Merge branch 'master' into 1.5

Conflicts:
	src/ai/ai_gui.cpp
	src/build_vehicle_gui.cpp
	src/cheat_gui.cpp
	src/company_gui.cpp
	src/depot_gui.cpp
	src/dock_gui.cpp
	src/genworld_gui.cpp
	src/misc_gui.cpp
	src/network/network_content_gui.cpp
	src/network/network_gui.cpp
	src/newgrf_gui.cpp
	src/news_gui.cpp
	src/rail_gui.cpp
	src/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/station_gui.cpp
	src/table/settings.ini
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/widget.cpp
	src/widgets/settings_widget.h

src/table/gameopt_settings.ini

@@ -19,6 +19,7 @@ static const char *_locale_units = "imperial|metric|si";
 static const char *_town_names = "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|slovak|norwegian|hungarian|austrian|romanian|czech|swiss|danish|turkish|italian|catalan";
 static const char *_climates = "temperate|arctic|tropic|toyland";
 static const char *_autosave_interval = "off|monthly|quarterly|half year|yearly";
+static const char *_save_to_network = "disabled|enabled|ask";
 static const char *_roadsides = "left|right";
 static const char *_savegame_date = "long|short|iso";
 #ifdef ENABLE_NETWORK
@@ -173,6 +174,15 @@ max      = 4
 full     = _autosave_interval
 cat      = SC_BASIC
 
+[SDTC_OMANY]
+var      = gui.save_to_network
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+def      = 2
+max      = 2
+full     = _save_to_network
+cat      = SC_BASIC
+
 [SDT_OMANY]
 base     = GameSettings
 var      = vehicle.road_side

src/table/misc_settings.ini

@@ -231,6 +231,25 @@ name     = ""mono_aa""
 var      = _freetype.mono.aa
 def      = false
 
+[SDTG_VAR]
+name     = ""min_button_size""
+type     = SLE_UINT
+var      = _settings_client.gui.min_button
+def      = 0
+min      = 0
+max      = 100
+cat      = SC_EXPERT
+
+[SDTG_VAR]
+name     = ""min_step_size""
+type     = SLE_UINT
+var      = _settings_client.gui.min_step
+def      = 0
+min      = 0
+max      = 100
+cat      = SC_EXPERT
+
+
 [SDTG_VAR]
 name     = ""sprite_cache_size_px""
 type     = SLE_UINT

src/table/settings.ini

@@ -42,6 +42,7 @@ static bool InvalidateCompanyInfrastructureWindow(int32 p1);
 static bool InvalidateCompanyWindow(int32 p1);
 static bool ZoomMinMaxChanged(int32 p1);
 static bool MaxVehiclesChanged(int32 p1);
+static bool VerticalToolbarChanged(int32 p1);
 
 #ifdef ENABLE_NETWORK
 static bool UpdateClientName(int32 p1);
@@ -2521,6 +2522,15 @@ strhelp  = STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT
 strval   = STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF
 cat      = SC_BASIC
 
+[SDTC_OMANY]
+var      = gui.save_to_network
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+def      = 2
+max      = 2
+full     = _save_to_network
+cat      = SC_BASIC
+
 [SDTC_BOOL]
 var      = gui.threaded_saves
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ -2539,6 +2549,15 @@ str      = STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES
 strhelp  = STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT
 strval   = STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG
 
+[SDTC_BOOL]
+var      = gui.vertical_toolbar
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+def      = true
+str      = STR_CONFIG_SETTING_VERTICAL_TOOLBAR
+strhelp  = STR_CONFIG_SETTING_VERTICAL_TOOLBAR_HELPTEXT
+proc     = VerticalToolbarChanged
+cat      = SC_BASIC
+
 [SDTC_BOOL]
 var      = gui.show_finances
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC