Changeset - r28412:476168dfef10
Parent rev.
Child rev.
[Not reviewed]
master
0 2 0
Tyler Trahan - 11 months ago 2024-01-07 13:44:50
tyler@tylertrahan.com
Change: Reorganize Settings menu items (#11683)
2 files changed with 35 insertions and 22 deletions:
src/lang/english.txt
3
src/settings_gui.cpp
32
22
0 comments (0 inline, 0 general)
src/lang/english.txt
➞
Show inline comments
 
@@ -2052,20 +2052,23 @@ STR_CONFIG_SETTING_INTERFACE_CONSTRUCTIO
 
STR_CONFIG_SETTING_ADVISORS                                     :News / Advisors
 
STR_CONFIG_SETTING_COMPANY                                      :Company
 
STR_CONFIG_SETTING_ACCOUNTING                                   :Accounting
 
STR_CONFIG_SETTING_VEHICLES                                     :Vehicles
 
STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Physics
 
STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Routing
 
STR_CONFIG_SETTING_VEHICLES_ORDERS                              :Orders
 
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
 
STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Cargo distribution
 
STR_CONFIG_SETTING_ENVIRONMENT_TREES                            :Trees
 
STR_CONFIG_SETTING_AI                                           :Competitors
 
STR_CONFIG_SETTING_AI_NPC                                       :Computer players
 
STR_CONFIG_SETTING_NETWORK                                      :Network
 

			




	
	
	
		
 
STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Pathfinder for trains: {STRING2}

			




	
	
	
		
 
STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Path finder to use for trains

			




        

    


    
    

    

        

                

                    src/settings_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -1791,17 +1791,20 @@ static SettingsContainer &GetSettingsTre

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			SettingsPage *construction = interface->Add(new SettingsPage(STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION));

			




	
	
	
		
 
			{

			




	
	
	
		
 
				construction->Add(new SettingEntry("gui.link_terraform_toolbar"));

			




	
	
	
		
 
				construction->Add(new SettingEntry("gui.persistent_buildingtools"));

			




	
	
	
		
 
				construction->Add(new SettingEntry("gui.quick_goto"));

			




	
	
	
		
 
				construction->Add(new SettingEntry("gui.default_rail_type"));

			




	
	
	
		
 
				construction->Add(new SettingEntry("gui.semaphore_build_before"));

			




	
	
	
		
 
				construction->Add(new SettingEntry("gui.signal_gui_mode"));

			




	
	
	
		
 
				construction->Add(new SettingEntry("gui.cycle_signal_types"));

			




	
	
	
		
 
				construction->Add(new SettingEntry("gui.drag_signals_fixed_distance"));

			




	
	
	
		
 
				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"));

			




	
	
	
		
 
			interface->Add(new SettingEntry("gui.advanced_vehicle_list"));

			




	
	
	
		
 
			interface->Add(new SettingEntry("gui.timetable_mode"));

			




	
	
	
		
 
			interface->Add(new SettingEntry("gui.timetable_arrival_departure"));

			




	
	
		
 
@@ -1833,19 +1836,12 @@ static SettingsContainer &GetSettingsTre

			




	
	
	
		
 
			advisors->Add(new SettingEntry("news_display.production_other"));

			




	
	
	
		
 
			advisors->Add(new SettingEntry("news_display.production_nobody"));

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		SettingsPage *company = main->Add(new SettingsPage(STR_CONFIG_SETTING_COMPANY));

			




	
	
	
		
 
		{

			




	
	
	
		
 
			company->Add(new SettingEntry("gui.semaphore_build_before"));

			




	
	
	
		
 
			company->Add(new SettingEntry("gui.cycle_signal_types"));

			




	
	
	
		
 
			company->Add(new SettingEntry("gui.signal_gui_mode"));

			




	
	
	
		
 
			company->Add(new SettingEntry("gui.drag_signals_fixed_distance"));

			




	
	
	
		
 
			company->Add(new SettingEntry("gui.auto_remove_signals"));

			




	
	
	
		
 
			company->Add(new SettingEntry("gui.new_nonstop"));

			




	
	
	
		
 
			company->Add(new SettingEntry("gui.stop_location"));

			




	
	
	
		
 
			company->Add(new SettingEntry("gui.starting_colour"));

			




	
	
	
		
 
			company->Add(new SettingEntry("gui.starting_colour_secondary"));

			




	
	
	
		
 
			company->Add(new SettingEntry("company.engine_renew"));

			




	
	
	
		
 
			company->Add(new SettingEntry("company.engine_renew_months"));

			




	
	
	
		
 
			company->Add(new SettingEntry("company.engine_renew_money"));

			




	
	
	
		
 
			company->Add(new SettingEntry("vehicle.servint_ispercent"));

			




	
	
		
 
@@ -1881,22 +1877,27 @@ static SettingsContainer &GetSettingsTre

			




	
	
	
		
 
				physics->Add(new SettingEntry("vehicle.smoke_amount"));

			




	
	
	
		
 
				physics->Add(new SettingEntry("vehicle.plane_speed"));

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			SettingsPage *routing = vehicles->Add(new SettingsPage(STR_CONFIG_SETTING_VEHICLES_ROUTING));

			




	
	
	
		
 
			{

			




	
	
	
		
 
				routing->Add(new SettingEntry("vehicle.road_side"));

			




	
	
	
		
 
				routing->Add(new SettingEntry("pf.pathfinder_for_trains"));

			




	
	
	
		
 
				routing->Add(new SettingEntry("difficulty.line_reverse_mode"));

			




	
	
	
		
 
				routing->Add(new SettingEntry("pf.reverse_at_signals"));

			




	
	
	
		
 
				routing->Add(new SettingEntry("pf.forbid_90_deg"));

			




	
	
	
		
 
				routing->Add(new SettingEntry("pf.pathfinder_for_roadvehs"));

			




	
	
	
		
 
				routing->Add(new SettingEntry("pf.pathfinder_for_ships"));

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			vehicles->Add(new SettingEntry("order.no_servicing_if_no_breakdowns"));

			




	
	
	
		
 
			vehicles->Add(new SettingEntry("order.serviceathelipad"));

			




	
	
	
		
 
			SettingsPage *orders = vehicles->Add(new SettingsPage(STR_CONFIG_SETTING_VEHICLES_ORDERS));

			




	
	
	
		
 
			{

			




	
	
	
		
 
				orders->Add(new SettingEntry("gui.new_nonstop"));

			




	
	
	
		
 
				orders->Add(new SettingEntry("gui.quick_goto"));

			




	
	
	
		
 
				orders->Add(new SettingEntry("gui.stop_location"));

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		SettingsPage *limitations = main->Add(new SettingsPage(STR_CONFIG_SETTING_LIMITATIONS));

			




	
	
	
		
 
		{

			




	
	
	
		
 
			limitations->Add(new SettingEntry("construction.command_pause_level"));

			




	
	
	
		
 
			limitations->Add(new SettingEntry("construction.autoslope"));

			




	
	
		
 
@@ -1911,25 +1912,28 @@ static SettingsContainer &GetSettingsTre

			




	
	
	
		
 
			limitations->Add(new SettingEntry("vehicle.max_roadveh"));

			




	
	
	
		
 
			limitations->Add(new SettingEntry("vehicle.max_aircraft"));

			




	
	
	
		
 
			limitations->Add(new SettingEntry("vehicle.max_ships"));

			




	
	
	
		
 
			limitations->Add(new SettingEntry("vehicle.max_train_length"));

			




	
	
	
		
 
			limitations->Add(new SettingEntry("station.station_spread"));

			




	
	
	
		
 
			limitations->Add(new SettingEntry("station.distant_join_stations"));

			




	
	
	
		
 
			limitations->Add(new SettingEntry("station.modified_catchment"));

			




	
	
	
		
 
			limitations->Add(new SettingEntry("construction.road_stop_on_town_road"));

			




	
	
	
		
 
			limitations->Add(new SettingEntry("construction.road_stop_on_competitor_road"));

			




	
	
	
		
 
			limitations->Add(new SettingEntry("construction.crossing_with_competitor"));

			




	
	
	
		
 
			limitations->Add(new SettingEntry("vehicle.disable_elrails"));

			




	
	
	
		
 
			limitations->Add(new SettingEntry("order.station_length_loading_penalty"));

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		SettingsPage *disasters = main->Add(new SettingsPage(STR_CONFIG_SETTING_ACCIDENTS));

			




	
	
	
		
 
		{

			




	
	
	
		
 
			disasters->Add(new SettingEntry("difficulty.disasters"));

			




	
	
	
		
 
			disasters->Add(new SettingEntry("difficulty.economy"));

			




	
	
	
		
 
			disasters->Add(new SettingEntry("vehicle.plane_crashes"));

			




	
	
	
		
 
			disasters->Add(new SettingEntry("difficulty.vehicle_breakdowns"));

			




	
	
	
		
 
			disasters->Add(new SettingEntry("vehicle.plane_crashes"));

			




	
	
	
		
 
			disasters->Add(new SettingEntry("order.no_servicing_if_no_breakdowns"));

			




	
	
	
		
 
			disasters->Add(new SettingEntry("order.serviceathelipad"));

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		SettingsPage *genworld = main->Add(new SettingsPage(STR_CONFIG_SETTING_GENWORLD));

			




	
	
	
		
 
		{

			




	
	
	
		
 
			genworld->Add(new SettingEntry("game_creation.landscape"));

			




	
	
	
		
 
			genworld->Add(new SettingEntry("game_creation.land_generator"));

			




	
	
		
 
@@ -1937,24 +1941,23 @@ static SettingsContainer &GetSettingsTre

			




	
	
	
		
 
			genworld->Add(new SettingEntry("game_creation.tgen_smoothness"));

			




	
	
	
		
 
			genworld->Add(new SettingEntry("game_creation.variety"));

			




	
	
	
		
 
			genworld->Add(new SettingEntry("game_creation.snow_coverage"));

			




	
	
	
		
 
			genworld->Add(new SettingEntry("game_creation.snow_line_height"));

			




	
	
	
		
 
			genworld->Add(new SettingEntry("game_creation.desert_coverage"));

			




	
	
	
		
 
			genworld->Add(new SettingEntry("game_creation.amount_of_rivers"));

			




	
	
	
		
 
			genworld->Add(new SettingEntry("game_creation.tree_placer"));

			




	
	
	
		
 
			genworld->Add(new SettingEntry("vehicle.road_side"));

			




	
	
	
		
 
			genworld->Add(new SettingEntry("economy.larger_towns"));

			




	
	
	
		
 
			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"));

			




	
	
	
		
 
				authorities->Add(new SettingEntry("economy.bribe"));

			




	
	
	
		
 
				authorities->Add(new SettingEntry("economy.exclusive_rights"));

			




	
	
	
		
 
				authorities->Add(new SettingEntry("economy.fund_roads"));

			




	
	
		
 
@@ -1965,17 +1968,21 @@ static SettingsContainer &GetSettingsTre

			




	
	
	
		
 
			SettingsPage *towns = environment->Add(new SettingsPage(STR_CONFIG_SETTING_ENVIRONMENT_TOWNS));

			




	
	
	
		
 
			{

			




	
	
	
		
 
				towns->Add(new SettingEntry("economy.town_growth_rate"));

			




	
	
	
		
 
				towns->Add(new SettingEntry("economy.allow_town_roads"));

			




	
	
	
		
 
				towns->Add(new SettingEntry("economy.allow_town_level_crossings"));

			




	
	
	
		
 
				towns->Add(new SettingEntry("economy.found_town"));

			




	
	
	
		
 
				towns->Add(new SettingEntry("economy.town_layout"));

			




	
	
	
		
 
				towns->Add(new SettingEntry("economy.larger_towns"));

			




	
	
	
		
 
				towns->Add(new SettingEntry("economy.initial_city_size"));

			




	
	
	
		
 
				towns->Add(new SettingEntry("economy.town_cargogen_mode"));

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			SettingsPage *industries = environment->Add(new SettingsPage(STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES));

			




	
	
	
		
 
			{

			




	
	
	
		
 
				industries->Add(new SettingEntry("difficulty.industry_density"));

			




	
	
	
		
 
				industries->Add(new SettingEntry("construction.raw_industry_construction"));

			




	
	
	
		
 
				industries->Add(new SettingEntry("construction.industry_platform"));

			




	
	
	
		
 
				industries->Add(new SettingEntry("economy.multiple_industry_per_town"));

			




	
	
	
		
 
				industries->Add(new SettingEntry("game_creation.oil_refinery_limit"));

			




	
	
	
		
 
				industries->Add(new SettingEntry("economy.type"));

			




	
	
	
		
 
				industries->Add(new SettingEntry("station.serve_neutral_industries"));

			




	
	
		
 
@@ -1992,14 +1999,17 @@ static SettingsContainer &GetSettingsTre

			




	
	
	
		
 
				cdist->Add(new SettingEntry("linkgraph.accuracy"));

			




	
	
	
		
 
				cdist->Add(new SettingEntry("linkgraph.demand_distance"));

			




	
	
	
		
 
				cdist->Add(new SettingEntry("linkgraph.demand_size"));

			




	
	
	
		
 
				cdist->Add(new SettingEntry("linkgraph.short_path_saturation"));

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			environment->Add(new SettingEntry("station.modified_catchment"));

			




	
	
	
		
 
			environment->Add(new SettingEntry("construction.extra_tree_placement"));

			




	
	
	
		
 
			SettingsPage *trees = environment->Add(new SettingsPage(STR_CONFIG_SETTING_ENVIRONMENT_TREES));

			




	
	
	
		
 
			{

			




	
	
	
		
 
				trees->Add(new SettingEntry("game_creation.tree_placer"));

			




	
	
	
		
 
				trees->Add(new SettingEntry("construction.extra_tree_placement"));

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		SettingsPage *ai = main->Add(new SettingsPage(STR_CONFIG_SETTING_AI));

			




	
	
	
		
 
		{

			




	
	
	
		
 
			SettingsPage *npc = ai->Add(new SettingsPage(STR_CONFIG_SETTING_AI_NPC));

			




	
	
	
		
 
			{

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support