From 6f2aafb1b1ecc95150ea02626b68a5ad7c1a5b04 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Fri, 23 Jun 2017 19:46:19 +0300 Subject: [PATCH] Setting for a compact vertical toolbar, no implementation yet --- android-store-strings.sh | 1 + src/lang/english.txt | 2 ++ src/settings_gui.cpp | 1 + src/settings_type.h | 1 + src/table/settings.ini | 8 ++++++++ 5 files changed, 13 insertions(+) diff --git a/android-store-strings.sh b/android-store-strings.sh index 70781d22b7..7a9d540c25 100755 --- a/android-store-strings.sh +++ b/android-store-strings.sh @@ -7,6 +7,7 @@ for f in ../translations/lang/*.txt; do { grep -v "^# Android strings" $out ; echo "# Android strings" ; } > $out.new mv -f $out.new $out cat $f | grep '^STR' | while read name text; do + [ "$name" = "STR_ABOUT_MENU_SEPARATOR" ] && continue { grep -v "^$name\b" $out ; printf "%-64s%s\n" "$name" "$text" ; } > $out.new mv -f $out.new $out done diff --git a/src/lang/english.txt b/src/lang/english.txt index afc9fbef61..a65e2ff0e0 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1214,6 +1214,8 @@ STR_CONFIG_SETTING_SIGNALSIDE_DRIVING_SIDE :On the driving STR_CONFIG_SETTING_SIGNALSIDE_RIGHT :On the right STR_CONFIG_SETTING_VERTICAL_TOOLBAR :{BLACK}Vertical toolbar STR_CONFIG_SETTING_VERTICAL_TOOLBAR_HELPTEXT :{BLACK}Main toolbar is split into two vertical toolbars on the sides of the screen +STR_CONFIG_SETTING_COMPACT_VERTICAL_TOOLBAR :{BLACK}Compact vertical toolbar +STR_CONFIG_SETTING_COMPACT_VERTICAL_TOOLBAR_HELPTEXT :{BLACK}No 'Switch toolbars' button in the vertical toolbar, but more sub-menus STR_CONFIG_SETTING_BUTTON_SIZE :{BLACK}Button size STR_CONFIG_SETTING_BUTTON_SIZE_TOOLTIP :{BLACK}Size of all user interface elements STR_CONFIG_SETTING_FONT_SIZE :{BLACK}Font size diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 51561e4541..ad50feadb5 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1650,6 +1650,7 @@ static SettingsContainer &GetSettingsTree() interface->Add(new SettingEntry("gui.autosave")); interface->Add(new SettingEntry("gui.vertical_toolbar")); + interface->Add(new SettingEntry("gui.compact_vertical_toolbar")); interface->Add(new SettingEntry("gui.build_confirmation")); interface->Add(new SettingEntry("gui.windows_titlebars")); interface->Add(new SettingEntry("gui.windows_decorations")); diff --git a/src/settings_type.h b/src/settings_type.h index 96614bbd5b..165589fddd 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -78,6 +78,7 @@ struct GUISettings { uint8 order_review_system; ///< perform order reviews on vehicles bool vehicle_income_warn; ///< if a vehicle isn't generating income, show a warning bool vertical_toolbar; ///< main toolbar is split into two vertical toolbars + bool compact_vertical_toolbar; ///< compact mode for vertical toolbars, with more sub-menus bool build_confirmation; ///< show confirmation dialog when building roads and stations bool windows_titlebars; ///< show or hide titlebars for all windows to increase scrren space bool windows_decorations; ///< draw ornament on all window edges diff --git a/src/table/settings.ini b/src/table/settings.ini index 1cc7248601..cf17912c1e 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -2558,6 +2558,14 @@ strhelp = STR_CONFIG_SETTING_VERTICAL_TOOLBAR_HELPTEXT proc = VerticalToolbarChanged cat = SC_BASIC +[SDTC_BOOL] +var = gui.compact_vertical_toolbar +flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC +def = false +str = STR_CONFIG_SETTING_COMPACT_VERTICAL_TOOLBAR +strhelp = STR_CONFIG_SETTING_COMPACT_VERTICAL_TOOLBAR_HELPTEXT +cat = SC_BASIC + [SDTC_BOOL] var = gui.build_confirmation flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC