diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-05-05 12:04:46 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-05-05 12:04:46 +0200 |
| commit | 2ac9e8eabb8240900fbc72362ef105563fc87acf (patch) | |
| tree | d5e7600526255f3d26e6550ea690d2986cd699ea /wizard | |
| parent | da6aad33a4aa58c298f3452206f3bab04ad2b5cb (diff) | |
| parent | fff5c716c813e741c552d310fb4ce1c07d3b07d8 (diff) | |
| download | monzero-gui-2ac9e8eabb8240900fbc72362ef105563fc87acf.tar.gz monzero-gui-2ac9e8eabb8240900fbc72362ef105563fc87acf.tar.xz monzero-gui-2ac9e8eabb8240900fbc72362ef105563fc87acf.zip | |
Merge pull request #658
fff5c71 add ios_get_libwallet.api.sh (Jaquee)
2e53c52 ios build settings (Jaquee)
Diffstat (limited to 'wizard')
| -rw-r--r-- | wizard/WizardCreateWallet.qml | 1 | ||||
| -rw-r--r-- | wizard/WizardMain.qml | 18 | ||||
| -rw-r--r-- | wizard/WizardManageWalletUI.qml | 3 |
3 files changed, 18 insertions, 4 deletions
diff --git a/wizard/WizardCreateWallet.qml b/wizard/WizardCreateWallet.qml index 3f43fe94..99ee2478 100644 --- a/wizard/WizardCreateWallet.qml +++ b/wizard/WizardCreateWallet.qml @@ -59,6 +59,7 @@ ColumnLayout { settingsObject['account_name'] = uiItem.accountNameText settingsObject['words'] = uiItem.wordsTexttext settingsObject['wallet_path'] = uiItem.walletPath + console.log("path " +uiItem.walletPath); var walletFullPath = wizard.createWalletPath(uiItem.walletPath,uiItem.accountNameText); return wizard.walletPathValid(walletFullPath); } diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml index 21169ac1..9064b875 100644 --- a/wizard/WizardMain.qml +++ b/wizard/WizardMain.qml @@ -162,10 +162,16 @@ ColumnLayout { folder_path = folder_path.substring(0,folder_path.length -1) } + // Store releative path on ios. + if(isIOS) + folder_path = ""; + return folder_path + "/" + account_name + "/" + account_name } function walletPathValid(path){ + if(isIOS) + path = moneroAccountsDir + path; if (walletManager.walletExists(path)) { walletErrorDialog.text = qsTr("A wallet with same name already exists. Please change wallet name") + translationManager.emptyString; walletErrorDialog.open(); @@ -195,8 +201,16 @@ ColumnLayout { function applySettings() { // Save wallet files in user specified location var new_wallet_filename = createWalletPath(settings.wallet_path,settings.account_name) - console.log("saving in wizard: "+ new_wallet_filename) - settings.wallet.store(new_wallet_filename); + if(isIOS) { + console.log("saving in ios: "+ moneroAccountsDir + new_wallet_filename) + settings.wallet.store(moneroAccountsDir + new_wallet_filename); + } else { + console.log("saving in wizard: "+ new_wallet_filename) + settings.wallet.store(new_wallet_filename); + + } + + // make sure temporary wallet files are deleted console.log("Removing temporary wallet: "+ settings.tmp_wallet_filename) diff --git a/wizard/WizardManageWalletUI.qml b/wizard/WizardManageWalletUI.qml index 7c15f4d5..b2aa7e73 100644 --- a/wizard/WizardManageWalletUI.qml +++ b/wizard/WizardManageWalletUI.qml @@ -242,8 +242,7 @@ ColumnLayout { Layout.fillWidth: true Layout.topMargin: 20 fontSize: 14 - text: qsTr("Your wallet is stored in") + translationManager.emptyString - + translationManager.emptyString + text: qsTr("Your wallet is stored in") + fileUrlInput.text; } LineEdit { |