aboutsummaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorSander Ferdinand <sa.ferdinand@gmail.com>2018-03-21 23:56:53 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-03-29 23:04:03 +0100
commit6e794e3c50a5063d79cfe47a69d36d8005568921 (patch)
treebb3f5aa0e64c54d3e17487a854a5bf5d8619a165 /components
parent7c0f704fbd9db39c0ae88349212cf19389b4f07e (diff)
downloadmonzero-gui-6e794e3c50a5063d79cfe47a69d36d8005568921.tar.gz
monzero-gui-6e794e3c50a5063d79cfe47a69d36d8005568921.tar.xz
monzero-gui-6e794e3c50a5063d79cfe47a69d36d8005568921.zip
Redoing the Sign/Verify page
Diffstat (limited to 'components')
-rw-r--r--components/InputMulti.qml5
-rw-r--r--components/LineEditMulti.qml2
-rw-r--r--components/SubaddressTable.qml1
3 files changed, 7 insertions, 1 deletions
diff --git a/components/InputMulti.qml b/components/InputMulti.qml
index f809ca10..9c74d0c1 100644
--- a/components/InputMulti.qml
+++ b/components/InputMulti.qml
@@ -29,6 +29,7 @@
import QtQuick.Controls 2.2
import QtQuick 2.10
+import "../js/TxUtils.js" as TxUtils
import "." 1.0
@@ -37,6 +38,7 @@ TextArea {
property bool addressValidation: false
property bool wrapAnywhere: true
property int fontSize: 18 * scaleRatio
+
id: textArea
font.family: Style.fontRegular
font.pixelSize: fontSize
@@ -56,6 +58,9 @@ TextArea {
if(addressValidation){
// js replacement for `RegExpValidator { regExp: /[0-9A-Fa-f]{95}/g }`
textArea.text = textArea.text.replace(/[^a-z0-9]/gi,'');
+ var address_ok = TxUtils.checkAddress(textArea.text, appWindow.persistentSettings.testnet);
+ if(!address_ok) error = true;
+ else error = false;
TextArea.cursorPosition = textArea.text.length;
}
}
diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml
index dd5199d4..758755d0 100644
--- a/components/LineEditMulti.qml
+++ b/components/LineEditMulti.qml
@@ -35,7 +35,7 @@ ColumnLayout {
id: lineditmulti
property alias text: multiLine.text
property alias placeholderText: placeholderLabel.text
- property alias inputLabelText: inputLabel.text
+ property alias labelText: inputLabel.text
property alias error: multiLine.error
property alias readOnly: multiLine.readOnly
property alias addressValidation: multiLine.addressValidation
diff --git a/components/SubaddressTable.qml b/components/SubaddressTable.qml
index c35ef96e..88856ad3 100644
--- a/components/SubaddressTable.qml
+++ b/components/SubaddressTable.qml
@@ -65,6 +65,7 @@ ListView {
showingHeader: false
showBorder: false
+ addressValidation: false
}
IconButton {