monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-22 19:49:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wizard: use m_wallet instead of storing in settingsObj

Browse source
This commit is contained in:
Jaquee 2017-08-06 17:11:12 +02:00
parent 91953f1a3a
commit bbcb780cfa
7 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
main.qml
View file

@ -196,7 +196,7 @@ ApplicationWindow {
walletManager.setDaemonAddress(persistentSettings.daemon_address)
// wallet already opened with wizard, we just need to initialize it
if (typeof wizard.settings['wallet'] !== 'undefined') {
if (typeof wizard.m_wallet !== 'undefined') {
console.log("using wizard wallet")
//Set restoreHeight
if(persistentSettings.restore_height > 0){
@ -204,11 +204,11 @@ ApplicationWindow {
restoreHeight = persistentSettings.restore_height
}
connectWallet(wizard.settings['wallet'])
connectWallet(wizard.m_wallet)
isNewWallet = true
// We don't need the wizard wallet any more - delete to avoid conflict with daemon adress change
delete wizard.settings['wallet']
delete wizard.m_wallet
} else {
var wallet_path = walletPath();
if(isIOS)

6
wizard/WizardCreateWallet.qml
View file

@ -78,7 +78,7 @@ ColumnLayout {
// page submitted or b) delete it when program closed before reaching final page
// Always delete the wallet object before creating new - we could be stepping back from recovering wallet
if (typeof settingsObject.wallet !== 'undefined') {
if (typeof m_wallet !== 'undefined') {
walletManager.closeWallet()
console.log("deleting wallet")
}
@ -91,8 +91,8 @@ ColumnLayout {
uiItem.wordsTextItem.memoText = wallet.seed
// saving wallet in "global" settings object
// TODO: wallet should have a property pointing to the file where it stored or loaded from
settingsObject.wallet = wallet
settingsObject.tmp_wallet_filename = tmp_wallet_filename
m_wallet = wallet;
settingsObject['tmp_wallet_filename'] = tmp_wallet_filename
}
WizardManageWalletUI {

2
wizard/WizardFinish.qml
View file

@ -100,7 +100,7 @@ ColumnLayout {
ListElement { dotColor: "#36B05B" }
ListElement { dotColor: "#36B05B" }
ListElement { dotColor: "#36B05B" }
//ListElement { dotColor: "#36B05B" }
ListElement { dotColor: "#FFE00A" }
}
Repeater {

14
wizard/WizardMain.qml
View file

@ -44,6 +44,8 @@ ColumnLayout {
property int wizardRightMargin: (!isMobile) ? 150 : 25 * scaleRatio
property int wizardBottomMargin: (isMobile) ? 150 : 25 * scaleRatio
property int wizardTopMargin: (isMobile) ? 15 * scaleRatio : 50
// Storing wallet in Settings object doesn't work in qt 5.8 on android
property var m_wallet;
property var paths: {
// "create_wallet" : [welcomePage, optionsPage, createWalletPage, passwordPage, donationPage, finishPage ],
@ -137,9 +139,8 @@ ColumnLayout {
function openOpenWalletPage() {
console.log("open wallet from file page");
if (typeof wizard.settings['wallet'] !== 'undefined') {
settings.wallet.destroy();
delete wizard.settings['wallet'];
if (typeof m_wallet !== 'undefined' && m_wallet != null) {
walletManager.closeWallet()
}
optionsPage.onPageClosed(settings)
wizard.openWalletFromFileClicked();
@ -203,11 +204,10 @@ ColumnLayout {
var new_wallet_filename = createWalletPath(settings.wallet_path,settings.account_name)
if(isIOS) {
console.log("saving in ios: "+ moneroAccountsDir + new_wallet_filename)
settings.wallet.store(moneroAccountsDir + new_wallet_filename);
m_wallet.store(moneroAccountsDir + new_wallet_filename);
} else {
console.log("saving in wizard: "+ new_wallet_filename)
settings.wallet.store(new_wallet_filename);
m_wallet.store(new_wallet_filename);
}
@ -217,7 +217,7 @@ ColumnLayout {
oshelper.removeTemporaryWallet(settings.tmp_wallet_filename)
// protecting wallet with password
settings.wallet.setPassword(settings.wallet_password);
m_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

4
wizard/WizardManageWalletUI.qml
View file

@ -93,8 +93,8 @@ ColumnLayout {
ListModel {
id: dotsModel
ListElement { dotColor: "#36B05B" }
//ListElement { dotColor: "#DBDBDB" }
ListElement { dotColor: "#FFE00A" }
ListElement { dotColor: "#DBDBDB" }
ListElement { dotColor: "#DBDBDB" }
ListElement { dotColor: "#DBDBDB" }
}

5
wizard/WizardPassword.qml
View file

@ -64,7 +64,6 @@ ColumnLayout {
function onPageClosed(settingsObject) {
// TODO: set password on the final page
// settingsObject.wallet.setPassword(passwordItem.password)
settingsObject['wallet_password'] = passwordUI.password
return true
}
@ -82,8 +81,8 @@ ColumnLayout {
ListModel {
id: dotsModel
ListElement { dotColor: "#36B05B" }
ListElement { dotColor: "#36B05B" }
//ListElement { dotColor: "#FFE00A" }
ListElement { dotColor: "#FFE00A" }
ListElement { dotColor: "#DBDBDB" }
ListElement { dotColor: "#DBDBDB" }
}

2
wizard/WizardRecoveryWallet.qml
View file

@ -92,7 +92,7 @@ ColumnLayout {
var success = wallet.status === Wallet.Status_Ok;
if (success) {
settingsObject['wallet'] = wallet;
m_wallet = wallet;
settingsObject['is_recovering'] = true;
settingsObject['tmp_wallet_filename'] = tmp_wallet_filename
} else {