Skip to content

Commit d0a5d8b

Browse files
jonasschnelliknst
authored andcommitted
Merge bitcoin-core/gui#85: Remove unused "What's This" button in dialogs on Windows OS
ac7ccd6 scripted-diff: Remove unused "What's This" button in dialogs on Windows (Hennadii Stepanov) b695148 qt: Add flags to prevent a "What's This" button on Windows OS (Hennadii Stepanov) Pull request description: Fix dashpay#74. From [Qt docs](https://doc.qt.io/qt-5/qdialog.html#QDialog): > The widget flags _f_ are passed on to the `QWidget` constructor. If, for example, you don't want a **What's This** button in the title bar of the dialog, pass `Qt::WindowTitleHint | Qt::WindowSystemMenuHint` in _f_. Screenshot on Windows 10 (2004): - master (3ba25e3) ![Screenshot from 2020-09-07 16-55-42](https://user-images.githubusercontent.com/32963518/92402384-20dc6a00-f138-11ea-9dcb-3e0f6373ff22.png) - this PR (e322fe7e19ac504272d14b9b4f9b28b13df888ed) ![Screenshot from 2020-09-07 18-31-16](https://user-images.githubusercontent.com/32963518/92402509-5aad7080-f138-11ea-8b63-9bbbf8b9b9e1.png) ACKs for top commit: Bosch-0: tACK ac7ccd6 Tested on Windows 10.0.18363 Build 18363. promag: Code review ACK ac7ccd6 but with some suggestions. jonasschnelli: utACK ac7ccd6 Tree-SHA512: f6750a17b7203106cb4db5870becba1cef6a505d4edcc710ba131338bd3aae051510627e62c9bcb8345a7f497c614709e11aeb8f6ae3ea85967bbce2a8c69e64
1 parent 127c103 commit d0a5d8b

17 files changed

+22
-16
lines changed

src/qt/addressbookpage.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class AddressBookSortFilterProxyModel final : public QSortFilterProxyModel
5858
};
5959

6060
AddressBookPage::AddressBookPage(Mode _mode, Tabs _tab, QWidget* parent) :
61-
QDialog(parent),
61+
QDialog(parent, GUIUtil::dialog_flags),
6262
ui(new Ui::AddressBookPage),
6363
model(nullptr),
6464
mode(_mode),

src/qt/askpassphrasedialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <QPushButton>
2222

2323
AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent, SecureString* passphrase_out) :
24-
QDialog(parent),
24+
QDialog(parent, GUIUtil::dialog_flags),
2525
ui(new Ui::AskPassphraseDialog),
2626
mode(_mode),
2727
model(nullptr),

src/qt/coincontroldialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ bool CCoinControlWidgetItem::operator<(const QTreeWidgetItem &other) const {
4242
}
4343

4444
CoinControlDialog::CoinControlDialog(CCoinControl& coin_control, WalletModel* _model, QWidget* parent) :
45-
QDialog(parent),
45+
QDialog(parent, GUIUtil::dialog_flags),
4646
ui(new Ui::CoinControlDialog),
4747
m_coin_control(coin_control),
4848
model(_model)

src/qt/createwalletdialog.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
#include <qt/createwalletdialog.h>
1010
#include <qt/forms/ui_createwalletdialog.h>
1111

12+
#include <qt/guiutil.h>
13+
1214
#include <QPushButton>
1315

1416
CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
15-
QDialog(parent),
17+
QDialog(parent, GUIUtil::dialog_flags),
1618
ui(new Ui::CreateWalletDialog)
1719
{
1820
ui->setupUi(this);

src/qt/editaddressdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <QMessageBox>
1414

1515
EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) :
16-
QDialog(parent),
16+
QDialog(parent, GUIUtil::dialog_flags),
1717
ui(new Ui::EditAddressDialog),
1818
mapper(nullptr),
1919
mode(_mode),

src/qt/guiutil.h

+3
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ namespace GUIUtil
111111
void setIcon(QAbstractButton* button, const QString& strIcon, ThemedColor color, ThemedColor colorAlternative, const QSize& size);
112112
void setIcon(QAbstractButton* button, const QString& strIcon, ThemedColor color = ThemedColor::BLUE, const QSize& size = QSize(BUTTON_ICONSIZE, BUTTON_ICONSIZE));
113113

114+
// Use this flags to prevent a "What's This" button in the title bar of the dialog on Windows.
115+
constexpr auto dialog_flags = Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint;
116+
114117
// Create human-readable string from date
115118
QString dateTimeStr(const QDateTime &datetime);
116119
QString dateTimeStr(qint64 nTime);

