Merge pull request #10104 from AdmiralCurtiss/cheats-manager-ux

Cheats Manager UX improvements.

Source/Core/DolphinQt/CheatsManager.cpp

@@ -30,24 +30,30 @@ CheatsManager::CheatsManager(QWidget* parent) : QDialog(parent)
   connect(&Settings::Instance(), &Settings::EmulationStateChanged, this,
           &CheatsManager::OnStateChanged);
 
-  OnStateChanged(Core::GetState());
-
   CreateWidgets();
   ConnectWidgets();
+
+  RefreshCodeTabs(Core::GetState(), true);
 }
 
 CheatsManager::~CheatsManager() = default;
 
 void CheatsManager::OnStateChanged(Core::State state)
 {
-  if (state != Core::State::Running && state != Core::State::Paused)
+  RefreshCodeTabs(state, false);
+}
+
+void CheatsManager::RefreshCodeTabs(Core::State state, bool force)
+{
+  if (!force && (state == Core::State::Starting || state == Core::State::Stopping))
     return;
 
-  const auto& game_id = SConfig::GetInstance().GetGameID();
+  const auto& game_id =
+      state != Core::State::Uninitialized ? SConfig::GetInstance().GetGameID() : std::string();
   const auto& game_tdb_id = SConfig::GetInstance().GetGameTDBID();
   const u16 revision = SConfig::GetInstance().GetRevision();
 
-  if (m_game_id == game_id && m_game_tdb_id == game_tdb_id && m_revision == revision)
+  if (!force && m_game_id == game_id && m_game_tdb_id == game_tdb_id && m_revision == revision)
     return;
 
   m_game_id = game_id;
@@ -78,6 +84,10 @@ void CheatsManager::OnStateChanged(Core::State state)
   m_tab_widget->insertTab(1, m_gecko_code, tr("Gecko Codes"));
   m_tab_widget->setTabUnclosable(0);
   m_tab_widget->setTabUnclosable(1);
+
+  connect(m_ar_code, &ARCodeWidget::OpenGeneralSettings, this, &CheatsManager::OpenGeneralSettings);
+  connect(m_gecko_code, &GeckoCodeWidget::OpenGeneralSettings, this,
+          &CheatsManager::OpenGeneralSettings);
 }
 
 void CheatsManager::CreateWidgets()

Source/Core/DolphinQt/CheatsManager.h

@@ -33,13 +33,18 @@ class CheatsManager : public QDialog
   explicit CheatsManager(QWidget* parent = nullptr);
   ~CheatsManager();
 
+signals:
+  void OpenGeneralSettings();
+
 private:
   void CreateWidgets();
   void ConnectWidgets();
   void OnStateChanged(Core::State state);
   void OnNewSessionCreated(const Cheats::CheatSearchSessionBase& session);
   void OnTabCloseRequested(int index);
 
+  void RefreshCodeTabs(Core::State state, bool force);
+
   std::string m_game_id;
   std::string m_game_tdb_id;
   u16 m_revision = 0;

Source/Core/DolphinQt/Config/ARCodeWidget.cpp

