diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-12-20 22:57:50 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-12-20 22:57:50 +0200 |
| commit | ca23b3a0e5316d1aeb97d5cfb8dfbaa8b0fd829a (patch) | |
| tree | 8b0a31e10e08a001872fc8b80dc0500dec50424c | |
| parent | 4d258f6da7a798a24e14735a62c799586f6a0c57 (diff) | |
| parent | 2d763c930e17206ebb7f1a763f852ebd85e1afb1 (diff) | |
| download | monzero-gui-ca23b3a0e5316d1aeb97d5cfb8dfbaa8b0fd829a.tar.gz monzero-gui-ca23b3a0e5316d1aeb97d5cfb8dfbaa8b0fd829a.tar.xz monzero-gui-ca23b3a0e5316d1aeb97d5cfb8dfbaa8b0fd829a.zip | |
Merge pull request #309
2d763c9 Remove from the ctrl-tab cycling the hidden panels (Dashboard, Mining) (Clement)
3705d79 Add missing shortcuts. Improve coherency of shortcuts. (Clement)
| -rw-r--r-- | LeftPanel.qml | 6 | ||||
| -rw-r--r-- | main.qml | 41 |
2 files changed, 37 insertions, 10 deletions
diff --git a/LeftPanel.qml b/LeftPanel.qml index 6f1ffc94..c8d696da 100644 --- a/LeftPanel.qml +++ b/LeftPanel.qml @@ -229,7 +229,7 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right text: qsTr("Send") + translationManager.emptyString - symbol: qsTr("T") + translationManager.emptyString + symbol: qsTr("S") + translationManager.emptyString dotColor: "#FF6C3C" onClicked: { parent.previousButton.checked = false @@ -365,7 +365,7 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right text: qsTr("Sign/verify") + translationManager.emptyString - symbol: qsTr("S") + translationManager.emptyString + symbol: qsTr("I") + translationManager.emptyString dotColor: "#AAFFBB" onClicked: { parent.previousButton.checked = false @@ -386,7 +386,7 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right text: qsTr("Settings") + translationManager.emptyString - symbol: qsTr("S") + translationManager.emptyString + symbol: qsTr("E") + translationManager.emptyString dotColor: "#36B25C" onClicked: { parent.previousButton.checked = false @@ -81,25 +81,52 @@ ApplicationWindow { } if(seq === "Ctrl+D") middlePanel.state = "Dashboard" + else if(seq === "Ctrl+S") middlePanel.state = "Transfer" + else if(seq === "Ctrl+R") middlePanel.state = "Receive" + else if(seq === "Ctrl+K") middlePanel.state = "TxKey" else if(seq === "Ctrl+H") middlePanel.state = "History" - else if(seq === "Ctrl+T") middlePanel.state = "Transfer" else if(seq === "Ctrl+B") middlePanel.state = "AddressBook" else if(seq === "Ctrl+M") middlePanel.state = "Mining" - else if(seq === "Ctrl+S") middlePanel.state = "Settings" + else if(seq === "Ctrl+I") middlePanel.state = "Sign" + else if(seq === "Ctrl+E") middlePanel.state = "Settings" else if(seq === "Ctrl+Tab" || seq === "Alt+Tab") { + /* if(middlePanel.state === "Dashboard") middlePanel.state = "Transfer" - else if(middlePanel.state === "Transfer") middlePanel.state = "History" + else if(middlePanel.state === "Transfer") middlePanel.state = "Receive" + else if(middlePanel.state === "Receive") middlePanel.state = "TxKey" + else if(middlePanel.state === "TxKey") middlePanel.state = "History" else if(middlePanel.state === "History") middlePanel.state = "AddressBook" else if(middlePanel.state === "AddressBook") middlePanel.state = "Mining" - else if(middlePanel.state === "Mining") middlePanel.state = "Settings" + else if(middlePanel.state === "Mining") middlePanel.state = "Sign" + else if(middlePanel.state === "Sign") middlePanel.state = "Settings" else if(middlePanel.state === "Settings") middlePanel.state = "Dashboard" + */ + if(middlePanel.state === "Settings") middlePanel.state = "Transfer" + else if(middlePanel.state === "Transfer") middlePanel.state = "Receive" + else if(middlePanel.state === "Receive") middlePanel.state = "TxKey" + else if(middlePanel.state === "TxKey") middlePanel.state = "History" + else if(middlePanel.state === "History") middlePanel.state = "AddressBook" + else if(middlePanel.state === "AddressBook") middlePanel.state = "Sign" + else if(middlePanel.state === "Sign") middlePanel.state = "Settings" } else if(seq === "Ctrl+Shift+Backtab" || seq === "Alt+Shift+Backtab") { + /* if(middlePanel.state === "Dashboard") middlePanel.state = "Settings" - else if(middlePanel.state === "Settings") middlePanel.state = "Mining" + if(middlePanel.state === "Settings") middlePanel.state = "Sign" + else if(middlePanel.state === "Sign") middlePanel.state = "Mining" else if(middlePanel.state === "Mining") middlePanel.state = "AddressBook" else if(middlePanel.state === "AddressBook") middlePanel.state = "History" - else if(middlePanel.state === "History") middlePanel.state = "Transfer" + else if(middlePanel.state === "History") middlePanel.state = "TxKey" + else if(middlePanel.state === "TxKey") middlePanel.state = "Receive" + else if(middlePanel.state === "Receive") middlePanel.state = "Transfer" else if(middlePanel.state === "Transfer") middlePanel.state = "Dashboard" + */ + if(middlePanel.state === "Settings") middlePanel.state = "Sign" + else if(middlePanel.state === "Sign") middlePanel.state = "AddressBook" + else if(middlePanel.state === "AddressBook") middlePanel.state = "History" + else if(middlePanel.state === "History") middlePanel.state = "TxKey" + else if(middlePanel.state === "TxKey") middlePanel.state = "Receive" + else if(middlePanel.state === "Receive") middlePanel.state = "Transfer" + else if(middlePanel.state === "Transfer") middlePanel.state = "Settings" } leftPanel.selectItem(middlePanel.state) @@ -804,10 +831,10 @@ ApplicationWindow { anchors.bottom: parent.bottom height: parent.height onDashboardClicked: middlePanel.state = "Dashboard" - onHistoryClicked: middlePanel.state = "History" onTransferClicked: middlePanel.state = "Transfer" onReceiveClicked: middlePanel.state = "Receive" onTxkeyClicked: middlePanel.state = "TxKey" + onHistoryClicked: middlePanel.state = "History" onAddressBookClicked: middlePanel.state = "AddressBook" onMiningClicked: middlePanel.state = "Minning" onSignClicked: middlePanel.state = "Sign" |