diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 582f293ad853..3dc81d225e5b 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -20,33 +20,32 @@ QT_FORMS_UI = \ qt/forms/askpassphrasedialog.ui \ qt/forms/coincontroldialog.ui \ qt/forms/createwalletdialog.ui \ + qt/forms/debugwindow.ui \ + qt/forms/descriptiondialog.ui \ qt/forms/editaddressdialog.ui \ qt/forms/governancelist.ui \ - qt/forms/proposalwizard.ui \ qt/forms/helpmessagedialog.ui \ qt/forms/intro.ui \ - qt/forms/modaloverlay.ui \ qt/forms/masternodelist.ui \ qt/forms/mnemonicverificationdialog.ui \ - qt/forms/qrdialog.ui \ + qt/forms/modaloverlay.ui \ qt/forms/openuridialog.ui \ qt/forms/optionsdialog.ui \ qt/forms/overviewpage.ui \ + qt/forms/proposalwizard.ui \ qt/forms/psbtoperationsdialog.ui \ + qt/forms/qrdialog.ui \ qt/forms/receivecoinsdialog.ui \ qt/forms/receiverequestdialog.ui \ - qt/forms/debugwindow.ui \ qt/forms/sendcoinsdialog.ui \ qt/forms/sendcoinsentry.ui \ - qt/forms/signverifymessagedialog.ui \ - qt/forms/transactiondescdialog.ui + qt/forms/signverifymessagedialog.ui QT_MOC_CPP = \ qt/moc_addressbookpage.cpp \ qt/moc_addresstablemodel.cpp \ qt/moc_appearancewidget.cpp \ qt/moc_askpassphrasedialog.cpp \ - qt/moc_createwalletdialog.cpp \ qt/moc_bantablemodel.cpp \ qt/moc_bitcoin.cpp \ qt/moc_bitcoinaddressvalidator.cpp \ @@ -56,26 +55,30 @@ QT_MOC_CPP = \ qt/moc_clientmodel.cpp \ qt/moc_coincontroldialog.cpp \ qt/moc_coincontroltreewidget.cpp \ + qt/moc_createwalletdialog.cpp \ qt/moc_csvmodelwriter.cpp \ + qt/moc_descriptiondialog.cpp \ qt/moc_editaddressdialog.cpp \ qt/moc_governancelist.cpp \ - qt/moc_proposalwizard.cpp \ qt/moc_guiutil.cpp \ qt/moc_initexecutor.cpp \ qt/moc_intro.cpp \ qt/moc_macdockiconhandler.cpp \ qt/moc_macnotificationhandler.cpp \ - qt/moc_modaloverlay.cpp \ qt/moc_masternodelist.cpp \ + qt/moc_masternodemodel.cpp \ qt/moc_mnemonicverificationdialog.cpp \ + qt/moc_modaloverlay.cpp \ qt/moc_notificator.cpp \ qt/moc_openuridialog.cpp \ qt/moc_optionsdialog.cpp \ qt/moc_optionsmodel.cpp \ qt/moc_overviewpage.cpp \ + qt/moc_paymentserver.cpp \ qt/moc_peertablemodel.cpp \ qt/moc_peertablesortproxy.cpp \ - qt/moc_paymentserver.cpp \ + qt/moc_proposalmodel.cpp \ + qt/moc_proposalwizard.cpp \ qt/moc_psbtoperationsdialog.cpp \ qt/moc_qrdialog.cpp \ qt/moc_qrimagewidget.cpp \ @@ -91,7 +94,6 @@ QT_MOC_CPP = \ qt/moc_splashscreen.cpp \ qt/moc_trafficgraphwidget.cpp \ qt/moc_transactiondesc.cpp \ - qt/moc_transactiondescdialog.cpp \ qt/moc_transactionfilterproxy.cpp \ qt/moc_transactionoverviewwidget.cpp \ qt/moc_transactiontablemodel.cpp \ @@ -134,9 +136,9 @@ BITCOIN_QT_H = \ qt/coincontroltreewidget.h \ qt/createwalletdialog.h \ qt/csvmodelwriter.h \ + qt/descriptiondialog.h \ qt/editaddressdialog.h \ qt/governancelist.h \ - qt/proposalwizard.h \ qt/guiconstants.h \ qt/guiutil.h \ qt/guiutil_font.h \ @@ -145,9 +147,10 @@ BITCOIN_QT_H = \ qt/macdockiconhandler.h \ qt/macnotificationhandler.h \ qt/macos_appnap.h \ - qt/modaloverlay.h \ qt/masternodelist.h \ + qt/masternodemodel.h \ qt/mnemonicverificationdialog.h \ + qt/modaloverlay.h \ qt/networkstyle.h \ qt/notificator.h \ qt/openuridialog.h \ @@ -157,6 +160,8 @@ BITCOIN_QT_H = \ qt/paymentserver.h \ qt/peertablemodel.h \ qt/peertablesortproxy.h \ + qt/proposalmodel.h \ + qt/proposalwizard.h \ qt/psbtoperationsdialog.h \ qt/qrdialog.h \ qt/qrimagewidget.h \ @@ -174,7 +179,6 @@ BITCOIN_QT_H = \ qt/trafficgraphdata.h \ qt/trafficgraphwidget.h \ qt/transactiondesc.h \ - qt/transactiondescdialog.h \ qt/transactionfilterproxy.h \ qt/transactionoverviewwidget.h \ qt/transactionrecord.h \ @@ -189,36 +193,36 @@ BITCOIN_QT_H = \ qt/winshutdownmonitor.h QT_RES_ICONS = \ - qt/res/icons/dash.ico \ - qt/res/icons/dash_testnet.ico \ - qt/res/icons/dash.png \ - qt/res/icons/warning.png \ qt/res/icons/address-book.png \ - qt/res/icons/transaction0.png \ - qt/res/icons/transaction1.png \ - qt/res/icons/transaction2.png \ - qt/res/icons/transaction3.png \ - qt/res/icons/transaction4.png \ - qt/res/icons/transaction5.png \ - qt/res/icons/transaction_abandoned.png \ - qt/res/icons/transaction_locked.png \ qt/res/icons/connect1_16.png \ qt/res/icons/connect2_16.png \ qt/res/icons/connect3_16.png \ qt/res/icons/connect4_16.png \ + qt/res/icons/dash.ico \ + qt/res/icons/dash.png \ + qt/res/icons/dash_testnet.ico \ qt/res/icons/editcopy.png \ qt/res/icons/editpaste.png \ qt/res/icons/eye.png \ qt/res/icons/eye_minus.png \ qt/res/icons/eye_plus.png \ + qt/res/icons/fontbigger.png \ + qt/res/icons/fontsmaller.png \ qt/res/icons/hd_enabled.png \ qt/res/icons/lock_closed.png \ qt/res/icons/lock_open.png \ qt/res/icons/proxy.png \ qt/res/icons/remove.png \ qt/res/icons/synced.png \ - qt/res/icons/fontbigger.png \ - qt/res/icons/fontsmaller.png + qt/res/icons/transaction0.png \ + qt/res/icons/transaction1.png \ + qt/res/icons/transaction2.png \ + qt/res/icons/transaction3.png \ + qt/res/icons/transaction4.png \ + qt/res/icons/transaction5.png \ + qt/res/icons/transaction_abandoned.png \ + qt/res/icons/transaction_locked.png \ + qt/res/icons/warning.png BITCOIN_QT_BASE_CPP = \ qt/appearancewidget.cpp \ @@ -258,14 +262,17 @@ BITCOIN_QT_WALLET_CPP = \ qt/coincontroldialog.cpp \ qt/coincontroltreewidget.cpp \ qt/createwalletdialog.cpp \ + qt/descriptiondialog.cpp \ qt/editaddressdialog.cpp \ qt/governancelist.cpp \ - qt/proposalwizard.cpp \ qt/masternodelist.cpp \ + qt/masternodemodel.cpp \ qt/mnemonicverificationdialog.cpp \ qt/openuridialog.cpp \ qt/overviewpage.cpp \ qt/paymentserver.cpp \ + qt/proposalmodel.cpp \ + qt/proposalwizard.cpp \ qt/psbtoperationsdialog.cpp \ qt/qrdialog.cpp \ qt/qrimagewidget.cpp \ @@ -276,7 +283,6 @@ BITCOIN_QT_WALLET_CPP = \ qt/sendcoinsentry.cpp \ qt/signverifymessagedialog.cpp \ qt/transactiondesc.cpp \ - qt/transactiondescdialog.cpp \ qt/transactionfilterproxy.cpp \ qt/transactionoverviewwidget.cpp \ qt/transactionrecord.cpp \ @@ -301,50 +307,50 @@ QT_RES_IMAGES = \ qt/res/images/arrow_down_light.png \ qt/res/images/arrow_left_dark.png \ qt/res/images/arrow_left_light.png \ - qt/res/images/arrow_right_dark.png \ - qt/res/images/arrow_right_light.png \ - qt/res/images/arrow_up_dark.png \ - qt/res/images/arrow_up_light.png \ - qt/res/images/arrow_light_down_normal.png \ qt/res/images/arrow_light_down_hover.png \ - qt/res/images/arrow_light_left_normal.png \ + qt/res/images/arrow_light_down_normal.png \ qt/res/images/arrow_light_left_hover.png \ - qt/res/images/arrow_light_right_normal.png \ + qt/res/images/arrow_light_left_normal.png \ qt/res/images/arrow_light_right_hover.png \ - qt/res/images/arrow_light_up_normal.png \ + qt/res/images/arrow_light_right_normal.png \ qt/res/images/arrow_light_up_hover.png \ - qt/res/images/checkbox_normal_dark.png \ - qt/res/images/checkbox_normal_hover_dark.png \ - qt/res/images/checkbox_normal_disabled_dark.png \ + qt/res/images/arrow_light_up_normal.png \ + qt/res/images/arrow_right_dark.png \ + qt/res/images/arrow_right_light.png \ + qt/res/images/arrow_up_dark.png \ + qt/res/images/arrow_up_light.png \ qt/res/images/checkbox_checked_dark.png \ - qt/res/images/checkbox_checked_hover_dark.png \ qt/res/images/checkbox_checked_disabled_dark.png \ + qt/res/images/checkbox_checked_disabled_light.png \ + qt/res/images/checkbox_checked_hover_dark.png \ + qt/res/images/checkbox_checked_hover_light.png \ + qt/res/images/checkbox_checked_light.png \ + qt/res/images/checkbox_normal_dark.png \ + qt/res/images/checkbox_normal_disabled_dark.png \ + qt/res/images/checkbox_normal_disabled_light.png \ + qt/res/images/checkbox_normal_hover_dark.png \ + qt/res/images/checkbox_normal_hover_light.png \ + qt/res/images/checkbox_normal_light.png \ qt/res/images/checkbox_partly_checked_dark.png \ - qt/res/images/checkbox_partly_checked_hover_dark.png \ qt/res/images/checkbox_partly_checked_disabled_dark.png \ - qt/res/images/checkbox_normal_light.png \ - qt/res/images/checkbox_normal_hover_light.png \ - qt/res/images/checkbox_normal_disabled_light.png \ - qt/res/images/checkbox_checked_light.png \ - qt/res/images/checkbox_checked_hover_light.png \ - qt/res/images/checkbox_checked_disabled_light.png \ - qt/res/images/checkbox_partly_checked_light.png \ - qt/res/images/checkbox_partly_checked_hover_light.png \ qt/res/images/checkbox_partly_checked_disabled_light.png \ + qt/res/images/checkbox_partly_checked_hover_dark.png \ + qt/res/images/checkbox_partly_checked_hover_light.png \ + qt/res/images/checkbox_partly_checked_light.png \ qt/res/images/dash_logo_toolbar.png \ qt/res/images/dash_logo_toolbar_blue.png \ - qt/res/images/radio_normal_dark.png \ - qt/res/images/radio_normal_hover_dark.png \ qt/res/images/radio_checked_dark.png \ - qt/res/images/radio_checked_hover_dark.png \ - qt/res/images/radio_normal_disabled_dark.png \ qt/res/images/radio_checked_disabled_dark.png \ - qt/res/images/radio_normal_light.png \ - qt/res/images/radio_normal_hover_light.png \ - qt/res/images/radio_checked_light.png \ + qt/res/images/radio_checked_disabled_light.png \ + qt/res/images/radio_checked_hover_dark.png \ qt/res/images/radio_checked_hover_light.png \ + qt/res/images/radio_checked_light.png \ + qt/res/images/radio_normal_dark.png \ + qt/res/images/radio_normal_disabled_dark.png \ qt/res/images/radio_normal_disabled_light.png \ - qt/res/images/radio_checked_disabled_light.png \ + qt/res/images/radio_normal_hover_dark.png \ + qt/res/images/radio_normal_hover_light.png \ + qt/res/images/radio_normal_light.png \ qt/res/images/splash.png QT_RES_CSS = \ diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 249e4d25d751..467d41fcecb0 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -729,30 +729,23 @@ void BitcoinGUI::createToolBars() coinJoinCoinsButton->setStatusTip(coinJoinCoinsAction->statusTip()); tabGroup->addButton(coinJoinCoinsButton); - QSettings settings; - if (settings.value("fShowMasternodesTab").toBool()) { - masternodeButton = new QToolButton(this); - masternodeButton->setText(tr("&Masternodes")); - masternodeButton->setStatusTip(tr("Browse masternodes")); - tabGroup->addButton(masternodeButton); - connect(masternodeButton, &QToolButton::clicked, this, &BitcoinGUI::gotoMasternodePage); - masternodeButton->setEnabled(true); - } + masternodeButton = new QToolButton(this); + masternodeButton->setText(tr("&Masternodes")); + masternodeButton->setStatusTip(tr("Browse masternodes")); + tabGroup->addButton(masternodeButton); - if (settings.value("fShowGovernanceTab").toBool()) { - governanceButton = new QToolButton(this); - governanceButton->setText(tr("&Governance")); - governanceButton->setStatusTip(tr("View Governance Proposals")); - tabGroup->addButton(governanceButton); - connect(governanceButton, &QToolButton::clicked, this, &BitcoinGUI::gotoGovernancePage); - governanceButton->setEnabled(true); - } + governanceButton = new QToolButton(this); + governanceButton->setText(tr("&Governance")); + governanceButton->setStatusTip(tr("View Governance Proposals")); + tabGroup->addButton(governanceButton); connect(overviewButton, &QToolButton::clicked, this, &BitcoinGUI::gotoOverviewPage); connect(sendCoinsButton, &QToolButton::clicked, [this]{ gotoSendCoinsPage(); }); connect(coinJoinCoinsButton, &QToolButton::clicked, [this]{ gotoCoinJoinCoinsPage(); }); connect(receiveCoinsButton, &QToolButton::clicked, this, &BitcoinGUI::gotoReceiveCoinsPage); connect(historyButton, &QToolButton::clicked, this, &BitcoinGUI::gotoHistoryPage); + connect(governanceButton, &QToolButton::clicked, this, &BitcoinGUI::gotoGovernancePage); + connect(masternodeButton, &QToolButton::clicked, this, &BitcoinGUI::gotoMasternodePage); // Give the selected tab button a bolder font. connect(tabGroup, qOverload(&QButtonGroup::buttonToggled), this, &BitcoinGUI::highlightTabButton); @@ -762,7 +755,10 @@ void BitcoinGUI::createToolBars() button->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); button->setToolTip(button->statusTip()); button->setCheckable(true); - toolbar->addWidget(button); + QAction* action = toolbar->addWidget(button); + if (button == coinJoinCoinsButton) { m_coinjoin_action = action; } + else if (button == governanceButton) { m_governance_action = action; } + else if (button == masternodeButton) { m_masternode_action = action; } } overviewButton->setChecked(true); @@ -877,20 +873,24 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel, interfaces::BlockAndH walletFrame->setClientModel(_clientModel); } #endif // ENABLE_WALLET - unitDisplayControl->setOptionsModel(_clientModel->getOptionsModel()); OptionsModel* optionsModel = _clientModel->getOptionsModel(); - if (optionsModel && trayIcon) { - // be aware of the tray icon disable state change reported by the OptionsModel object. - connect(optionsModel, &OptionsModel::showTrayIconChanged, trayIcon, &QSystemTrayIcon::setVisible); + if (optionsModel) { + unitDisplayControl->setOptionsModel(optionsModel); + m_mask_values_action->setChecked(optionsModel->getOption(OptionsModel::OptionID::MaskValues).toBool()); - // initialize the disable state of the tray icon with the current value in the model. - trayIcon->setVisible(optionsModel->getShowTrayIcon()); + connect(optionsModel, &OptionsModel::showCoinJoinChanged, this, &BitcoinGUI::updateCoinJoinVisibility); + connect(optionsModel, &OptionsModel::showGovernanceChanged, this, &BitcoinGUI::updateGovernanceVisibility); + connect(optionsModel, &OptionsModel::showMasternodesChanged, this, &BitcoinGUI::updateMasternodesVisibility); - connect(optionsModel, &OptionsModel::coinJoinEnabledChanged, this, &BitcoinGUI::updateCoinJoinVisibility); - } + if (trayIcon) { + // be aware of the tray icon disable state change reported by the OptionsModel object. + connect(optionsModel, &OptionsModel::showTrayIconChanged, trayIcon, &QSystemTrayIcon::setVisible); - m_mask_values_action->setChecked(_clientModel->getOptionsModel()->getOption(OptionsModel::OptionID::MaskValues).toBool()); + // initialize the disable state of the tray icon with the current value in the model. + trayIcon->setVisible(optionsModel->getShowTrayIcon()); + } + } } else { if(trayIconMenu) { @@ -917,6 +917,8 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel, interfaces::BlockAndH } updateCoinJoinVisibility(); + updateGovernanceVisibility(); + updateMasternodesVisibility(); } #ifdef ENABLE_WALLET @@ -1248,8 +1250,7 @@ void BitcoinGUI::highlightTabButton(QAbstractButton *button, bool checked) void BitcoinGUI::gotoGovernancePage() { - QSettings settings; - if (settings.value("fShowGovernanceTab").toBool() && governanceButton) { + if (governanceButton) { governanceButton->setChecked(true); if (walletFrame) walletFrame->gotoGovernancePage(); } @@ -1269,8 +1270,7 @@ void BitcoinGUI::gotoHistoryPage() void BitcoinGUI::gotoMasternodePage() { - QSettings settings; - if (settings.value("fShowMasternodesTab").toBool() && masternodeButton) { + if (masternodeButton) { masternodeButton->setChecked(true); if (walletFrame) walletFrame->gotoMasternodePage(); } @@ -1449,21 +1449,50 @@ void BitcoinGUI::updateProgressBarVisibility() void BitcoinGUI::updateCoinJoinVisibility() { + const bool fEnabled{ #ifdef ENABLE_WALLET - bool fEnabled = m_node.coinJoinOptions().isEnabled(); + m_node.coinJoinOptions().isEnabled() #else - bool fEnabled = false; -#endif - // CoinJoin button is the third QToolButton, show/hide the underlying QAction - // Hiding the QToolButton itself doesn't work for the GUI part - // but is still needed for shortcuts to work properly. - if (appToolBar != nullptr) { - appToolBar->actions()[4]->setVisible(fEnabled); - coinJoinCoinsButton->setVisible(fEnabled); - GUIUtil::updateButtonGroupShortcuts(tabGroup); - } - coinJoinCoinsAction->setVisible(fEnabled); - showCoinJoinHelpAction->setVisible(fEnabled); + false +#endif // ENABLE_WALLET + }; + + // Show/hide the underlying QAction, hiding the QToolButton itself doesn't + // work for the GUI part but is still needed for shortcuts to work properly. + if (m_coinjoin_action) m_coinjoin_action->setVisible(fEnabled); + if (coinJoinCoinsButton) coinJoinCoinsButton->setVisible(fEnabled); + if (coinJoinCoinsAction) coinJoinCoinsAction->setVisible(fEnabled); + if (showCoinJoinHelpAction) showCoinJoinHelpAction->setVisible(fEnabled); + + GUIUtil::updateButtonGroupShortcuts(tabGroup); + updateWidth(); +} + +void BitcoinGUI::updateGovernanceVisibility() +{ + if (!clientModel || !clientModel->getOptionsModel()) return; + const bool fShow = clientModel->getOptionsModel()->getShowGovernanceTab(); + + // Show/hide the underlying QAction, hiding the QToolButton itself doesn't + // work for the GUI part but is still needed for shortcuts to work properly. + if (m_governance_action) m_governance_action->setVisible(fShow); + if (governanceButton) governanceButton->setVisible(fShow); + + GUIUtil::updateButtonGroupShortcuts(tabGroup); + updateWidth(); +} + +void BitcoinGUI::updateMasternodesVisibility() +{ + if (!clientModel || !clientModel->getOptionsModel()) return; + const bool fShow = clientModel->getOptionsModel()->getShowMasternodesTab(); + + // Show/hide the underlying QAction, hiding the QToolButton itself doesn't + // work for the GUI part but is still needed for shortcuts to work properly. + if (m_masternode_action) m_masternode_action->setVisible(fShow); + if (masternodeButton) masternodeButton->setVisible(fShow); + + GUIUtil::updateButtonGroupShortcuts(tabGroup); updateWidth(); } diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 576605443e7c..7c8af4f63386 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -149,6 +149,9 @@ class BitcoinGUI : public QMainWindow QAction* usedReceivingAddressesAction = nullptr; QAction* signMessageAction = nullptr; QAction* verifyMessageAction = nullptr; + QAction* m_coinjoin_action = nullptr; + QAction* m_governance_action = nullptr; + QAction* m_masternode_action = nullptr; QAction* m_load_psbt_action = nullptr; QAction* m_load_psbt_clipboard_action = nullptr; QAction* aboutAction = nullptr; @@ -388,6 +391,8 @@ public Q_SLOTS: void showModalOverlay(); void updateCoinJoinVisibility(); + void updateGovernanceVisibility(); + void updateMasternodesVisibility(); void updateWidth(); }; diff --git a/src/qt/descriptiondialog.cpp b/src/qt/descriptiondialog.cpp new file mode 100644 index 000000000000..164939d3f284 --- /dev/null +++ b/src/qt/descriptiondialog.cpp @@ -0,0 +1,27 @@ +// Copyright (c) 2011-2021 The Bitcoin Core developers +// Copyright (c) 2026 The Dash Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include + +#include +#include + +#include + +DescriptionDialog::DescriptionDialog(const QString& title, const QString& html, QWidget* parent) : + QDialog{parent, GUIUtil::dialog_flags}, + ui{new Ui::DescriptionDialog} +{ + ui->setupUi(this); + setWindowTitle(title); + GUIUtil::registerWidget(ui->detailText, html); + GUIUtil::updateFonts(); + GUIUtil::handleCloseWindowShortcut(this); +} + +DescriptionDialog::~DescriptionDialog() +{ + delete ui; +} diff --git a/src/qt/descriptiondialog.h b/src/qt/descriptiondialog.h new file mode 100644 index 000000000000..161983a3e8d9 --- /dev/null +++ b/src/qt/descriptiondialog.h @@ -0,0 +1,28 @@ +// Copyright (c) 2011-2020 The Bitcoin Core developers +// Copyright (c) 2026 The Dash Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef BITCOIN_QT_DESCRIPTIONDIALOG_H +#define BITCOIN_QT_DESCRIPTIONDIALOG_H + +#include + +namespace Ui { +class DescriptionDialog; +} // namespace Ui + +/** Generic dialog showing detailed text description. */ +class DescriptionDialog : public QDialog +{ + Q_OBJECT + +public: + explicit DescriptionDialog(const QString& title, const QString& html, QWidget* parent = nullptr); + ~DescriptionDialog(); + +private: + Ui::DescriptionDialog* ui; +}; + +#endif // BITCOIN_QT_DESCRIPTIONDIALOG_H diff --git a/src/qt/forms/transactiondescdialog.ui b/src/qt/forms/descriptiondialog.ui similarity index 81% rename from src/qt/forms/transactiondescdialog.ui rename to src/qt/forms/descriptiondialog.ui index 3a698cfd1d40..0918e5a6174a 100644 --- a/src/qt/forms/transactiondescdialog.ui +++ b/src/qt/forms/descriptiondialog.ui @@ -1,7 +1,7 @@ - TransactionDescDialog - + DescriptionDialog + 0 @@ -11,13 +11,13 @@ - Transaction details + Details - This pane shows a detailed description of the transaction + This pane shows detailed information true @@ -41,7 +41,7 @@ buttonBox accepted() - TransactionDescDialog + DescriptionDialog accept() @@ -57,7 +57,7 @@ buttonBox rejected() - TransactionDescDialog + DescriptionDialog reject() diff --git a/src/qt/forms/masternodelist.ui b/src/qt/forms/masternodelist.ui index 672b8199732d..6ad419c8c709 100644 --- a/src/qt/forms/masternodelist.ui +++ b/src/qt/forms/masternodelist.ui @@ -31,19 +31,6 @@ 0 - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -52,14 +39,29 @@ 0 - - - Filter List: + + + Filter by masternode type + + + All + + + + + Regular + + + + + Evo + + - + Filter masternode list @@ -69,46 +71,32 @@ - + Show only masternodes this wallet has keys for. - My masternodes only + Owned - - - Qt::Horizontal - - - - 10 - 20 - + + + Hide masternodes that are currently PoSe banned. - - - - - Node Count: + Hide banned - - - - - - 0 + + true - + QAbstractItemView::NoEditTriggers @@ -124,71 +112,42 @@ true - - true - - - - Service - - - - - Type - - - - - Status - - - - - PoSe Score - - - - - Registered - - - - - Last Paid - - - - - Next Payment - - - - - Payout Address - - - - - Operator Reward - - - - - Collateral Address - - - - - Owner Address - - - - - Voting Address - - + + + + 3 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Node Count: + + + + + + + 0 + + + + + diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index eda0ce5cdd69..fbfcd6248196 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -325,18 +325,18 @@ - - - - Whether to set subtract fee from amount as default or not. - - - Subtract &fee from amount by default - - - + + + + Whether to set subtract fee from amount as default or not. + + + Subtract &fee from amount by default + + + diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp index 32706b33b1a7..01c976a5ee39 100644 --- a/src/qt/governancelist.cpp +++ b/src/qt/governancelist.cpp @@ -2,301 +2,31 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include #include -#include -#include -#include -#include -#include #include #include #include + +#include +#include +#include +#include + +#include #include #include -#include -#include -#include -#include -#include -#include #include