From 2a7e8a40037a1690287dcf47fa99b32513418bd0 Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Tue, 27 May 2025 16:52:17 -0700 Subject: [PATCH] DolphinQt: Remove redundant window hints Remove window hints clearing the flag Qt::WindowContextHelpButtonHint, which is already off by default in Qt 6. In Qt 5 this flag was set by default for QDialogs, and on Windows put a ? button in the corner of the title bar allowing users to activate Qt's QWhatsThis help system for a given widget. Since we don't set that text the ? button was useless and so we hid it manually. --- Source/Core/DolphinQt/AboutDialog.cpp | 1 - Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp | 1 - Source/Core/DolphinQt/CheatsManager.cpp | 1 - Source/Core/DolphinQt/Config/CheatCodeEditor.cpp | 1 - .../Config/ControllerInterface/ControllerInterfaceWindow.cpp | 1 - .../ControllerInterface/DualShockUDPClientAddServerDialog.cpp | 1 - Source/Core/DolphinQt/Config/FreeLookWindow.cpp | 1 - .../DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.cpp | 1 - Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp | 1 - .../DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp | 1 - Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp | 2 -- Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp | 1 - Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp | 1 - Source/Core/DolphinQt/Config/NewPatchDialog.cpp | 1 - Source/Core/DolphinQt/Config/SettingsWindow.cpp | 2 -- Source/Core/DolphinQt/ConvertDialog.cpp | 1 - Source/Core/DolphinQt/Debugger/AssembleInstructionDialog.cpp | 1 - Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp | 2 +- Source/Core/DolphinQt/Debugger/BreakpointDialog.cpp | 3 --- Source/Core/DolphinQt/Debugger/PatchInstructionDialog.cpp | 1 - Source/Core/DolphinQt/DiscordJoinRequestDialog.cpp | 1 - Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp | 1 - Source/Core/DolphinQt/GCMemcardManager.cpp | 1 - Source/Core/DolphinQt/NANDRepairDialog.cpp | 1 - Source/Core/DolphinQt/NKitWarningDialog.cpp | 1 - Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp | 1 - Source/Core/DolphinQt/NetPlay/GameListDialog.cpp | 1 - Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp | 2 -- Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp | 2 -- Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp | 1 - Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp | 1 - Source/Core/DolphinQt/QtUtils/ParallelProgressDialog.h | 1 - Source/Core/DolphinQt/ResourcePackManager.cpp | 1 - Source/Core/DolphinQt/RiivolutionBootWidget.cpp | 1 - .../Core/DolphinQt/Settings/BroadbandAdapterSettingsDialog.cpp | 1 - .../Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp | 1 - Source/Core/DolphinQt/TAS/TASInputWindow.cpp | 1 - Source/Core/DolphinQt/Updater.cpp | 1 - Source/Core/DolphinQt/WiiUpdate.cpp | 1 - 39 files changed, 1 insertion(+), 45 deletions(-) diff --git a/Source/Core/DolphinQt/AboutDialog.cpp b/Source/Core/DolphinQt/AboutDialog.cpp index 73cfde11ee..2736fcf65b 100644 --- a/Source/Core/DolphinQt/AboutDialog.cpp +++ b/Source/Core/DolphinQt/AboutDialog.cpp @@ -15,7 +15,6 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("About Dolphin")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); QString branch_str = QString::fromStdString(Common::GetScmBranchStr()); const int commits_ahead = Common::GetScmCommitsAheadMaster(); diff --git a/Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp b/Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp index 9289ee9ad5..a1e17030fc 100644 --- a/Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp +++ b/Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp @@ -27,7 +27,6 @@ AchievementsWindow::AchievementsWindow(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("Achievements")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); CreateMainLayout(); ConnectWidgets(); diff --git a/Source/Core/DolphinQt/CheatsManager.cpp b/Source/Core/DolphinQt/CheatsManager.cpp index 4ad038013f..ecaf4fe2f4 100644 --- a/Source/Core/DolphinQt/CheatsManager.cpp +++ b/Source/Core/DolphinQt/CheatsManager.cpp @@ -26,7 +26,6 @@ CheatsManager::CheatsManager(Core::System& system, QWidget* parent) : QDialog(parent), m_system(system) { setWindowTitle(tr("Cheats Manager")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, &CheatsManager::OnStateChanged); diff --git a/Source/Core/DolphinQt/Config/CheatCodeEditor.cpp b/Source/Core/DolphinQt/Config/CheatCodeEditor.cpp index 4643e7a3f1..c29eb3a86e 100644 --- a/Source/Core/DolphinQt/Config/CheatCodeEditor.cpp +++ b/Source/Core/DolphinQt/Config/CheatCodeEditor.cpp @@ -23,7 +23,6 @@ CheatCodeEditor::CheatCodeEditor(QWidget* parent) : QDialog(parent) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Cheat Code Editor")); CreateWidgets(); diff --git a/Source/Core/DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.cpp b/Source/Core/DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.cpp index 5201c11fe8..42bfe61ada 100644 --- a/Source/Core/DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.cpp +++ b/Source/Core/DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.cpp @@ -17,7 +17,6 @@ ControllerInterfaceWindow::ControllerInterfaceWindow(QWidget* parent) : QDialog( CreateMainLayout(); setWindowTitle(tr("Alternate Input Sources")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); } void ControllerInterfaceWindow::CreateMainLayout() diff --git a/Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientAddServerDialog.cpp b/Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientAddServerDialog.cpp index 84185da00d..04315c6aeb 100644 --- a/Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientAddServerDialog.cpp +++ b/Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientAddServerDialog.cpp @@ -29,7 +29,6 @@ DualShockUDPClientAddServerDialog::DualShockUDPClientAddServerDialog(QWidget* pa void DualShockUDPClientAddServerDialog::CreateWidgets() { setWindowTitle(tr("Add New DSU Server")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); m_main_layout = new QGridLayout; diff --git a/Source/Core/DolphinQt/Config/FreeLookWindow.cpp b/Source/Core/DolphinQt/Config/FreeLookWindow.cpp index d2c57be8a6..b49f6e5f8a 100644 --- a/Source/Core/DolphinQt/Config/FreeLookWindow.cpp +++ b/Source/Core/DolphinQt/Config/FreeLookWindow.cpp @@ -17,7 +17,6 @@ FreeLookWindow::FreeLookWindow(QWidget* parent) : QDialog(parent) ConnectWidgets(); setWindowTitle(tr("Free Look Settings")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); } void FreeLookWindow::CreateMainLayout() diff --git a/Source/Core/DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.cpp b/Source/Core/DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.cpp index 62f2437b57..735462a360 100644 --- a/Source/Core/DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.cpp @@ -22,7 +22,6 @@ ColorCorrectionConfigWindow::ColorCorrectionConfigWindow(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("Color Correction Configuration")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); Create(); ConnectWidgets(); diff --git a/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp index 41d2081e38..f6f80cb4c7 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp @@ -28,7 +28,6 @@ GraphicsWindow::GraphicsWindow(MainWindow* parent) : QDialog(parent), m_main_win CreateMainLayout(); setWindowTitle(tr("Graphics")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); OnBackendChanged(QString::fromStdString(Config::Get(Config::MAIN_GFX_BACKEND))); diff --git a/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp b/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp index 192f3252f8..dfa1499f49 100644 --- a/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp @@ -42,7 +42,6 @@ PostProcessingConfigWindow::PostProcessingConfigWindow(EnhancementsWidget* paren } setWindowTitle(tr("Post-Processing Shader Configuration")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); PopulateGroups(); Create(); diff --git a/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp b/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp index d2352f9f80..82b39d28e3 100644 --- a/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp @@ -17,8 +17,6 @@ GCPadWiiUConfigDialog::GCPadWiiUConfigDialog(int port, QWidget* parent) : QDialog(parent), m_port{port} { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - CreateLayout(); LoadSettings(); diff --git a/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp index 9afaeda575..21de762ed3 100644 --- a/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp @@ -268,7 +268,6 @@ IOWindow::IOWindow(MappingWindow* window, ControllerEmu::EmulatedController* con connect(&Settings::Instance(), &Settings::ConfigChanged, this, &IOWindow::ConfigChanged); setWindowTitle(type == IOWindow::Type::Input ? tr("Configure Input") : tr("Configure Output")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); ConfigChanged(); diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp index 7c5cb41939..2ead76d209 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp @@ -65,7 +65,6 @@ MappingWindow::MappingWindow(QWidget* parent, Type type, 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/DolphinQt/Config/NewPatchDialog.cpp b/Source/Core/DolphinQt/Config/NewPatchDialog.cpp index 7ac0d7ede2..828fd61ebe 100644 --- a/Source/Core/DolphinQt/Config/NewPatchDialog.cpp +++ b/Source/Core/DolphinQt/Config/NewPatchDialog.cpp @@ -38,7 +38,6 @@ NewPatchDialog::NewPatchDialog(QWidget* parent, PatchEngine::Patch& patch) : QDialog(parent), m_patch(patch) { setWindowTitle(tr("Patch Editor")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); CreateWidgets(); ConnectWidgets(); diff --git a/Source/Core/DolphinQt/Config/SettingsWindow.cpp b/Source/Core/DolphinQt/Config/SettingsWindow.cpp index 0c8ebefcbb..35bda6d93f 100644 --- a/Source/Core/DolphinQt/Config/SettingsWindow.cpp +++ b/Source/Core/DolphinQt/Config/SettingsWindow.cpp @@ -24,8 +24,6 @@ StackedSettingsWindow::StackedSettingsWindow(QWidget* parent) : QDialog{parent} { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - // This eliminates the ugly line between the title bar and window contents with KDE Plasma. setStyleSheet(QStringLiteral("QDialog { border: none; }")); diff --git a/Source/Core/DolphinQt/ConvertDialog.cpp b/Source/Core/DolphinQt/ConvertDialog.cpp index 5e29463117..f4e363c79f 100644 --- a/Source/Core/DolphinQt/ConvertDialog.cpp +++ b/Source/Core/DolphinQt/ConvertDialog.cpp @@ -42,7 +42,6 @@ ConvertDialog::ConvertDialog(QList> fi ASSERT(!m_files.empty()); setWindowTitle(tr("Convert")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); QGridLayout* grid_layout = new QGridLayout; grid_layout->setColumnStretch(1, 1); diff --git a/Source/Core/DolphinQt/Debugger/AssembleInstructionDialog.cpp b/Source/Core/DolphinQt/Debugger/AssembleInstructionDialog.cpp index a130576e08..7d7c0ce2c4 100644 --- a/Source/Core/DolphinQt/Debugger/AssembleInstructionDialog.cpp +++ b/Source/Core/DolphinQt/Debugger/AssembleInstructionDialog.cpp @@ -41,7 +41,6 @@ QString HtmlFormatErrorLine(const Common::GekkoAssembler::AssemblerError& err) AssembleInstructionDialog::AssembleInstructionDialog(QWidget* parent, u32 address, u32 value) : QDialog(parent), m_code(value), m_address(address) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowModality(Qt::WindowModal); setWindowTitle(tr("Instruction")); diff --git a/Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp b/Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp index 949bb8d65c..b5b073fbd3 100644 --- a/Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp +++ b/Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp @@ -200,7 +200,7 @@ BranchWatchDialog::BranchWatchDialog(Core::System& system, Core::BranchWatch& br : QDialog(parent), m_system(system), m_branch_watch(branch_watch), m_code_widget(code_widget) { setWindowTitle(tr("Branch Watch Tool")); - setWindowFlags((windowFlags() | Qt::WindowMinMaxButtonsHint) & ~Qt::WindowContextHelpButtonHint); + setWindowFlags(windowFlags() | Qt::WindowMinMaxButtonsHint); // Branch Watch Table m_table_view = new QTableView(nullptr); diff --git a/Source/Core/DolphinQt/Debugger/BreakpointDialog.cpp b/Source/Core/DolphinQt/Debugger/BreakpointDialog.cpp index ba7fe1feb5..b7ffee2cf0 100644 --- a/Source/Core/DolphinQt/Debugger/BreakpointDialog.cpp +++ b/Source/Core/DolphinQt/Debugger/BreakpointDialog.cpp @@ -24,7 +24,6 @@ BreakpointDialog::BreakpointDialog(BreakpointWidget* parent) : QDialog(parent), m_parent(parent), m_open_mode(OpenMode::New) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("New Breakpoint")); CreateWidgets(); ConnectWidgets(); @@ -36,7 +35,6 @@ BreakpointDialog::BreakpointDialog(BreakpointWidget* parent) BreakpointDialog::BreakpointDialog(BreakpointWidget* parent, const TBreakPoint* breakpoint) : QDialog(parent), m_parent(parent), m_open_mode(OpenMode::EditBreakPoint) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Edit Breakpoint")); CreateWidgets(); ConnectWidgets(); @@ -56,7 +54,6 @@ BreakpointDialog::BreakpointDialog(BreakpointWidget* parent, const TBreakPoint* BreakpointDialog::BreakpointDialog(BreakpointWidget* parent, const TMemCheck* memcheck) : QDialog(parent), m_parent(parent), m_open_mode(OpenMode::EditMemCheck) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Edit Breakpoint")); CreateWidgets(); diff --git a/Source/Core/DolphinQt/Debugger/PatchInstructionDialog.cpp b/Source/Core/DolphinQt/Debugger/PatchInstructionDialog.cpp index 9a562863d6..9a54567d3e 100644 --- a/Source/Core/DolphinQt/Debugger/PatchInstructionDialog.cpp +++ b/Source/Core/DolphinQt/Debugger/PatchInstructionDialog.cpp @@ -14,7 +14,6 @@ PatchInstructionDialog::PatchInstructionDialog(QWidget* parent, u32 address, u32 value) : QDialog(parent), m_address(address) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowModality(Qt::WindowModal); setWindowTitle(tr("Instruction")); diff --git a/Source/Core/DolphinQt/DiscordJoinRequestDialog.cpp b/Source/Core/DolphinQt/DiscordJoinRequestDialog.cpp index cbb9800841..9c00f7c8cb 100644 --- a/Source/Core/DolphinQt/DiscordJoinRequestDialog.cpp +++ b/Source/Core/DolphinQt/DiscordJoinRequestDialog.cpp @@ -21,7 +21,6 @@ DiscordJoinRequestDialog::DiscordJoinRequestDialog(QWidget* parent, const std::s : QDialog(parent), m_user_id(id), m_close_timestamp(std::time(nullptr) + s_max_lifetime_seconds) { setWindowTitle(tr("Request to Join Your Party")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); QPixmap avatar_pixmap; diff --git a/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp b/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp index 6b68b6fbfd..dc37017830 100644 --- a/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp +++ b/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp @@ -60,7 +60,6 @@ GCMemcardCreateNewDialog::GCMemcardCreateNewDialog(QWidget* parent) : QDialog(pa }); setWindowTitle(tr("Create New Memory Card")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); } GCMemcardCreateNewDialog::~GCMemcardCreateNewDialog() = default; diff --git a/Source/Core/DolphinQt/GCMemcardManager.cpp b/Source/Core/DolphinQt/GCMemcardManager.cpp index a3d19b5d57..40255f9c7d 100644 --- a/Source/Core/DolphinQt/GCMemcardManager.cpp +++ b/Source/Core/DolphinQt/GCMemcardManager.cpp @@ -98,7 +98,6 @@ GCMemcardManager::GCMemcardManager(QWidget* parent) : QDialog(parent) resize(650, 500); setWindowTitle(tr("GameCube Memory Card Manager")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); } GCMemcardManager::~GCMemcardManager() = default; diff --git a/Source/Core/DolphinQt/NANDRepairDialog.cpp b/Source/Core/DolphinQt/NANDRepairDialog.cpp index f88f666740..07efab4eea 100644 --- a/Source/Core/DolphinQt/NANDRepairDialog.cpp +++ b/Source/Core/DolphinQt/NANDRepairDialog.cpp @@ -27,7 +27,6 @@ NANDRepairDialog::NANDRepairDialog(const WiiUtils::NANDCheckResult& result, QWid : QDialog(parent) { setWindowTitle(tr("NAND Check")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowIcon(Resources::GetAppIcon()); QVBoxLayout* main_layout = new QVBoxLayout(); diff --git a/Source/Core/DolphinQt/NKitWarningDialog.cpp b/Source/Core/DolphinQt/NKitWarningDialog.cpp index 6c1bd5b117..72c5e8c2d1 100644 --- a/Source/Core/DolphinQt/NKitWarningDialog.cpp +++ b/Source/Core/DolphinQt/NKitWarningDialog.cpp @@ -30,7 +30,6 @@ bool NKitWarningDialog::ShowUnlessDisabled(QWidget* parent) NKitWarningDialog::NKitWarningDialog(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("NKit Warning")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowIcon(Resources::GetAppIcon()); QVBoxLayout* main_layout = new QVBoxLayout; diff --git a/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp b/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp index 46e6223ac4..1815344761 100644 --- a/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp @@ -45,7 +45,6 @@ ChunkedProgressDialog::ChunkedProgressDialog(QWidget* parent) : QDialog(parent) CreateWidgets(); ConnectWidgets(); setWindowTitle(tr("Data Transfer")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); } void ChunkedProgressDialog::CreateWidgets() diff --git a/Source/Core/DolphinQt/NetPlay/GameListDialog.cpp b/Source/Core/DolphinQt/NetPlay/GameListDialog.cpp index e459fda3f6..75828cb466 100644 --- a/Source/Core/DolphinQt/NetPlay/GameListDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/GameListDialog.cpp @@ -14,7 +14,6 @@ GameListDialog::GameListDialog(const GameListModel& game_list_model, QWidget* parent) : QDialog(parent), m_game_list_model(game_list_model) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Select a game")); CreateWidgets(); diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp index ef753ef92f..be3dd19844 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp @@ -32,7 +32,6 @@ NetPlayBrowser::NetPlayBrowser(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("NetPlay Session Browser")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); CreateWidgets(); RestoreSettings(); @@ -297,7 +296,6 @@ void NetPlayBrowser::accept() { QInputDialog dialog(this); - dialog.setWindowFlags(dialog.windowFlags() & ~Qt::WindowContextHelpButtonHint); dialog.setWindowTitle(tr("Enter password")); dialog.setLabelText(tr("This session requires a password:")); dialog.setWindowModality(Qt::WindowModal); diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp index ad9b5acf86..7eb0edcf8f 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp @@ -97,8 +97,6 @@ NetPlayDialog::NetPlayDialog(const GameListModel& game_list_model, : QDialog(parent), m_game_list_model(game_list_model), m_start_game_callback(std::move(start_game_callback)) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - setWindowTitle(tr("NetPlay")); setWindowIcon(Resources::GetAppIcon()); diff --git a/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp index 8791cb9e92..9188768229 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp @@ -32,7 +32,6 @@ NetPlaySetupDialog::NetPlaySetupDialog(const GameListModel& game_list_model, QWi : QDialog(parent), m_game_list_model(game_list_model) { setWindowTitle(tr("NetPlay Setup")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); CreateMainLayout(); diff --git a/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp b/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp index fa4bdf43a6..cd7c4d893b 100644 --- a/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp @@ -17,7 +17,6 @@ PadMappingDialog::PadMappingDialog(QWidget* parent) : QDialog(parent) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Assign Controllers")); CreateWidgets(); diff --git a/Source/Core/DolphinQt/QtUtils/ParallelProgressDialog.h b/Source/Core/DolphinQt/QtUtils/ParallelProgressDialog.h index 573c2ed2d2..393a1bbabf 100644 --- a/Source/Core/DolphinQt/QtUtils/ParallelProgressDialog.h +++ b/Source/Core/DolphinQt/QtUtils/ParallelProgressDialog.h @@ -26,7 +26,6 @@ public: ParallelProgressDialog(Args&&... args) : m_dialog{std::forward(args)...} { setParent(m_dialog.parent()); - m_dialog.setWindowFlags(m_dialog.windowFlags() & ~Qt::WindowContextHelpButtonHint); ConnectSignalsAndSlots(); } diff --git a/Source/Core/DolphinQt/ResourcePackManager.cpp b/Source/Core/DolphinQt/ResourcePackManager.cpp index eac48cd6c5..6e1f2c2f90 100644 --- a/Source/Core/DolphinQt/ResourcePackManager.cpp +++ b/Source/Core/DolphinQt/ResourcePackManager.cpp @@ -24,7 +24,6 @@ ResourcePackManager::ResourcePackManager(QWidget* widget) : QDialog(widget) RepopulateTable(); setWindowTitle(tr("Resource Pack Manager")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); resize(QSize(900, 600)); } diff --git a/Source/Core/DolphinQt/RiivolutionBootWidget.cpp b/Source/Core/DolphinQt/RiivolutionBootWidget.cpp index 29b5af0a1f..59d8949728 100644 --- a/Source/Core/DolphinQt/RiivolutionBootWidget.cpp +++ b/Source/Core/DolphinQt/RiivolutionBootWidget.cpp @@ -46,7 +46,6 @@ RiivolutionBootWidget::RiivolutionBootWidget(std::string game_id, std::optional< m_base_game_path(std::move(base_game_path)) { setWindowTitle(tr("Start with Riivolution Patches")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); CreateWidgets(); ConnectWidgets(); diff --git a/Source/Core/DolphinQt/Settings/BroadbandAdapterSettingsDialog.cpp b/Source/Core/DolphinQt/Settings/BroadbandAdapterSettingsDialog.cpp index 0eecfdf455..41009e9b54 100644 --- a/Source/Core/DolphinQt/Settings/BroadbandAdapterSettingsDialog.cpp +++ b/Source/Core/DolphinQt/Settings/BroadbandAdapterSettingsDialog.cpp @@ -95,7 +95,6 @@ void BroadbandAdapterSettingsDialog::InitControls() } setWindowTitle(window_title); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); m_address_input = new QLineEdit(current_address); m_address_input->setPlaceholderText(address_placeholder); diff --git a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp index cf159e0a16..94f94c4c28 100644 --- a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp +++ b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp @@ -42,7 +42,6 @@ USBDeviceAddToWhitelistDialog::USBDeviceAddToWhitelistDialog(QWidget* parent) : void USBDeviceAddToWhitelistDialog::InitControls() { setWindowTitle(tr("Add New USB Device")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); m_whitelist_buttonbox = new QDialogButtonBox(); auto* add_button = new QPushButton(tr("Add")); diff --git a/Source/Core/DolphinQt/TAS/TASInputWindow.cpp b/Source/Core/DolphinQt/TAS/TASInputWindow.cpp index 8075c6af58..00e2679c3a 100644 --- a/Source/Core/DolphinQt/TAS/TASInputWindow.cpp +++ b/Source/Core/DolphinQt/TAS/TASInputWindow.cpp @@ -45,7 +45,6 @@ ControllerEmu::InputOverrideFunction InputOverrider::GetInputOverrideFunction() TASInputWindow::TASInputWindow(QWidget* parent) : QDialog(parent) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowIcon(Resources::GetAppIcon()); QGridLayout* settings_layout = new QGridLayout; diff --git a/Source/Core/DolphinQt/Updater.cpp b/Source/Core/DolphinQt/Updater.cpp index 0cfac079e1..bb394e8204 100644 --- a/Source/Core/DolphinQt/Updater.cpp +++ b/Source/Core/DolphinQt/Updater.cpp @@ -59,7 +59,6 @@ void Updater::OnUpdateAvailable(const NewVersionInformation& info) QDialog* dialog = new QDialog(m_parent); dialog->setAttribute(Qt::WA_DeleteOnClose, true); dialog->setWindowTitle(tr("Update available")); - dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint); auto* label = new QLabel( tr("

A new version of Dolphin is available!

Dolphin %1 is available for " diff --git a/Source/Core/DolphinQt/WiiUpdate.cpp b/Source/Core/DolphinQt/WiiUpdate.cpp index 633f02c2ce..5b07318914 100644 --- a/Source/Core/DolphinQt/WiiUpdate.cpp +++ b/Source/Core/DolphinQt/WiiUpdate.cpp @@ -96,7 +96,6 @@ static WiiUtils::UpdateResult ShowProgress(QWidget* parent, Callable function, A 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);