mirror of https://github.com/OpenRCT2/OpenRCT2.git
Use MakeTab in EditorInventionsList, EditorObjectSelection, Scenery
This commit is contained in:
Aaron van Geffen
parent
4a55acd71e
commit
6602b51b8b
|
|
@ -47,14 +47,14 @@ enum {
|
|||
|
||||
static rct_widget window_editor_inventions_list_widgets[] = {
|
||||
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
|
||||
MakeWidget ({ 0, 43}, {600, 357}, WWT_RESIZE, 1 ),
|
||||
MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB ),
|
||||
MakeWidget ({ 4, 56}, {368, 161}, WWT_SCROLL, 1, SCROLL_VERTICAL ),
|
||||
MakeWidget ({ 4, 231}, {368, 157}, WWT_SCROLL, 1, SCROLL_VERTICAL ),
|
||||
MakeWidget ({431, 106}, {114, 114}, WWT_FLATBTN, 1 ),
|
||||
MakeWidget ({375, 343}, {220, 14}, WWT_BUTTON, 1, STR_MOVE_ALL_TOP ),
|
||||
MakeWidget ({375, 358}, {220, 14}, WWT_BUTTON, 1, STR_MOVE_ALL_BOTTOM ),
|
||||
MakeWidget ({375, 373}, {220, 14}, WWT_BUTTON, 1, STR_RANDOM_SHUFFLE, STR_RANDOM_SHUFFLE_TIP),
|
||||
MakeWidget({ 0, 43}, {600, 357}, WWT_RESIZE, 1 ),
|
||||
MakeTab ({ 3, 17} ),
|
||||
MakeWidget({ 4, 56}, {368, 161}, WWT_SCROLL, 1, SCROLL_VERTICAL ),
|
||||
MakeWidget({ 4, 231}, {368, 157}, WWT_SCROLL, 1, SCROLL_VERTICAL ),
|
||||
MakeWidget({431, 106}, {114, 114}, WWT_FLATBTN, 1 ),
|
||||
MakeWidget({375, 343}, {220, 14}, WWT_BUTTON, 1, STR_MOVE_ALL_TOP ),
|
||||
MakeWidget({375, 358}, {220, 14}, WWT_BUTTON, 1, STR_MOVE_ALL_BOTTOM ),
|
||||
MakeWidget({375, 373}, {220, 14}, WWT_BUTTON, 1, STR_RANDOM_SHUFFLE, STR_RANDOM_SHUFFLE_TIP),
|
||||
{ WIDGETS_END }
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -142,26 +142,26 @@ validate_global_widx(WC_EDITOR_OBJECT_SELECTION, WIDX_TAB_1);
|
|||
static bool _window_editor_object_selection_widgets_initialised;
|
||||
static std::vector<rct_widget> _window_editor_object_selection_widgets = {
|
||||
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
|
||||
MakeWidget ({ 0, 43}, {600, 357}, WWT_RESIZE, 1 ),
|
||||
MakeWidget ({470, 22}, {122, 14}, WWT_BUTTON, 0, STR_OBJECT_SELECTION_ADVANCED, STR_OBJECT_SELECTION_ADVANCED_TIP),
|
||||
MakeWidget ({ 4, 60}, {288, 327}, WWT_SCROLL, 1, SCROLL_VERTICAL ),
|
||||
MakeWidget ({391, 45}, {114, 115}, WWT_FLATBTN, 1 ),
|
||||
MakeWidget ({470, 22}, {122, 14}, WWT_BUTTON, 0, STR_INSTALL_NEW_TRACK_DESIGN, STR_INSTALL_NEW_TRACK_DESIGN_TIP ),
|
||||
MakeWidget ({350, 22}, {114, 14}, WWT_BUTTON, 0, STR_OBJECT_FILTER, STR_OBJECT_FILTER_TIP ),
|
||||
MakeWidget ({ 4, 45}, {211, 14}, WWT_TEXT_BOX, 1 ),
|
||||
MakeWidget ({218, 45}, { 70, 14}, WWT_BUTTON, 1, STR_OBJECT_SEARCH_CLEAR ),
|
||||
MakeWidget ({ 3, 73}, {285, 4}, WWT_IMGBTN, 1 ),
|
||||
MakeRemapWidget({ 3, 47}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_OBJECT_FILTER_ALL_RIDES_TIP ),
|
||||
MakeRemapWidget({ 34, 47}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_TRANSPORT_RIDES_TIP ),
|
||||
MakeRemapWidget({ 65, 47}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_GENTLE_RIDES_TIP ),
|
||||
MakeRemapWidget({ 96, 47}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_ROLLER_COASTERS_TIP ),
|
||||
MakeRemapWidget({127, 47}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THRILL_RIDES_TIP ),
|
||||
MakeRemapWidget({158, 47}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_WATER_RIDES_TIP ),
|
||||
MakeRemapWidget({189, 47}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOPS_STALLS_TIP ),
|
||||
MakeWidget ({ 4, 80}, {145, 14}, WWT_TABLE_HEADER, 1 ),
|
||||
MakeWidget ({149, 80}, {143, 14}, WWT_TABLE_HEADER, 1 ),
|
||||
MakeWidget({ 0, 43}, {600, 357}, WWT_RESIZE, 1 ),
|
||||
MakeWidget({470, 22}, {122, 14}, WWT_BUTTON, 0, STR_OBJECT_SELECTION_ADVANCED, STR_OBJECT_SELECTION_ADVANCED_TIP),
|
||||
MakeWidget({ 4, 60}, {288, 327}, WWT_SCROLL, 1, SCROLL_VERTICAL ),
|
||||
MakeWidget({391, 45}, {114, 115}, WWT_FLATBTN, 1 ),
|
||||
MakeWidget({470, 22}, {122, 14}, WWT_BUTTON, 0, STR_INSTALL_NEW_TRACK_DESIGN, STR_INSTALL_NEW_TRACK_DESIGN_TIP ),
|
||||
MakeWidget({350, 22}, {114, 14}, WWT_BUTTON, 0, STR_OBJECT_FILTER, STR_OBJECT_FILTER_TIP ),
|
||||
MakeWidget({ 4, 45}, {211, 14}, WWT_TEXT_BOX, 1 ),
|
||||
MakeWidget({218, 45}, { 70, 14}, WWT_BUTTON, 1, STR_OBJECT_SEARCH_CLEAR ),
|
||||
MakeWidget({ 3, 73}, {285, 4}, WWT_IMGBTN, 1 ),
|
||||
MakeTab ({ 3, 47}, STR_OBJECT_FILTER_ALL_RIDES_TIP ),
|
||||
MakeTab ({ 34, 47}, STR_TRANSPORT_RIDES_TIP ),
|
||||
MakeTab ({ 65, 47}, STR_GENTLE_RIDES_TIP ),
|
||||
MakeTab ({ 96, 47}, STR_ROLLER_COASTERS_TIP ),
|
||||
MakeTab ({127, 47}, STR_THRILL_RIDES_TIP ),
|
||||
MakeTab ({158, 47}, STR_WATER_RIDES_TIP ),
|
||||
MakeTab ({189, 47}, STR_SHOPS_STALLS_TIP ),
|
||||
MakeWidget({ 4, 80}, {145, 14}, WWT_TABLE_HEADER, 1 ),
|
||||
MakeWidget({149, 80}, {143, 14}, WWT_TABLE_HEADER, 1 ),
|
||||
|
||||
MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STRING_DEFINED_TOOLTIP ),
|
||||
MakeTab ({ 3, 17}, STR_STRING_DEFINED_TOOLTIP ),
|
||||
// Copied object type times...
|
||||
|
||||
{ WIDGETS_END }
|
||||
|
|
|
|||
|
|
@ -156,25 +156,25 @@ validate_global_widx(WC_SCENERY, WIDX_SCENERY_EYEDROPPER_BUTTON);
|
|||
static rct_widget window_scenery_widgets[] = {
|
||||
WINDOW_SHIM(WINDOW_TITLE, WINDOW_SCENERY_WIDTH, WINDOW_SCENERY_HEIGHT),
|
||||
MakeWidget ({ 0, 43}, {634, 99}, WWT_RESIZE, 1 ), // 8 0x009DE2C8
|
||||
MakeWidget ({ 3, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 10 0x009DE2D8
|
||||
MakeWidget ({ 34, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 20 0x009DE2E8
|
||||
MakeWidget ({ 65, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 40 0x009DE2F8
|
||||
MakeWidget ({ 96, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 80 0x009DE308
|
||||
MakeWidget ({127, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 100 0x009DE318
|
||||
MakeWidget ({158, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 200 0x009DE328
|
||||
MakeWidget ({189, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 400 0x009DE338
|
||||
MakeWidget ({220, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 800 0x009DE348
|
||||
MakeWidget ({251, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 1000 0x009DE358
|
||||
MakeWidget ({282, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 2000 0x009DE368
|
||||
MakeWidget ({313, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 4000 0x009DE378
|
||||
MakeWidget ({344, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 8000 0x009DE388
|
||||
MakeWidget ({375, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 10000 0x009DE398
|
||||
MakeWidget ({406, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 20000 0x009DE3A8
|
||||
MakeWidget ({437, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 40000 0x009DE3B8
|
||||
MakeWidget ({468, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 80000 0x009DE3C8
|
||||
MakeWidget ({468, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 100000 0x009DE3D8
|
||||
MakeWidget ({468, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 200000 0x009DE3E8
|
||||
MakeWidget ({468, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 400000 0x009DE3F8
|
||||
MakeTab ({ 3, 17}, STR_STRING_DEFINED_TOOLTIP ), // 10 0x009DE2D8
|
||||
MakeTab ({ 34, 17}, STR_STRING_DEFINED_TOOLTIP ), // 20 0x009DE2E8
|
||||
MakeTab ({ 65, 17}, STR_STRING_DEFINED_TOOLTIP ), // 40 0x009DE2F8
|
||||
MakeTab ({ 96, 17}, STR_STRING_DEFINED_TOOLTIP ), // 80 0x009DE308
|
||||
MakeTab ({127, 17}, STR_STRING_DEFINED_TOOLTIP ), // 100 0x009DE318
|
||||
MakeTab ({158, 17}, STR_STRING_DEFINED_TOOLTIP ), // 200 0x009DE328
|
||||
MakeTab ({189, 17}, STR_STRING_DEFINED_TOOLTIP ), // 400 0x009DE338
|
||||
MakeTab ({220, 17}, STR_STRING_DEFINED_TOOLTIP ), // 800 0x009DE348
|
||||
MakeTab ({251, 17}, STR_STRING_DEFINED_TOOLTIP ), // 1000 0x009DE358
|
||||
MakeTab ({282, 17}, STR_STRING_DEFINED_TOOLTIP ), // 2000 0x009DE368
|
||||
MakeTab ({313, 17}, STR_STRING_DEFINED_TOOLTIP ), // 4000 0x009DE378
|
||||
MakeTab ({344, 17}, STR_STRING_DEFINED_TOOLTIP ), // 8000 0x009DE388
|
||||
MakeTab ({375, 17}, STR_STRING_DEFINED_TOOLTIP ), // 10000 0x009DE398
|
||||
MakeTab ({406, 17}, STR_STRING_DEFINED_TOOLTIP ), // 20000 0x009DE3A8
|
||||
MakeTab ({437, 17}, STR_STRING_DEFINED_TOOLTIP ), // 40000 0x009DE3B8
|
||||
MakeTab ({468, 17}, STR_STRING_DEFINED_TOOLTIP ), // 80000 0x009DE3C8
|
||||
MakeTab ({468, 17}, STR_STRING_DEFINED_TOOLTIP ), // 100000 0x009DE3D8
|
||||
MakeTab ({468, 17}, STR_STRING_DEFINED_TOOLTIP ), // 200000 0x009DE3E8
|
||||
MakeTab ({468, 17}, STR_STRING_DEFINED_TOOLTIP ), // 400000 0x009DE3F8
|
||||
MakeRemapWidget({468, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB_QUESTION, STR_STRING_DEFINED_TOOLTIP ), // 800000 0x009DE408
|
||||
MakeWidget ({ 2, 47}, {607, 80}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // 1000000 0x009DE418
|
||||
MakeWidget ({609, 44}, { 24, 24}, WWT_FLATBTN, 1, SPR_ROTATE_ARROW, STR_ROTATE_OBJECTS_90 ), // 2000000 0x009DE428
|
||||
|
|
|
|||
Loading…
Reference in New Issue