src/qt/intro.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ int GetPruneTargetGB()
119119
} // namespace
120120

121121
Intro::Intro(QWidget *parent, int64_t blockchain_size_gb, int64_t chain_state_size_gb) :
122-
QDialog(parent),
122+
QDialog(parent, GUIUtil::dialog_flags),
123123
ui(new Ui::Intro),
124124
thread(nullptr),
125125
signalled(false),

src/qt/openuridialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <QUrl>
1313

1414
OpenURIDialog::OpenURIDialog(QWidget *parent) :
15-
QDialog(parent),
15+
QDialog(parent, GUIUtil::dialog_flags),
1616
ui(new Ui::OpenURIDialog)
1717
{
1818
ui->setupUi(this);

src/qt/optionsdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include <QTimer>
3636

3737
OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
38-
QDialog(parent),
38+
QDialog(parent, GUIUtil::dialog_flags),
3939
ui(new Ui::OptionsDialog),
4040
model(nullptr),
4141
mapper(nullptr),

src/qt/psbtoperationsdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
PSBTOperationsDialog::PSBTOperationsDialog(
22-
QWidget* parent, WalletModel* wallet_model, ClientModel* client_model) : QDialog(parent),
22+
QWidget* parent, WalletModel* wallet_model, ClientModel* client_model) : QDialog(parent, GUIUtil::dialog_flags),
2323
m_ui(new Ui::PSBTOperationsDialog),
2424
m_wallet_model(wallet_model),
2525
m_client_model(client_model)

src/qt/qrdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#endif
1919

2020
QRDialog::QRDialog(QWidget *parent) :
21-
QDialog(parent),
21+
QDialog(parent, GUIUtil::dialog_flags),
2222
ui(new Ui::QRDialog)
2323
{
2424
ui->setupUi(this);

src/qt/receivecoinsdialog.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <qt/forms/ui_receivecoinsdialog.h>
77

88
#include <qt/addresstablemodel.h>
9+
#include <qt/guiutil.h>
910
#include <qt/optionsmodel.h>
1011
#include <qt/receiverequestdialog.h>
1112
#include <qt/recentrequeststablemodel.h>
@@ -18,7 +19,7 @@
1819
#include <QTextDocument>
1920

2021
ReceiveCoinsDialog::ReceiveCoinsDialog(QWidget* parent) :
21-
QDialog(parent),
22+
QDialog(parent, GUIUtil::dialog_flags),
2223
ui(new Ui::ReceiveCoinsDialog),
2324
model(nullptr)
2425
{

src/qt/receiverequestdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#endif
2020

2121
ReceiveRequestDialog::ReceiveRequestDialog(QWidget *parent) :
22-
QDialog(parent),
22+
QDialog(parent, GUIUtil::dialog_flags),
2323
ui(new Ui::ReceiveRequestDialog),
2424
model(nullptr)
2525
{

src/qt/sendcoinsdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ int getIndexForConfTarget(int target) {
5757
}
5858

5959
SendCoinsDialog::SendCoinsDialog(bool _fCoinJoin, QWidget* parent) :
60-
QDialog(parent),
60+
QDialog(parent, GUIUtil::dialog_flags),
6161
ui(new Ui::SendCoinsDialog),
6262
clientModel(nullptr),
6363
model(nullptr),

src/qt/signverifymessagedialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <QClipboard>
2222

2323
SignVerifyMessageDialog::SignVerifyMessageDialog(QWidget* parent) :
24-
QDialog(parent),
24+
QDialog(parent, GUIUtil::dialog_flags),
2525
ui(new Ui::SignVerifyMessageDialog),
2626
model(nullptr),
2727
pageButtons(nullptr)

src/qt/transactiondescdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <QString>
1414

1515
TransactionDescDialog::TransactionDescDialog(const QModelIndex &idx, QWidget *parent) :
16-
QDialog(parent),
16+
QDialog(parent, GUIUtil::dialog_flags),
1717
ui(new Ui::TransactionDescDialog)
1818
{
1919
ui->setupUi(this);

src/qt/utilitydialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
/** "Help message" or "About" dialog box */
3232
HelpMessageDialog::HelpMessageDialog(interfaces::Node& node, QWidget *parent, HelpMode helpMode) :
33-
QDialog(parent),
33+
QDialog(parent, GUIUtil::dialog_flags),
3434
ui(new Ui::HelpMessageDialog)
3535
{
3636
ui->setupUi(this);

0 commit comments

Comments
 (0)