aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxiphon <xiphon@protonmail.com>2018-09-27 14:01:14 +0000
committerxiphon <xiphon@protonmail.com>2018-09-27 14:01:14 +0000
commitaf0f58f72730454dce2636936024ebf9dd76e5a9 (patch)
treeaa3c6f74c660434182a289652982461af3d7ce03
parent3fd37b96a0acbbf54db62f8d84b392ae3e7b85f9 (diff)
downloadmonzero-gui-af0f58f72730454dce2636936024ebf9dd76e5a9.tar.gz
monzero-gui-af0f58f72730454dce2636936024ebf9dd76e5a9.tar.xz
monzero-gui-af0f58f72730454dce2636936024ebf9dd76e5a9.zip
fixed "Keys" CTRL+Y hotkey
-rw-r--r--LeftPanel.qml1
-rw-r--r--js/Utils.js4
-rw-r--r--main.qml1
3 files changed, 4 insertions, 2 deletions
diff --git a/LeftPanel.qml b/LeftPanel.qml
index e06fc04b..5a22f365 100644
--- a/LeftPanel.qml
+++ b/LeftPanel.qml
@@ -72,6 +72,7 @@ Rectangle {
else if(pos === "Sign") menuColumn.previousButton = signButton
else if(pos === "Settings") menuColumn.previousButton = settingsButton
else if(pos === "Advanced") menuColumn.previousButton = advancedButton
+ else if(pos === "Keys") menuColumn.previousButton = keysButton
menuColumn.previousButton.checked = true
}
diff --git a/js/Utils.js b/js/Utils.js
index 56953f50..9a6e4829 100644
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -37,7 +37,7 @@ function showSeedPage() {
currentWallet.setSeedLanguage("English");
}
// Load keys page
- middlePanel.state = "Keys"
+ appWindow.showPageRequest("Keys");
} else {
informationPopup.title = qsTr("Error") + translationManager.emptyString;
informationPopup.text = qsTr("Wrong password");
@@ -48,7 +48,7 @@ function showSeedPage() {
}
}
passwordDialog.onRejectedCallback = function() {
- appWindow.showPageRequest("Settings");
+ leftPanel.selectItem(middlePanel.state);
}
passwordDialog.open();
if(isMobile) hideMenu();
diff --git a/main.qml b/main.qml
index 3f5769ab..8d159cc8 100644
--- a/main.qml
+++ b/main.qml
@@ -109,6 +109,7 @@ ApplicationWindow {
else if(seq === "Ctrl+I") middlePanel.state = "Sign"
else if(seq === "Ctrl+G") middlePanel.state = "SharedRingDB"
else if(seq === "Ctrl+E") middlePanel.state = "Settings"
+ else if(seq === "Ctrl+Y") leftPanel.keysClicked()
else if(seq === "Ctrl+D") middlePanel.state = "Advanced"
else if(seq === "Ctrl+Tab" || seq === "Alt+Tab") {
/*