diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 5ab296bdf5..cfa05c3167 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -72,10 +72,10 @@ validate_global_widx(WC_STAFF, WIDX_PICKUP); #define MAIN_STAFF_WIDGETS \ WINDOW_SHIM(WINDOW_TITLE, WW, WH), \ - MakeWidget ({ 0, 43}, {190, 137}, WWT_RESIZE, 1 ), /* Resize */ \ - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_OVERVIEW_TIP), /* Tab 1 */ \ - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_OPTIONS_TIP ), /* Tab 2 */ \ - MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_STATS_TIP ) /* Tab 3 */ + MakeWidget({ 0, 43}, {190, 137}, WWT_RESIZE, 1), /* Resize */ \ + MakeTab ({ 3, 17}, STR_STAFF_OVERVIEW_TIP ), /* Tab 1 */ \ + MakeTab ({34, 17}, STR_STAFF_OPTIONS_TIP ), /* Tab 2 */ \ + MakeTab ({65, 17}, STR_STAFF_STATS_TIP ) /* Tab 3 */ static rct_widget window_staff_overview_widgets[] = { MAIN_STAFF_WIDGETS, diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index a75782560a..9e51a63e80 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -112,17 +112,17 @@ constexpr int32_t MAX_WH = 450; static rct_widget window_staff_list_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 0, 43}, { WW, WH - 43}, WWT_RESIZE, 1 ), // tab content panel - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_HANDYMEN_TAB_TIP ), // handymen tab - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_MECHANICS_TAB_TIP ), // mechanics tab - MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_SECURITY_TAB_TIP ), // security guards tab - MakeRemapWidget({ 96, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_ENTERTAINERS_TAB_TIP), // entertainers tab - MakeWidget ({ 3, 72}, {WW - 6, 195}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // staff list - MakeWidget ({130, 58}, { 12, 12}, WWT_COLOURBTN, 1, STR_NONE, STR_UNIFORM_COLOUR_TIP ), // uniform colour picker - MakeWidget ({165, 17}, { 145, 13}, WWT_BUTTON, 0, STR_NONE, STR_HIRE_STAFF_TIP ), // hire button - MakeWidget ({243, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH, STR_QUICK_FIRE_STAFF ), // quick fire staff - MakeWidget ({267, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_PATROL_BTN, STR_SHOW_PATROL_AREA_TIP ), // show staff patrol area tool - MakeWidget ({291, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_MAP, STR_SHOW_STAFF_ON_MAP_TIP ), // show staff on map button + MakeWidget({ 0, 43}, { WW, WH - 43}, WWT_RESIZE, 1 ), // tab content panel + MakeTab ({ 3, 17}, STR_STAFF_HANDYMEN_TAB_TIP ), // handymen tab + MakeTab ({ 34, 17}, STR_STAFF_MECHANICS_TAB_TIP ), // mechanics tab + MakeTab ({ 65, 17}, STR_STAFF_SECURITY_TAB_TIP ), // security guards tab + MakeTab ({ 96, 17}, STR_STAFF_ENTERTAINERS_TAB_TIP), // entertainers tab + MakeWidget({ 3, 72}, {WW - 6, 195}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // staff list + MakeWidget({130, 58}, { 12, 12}, WWT_COLOURBTN, 1, STR_NONE, STR_UNIFORM_COLOUR_TIP ), // uniform colour picker + MakeWidget({165, 17}, { 145, 13}, WWT_BUTTON, 0, STR_NONE, STR_HIRE_STAFF_TIP ), // hire button + MakeWidget({243, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH, STR_QUICK_FIRE_STAFF ), // quick fire staff + MakeWidget({267, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_PATROL_BTN, STR_SHOW_PATROL_AREA_TIP ), // show staff patrol area tool + MakeWidget({291, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_MAP, STR_SHOW_STAFF_ON_MAP_TIP ), // show staff on map button { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index a7cec987bd..e74c183c51 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -115,29 +115,29 @@ static constexpr const int32_t WH = 107; static rct_widget window_themes_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 0, 43}, {320, 64}, WWT_RESIZE, 1 ), // tab content panel - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_SETTINGS_TIP ), // settings tab - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_MAIN_TIP ), // main ui tab - MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_PARK_TIP ), // park tab - MakeRemapWidget({ 96, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_TOOLS_TIP ), // tools tab - MakeRemapWidget({127, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_RIDES_AND_GUESTS_TIP), // rides and peeps tab - MakeRemapWidget({158, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_EDITORS_TIP ), // editors tab - MakeRemapWidget({189, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_MISC_TIP ), // misc tab - MakeRemapWidget({220, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_PROMPTS_TIP ), // prompts tab - MakeRemapWidget({251, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_FEATURES_TIP ), // features tab - MakeWidget ({ 5, 46}, {214, 15}, WWT_TABLE_HEADER, 1, STR_THEMES_HEADER_WINDOW ), // Window header - MakeWidget ({219, 46}, { 97, 15}, WWT_TABLE_HEADER, 1, STR_THEMES_HEADER_PALETTE ), // Palette header - MakeWidget ({125, 60}, {175, 12}, WWT_DROPDOWN, 1 ), // Preset colour schemes - MakeWidget ({288, 61}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), - MakeWidget ({ 10, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_THEMES_ACTION_DUPLICATE_TIP ), // Duplicate button - MakeWidget ({110, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TRACK_MANAGE_DELETE, STR_THEMES_ACTION_DELETE_TIP ), // Delete button - MakeWidget ({210, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TRACK_MANAGE_RENAME, STR_THEMES_ACTION_RENAME_TIP ), // Rename button - MakeWidget ({ 0, 0}, { 1, 1}, WWT_COLOURBTN, 1 ), // colour button mask - MakeWidget ({ 3, 60}, {314, 44}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // staff list - MakeWidget ({ 10, 54}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_RIDE_CONTROLS ), // rct1 ride lights - MakeWidget ({ 10, 69}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_PARK_CONTROLS ), // rct1 park lights - MakeWidget ({ 10, 84}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_SCENARIO_SELECTION_FONT ), // rct1 scenario font - MakeWidget ({ 10, 99}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_BOTTOM_TOOLBAR ), // rct1 bottom toolbar + MakeWidget({ 0, 43}, {320, 64}, WWT_RESIZE, 1 ), // tab content panel + MakeTab ({ 3, 17}, STR_THEMES_TAB_SETTINGS_TIP ), // settings tab + MakeTab ({ 34, 17}, STR_THEMES_TAB_MAIN_TIP ), // main ui tab + MakeTab ({ 65, 17}, STR_THEMES_TAB_PARK_TIP ), // park tab + MakeTab ({ 96, 17}, STR_THEMES_TAB_TOOLS_TIP ), // tools tab + MakeTab ({127, 17}, STR_THEMES_TAB_RIDES_AND_GUESTS_TIP), // rides and peeps tab + MakeTab ({158, 17}, STR_THEMES_TAB_EDITORS_TIP ), // editors tab + MakeTab ({189, 17}, STR_THEMES_TAB_MISC_TIP ), // misc tab + MakeTab ({220, 17}, STR_THEMES_TAB_PROMPTS_TIP ), // prompts tab + MakeTab ({251, 17}, STR_THEMES_TAB_FEATURES_TIP ), // features tab + MakeWidget({ 5, 46}, {214, 15}, WWT_TABLE_HEADER, 1, STR_THEMES_HEADER_WINDOW ), // Window header + MakeWidget({219, 46}, { 97, 15}, WWT_TABLE_HEADER, 1, STR_THEMES_HEADER_PALETTE ), // Palette header + MakeWidget({125, 60}, {175, 12}, WWT_DROPDOWN, 1 ), // Preset colour schemes + MakeWidget({288, 61}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), + MakeWidget({ 10, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_THEMES_ACTION_DUPLICATE_TIP ), // Duplicate button + MakeWidget({110, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TRACK_MANAGE_DELETE, STR_THEMES_ACTION_DELETE_TIP ), // Delete button + MakeWidget({210, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TRACK_MANAGE_RENAME, STR_THEMES_ACTION_RENAME_TIP ), // Rename button + MakeWidget({ 0, 0}, { 1, 1}, WWT_COLOURBTN, 1 ), // colour button mask + MakeWidget({ 3, 60}, {314, 44}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // staff list + MakeWidget({ 10, 54}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_RIDE_CONTROLS ), // rct1 ride lights + MakeWidget({ 10, 69}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_PARK_CONTROLS ), // rct1 park lights + MakeWidget({ 10, 84}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_SCENARIO_SELECTION_FONT ), // rct1 scenario font + MakeWidget({ 10, 99}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_BOTTOM_TOOLBAR ), // rct1 bottom toolbar { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index b436999bdb..28fc992804 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -148,11 +148,11 @@ static constexpr int32_t SCROLL_WIDTH = 350; static rct_widget window_title_editor_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 0, 43}, { 320, 84}, WWT_RESIZE, 1 ), // tab content panel - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_SETTINGS_TIP ), // presets tab - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_TITLE_EDITOR_SAVES_TAB_TIP ), // saves tab - MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_TITLE_EDITOR_SCRIPT_TAB_TIP ), // script tab - MakeWidget ({ 89, 48}, { 228, 219}, WWT_SCROLL, 1, SCROLL_BOTH ), // command/save list + MakeWidget({ 0, 43}, { 320, 84}, WWT_RESIZE, 1 ), // tab content panel + MakeTab ({ 3, 17}, STR_THEMES_TAB_SETTINGS_TIP ), // presets tab + MakeTab ({ 34, 17}, STR_TITLE_EDITOR_SAVES_TAB_TIP ), // saves tab + MakeTab ({ 65, 17}, STR_TITLE_EDITOR_SCRIPT_TAB_TIP ), // script tab + MakeWidget({ 89, 48}, { 228, 219}, WWT_SCROLL, 1, SCROLL_BOTH), // command/save list // Presets Tab MakeWidget ({ 125, 60}, { 175, 14}, WWT_DROPDOWN, 1 ), // Preset title sequences