Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages 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

6
wizard/WizardController.qml
View File

@@ -307,7 +307,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
@@ -381,7 +381,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);
@@ -539,7 +539,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();
}

2
wizard/WizardOpenWallet1.qml
View File

@@ -299,7 +299,7 @@ Rectangle {
function onPageCompleted(previousView){
if(previousView.viewName == "wizardHome"){
walletKeysFilesModel.refresh(moneroAccountsDir);
walletKeysFilesModel.refresh(appWindow.accountsDir);
wizardOpenWallet1.walletCount = walletKeysFilesModel.rowCount();
flow._height = flow.calcHeight();
}

6
wizard/WizardWalletInput.qml
View File

@@ -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: {