diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-12-09 00:06:44 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-12-09 00:06:44 +0200 |
| commit | bb506a2e924eb88b08cf3316969bf46099be6eb2 (patch) | |
| tree | bf60a31fecf9f825b8d8d36a8959d0cab3ac4457 /components | |
| parent | 4cdf443b6b1a9ab171929c0d2a0d8710ad9e698e (diff) | |
| parent | e1255bd91f6b237fe85acb18cc19164fb82408ca (diff) | |
| download | monzero-gui-bb506a2e924eb88b08cf3316969bf46099be6eb2.tar.gz monzero-gui-bb506a2e924eb88b08cf3316969bf46099be6eb2.tar.xz monzero-gui-bb506a2e924eb88b08cf3316969bf46099be6eb2.zip | |
Merge pull request #235
e1255bd history: remove unused dependencies (Jaquee)
9341d75 history: print destination address in tx details popup (Jaquee)
7aea3d3 TransactionInfo: add transfers() and destinations_formatted() (Jaquee)
a4c3de9 history: add Transfer class (Jaquee)
Diffstat (limited to 'components')
| -rw-r--r-- | components/HistoryTable.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml index 0c9e9b60..52906f26 100644 --- a/components/HistoryTable.qml +++ b/components/HistoryTable.qml @@ -37,7 +37,7 @@ ListView { property var previousItem property int rowSpacing: 12 - function buildTxDetailsString(tx_id, paymentId, tx_key,tx_note) { + function buildTxDetailsString(tx_id, paymentId, tx_key,tx_note, destinations) { var trStart = '<tr><td width="85" style="padding-top:5px"><b>', trMiddle = '</b></td><td style="padding-left:10px;padding-top:5px;">', trEnd = "</td></tr>"; @@ -47,6 +47,7 @@ ListView { + (paymentId ? trStart + qsTr("Payment ID:") + trMiddle + paymentId + trEnd : "") + (tx_key ? trStart + qsTr("Tx key:") + trMiddle + tx_key + trEnd : "") + (tx_note ? trStart + qsTr("Tx note:") + trMiddle + tx_note + trEnd : "") + + (destinations ? trStart + qsTr("Destinations:") + trMiddle + destinations + trEnd : "") + "</table>" + translationManager.emptyString; } @@ -72,6 +73,7 @@ ListView { width:600 cancelVisible: false okVisible: true + width:850 } @@ -97,12 +99,10 @@ ListView { pressedColor: "#FF4304" text: qsTr("Details") onClicked: { - console.log(hash) var tx_key = currentWallet.getTxKey(hash) var tx_note = currentWallet.getUserNote(hash) - console.log("key",tx_key); detailsPopup.title = "Transaction details"; - detailsPopup.content = buildTxDetailsString(hash,paymentId,tx_key,tx_note); + detailsPopup.content = buildTxDetailsString(hash,paymentId,tx_key,tx_note,destinations); detailsPopup.open(); } |
