aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--js/Wizard.js4
-rw-r--r--main.qml7
-rw-r--r--pages/History.qml2
-rw-r--r--pages/Transfer.qml4
-rw-r--r--pages/settings/SettingsInfo.qml2
-rw-r--r--wizard/WizardController.qml6
-rw-r--r--wizard/WizardOpenWallet1.qml2
-rw-r--r--wizard/WizardWalletInput.qml6
8 files changed, 17 insertions, 16 deletions
diff --git a/js/Wizard.js b/js/Wizard.js
index 054b13f7..52c43a84 100644
--- a/js/Wizard.js
+++ b/js/Wizard.js
@@ -65,7 +65,7 @@ function createWalletPath(isIOS, folder_path,account_name){
return folder_path + "/" + account_name + "/" + account_name
}
-function walletPathExists(directory, filename, isIOS, walletManager) {
+function walletPathExists(accountsDir, directory, filename, isIOS, walletManager) {
if(!filename || filename === "") return false;
if(!directory || directory === "") return false;
@@ -76,7 +76,7 @@ function walletPathExists(directory, filename, isIOS, walletManager) {
directory += "/"
if(isIOS)
- var path = moneroAccountsDir + filename;
+ var path = accountsDir + filename;
else
var path = directory + filename + "/" + filename;
diff --git a/main.qml b/main.qml
index 4d49e8a9..21e687c5 100644
--- a/main.qml
+++ b/main.qml
@@ -57,6 +57,7 @@ ApplicationWindow {
property bool hideBalanceForced: false
property bool ctrlPressed: false
property alias persistentSettings : persistentSettings
+ property string accountsDir: !persistentSettings.portable ? moneroAccountsDir : persistentSettings.portableFolderName + "/wallets"
property var currentWallet;
property bool disconnected: currentWallet ? currentWallet.disconnected : false
property var transaction;
@@ -257,7 +258,7 @@ ApplicationWindow {
// wallet already opened with wizard, we just need to initialize it
var wallet_path = persistentSettings.wallet_path;
if(isIOS)
- wallet_path = moneroAccountsDir + wallet_path;
+ wallet_path = appWindow.accountsDir + wallet_path;
// console.log("opening wallet at: ", wallet_path, "with password: ", appWindow.walletPassword);
console.log("opening wallet at: ", wallet_path, ", network type: ", persistentSettings.nettype == NetworkType.MAINNET ? "mainnet" : persistentSettings.nettype == NetworkType.TESTNET ? "testnet" : "stagenet");
@@ -776,7 +777,7 @@ ApplicationWindow {
function walletsFound() {
if (persistentSettings.wallet_path.length > 0) {
if(isIOS)
- return walletManager.walletExists(moneroAccountsDir + persistentSettings.wallet_path);
+ return walletManager.walletExists(appWindow.accountsDir + persistentSettings.wallet_path);
else
return walletManager.walletExists(persistentSettings.wallet_path);
}
@@ -891,7 +892,7 @@ ApplicationWindow {
FileDialog {
id: saveTxDialog
title: "Please choose a location"
- folder: "file://" +moneroAccountsDir
+ folder: "file://" + appWindow.accountsDir
selectExisting: false;
onAccepted: {
diff --git a/pages/History.qml b/pages/History.qml
index 9422593f..7869c013 100644
--- a/pages/History.qml
+++ b/pages/History.qml
@@ -1692,7 +1692,7 @@ Rectangle {
informationPopup.open();
}
Component.onCompleted: {
- var _folder = 'file://' + moneroAccountsDir;
+ var _folder = 'file://' + appWindow.accountsDir;
try {
_folder = 'file://' + desktopFolder;
}
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index dc344069..c3ebeff3 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -621,7 +621,7 @@ Rectangle {
FileDialog {
id: signTxDialog
title: qsTr("Please choose a file") + translationManager.emptyString
- folder: "file://" +moneroAccountsDir
+ folder: "file://" + appWindow.accountsDir
nameFilters: [ "Unsigned transfers (*)"]
onAccepted: {
@@ -682,7 +682,7 @@ Rectangle {
FileDialog {
id: submitTxDialog
title: qsTr("Please choose a file") + translationManager.emptyString
- folder: "file://" +moneroAccountsDir
+ folder: "file://" + appWindow.accountsDir
nameFilters: [ "signed transfers (*)"]
onAccepted: {
diff --git a/pages/settings/SettingsInfo.qml b/pages/settings/SettingsInfo.qml
index 703e4b6b..310243a6 100644
--- a/pages/settings/SettingsInfo.qml
+++ b/pages/settings/SettingsInfo.qml
@@ -135,7 +135,7 @@ Rectangle {
Layout.fillWidth: true
color: MoneroComponents.Style.dimmedFontColor
font.pixelSize: 14
- property string walletPath: (isIOS ? moneroAccountsDir : "") + persistentSettings.wallet_path
+ property string walletPath: (isIOS ? appWindow.accountsDir : "") + persistentSettings.wallet_path
text: "\
<style type='text/css'>\
a {cursor:pointer;text-decoration: none; color: #FF6C3C}\
diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml
index b38d079f..e39a29de 100644
--- a/wizard/WizardController.qml
+++ b/wizard/WizardController.qml
@@ -308,7 +308,7 @@ Rectangle {
FileDialog {
id: fileDialog
title: qsTr("Please choose a file") + translationManager.emptyString
- folder: "file://" + moneroAccountsDir
+ folder: "file://" + appWindow.accountsDir
nameFilters: [ "Wallet files (*.keys)"]
sidebarVisible: false
@@ -382,7 +382,7 @@ Rectangle {
};
if (isIOS) {
- new_wallet_filename = moneroAccountsDir + new_wallet_filename;
+ new_wallet_filename = appWindow.accountsDir + new_wallet_filename;
}
console.log("saving new wallet to", new_wallet_filename);
wizardController.m_wallet.storeAsync(handler, new_wallet_filename);
@@ -540,7 +540,7 @@ Rectangle {
persistentSettings.wallet_path = fn;
if(isIOS)
- persistentSettings.wallet_path = persistentSettings.wallet_path.replace(moneroAccountsDir, "");
+ persistentSettings.wallet_path = persistentSettings.wallet_path.replace(appWindow.accountsDir, "");
appWindow.openWallet();
}
diff --git a/wizard/WizardOpenWallet1.qml b/wizard/WizardOpenWallet1.qml
index 85bc48d7..778542e8 100644
--- a/wizard/WizardOpenWallet1.qml
+++ b/wizard/WizardOpenWallet1.qml
@@ -294,7 +294,7 @@ Rectangle {
function onPageCompleted(previousView){
if(previousView.viewName == "wizardHome"){
- walletKeysFilesModel.refresh(moneroAccountsDir);
+ walletKeysFilesModel.refresh(appWindow.accountsDir);
wizardOpenWallet1.walletCount = walletKeysFilesModel.rowCount();
flow._height = flow.calcHeight();
}
diff --git a/wizard/WizardWalletInput.qml b/wizard/WizardWalletInput.qml
index 261f4b37..5b2f3b69 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 = appWindow.accountsDir;
walletName.text = defaultAccountName;
}
@@ -66,7 +66,7 @@ GridLayout {
function verify(){
if(walletLocation === "" || /[\\\/]/.test(walletName.text)) return false;
- var exists = Wizard.walletPathExists(walletLocation.text, walletName.text, isIOS, walletManager);
+ var exists = Wizard.walletPathExists(appWindow.accountsDir, walletLocation.text, walletName.text, isIOS, walletManager);
return !exists && walletLocation.error === false;
}
@@ -88,7 +88,7 @@ GridLayout {
labelFontSize: 14
placeholderText: "..."
placeholderFontSize: 16
- text: moneroAccountsDir + "/"
+ text: appWindow.accountsDir + "/"
inlineButton.small: true
inlineButtonText: qsTr("Browse") + translationManager.emptyString
inlineButton.onClicked: {
generated by cgit v1.2.3 (git 2.51.0) at 2026-08-16 03:02:03 +0000