diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/model/GeckoCheat.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/model/GeckoCheat.kt index 7a23066545..ea345b2f7f 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/model/GeckoCheat.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/model/GeckoCheat.kt @@ -29,7 +29,7 @@ class GeckoCheat : AbstractCheat { } override fun supportsCreator(): Boolean { - return true + return false } override fun supportsNotes(): Boolean { @@ -38,8 +38,6 @@ class GeckoCheat : AbstractCheat { external override fun getName(): String - external override fun getCreator(): String - external override fun getNotes(): String external override fun getCode(): String diff --git a/Source/Android/jni/Cheats/GeckoCheat.cpp b/Source/Android/jni/Cheats/GeckoCheat.cpp index c585acf9ea..aacb942c9a 100644 --- a/Source/Android/jni/Cheats/GeckoCheat.cpp +++ b/Source/Android/jni/Cheats/GeckoCheat.cpp @@ -52,12 +52,6 @@ Java_org_dolphinemu_dolphinemu_features_cheats_model_GeckoCheat_getName(JNIEnv* return ToJString(env, GetPointer(env, obj)->name); } -JNIEXPORT jstring JNICALL -Java_org_dolphinemu_dolphinemu_features_cheats_model_GeckoCheat_getCreator(JNIEnv* env, jobject obj) -{ - return ToJString(env, GetPointer(env, obj)->creator); -} - JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_features_cheats_model_GeckoCheat_getNotes(JNIEnv* env, jobject obj) { @@ -128,7 +122,6 @@ JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_features_cheats_model_Geck return Cheats::TRY_SET_FAIL_NO_CODE_LINES; code->name = GetJString(env, name); - code->creator = GetJString(env, creator); code->notes = SplitString(GetJString(env, notes), '\n'); code->codes = std::move(entries); diff --git a/Source/Core/Core/GeckoCode.h b/Source/Core/Core/GeckoCode.h index 2931ed3641..cded4e9640 100644 --- a/Source/Core/Core/GeckoCode.h +++ b/Source/Core/Core/GeckoCode.h @@ -30,7 +30,7 @@ public: }; std::vector codes; - std::string name, creator; + std::string name; std::vector notes; bool enabled = false; diff --git a/Source/Core/Core/GeckoCodeConfig.cpp b/Source/Core/Core/GeckoCodeConfig.cpp index ec16d96e06..9729ad731c 100644 --- a/Source/Core/Core/GeckoCodeConfig.cpp +++ b/Source/Core/Core/GeckoCodeConfig.cpp @@ -72,12 +72,9 @@ std::vector DownloadCodes(std::string gametdb_id, bool* succeeded, bo case 0: { std::istringstream ssline(line); - // stop at [ character (beginning of contributor name) - std::getline(ssline, gcode.name, '['); + std::getline(ssline, gcode.name); gcode.name = StripWhitespace(gcode.name); gcode.user_defined = true; - // read the code creator name - std::getline(ssline, gcode.creator, ']'); read_state = 1; } break; @@ -162,10 +159,8 @@ std::vector LoadCodes(const Common::IniFile& globalIni, const Common: gcode.user_defined = (ini == &localIni); ss.seekg(1, std::ios_base::cur); // read the code name - std::getline(ss, gcode.name, '['); // stop at [ character (beginning of contributor name) + std::getline(ss, gcode.name); gcode.name = StripWhitespace(gcode.name); - // read the code creator name - std::getline(ss, gcode.creator, ']'); break; // notes @@ -208,14 +203,7 @@ std::vector LoadCodes(const Common::IniFile& globalIni, const Common: static std::string MakeGeckoCodeTitle(const GeckoCode& code) { - std::string title = '$' + code.name; - - if (!code.creator.empty()) - { - title += " [" + code.creator + ']'; - } - - return title; + return '$' + code.name; } // used by the SaveGeckoCodes function diff --git a/Source/Core/DolphinQt/Config/CheatCodeEditor.cpp b/Source/Core/DolphinQt/Config/CheatCodeEditor.cpp index b8a62c36b6..239015bcd7 100644 --- a/Source/Core/DolphinQt/Config/CheatCodeEditor.cpp +++ b/Source/Core/DolphinQt/Config/CheatCodeEditor.cpp @@ -37,8 +37,6 @@ void CheatCodeEditor::SetARCode(ActionReplay::ARCode* code) for (ActionReplay::AREntry& e : code->ops) m_code_edit->append(QString::fromStdString(ActionReplay::SerializeLine(e))); - m_creator_label->setHidden(true); - m_creator_edit->setHidden(true); m_notes_label->setHidden(true); m_notes_edit->setHidden(true); @@ -49,7 +47,6 @@ void CheatCodeEditor::SetARCode(ActionReplay::ARCode* code) void CheatCodeEditor::SetGeckoCode(Gecko::GeckoCode* code) { m_name_edit->setText(QString::fromStdString(code->name)); - m_creator_edit->setText(QString::fromStdString(code->creator)); m_code_edit->clear(); @@ -62,8 +59,6 @@ void CheatCodeEditor::SetGeckoCode(Gecko::GeckoCode* code) m_notes_edit->setText(notes_string); - m_creator_label->setHidden(false); - m_creator_edit->setHidden(false); m_notes_label->setHidden(false); m_notes_edit->setHidden(false); @@ -74,25 +69,21 @@ void CheatCodeEditor::SetGeckoCode(Gecko::GeckoCode* code) void CheatCodeEditor::CreateWidgets() { m_name_edit = new QLineEdit; - m_creator_edit = new QLineEdit; m_notes_edit = new QTextEdit; m_code_edit = new QTextEdit; m_button_box = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Save); - m_creator_label = new QLabel(tr("Creator:")); m_notes_label = new QLabel(tr("Notes:")); QGridLayout* grid_layout = new QGridLayout; grid_layout->addWidget(new QLabel(tr("Name:")), 0, 0); grid_layout->addWidget(m_name_edit, 0, 1); - grid_layout->addWidget(m_creator_label, 1, 0); - grid_layout->addWidget(m_creator_edit, 1, 1); - grid_layout->addWidget(m_notes_label, 2, 0); - grid_layout->addWidget(m_notes_edit, 2, 1); - grid_layout->addWidget(new QLabel(tr("Code:")), 3, 0); - grid_layout->addWidget(m_code_edit, 3, 1); - grid_layout->addWidget(m_button_box, 4, 1); + grid_layout->addWidget(m_notes_label, 1, 0); + grid_layout->addWidget(m_notes_edit, 1, 1); + grid_layout->addWidget(new QLabel(tr("Code:")), 2, 0); + grid_layout->addWidget(m_code_edit, 2, 1); + grid_layout->addWidget(m_button_box, 3, 1); QFont monospace(QFontDatabase::systemFont(QFontDatabase::FixedFont).family()); @@ -252,7 +243,6 @@ bool CheatCodeEditor::AcceptGecko() } m_gecko_code->name = name.toStdString(); - m_gecko_code->creator = m_creator_edit->text().toStdString(); m_gecko_code->codes = std::move(entries); m_gecko_code->notes = SplitString(m_notes_edit->toPlainText().toStdString(), '\n'); m_gecko_code->user_defined = true; diff --git a/Source/Core/DolphinQt/Config/CheatCodeEditor.h b/Source/Core/DolphinQt/Config/CheatCodeEditor.h index 0b60a01264..cd8082d996 100644 --- a/Source/Core/DolphinQt/Config/CheatCodeEditor.h +++ b/Source/Core/DolphinQt/Config/CheatCodeEditor.h @@ -37,11 +37,9 @@ private: void accept() override; - QLabel* m_creator_label; QLabel* m_notes_label; QLineEdit* m_name_edit; - QLineEdit* m_creator_edit; QTextEdit* m_notes_edit; QTextEdit* m_code_edit; QDialogButtonBox* m_button_box; diff --git a/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp b/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp index 97a93051f5..e3a05f3d8d 100644 --- a/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp +++ b/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp @@ -56,7 +56,6 @@ void GeckoCodeWidget::ChangeGame(std::string game_id, std::string gametdb_id, m_gecko_codes.clear(); m_code_list->clear(); m_name_label->clear(); - m_creator_label->clear(); m_code_description->clear(); m_code_view->clear(); @@ -78,7 +77,6 @@ void GeckoCodeWidget::CreateWidgets() #endif // USE_RETRO_ACHIEVEMENTS m_code_list = new QListWidget; m_name_label = new QLabel; - m_creator_label = new QLabel; m_code_list->setContextMenuPolicy(Qt::CustomContextMenu); @@ -116,12 +114,11 @@ void GeckoCodeWidget::CreateWidgets() auto* info_layout = new QFormLayout; info_layout->addRow(tr("Name:"), m_name_label); - info_layout->addRow(tr("Creator:"), m_creator_label); info_layout->addRow(tr("Description:"), static_cast(nullptr)); info_layout->setFormAlignment(Qt::AlignLeft | Qt::AlignTop); - for (QLabel* label : {m_name_label, m_creator_label}) + for (QLabel* const label : {m_name_label}) { label->setTextInteractionFlags(Qt::TextSelectableByMouse); label->setCursor(Qt::IBeamCursor); @@ -183,7 +180,6 @@ void GeckoCodeWidget::OnSelectionChanged() const auto& code = m_gecko_codes[index]; m_name_label->setText(QString::fromStdString(code.name)); - m_creator_label->setText(QString::fromStdString(code.creator)); m_code_description->clear(); @@ -269,7 +265,6 @@ void GeckoCodeWidget::LoadCodes() 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());