From ee35aa49a2800a341906dbe3cde7626fd0d7849f Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Sun, 25 Aug 2024 15:33:41 -0700 Subject: ARWidget: Disable Edit and Remove buttons when no code is selected Also some minor refactoring of nearby/related code: * Make non-obvious variable types explicit instead of auto. * Throw some consts around. * Use setDisabled(empty) instead of setEnabled(!empty). --- Source/Core/DolphinQt/Config/ARCodeWidget.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'Source/Core/DolphinQt/Config/ARCodeWidget.cpp') diff --git a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp index d40d4f9109..f42a33317b 100644 --- a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp +++ b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp @@ -67,8 +67,8 @@ void ARCodeWidget::CreateWidgets() m_code_list->setEnabled(!m_game_id.empty()); m_code_add->setEnabled(!m_game_id.empty()); - m_code_edit->setEnabled(!m_game_id.empty()); - m_code_remove->setEnabled(!m_game_id.empty()); + m_code_edit->setEnabled(false); + m_code_remove->setEnabled(false); m_code_list->setContextMenuPolicy(Qt::CustomContextMenu); @@ -179,14 +179,18 @@ void ARCodeWidget::OnListReordered() void ARCodeWidget::OnSelectionChanged() { - auto items = m_code_list->selectedItems(); + const QList items = m_code_list->selectedItems(); + const bool empty = items.empty(); - if (items.empty()) + m_code_edit->setDisabled(empty); + m_code_remove->setDisabled(empty); + + if (empty) return; - const auto* selected = items[0]; + const QListWidgetItem* const selected = items[0]; - bool user_defined = m_ar_codes[m_code_list->row(selected)].user_defined; + const bool user_defined = m_ar_codes[m_code_list->row(selected)].user_defined; m_code_remove->setEnabled(user_defined); m_code_edit->setText(user_defined ? tr("&Edit Code...") : tr("Clone and &Edit Code...")); -- cgit v1.2.3 From 232d24109df7af9449c0604523ce4568e78aa52d Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Tue, 30 Jul 2024 19:44:10 -0700 Subject: Extract ARCodeWidget/GeckoCodeWidget code loading to functions --- Source/Core/DolphinQt/Config/ARCodeWidget.cpp | 45 +++++++++++++++------------ 1 file changed, 25 insertions(+), 20 deletions(-) (limited to 'Source/Core/DolphinQt/Config/ARCodeWidget.cpp') diff --git a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp index f42a33317b..82a5dce74b 100644 --- a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp +++ b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp @@ -35,21 +35,7 @@ ARCodeWidget::ARCodeWidget(std::string game_id, u16 game_revision, bool restart_ CreateWidgets(); ConnectWidgets(); - if (!m_game_id.empty()) - { - Common::IniFile game_ini_local; - - // We don't use LoadLocalGameIni() here because user cheat codes that are installed via the UI - // will always be stored in GS/${GAMEID}.ini - game_ini_local.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_game_id + ".ini"); - - const Common::IniFile game_ini_default = - SConfig::LoadDefaultGameIni(m_game_id, m_game_revision); - m_ar_codes = ActionReplay::LoadCodes(game_ini_default, game_ini_local); - } - - UpdateList(); - OnSelectionChanged(); + LoadCodes(); } ARCodeWidget::~ARCodeWidget() = default; @@ -65,11 +51,6 @@ void ARCodeWidget::CreateWidgets() m_code_edit = new NonDefaultQPushButton(tr("&Edit Code...")); m_code_remove = new NonDefaultQPushButton(tr("&Remove Code")); - m_code_list->setEnabled(!m_game_id.empty()); - m_code_add->setEnabled(!m_game_id.empty()); - m_code_edit->setEnabled(false); - m_code_remove->setEnabled(false); - m_code_list->setContextMenuPolicy(Qt::CustomContextMenu); auto* button_layout = new QHBoxLayout; @@ -218,6 +199,30 @@ void ARCodeWidget::UpdateList() m_code_list->setDragDropMode(QAbstractItemView::InternalMove); } +void ARCodeWidget::LoadCodes() +{ + if (!m_game_id.empty()) + { + Common::IniFile game_ini_local; + + // We don't use LoadLocalGameIni() here because user cheat codes that are installed via the UI + // will always be stored in GS/${GAMEID}.ini + game_ini_local.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_game_id + ".ini"); + + const Common::IniFile game_ini_default = + SConfig::LoadDefaultGameIni(m_game_id, m_game_revision); + m_ar_codes = ActionReplay::LoadCodes(game_ini_default, game_ini_local); + } + + m_code_list->setEnabled(!m_game_id.empty()); + m_code_add->setEnabled(!m_game_id.empty()); + m_code_edit->setEnabled(false); + m_code_remove->setEnabled(false); + + UpdateList(); + OnSelectionChanged(); +} + void ARCodeWidget::SaveCodes() { if (m_game_id.empty()) -- cgit v1.2.3 From f4db168a8e63751535d174d27abe7dbab19d4d74 Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Tue, 30 Jul 2024 19:55:27 -0700 Subject: CheatsManager: Create ARCodeWidget and GeckoCodeWidget only once. Create ARCodeWidget and GeckoCodeWidget once on startup rather than every time a game is launched or shutdown. In addition to losing focus on the tab (since the previous widget and tab no longer existed), the behavior prior to this commit could cause a crash if the user initiated a game shutdown and then opened a code edit window since the AR/GeckoCodeWidget would get deleted in the meantime. --- Source/Core/DolphinQt/Config/ARCodeWidget.cpp | 39 ++++++++++++++++++--------- 1 file changed, 26 insertions(+), 13 deletions(-) (limited to 'Source/Core/DolphinQt/Config/ARCodeWidget.cpp') diff --git a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp index 82a5dce74b..a305786f68 100644 --- a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp +++ b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp @@ -40,6 +40,22 @@ ARCodeWidget::ARCodeWidget(std::string game_id, u16 game_revision, bool restart_ ARCodeWidget::~ARCodeWidget() = default; +void ARCodeWidget::ChangeGame(std::string game_id, const u16 game_revision) +{ + m_game_id = std::move(game_id); + m_game_revision = game_revision; + m_restart_required = false; + + m_ar_codes.clear(); + + // If a CheatCodeEditor is open, it's now trying to add or edit a code in the previous game's code + // list which is no longer loaded. Letting the user save the code wouldn't make sense, so close + // the dialog instead. + m_cheat_code_editor->reject(); + + LoadCodes(); +} + void ARCodeWidget::CreateWidgets() { m_warning = new CheatWarningWidget(m_game_id, m_restart_required, this); @@ -51,6 +67,8 @@ void ARCodeWidget::CreateWidgets() m_code_edit = new NonDefaultQPushButton(tr("&Edit Code...")); m_code_remove = new NonDefaultQPushButton(tr("&Remove Code")); + m_cheat_code_editor = new CheatCodeEditor(this); + m_code_list->setContextMenuPolicy(Qt::CustomContextMenu); auto* button_layout = new QHBoxLayout; @@ -250,10 +268,9 @@ void ARCodeWidget::OnCodeAddClicked() ActionReplay::ARCode ar; ar.enabled = true; - CheatCodeEditor ed(this); - ed.SetARCode(&ar); - SetQWidgetWindowDecorations(&ed); - if (ed.exec() == QDialog::Rejected) + m_cheat_code_editor->SetARCode(&ar); + SetQWidgetWindowDecorations(m_cheat_code_editor); + if (m_cheat_code_editor->exec() == QDialog::Rejected) return; m_ar_codes.push_back(std::move(ar)); @@ -270,23 +287,19 @@ void ARCodeWidget::OnCodeEditClicked() const auto* const selected = items[0]; auto& current_ar = m_ar_codes[m_code_list->row(selected)]; + SetQWidgetWindowDecorations(m_cheat_code_editor); - CheatCodeEditor ed(this); if (current_ar.user_defined) { - ed.SetARCode(¤t_ar); - - SetQWidgetWindowDecorations(&ed); - if (ed.exec() == QDialog::Rejected) + m_cheat_code_editor->SetARCode(¤t_ar); + if (m_cheat_code_editor->exec() == QDialog::Rejected) return; } else { ActionReplay::ARCode ar = current_ar; - ed.SetARCode(&ar); - - SetQWidgetWindowDecorations(&ed); - if (ed.exec() == QDialog::Rejected) + m_cheat_code_editor->SetARCode(&ar); + if (m_cheat_code_editor->exec() == QDialog::Rejected) return; m_ar_codes.push_back(std::move(ar)); -- cgit v1.2.3 From 9e6a4e9d3597257629247c43f17698d355866a9c Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Sun, 25 Aug 2024 16:06:44 -0700 Subject: ARCodeWidget: Remove unnecessary call to OnSelectionChanged Before the call to OnSelectionChange, m_code_edit and m_code_remove are disabled and UpdateList calls m_code_list->clear(), thereby deselecting any selected items. When no items are selected, OnSelectionChange disables m_code_edit and m_code_remove and then returns. Since that was already done, the call doesn't change anything and can be removed. --- Source/Core/DolphinQt/Config/ARCodeWidget.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'Source/Core/DolphinQt/Config/ARCodeWidget.cpp') diff --git a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp index a305786f68..933c6575ef 100644 --- a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp +++ b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp @@ -238,7 +238,6 @@ void ARCodeWidget::LoadCodes() m_code_remove->setEnabled(false); UpdateList(); - OnSelectionChanged(); } void ARCodeWidget::SaveCodes() -- cgit v1.2.3