Merge pull request #1511

Settings overhaul (27 commits by skftn)
This commit is contained in:
luigi1111
2018-08-14 16:15:31 -05:00
29 changed files with 2270 additions and 956 deletions

View File

@@ -40,6 +40,7 @@ import moneroComponents.NetworkType 1.0
import "components"
import "wizard"
import "../js/Utils.js" as Utils
import "js/Windows.js" as Windows
ApplicationWindow {
@@ -1414,31 +1415,7 @@ ApplicationWindow {
updateBalance();
}
onKeysClicked: {
passwordDialog.onAcceptedCallback = function() {
if(walletPassword === passwordDialog.password){
if(currentWallet.seedLanguage == "") {
console.log("No seed language set. Using English as default");
currentWallet.setSeedLanguage("English");
}
// Load keys page
middlePanel.state = "Keys"
} else {
informationPopup.title = qsTr("Error") + translationManager.emptyString;
informationPopup.text = qsTr("Wrong password");
informationPopup.open()
informationPopup.onCloseCallback = function() {
passwordDialog.open()
}
}
}
passwordDialog.onRejectedCallback = function() {
appWindow.showPageRequest("Settings");
}
passwordDialog.open();
if(isMobile) hideMenu();
updateBalance();
}
onKeysClicked: Utils.showSeedPage();
}
RightPanel {