Merge pull request #122

42086b5 remove old reference to passwordDialog (Jacob Brydolf) 4a1e22a history: transaction details button + popup (Jacob Brydolf) cfa8929 wallet api: added getTxKey() (Jacob Brydolf) d628795 added standardDialog component (Jacob Brydolf)
2024-11-26 10:21:05 +01:00 · 2016-11-09 20:46:57 +02:00 · 2016-11-09 20:46:57 +02:00 · 99dbbc469c
commit 99dbbc469c
parent 1e249c1624 42086b574c
5 changed files with 190 additions and 1 deletions
--- a/components/HistoryTable.qml
+++ b/components/HistoryTable.qml
@ -37,6 +37,22 @@ ListView {
    property var previousItem
    property int rowSpacing: 12

+    function buildTxDetailsString(tx_id, paymentId, tx_key,tx_note) {
+        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>";
+
+        return '<table border="0">'
+            + (tx_id ? trStart + qsTr("Tx ID:") + trMiddle + tx_id + trEnd : "")
+            + (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 : "")
+            + "</table>"
+            + translationManager.emptyString;
+    }
+
+
+
    footer: Rectangle {
        height: 127
        width: listView.width
@ -51,6 +67,12 @@ ListView {
        }
    }

+    StandardDialog {
+        id: detailsPopup
+        cancelVisible: false
+        okVisible: true
+    }
+

    delegate: Rectangle {
        id: delegate
@ -60,6 +82,33 @@ ListView {
        z: listView.count - index
        function collapseDropdown() { dropdown.expanded = false }

+        StandardButton {
+            id: detailsButton
+            anchors.right:parent.right
+            anchors.rightMargin: 15
+            anchors.top: parent.top
+            anchors.topMargin: parent.height/2 - this.height/2
+            width: 80
+            fontSize: 14
+            shadowReleasedColor: "#FF4304"
+            shadowPressedColor: "#B32D00"
+            releasedColor: "#FF6C3C"
+            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.open();
+
+            }
+        }
+
+
+
        Row {
            id: row1
            anchors.left: parent.left
@ -331,7 +380,6 @@ ListView {
        }


-
        /*
        // Transaction dropdown menu.
        // Disable for now until AddressBook implemented
--- a/components/StandardDialog.qml
+++ b/components/StandardDialog.qml
@ -0,0 +1,133 @@
+// Copyright (c) 2014-2015, The Monero Project
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import QtQuick 2.0
+import QtQuick.Controls 1.4
+import QtQuick.Dialogs 1.2
+import QtQuick.Layouts 1.1
+import QtQuick.Controls.Styles 1.4
+import QtQuick.Window 2.0
+
+import "../components" as MoneroComponents
+
+Window {
+    id: root
+    modality: Qt.ApplicationModal
+    flags: Qt.Window | Qt.FramelessWindowHint
+    property alias title: dialogTitle.text
+    property alias content: dialogContent.text
+    property alias cancelVisible: cancelButton.visible
+    property alias okVisible: okButton.visible
+
+    // same signals as Dialog has
+    signal accepted()
+    signal rejected()
+
+
+    function open() {
+        show()
+    }
+
+    // TODO: implement without hardcoding sizes
+    width: 600
+    height: 480
+
+    ColumnLayout {
+        id: mainLayout
+        spacing: 10
+        anchors { fill: parent; margins: 35 }
+
+        RowLayout {
+            id: column
+            //anchors {fill: parent; margins: 16 }
+            Layout.alignment: Qt.AlignHCenter
+
+            Label {
+                id: dialogTitle
+                horizontalAlignment: Text.AlignHCenter
+                font.pixelSize: 32
+                font.family: "Arial"
+                color: "#555555"
+            }
+
+        }
+
+        RowLayout {
+            TextArea {
+                id : dialogContent
+                Layout.fillWidth: true
+                font.family: "Arial"
+                textFormat: TextEdit.AutoText
+                readOnly: true
+                font.pixelSize: 12
+            }
+        }
+
+        // Ok/Cancel buttons
+        RowLayout {
+            id: buttons
+            spacing: 60
+            Layout.alignment: Qt.AlignHCenter
+
+            MoneroComponents.StandardButton {
+                id: okButton
+                width: 120
+                fontSize: 14
+                shadowReleasedColor: "#FF4304"
+                shadowPressedColor: "#B32D00"
+                releasedColor: "#FF6C3C"
+                pressedColor: "#FF4304"
+                text: qsTr("Ok")
+                KeyNavigation.tab: cancelButton
+                onClicked: {
+                    root.accepted()
+                    root.close()
+                }
+            }
+
+            MoneroComponents.StandardButton {
+                id: cancelButton
+                width: 120
+                fontSize: 14
+                shadowReleasedColor: "#FF4304"
+                shadowPressedColor: "#B32D00"
+                releasedColor: "#FF6C3C"
+                pressedColor: "#FF4304"
+                text: qsTr("Cancel")
+                onClicked: {
+                    root.rejected()
+                    root.close()
+                }
+            }
+        }
+    }
+
+}
+
+
+
--- a/qml.qrc
+++ b/qml.qrc
@ -118,5 +118,6 @@
        <file>components/PasswordDialog.qml</file>
        <file>components/ProcessingSplash.qml</file>
        <file>components/DaemonProgress.qml</file>
+        <file>components/StandardDialog.qml</file>
    </qresource>
 </RCC>
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@ -270,6 +270,11 @@ QString Wallet::getUserNote(const QString &txid) const
  return QString::fromStdString(m_walletImpl->getUserNote(txid.toStdString()));
 }

+QString Wallet::getTxKey(const QString &txid) const
+{
+  return QString::fromStdString(m_walletImpl->getTxKey(txid.toStdString()));
+}
+
 Wallet::Wallet(Bitmonero::Wallet *w, QObject *parent)
    : QObject(parent)
    , m_walletImpl(w)
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@ -141,6 +141,8 @@ public:
    Q_INVOKABLE bool setUserNote(const QString &txid, const QString &note);
    Q_INVOKABLE QString getUserNote(const QString &txid) const;

+    Q_INVOKABLE QString getTxKey(const QString &txid) const;
+
    // TODO: setListenter() when it implemented in API
 signals:
    // emitted on every event happened with wallet