From 7cd30810a3018655db0c3e0b0868f2c1f5db0414 Mon Sep 17 00:00:00 2001 From: spycrab Date: Sun, 6 May 2018 18:02:39 +0200 Subject: [PATCH] Qt: Make dialogues more consistent --- Source/Core/DolphinQt2/Config/ARCodeWidget.cpp | 4 ++-- Source/Core/DolphinQt2/Config/CheatCodeEditor.cpp | 5 ++++- Source/Core/DolphinQt2/Config/CheatCodeEditor.h | 2 +- Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp | 4 ++-- Source/Core/DolphinQt2/Config/InfoWidget.cpp | 1 + Source/Core/DolphinQt2/Config/NewPatchDialog.cpp | 3 ++- Source/Core/DolphinQt2/Config/NewPatchDialog.h | 2 +- Source/Core/DolphinQt2/Config/PatchesWidget.cpp | 4 ++-- Source/Core/DolphinQt2/NetPlay/GameListDialog.cpp | 1 + .../DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp | 2 ++ 10 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp b/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp index 76776c6539..001ebfd219 100644 --- a/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp +++ b/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp @@ -137,7 +137,7 @@ void ARCodeWidget::OnCodeAddPressed() ActionReplay::ARCode ar; ar.active = true; - CheatCodeEditor ed; + CheatCodeEditor ed(this); ed.SetARCode(&ar); @@ -165,7 +165,7 @@ void ARCodeWidget::OnCodeEditPressed() ActionReplay::ARCode ar = current_ar; - CheatCodeEditor ed; + CheatCodeEditor ed(this); ed.SetARCode(user_defined ? ¤t_ar : &ar); ed.exec(); diff --git a/Source/Core/DolphinQt2/Config/CheatCodeEditor.cpp b/Source/Core/DolphinQt2/Config/CheatCodeEditor.cpp index db30d7e156..cd4385aa15 100644 --- a/Source/Core/DolphinQt2/Config/CheatCodeEditor.cpp +++ b/Source/Core/DolphinQt2/Config/CheatCodeEditor.cpp @@ -17,8 +17,11 @@ #include "Core/ActionReplay.h" #include "Core/GeckoCodeConfig.h" -CheatCodeEditor::CheatCodeEditor() +CheatCodeEditor::CheatCodeEditor(QWidget* parent) : QDialog(parent) { + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + setWindowTitle(tr("Cheat Code Editor")); + CreateWidgets(); ConnectWidgets(); } diff --git a/Source/Core/DolphinQt2/Config/CheatCodeEditor.h b/Source/Core/DolphinQt2/Config/CheatCodeEditor.h index beb0862590..a586790571 100644 --- a/Source/Core/DolphinQt2/Config/CheatCodeEditor.h +++ b/Source/Core/DolphinQt2/Config/CheatCodeEditor.h @@ -22,7 +22,7 @@ class GeckoCode; class CheatCodeEditor : public QDialog { public: - explicit CheatCodeEditor(); + explicit CheatCodeEditor(QWidget* parent); void SetARCode(ActionReplay::ARCode* code); void SetGeckoCode(Gecko::GeckoCode* code); diff --git a/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp b/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp index 607c1c9099..848479ee03 100644 --- a/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp +++ b/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp @@ -168,7 +168,7 @@ void GeckoCodeWidget::AddCode() Gecko::GeckoCode code; code.enabled = true; - CheatCodeEditor ed; + CheatCodeEditor ed(this); ed.SetGeckoCode(&code); if (ed.exec()) @@ -188,7 +188,7 @@ void GeckoCodeWidget::EditCode() int row = m_code_list->row(item); - CheatCodeEditor ed; + CheatCodeEditor ed(this); ed.SetGeckoCode(&m_gecko_codes[row]); diff --git a/Source/Core/DolphinQt2/Config/InfoWidget.cpp b/Source/Core/DolphinQt2/Config/InfoWidget.cpp index b0b71cd747..8c2604488a 100644 --- a/Source/Core/DolphinQt2/Config/InfoWidget.cpp +++ b/Source/Core/DolphinQt2/Config/InfoWidget.cpp @@ -188,6 +188,7 @@ void InfoWidget::ComputeChecksum() QProgressDialog* progress = new QProgressDialog(tr("Computing MD5 Checksum"), tr("Cancel"), 0, 1000, this); progress->setWindowTitle(tr("Computing MD5 Checksum")); + progress->setWindowFlags(progress->windowFlags() & ~Qt::WindowContextHelpButtonHint); progress->setMinimumDuration(500); progress->setWindowModality(Qt::WindowModal); while (read_offset < game_size) diff --git a/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp b/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp index f7f5c0b1cd..3e871b842a 100644 --- a/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp +++ b/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp @@ -17,7 +17,8 @@ #include -NewPatchDialog::NewPatchDialog(PatchEngine::Patch& patch) : m_patch(patch) +NewPatchDialog::NewPatchDialog(QWidget* parent, PatchEngine::Patch& patch) + : QDialog(parent), m_patch(patch) { setWindowTitle(tr("Patch Editor")); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); diff --git a/Source/Core/DolphinQt2/Config/NewPatchDialog.h b/Source/Core/DolphinQt2/Config/NewPatchDialog.h index c3e132efb8..cc62712d9a 100644 --- a/Source/Core/DolphinQt2/Config/NewPatchDialog.h +++ b/Source/Core/DolphinQt2/Config/NewPatchDialog.h @@ -20,7 +20,7 @@ class QPushButton; class NewPatchDialog : public QDialog { public: - explicit NewPatchDialog(PatchEngine::Patch& patch); + explicit NewPatchDialog(QWidget* parent, PatchEngine::Patch& patch); private: void CreateWidgets(); diff --git a/Source/Core/DolphinQt2/Config/PatchesWidget.cpp b/Source/Core/DolphinQt2/Config/PatchesWidget.cpp index 99a99d0901..b7c8a4218a 100644 --- a/Source/Core/DolphinQt2/Config/PatchesWidget.cpp +++ b/Source/Core/DolphinQt2/Config/PatchesWidget.cpp @@ -69,7 +69,7 @@ void PatchesWidget::OnAdd() PatchEngine::Patch patch; patch.user_defined = true; - if (NewPatchDialog(patch).exec()) + if (NewPatchDialog(this, patch).exec()) { m_patches.push_back(patch); SavePatches(); @@ -93,7 +93,7 @@ void PatchesWidget::OnEdit() patch.name = tr("%1 (Copy)").arg(QString::fromStdString(patch.name)).toStdString(); } - if (NewPatchDialog(patch).exec()) + if (NewPatchDialog(this, patch).exec()) { if (patch.user_defined) { diff --git a/Source/Core/DolphinQt2/NetPlay/GameListDialog.cpp b/Source/Core/DolphinQt2/NetPlay/GameListDialog.cpp index 00c5a36ea4..52ce85b345 100644 --- a/Source/Core/DolphinQt2/NetPlay/GameListDialog.cpp +++ b/Source/Core/DolphinQt2/NetPlay/GameListDialog.cpp @@ -14,6 +14,7 @@ GameListDialog::GameListDialog(QWidget* parent) : QDialog(parent) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + setWindowTitle(tr("Select a game")); CreateWidgets(); ConnectWidgets(); diff --git a/Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp b/Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp index ffa718f3cd..7df28c98be 100644 --- a/Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp +++ b/Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp @@ -40,6 +40,8 @@ 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")); m_whitelist_buttonbox->addButton(add_button, QDialogButtonBox::AcceptRole);