miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Setting for a compact vertical toolbar, no implementation yet

Browse Source
This commit is contained in:
Sergii Pylypenko
2017-06-23 19:46:19 +03:00
parent 17fce52ad9
commit 6f2aafb1b1
5 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android-store-strings.sh
View File

@@ -7,6 +7,7 @@ for f in ../translations/lang/*.txt; do
{ grep -v "^# Android strings" $out ; echo "# Android strings" ; } > $out.new { grep -v "^# Android strings" $out ; echo "# Android strings" ; } > $out.new
mv -f $out.new $out mv -f $out.new $out
cat $f | grep '^STR' | while read name text; do 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 { grep -v "^$name\b" $out ; printf "%-64s%s\n" "$name" "$text" ; } > $out.new
mv -f $out.new $out mv -f $out.new $out
done done

2
src/lang/english.txt
View File

@@ -1214,6 +1214,8 @@ STR_CONFIG_SETTING_SIGNALSIDE_DRIVING_SIDE :On the driving
STR_CONFIG_SETTING_SIGNALSIDE_RIGHT :On the right STR_CONFIG_SETTING_SIGNALSIDE_RIGHT :On the right
STR_CONFIG_SETTING_VERTICAL_TOOLBAR :{BLACK}Vertical toolbar 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_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 :{BLACK}Button size
STR_CONFIG_SETTING_BUTTON_SIZE_TOOLTIP :{BLACK}Size of all user interface elements STR_CONFIG_SETTING_BUTTON_SIZE_TOOLTIP :{BLACK}Size of all user interface elements
STR_CONFIG_SETTING_FONT_SIZE :{BLACK}Font size STR_CONFIG_SETTING_FONT_SIZE :{BLACK}Font size

1
src/settings_gui.cpp
View File

@@ -1650,6 +1650,7 @@ static SettingsContainer &GetSettingsTree()
interface->Add(new SettingEntry("gui.autosave")); interface->Add(new SettingEntry("gui.autosave"));
interface->Add(new SettingEntry("gui.vertical_toolbar")); 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.build_confirmation"));
interface->Add(new SettingEntry("gui.windows_titlebars")); interface->Add(new SettingEntry("gui.windows_titlebars"));
interface->Add(new SettingEntry("gui.windows_decorations")); interface->Add(new SettingEntry("gui.windows_decorations"));

1
src/settings_type.h
View File

@@ -78,6 +78,7 @@ struct GUISettings {
uint8 order_review_system; ///< perform order reviews on vehicles uint8 order_review_system; ///< perform order reviews on vehicles
bool vehicle_income_warn; ///< if a vehicle isn't generating income, show a warning 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 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 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_titlebars; ///< show or hide titlebars for all windows to increase scrren space
bool windows_decorations; ///< draw ornament on all window edges bool windows_decorations; ///< draw ornament on all window edges

8
src/table/settings.ini
View File

@@ -2558,6 +2558,14 @@ strhelp = STR_CONFIG_SETTING_VERTICAL_TOOLBAR_HELPTEXT
proc = VerticalToolbarChanged proc = VerticalToolbarChanged
cat = SC_BASIC 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] [SDTC_BOOL]
var = gui.build_confirmation var = gui.build_confirmation
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC