Skip to content

Commit 2240979

Browse files
committed
refactor: repurpose transactiondescdialog as a generic desc. container
1 parent 8af13b6 commit 2240979

8 files changed

Lines changed: 73 additions & 73 deletions

src/Makefile.qt.include

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ QT_FORMS_UI = \
2121
qt/forms/coincontroldialog.ui \
2222
qt/forms/createwalletdialog.ui \
2323
qt/forms/debugwindow.ui \
24+
qt/forms/descriptiondialog.ui \
2425
qt/forms/editaddressdialog.ui \
2526
qt/forms/governancelist.ui \
2627
qt/forms/helpmessagedialog.ui \
@@ -38,8 +39,7 @@ QT_FORMS_UI = \
3839
qt/forms/receiverequestdialog.ui \
3940
qt/forms/sendcoinsdialog.ui \
4041
qt/forms/sendcoinsentry.ui \
41-
qt/forms/signverifymessagedialog.ui \
42-
qt/forms/transactiondescdialog.ui
42+
qt/forms/signverifymessagedialog.ui
4343

4444
QT_MOC_CPP = \
4545
qt/moc_addressbookpage.cpp \
@@ -57,6 +57,7 @@ QT_MOC_CPP = \
5757
qt/moc_coincontroltreewidget.cpp \
5858
qt/moc_createwalletdialog.cpp \
5959
qt/moc_csvmodelwriter.cpp \
60+
qt/moc_descriptiondialog.cpp \
6061
qt/moc_editaddressdialog.cpp \
6162
qt/moc_governancelist.cpp \
6263
qt/moc_guiutil.cpp \
@@ -92,7 +93,6 @@ QT_MOC_CPP = \
9293
qt/moc_splashscreen.cpp \
9394
qt/moc_trafficgraphwidget.cpp \
9495
qt/moc_transactiondesc.cpp \
95-
qt/moc_transactiondescdialog.cpp \
9696
qt/moc_transactionfilterproxy.cpp \
9797
qt/moc_transactionoverviewwidget.cpp \
9898
qt/moc_transactiontablemodel.cpp \
@@ -135,6 +135,7 @@ BITCOIN_QT_H = \
135135
qt/coincontroltreewidget.h \
136136
qt/createwalletdialog.h \
137137
qt/csvmodelwriter.h \
138+
qt/descriptiondialog.h \
138139
qt/editaddressdialog.h \
139140
qt/governancelist.h \
140141
qt/guiconstants.h \
@@ -176,7 +177,6 @@ BITCOIN_QT_H = \
176177
qt/trafficgraphdata.h \
177178
qt/trafficgraphwidget.h \
178179
qt/transactiondesc.h \
179-
qt/transactiondescdialog.h \
180180
qt/transactionfilterproxy.h \
181181
qt/transactionoverviewwidget.h \
182182
qt/transactionrecord.h \
@@ -260,6 +260,7 @@ BITCOIN_QT_WALLET_CPP = \
260260
qt/coincontroldialog.cpp \
261261
qt/coincontroltreewidget.cpp \
262262
qt/createwalletdialog.cpp \
263+
qt/descriptiondialog.cpp \
263264
qt/editaddressdialog.cpp \
264265
qt/governancelist.cpp \
265266
qt/masternodelist.cpp \
@@ -279,7 +280,6 @@ BITCOIN_QT_WALLET_CPP = \
279280
qt/sendcoinsentry.cpp \
280281
qt/signverifymessagedialog.cpp \
281282
qt/transactiondesc.cpp \
282-
qt/transactiondescdialog.cpp \
283283
qt/transactionfilterproxy.cpp \
284284
qt/transactionoverviewwidget.cpp \
285285
qt/transactionrecord.cpp \

src/qt/descriptiondialog.cpp

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Copyright (c) 2011-2021 The Bitcoin Core developers
2+
// Copyright (c) 2026 The Dash Core developers
3+
// Distributed under the MIT software license, see the accompanying
4+
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
5+
6+
#include <qt/forms/ui_descriptiondialog.h>
7+
8+
#include <qt/descriptiondialog.h>
9+
#include <qt/guiutil_font.h>
10+
11+
#include <qt/guiutil.h>
12+
13+
DescriptionDialog::DescriptionDialog(const QString& title, const QString& html, QWidget* parent) :
14+
QDialog{parent, GUIUtil::dialog_flags},
15+
ui{new Ui::DescriptionDialog}
16+
{
17+
ui->setupUi(this);
18+
setWindowTitle(title);
19+
GUIUtil::registerWidget(ui->detailText, html);
20+
GUIUtil::updateFonts();
21+
GUIUtil::handleCloseWindowShortcut(this);
22+
}
23+
24+
DescriptionDialog::~DescriptionDialog()
25+
{
26+
delete ui;
27+
}

