Public/monero-gui
1
0
Fork 1
mirror of https://github.com/monero-project/monero-gui.git synced 2026-04-13 05:37:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Windows: don't allow non-ascii characters in path

Browse Source
This commit is contained in:
Jaquee
2016-11-29 17:14:11 +01:00
parent 1a610db431
commit abd5c685af
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
wizard/WizardMain.qml
View File

@@ -141,12 +141,30 @@ Rectangle {
return folder_path + "/" + account_name + "/" + account_name
}
function walletExists(path){
if(walletManager.walletExists(path)){
walletExistsErrorDialog.open();
return true;
function walletPathValid(path){
if (walletManager.walletExists(path)) {
walletErrorDialog.text = qsTr("A wallet with same name already exists. Please change wallet name") + translationManager.emptyString;
walletErrorDialog.open();
return false;
}
return false;
// Don't allow non ascii characters in path on windows platforms until supported by Wallet2
if (isWindows) {
if (!isAscii(path)) {
walletErrorDialog.text = qsTr("Non-ASCII characters are not allowed in wallet path or account name") + translationManager.emptyString;
walletErrorDialog.open();
return false;
}
}
return true;
}
function isAscii(str){
for (var i = 0; i < str.length; i++) {
if (str.charCodeAt(i) > 127)
return false;
}
return true;
}
//! actually writes the wallet
@@ -197,9 +215,8 @@ Rectangle {
}
MessageDialog {
id: walletExistsErrorDialog
id: walletErrorDialog
title: "Error"
text: qsTr("A wallet with same name already exists. Please change wallet name") + translationManager.emptyString
onAccepted: {
}
}