Merge pull request #1489

af0f58f fixed 'Keys' CTRL+Y hotkey (xiphon)
This commit is contained in:
luigi1111 2018-10-03 13:31:48 -05:00
commit 78a003c161
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 4 additions and 2 deletions

View file

@ -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
}

View file

@ -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();

View file

@ -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") {
/*