Update to 14.0-beta1
This commit is contained in:
@@ -7,26 +7,27 @@
|
||||
; GUI settings as stored in the main configuration file ("openttd.cfg").
|
||||
|
||||
[pre-amble]
|
||||
static void v_PositionMainToolbar(int32 new_value);
|
||||
static void v_PositionStatusbar(int32 new_value);
|
||||
static void RedrawSmallmap(int32 new_value);
|
||||
static void UpdateLinkgraphColours(int32 new_value);
|
||||
static void InvalidateCompanyLiveryWindow(int32 new_value);
|
||||
static void InvalidateNewGRFChangeWindows(int32 new_value);
|
||||
static void ZoomMinMaxChanged(int32 new_value);
|
||||
static void SpriteZoomMinChanged(int32 new_value);
|
||||
static bool CanChangeTimetableMode(int32_t &new_value);
|
||||
static void v_PositionMainToolbar(int32_t new_value);
|
||||
static void v_PositionStatusbar(int32_t new_value);
|
||||
static void RedrawSmallmap(int32_t new_value);
|
||||
static void UpdateLinkgraphColours(int32_t new_value);
|
||||
static void InvalidateCompanyLiveryWindow(int32_t new_value);
|
||||
static void InvalidateNewGRFChangeWindows(int32_t new_value);
|
||||
static void ZoomMinMaxChanged(int32_t new_value);
|
||||
static void SpriteZoomMinChanged(int32_t new_value);
|
||||
|
||||
static constexpr std::initializer_list<const char*> _autosave_interval{"off", "monthly", "quarterly", "half year", "yearly"};
|
||||
static constexpr std::initializer_list<const char*> _osk_activation{"disabled", "double", "single", "immediately"};
|
||||
static constexpr std::initializer_list<const char*> _savegame_date{"long", "short", "iso"};
|
||||
static constexpr std::initializer_list<const char*> _right_click_close{"no", "yes", "except sticky"};
|
||||
|
||||
static const SettingVariant _gui_settings_table[] = {
|
||||
[post-amble]
|
||||
};
|
||||
[templates]
|
||||
SDTC_BOOL = SDTC_BOOL( $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup),
|
||||
SDTC_OMANY = SDTC_OMANY( $var, $type, $flags, $def, $max, $full, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup),
|
||||
SDTC_VAR = SDTC_VAR( $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup),
|
||||
SDTC_BOOL = SDTC_BOOL( $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $str_cb, $help_cb, $val_cb, $from, $to, $cat, $extra, $startup),
|
||||
SDTC_OMANY = SDTC_OMANY( $var, $type, $flags, $def, $max, $full, $str, $strhelp, $strval, $pre_cb, $post_cb, $str_cb, $help_cb, $val_cb, $from, $to, $cat, $extra, $startup),
|
||||
SDTC_VAR = SDTC_VAR( $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $str_cb, $help_cb, $val_cb, $from, $to, $cat, $extra, $startup),
|
||||
|
||||
[validation]
|
||||
SDTC_OMANY = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size");
|
||||
@@ -40,6 +41,9 @@ strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
|
||||
strval = STR_NULL
|
||||
pre_cb = nullptr
|
||||
post_cb = nullptr
|
||||
str_cb = nullptr
|
||||
help_cb = nullptr
|
||||
val_cb = nullptr
|
||||
load = nullptr
|
||||
from = SL_MIN_VERSION
|
||||
to = SL_MAX_VERSION
|
||||
@@ -48,17 +52,13 @@ extra = 0
|
||||
startup = false
|
||||
|
||||
|
||||
[SDTC_OMANY]
|
||||
var = gui.autosave
|
||||
type = SLE_UINT8
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
|
||||
def = 1
|
||||
max = 4
|
||||
full = _autosave_interval
|
||||
str = STR_CONFIG_SETTING_AUTOSAVE
|
||||
strhelp = STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT
|
||||
strval = STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF
|
||||
cat = SC_BASIC
|
||||
[SDTC_VAR]
|
||||
var = gui.autosave_interval
|
||||
type = SLE_UINT32
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
def = 10
|
||||
min = 0
|
||||
max = 1440
|
||||
|
||||
[SDTC_BOOL]
|
||||
var = gui.threaded_saves
|
||||
@@ -82,7 +82,9 @@ var = gui.show_finances
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
def = true
|
||||
str = STR_CONFIG_SETTING_SHOWFINANCES
|
||||
str_cb = SettingTitleWallclock
|
||||
strhelp = STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT
|
||||
help_cb = SettingHelpWallclock
|
||||
cat = SC_BASIC
|
||||
|
||||
[SDTC_VAR]
|
||||
@@ -126,16 +128,21 @@ cat = SC_BASIC
|
||||
[SDTC_BOOL]
|
||||
var = gui.smooth_scroll
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
def = false
|
||||
def = true
|
||||
str = STR_CONFIG_SETTING_SMOOTH_SCROLLING
|
||||
strhelp = STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT
|
||||
|
||||
[SDTC_BOOL]
|
||||
var = gui.right_mouse_wnd_close
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
def = false
|
||||
[SDTC_OMANY]
|
||||
var = gui.right_click_wnd_close
|
||||
type = SLE_UINT8
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
|
||||
def = RCC_NO
|
||||
min = RCC_NO
|
||||
max = RCC_YES_EXCEPT_STICKY
|
||||
full = _right_click_close
|
||||
str = STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE
|
||||
strhelp = STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT
|
||||
strval = STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_NO
|
||||
cat = SC_BASIC
|
||||
|
||||
; We might need to emulate a right mouse button on mac
|
||||
@@ -169,7 +176,7 @@ min = 0
|
||||
max = 20
|
||||
str = STR_CONFIG_SETTING_ERRMSG_DURATION
|
||||
strhelp = STR_CONFIG_SETTING_ERRMSG_DURATION_HELPTEXT
|
||||
strval = STR_CONFIG_SETTING_ERRMSG_DURATION_VALUE
|
||||
strval = STR_CONFIG_SETTING_SECONDS_VALUE
|
||||
|
||||
[SDTC_VAR]
|
||||
var = gui.hover_delay_ms
|
||||
@@ -348,6 +355,17 @@ str = STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR
|
||||
strhelp = STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_HELPTEXT
|
||||
strval = STR_COLOUR_DARK_BLUE
|
||||
|
||||
[SDTC_VAR]
|
||||
var = gui.starting_colour_secondary
|
||||
type = SLE_UINT8
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
|
||||
def = COLOUR_END
|
||||
min = 0
|
||||
max = COLOUR_END
|
||||
str = STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_SECONDARY
|
||||
strhelp = STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_SECONDARY_HELPTEXT
|
||||
strval = STR_COLOUR_SECONDARY_DARK_BLUE
|
||||
|
||||
[SDTC_BOOL]
|
||||
var = gui.auto_remove_signals
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
@@ -408,14 +426,19 @@ str = STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS
|
||||
strhelp = STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_HELPTEXT
|
||||
strval = STR_CONFIG_SETTING_COMPANIES_OFF
|
||||
|
||||
[SDTC_BOOL]
|
||||
var = gui.timetable_in_ticks
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
def = false
|
||||
str = STR_CONFIG_SETTING_TIMETABLE_IN_TICKS
|
||||
strhelp = STR_CONFIG_SETTING_TIMETABLE_IN_TICKS_HELPTEXT
|
||||
[SDTC_VAR]
|
||||
var = gui.timetable_mode
|
||||
type = SLE_UINT8
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
|
||||
def = 0
|
||||
min = 0
|
||||
max = 2
|
||||
str = STR_CONFIG_SETTING_TIMETABLE_MODE
|
||||
strhelp = STR_CONFIG_SETTING_TIMETABLE_MODE_HELPTEXT
|
||||
strval = STR_CONFIG_SETTING_TIMETABLE_MODE_DAYS
|
||||
pre_cb = CanChangeTimetableMode
|
||||
post_cb = [](auto) { InvalidateWindowClassesData(WC_VEHICLE_TIMETABLE, VIWD_MODIFY_ORDERS); }
|
||||
cat = SC_EXPERT
|
||||
cat = SC_ADVANCED
|
||||
|
||||
[SDTC_BOOL]
|
||||
var = gui.timetable_arrival_departure
|
||||
@@ -484,8 +507,8 @@ var = gui.coloured_news_year
|
||||
type = SLE_INT32
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
def = 2000
|
||||
min = MIN_YEAR
|
||||
max = MAX_YEAR
|
||||
min = CalendarTime::MIN_YEAR
|
||||
max = CalendarTime::MAX_YEAR
|
||||
interval = 1
|
||||
str = STR_CONFIG_SETTING_COLOURED_NEWS_YEAR
|
||||
strhelp = STR_CONFIG_SETTING_COLOURED_NEWS_YEAR_HELPTEXT
|
||||
@@ -496,13 +519,13 @@ cat = SC_EXPERT
|
||||
var = gui.cycle_signal_types
|
||||
type = SLE_UINT8
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
|
||||
def = 0
|
||||
min = 0
|
||||
max = 1
|
||||
def = SIGNAL_CYCLE_GROUP
|
||||
min = SIGNAL_CYCLE_GROUP
|
||||
max = SIGNAL_CYCLE_ALL
|
||||
interval = 1
|
||||
str = STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES
|
||||
strhelp = STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES_HELPTEXT
|
||||
strval = STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS
|
||||
strval = STR_CONFIG_SETTING_CYCLE_SIGNAL_GROUP
|
||||
cat = SC_ADVANCED
|
||||
|
||||
[SDTC_VAR]
|
||||
@@ -531,8 +554,8 @@ var = gui.semaphore_build_before
|
||||
type = SLE_INT32
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
def = 1950
|
||||
min = MIN_YEAR
|
||||
max = MAX_YEAR
|
||||
min = CalendarTime::MIN_YEAR
|
||||
max = CalendarTime::MAX_YEAR
|
||||
interval = 1
|
||||
str = STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE
|
||||
strhelp = STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE_HELPTEXT
|
||||
@@ -545,6 +568,7 @@ flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
def = true
|
||||
str = STR_CONFIG_SETTING_WARN_INCOME_LESS
|
||||
strhelp = STR_CONFIG_SETTING_WARN_INCOME_LESS_HELPTEXT
|
||||
help_cb = SettingHelpWallclock
|
||||
cat = SC_BASIC
|
||||
|
||||
[SDTC_VAR]
|
||||
@@ -578,13 +602,14 @@ cat = SC_BASIC
|
||||
var = gui.stop_location
|
||||
type = SLE_UINT8
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
|
||||
def = 2
|
||||
def = 1
|
||||
min = 0
|
||||
max = 2
|
||||
interval = 1
|
||||
str = STR_CONFIG_SETTING_STOP_LOCATION
|
||||
strhelp = STR_CONFIG_SETTING_STOP_LOCATION_HELPTEXT
|
||||
strval = STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END
|
||||
post_cb = [](auto) { SetWindowClassesDirty(WC_VEHICLE_ORDERS); }
|
||||
cat = SC_BASIC
|
||||
|
||||
[SDTC_BOOL]
|
||||
@@ -675,7 +700,7 @@ cat = SC_BASIC
|
||||
var = gui.station_gui_group_order
|
||||
type = SLE_UINT8
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
def = 0
|
||||
def = 3
|
||||
min = 0
|
||||
max = 5
|
||||
interval = 1
|
||||
@@ -779,7 +804,7 @@ cat = SC_EXPERT
|
||||
var = gui.ai_developer_tools
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
def = false
|
||||
post_cb = [](auto) { InvalidateWindowClassesData(WC_AI_SETTINGS); }
|
||||
post_cb = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); InvalidateWindowClassesData(WC_SCRIPT_DEBUG); InvalidateWindowClassesData(WC_SCRIPT_SETTINGS); }
|
||||
cat = SC_EXPERT
|
||||
|
||||
[SDTC_BOOL]
|
||||
|
||||
Reference in New Issue
Block a user