github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2024-12-22 03:15:52 +01:00
Code Releases Activity

Selection (branching) for recovery path

Browse Source
This commit is contained in:
Ilya Kitaev 2016-02-03 00:09:45 +03:00
parent bbc35ff484
commit fce88a8120
8 changed files with 442 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
monero-core.pro
View File

@ -52,3 +52,6 @@ QML_IMPORT_PATH =
# Default rules for deployment.
include(deployment.pri)
DISTFILES += \
wizard/WizardManageWalletUI.qml

2
qml.qrc
View File

@ -107,5 +107,7 @@
<file>lang/flags/russia.png</file>
<file>lang/flags/uk.png</file>
<file>lang/flags/usa.png</file>
<file>wizard/WizardManageWalletUI.qml</file>
<file>wizard/WizardRecoveryWallet.qml</file>
</qresource>
</RCC>

242
wizard/WizardCreateWallet.qml
View File

@ -33,6 +33,7 @@ import QtQuick.Dialogs 1.2
Item {
opacity: 0
visible: false
Behavior on opacity {
NumberAnimation { duration: 100; easing.type: Easing.InQuad }
}
@ -40,241 +41,14 @@ Item {
onOpacityChanged: visible = opacity !== 0
function saveSettings(settingsObject) {
settingsObject['account_name'] = accountName.text
settingsObject['words'] = wordsText.text
settingsObject['wallet_path'] = fileUrlInput.text
settingsObject['account_name'] = uiItem.accountNameText
settingsObject['words'] = uiItem.wordsTexttext
settingsObject['wallet_path'] = uiItem.walletPath
}
Row {
id: dotsRow
anchors.top: parent.top
anchors.right: parent.right
anchors.topMargin: 85
spacing: 6
ListModel {
id: dotsModel
ListElement { dotColor: "#FFE00A" }
ListElement { dotColor: "#DBDBDB" }
ListElement { dotColor: "#DBDBDB" }
ListElement { dotColor: "#DBDBDB" }
}
Repeater {
model: dotsModel
delegate: Rectangle {
width: 12; height: 12
radius: 6
color: dotColor
}
}
}
Column {
id: headerColumn
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 16
anchors.rightMargin: 16
anchors.top: parent.top
anchors.topMargin: 74
spacing: 24
Text {
anchors.left: parent.left
width: headerColumn.width - dotsRow.width - 16
font.family: "Arial"
font.pixelSize: 28
wrapMode: Text.Wrap
//renderType: Text.NativeRendering
color: "#3F3F3F"
text: qsTr("A new wallet has been created for you")
}
Text {
anchors.left: parent.left
anchors.right: parent.right
font.family: "Arial"
font.pixelSize: 18
wrapMode: Text.Wrap
//renderType: Text.NativeRendering
color: "#4A4646"
text: qsTr("This is the name of your wallet. You can change it to a different name if you’d like:")
}
}
Item {
id: walletNameItem
anchors.top: headerColumn.bottom
anchors.horizontalCenter: parent.horizontalCenter
anchors.topMargin: 24
width: 300
height: 62
TextInput {
id: accountName
anchors.fill: parent
horizontalAlignment: TextInput.AlignHCenter
verticalAlignment: TextInput.AlignVCenter
font.family: "Arial"
font.pixelSize: 32
renderType: Text.NativeRendering
color: "#FF6C3C"
text: qsTr("My account name")
focus: true
}
Rectangle {
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
height: 1
color: "#DBDBDB"
}
}
Text {
id: frameHeader
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 16
anchors.rightMargin: 16
anchors.top: walletNameItem.bottom
anchors.topMargin: 24
font.family: "Arial"
font.pixelSize: 18
//renderType: Text.NativeRendering
color: "#4A4646"
elide: Text.ElideRight
text: qsTr("This is the 24 word mnemonic for your wallet")
}
Rectangle {
id: wordsRect
anchors.left: parent.left
anchors.right: parent.right
anchors.top: frameHeader.bottom
anchors.topMargin: 16
height: 182
border.width: 1
border.color: "#DBDBDB"
TextEdit {
id: wordsText
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: tipRect.top
anchors.margins: 16
font.family: "Arial"
font.pixelSize: 24
wrapMode: Text.Wrap
selectByMouse: true
readOnly: true
color: "#3F3F3F"
text: "bound class paint gasp task soul forgot past pleasure physical circle appear shore bathroom glove women crap busy beauty bliss idea give needle burden"
}
Image {
anchors.right: parent.right
anchors.bottom: tipRect.top
source: "qrc:///images/greyTriangle.png"
Image {
anchors.centerIn: parent
source: "qrc:///images/copyToClipboard.png"
}
Clipboard { id: clipboard }
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: clipboard.setText(wordsText.text)
}
}
Rectangle {
id: tipRect
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
height: 65
color: "#DBDBDB"
Text {
anchors.fill: parent
anchors.margins: 16
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
font.family: "Arial"
font.pixelSize: 15
color: "#4A4646"
wrapMode: Text.Wrap
text: qsTr("It is very important to write it down as this is the only backup you will need for your wallet. You will be asked to confirm the seed in the next screen to ensure it has copied down correctly.")
}
}
}
Row {
anchors.left: parent.left
anchors.right: parent.right
anchors.top: wordsRect.bottom
anchors.topMargin: 24
spacing: 16
Text {
anchors.verticalCenter: parent.verticalCenter
font.family: "Arial"
font.pixelSize: 18
//renderType: Text.NativeRendering
color: "#4A4646"
text: qsTr("Your wallet is stored in")
}
Item {
anchors.verticalCenter: parent.verticalCenter
width: parent.width - x
height: 34
FileDialog {
id: fileDialog
selectMultiple: false
title: "Please choose a file"
onAccepted: {
fileUrlInput.text = fileDialog.fileUrl
fileDialog.visible = false
}
onRejected: {
fileDialog.visible = false
}
}
TextInput {
id: fileUrlInput
anchors.fill: parent
anchors.leftMargin: 5
anchors.rightMargin: 5
clip: true
font.family: "Arial"
font.pixelSize: 18
color: "#6B0072"
verticalAlignment: Text.AlignVCenter
selectByMouse: true
text: "~/.monero/mywallet/"
onFocusChanged: {
if(focus) {
fileDialog.visible = true
}
}
}
Rectangle {
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
height: 1
color: "#DBDBDB"
}
}
WizardManageWalletUI {
id: uiItem
titleText: qsTr("A new wallet has been created for you")
wordsTextTitle: qsTr("This is the 24 word mnemonic for your wallet")
}
}

75
wizard/WizardMain.qml
View File

@ -34,7 +34,9 @@ Rectangle {
property alias nextButton : nextButton
property var settings : ({})
property int currentPage: 0
property var pages: [welcomePage, optionsPage, createWalletPage, passwordPage, /*configurePage,*/ donationPage, finishPage ]
property var pages: [welcomePage, optionsPage, createWalletPage, recoveryWalletPage,
passwordPage,/*configurePage,*/ donationPage, finishPage ]
property string path;
signal useMoneroClicked()
border.color: "#DBDBDB"
@ -42,24 +44,35 @@ Rectangle {
color: "#FFFFFF"
function switchPage(next) {
// save settings for current page;
if (typeof pages[currentPage].saveSettings !== 'undefined') {
pages[currentPage].saveSettings(settings);
}
print ("switchpage: start: currentPage: ", currentPage);
if(next === false) {
if(currentPage > 0) {
pages[currentPage].opacity = 0
pages[--currentPage].opacity = 1
}
} else {
if(currentPage < pages.length - 1) {
pages[currentPage].opacity = 0
pages[++currentPage].opacity = 1
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();
}
}
function handlePageChanged() {
// disable "next" button until passwords match
if (pages[currentPage] === passwordPage) {
nextButton.enabled = passwordPage.passwordValid;
@ -68,11 +81,32 @@ Rectangle {
finishPage.updateSettingsSummary();
nextButton.visible = false
} else {
nextButton.visible = true
nextButton.enabled = true
var enableButton = pages[currentPage] !== optionsPage;
nextButton.visible = nextButton.enabled = enableButton
print ("nextButtonVisible: ", enableButton)
}
}
function openCreateWalletPage() {
print ("show create wallet page");
pages[currentPage].opacity = 0;
createWalletPage.opacity = 1
path = "create_wallet";
currentPage = pages.indexOf(createWalletPage)
handlePageChanged()
}
function openRecoveryWalletPage() {
print ("show recovery wallet page");
pages[currentPage].opacity = 0
recoveryWalletPage.opacity = 1
path = "recovery_wallet"
currentPage = pages.indexOf(recoveryWalletPage)
handlePageChanged()
}
Rectangle {
id: nextButton
@ -120,7 +154,8 @@ Rectangle {
anchors.left: prevButton.right
anchors.leftMargin: 50
anchors.rightMargin: 50
onCreateWalletClicked: wizard.switchPage(true)
onCreateWalletClicked: wizard.openCreateWalletPage()
onRecoveryWalletClicked: wizard.openRecoveryWalletPage()
}
WizardCreateWallet {
@ -133,6 +168,18 @@ Rectangle {
anchors.rightMargin: 50
}
WizardRecoveryWallet {
id: recoveryWalletPage
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: nextButton.left
anchors.left: prevButton.right
anchors.leftMargin: 50
anchors.rightMargin: 50
}
WizardPassword {
id: passwordPage
anchors.top: parent.top

284
wizard/WizardManageWalletUI.qml Normal file
View File

@ -0,0 +1,284 @@
// Copyright (c) 2014-2015, The Monero Project
//
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
// permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice, this list of
// conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
// of conditions and the following disclaimer in the documentation and/or other
// materials provided with the distribution.
//
// 3. Neither the name of the copyright holder nor the names of its contributors may be
// used to endorse or promote products derived from this software without specific
// prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick 2.2
import moneroComponents 1.0
import QtQuick.Dialogs 1.2
// Reusable component for managing wallet (account name, path, private key)
Item {
property alias titleText: titleText.text
property alias accountNameText: accountName.text
property alias wordsTextTitle: frameHeader.text
property alias wordsText: wordsText.text
property alias wordsTextTip: tipRect
property alias walletPath: fileUrlInput.text
// TODO extend properties if needed
anchors.fill: parent
Row {
id: dotsRow
anchors.top: parent.top
anchors.right: parent.right
anchors.topMargin: 85
spacing: 6
ListModel {
id: dotsModel
ListElement { dotColor: "#FFE00A" }
ListElement { dotColor: "#DBDBDB" }
ListElement { dotColor: "#DBDBDB" }
ListElement { dotColor: "#DBDBDB" }
}
Repeater {
model: dotsModel
delegate: Rectangle {
width: 12; height: 12
radius: 6
color: dotColor
}
}
}
Column {
id: headerColumn
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 16
anchors.rightMargin: 16
anchors.top: parent.top
anchors.topMargin: 74
spacing: 24
Text {
id: titleText
anchors.left: parent.left
width: headerColumn.width - dotsRow.width - 16
font.family: "Arial"
font.pixelSize: 28
wrapMode: Text.Wrap
//renderType: Text.NativeRendering
color: "#3F3F3F"
}
Text {
anchors.left: parent.left
anchors.right: parent.right
font.family: "Arial"
font.pixelSize: 18
wrapMode: Text.Wrap
//renderType: Text.NativeRendering
color: "#4A4646"
text: qsTr("This is the name of your wallet. You can change it to a different name if you’d like:")
}
}
Item {
id: walletNameItem
anchors.top: headerColumn.bottom
anchors.horizontalCenter: parent.horizontalCenter
anchors.topMargin: 24
width: 300
height: 62
TextInput {
id: accountName
anchors.fill: parent
horizontalAlignment: TextInput.AlignHCenter
verticalAlignment: TextInput.AlignVCenter
font.family: "Arial"
font.pixelSize: 32
renderType: Text.NativeRendering
color: "#FF6C3C"
focus: true
text: qsTr("My account name")
}
Rectangle {
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
height: 1
color: "#DBDBDB"
}
}
Text {
id: frameHeader
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 16
anchors.rightMargin: 16
anchors.top: walletNameItem.bottom
anchors.topMargin: 24
font.family: "Arial"
font.pixelSize: 24
font.bold: true
//renderType: Text.NativeRendering
color: "#4A4646"
elide: Text.ElideRight
}
Rectangle {
id: wordsRect
anchors.left: parent.left
anchors.right: parent.right
anchors.top: frameHeader.bottom
anchors.topMargin: 16
height: 182
border.width: 1
border.color: "#DBDBDB"
TextEdit {
id: wordsText
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: tipRect.top
anchors.margins: 16
font.family: "Arial"
font.pixelSize: 24
wrapMode: Text.Wrap
selectByMouse: true
readOnly: true
color: "#3F3F3F"
text: "bound class paint gasp task soul forgot past pleasure physical circle appear shore bathroom glove women crap busy beauty bliss idea give needle burden"
}
Image {
anchors.right: parent.right
anchors.bottom: tipRect.top
source: "qrc:///images/greyTriangle.png"
Image {
anchors.centerIn: parent
source: "qrc:///images/copyToClipboard.png"
}
Clipboard { id: clipboard }
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: clipboard.setText(wordsText.text)
}
}
Rectangle {
id: tipRect
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
height: 65
color: "#DBDBDB"
property alias text: wordsTipText.text
Text {
id: wordsTipText
anchors.fill: parent
anchors.margins: 16
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
font.family: "Arial"
font.pixelSize: 15
color: "#4A4646"
wrapMode: Text.Wrap
text: qsTr("It is very important to write it down as this is the only backup you will need for your wallet. You will be asked to confirm the seed in the next screen to ensure it has copied down correctly.")
}
}
}
Row {
anchors.left: parent.left
anchors.right: parent.right
anchors.top: wordsRect.bottom
anchors.topMargin: 24
spacing: 16
Text {
anchors.verticalCenter: parent.verticalCenter
font.family: "Arial"
font.pixelSize: 18
//renderType: Text.NativeRendering
color: "#4A4646"
text: qsTr("Your wallet is stored in")
}
Item {
anchors.verticalCenter: parent.verticalCenter
width: parent.width - x
height: 34
FileDialog {
id: fileDialog
selectMultiple: false
title: "Please choose a file"
onAccepted: {
fileUrlInput.text = fileDialog.fileUrl
fileDialog.visible = false
}
onRejected: {
fileDialog.visible = false
}
}
TextInput {
id: fileUrlInput
anchors.fill: parent
anchors.leftMargin: 5
anchors.rightMargin: 5
clip: true
font.family: "Arial"
font.pixelSize: 18
color: "#6B0072"
verticalAlignment: Text.AlignVCenter
selectByMouse: true
text: "~/.monero/mywallet/"
onFocusChanged: {
if(focus) {
fileDialog.visible = true
}
}
}
Rectangle {
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
height: 1
color: "#DBDBDB"
}
}
}
}

2
wizard/WizardOptions.qml
View File

@ -31,6 +31,7 @@ import QtQuick 2.2
Item {
id: page
signal createWalletClicked()
signal recoveryWalletClicked()
opacity: 0
visible: false
Behavior on opacity {
@ -126,6 +127,7 @@ Item {
id: recoverWalletArea
anchors.fill: parent
hoverEnabled: true
onClicked: page.recoveryWalletClicked()
}
}

28
wizard/WizardPasswordInput.qml
View File

@ -1,4 +1,30 @@
// WizardPasswordInput.qml
// Copyright (c) 2014-2015, The Monero Project
//
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
// permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice, this list of
// conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
// of conditions and the following disclaimer in the documentation and/or other
// materials provided with the distribution.
//
// 3. Neither the name of the copyright holder nor the names of its contributors may be
// used to endorse or promote products derived from this software without specific
// prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick 2.0

55
wizard/WizardRecoveryWallet.qml Normal file
View File

@ -0,0 +1,55 @@
// Copyright (c) 2014-2015, The Monero Project
//
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
// permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice, this list of
// conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
// of conditions and the following disclaimer in the documentation and/or other
// materials provided with the distribution.
//
// 3. Neither the name of the copyright holder nor the names of its contributors may be
// used to endorse or promote products derived from this software without specific
// prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick 2.2
import moneroComponents 1.0
import QtQuick.Dialogs 1.2
Item {
opacity: 0
visible: false
Behavior on opacity {
NumberAnimation { duration: 100; easing.type: Easing.InQuad }
}
onOpacityChanged: visible = opacity !== 0
function saveSettings(settingsObject) {
settingsObject['account_name'] = uiItem.accountNameText
settingsObject['words'] = uiItem.wordsTexttext
settingsObject['wallet_path'] = uiItem.walletPath
}
WizardManageWalletUI {
id: uiItem
accountNameText: qsTr("My account name")
titleText: qsTr("We're ready to recover your account")
wordsTextTitle: qsTr("This is the 25 word mnemonic for your wallet")
}
}