diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-10-11 10:28:09 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-10-11 10:28:09 +0200 |
| commit | 6bbad6c8de9582fd4cdaa4ac65b75795d64cbac9 (patch) | |
| tree | 9560fc990a22d35740250fd4aea9ff9beda8045f /components | |
| parent | 77445ad0d47b39061d9592b32c485afb6a676671 (diff) | |
| parent | f8f94e048b040df819c6db3161a6218ee39da6a0 (diff) | |
| download | monzero-gui-6bbad6c8de9582fd4cdaa4ac65b75795d64cbac9.tar.gz monzero-gui-6bbad6c8de9582fd4cdaa4ac65b75795d64cbac9.tar.xz monzero-gui-6bbad6c8de9582fd4cdaa4ac65b75795d64cbac9.zip | |
Merge pull request #45
f8f94e0 History: display blockheight, sort by blockheight (Ilya Kitaev)
Diffstat (limited to 'components')
| -rw-r--r-- | components/HistoryTable.qml | 80 | ||||
| -rw-r--r-- | components/ProcessingSplash.qml | 5 |
2 files changed, 57 insertions, 28 deletions
diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml index 867fdedf..0230a662 100644 --- a/components/HistoryTable.qml +++ b/components/HistoryTable.qml @@ -119,36 +119,64 @@ ListView { // visible: !descriptionArea.containsMouse } } - // -- "PaymentID" title - Text { - id: paymentLabel - anchors.left: parent.left - anchors.top: row1.bottom - anchors.topMargin: 4 - anchors.leftMargin: 28 - width: 118 - font.family: "Arial" - font.pixelSize: 12 - font.letterSpacing: -1 - color: "#535353" - text: paymentId !== "" ? qsTr("Payment ID:") + translationManager.emptyString : "" - } - // -- "PaymentID" value - Text { - anchors.bottom: paymentLabel.bottom - anchors.left: paymentLabel.right + Row { + // - Payment ID + block height row + id: row2 + anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 12 - anchors.rightMargin: 12 + anchors.top: parent.top + anchors.topMargin: 40 + anchors.leftMargin: 26 - elide: Text.ElideRight - font.family: "Arial" - font.pixelSize: 13 - font.letterSpacing: -1 - color: "#545454" - text: paymentId + // -- "PaymentID" title + Text { + id: paymentLabel + width: 86 + anchors.bottom: parent.bottom + font.family: "Arial" + font.pixelSize: 12 + font.letterSpacing: -1 + color: "#535353" + text: paymentId !== "" ? qsTr("Payment ID:") + translationManager.emptyString : "" + } + // -- "PaymentID" value + Text { + id: paymentIdValue + width: 136 + anchors.bottom: parent.bottom + elide: Text.ElideRight + font.family: "Arial" + font.pixelSize:13 + font.letterSpacing: -1 + color: "#545454" + text: paymentId + } + // -- "BlockHeight" title + Text { + id: blockHeghtTitle + anchors.bottom: parent.bottom + width: 86 + font.family: "Arial" + font.pixelSize: 12 + font.letterSpacing: -1 + color: "#535353" + text: qsTr("BlockHeight:") + translationManager.emptyString + } + // -- "BlockHeight" value + Text { + width: 85 + anchors.bottom: parent.bottom + elide: Text.ElideRight + font.family: "Arial" + font.pixelSize: 13 + font.letterSpacing: -1 + color: "#545454" + text: blockHeight + } } + + // -- "Date", "Balance" and "Amound" section Row { anchors.left: parent.left diff --git a/components/ProcessingSplash.qml b/components/ProcessingSplash.qml index 84218f88..42312f42 100644 --- a/components/ProcessingSplash.qml +++ b/components/ProcessingSplash.qml @@ -44,10 +44,11 @@ Window { ColumnLayout { id: rootLayout - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + anchors.leftMargin: 30 anchors.rightMargin: 30 |