Skip to content

Commit e322fe7

Browse files
committed
scripted-diff: Remove unused "What's This" button in dialogs on Windows
-BEGIN VERIFY SCRIPT- git grep -l 'QDialog(parent)' -- src/qt | xargs sed -i -E 's/QDialog\(parent\)/QDialog\(parent, GUIUtil::dialog_flags\)/g' patch -p1 << "EOF" --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -43,6 +43,9 @@ QT_END_NAMESPACE */ namespace GUIUtil { + // Use this flags to prevent a "What's This" button in the title bar of the dialog on Windows. + constexpr auto dialog_flags = Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint; + // Create human-readable string from date QString dateTimeStr(const QDateTime &datetime); QString dateTimeStr(qint64 nTime); --- a/src/qt/createwalletdialog.cpp +++ b/src/qt/createwalletdialog.cpp @@ -9,6 +9,8 @@ #include <qt/createwalletdialog.h> #include <qt/forms/ui_createwalletdialog.h> +#include <qt/guiutil.h> + #include <QPushButton> CreateWalletDialog::CreateWalletDialog(QWidget* parent) : EOF -END VERIFY SCRIPT-
1 parent 3ba25e3 commit e322fe7

16 files changed

+20
-15
lines changed

src/qt/addressbookpage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class AddressBookSortFilterProxyModel final : public QSortFilterProxyModel
5656
};
5757

5858
AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode, Tabs _tab, QWidget *parent) :
59-
QDialog(parent),
59+
QDialog(parent, GUIUtil::dialog_flags),
6060
ui(new Ui::AddressBookPage),
6161
model(nullptr),
6262
mode(_mode),

src/qt/askpassphrasedialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <QPushButton>
2121

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

src/qt/coincontroldialog.cpp

Lines changed: 1 addition & 1 deletion
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, const PlatformStyle *_platformStyle, 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

Lines changed: 3 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ QT_END_NAMESPACE
4343
*/
4444
namespace GUIUtil
4545
{
46+
// Use this flags to prevent a "What's This" button in the title bar of the dialog on Windows.
47+
constexpr auto dialog_flags = Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint;
48+
4649
// Create human-readable string from date
4750
QString dateTimeStr(const QDateTime &datetime);
4851
QString dateTimeStr(qint64 nTime);

src/qt/intro.cpp

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <QUrl>
1212

1313
OpenURIDialog::OpenURIDialog(QWidget *parent) :
14-
QDialog(parent),
14+
QDialog(parent, GUIUtil::dialog_flags),
1515
ui(new Ui::OpenURIDialog)
1616
{
1717
ui->setupUi(this);

src/qt/optionsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <QTimer>
2929

3030
OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
31-
QDialog(parent),
31+
QDialog(parent, GUIUtil::dialog_flags),
3232
ui(new Ui::OptionsDialog),
3333
model(nullptr),
3434
mapper(nullptr)

src/qt/psbtoperationsdialog.cpp

Lines changed: 1 addition & 1 deletion
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)

0 commit comments

Comments
 (0)