mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Merge branch 'qml_app_ui_improvements' into GSoC2017-evaluation-final
This commit is contained in:
commit
79f09f14ac
@ -21,6 +21,7 @@ Item
|
||||
anchors.fill: parent
|
||||
width: parent.width
|
||||
height: parent.height
|
||||
color: "transparent"
|
||||
|
||||
Rectangle
|
||||
{
|
||||
|
@ -84,7 +84,7 @@ Item
|
||||
iconUrl: isOnline?
|
||||
"/icons/state-ok.svg" :
|
||||
"/icons/state-offline.svg"
|
||||
color: "white"
|
||||
color: "transparent"
|
||||
pressColor: "lightsteelblue"
|
||||
buttonTextPixelSize: 18
|
||||
iconHeight:parent.height - 4
|
||||
|
@ -18,6 +18,7 @@
|
||||
|
||||
import QtQuick 2.1
|
||||
import QtQuick.Controls 2.0
|
||||
import QtGraphicalEffects 1.0
|
||||
import org.retroshare.qml_components.LibresapiLocalClient 1.0
|
||||
import "URI.js" as UriJs
|
||||
import "." //Needed for TokensManager and ClipboardWrapper singleton
|
||||
@ -61,6 +62,7 @@ ApplicationWindow
|
||||
header: ToolBar
|
||||
{
|
||||
id: toolBar
|
||||
height: 50
|
||||
property alias titleText: toolBarText.text
|
||||
property alias loaderSource: imageLoader.sourceComponent
|
||||
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
|
||||
{
|
||||
id: stackView
|
||||
anchors.fill: parent
|
||||
anchors.top: toolBar.bottom
|
||||
anchors.topMargin: 5
|
||||
focus: true
|
||||
onCurrentItemChanged:
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user