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

Partialy implement back button

Browse Source
This commit is contained in:
Angela Mazzurco 2017-06-23 17:26:10 +02:00
parent 37089bb73f
commit 60dae07742
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,9 @@ ApplicationWindow
property alias loaderSource: imageLoader.sourceComponent property alias loaderSource: imageLoader.sourceComponent
property string defaultLabel: "RetroShare" property string defaultLabel: "RetroShare"
property var iconsSize: (coreReady)? height - 10 : 0
property var backBtnVisible: true
property var searchBtnCb property var searchBtnCb
function openMainPage () function openMainPage ()
@ -86,6 +89,7 @@ ApplicationWindow
{ {
name: "CHATVIEW" name: "CHATVIEW"
PropertyChanges { target: toolBarText; mouseA.visible: false } PropertyChanges { target: toolBarText; mouseA.visible: false }
// PropertyChanges { target: toolBar; backBtnVisible: true }
}, },
State State
{ {
@ -93,6 +97,7 @@ ApplicationWindow
PropertyChanges { target: toolBar; titleText: defaultLabel} PropertyChanges { target: toolBar; titleText: defaultLabel}
PropertyChanges { target: toolBar; loaderSource: rsIcon} PropertyChanges { target: toolBar; loaderSource: rsIcon}
PropertyChanges { target: searchIcon; searchIconVisibility: true} PropertyChanges { target: searchIcon; searchIconVisibility: true}
PropertyChanges { target: toolBar; backBtnVisible: false }
} }
] ]
@ -140,14 +145,37 @@ ApplicationWindow
} }
BtnIcon
{
id: backButton
visible: toolBar.backBtnVisible
height: toolBar.iconsSize
width: toolBar.iconsSize
fillMode: Image.PreserveAspectFit
imgUrl: "/icons/microphone.svg"
onClicked:
{
if (stackView.depth > 1)
{
stackView.pop();
console.log("@@@@@@ depth ", stackView.depth)
// if (stackView.depth-1 == 0) toolBar.backBtnVisible = false
}
else
{
Qt.quit();
}
}
}
BtnIcon BtnIcon
{ {
property bool searchIconVisibility: false property bool searchIconVisibility: false
property var onClickCB: function (){} property var onClickCB: function (){}
id: searchIcon id: searchIcon
height: (coreReady)? parent.height - 10 : 0 height: toolBar.iconsSize
width: (coreReady)? parent.height - 10 : 0 width: toolBar.iconsSize
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
imgUrl: "qrc:/icons/search.svg" imgUrl: "qrc:/icons/search.svg"
anchors.right: menu.left anchors.right: menu.left
@ -199,6 +227,7 @@ ApplicationWindow
} }
currentItem.focus = true currentItem.focus = true
} }
console.log("@@@@@ CHANGED", toolBar.state)
} }
Keys.onReleased: Keys.onReleased: