From dff1d724a007e5f84e5b4ff1ed7a6604c743172b Mon Sep 17 00:00:00 2001 From: Pulkit Date: Thu, 20 Apr 2017 12:07:22 -0400 Subject: [PATCH] Updated the location of the mute button --- data/language/en-GB.txt | 3 ++- src/openrct2/localisation/string_ids.h | 3 ++- src/openrct2/windows/options.c | 16 ++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 66653a3307..72a8084167 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -3492,7 +3492,7 @@ STR_5150 :Enable debugging tools STR_5151 :, STR_5152 :. STR_5153 :Edit Themes... -STR_5154 :Mute +STR_5154 :Hardware display STR_5155 :Allow testing of unfinished tracks STR_5156 :{SMALLFONT}{BLACK}Allows testing of most ride types even when the track is unfinished, does not apply to block sectioned modes STR_5157 :Unlock all prices @@ -4366,6 +4366,7 @@ STR_6054 :Only 24-bit bitmaps are supported STR_6055 :OpenRCT2 Heightmap File STR_6056 :{SMALLFONT}{BLACK}Mute STR_6057 :{SMALLFONT}{BLACK}Show a separate button for the Mute Option in the toolbar +STR_6058 :Mute ############# # Scenarios # diff --git a/src/openrct2/localisation/string_ids.h b/src/openrct2/localisation/string_ids.h index 79b1ec28e7..5b2c26c31d 100644 --- a/src/openrct2/localisation/string_ids.h +++ b/src/openrct2/localisation/string_ids.h @@ -2837,7 +2837,7 @@ enum { STR_LOCALE_THOUSANDS_SEPARATOR = 5151, STR_LOCALE_DECIMAL_POINT = 5152, STR_EDIT_THEMES_BUTTON = 5153, - STR_MUTE_BUTTON_ON_TOOLBAR = 5154, + STR_HARDWARE_DISPLAY = 5154, // Unused STR_TEST_UNFINISHED_TRACKS = 5155, STR_TEST_UNFINISHED_TRACKS_TIP = 5156, STR_CHEAT_UNLOCK_PRICES = 5157, @@ -3717,6 +3717,7 @@ enum { STR_SHOW_MUTE = 6056, STR_MUTE_BUTTON_ON_TOOLBAR_TIP = 6057, + STR_MUTE_BUTTON_ON_TOOLBAR = 6058, // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768 diff --git a/src/openrct2/windows/options.c b/src/openrct2/windows/options.c index 082c5082e5..21f3377d8b 100644 --- a/src/openrct2/windows/options.c +++ b/src/openrct2/windows/options.c @@ -299,16 +299,16 @@ static rct_widget window_options_controls_and_interface_widgets[] = { { WWT_DROPDOWN, 1, 155, 299, 162, 173, STR_NONE, STR_NONE }, // Themes { WWT_DROPDOWN_BUTTON, 1, 288, 298, 163, 172, STR_DROPDOWN_GLYPH, STR_CURRENT_THEME_TIP }, { WWT_DROPDOWN_BUTTON, 1, 10, 145, 178, 189, STR_EDIT_THEMES_BUTTON, STR_EDIT_THEMES_BUTTON_TIP }, // Themes button - { WWT_GROUPBOX, 1, 5, 304, 198, 260, STR_TOOLBAR_BUTTONS_GROUP, STR_NONE }, // Toolbar buttons group + { WWT_GROUPBOX, 1, 5, 304, 198, 275, STR_TOOLBAR_BUTTONS_GROUP, STR_NONE }, // Toolbar buttons group { WWT_CHECKBOX, 2, 10, 145, 229, 240, STR_FINANCES_BUTTON_ON_TOOLBAR, STR_FINANCES_BUTTON_ON_TOOLBAR_TIP }, // Finances { WWT_CHECKBOX, 2, 10, 145, 244, 255, STR_RESEARCH_BUTTON_ON_TOOLBAR, STR_RESEARCH_BUTTON_ON_TOOLBAR_TIP }, // Research - { WWT_CHECKBOX, 2, 115, 180, 229, 240, STR_CHEATS_BUTTON_ON_TOOLBAR, STR_CHEATS_BUTTON_ON_TOOLBAR_TIP }, // Cheats - { WWT_CHECKBOX, 2, 180, 210, 229, 240, STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR, STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR_TIP }, // Recent messages - { WWT_CHECKBOX, 2, 115, 185, 244, 255, STR_MUTE_BUTTON_ON_TOOLBAR, STR_MUTE_BUTTON_ON_TOOLBAR_TIP }, // Mute - { WWT_CHECKBOX, 2, 10, 299, 269, 280, STR_SELECT_BY_TRACK_TYPE, STR_SELECT_BY_TRACK_TYPE_TIP }, // Select by track type - { WWT_DROPDOWN, 2, 155, 299, 284, 295, STR_NONE, STR_NONE }, // Scenario select mode - { WWT_DROPDOWN_BUTTON, 2, 288, 298, 285, 294, STR_DROPDOWN_GLYPH, STR_SCENARIO_GROUPING_TIP }, - { WWT_CHECKBOX, 2, 18, 299, 299, 310, STR_OPTIONS_SCENARIO_UNLOCKING, STR_SCENARIO_UNLOCKING_TIP }, // Unlocking of scenarios + { WWT_CHECKBOX, 2, 155, 299, 229, 240, STR_CHEATS_BUTTON_ON_TOOLBAR, STR_CHEATS_BUTTON_ON_TOOLBAR_TIP }, // Cheats + { WWT_CHECKBOX, 2, 155, 299, 244, 255, STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR, STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR_TIP }, // Recent messages + { WWT_CHECKBOX, 2, 10, 185, 259, 270, STR_MUTE_BUTTON_ON_TOOLBAR, STR_MUTE_BUTTON_ON_TOOLBAR_TIP }, // Mute + { WWT_CHECKBOX, 2, 10, 299, 279, 285, STR_SELECT_BY_TRACK_TYPE, STR_SELECT_BY_TRACK_TYPE_TIP }, // Select by track type + { WWT_DROPDOWN, 2, 155, 299, 294, 305, STR_NONE, STR_NONE }, // Scenario select mode + { WWT_DROPDOWN_BUTTON, 2, 288, 298, 295, 304, STR_DROPDOWN_GLYPH, STR_SCENARIO_GROUPING_TIP }, + { WWT_CHECKBOX, 2, 18, 299, 309, 320, STR_OPTIONS_SCENARIO_UNLOCKING, STR_SCENARIO_UNLOCKING_TIP }, // Unlocking of scenarios { WIDGETS_END }, };