Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Password strength level updated

Browse Source
This commit is contained in:
Ilya Kitaev
2016-02-06 19:19:54 +03:00
parent 1571118e7b
commit 1364c2b498
5 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
wizard/WizardMain.qml
View File

@@ -34,9 +34,13 @@ Rectangle {
property alias nextButton : nextButton
property var settings : ({})
property int currentPage: 0
property var pages: [welcomePage, optionsPage, createWalletPage, recoveryWalletPage,
passwordPage,/*configurePage,*/ donationPage, finishPage ]
property string path;
property var paths: {
"create_wallet" : [welcomePage, optionsPage, createWalletPage, passwordPage, donationPage, finishPage ],
"recovery_wallet" : [welcomePage, optionsPage, recoveryWalletPage, passwordPage, donationPage, finishPage ]
}
property string currentPath: "create_wallet"
property var pages: paths[currentPath]
signal useMoneroClicked()
border.color: "#DBDBDB"
@@ -51,20 +55,8 @@ Rectangle {
print ("switchpage: start: currentPage: ", currentPage);
if (currentPage > 0 || currentPage < pages.length - 1) {
pages[currentPage].opacity = 0
var step_value = next ? 1 : -1
// special case - we stepping backward from password page:
// previous page "createWallet" or "recoveryWallet"
if (!next) {
print ("stepping back: current page: ", currentPage);
if ((pages[currentPage] === passwordPage && path === "create_walled")
|| (pages[currentPage] === recoveryWalletPage) ) {
step_value *= 2;
}
}
currentPage += step_value
pages[currentPage].opacity = 1;
handlePageChanged();
@@ -73,25 +65,38 @@ Rectangle {
}
function handlePageChanged() {
// disable "next" button until passwords match
if (pages[currentPage] === passwordPage) {
switch (pages[currentPage]) {
case passwordPage:
// disable "next" button until passwords match
nextButton.enabled = passwordPage.passwordValid;
} else if (pages[currentPage] === finishPage) {
if (currentPath === "create_wallet") {
passwordPage.titleText = qsTr("Now that your wallet has been created, please set a password for the wallet")
} else {
passwordPage.titleText = qsTr("Now that your wallet has been restored, please set a password for the wallet")
}
break;
case finishPage:
// display settings summary
finishPage.updateSettingsSummary();
nextButton.visible = false
} else {
var enableButton = pages[currentPage] !== optionsPage;
nextButton.visible = nextButton.enabled = enableButton
print ("nextButtonVisible: ", enableButton)
nextButton.visible = false;
break;
case recoveryWalletPage:
// TODO: disable "next button" until 25 words private key entered
// nextButton.enabled = false;
break
default:
var nextButtonVisible = pages[currentPage] !== optionsPage;
//nextButton.visible = nextButton.enabled = nextButtonVisible;
}
}
function openCreateWalletPage() {
print ("show create wallet page");
pages[currentPage].opacity = 0;
createWalletPage.opacity = 1
path = "create_wallet";
currentPath = "create_wallet"
pages = paths[currentPath]
currentPage = pages.indexOf(createWalletPage)
handlePageChanged()
}
@@ -100,7 +105,8 @@ Rectangle {
print ("show recovery wallet page");
pages[currentPage].opacity = 0
recoveryWalletPage.opacity = 1
path = "recovery_wallet"
currentPath = "recovery_wallet"
pages = paths[currentPath]
currentPage = pages.indexOf(recoveryWalletPage)
handlePageChanged()
}
@@ -134,8 +140,6 @@ Rectangle {
}
WizardWelcome {
id: welcomePage
anchors.top: parent.top
@@ -246,7 +250,7 @@ Rectangle {
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
visible: parent.pages[currentPage] === finishPage
visible: parent.paths[currentPath][currentPage] === finishPage
onClicked: wizard.useMoneroClicked()
}
}