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

Cleanup after rebase

Browse Source
This commit is contained in:
Sander Ferdinand
2018-03-27 02:03:59 +02:00
committed by moneromooo-monero
parent 3d4eb7a5f5
commit 3c24044736
10 changed files with 44 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/DatePicker.qml
View File

@@ -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

44
components/HistoryTable.qml
View File

@@ -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');
}

2
components/InputMulti.qml
View File

@@ -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;

1
components/NetworkStatusItem.qml
View File

@@ -79,7 +79,6 @@ Rectangle {
return "../images/lightning-white.png"
}
}
//getConnectionStatusImage(item.connected)
}
}