From 3705d7934690523ea257fd7095d1cb538fc2ebfd Mon Sep 17 00:00:00 2001 From: Clement Date: Sun, 18 Dec 2016 14:59:24 +0100 Subject: [PATCH 1/2] Add missing shortcuts. Improve coherency of shortcuts. --- LeftPanel.qml | 6 +++--- main.qml | 23 ++++++++++++++++------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/LeftPanel.qml b/LeftPanel.qml index cd87de7e..bd6fca4a 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 diff --git a/main.qml b/main.qml index 0bbe4be3..c38cc548 100644 --- a/main.qml +++ b/main.qml @@ -81,24 +81,33 @@ 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" } 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" + else 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" } @@ -780,10 +789,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" From 2d763c930e17206ebb7f1a763f852ebd85e1afb1 Mon Sep 17 00:00:00 2001 From: Clement Date: Sun, 18 Dec 2016 15:24:48 +0100 Subject: [PATCH 2/2] Remove from the ctrl-tab cycling the hidden panels (Dashboard, Mining) --- main.qml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/main.qml b/main.qml index c38cc548..5419ee32 100644 --- a/main.qml +++ b/main.qml @@ -90,6 +90,7 @@ ApplicationWindow { 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 = "Receive" else if(middlePanel.state === "Receive") middlePanel.state = "TxKey" @@ -99,9 +100,18 @@ ApplicationWindow { 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 = "Sign" + 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" @@ -109,6 +119,14 @@ ApplicationWindow { 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)