From 69d6c0dccb42a7ac153f66e1b799a58cf8efde54 Mon Sep 17 00:00:00 2001 From: spycrab Date: Sat, 5 May 2018 02:29:16 +0200 Subject: [PATCH] Qt: Remove "What's this" button --- Source/Core/DolphinQt2/CheatsManager.cpp | 1 + Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.cpp | 2 ++ Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp | 2 ++ Source/Core/DolphinQt2/Config/NewPatchDialog.cpp | 2 ++ Source/Core/DolphinQt2/Config/PropertiesDialog.cpp | 2 ++ Source/Core/DolphinQt2/FIFOPlayerWindow.cpp | 1 + Source/Core/DolphinQt2/GCMemcardManager.cpp | 1 + Source/Core/DolphinQt2/NetPlay/MD5Dialog.cpp | 1 + Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp | 1 + Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp | 2 ++ Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp | 2 ++ 11 files changed, 17 insertions(+) diff --git a/Source/Core/DolphinQt2/CheatsManager.cpp b/Source/Core/DolphinQt2/CheatsManager.cpp index ce759092ad..b75867cb7f 100644 --- a/Source/Core/DolphinQt2/CheatsManager.cpp +++ b/Source/Core/DolphinQt2/CheatsManager.cpp @@ -42,6 +42,7 @@ constexpr int COLUMN_ROLE = Qt::UserRole + 1; CheatsManager::CheatsManager(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("Cheats Manager")); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, &CheatsManager::OnStateChanged); diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.cpp b/Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.cpp index 1b20728690..2d9d880801 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.cpp @@ -15,6 +15,8 @@ GCPadWiiUConfigDialog::GCPadWiiUConfigDialog(int port, QWidget* parent) : QDialog(parent), m_port{port} { + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + CreateLayout(); ConnectWidgets(); diff --git a/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp index bbf4426ef9..dd7f9babc8 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp @@ -34,7 +34,9 @@ IOWindow::IOWindow(QWidget* parent, ControllerEmu::EmulatedController* controlle { CreateMainLayout(); ConnectWidgets(); + setWindowTitle(type == IOWindow::Type::Input ? tr("Configure Input") : tr("Configure Output")); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); Update(); } diff --git a/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp b/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp index 07d9086456..f7f5c0b1cd 100644 --- a/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp +++ b/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp @@ -20,6 +20,8 @@ NewPatchDialog::NewPatchDialog(PatchEngine::Patch& patch) : m_patch(patch) { setWindowTitle(tr("Patch Editor")); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + CreateWidgets(); ConnectWidgets(); diff --git a/Source/Core/DolphinQt2/Config/PropertiesDialog.cpp b/Source/Core/DolphinQt2/Config/PropertiesDialog.cpp index 5236ec6359..e80b6259e4 100644 --- a/Source/Core/DolphinQt2/Config/PropertiesDialog.cpp +++ b/Source/Core/DolphinQt2/Config/PropertiesDialog.cpp @@ -24,6 +24,8 @@ PropertiesDialog::PropertiesDialog(QWidget* parent, const UICommon::GameFile& ga .arg(QString::fromStdString(game.GetFileName()), QString::fromStdString(game.GetGameID()), QString::fromStdString(game.GetLongName()))); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + QVBoxLayout* layout = new QVBoxLayout(); QTabWidget* tab_widget = new QTabWidget(this); diff --git a/Source/Core/DolphinQt2/FIFOPlayerWindow.cpp b/Source/Core/DolphinQt2/FIFOPlayerWindow.cpp index f9eacac5bd..b3a72d0576 100644 --- a/Source/Core/DolphinQt2/FIFOPlayerWindow.cpp +++ b/Source/Core/DolphinQt2/FIFOPlayerWindow.cpp @@ -29,6 +29,7 @@ FIFOPlayerWindow::FIFOPlayerWindow(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("FIFO Player")); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); CreateWidgets(); ConnectWidgets(); diff --git a/Source/Core/DolphinQt2/GCMemcardManager.cpp b/Source/Core/DolphinQt2/GCMemcardManager.cpp index a2a1b0e34c..e46f1a4412 100644 --- a/Source/Core/DolphinQt2/GCMemcardManager.cpp +++ b/Source/Core/DolphinQt2/GCMemcardManager.cpp @@ -49,6 +49,7 @@ 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/DolphinQt2/NetPlay/MD5Dialog.cpp b/Source/Core/DolphinQt2/NetPlay/MD5Dialog.cpp index 72fb4af5d5..a31220e05a 100644 --- a/Source/Core/DolphinQt2/NetPlay/MD5Dialog.cpp +++ b/Source/Core/DolphinQt2/NetPlay/MD5Dialog.cpp @@ -31,6 +31,7 @@ MD5Dialog::MD5Dialog(QWidget* parent) : QDialog(parent) CreateWidgets(); ConnectWidgets(); setWindowTitle(tr("MD5 Checksum")); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); } void MD5Dialog::CreateWidgets() diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp b/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp index f4cc46becb..2d07a4b81e 100644 --- a/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp +++ b/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp @@ -24,6 +24,7 @@ NetPlaySetupDialog::NetPlaySetupDialog(QWidget* parent) : QDialog(parent), m_game_list_model(Settings::Instance().GetGameListModel()) { setWindowTitle(tr("Dolphin NetPlay Setup")); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); CreateMainLayout(); diff --git a/Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp b/Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp index 694b539de0..fd9c7f4a45 100644 --- a/Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp +++ b/Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp @@ -17,6 +17,8 @@ GCTASInputWindow::GCTASInputWindow(QWidget* parent, int num) : QDialog(parent) { setWindowTitle(tr("GameCube TAS Input %1").arg(num + 1)); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + auto* main_stick_box = CreateStickInputs(this, tr("Main Stick"), m_x_main_stick_value, m_y_main_stick_value, 255, 255, Qt::Key_F, Qt::Key_G); auto* c_stick_box = CreateStickInputs(this, tr("C Stick"), m_x_c_stick_value, m_y_c_stick_value, diff --git a/Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp b/Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp index 5b02c164d7..8e8ef58dad 100644 --- a/Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp +++ b/Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp @@ -25,6 +25,8 @@ WiiTASInputWindow::WiiTASInputWindow(QWidget* parent, int num) : QDialog(parent), m_num(num) { + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + const QKeySequence ir_x_shortcut_key_sequence = QKeySequence(Qt::ALT + Qt::Key_F); const QKeySequence ir_y_shortcut_key_sequence = QKeySequence(Qt::ALT + Qt::Key_G);