diff options
| author | Sander Ferdinand <sa.ferdinand@gmail.com> | 2018-03-27 02:03:59 +0200 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-03-29 23:04:04 +0100 |
| commit | 3c2404473672991b51cbe6ec6d2d9326e9f85ca8 (patch) | |
| tree | c8c97c8835195bf77be93da24f84f5c3b3e7ce2d /components | |
| parent | 3d4eb7a5f5f63e52592faeff77cb76838a5add5e (diff) | |
| download | monzero-gui-3c2404473672991b51cbe6ec6d2d9326e9f85ca8.tar.gz monzero-gui-3c2404473672991b51cbe6ec6d2d9326e9f85ca8.tar.xz monzero-gui-3c2404473672991b51cbe6ec6d2d9326e9f85ca8.zip | |
Cleanup after rebase
Diffstat (limited to 'components')
| -rw-r--r-- | components/DatePicker.qml | 2 | ||||
| -rw-r--r-- | components/HistoryTable.qml | 44 | ||||
| -rw-r--r-- | components/InputMulti.qml | 2 | ||||
| -rw-r--r-- | components/NetworkStatusItem.qml | 1 |
4 files changed, 16 insertions, 33 deletions
diff --git a/components/DatePicker.qml b/components/DatePicker.qml index 45d21406..5d3c44bd 100644 --- a/components/DatePicker.qml +++ b/components/DatePicker.qml @@ -288,7 +288,7 @@ Item { gridVisible: false background: Rectangle { color: "transparent" } dayDelegate: Item { - z: 8 + z: parent.z + 1 implicitHeight: implicitWidth implicitWidth: calendar.width / 7 diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml index e5abbc65..bcb869f2 100644 --- a/components/HistoryTable.qml +++ b/components/HistoryTable.qml @@ -163,30 +163,6 @@ ListView { color: "#808080" } -// // -- "BlockHeight" value -// TextEdit { -// readOnly: true -// selectByMouse: true -// width: 85 -// anchors.bottom: parent.bottom -// //elide: Text.ElideRight -// font.family: "Arial" -// font.pixelSize: 13 -// color: (confirmations < confirmationsRequired)? "#FF6C3C" : "#545454" -// text: { -// if (!isPending) -// if(confirmations < confirmationsRequired) -// return blockHeight + " " + qsTr("(%1/%2 confirmations)").arg(confirmations).arg(confirmationsRequired) -// else -// return blockHeight -// if (!isOut) -// return qsTr("UNCONFIRMED") + translationManager.emptyString -// if (isFailed) -// return qsTr("FAILED") + translationManager.emptyString -// return qsTr("PENDING") + translationManager.emptyString -// } -// } - Text { id: amountLabel anchors.left: arrowImage.right @@ -375,12 +351,20 @@ ListView { HistoryTableInnerColumn{ anchors.left: parent.left anchors.leftMargin: 30 * scaleRatio - labelHeader: qsTr("Payment ID") - labelValue: paymentId !== "" && !paymentId.startsWith("00000000") ? paymentId.substring(0, 32) + "..." : "-" - copyValue: { - if(paymentId !== "") { return paymentId } - else { return undefined } + labelHeader: qsTr("Blockheight") + labelValue: { + if (!isPending) + if(confirmations < confirmationsRequired) + return blockHeight + " " + qsTr("(%1/%2 confirmations)").arg(confirmations).arg(confirmationsRequired); + else + return blockHeight; + if (!isOut) + return qsTr("UNCONFIRMED") + translationManager.emptyString + if (isFailed) + return qsTr("FAILED") + translationManager.emptyString + return qsTr("PENDING") + translationManager.emptyString } + copyValue: labelValue } // right column @@ -433,7 +417,7 @@ ListView { return; } - var checked = (TxUtils.checkTxID(hash) && TxUtils.checkAddress(address, appWindow.persistentSettings.testnet)); + var checked = (TxUtils.checkTxID(hash) && TxUtils.checkAddress(address, appWindow.persistentSettings.nettype)); if(!checked){ console.log('getProof: Error checking TxId and/or address'); } diff --git a/components/InputMulti.qml b/components/InputMulti.qml index 9917eb52..3b860fdf 100644 --- a/components/InputMulti.qml +++ b/components/InputMulti.qml @@ -59,7 +59,7 @@ 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); + var address_ok = TxUtils.checkAddress(textArea.text, appWindow.persistentSettings.nettype); if(!address_ok) error = true; else error = false; TextArea.cursorPosition = textArea.text.length; diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml index 39ca8f0d..f1916457 100644 --- a/components/NetworkStatusItem.qml +++ b/components/NetworkStatusItem.qml @@ -79,7 +79,6 @@ Rectangle { return "../images/lightning-white.png" } } - //getConnectionStatusImage(item.connected) } } |