Merge bitcoin-core/gui#85: Remove unused "What's This" button in dialogs on Windows OS
ac7ccd67d7scripted-diff: Remove unused "What's This" button in dialogs on Windows (Hennadii Stepanov)b6951483ecqt: Add flags to prevent a "What's This" button on Windows OS (Hennadii Stepanov) Pull request description: Fix #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 (3ba25e3bdd)  - this PR (e322fe7e19ac504272d14b9b4f9b28b13df888ed)  ACKs for top commit: Bosch-0: tACKac7ccd67d7Tested on Windows 10.0.18363 Build 18363. promag: Code review ACKac7ccd67d7but with some suggestions. jonasschnelli: utACKac7ccd67d7Tree-SHA512: f6750a17b7203106cb4db5870becba1cef6a505d4edcc710ba131338bd3aae051510627e62c9bcb8345a7f497c614709e11aeb8f6ae3ea85967bbce2a8c69e64
This commit is contained in:
16 files changed
+21
-15
No files matched your search
@@ -56,7 +56,7 @@ protected:
|
|||||||
};
|
};
|
||||||
|
|
||||||
AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode, Tabs _tab, QWidget *parent) :
|
AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode, Tabs _tab, QWidget *parent) :
|
||||||
QDialog(parent),
|
QDialog(parent, GUIUtil::dialog_flags),
|
||||||
ui(new Ui::AddressBookPage),
|
ui(new Ui::AddressBookPage),
|
||||||
model(nullptr),
|
model(nullptr),
|
||||||
mode(_mode),
|
mode(_mode),
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
|
|
||||||
AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent, SecureString* passphrase_out) :
|
AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent, SecureString* passphrase_out) :
|
||||||
QDialog(parent),
|
QDialog(parent, GUIUtil::dialog_flags),
|
||||||
ui(new Ui::AskPassphraseDialog),
|
ui(new Ui::AskPassphraseDialog),
|
||||||
mode(_mode),
|
mode(_mode),
|
||||||
model(nullptr),
|
model(nullptr),
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ bool CCoinControlWidgetItem::operator<(const QTreeWidgetItem &other) const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
CoinControlDialog::CoinControlDialog(CCoinControl& coin_control, WalletModel* _model, const PlatformStyle *_platformStyle, QWidget *parent) :
|
CoinControlDialog::CoinControlDialog(CCoinControl& coin_control, WalletModel* _model, const PlatformStyle *_platformStyle, QWidget *parent) :
|
||||||
QDialog(parent),
|
QDialog(parent, GUIUtil::dialog_flags),
|
||||||
ui(new Ui::CoinControlDialog),
|
ui(new Ui::CoinControlDialog),
|
||||||
m_coin_control(coin_control),
|
m_coin_control(coin_control),
|
||||||
model(_model),
|
model(_model),
|
||||||
|
|||||||
@@ -9,10 +9,12 @@
|
|||||||
#include <qt/createwalletdialog.h>
|
#include <qt/createwalletdialog.h>
|
||||||
#include <qt/forms/ui_createwalletdialog.h>
|
#include <qt/forms/ui_createwalletdialog.h>
|
||||||
|
|
||||||
|
#include <qt/guiutil.h>
|
||||||
|
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
|
|
||||||
CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
|
CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
|
||||||
QDialog(parent),
|
QDialog(parent, GUIUtil::dialog_flags),
|
||||||
ui(new Ui::CreateWalletDialog)
|
ui(new Ui::CreateWalletDialog)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
|
|
||||||
EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) :
|
EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) :
|
||||||
QDialog(parent),
|
QDialog(parent, GUIUtil::dialog_flags),
|
||||||
ui(new Ui::EditAddressDialog),
|
ui(new Ui::EditAddressDialog),
|
||||||
mapper(nullptr),
|
mapper(nullptr),
|
||||||
mode(_mode),
|
mode(_mode),
|
||||||
|
|||||||
@@ -45,6 +45,9 @@ QT_END_NAMESPACE
|
|||||||
*/
|
*/
|
||||||
namespace GUIUtil
|
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
|
// Create human-readable string from date
|
||||||
QString dateTimeStr(const QDateTime &datetime);
|
QString dateTimeStr(const QDateTime &datetime);
|
||||||
QString dateTimeStr(qint64 nTime);
|
QString dateTimeStr(qint64 nTime);
|
||||||
|
|||||||
+1
-1
@@ -119,7 +119,7 @@ int GetPruneTargetGB()
|
|||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
Intro::Intro(QWidget *parent, int64_t blockchain_size_gb, int64_t chain_state_size_gb) :
|
Intro::Intro(QWidget *parent, int64_t blockchain_size_gb, int64_t chain_state_size_gb) :
|
||||||
QDialog(parent),
|
QDialog(parent, GUIUtil::dialog_flags),
|
||||||
ui(new Ui::Intro),
|
ui(new Ui::Intro),
|
||||||
thread(nullptr),
|
thread(nullptr),
|
||||||
signalled(false),
|
signalled(false),
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
|
|
||||||
OpenURIDialog::OpenURIDialog(QWidget *parent) :
|
OpenURIDialog::OpenURIDialog(QWidget *parent) :
|
||||||
QDialog(parent),
|
QDialog(parent, GUIUtil::dialog_flags),
|
||||||
ui(new Ui::OpenURIDialog)
|
ui(new Ui::OpenURIDialog)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
|
OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
|
||||||
QDialog(parent),
|
QDialog(parent, GUIUtil::dialog_flags),
|
||||||
ui(new Ui::OptionsDialog),
|
ui(new Ui::OptionsDialog),
|
||||||
model(nullptr),
|
model(nullptr),
|
||||||
mapper(nullptr)
|
mapper(nullptr)
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
|
|
||||||
PSBTOperationsDialog::PSBTOperationsDialog(
|
PSBTOperationsDialog::PSBTOperationsDialog(
|
||||||
QWidget* parent, WalletModel* wallet_model, ClientModel* client_model) : QDialog(parent),
|
QWidget* parent, WalletModel* wallet_model, ClientModel* client_model) : QDialog(parent, GUIUtil::dialog_flags),
|
||||||
m_ui(new Ui::PSBTOperationsDialog),
|
m_ui(new Ui::PSBTOperationsDialog),
|
||||||
m_wallet_model(wallet_model),
|
m_wallet_model(wallet_model),
|
||||||
m_client_model(client_model)
|
m_client_model(client_model)
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
#include <qt/forms/ui_receivecoinsdialog.h>
|
#include <qt/forms/ui_receivecoinsdialog.h>
|
||||||
|
|
||||||
#include <qt/addresstablemodel.h>
|
#include <qt/addresstablemodel.h>
|
||||||
|
#include <qt/guiutil.h>
|
||||||
#include <qt/optionsmodel.h>
|
#include <qt/optionsmodel.h>
|
||||||
#include <qt/platformstyle.h>
|
#include <qt/platformstyle.h>
|
||||||
#include <qt/receiverequestdialog.h>
|
#include <qt/receiverequestdialog.h>
|
||||||
@@ -21,7 +22,7 @@
|
|||||||
#include <QTextDocument>
|
#include <QTextDocument>
|
||||||
|
|
||||||
ReceiveCoinsDialog::ReceiveCoinsDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
|
ReceiveCoinsDialog::ReceiveCoinsDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
|
||||||
QDialog(parent),
|
QDialog(parent, GUIUtil::dialog_flags),
|
||||||
ui(new Ui::ReceiveCoinsDialog),
|
ui(new Ui::ReceiveCoinsDialog),
|
||||||
columnResizingFixer(nullptr),
|
columnResizingFixer(nullptr),
|
||||||
model(nullptr),
|
model(nullptr),
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
ReceiveRequestDialog::ReceiveRequestDialog(QWidget *parent) :
|
ReceiveRequestDialog::ReceiveRequestDialog(QWidget *parent) :
|
||||||
QDialog(parent),
|
QDialog(parent, GUIUtil::dialog_flags),
|
||||||
ui(new Ui::ReceiveRequestDialog),
|
ui(new Ui::ReceiveRequestDialog),
|
||||||
model(nullptr)
|
model(nullptr)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ int getIndexForConfTarget(int target) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
SendCoinsDialog::SendCoinsDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
|
SendCoinsDialog::SendCoinsDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
|
||||||
QDialog(parent),
|
QDialog(parent, GUIUtil::dialog_flags),
|
||||||
ui(new Ui::SendCoinsDialog),
|
ui(new Ui::SendCoinsDialog),
|
||||||
clientModel(nullptr),
|
clientModel(nullptr),
|
||||||
model(nullptr),
|
model(nullptr),
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
#include <QClipboard>
|
#include <QClipboard>
|
||||||
|
|
||||||
SignVerifyMessageDialog::SignVerifyMessageDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
|
SignVerifyMessageDialog::SignVerifyMessageDialog(const PlatformStyle *_platformStyle, QWidget *parent) :
|
||||||
QDialog(parent),
|
QDialog(parent, GUIUtil::dialog_flags),
|
||||||
ui(new Ui::SignVerifyMessageDialog),
|
ui(new Ui::SignVerifyMessageDialog),
|
||||||
model(nullptr),
|
model(nullptr),
|
||||||
platformStyle(_platformStyle)
|
platformStyle(_platformStyle)
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
#include <QModelIndex>
|
#include <QModelIndex>
|
||||||
|
|
||||||
TransactionDescDialog::TransactionDescDialog(const QModelIndex &idx, QWidget *parent) :
|
TransactionDescDialog::TransactionDescDialog(const QModelIndex &idx, QWidget *parent) :
|
||||||
QDialog(parent),
|
QDialog(parent, GUIUtil::dialog_flags),
|
||||||
ui(new Ui::TransactionDescDialog)
|
ui(new Ui::TransactionDescDialog)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
/** "Help message" or "About" dialog box */
|
/** "Help message" or "About" dialog box */
|
||||||
HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
|
HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
|
||||||
QDialog(parent),
|
QDialog(parent, GUIUtil::dialog_flags),
|
||||||
ui(new Ui::HelpMessageDialog)
|
ui(new Ui::HelpMessageDialog)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|||||||
Reference in new issue
Block a user