monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-03 17:39:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3544

Browse source 
f75a244 Wizard: set unused wallet name (selsta)
This commit is contained in:
luigi1111 2021-07-06 11:43:09 -04:00
commit 0b0bc87184
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
js/Wizard.js
View file

@ -82,6 +82,17 @@ function walletPathExists(accountsDir, directory, filename, isIOS, walletManager
return false; return false;
} }
function unusedWalletName(directory, filename, walletManager) {
for (var i = 0; i < 100; i++) {
var walletName = filename + (i > 0 ? "_" + i : "");
if (!walletManager.walletExists(directory + "/" + walletName + "/" + walletName)) {
return walletName;
}
}
return filename;
}
function isAscii(str){ function isAscii(str){
for (var i = 0; i < str.length; i++) { for (var i = 0; i < str.length; i++) {
if (str.charCodeAt(i) > 127) if (str.charCodeAt(i) > 127)

2
wizard/WizardWalletInput.qml
View file

@ -57,7 +57,7 @@ GridLayout {
walletName.error = !walletName.verify(); walletName.error = !walletName.verify();
walletLocation.error = walletLocation.text === ""; walletLocation.error = walletLocation.text === "";
walletLocation.text = appWindow.accountsDir; walletLocation.text = appWindow.accountsDir;
walletName.text = defaultAccountName; walletName.text = Wizard.unusedWalletName(appWindow.accountsDir, defaultAccountName, walletManager);
} }
MoneroComponents.LineEdit { MoneroComponents.LineEdit {