Merge branch 'timeplayed' into 'master'

Remove time played setting See merge request OpenMW/openmw!4235
OpenMW · Jul 8, 2024 · 3a5ed99 · 3a5ed99
2 parents 061f10b + 888abc0
commit 3a5ed99
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 70 deletions.
diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp
@@ -319,7 +319,6 @@ bool Launcher::SettingsPage::loadSettings()
     // Miscellaneous
     {
         // Saves
-        loadSettingBool(Settings::saves().mTimeplayed, *timePlayedCheckbox);
         loadSettingInt(Settings::saves().mMaxQuicksaves, *maximumQuicksavesComboBox);
 
         // Other Settings
@@ -512,7 +511,6 @@ void Launcher::SettingsPage::saveSettings()
     // Miscellaneous
     {
         // Saves Settings
-        saveSettingBool(*timePlayedCheckbox, Settings::saves().mTimeplayed);
         saveSettingInt(*maximumQuicksavesComboBox, Settings::saves().mMaxQuicksaves);
 
         // Other Settings

diff --git a/apps/launcher/ui/settingspage.ui b/apps/launcher/ui/settingspage.ui
@@ -1430,16 +1430,6 @@
           <string>Saves</string>
          </property>
          <layout class="QVBoxLayout" name="savesGroupVerticalLayout">
-          <item>
-           <widget class="QCheckBox" name="timePlayedCheckbox">
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting determines whether the amount of the time the player has spent playing will be displayed for each saved game in the Load menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="text">
-             <string>Add &quot;Time Played&quot; to Saves</string>
-            </property>
-           </widget>
-          </item>
           <item>
            <layout class="QHBoxLayout" name="maximumQuicksavesLayout">
             <item>

diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
@@ -435,7 +435,7 @@ namespace MWGui
                     mCurrentSlot->mProfile.mInGameTime.mMonth)
              << " " << hour << " " << (pm ? "#{Calendar:pm}" : "#{Calendar:am}");
 
-        if (Settings::saves().mTimeplayed)
+        if (mCurrentSlot->mProfile.mTimePlayed > 0)
         {
             text << "\n"
                  << "#{OMWEngine:TimePlayed}: " << formatTimeplayed(mCurrentSlot->mProfile.mTimePlayed);

diff --git a/components/settings/categories/saves.hpp b/components/settings/categories/saves.hpp
@@ -20,7 +20,6 @@ namespace Settings
 
         SettingValue<std::string> mCharacter{ mIndex, "Saves", "character" };
         SettingValue<bool> mAutosave{ mIndex, "Saves", "autosave" };
-        SettingValue<bool> mTimeplayed{ mIndex, "Saves", "timeplayed" };
         SettingValue<int> mMaxQuicksaves{ mIndex, "Saves", "max quicksaves", makeMaxSanitizerInt(1) };
     };
 }

diff --git a/docs/source/reference/modding/settings/saves.rst b/docs/source/reference/modding/settings/saves.rst
@@ -21,19 +21,6 @@ This setting determines whether the game will be automatically saved when the ch
 
 This setting can be toggled in game with the Auto-Save when Rest button in the Prefs panel of the Options menu.
 
-timeplayed
-----------
-
-:Type:		boolean
-:Range:		True/False
-:Default:	False
-
-This setting determines whether the amount of the time the player has spent playing will be displayed
-for each saved game in the Load menu. Currently, the counter includes time spent in menus, including the pause menu, 
-but does not include time spent with the game window minimized.
-
-This setting can only be configured by editing the settings configuration file.
-
 max quicksaves
 --------------
 

diff --git a/files/lang/launcher_de.ts b/files/lang/launcher_de.ts
@@ -920,10 +920,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Saves</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting determines whether the amount of the time the player has spent playing will be displayed for each saved game in the Load menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>JPG</source>
         <translation type="unfinished"></translation>
@@ -1415,10 +1411,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Can Zoom on Maps</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add &quot;Time Played&quot; to Saves</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Notify on Saved Screenshot</source>
         <translation type="unfinished"></translation>

diff --git a/files/lang/launcher_en.ts b/files/lang/launcher_en.ts
@@ -1363,14 +1363,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Saves</source>
         <translation></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting determines whether the amount of the time the player has spent playing will be displayed for each saved game in the Load menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Add &quot;Time Played&quot; to Saves</source>
-        <translation></translation>
-    </message>
     <message>
         <source>Maximum Quicksaves</source>
         <translation></translation>

diff --git a/files/lang/launcher_fr.ts b/files/lang/launcher_fr.ts
@@ -920,10 +920,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Saves</source>
         <translation>Sauvegardes</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting determines whether the amount of the time the player has spent playing will be displayed for each saved game in the Load menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;body&gt;&lt;p&gt;Cette option affiche le temps de jeu de chaque sauvegarde dans leur menu de sélection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>JPG</source>
         <translation>JPG</translation>
@@ -1418,10 +1414,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Can Zoom on Maps</source>
         <translation>Permettre le zoom sur la carte</translation>
     </message>
-    <message>
-        <source>Add &quot;Time Played&quot; to Saves</source>
-        <translation>Ajoute le temps de jeu aux sauvegardes</translation>
-    </message>
     <message>
         <source>Notify on Saved Screenshot</source>
         <translation>Notifier l&apos;enregistrement des captures d&apos;écran</translation>

diff --git a/files/lang/launcher_ru.ts b/files/lang/launcher_ru.ts
@@ -1140,14 +1140,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Saves</source>
         <translation>Сохранения</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting determines whether the amount of the time the player has spent playing will be displayed for each saved game in the Load menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Эта настройка определяет, будет ли отображаться время с начала новой игры для выбранного сохранения в меню загрузки.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Add &quot;Time Played&quot; to Saves</source>
-        <translation>Выводить &quot;Время в игре&quot; в сохранениях</translation>
-    </message>
     <message>
         <source>JPG</source>
         <translation>JPG</translation>

diff --git a/files/lang/launcher_sv.ts b/files/lang/launcher_sv.ts
@@ -933,10 +933,6 @@ de ordinarie fonterna i Morrowind. Bocka denna ruta om du ändå föredrar ordin
         <source>Saves</source>
         <translation>Sparfiler</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting determines whether the amount of the time the player has spent playing will be displayed for each saved game in the Load menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Denna inställning avgör huruvida mängden tid spelaren har spenderat i spelet kommer visas för varje sparat spel i Ladda spel-menyn.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>JPG</source>
         <translation>JPG</translation>
@@ -1434,10 +1430,6 @@ de ordinarie fonterna i Morrowind. Bocka denna ruta om du ändå föredrar ordin
         <source>Can Zoom on Maps</source>
         <translation>Kan zooma på kartor</translation>
     </message>
-    <message>
-        <source>Add &quot;Time Played&quot; to Saves</source>
-        <translation>Lägg till spelad tid i sparfiler</translation>
-    </message>
     <message>
         <source>Notify on Saved Screenshot</source>
         <translation>Ge notis vid sparad skärmdump</translation>

diff --git a/files/settings-default.cfg b/files/settings-default.cfg
@@ -566,9 +566,6 @@ character =
 # Automatically save the game whenever the player rests.
 autosave = true
 
-# Display the time played on each save file in the load menu.
-timeplayed = false
-
 # The maximum number of quick (or auto) save slots to have.
 # If all slots are used, the  oldest save is reused
 max quicksaves = 1