From ed0ba7ef28045182b83ff6bd2fc52906c696518a Mon Sep 17 00:00:00 2001 From: Starsam80 Date: Thu, 29 Jun 2017 18:52:53 -0600 Subject: [PATCH] Qt: Don't show the Qt "What's this" button --- Source/Core/DolphinQt2/AboutDialog.cpp | 1 + Source/Core/DolphinQt2/Config/ControllersWindow.cpp | 1 + Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp | 1 + Source/Core/DolphinQt2/Config/SettingsWindow.cpp | 1 + Source/Core/DolphinQt2/WiiUpdate.cpp | 1 + 5 files changed, 5 insertions(+) diff --git a/Source/Core/DolphinQt2/AboutDialog.cpp b/Source/Core/DolphinQt2/AboutDialog.cpp index b6bb1e06e2..9c237e8eea 100644 --- a/Source/Core/DolphinQt2/AboutDialog.cpp +++ b/Source/Core/DolphinQt2/AboutDialog.cpp @@ -13,6 +13,7 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("About Dolphin")); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setAttribute(Qt::WA_DeleteOnClose); QString text = QStringLiteral(""); diff --git a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp b/Source/Core/DolphinQt2/Config/ControllersWindow.cpp index 1d96b48ccb..c8876c4f0a 100644 --- a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp +++ b/Source/Core/DolphinQt2/Config/ControllersWindow.cpp @@ -69,6 +69,7 @@ static int FromWiimoteMenuIndex(const int menudevice) ControllersWindow::ControllersWindow(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("Controller Settings")); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); CreateGamecubeLayout(); CreateWiimoteLayout(); diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp index 216573c6b1..f7406a5a8b 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp @@ -39,6 +39,7 @@ MappingWindow::MappingWindow(QWidget* parent, int port_num) : QDialog(parent), m_port(port_num) { setWindowTitle(tr("Port %1").arg(port_num + 1)); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); CreateDevicesLayout(); CreateProfilesLayout(); diff --git a/Source/Core/DolphinQt2/Config/SettingsWindow.cpp b/Source/Core/DolphinQt2/Config/SettingsWindow.cpp index a930801ebe..0b6f5af224 100644 --- a/Source/Core/DolphinQt2/Config/SettingsWindow.cpp +++ b/Source/Core/DolphinQt2/Config/SettingsWindow.cpp @@ -23,6 +23,7 @@ SettingsWindow::SettingsWindow(QWidget* parent) : QDialog(parent) { // Set Window Properties setWindowTitle(tr("Settings")); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); resize(720, 600); // Main Layout diff --git a/Source/Core/DolphinQt2/WiiUpdate.cpp b/Source/Core/DolphinQt2/WiiUpdate.cpp index d709e44b50..8db46852e0 100644 --- a/Source/Core/DolphinQt2/WiiUpdate.cpp +++ b/Source/Core/DolphinQt2/WiiUpdate.cpp @@ -43,6 +43,7 @@ void PerformOnlineUpdate(const std::string& region, QWidget* parent) UpdateProgressDialog dialog{parent}; dialog.setLabelText(QObject::tr("Preparing to update...\nThis can take a while.")); dialog.setWindowTitle(QObject::tr("Updating")); + dialog.setWindowFlags(dialog.windowFlags() & ~Qt::WindowContextHelpButtonHint); // QProgressDialog doesn't set its minimum size correctly. dialog.setMinimumSize(360, 150);