src/qt/descriptiondialog.h

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright (c) 2011-2020 The Bitcoin Core developers
2+
// Copyright (c) 2026 The Dash Core developers
3+
// Distributed under the MIT software license, see the accompanying
4+
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
5+
6+
#ifndef BITCOIN_QT_DESCRIPTIONDIALOG_H
7+
#define BITCOIN_QT_DESCRIPTIONDIALOG_H
8+
9+
#include <QDialog>
10+
11+
namespace Ui {
12+
class DescriptionDialog;
13+
} // namespace Ui
14+
15+
/** Generic dialog showing detailed text description. */
16+
class DescriptionDialog : public QDialog
17+
{
18+
Q_OBJECT
19+
20+
public:
21+
explicit DescriptionDialog(const QString& title, const QString& html, QWidget* parent = nullptr);
22+
~DescriptionDialog();
23+
24+
private:
25+
Ui::DescriptionDialog* ui;
26+
};
27+
28+
#endif // BITCOIN_QT_DESCRIPTIONDIALOG_H
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
3-
<class>TransactionDescDialog</class>
4-
<widget class="QDialog" name="TransactionDescDialog">
3+
<class>DescriptionDialog</class>
4+
<widget class="QDialog" name="DescriptionDialog">
55
<property name="geometry">
66
<rect>
77
<x>0</x>
@@ -11,13 +11,13 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string notr="true">Transaction details</string>
14+
<string notr="true">Details</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout">
1717
<item>
1818
<widget class="QTextEdit" name="detailText">
1919
<property name="toolTip">
20-
<string>This pane shows a detailed description of the transaction</string>
20+
<string>This pane shows detailed information</string>
2121
</property>
2222
<property name="readOnly">
2323
<bool>true</bool>
@@ -41,7 +41,7 @@
4141
<connection>
4242
<sender>buttonBox</sender>
4343
<signal>accepted()</signal>
44-
<receiver>TransactionDescDialog</receiver>
44+
<receiver>DescriptionDialog</receiver>
4545
<slot>accept()</slot>
4646
<hints>
4747
<hint type="sourcelabel">
@@ -57,7 +57,7 @@
5757
<connection>
5858
<sender>buttonBox</sender>
5959
<signal>rejected()</signal>
60-
<receiver>TransactionDescDialog</receiver>
60+
<receiver>DescriptionDialog</receiver>
6161
<slot>reject()</slot>
6262
<hints>
6363
<hint type="sourcelabel">

src/qt/transactiondescdialog.cpp

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/qt/transactiondescdialog.h

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/qt/transactionview.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
#include <qt/addresstablemodel.h>
88
#include <qt/bitcoinunits.h>
99
#include <qt/csvmodelwriter.h>
10+
#include <qt/descriptiondialog.h>
1011
#include <qt/editaddressdialog.h>
1112
#include <qt/guiutil.h>
1213
#include <qt/optionsmodel.h>
1314
#include <qt/qrdialog.h>
14-
#include <qt/transactiondescdialog.h>
1515
#include <qt/transactionfilterproxy.h>
1616
#include <qt/transactionrecord.h>
1717
#include <qt/transactiontablemodel.h>
@@ -538,7 +538,11 @@ void TransactionView::showDetails()
538538
QModelIndexList selection = transactionView->selectionModel()->selectedRows();
539539
if(!selection.isEmpty())
540540
{
541-
TransactionDescDialog* dlg = new TransactionDescDialog(selection.at(0), this);
541+
const QModelIndex& idx{selection.at(0)};
542+
DescriptionDialog* dlg = new DescriptionDialog(
543+
tr("Details for %1").arg(idx.data(TransactionTableModel::TxHashRole).toString()),
544+
idx.data(TransactionTableModel::LongDescriptionRole).toString(),
545+
/*parent=*/this);
542546
dlg->setAttribute(Qt::WA_DeleteOnClose);
543547
dlg->show();
544548
}

test/util/data/non-backported.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ src/masternode/*.cpp
2828
src/masternode/*.h
2929
src/messagesigner.*
3030
src/netfulfilledman.*
31+
src/qt/descriptiondialog.*
3132
src/qt/governancelist.*
3233
src/qt/guiutil_font.*
3334
src/qt/masternodelist.*

0 commit comments

Comments
 (0)