Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'qml_app_ui_improvements' into GSoC2017-evaluation-final

Browse Source
This commit is contained in:
Angela Mazzurco 2017-08-16 14:09:38 +02:00
commit 79f09f14ac
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
retroshare-qml-app/src/ChatBubbleDelegate.qml
View File

@ -21,6 +21,7 @@ Item
anchors.fill: parent anchors.fill: parent
width: parent.width width: parent.width
height: parent.height height: parent.height
color: "transparent"
Rectangle Rectangle
{ {

2
retroshare-qml-app/src/TrustedNodesView.qml
View File

@ -84,7 +84,7 @@ Item
iconUrl: isOnline? iconUrl: isOnline?
"/icons/state-ok.svg" : "/icons/state-ok.svg" :
"/icons/state-offline.svg" "/icons/state-offline.svg"
color: "white" color: "transparent"
pressColor: "lightsteelblue" pressColor: "lightsteelblue"
buttonTextPixelSize: 18 buttonTextPixelSize: 18
iconHeight:parent.height - 4 iconHeight:parent.height - 4

18
retroshare-qml-app/src/main-app.qml
View File

@ -18,6 +18,7 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 2.0 import QtQuick.Controls 2.0
import QtGraphicalEffects 1.0
import org.retroshare.qml_components.LibresapiLocalClient 1.0 import org.retroshare.qml_components.LibresapiLocalClient 1.0
import "URI.js" as UriJs import "URI.js" as UriJs
import "." //Needed for TokensManager and ClipboardWrapper singleton import "." //Needed for TokensManager and ClipboardWrapper singleton
@ -61,6 +62,7 @@ ApplicationWindow
header: ToolBar header: ToolBar
{ {
id: toolBar id: toolBar
height: 50
property alias titleText: toolBarText.text property alias titleText: toolBarText.text
property alias loaderSource: imageLoader.sourceComponent property alias loaderSource: imageLoader.sourceComponent
property alias gxsSource: imageLoader.gxsSource property alias gxsSource: imageLoader.gxsSource
@ -219,17 +221,25 @@ ApplicationWindow
} }
}
DropShadow
{
anchors.fill: toolBar
horizontalOffset: 0
verticalOffset: 1
radius: 12
samples: 25
color: "#80000000"
source: toolBar
} }
StackView StackView
{ {
id: stackView id: stackView
anchors.fill: parent anchors.fill: parent
anchors.top: toolBar.bottom
anchors.topMargin: 5
focus: true focus: true
onCurrentItemChanged: onCurrentItemChanged:
{ {