@@ -31,14 +31,17 @@ ARCodeWidget::ARCodeWidget(std::string game_id, u16 game_revision, bool restart_
   CreateWidgets();
   ConnectWidgets();
 
-  IniFile game_ini_local;
+  if (!m_game_id.empty())
+  {
+    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");
+    // 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 IniFile game_ini_default = SConfig::LoadDefaultGameIni(m_game_id, m_game_revision);
-  m_ar_codes = ActionReplay::LoadCodes(game_ini_default, game_ini_local);
+    const 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();
@@ -54,6 +57,11 @@ void ARCodeWidget::CreateWidgets()
   m_code_edit = new QPushButton(tr("&Edit Code..."));
   m_code_remove = new QPushButton(tr("&Remove Code"));
 
+  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_list->setContextMenuPolicy(Qt::CustomContextMenu);
 
   auto* button_layout = new QHBoxLayout;
@@ -171,6 +179,9 @@ void ARCodeWidget::UpdateList()
 
 void ARCodeWidget::SaveCodes()
 {
+  if (m_game_id.empty())
+    return;
+
   const auto ini_path =
       std::string(File::GetUserPath(D_GAMESETTINGS_IDX)).append(m_game_id).append(".ini");
 

Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp

@@ -37,14 +37,17 @@ GeckoCodeWidget::GeckoCodeWidget(std::string game_id, std::string gametdb_id, u1
   CreateWidgets();
   ConnectWidgets();
 
-  IniFile game_ini_local;
+  if (!m_game_id.empty())
+  {
+    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");
+    // 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 IniFile game_ini_default = SConfig::LoadDefaultGameIni(m_game_id, m_game_revision);
-  m_gecko_codes = Gecko::LoadCodes(game_ini_default, game_ini_local);
+    const IniFile game_ini_default = SConfig::LoadDefaultGameIni(m_game_id, m_game_revision);
+    m_gecko_codes = Gecko::LoadCodes(game_ini_default, game_ini_local);
+  }
 
   UpdateList();
 }
@@ -81,9 +84,16 @@ void GeckoCodeWidget::CreateWidgets()
 
   m_download_codes->setToolTip(tr("Download Codes from the WiiRD Database"));
 
-  m_download_codes->setEnabled(!m_game_id.empty());
+  m_code_list->setEnabled(!m_game_id.empty());
+  m_name_label->setEnabled(!m_game_id.empty());
+  m_creator_label->setEnabled(!m_game_id.empty());
+  m_code_description->setEnabled(!m_game_id.empty());
+  m_code_view->setEnabled(!m_game_id.empty());
+
+  m_add_code->setEnabled(!m_game_id.empty());
   m_edit_code->setEnabled(false);
   m_remove_code->setEnabled(false);
+  m_download_codes->setEnabled(!m_game_id.empty());
 
   auto* layout = new QVBoxLayout;
 
@@ -228,6 +238,9 @@ void GeckoCodeWidget::RemoveCode()
 
 void GeckoCodeWidget::SaveCodes()
 {
+  if (m_game_id.empty())
+    return;
+
   const auto ini_path =
       std::string(File::GetUserPath(D_GAMESETTINGS_IDX)).append(m_game_id).append(".ini");
 

Source/Core/DolphinQt/MainWindow.cpp

@@ -220,6 +220,9 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters,
   ConnectMenuBar();
   ConnectHotkeys();
 
+  connect(m_cheats_manager, &CheatsManager::OpenGeneralSettings, this,
+          &MainWindow::ShowGeneralWindow);
+
   InitCoreCallbacks();
 
   NetPlayInit();

Source/Core/DolphinQt/MenuBar.cpp

@@ -131,9 +131,6 @@ void MenuBar::OnEmulationStateChanged(Core::State state)
   // Options
   m_controllers_action->setEnabled(NetPlay::IsNetPlayRunning() ? !running : true);
 
-  // Tools
-  m_show_cheat_manager->setEnabled(Settings::Instance().GetCheatsEnabled() && running);
-
   // JIT
   m_jit_interpreter_core->setEnabled(running);
   m_jit_block_linking->setEnabled(!running);
@@ -228,12 +225,7 @@ void MenuBar::AddToolsMenu()
   tools_menu->addAction(tr("&Resource Pack Manager"), this,
                         [this] { emit ShowResourcePackManager(); });
 
-  m_show_cheat_manager =
-      tools_menu->addAction(tr("&Cheats Manager"), this, [this] { emit ShowCheatsManager(); });
-
-  connect(&Settings::Instance(), &Settings::EnableCheatsChanged, this, [this](bool enabled) {
-    m_show_cheat_manager->setEnabled(Core::GetState() != Core::State::Uninitialized && enabled);
-  });
+  tools_menu->addAction(tr("&Cheats Manager"), this, [this] { emit ShowCheatsManager(); });
 
   tools_menu->addAction(tr("FIFO Player"), this, &MenuBar::ShowFIFOPlayer);
 

Source/Core/DolphinQt/MenuBar.h

@@ -196,7 +196,6 @@ class MenuBar final : public QMenuBar
   QMenu* m_backup_menu;
 
   // Tools
-  QAction* m_show_cheat_manager;
   QAction* m_wad_install_action;
   QMenu* m_perform_online_update_menu;
   QAction* m_perform_online_update_for_current_region;