From 95b413a458481527f64a31ddc183784dd1dc2121 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 9 May 2019 01:08:03 -0400 Subject: [PATCH 1/3] yuzu/compatdb: Remove unnecessary qualifiers Keeps the code consistent in regards to how the buttons are referred to. --- src/citra_qt/compatdb.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/citra_qt/compatdb.cpp b/src/citra_qt/compatdb.cpp index 6b6c7f37f6..50d31a77b3 100644 --- a/src/citra_qt/compatdb.cpp +++ b/src/citra_qt/compatdb.cpp @@ -56,7 +56,7 @@ void CompatDB::Submit() { button(NextButton)->setEnabled(false); button(NextButton)->setText(tr("Submitting")); - button(QWizard::CancelButton)->setVisible(false); + button(CancelButton)->setVisible(false); testcase_watcher.setFuture(QtConcurrent::run( [] { return Core::System::GetInstance().TelemetrySession().SubmitTestcase(); })); @@ -72,12 +72,12 @@ void CompatDB::OnTestcaseSubmitted() { tr("An error occured while sending the Testcase")); button(NextButton)->setEnabled(true); button(NextButton)->setText(tr("Next")); - button(QWizard::CancelButton)->setVisible(true); + button(CancelButton)->setVisible(true); } else { next(); // older versions of QT don't support the "NoCancelButtonOnLastPage" option, this is a // workaround - button(QWizard::CancelButton)->setVisible(false); + button(CancelButton)->setVisible(false); } } From eeb8dca7b9296980cf3032c0dd39348ba17d45d8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 9 May 2019 02:13:50 -0400 Subject: [PATCH 2/3] yuzu/hotkeys: Remove unnecessary constructor The behavior of the Hotkey constructor is already accomplished via in-class member initializers, so the constructor is superfluous here. --- src/citra_qt/hotkeys.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/citra_qt/hotkeys.h b/src/citra_qt/hotkeys.h index 4f526dc7e8..248fadaf38 100644 --- a/src/citra_qt/hotkeys.h +++ b/src/citra_qt/hotkeys.h @@ -67,8 +67,6 @@ public: private: struct Hotkey { - Hotkey() : shortcut(nullptr), context(Qt::WindowShortcut) {} - QKeySequence keyseq; QShortcut* shortcut = nullptr; Qt::ShortcutContext context = Qt::WindowShortcut; From 563e1622caeefe42d0dfd67c6fc7185f7d96e7e0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 9 May 2019 03:20:13 -0400 Subject: [PATCH 3/3] configure_dialog: Remove the Whats This? button from the dialog --- src/citra_qt/configuration/configure_dialog.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/citra_qt/configuration/configure_dialog.cpp b/src/citra_qt/configuration/configure_dialog.cpp index 653f2a3875..0c9e34d05d 100644 --- a/src/citra_qt/configuration/configure_dialog.cpp +++ b/src/citra_qt/configuration/configure_dialog.cpp @@ -17,9 +17,13 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry, bool ui->webTab->SetWebServiceConfigEnabled(enable_web_config); this->PopulateSelectionList(); + + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + connect(ui->uiTab, &ConfigureUi::languageChanged, this, &ConfigureDialog::onLanguageChanged); connect(ui->selectorList, &QListWidget::itemSelectionChanged, this, &ConfigureDialog::UpdateVisibleTabs); + adjustSize(); ui->selectorList->setCurrentRow(0);