Merge pull request #6322 from spycrab/qt_gecko_input

Qt/GeckoCodeWidget: Add option to add/remove gecko codes from UI
dolphin-emu · Jan 26, 2018 · 0eaf3de · 0eaf3de
2 parents 28176d0 + ee90893
commit 0eaf3de
Show file tree

Hide file tree

Showing 9 changed files with 442 additions and 212 deletions.
diff --git a/Source/Core/DolphinQt2/CMakeLists.txt b/Source/Core/DolphinQt2/CMakeLists.txt
@@ -32,7 +32,7 @@ set(SRCS
   Translation.cpp
   WiiUpdate.cpp
   WiiUpdate.h
-  Config/ARCodeEditor.cpp
+  Config/CheatCodeEditor.cpp
   Config/ARCodeWidget.cpp
   Config/CheatWarningWidget.cpp
   Config/ControllersWindow.cpp

diff --git a/Source/Core/DolphinQt2/Config/ARCodeEditor.cpp b/Source/Core/DolphinQt2/Config/ARCodeEditor.cpp
diff --git a/Source/Core/DolphinQt2/Config/ARCodeEditor.h b/Source/Core/DolphinQt2/Config/ARCodeEditor.h
diff --git a/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp b/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp
@@ -14,7 +14,7 @@
 #include "Common/IniFile.h"
 #include "Core/ActionReplay.h"
 #include "Core/ConfigManager.h"
-#include "DolphinQt2/Config/ARCodeEditor.h"
+#include "DolphinQt2/Config/CheatCodeEditor.h"
 #include "DolphinQt2/Config/CheatWarningWidget.h"
 #include "DolphinQt2/GameList/GameFile.h"
 
@@ -122,15 +122,19 @@ void ARCodeWidget::SaveCodes()
 void ARCodeWidget::OnCodeAddPressed()
 {
   ActionReplay::ARCode ar;
+  ar.active = true;
 
-  ARCodeEditor ed(ar);
+  CheatCodeEditor ed;
 
-  ed.exec();
+  ed.SetARCode(&ar);
 
-  m_ar_codes.push_back(std::move(ar));
+  if (ed.exec())
+  {
+    m_ar_codes.push_back(std::move(ar));
 
-  UpdateList();
-  SaveCodes();
+    UpdateList();
+    SaveCodes();
+  }
 }
 
 void ARCodeWidget::OnCodeEditPressed()
@@ -148,8 +152,9 @@ void ARCodeWidget::OnCodeEditPressed()
 
   ActionReplay::ARCode ar = current_ar;
 
-  ARCodeEditor ed(user_defined ? current_ar : ar);
+  CheatCodeEditor ed;
 
+  ed.SetARCode(user_defined ? &current_ar : &ar);
   ed.exec();
 
   if (!user_defined)