Skip to content

Commit 68692d3

Browse files
committed
Merge bitcoin-core#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 bitcoin-core#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 (e322fe7) ![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
2 parents 7595183 + ac7ccd6 commit 68692d3

16 files changed

+21
-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
@@ -45,6 +45,9 @@ QT_END_NAMESPACE
4545
*/
4646
namespace GUIUtil
4747
{
48+
// Use this flags to prevent a "What's This" button in the title bar of the dialog on Windows.
49+
constexpr auto dialog_flags = Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint;
50+
4851
// Create human-readable string from date
4952
QString dateTimeStr(const QDateTime &datetime);
5053
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
@@ -29,7 +29,7 @@
2929
#include <QTimer>
3030

3131
OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
32-
QDialog(parent),
32+
QDialog(parent, GUIUtil::dialog_flags),
3333
ui(new Ui::OptionsDialog),
3434
model(nullptr),
3535
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)