diff options
| author | Ilya Kitaev <mbg033@gmail.com> | 2016-06-15 16:34:55 +0300 |
|---|---|---|
| committer | Ilya Kitaev <mbg033@gmail.com> | 2016-06-15 16:34:55 +0300 |
| commit | 3ddd9bed72da0e039f44b64a4cc9fff679dd40ed (patch) | |
| tree | 76749d569926f58b217455330b2ed2820e57008c /wizard | |
| parent | 2151f1395c28027f867d8e640b0c0be4cd4e0a23 (diff) | |
| download | monzero-gui-3ddd9bed72da0e039f44b64a4cc9fff679dd40ed.tar.gz monzero-gui-3ddd9bed72da0e039f44b64a4cc9fff679dd40ed.tar.xz monzero-gui-3ddd9bed72da0e039f44b64a4cc9fff679dd40ed.zip | |
main application: initialize wallet, display balance
Diffstat (limited to 'wizard')
| -rw-r--r-- | wizard/WizardMain.qml | 37 | ||||
| -rw-r--r-- | wizard/WizardPassword.qml | 4 |
2 files changed, 22 insertions, 19 deletions
diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml index 940243cb..3c4103ce 100644 --- a/wizard/WizardMain.qml +++ b/wizard/WizardMain.qml @@ -146,32 +146,33 @@ Rectangle { settings['wallet_filename'] = new_wallet_filename; // persist settings - persistentSettings.language = settings.language - persistentSettings.account_name = settings.account_name - persistentSettings.wallet_path = settings.wallet_path - persistentSettings.allow_background_mining = settings.allow_background_mining - persistentSettings.auto_donations_enabled = settings.auto_donations_enabled - persistentSettings.auto_donations_amount = settings.auto_donations_amount + appWindow.persistentSettings.language = settings.language + appWindow.persistentSettings.account_name = settings.account_name + appWindow.persistentSettings.wallet_path = settings.wallet_path + appWindow.persistentSettings.allow_background_mining = settings.allow_background_mining + appWindow.persistentSettings.auto_donations_enabled = settings.auto_donations_enabled + appWindow.persistentSettings.auto_donations_amount = settings.auto_donations_amount } // reading settings from persistent storage Component.onCompleted: { - settings['allow_background_mining'] = persistentSettings.allow_background_mining - settings['auto_donations_enabled'] = persistentSettings.auto_donations_enabled - settings['auto_donations_amount'] = persistentSettings.auto_donations_amount + console.log("rootItem: ", appWindow); + settings['allow_background_mining'] = appWindow.persistentSettings.allow_background_mining + settings['auto_donations_enabled'] = appWindow.persistentSettings.auto_donations_enabled + settings['auto_donations_amount'] = appWindow.persistentSettings.auto_donations_amount } - Settings { - id: persistentSettings +// Settings { +// id: persistentSettings - property string language - property string account_name - property string wallet_path - property bool auto_donations_enabled : true - property int auto_donations_amount : 50 - property bool allow_background_mining : true - } +// property string language +// property string account_name +// property string wallet_path +// property bool auto_donations_enabled : true +// property int auto_donations_amount : 50 +// property bool allow_background_mining : true +// } Rectangle { id: nextButton diff --git a/wizard/WizardPassword.qml b/wizard/WizardPassword.qml index 6b14dae9..4825c02d 100644 --- a/wizard/WizardPassword.qml +++ b/wizard/WizardPassword.qml @@ -44,7 +44,9 @@ Item { onOpacityChanged: visible = opacity !== 0 function onPageClosed(settingsObject) { - settingsObject.wallet.setPassword(passwordItem.password) + // TODO: set password on the final page + // settingsObject.wallet.setPassword(passwordItem.password) + settingsObject['wallet_password'] = passwordItem.password return true } |