diff options
| author | rubidium <rubidium@openttd.org> | 2011-02-04 14:38:15 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-02-04 14:38:15 +0000 |
| commit | 313c1bc171b5714f8eda6f5a7b46c1d53cb3e532 (patch) | |
| tree | 1b1ec593702c36cc6d2cd614b26ddea914f254c3 | |
| parent | 2ad1279725c08c98db9eaaceb684709f59a6650f (diff) | |
| download | openttd-313c1bc171b5714f8eda6f5a7b46c1d53cb3e532.tar.xz | |
(svn r21955) -Cleanup: always show the long date in the status bar
| -rw-r--r-- | src/lang/english.txt | 2 | ||||
| -rw-r--r-- | src/settings_type.h | 1 | ||||
| -rw-r--r-- | src/statusbar_gui.cpp | 2 | ||||
| -rw-r--r-- | src/table/settings.h | 1 |
4 files changed, 1 insertions, 5 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt index e183afcce..e2671b942 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1122,7 +1122,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :as other indust STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospecting STR_CONFIG_SETTING_INDUSTRY_PLATFORM :{LTBLUE}Flat area around industries: {ORANGE}{STRING1} tile{P 0:1 "" s} STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Allow multiple similar industries per town: {ORANGE}{STRING1} -STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Always show long date in the status bar: {ORANGE}{STRING1} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Show signals on the drive side: {ORANGE}{STRING1} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Show finances window at the end of the year: {ORANGE}{STRING1} STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT :{LTBLUE}New orders are 'non-stop' by default: {ORANGE}{STRING1} @@ -4239,7 +4238,6 @@ STR_COMPANY_MONEY :{WHITE}{CURRENC STR_BLACK_DATE_LONG :{BLACK}{DATE_LONG} STR_BLACK_CROSS :{BLACK}{CROSS} STR_SILVER_CROSS :{SILVER}{CROSS} -STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT} STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG} STR_SHORT_DATE :{WHITE}{DATE_TINY} STR_DATE_LONG_SMALL :{TINYFONT}{BLACK}{DATE_LONG} diff --git a/src/settings_type.h b/src/settings_type.h index 6a163be08..0faeb4407 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -46,7 +46,6 @@ struct GUISettings { bool lost_vehicle_warn; ///< if a vehicle can't find its destination, show a warning uint8 order_review_system; ///< perform order reviews on vehicles bool vehicle_income_warn; ///< if a vehicle isn't generating income, show a warning - bool status_long_date; ///< always show long date in status bar bool show_finances; ///< show finances at end of year bool sg_new_nonstop; ///< ttdpatch compatible nonstop handling read from pre v93 savegames bool new_nonstop; ///< ttdpatch compatible nonstop handling diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp index 626f4b394..4c1184336 100644 --- a/src/statusbar_gui.cpp +++ b/src/statusbar_gui.cpp @@ -136,7 +136,7 @@ struct StatusBarWindow : Window { case SBW_LEFT: /* Draw the date */ SetDParam(0, _date); - DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, (_pause_mode || _settings_client.gui.status_long_date) ? STR_WHITE_DATE_LONG : STR_WHITE_DATE_SHORT, TC_FROMSTRING, SA_HOR_CENTER); + DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, STR_WHITE_DATE_LONG, TC_FROMSTRING, SA_HOR_CENTER); break; case SBW_RIGHT: { diff --git a/src/table/settings.h b/src/table/settings.h index b9c012fbf..08a2d6f9c 100644 --- a/src/table/settings.h +++ b/src/table/settings.h @@ -563,7 +563,6 @@ const SettingDesc _settings[] = { SDTC_OMANY(gui.autosave, SLE_UINT8, S, 0, 1, 4, _autosave_interval, STR_NULL, NULL), SDTC_BOOL(gui.threaded_saves, S, 0, true, STR_NULL, NULL), SDTC_OMANY(gui.date_format_in_default_names,SLE_UINT8,S,MS, 0, 2, _savegame_date, STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES, NULL), - SDTC_BOOL(gui.status_long_date, S, 0, true, STR_CONFIG_SETTING_LONGDATE, NULL), SDTC_BOOL(gui.show_finances, S, 0, true, STR_CONFIG_SETTING_SHOWFINANCES, NULL), SDTC_BOOL(gui.autoscroll, S, 0, false, STR_CONFIG_SETTING_AUTOSCROLL, NULL), SDTC_BOOL(gui.reverse_scroll, S, 0, false, STR_CONFIG_SETTING_REVERSE_SCROLLING, NULL), |