mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-16 16:29:55 +00:00
Merge branch 'timeplayed' into 'master'
Remove time played setting See merge request OpenMW/openmw!4235
This commit is contained in:
psi29a
commit
3a5ed998e7
11 changed files with 1 additions and 70 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1430,16 +1430,6 @@
|
|||
<string>Saves</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="savesGroupVerticalLayout">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="timePlayedCheckbox">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>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.</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Add "Time Played" to Saves</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="maximumQuicksavesLayout">
|
||||
<item>
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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) };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
--------------
|
||||
|
||||
|
|
|
|||
|
|
@ -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><html><head/><body><p>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.</p></body></html></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 "Time Played" to Saves</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Notify on Saved Screenshot</source>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -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><html><head/><body><p>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.</p></body></html></source>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Add "Time Played" to Saves</source>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Maximum Quicksaves</source>
|
||||
<translation></translation>
|
||||
|
|
|
|||
|
|
@ -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><html><head/><body><p>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.</p></body></html></source>
|
||||
<translation><html><body><p>Cette option affiche le temps de jeu de chaque sauvegarde dans leur menu de sélection.</p></body></html></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 "Time Played" to Saves</source>
|
||||
<translation>Ajoute le temps de jeu aux sauvegardes</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Notify on Saved Screenshot</source>
|
||||
<translation>Notifier l'enregistrement des captures d'écran</translation>
|
||||
|
|
|
|||
|
|
@ -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><html><head/><body><p>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.</p></body></html></source>
|
||||
<translation><html><head/><body><p>Эта настройка определяет, будет ли отображаться время с начала новой игры для выбранного сохранения в меню загрузки.</p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Add "Time Played" to Saves</source>
|
||||
<translation>Выводить "Время в игре" в сохранениях</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>JPG</source>
|
||||
<translation>JPG</translation>
|
||||
|
|
|
|||
|
|
@ -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><html><head/><body><p>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.</p></body></html></source>
|
||||
<translation><html><head/><body><p>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.</p></body></html></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 "Time Played" 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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue