From 7f115e58044aaf73cbbf344fa65a7a3b222398fa Mon Sep 17 00:00:00 2001 From: Tyler Trahan Date: Thu, 4 Jan 2024 06:38:17 -0500 Subject: [PATCH] Change: Move time-related settings to a new Environment->Time page --- src/lang/english.txt | 1 + src/settings_gui.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index f9605f159e..8e82e582ec 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2057,6 +2057,7 @@ STR_CONFIG_SETTING_LIMITATIONS :Limitations STR_CONFIG_SETTING_ACCIDENTS :Disasters / Accidents STR_CONFIG_SETTING_GENWORLD :World generation STR_CONFIG_SETTING_ENVIRONMENT :Environment +STR_CONFIG_SETTING_ENVIRONMENT_TIME :Time STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Authorities STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Towns STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industries diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index d1c210191e..caa260fc5a 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1802,7 +1802,6 @@ static SettingsContainer &GetSettingsTree() construction->Add(new SettingEntry("gui.auto_remove_signals")); } - interface->Add(new SettingEntry("gui.fast_forward_speed_limit")); interface->Add(new SettingEntry("gui.toolbar_pos")); interface->Add(new SettingEntry("gui.statusbar_pos")); interface->Add(new SettingEntry("gui.prefer_teamchat")); @@ -1948,12 +1947,16 @@ static SettingsContainer &GetSettingsTree() genworld->Add(new SettingEntry("economy.initial_city_size")); genworld->Add(new SettingEntry("economy.town_layout")); genworld->Add(new SettingEntry("difficulty.industry_density")); - genworld->Add(new SettingEntry("gui.pause_on_newgame")); - genworld->Add(new SettingEntry("game_creation.ending_year")); } SettingsPage *environment = main->Add(new SettingsPage(STR_CONFIG_SETTING_ENVIRONMENT)); { + SettingsPage *time = environment->Add(new SettingsPage(STR_CONFIG_SETTING_ENVIRONMENT_TIME)); + { + time->Add(new SettingEntry("game_creation.ending_year")); + time->Add(new SettingEntry("gui.pause_on_newgame")); + time->Add(new SettingEntry("gui.fast_forward_speed_limit")); + } SettingsPage *authorities = environment->Add(new SettingsPage(STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES)); { authorities->Add(new SettingEntry("difficulty.town_council_tolerance"));