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

Merge pull request #2170

Browse Source 
a3c620f restore height visibility enhancements (mmbyday)
This commit is contained in:
luigi1111 2019-06-21 14:27:26 -05:00
commit edb849fa81
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
4 changed files with 92 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/Utils.js
View File

@ -108,6 +108,10 @@ function epoch(){
return Math.floor((new Date).getTime()/1000);
}
function roundDownToNearestThousand(_num){
return Math.floor(_num/1000.0)*1000
}
function isAlpha(letter){ return letter.match(/^[A-Za-z0-9]+$/) !== null; }
function isLowerCaseChar(letter){ return letter === letter.toLowerCase(); }

30
pages/Keys.qml
View File

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project
// Copyright (c) 2014-2019, The Monero Project
//
// All rights reserved.
//
@ -96,6 +96,34 @@ Rectangle {
}
}
ColumnLayout {
Layout.fillWidth: true
MoneroComponents.Label {
Layout.fillWidth: true
fontSize: 22
Layout.topMargin: 10
text: qsTr("Wallet restore height") + translationManager.emptyString
}
Rectangle {
Layout.fillWidth: true
height: 2
color: MoneroComponents.Style.dividerColor
opacity: MoneroComponents.Style.dividerOpacity
Layout.bottomMargin: 10
}
MoneroComponents.LineEdit {
Layout.fillWidth: true
readOnly: true
copyButton: true
labelText: qsTr("Block #") + translationManager.emptyString
fontSize: 16
text: currentWallet.walletCreationHeight
}
}
ColumnLayout {
Layout.fillWidth: true

2
pages/settings/SettingsInfo.qml
View File

@ -165,7 +165,7 @@ Rectangle {
id: restoreHeight
font.pixelSize: 14
textFormat: Text.RichText
text: (typeof currentWallet == "undefined") ? "" : qsTr("Wallet creation height: ") + translationManager.emptyString
text: (typeof currentWallet == "undefined") ? "" : qsTr("Wallet restore height: ") + translationManager.emptyString
}
MoneroComponents.TextBlock {

58
wizard/WizardCreateWallet1.qml
View File

@ -32,6 +32,7 @@ import QtQuick.Layouts 1.2
import QtQuick.Controls 2.0
import "../js/Wizard.js" as Wizard
import "../js/Utils.js" as Utils
import "../components" as MoneroComponents
Rectangle {
@ -128,6 +129,63 @@ Rectangle {
}
}
ColumnLayout {
spacing: 0
Layout.topMargin: 10
Layout.fillWidth: true
MoneroComponents.LineEditMulti {
id: restoreHeight
spacing: 0
inputPaddingLeft: 16
inputPaddingRight: 16
inputPaddingTop: 20
inputPaddingBottom: 20
inputRadius: 0
fontSize: 18
fontBold: true
wrapMode: Text.WordWrap
labelText: qsTr("Wallet restore height") + translationManager.emptyString
labelFontSize: 14
copyButton: false
readOnly: true
text: Utils.roundDownToNearestThousand(wizardController.m_wallet.walletCreationHeight)
}
MoneroComponents.WarningBox {
Rectangle {
anchors.left: parent.left
anchors.top: parent.top
anchors.bottom: parent.bottom
width: 1
color: MoneroComponents.Style.inputBorderColorInActive
}
Rectangle {
anchors.right: parent.right
anchors.left: parent.left
anchors.bottom: parent.bottom
height: 1
color: MoneroComponents.Style.inputBorderColorInActive
}
Rectangle {
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
width: 1
color: MoneroComponents.Style.inputBorderColorInActive
}
radius: 0
border.color: MoneroComponents.Style.inputBorderColorInActive
border.width: 0
text: qsTr("Should you restore your wallet in the future, specifying this block number will recover your wallet quicker.") + translationManager.emptyString
}
}
WizardNav {
progressSteps: 4
progress: 1