From 646deebd3a6eda4af36a6476c66074939474f35e Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Wed, 2 Mar 2016 19:00:33 +0000 Subject: [PATCH] re-order misc options --- src/windows/options.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/windows/options.c b/src/windows/options.c index a7eaf7e425..2d96c4ff3d 100644 --- a/src/windows/options.c +++ b/src/windows/options.c @@ -148,18 +148,18 @@ enum WINDOW_OPTIONS_WIDGET_IDX { // Misc WIDX_REAL_NAME_CHECKBOX = WIDX_PAGE_START, + WIDX_ALLOW_LOADING_WITH_INCORRECT_CHECKSUM, WIDX_SAVE_PLUGIN_DATA_CHECKBOX, + WIDX_TEST_UNFINISHED_TRACKS, + WIDX_DEBUGGING_TOOLS, + WIDX_STAY_CONNECTED_AFTER_DESYNC, WIDX_AUTOSAVE, WIDX_AUTOSAVE_DROPDOWN, - WIDX_TEST_UNFINISHED_TRACKS, - WIDX_AUTO_STAFF_PLACEMENT, - WIDX_HANDYMEN_MOW_DEFAULT, - WIDX_DEBUGGING_TOOLS, WIDX_TITLE_SEQUENCE, WIDX_TITLE_SEQUENCE_DROPDOWN, WIDX_TITLE_SEQUENCE_BUTTON, - WIDX_ALLOW_LOADING_WITH_INCORRECT_CHECKSUM, - WIDX_STAY_CONNECTED_AFTER_DESYNC, + WIDX_AUTO_STAFF_PLACEMENT, + WIDX_HANDYMEN_MOW_DEFAULT, WIDX_AUTO_OPEN_SHOPS, // Twitch @@ -290,20 +290,20 @@ static rct_widget window_options_controls_and_interface_widgets[] = { static rct_widget window_options_misc_widgets[] = { MAIN_OPTIONS_WIDGETS, - { WWT_CHECKBOX, 2, 10, 299, 54, 65, STR_REAL_NAME, STR_REAL_NAME_TIP }, - { WWT_CHECKBOX, 2, 10, 299, 69, 80, STR_SAVE_PLUGIN_DATA, STR_SAVE_PLUGIN_DATA_TIP }, - { WWT_DROPDOWN, 1, 155, 299, 83, 94, STR_NONE, STR_NONE }, - { WWT_DROPDOWN_BUTTON, 1, 288, 298, 84, 93, STR_DROPDOWN_GLYPH, STR_NONE }, - { WWT_CHECKBOX, 2, 10, 299, 114, 125, STR_TEST_UNFINISHED_TRACKS, STR_TEST_UNFINISHED_TRACKS_TIP }, // test unfinished tracks - { WWT_CHECKBOX, 2, 10, 299, 129, 140, STR_AUTO_STAFF_PLACEMENT, STR_NONE }, // auto staff placement - { WWT_CHECKBOX, 2, 10, 299, 144, 155, STR_HANDYMEN_MOW_BY_DEFAULT, STR_NONE }, // handymen mow by default - { WWT_CHECKBOX, 2, 10, 299, 159, 170, STR_ENABLE_DEBUGGING_TOOLS, STR_NONE }, // enable debugging tools - { WWT_DROPDOWN, 1, 155, 299, 173, 184, STR_NONE, STR_NONE }, - { WWT_DROPDOWN_BUTTON, 1, 288, 298, 174, 183, STR_DROPDOWN_GLYPH, STR_NONE }, - { WWT_DROPDOWN_BUTTON, 1, 26, 185, 189, 200, STR_EDIT_TITLE_SEQUENCES_BUTTON, STR_NONE }, // Title sequences button - { WWT_CHECKBOX, 2, 10, 299, 204, 215, STR_ALLOW_LOADING_WITH_INCORRECT_CHECKSUM, STR_ALLOW_LOADING_WITH_INCORRECT_CHECKSUM_TIP }, // Allow loading with incorrect checksum - { WWT_CHECKBOX, 2, 10, 299, 219, 230, STR_STAY_CONNECTED_AFTER_DESYNC, STR_NONE }, // Do not disconnect after the client desynchronises with the server - { WWT_CHECKBOX, 2, 10, 299, 234, 245, STR_AUTO_OPEN_SHOPS, STR_AUTO_OPEN_SHOPS_TIP }, // Automatically open shops & stalls + { WWT_CHECKBOX, 2, 10, 299, 54, 65, STR_REAL_NAME, STR_REAL_NAME_TIP }, // Show 'real' names of guests + { WWT_CHECKBOX, 2, 10, 299, 69, 80, STR_ALLOW_LOADING_WITH_INCORRECT_CHECKSUM, STR_ALLOW_LOADING_WITH_INCORRECT_CHECKSUM_TIP }, // Allow loading with incorrect checksum + { WWT_CHECKBOX, 2, 10, 299, 84, 95, STR_SAVE_PLUGIN_DATA, STR_SAVE_PLUGIN_DATA_TIP }, // Export plug-in objects with saved games + { WWT_CHECKBOX, 2, 10, 299, 99, 110, STR_TEST_UNFINISHED_TRACKS, STR_TEST_UNFINISHED_TRACKS_TIP }, // test unfinished tracks + { WWT_CHECKBOX, 2, 10, 299, 114, 125, STR_ENABLE_DEBUGGING_TOOLS, STR_NONE }, // enable debugging tools + { WWT_CHECKBOX, 2, 10, 299, 129, 140, STR_STAY_CONNECTED_AFTER_DESYNC, STR_NONE }, // Do not disconnect after the client desynchronises with the server + { WWT_DROPDOWN, 1, 155, 299, 144, 155, STR_NONE, STR_NONE }, // autosave dropdown + { WWT_DROPDOWN_BUTTON, 1, 288, 298, 145, 154, STR_DROPDOWN_GLYPH, STR_NONE }, // autosave dropdown button + { WWT_DROPDOWN, 1, 155, 299, 159, 170, STR_NONE, STR_NONE }, // title sequence dropdown + { WWT_DROPDOWN_BUTTON, 1, 288, 298, 160, 169, STR_DROPDOWN_GLYPH, STR_NONE }, // title seqeuence dropdown button + { WWT_DROPDOWN_BUTTON, 1, 26, 185, 174, 185, STR_EDIT_TITLE_SEQUENCES_BUTTON, STR_NONE }, // Title sequences button + { WWT_CHECKBOX, 2, 10, 299, 189, 200, STR_AUTO_STAFF_PLACEMENT, STR_NONE }, // auto staff placement + { WWT_CHECKBOX, 2, 10, 299, 204, 215, STR_HANDYMEN_MOW_BY_DEFAULT, STR_NONE }, // handymen mow by default + { WWT_CHECKBOX, 2, 10, 299, 219, 230, STR_AUTO_OPEN_SHOPS, STR_AUTO_OPEN_SHOPS_TIP }, // Automatically open shops & stalls { WIDGETS_END }, }; @@ -504,7 +504,7 @@ void window_options_open() if (w != NULL) return; - w = window_create_centred(WW, WH, &window_options_events, WC_OPTIONS, WF_RESIZABLE); + w = window_create_centred(WW, WH, &window_options_events, WC_OPTIONS, 0); w->widgets = window_options_display_widgets; w->enabled_widgets = window_options_page_enabled_widgets[WINDOW_OPTIONS_PAGE_DISPLAY]; w->page = WINDOW_OPTIONS_PAGE_DISPLAY;