Getting rid of the "Separate Update Folder" option (#2719)

* real fix this time ?

* should be all of it

* Update en_US.ts

src/common/config.cpp

@@ -75,7 +75,6 @@ static double trophyNotificationDuration = 6.0;
 static bool useUnifiedInputConfig = true;
 static bool overrideControllerColor = false;
 static int controllerCustomColorRGB[3] = {0, 0, 255};
-static bool separateupdatefolder = false;
 static bool compatibilityData = false;
 static bool checkCompatibilityOnStartup = false;
 static std::string trophyKey;
@@ -352,10 +351,6 @@ void setVkGuestMarkersEnabled(bool enable) {
     vkGuestMarkers = enable;
 }
 
-bool getSeparateUpdateEnabled() {
-    return separateupdatefolder;
-}
-
 bool getCompatibilityEnabled() {
     return compatibilityData;
 }
@@ -517,10 +512,6 @@ void setIsMotionControlsEnabled(bool use) {
     isMotionControlsEnabled = use;
 }
 
-void setSeparateUpdateEnabled(bool use) {
-    separateupdatefolder = use;
-}
-
 void setCompatibilityEnabled(bool use) {
     compatibilityData = use;
 }
@@ -781,7 +772,6 @@ void load(const std::filesystem::path& path) {
         isAutoUpdate = toml::find_or<bool>(general, "autoUpdate", false);
         isAlwaysShowChangelog = toml::find_or<bool>(general, "alwaysShowChangelog", false);
         isSideTrophy = toml::find_or<std::string>(general, "sideTrophy", "right");
-        separateupdatefolder = toml::find_or<bool>(general, "separateUpdateEnabled", false);
         compatibilityData = toml::find_or<bool>(general, "compatibilityEnabled", false);
         checkCompatibilityOnStartup =
             toml::find_or<bool>(general, "checkCompatibilityOnStartup", false);
@@ -977,7 +967,6 @@ void save(const std::filesystem::path& path) {
     data["General"]["autoUpdate"] = isAutoUpdate;
     data["General"]["alwaysShowChangelog"] = isAlwaysShowChangelog;
     data["General"]["sideTrophy"] = isSideTrophy;
-    data["General"]["separateUpdateEnabled"] = separateupdatefolder;
     data["General"]["compatibilityEnabled"] = compatibilityData;
     data["General"]["checkCompatibilityOnStartup"] = checkCompatibilityOnStartup;
     data["Input"]["cursorState"] = cursorState;
@@ -1150,7 +1139,6 @@ void setDefaultValues() {
     emulator_language = "en_US";
     m_language = 1;
     gpuId = -1;
-    separateupdatefolder = false;
     compatibilityData = false;
     checkCompatibilityOnStartup = false;
     backgroundImageOpacity = 50;

src/common/config.h

@@ -35,7 +35,6 @@ bool getPlayBGM();
 int getBGMvolume();
 bool getisTrophyPopupDisabled();
 bool getEnableDiscordRPC();
-bool getSeparateUpdateEnabled();
 bool getCompatibilityEnabled();
 bool getCheckCompatibilityOnStartup();
 int getBackgroundImageOpacity();
@@ -105,7 +104,6 @@ void setNeoMode(bool enable);
 void setUserName(const std::string& type);
 void setUpdateChannel(const std::string& type);
 void setChooseHomeTab(const std::string& type);
-void setSeparateUpdateEnabled(bool use);
 void setGameInstallDirs(const std::vector<std::filesystem::path>& dirs_config);
 void setAllGameInstallDirs(const std::vector<GameInstallDir>& dirs_config);
 void setSaveDataPath(const std::filesystem::path& path);

src/qt_gui/settings_dialog.cpp

@@ -318,7 +318,6 @@ SettingsDialog::SettingsDialog(std::span<const QString> physical_devices,
         // General
         ui->consoleLanguageGroupBox->installEventFilter(this);
         ui->emulatorLanguageGroupBox->installEventFilter(this);
-        ui->separateUpdatesCheckBox->installEventFilter(this);
         ui->showSplashCheckBox->installEventFilter(this);
         ui->discordRPCCheckbox->installEventFilter(this);
         ui->userName->installEventFilter(this);
@@ -450,8 +449,6 @@ void SettingsDialog::LoadValuesFromConfig() {
     QString translatedText_FullscreenMode =
         screenModeMap.key(QString::fromStdString(Config::getFullscreenMode()));
     ui->displayModeComboBox->setCurrentText(translatedText_FullscreenMode);
-    ui->separateUpdatesCheckBox->setChecked(
-        toml::find_or<bool>(data, "General", "separateUpdateEnabled", false));
     ui->gameSizeCheckBox->setChecked(toml::find_or<bool>(data, "GUI", "loadGameSizeEnabled", true));
     ui->showSplashCheckBox->setChecked(toml::find_or<bool>(data, "General", "showSplash", false));
     QString translatedText_logType = logTypeMap.key(QString::fromStdString(Config::getLogType()));
@@ -600,8 +597,6 @@ void SettingsDialog::updateNoteTextEdit(const QString& elementName) {
         text = tr("Console Language:\\nSets the language that the PS4 game uses.\\nIt's recommended to set this to a language the game supports, which will vary by region.");
     } else if (elementName == "emulatorLanguageGroupBox") {
         text = tr("Emulator Language:\\nSets the language of the emulator's user interface.");
-    } else if (elementName == "separateUpdatesCheckBox") {
-        text = tr("Enable Separate Update Folder:\\nEnables installing game updates into a separate folder for easy management.\\nThis can be manually created by adding the extracted update to the game folder with the name \"CUSA00000-UPDATE\" where the CUSA ID matches the game's ID.");
     } else if (elementName == "showSplashCheckBox") {
         text = tr("Show Splash Screen:\\nShows the game's splash screen (a special image) while the game is starting.");
     } else if (elementName == "discordRPCCheckbox") {
@@ -760,7 +755,6 @@ void SettingsDialog::UpdateSettings() {
     Config::setVblankDiv(ui->vblankSpinBox->value());
     Config::setDumpShaders(ui->dumpShadersCheckBox->isChecked());
     Config::setNullGpu(ui->nullGpuCheckBox->isChecked());
-    Config::setSeparateUpdateEnabled(ui->separateUpdatesCheckBox->isChecked());
     Config::setLoadGameSizeEnabled(ui->gameSizeCheckBox->isChecked());
     Config::setShowSplash(ui->showSplashCheckBox->isChecked());
     Config::setDebugDump(ui->debugDump->isChecked());

src/qt_gui/settings_dialog.ui

@@ -135,13 +135,6 @@
                  <property name="spacing">
                   <number>10</number>
                  </property>
-                 <item>
-                  <widget class="QCheckBox" name="separateUpdatesCheckBox">
-                   <property name="text">
-                    <string>Enable Separate Update Folder</string>
-                   </property>
-                  </widget>
-                 </item>
                  <item>
                   <widget class="QCheckBox" name="showSplashCheckBox">
                    <property name="text">

src/qt_gui/translations/en_US.ts

@@ -1474,10 +1474,6 @@
         <source>Emulator</source>
         <translation>Emulator</translation>
     </message>
-    <message>
-        <source>Enable Separate Update Folder</source>
-        <translation>Enable Separate Update Folder</translation>
-    </message>
     <message>
         <source>Default tab when opening settings</source>
         <translation>Default tab when opening settings</translation>
@@ -1742,10 +1738,6 @@
         <source>Emulator Language:\nSets the language of the emulator&apos;s user interface.</source>
         <translation>Emulator Language:\nSets the language of the emulator&apos;s user interface.</translation>
     </message>
-    <message>
-        <source>Enable Separate Update Folder:\nEnables installing game updates into a separate folder for easy management.\nThis can be manually created by adding the extracted update to the game folder with the name &quot;CUSA00000-UPDATE&quot; where the CUSA ID matches the game&apos;s ID.</source>
-        <translation>Enable Separate Update Folder:\nEnables installing game updates into a separate folder for easy management.\nThis can be manually created by adding the extracted update to the game folder with the name &quot;CUSA00000-UPDATE&quot; where the CUSA ID matches the game&apos;s ID.</translation>
-    </message>
     <message>
         <source>Show Splash Screen:\nShows the game&apos;s splash screen (a special image) while the game is starting.</source>
         <translation>Show Splash Screen:\nShows the game&apos;s splash screen (a special image) while the game is starting.</translation>