Editor selection refactor pt1

This commit is contained in:
David Wilson
2023-12-14 18:23:04 +10:00
committed by Gustas
parent b58c1ea5bc
commit 2ced4abc24
41 changed files with 1560 additions and 854 deletions

View File

@@ -204,7 +204,7 @@ Container@EDITOR_ROOT:
TooltipContainer@TOOLTIP_CONTAINER:
Container@EDITOR_WORLD_ROOT:
Logic: LoadIngamePerfLogic, MapEditorLogic, ActorEditLogic, MapOverlaysLogic
Logic: LoadIngamePerfLogic, MapEditorLogic, ActorEditLogic, MapOverlaysLogic, MapEditorSelectionLogic
ToggleGridOverlayKey: EditorToggleGridOverlay
ToggleBuildableOverlayKey: EditorToggleBuildableOverlay
Children:
@@ -215,110 +215,6 @@ Container@EDITOR_WORLD_ROOT:
Height: WINDOW_BOTTOM
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
Children:
Background@ACTOR_EDIT_PANEL:
X: 32
Y: 32
Width: 294
Height: 114
Children:
Label@ACTOR_TYPE_LABEL:
X: 15
Y: 16
Width: 265
Height: 24
Align: Center
Font: Bold
Label@ACTOR_ID_LABEL:
X: 15
Y: 45
Width: 55
Height: 25
Text: label-actor-edit-panel-id
Align: Right
TextField@ACTOR_ID:
X: 84
Y: 45
Width: 192
Height: 25
Label@ACTOR_ID_ERROR_LABEL:
X: 84
Y: 71
Width: 192
Height: 15
Font: TinyBold
TextColor: FF0000
Container@ACTOR_INIT_CONTAINER:
Y: 73
Width: PARENT_RIGHT
Children:
Container@CHECKBOX_OPTION_TEMPLATE:
Width: PARENT_RIGHT
Height: 22
Children:
Checkbox@OPTION:
X: 84
Y: 1
Width: PARENT_RIGHT - 84
Height: 20
Container@SLIDER_OPTION_TEMPLATE:
Width: PARENT_RIGHT
Height: 22
Children:
Label@LABEL:
X: 15
Y: 1
Width: 55
Height: 16
Align: Right
Slider@OPTION:
X: 75
Y: 1
Width: 149
Height: 20
TextField@VALUE:
X: 226
Y: 1
Width: 50
Height: 20
Type: Integer
Container@DROPDOWN_OPTION_TEMPLATE:
Width: PARENT_RIGHT
Height: 27
Children:
Label@LABEL:
X: 15
Y: 2
Width: 55
Height: 24
Align: Right
DropDownButton@OPTION:
X: 84
Y: 1
Width: 192
Height: 25
Font: Bold
Container@BUTTON_CONTAINER:
Y: 75
Children:
Button@DELETE_BUTTON:
X: 15
Width: 75
Height: 25
Text: button-container-delete
Font: Bold
Button@CANCEL_BUTTON:
X: 125
Width: 75
Height: 25
Text: button-container-cancel
Font: Bold
Button@OK_BUTTON:
X: 205
Width: 75
Height: 25
Text: button-container-ok
Font: Bold
ViewportController:
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM
@@ -347,230 +243,429 @@ Container@EDITOR_WORLD_ROOT:
Y: 10
Width: PARENT_RIGHT - 19
Height: PARENT_BOTTOM - 19
Background@TOOLS_BG:
X: WINDOW_RIGHT - 320
Y: 330
Width: 310
Height: WINDOW_BOTTOM - 422
Container@TILE_WIDGETS:
X: WINDOW_RIGHT - 320
Y: 354
Width: 310
Height: WINDOW_BOTTOM - 458
Logic: TileSelectorLogic
Children:
Background@TILES_BG:
X: WINDOW_RIGHT - 320
Y: 360
Width: 310
Height: WINDOW_BOTTOM - 452
Label@SEARCH_LABEL:
Y: 12
Width: 55
Height: 25
Text: label-tiles-bg-search
Align: Right
Font: TinyBold
TextField@SEARCH_TEXTFIELD:
X: 60
Y: 10
Width: PARENT_RIGHT - 70
Height: 25
Label@CATEGORIES_LABEL:
Y: 36
Width: 55
Height: 25
Text: label-tiles-bg-categories
Align: Right
Font: TinyBold
DropDownButton@CATEGORIES_DROPDOWN:
X: 60
Y: 34
Width: PARENT_RIGHT - 70
Height: 25
Font: Bold
ScrollPanel@TILETEMPLATE_LIST:
X: 10
Y: 58
Width: PARENT_RIGHT - 20
Height: PARENT_BOTTOM - 55
TopBottomSpacing: 4
ItemSpacing: 4
Children:
Label@SEARCH_LABEL:
Y: 12
Width: 55
Height: 25
Text: label-tiles-bg-search
Align: Right
Font: TinyBold
TextField@SEARCH_TEXTFIELD:
X: 60
Y: 10
Width: PARENT_RIGHT - 70
Height: 25
Label@CATEGORIES_LABEL:
Y: 36
Width: 55
Height: 25
Text: label-tiles-bg-categories
Align: Right
Font: TinyBold
DropDownButton@CATEGORIES_DROPDOWN:
X: 60
Y: 34
Width: PARENT_RIGHT - 70
Height: 25
Font: Bold
ScrollPanel@TILETEMPLATE_LIST:
X: 10
Y: 58
Width: PARENT_RIGHT - 20
Height: PARENT_BOTTOM - 68
TopBottomSpacing: 4
ItemSpacing: 4
ScrollItem@TILEPREVIEW_TEMPLATE:
Visible: false
Width: PARENT_RIGHT - 35
TooltipContainer: TOOLTIP_CONTAINER
Children:
ScrollItem@TILEPREVIEW_TEMPLATE:
Visible: false
Width: PARENT_RIGHT - 35
TooltipContainer: TOOLTIP_CONTAINER
Children:
TerrainTemplatePreview@TILE_PREVIEW:
X: 4
Y: 4
TerrainTemplatePreview@TILE_PREVIEW:
X: 4
Y: 4
Container@LAYER_WIDGETS:
X: WINDOW_RIGHT - 320
Y: 354
Width: 310
Height: WINDOW_BOTTOM - 458
Visible: false
Logic: LayerSelectorLogic
Children:
Background@LAYERS_BG:
X: WINDOW_RIGHT - 320
Y: 360
Width: 310
Height: WINDOW_BOTTOM - 452
ScrollPanel@LAYERTEMPLATE_LIST:
X: 10
Y: 10
Width: PARENT_RIGHT - 20
Height: PARENT_BOTTOM - 7
TopBottomSpacing: 4
ItemSpacing: 4
Children:
ScrollPanel@LAYERTEMPLATE_LIST:
X: 10
Y: 10
Width: PARENT_RIGHT - 20
Height: PARENT_BOTTOM - 20
TopBottomSpacing: 4
ItemSpacing: 4
ScrollItem@LAYERPREVIEW_TEMPLATE:
Visible: false
IgnoreChildMouseOver: true
TooltipContainer: TOOLTIP_CONTAINER
Children:
ScrollItem@LAYERPREVIEW_TEMPLATE:
ResourcePreview@LAYER_PREVIEW:
X: 4
Y: 4
Visible: false
IgnoreChildMouseOver: true
TooltipContainer: TOOLTIP_CONTAINER
Children:
ResourcePreview@LAYER_PREVIEW:
X: 4
Y: 4
Visible: false
Container@ACTOR_WIDGETS:
X: WINDOW_RIGHT - 320
Y: 354
Width: 310
Height: WINDOW_BOTTOM - 458
Visible: false
Logic: ActorSelectorLogic
Children:
Background@ACTORS_BG:
X: WINDOW_RIGHT - 320
Y: 360
Width: 310
Height: WINDOW_BOTTOM - 452
Label@SEARCH_LABEL:
Y: 12
Width: 55
Height: 25
Text: label-actors-bg-search
Align: Right
Font: TinyBold
TextField@SEARCH_TEXTFIELD:
X: 60
Y: 10
Width: PARENT_RIGHT - 70
Height: 25
Label@CATEGORIES_LABEL:
Y: 36
Width: 55
Height: 25
Text: label-actors-bg-categories
Align: Right
Font: TinyBold
DropDownButton@CATEGORIES_DROPDOWN:
X: 60
Y: 34
Width: PARENT_RIGHT - 70
Height: 25
Font: Bold
Label@OWNERS_LABEL:
Y: 60
Width: 55
Height: 25
Text: label-actors-bg-owners
Align: Right
Font: TinyBold
DropDownButton@OWNERS_DROPDOWN:
X: 60
Y: 58
Width: PARENT_RIGHT - 70
Height: 25
Font: Bold
ScrollPanel@ACTORTEMPLATE_LIST:
X: 10
Y: 82
Width: PARENT_RIGHT - 20
Height: PARENT_BOTTOM - 79
TopBottomSpacing: 4
ItemSpacing: 4
Children:
Label@SEARCH_LABEL:
Y: 12
Width: 55
Height: 25
Text: label-actors-bg-search
Align: Right
Font: TinyBold
TextField@SEARCH_TEXTFIELD:
X: 60
Y: 10
Width: PARENT_RIGHT - 70
Height: 25
Label@CATEGORIES_LABEL:
Y: 36
Width: 55
Height: 25
Text: label-actors-bg-categories
Align: Right
Font: TinyBold
DropDownButton@CATEGORIES_DROPDOWN:
X: 60
Y: 34
Width: PARENT_RIGHT - 70
Height: 25
Font: Bold
Label@OWNERS_LABEL:
Y: 60
Width: 55
Height: 25
Text: label-actors-bg-owners
Align: Right
Font: TinyBold
DropDownButton@OWNERS_DROPDOWN:
X: 60
Y: 58
Width: PARENT_RIGHT - 70
Height: 25
Font: Bold
ScrollPanel@ACTORTEMPLATE_LIST:
X: 10
Y: 82
Width: PARENT_RIGHT - 20
Height: PARENT_BOTTOM - 92
TopBottomSpacing: 4
ItemSpacing: 4
ScrollItem@ACTORPREVIEW_TEMPLATE:
Visible: false
Width: PARENT_RIGHT - 35
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
IgnoreChildMouseOver: true
Children:
ScrollItem@ACTORPREVIEW_TEMPLATE:
Visible: false
Width: PARENT_RIGHT - 35
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
IgnoreChildMouseOver: true
Children:
ActorPreview@ACTOR_PREVIEW:
X: 4
Y: 4
Visible: true
ActorPreview@ACTOR_PREVIEW:
X: 4
Y: 4
Visible: true
Container@TOOLS_WIDGETS:
X: WINDOW_RIGHT - 320
Y: 354
Width: 310
Height: WINDOW_BOTTOM - 458
Visible: false
Children:
Checkbox@SHOW_TILE_GRID:
X: 15
Y: 15
Width: PARENT_RIGHT - 15
Height: 20
Text: label-show-tile-grid
Checkbox@SHOW_BUILDABLE_AREA:
X: 15
Y: 40
Width: PARENT_RIGHT - 15
Height: 20
Text: label-show-buildable-area
Container@HISTORY_WIDGETS:
X: WINDOW_RIGHT - 320
Y: 354
Width: 310
Height: WINDOW_BOTTOM - 458
Logic: HistoryLogLogic
Visible: false
Children:
Background@HISTORY_BG:
X: WINDOW_RIGHT - 320
Y: 360
Width: 310
Height: WINDOW_BOTTOM - 452
ScrollPanel@HISTORY_LIST:
X: 10
Y: 10
Width: PARENT_RIGHT - 20
Height: PARENT_BOTTOM - 7
CollapseHiddenChildren: True
TopBottomSpacing: 4
ItemSpacing: 4
Children:
ScrollPanel@HISTORY_LIST:
X: 10
Y: 10
Width: PARENT_RIGHT - 20
Height: PARENT_BOTTOM - 20
CollapseHiddenChildren: True
TopBottomSpacing: 4
ItemSpacing: 4
ScrollItem@HISTORY_TEMPLATE:
X: 4
Visible: false
Width: PARENT_RIGHT - 31
Height: 25
IgnoreChildMouseOver: true
TextColor: ffffff
TextColorDisabled: 8f8f8f
Children:
ScrollItem@HISTORY_TEMPLATE:
X: 4
Visible: false
Width: PARENT_RIGHT - 31
Label@TITLE:
X: 5
Width: PARENT_RIGHT
Height: 25
IgnoreChildMouseOver: true
TextColor: ffffff
TextColorDisabled: 8f8f8f
Align: Left
Container@SELECT_WIDGETS:
X: WINDOW_RIGHT - 320
Y: 354
Width: 310
Height: WINDOW_BOTTOM - 458
Visible: false
Children:
Container@AREA_EDIT_PANEL:
Width: 310
Height: WINDOW_BOTTOM - 458
Children:
Label@AREA_EDIT_TITLE:
X: 15
Y: 16
Width: 281
Height: 24
Align: Center
Font: Bold
Text: label-area-selection
Label@AREA_FILTERS_LABEL:
X: 15
Y: 45
Width: 55
Height: 25
Font: Bold
Align: Left
Text: label-copy-filters
Checkbox@COPY_FILTER_TERRAIN_CHECKBOX:
X: 15
Y: 70
Width: PARENT_RIGHT - 29
Height: 20
Text: label-filter-terrain
Checkbox@COPY_FILTER_RESOURCES_CHECKBOX:
X: 15
Y: 95
Width: PARENT_RIGHT - 29
Height: 20
Text: label-filter-resources
Checkbox@COPY_FILTER_ACTORS_CHECKBOX:
X: 15
Y: 120
Width: PARENT_RIGHT - 29
Height: 20
Text: label-filter-actors
Button@SELECTION_CANCEL_BUTTON:
X: 222
Y: 145
Width: 75
Height: 25
Text: button-selection-cancel
Font: Bold
Container@ACTOR_EDIT_PANEL:
Width: 310
Height: WINDOW_BOTTOM - 458
Children:
Label@ACTOR_TYPE_LABEL:
X: 15
Y: 16
Width: 281
Height: 24
Align: Center
Font: Bold
Label@ACTOR_ID_LABEL:
X: 15
Y: 45
Width: 55
Height: 25
Text: label-actor-edit-panel-id
Align: Right
TextField@ACTOR_ID:
X: 84
Y: 45
Width: 208
Height: 25
Label@ACTOR_ID_ERROR_LABEL:
X: 84
Y: 71
Width: 208
Height: 15
Font: TinyBold
TextColor: FF0000
Container@ACTOR_INIT_CONTAINER:
Y: 73
Width: PARENT_RIGHT
Children:
Container@CHECKBOX_OPTION_TEMPLATE:
Width: PARENT_RIGHT
Height: 22
Children:
Label@TITLE:
X: 5
Width: PARENT_RIGHT
Checkbox@OPTION:
X: 84
Y: 1
Width: PARENT_RIGHT - 100
Height: 20
Container@SLIDER_OPTION_TEMPLATE:
Width: PARENT_RIGHT
Height: 22
Children:
Label@LABEL:
X: 15
Y: 1
Width: 55
Height: 16
Align: Right
Slider@OPTION:
X: 75
Y: 1
Width: 165
Height: 20
TextField@VALUE:
X: 242
Y: 1
Width: 50
Height: 20
Type: Integer
Container@DROPDOWN_OPTION_TEMPLATE:
Width: PARENT_RIGHT
Height: 27
Children:
Label@LABEL:
X: 15
Y: 2
Width: 55
Height: 24
Align: Right
DropDownButton@OPTION:
X: 84
Y: 1
Width: 208
Height: 25
Align: Left
Font: Bold
Container@BUTTON_CONTAINER:
Y: 75
Children:
Button@DELETE_BUTTON:
X: 15
Width: 75
Height: 25
Text: button-container-delete
Font: Bold
Button@CANCEL_BUTTON:
X: 142
Width: 75
Height: 25
Text: button-container-cancel
Font: Bold
Button@OK_BUTTON:
X: 222
Width: 75
Height: 25
Text: button-container-ok
Font: Bold
Container@MAP_EDITOR_TAB_CONTAINER:
Logic: MapEditorTabsLogic
X: WINDOW_RIGHT - 315
Y: 330
Width: 310
X: WINDOW_RIGHT - 311
Y: 339
Width: 292
Height: 25
Children:
Button@TILES_TAB:
X: 0
Width: 70
Width: 58
Height: 25
Text: button-map-editor-tab-container-tiles.label
Font: Bold
Key: EditorTilesTab
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: button-map-editor-tab-container-tiles.tooltip
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
X: 21
Y: 5
ImageCollection: editor
ImageName: tiles
Button@OVERLAYS_TAB:
X: 70
Width: 90
X: 58
Width: 58
Height: 25
Text: button-map-editor-tab-container-overlays.label
Font: Bold
Key: EditorOverlaysTab
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: button-map-editor-tab-container-overlays.tooltip
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
X: 21
Y: 5
ImageCollection: editor
ImageName: overlays
Button@ACTORS_TAB:
X: 160
Width: 70
X: 116
Width: 59
Height: 25
Text: button-map-editor-tab-container-actors.label
Font: Bold
Key: EditorActorsTab
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: button-map-editor-tab-container-actors.tooltip
TooltipContainer: TOOLTIP_CONTAINER
Button@HISTORY_TAB:
X: 230
Width: 70
Children:
Image@ICON:
X: 21
Y: 5
ImageCollection: production-icons
ImageName: infantry
Button@TOOLS_TAB:
X: 175
Width: 58
Height: 25
Key: EditorToolsTab
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: button-map-editor-tab-container-tools.tooltip
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
X: 21
Y: 5
ImageCollection: editor
ImageName: tools
Button@HISTORY_TAB:
X: 233
Width: 58
Height: 25
Text: button-map-editor-tab-container-history.label
Font: Bold
Key: EditorHistoryTab
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: button-map-editor-tab-container-history.tooltip
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
X: 21
Y: 5
ImageCollection: sidebar-bits
ImageName: production-tooltip-time
MenuButton@OPTIONS_BUTTON:
Logic: MenuButtonsChromeLogic
MenuContainer: INGAME_MENU
@@ -583,24 +678,8 @@ Container@EDITOR_WORLD_ROOT:
TooltipContainer: TOOLTIP_CONTAINER
Font: Bold
Key: escape
Button@COPYPASTE_BUTTON:
X: 70
Width: 90
Height: 25
Text: button-editor-world-root-copypaste.label
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: button-editor-world-root-copypaste.tooltip
TooltipContainer: TOOLTIP_CONTAINER
Font: Bold
Key: EditorCopy
DropDownButton@COPYFILTER_BUTTON:
X: 170
Width: 140
Height: 25
Text: dropdownbutton-editor-world-root-copyfilter-button
Font: Bold
Button@UNDO_BUTTON:
X: 320
X: 70
Height: 25
Width: 70
Text: button-editor-world-root-undo.label
@@ -610,7 +689,7 @@ Container@EDITOR_WORLD_ROOT:
TooltipText: button-editor-world-root-undo.tooltip
TooltipContainer: TOOLTIP_CONTAINER
Button@REDO_BUTTON:
X: 400
X: 150
Height: 25
Width: 70
Text: button-editor-world-root-redo.label
@@ -619,21 +698,35 @@ Container@EDITOR_WORLD_ROOT:
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: button-editor-world-root-redo.tooltip
TooltipContainer: TOOLTIP_CONTAINER
DropDownButton@OVERLAY_BUTTON:
X: 480
Width: 140
Button@COPY_BUTTON:
X: 230
Height: 25
Text: dropdownbutton-editor-world-root-overlay-button
Text: button-editor-world-root-copy.label
Width: 70
Font: Bold
Key: EditorCopy
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: button-editor-world-root-copy.tooltip
TooltipContainer: TOOLTIP_CONTAINER
Button@PASTE_BUTTON:
X: 310
Width: 70
Height: 25
Text: button-editor-world-root-paste.label
Font: Bold
Key: EditorPaste
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: button-editor-world-root-paste.tooltip
TooltipContainer: TOOLTIP_CONTAINER
Label@COORDINATE_LABEL:
X: 630
X: 470
Width: 50
Height: 25
Align: Left
Font: Bold
Contrast: true
Label@CASH_LABEL:
X: 745
X: 595
Width: 50
Height: 25
Align: Left
@@ -669,29 +762,3 @@ ScrollPanel@CATEGORY_FILTER_PANEL:
Height: 20
Visible: false
ScrollPanel@COPY_FILTER_PANEL:
Width: 140
Height: 80
ItemSpacing: 5
TopBottomSpacing: 0
Children:
Checkbox@CATEGORY_TEMPLATE:
X: 5
Y: 5
Width: PARENT_RIGHT - 29
Height: 20
Visible: false
ScrollPanel@OVERLAY_PANEL:
Width: 140
Height: 55
ItemSpacing: 5
TopBottomSpacing: 0
Children:
Checkbox@CATEGORY_TEMPLATE:
X: 5
Y: 5
Width: PARENT_RIGHT - 29
Height: 20
Visible: false