Public/monero-gui
1
0
Fork 1
mirror of https://github.com/monero-project/monero-gui.git synced 2026-04-07 19:47:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3025

Browse Source 
f5c5df7 main: accountsDir runtime configuration support (xiphon)
This commit is contained in:
luigi1111
2020-10-04 17:38:14 -05:00
parent adb04cef71 f5c5df7b67
commit cdfe9f338f
8 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main.qml
View File

@@ -61,6 +61,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;
@@ -261,7 +262,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");
@@ -801,7 +802,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);
}
@@ -916,7 +917,7 @@ ApplicationWindow {
FileDialog {
id: saveTxDialog
title: "Please choose a location"
folder: "file://" +moneroAccountsDir
folder: "file://" + appWindow.accountsDir
selectExisting: false;
onAccepted: {