monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 16:28:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #417

Browse source 
c51a28f fix advanced hotkey + menu separators (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-02-04 17:42:28 +02:00
commit e16180c2a5
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
LeftPanel.qml
View file

@ -62,6 +62,7 @@ Rectangle {
else if(pos === "TxKey") menuColumn.previousButton = txkeyButton else if(pos === "TxKey") menuColumn.previousButton = txkeyButton
else if(pos === "Sign") menuColumn.previousButton = signButton else if(pos === "Sign") menuColumn.previousButton = signButton
else if(pos === "Settings") menuColumn.previousButton = settingsButton else if(pos === "Settings") menuColumn.previousButton = settingsButton
else if(pos === "Advanced") menuColumn.previousButton = advancedButton
menuColumn.previousButton.checked = true menuColumn.previousButton.checked = true
} }
@ -259,6 +260,7 @@ Rectangle {
} }
Rectangle { Rectangle {
visible: transferButton.present
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 16
@ -307,6 +309,7 @@ Rectangle {
} }
} }
Rectangle { Rectangle {
visible: receiveButton.present
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 16
@ -330,6 +333,7 @@ Rectangle {
} }
} }
Rectangle { Rectangle {
visible: historyButton.present
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 16
@ -343,7 +347,7 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Advanced") + translationManager.emptyString text: qsTr("Advanced") + translationManager.emptyString
symbol: qsTr("A") + translationManager.emptyString symbol: qsTr("D") + translationManager.emptyString
dotColor: "#FFD781" dotColor: "#FFD781"
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
@ -351,6 +355,7 @@ Rectangle {
} }
} }
Rectangle { Rectangle {
visible: advancedButton.present
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 16
@ -375,6 +380,7 @@ Rectangle {
} }
Rectangle { Rectangle {
visible: miningButton.present
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 16

6
main.qml
View file

@ -84,8 +84,9 @@ ApplicationWindow {
return return
} }
if(seq === "Ctrl+D") middlePanel.state = "Dashboard" // Dashboard is not implemented
else if(seq === "Ctrl+S") middlePanel.state = "Transfer" // if(seq === "Ctrl+") middlePanel.state = "Dashboard"
if(seq === "Ctrl+S") middlePanel.state = "Transfer"
else if(seq === "Ctrl+R") middlePanel.state = "Receive" else if(seq === "Ctrl+R") middlePanel.state = "Receive"
else if(seq === "Ctrl+K") middlePanel.state = "TxKey" else if(seq === "Ctrl+K") middlePanel.state = "TxKey"
else if(seq === "Ctrl+H") middlePanel.state = "History" else if(seq === "Ctrl+H") middlePanel.state = "History"
@ -93,6 +94,7 @@ ApplicationWindow {
else if(seq === "Ctrl+M") middlePanel.state = "Mining" else if(seq === "Ctrl+M") middlePanel.state = "Mining"
else if(seq === "Ctrl+I") middlePanel.state = "Sign" else if(seq === "Ctrl+I") middlePanel.state = "Sign"
else if(seq === "Ctrl+E") middlePanel.state = "Settings" else if(seq === "Ctrl+E") middlePanel.state = "Settings"
else if(seq === "Ctrl+D") middlePanel.state = "Advanced"
else if(seq === "Ctrl+Tab" || seq === "Alt+Tab") { else if(seq === "Ctrl+Tab" || seq === "Alt+Tab") {
/* /*
if(middlePanel.state === "Dashboard") middlePanel.state = "Transfer" if(middlePanel.state === "Dashboard") middlePanel.state = "Transfer"