mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor Editor*, Finances, Guest* to use MakeTab

This commit is contained in:
Aaron van Geffen 2020-08-17 17:32:24 +02:00
parent 6602b51b8b
commit be626d0b7c
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@ -87,9 +87,9 @@ enum {
#define MAIN_OBJECTIVE_OPTIONS_WIDGETS \
WINDOW_SHIM(WINDOW_TITLE, WW, WH), \
MakeWidget ({ 0, 43}, {280, 106}, WWT_RESIZE, 1 ), \
MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SELECT_OBJECTIVE_AND_PARK_NAME_TIP), \
MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SELECT_RIDES_TO_BE_PRESERVED_TIP )
MakeWidget({ 0, 43}, {280, 106}, WWT_RESIZE, 1 ), \
MakeTab ({ 3, 17}, STR_SELECT_OBJECTIVE_AND_PARK_NAME_TIP), \
MakeTab ({ 34, 17}, STR_SELECT_RIDES_TO_BE_PRESERVED_TIP )
static rct_widget window_editor_objective_options_main_widgets[] = {
MAIN_OBJECTIVE_OPTIONS_WIDGETS,

6
src/openrct2-ui/windows/EditorScenarioOptions.cpp
View File

@ -120,9 +120,9 @@ enum {
static rct_widget window_editor_scenario_options_financial_widgets[] = {
WINDOW_SHIM(STR_SCENARIO_OPTIONS_FINANCIAL, WW_FINANCIAL, WH_FINANCIAL),
MakeWidget ({ 0, 43}, { WW_FINANCIAL, 106}, WWT_RESIZE, 1),
MakeRemapWidget ({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SCENARIO_OPTIONS_FINANCIAL_TIP),
MakeRemapWidget ({ 34, 17}, { 31, 30}, WWT_TAB, 1, SPR_TAB, STR_SCENARIO_OPTIONS_GUESTS_TIP ),
MakeRemapWidget ({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SCENARIO_OPTIONS_PARK_TIP ),
MakeTab ({ 3, 17}, STR_SCENARIO_OPTIONS_FINANCIAL_TIP),
MakeTab ({ 34, 17}, STR_SCENARIO_OPTIONS_GUESTS_TIP ),
MakeTab ({ 65, 17}, STR_SCENARIO_OPTIONS_PARK_TIP ),
MakeWidget ({ 8, 48}, {WW_FINANCIAL - 16, 12}, WWT_CHECKBOX, 1, STR_MAKE_PARK_NO_MONEY, STR_MAKE_PARK_NO_MONEY_TIP ),
MakeSpinnerWidgets({168, 65}, { 100, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets
MakeSpinnerWidgets({168, 82}, { 100, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets

12
src/openrct2-ui/windows/Finances.cpp
View File

@ -86,12 +86,12 @@ enum
#pragma region Widgets
#define TAB_WIDGETS \
MakeRemapWidget({ 3, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_SHOW_SUMMARY_TAB_TIP ), \
MakeRemapWidget({ 34, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_SHOW_CASH_TAB_TIP ), \
MakeRemapWidget({ 65, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_SHOW_PARK_VALUE_TAB_TIP ), \
MakeRemapWidget({ 96, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_SHOW_WEEKLY_PROFIT_TAB_TIP), \
MakeRemapWidget({127, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_SHOW_MARKETING_TAB_TIP ), \
MakeRemapWidget({158, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_RESEARCH_TIP )
MakeTab({ 3, 17}, STR_FINANCES_SHOW_SUMMARY_TAB_TIP ), \
MakeTab({ 34, 17}, STR_FINANCES_SHOW_CASH_TAB_TIP ), \
MakeTab({ 65, 17}, STR_FINANCES_SHOW_PARK_VALUE_TAB_TIP ), \
MakeTab({ 96, 17}, STR_FINANCES_SHOW_WEEKLY_PROFIT_TAB_TIP), \
MakeTab({127, 17}, STR_FINANCES_SHOW_MARKETING_TAB_TIP ), \
MakeTab({158, 17}, STR_FINANCES_RESEARCH_TIP )
static rct_widget _windowFinancesSummaryWidgets[] =
{

16
src/openrct2-ui/windows/Guest.cpp
View File

@ -76,14 +76,14 @@ static constexpr int32_t TabWidth = 30;
#define MAIN_GUEST_WIDGETS \
WINDOW_SHIM(WINDOW_TITLE, WW, WH), \
MakeWidget ({ 0, 43}, {192, 114}, WWT_RESIZE, 1 ), /* Resize */ \
MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOW_GUEST_VIEW_TIP ), /* Tab 1 */ \
MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOW_GUEST_NEEDS_TIP ), /* Tab 2 */ \
MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOW_GUEST_VISITED_RIDES_TIP), /* Tab 3 */ \
MakeRemapWidget({ 96, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOW_GUEST_FINANCE_TIP ), /* Tab 4 */ \
MakeRemapWidget({127, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOW_GUEST_THOUGHTS_TIP ), /* Tab 5 */ \
MakeRemapWidget({158, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOW_GUEST_ITEMS_TIP ), /* Tab 6 */ \
MakeRemapWidget({189, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_DEBUG_TIP ) /* Tab 7 */
MakeWidget({ 0, 43}, {192, 114}, WWT_RESIZE, 1 ), /* Resize */ \
MakeTab ({ 3, 17}, STR_SHOW_GUEST_VIEW_TIP ), /* Tab 1 */ \
MakeTab ({ 34, 17}, STR_SHOW_GUEST_NEEDS_TIP ), /* Tab 2 */ \
MakeTab ({ 65, 17}, STR_SHOW_GUEST_VISITED_RIDES_TIP), /* Tab 3 */ \
MakeTab ({ 96, 17}, STR_SHOW_GUEST_FINANCE_TIP ), /* Tab 4 */ \
MakeTab ({127, 17}, STR_SHOW_GUEST_THOUGHTS_TIP ), /* Tab 5 */ \
MakeTab ({158, 17}, STR_SHOW_GUEST_ITEMS_TIP ), /* Tab 6 */ \
MakeTab ({189, 17}, STR_DEBUG_TIP ) /* Tab 7 */
static rct_widget window_guest_overview_widgets[] = {
MAIN_GUEST_WIDGETS,

22
src/openrct2-ui/windows/GuestList.cpp
View File

@ -69,17 +69,17 @@ static constexpr const rct_string_id viewNames[VIEW_COUNT] = {
static rct_widget window_guest_list_widgets[] = {
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
MakeWidget ({ 0, 43}, {350, 287}, WWT_RESIZE, 1 ), // tab content panel
MakeWidget ({ 5, 59}, { 80, 12}, WWT_DROPDOWN, 1, STR_ARG_4_PAGE_X ), // page dropdown
MakeWidget ({ 73, 60}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), // page dropdown button
MakeWidget ({120, 59}, {142, 12}, WWT_DROPDOWN, 1, 0xFFFFFFFF, STR_INFORMATION_TYPE_TIP ), // information type dropdown
MakeWidget ({250, 60}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_INFORMATION_TYPE_TIP ), // information type dropdown button
MakeWidget ({273, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_MAP, STR_SHOW_GUESTS_ON_MAP_TIP ), // map
MakeWidget ({297, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_G2_SEARCH, STR_GUESTS_FILTER_BY_NAME_TIP), // filter by name
MakeWidget ({321, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_TRACK_PEEP, STR_TRACKED_GUESTS_ONLY_TIP ), // tracking
MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_INDIVIDUAL_GUESTS_TIP ), // tab 1
MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SUMMARISED_GUESTS_TIP ), // tab 2
MakeWidget ({ 3, 72}, {344, 255}, WWT_SCROLL, 1, SCROLL_BOTH ), // guest list
MakeWidget({ 0, 43}, {350, 287}, WWT_RESIZE, 1 ), // tab content panel
MakeWidget({ 5, 59}, { 80, 12}, WWT_DROPDOWN, 1, STR_ARG_4_PAGE_X ), // page dropdown
MakeWidget({ 73, 60}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), // page dropdown button
MakeWidget({120, 59}, {142, 12}, WWT_DROPDOWN, 1, 0xFFFFFFFF, STR_INFORMATION_TYPE_TIP ), // information type dropdown
MakeWidget({250, 60}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_INFORMATION_TYPE_TIP ), // information type dropdown button
MakeWidget({273, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_MAP, STR_SHOW_GUESTS_ON_MAP_TIP ), // map
MakeWidget({297, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_G2_SEARCH, STR_GUESTS_FILTER_BY_NAME_TIP), // filter by name
MakeWidget({321, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_TRACK_PEEP, STR_TRACKED_GUESTS_ONLY_TIP ), // tracking
MakeTab ({ 3, 17}, STR_INDIVIDUAL_GUESTS_TIP ), // tab 1
MakeTab ({ 34, 17}, STR_SUMMARISED_GUESTS_TIP ), // tab 2
MakeWidget({ 3, 72}, {344, 255}, WWT_SCROLL, 1, SCROLL_BOTH ), // guest list
{ WIDGETS_END },
};