diff options
Diffstat (limited to 'wizard')
| -rw-r--r-- | wizard/WizardController.qml | 2 | ||||
| -rw-r--r-- | wizard/WizardOpenWallet1.qml | 15 | ||||
| -rw-r--r-- | wizard/WizardWalletInput.qml | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml index 992ae2fb..3ec9dc79 100644 --- a/wizard/WizardController.qml +++ b/wizard/WizardController.qml @@ -371,7 +371,7 @@ Rectangle { persistentSettings.locale = wizardController.language_locale persistentSettings.account_name = wizardController.walletOptionsName - persistentSettings.wallet_path = new_wallet_filename + persistentSettings.wallet_path = wizardController.m_wallet.path; persistentSettings.restore_height = (isNaN(walletOptionsRestoreHeight))? 0 : walletOptionsRestoreHeight persistentSettings.allow_background_mining = false diff --git a/wizard/WizardOpenWallet1.qml b/wizard/WizardOpenWallet1.qml index a3d0bcbc..85bc48d7 100644 --- a/wizard/WizardOpenWallet1.qml +++ b/wizard/WizardOpenWallet1.qml @@ -119,7 +119,7 @@ Rectangle { delegate: Rectangle { // inherited roles from walletKeysFilesModel: - // index, modified, accessed, path, networktype, address + // index, fileName, modified, accessed, path, networktype, address id: item height: flow.itemHeight width: { @@ -133,11 +133,6 @@ Rectangle { else if(networktype === 2) return qsTr("Stagenet"); return ""; } - property string fileName: { - var spl = path.split("/"); - return spl[spl.length - 1].replace(".keys", ""); - } - property string filePath: { return path } color: "transparent" Rectangle { @@ -202,9 +197,9 @@ Rectangle { text: { // truncate on window width var maxLength = wizardController.layoutScale <= 1 ? 12 : 16 - if(item.fileName.length > maxLength) - return item.fileName.substring(0, maxLength) + "..."; - return item.fileName; + if (fileName.length > maxLength) + return fileName.substring(0, maxLength) + "..."; + return fileName; } Layout.preferredHeight: 26 @@ -270,7 +265,7 @@ Rectangle { onClicked: { persistentSettings.nettype = parseInt(networktype) - wizardController.openWalletFile(item.filePath); + wizardController.openWalletFile(path); } } } diff --git a/wizard/WizardWalletInput.qml b/wizard/WizardWalletInput.qml index e0d705cf..64356c89 100644 --- a/wizard/WizardWalletInput.qml +++ b/wizard/WizardWalletInput.qml @@ -55,7 +55,7 @@ GridLayout { function reset() { walletName.error = !walletName.verify(); walletLocation.error = walletLocation.text === ""; - walletLocation.text = moneroAccountsDir + "/"; + walletLocation.text = moneroAccountsDir; walletName.text = defaultAccountName; } |