monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-10 21:04:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #309

Browse source 
2d763c9 Remove from the ctrl-tab cycling the hidden panels (Dashboard, Mining) (Clement)
3705d79 Add missing shortcuts. Improve coherency of shortcuts. (Clement)
This commit is contained in:
Riccardo Spagni 2016-12-20 22:57:50 +02:00
commit ca23b3a0e5
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
LeftPanel.qml
View file

@ -229,7 +229,7 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Send") + translationManager.emptyString text: qsTr("Send") + translationManager.emptyString
symbol: qsTr("T") + translationManager.emptyString symbol: qsTr("S") + translationManager.emptyString
dotColor: "#FF6C3C" dotColor: "#FF6C3C"
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
@ -365,7 +365,7 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Sign/verify") + translationManager.emptyString text: qsTr("Sign/verify") + translationManager.emptyString
symbol: qsTr("S") + translationManager.emptyString symbol: qsTr("I") + translationManager.emptyString
dotColor: "#AAFFBB" dotColor: "#AAFFBB"
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
@ -386,7 +386,7 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Settings") + translationManager.emptyString text: qsTr("Settings") + translationManager.emptyString
symbol: qsTr("S") + translationManager.emptyString symbol: qsTr("E") + translationManager.emptyString
dotColor: "#36B25C" dotColor: "#36B25C"
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false

41
main.qml
View file

@ -81,25 +81,52 @@ ApplicationWindow {
} }
if(seq === "Ctrl+D") middlePanel.state = "Dashboard" 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+H") middlePanel.state = "History"
else if(seq === "Ctrl+T") middlePanel.state = "Transfer"
else if(seq === "Ctrl+B") middlePanel.state = "AddressBook" else if(seq === "Ctrl+B") middlePanel.state = "AddressBook"
else if(seq === "Ctrl+M") middlePanel.state = "Mining" 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") { else if(seq === "Ctrl+Tab" || seq === "Alt+Tab") {
/*
if(middlePanel.state === "Dashboard") middlePanel.state = "Transfer" 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 === "History") middlePanel.state = "AddressBook"
else if(middlePanel.state === "AddressBook") middlePanel.state = "Mining" 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(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") { } else if(seq === "Ctrl+Shift+Backtab" || seq === "Alt+Shift+Backtab") {
/*
if(middlePanel.state === "Dashboard") middlePanel.state = "Settings" 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 === "Mining") middlePanel.state = "AddressBook"
else if(middlePanel.state === "AddressBook") middlePanel.state = "History" 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" 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) leftPanel.selectItem(middlePanel.state)
@ -804,10 +831,10 @@ ApplicationWindow {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
height: parent.height height: parent.height
onDashboardClicked: middlePanel.state = "Dashboard" onDashboardClicked: middlePanel.state = "Dashboard"
onHistoryClicked: middlePanel.state = "History"
onTransferClicked: middlePanel.state = "Transfer" onTransferClicked: middlePanel.state = "Transfer"
onReceiveClicked: middlePanel.state = "Receive" onReceiveClicked: middlePanel.state = "Receive"
onTxkeyClicked: middlePanel.state = "TxKey" onTxkeyClicked: middlePanel.state = "TxKey"
onHistoryClicked: middlePanel.state = "History"
onAddressBookClicked: middlePanel.state = "AddressBook" onAddressBookClicked: middlePanel.state = "AddressBook"
onMiningClicked: middlePanel.state = "Minning" onMiningClicked: middlePanel.state = "Minning"
onSignClicked: middlePanel.state = "Sign" onSignClicked: middlePanel.state = "Sign"