aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-10-11 10:28:31 +0200
committerRiccardo Spagni <ric@spagni.net>2016-10-11 10:28:31 +0200
commitd9b3f4a4fd1f2082b9867a1f22ecb0fe01f04280 (patch)
treed7f21728940451b222ae40589c4f1f6d033e5696
parent6bbad6c8de9582fd4cdaa4ac65b75795d64cbac9 (diff)
parentb8c07de8197c69f95681f27be4c86d5b5e5bdefa (diff)
downloadmonzero-gui-d9b3f4a4fd1f2082b9867a1f22ecb0fe01f04280.tar.gz
monzero-gui-d9b3f4a4fd1f2082b9867a1f22ecb0fe01f04280.tar.xz
monzero-gui-d9b3f4a4fd1f2082b9867a1f22ecb0fe01f04280.zip
Merge pull request #46
b8c07de wizard: store password in appwindow session (Jacob Brydolf) e5b9a1b settings page: strict password check (Jacob Brydolf) 010cce4 settings page: Empty password field on seed view (Jacob Brydolf)
-rw-r--r--components/PasswordDialog.qml2
-rw-r--r--pages/Settings.qml4
-rw-r--r--wizard/WizardMain.qml3
3 files changed, 6 insertions, 3 deletions
diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml
index 9edf87fc..69a2ae91 100644
--- a/components/PasswordDialog.qml
+++ b/components/PasswordDialog.qml
@@ -36,7 +36,7 @@ import QtQuick.Controls.Styles 1.4
Dialog {
id: root
- readonly property alias password: passwordInput.text
+ property alias password: passwordInput.text
standardButtons: StandardButton.Ok + StandardButton.Cancel
ColumnLayout {
id: column
diff --git a/pages/Settings.qml b/pages/Settings.qml
index d46186af..8e73b8fe 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -72,11 +72,11 @@ Rectangle {
id: settingsPasswordDialog
standardButtons: StandardButton.Ok + StandardButton.Cancel
onAccepted: {
- if(appWindow.password == settingsPasswordDialog.password){
+ if(appWindow.password === settingsPasswordDialog.password){
memoTextInput.text = currentWallet.seed
showSeedButton.visible = false
}
-
+ settingsPasswordDialog.password = ""
}
onRejected: {
diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml
index 097fb58a..43200304 100644
--- a/wizard/WizardMain.qml
+++ b/wizard/WizardMain.qml
@@ -124,6 +124,9 @@ Rectangle {
// protecting wallet with password
settings.wallet.setPassword(settings.wallet_password);
+ // Store password in session to be able to use password protected functions (e.g show seed)
+ appWindow.password = settings.wallet_password
+
// saving wallet_filename;
settings['wallet_filename'] = new_wallet_filename;