epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Polish up UI

Browse Source
This commit is contained in:
Gustas
2024-09-15 17:59:36 +03:00
committed by Paul Chote
parent 251680056d
commit b09c4f3770
5 changed files with 203 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/Logic/Editor/ActorEditLogic.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly EditorActorLayer editorActorLayer; readonly EditorActorLayer editorActorLayer;
readonly EditorActionManager editorActionManager; readonly EditorActionManager editorActionManager;
readonly EditorViewportControllerWidget editor; readonly EditorViewportControllerWidget editor;
readonly ContainerWidget actorEditPanel; readonly Widget actorEditPanel;
readonly LabelWidget typeLabel; readonly LabelWidget typeLabel;
readonly TextFieldWidget actorIDField; readonly TextFieldWidget actorIDField;
readonly HashSet<TextFieldWidget> typableFields = new(); readonly HashSet<TextFieldWidget> typableFields = new();
@@ -72,8 +72,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
editor = widget.Parent.Parent.Get<EditorViewportControllerWidget>("MAP_EDITOR"); editor = widget.Parent.Parent.Get<EditorViewportControllerWidget>("MAP_EDITOR");
editor.DefaultBrush.SelectionChanged += HandleSelectionChanged; editor.DefaultBrush.SelectionChanged += HandleSelectionChanged;
var selectTabContainer = widget.Parent.Parent.Get<ContainerWidget>("SELECT_WIDGETS"); var selectTabContainer = widget.Parent.Parent.Get("SELECT_WIDGETS");
actorEditPanel = selectTabContainer.Get<ContainerWidget>("ACTOR_EDIT_PANEL"); actorEditPanel = selectTabContainer.Get("ACTOR_EDIT_PANEL");
typeLabel = actorEditPanel.Get<LabelWidget>("ACTOR_TYPE_LABEL"); typeLabel = actorEditPanel.Get<LabelWidget>("ACTOR_TYPE_LABEL");
actorIDField = actorEditPanel.Get<TextFieldWidget>("ACTOR_ID"); actorIDField = actorEditPanel.Get<TextFieldWidget>("ACTOR_ID");

4
OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorSelectionLogic.cs
View File

@@ -49,8 +49,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
editor = widget.Get<EditorViewportControllerWidget>("MAP_EDITOR"); editor = widget.Get<EditorViewportControllerWidget>("MAP_EDITOR");
editor.DefaultBrush.SelectionChanged += HandleSelectionChanged; editor.DefaultBrush.SelectionChanged += HandleSelectionChanged;
var selectTabContainer = widget.Get("SELECT_WIDGETS"); var selectTabContainer = widget.Get("SELECT_WIDGETS");
var actorEditPanel = selectTabContainer.Get<ContainerWidget>("ACTOR_EDIT_PANEL"); var actorEditPanel = selectTabContainer.Get("ACTOR_EDIT_PANEL");
var areaEditPanel = selectTabContainer.Get<ContainerWidget>("AREA_EDIT_PANEL"); var areaEditPanel = selectTabContainer.Get("AREA_EDIT_PANEL");
actorEditPanel.IsVisible = () => editor.DefaultBrush.Selection.Actor != null; actorEditPanel.IsVisible = () => editor.DefaultBrush.Selection.Actor != null;
areaEditPanel.IsVisible = () => editor.DefaultBrush.Selection.Area != null; areaEditPanel.IsVisible = () => editor.DefaultBrush.Selection.Area != null;

2
OpenRA.Mods.Common/Widgets/Logic/Editor/MapToolsLogic.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
toolsDropdown = widget.Get<DropDownButtonWidget>("TOOLS_DROPDOWN"); toolsDropdown = widget.Get<DropDownButtonWidget>("TOOLS_DROPDOWN");
var markerToolPanel = widget.Get<ScrollPanelWidget>("MARKER_TOOL_PANEL"); var markerToolPanel = widget.Get("MARKER_TOOL_PANEL");
toolPanels.Add(MapTool.MarkerTiles, markerToolPanel); toolPanels.Add(MapTool.MarkerTiles, markerToolPanel);
toolsDropdown.OnMouseDown = _ => ShowToolsDropDown(toolsDropdown); toolsDropdown.OnMouseDown = _ => ShowToolsDropDown(toolsDropdown);

329
mods/cnc/chrome/editor.yaml
View File

@@ -271,13 +271,17 @@ Container@EDITOR_WORLD_ROOT:
Y: 5 Y: 5
ImageCollection: order-icons ImageCollection: order-icons
ImageName: options ImageName: options
Background@TOOLS_BG:
X: WINDOW_RIGHT - 295
Y: 330
Width: 290
Height: WINDOW_BOTTOM - 422
Container@TILE_WIDGETS: Container@TILE_WIDGETS:
Logic: TileSelectorLogic
X: WINDOW_RIGHT - 295 X: WINDOW_RIGHT - 295
Y: 318 Y: 318
Width: 290 Width: 290
Height: WINDOW_BOTTOM - 410 Height: WINDOW_BOTTOM - 410
ClickThrough: false Logic: TileSelectorLogic
Children: Children:
Container@TILES_BG: Container@TILES_BG:
Width: PARENT_RIGHT Width: PARENT_RIGHT
@@ -328,141 +332,132 @@ Container@EDITOR_WORLD_ROOT:
X: 4 X: 4
Y: 4 Y: 4
Container@LAYER_WIDGETS: Container@LAYER_WIDGETS:
X: WINDOW_RIGHT - 295
Y: 318
Width: 290
Height: WINDOW_BOTTOM - 410
Visible: false
Logic: LayerSelectorLogic Logic: LayerSelectorLogic
X: WINDOW_RIGHT - 295
Y: 318
Width: 290
Height: WINDOW_BOTTOM - 410
ClickThrough: false
Children: Children:
Container@LAYERS_BG: ScrollPanel@LAYERTEMPLATE_LIST:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
TopBottomSpacing: 4
ItemSpacing: 4
Children: Children:
ScrollPanel@LAYERTEMPLATE_LIST: ScrollItem@LAYERPREVIEW_TEMPLATE:
Width: PARENT_RIGHT Visible: false
Height: PARENT_BOTTOM IgnoreChildMouseOver: true
TopBottomSpacing: 4 TooltipContainer: TOOLTIP_CONTAINER
ItemSpacing: 4
Children: Children:
ScrollItem@LAYERPREVIEW_TEMPLATE: ResourcePreview@LAYER_PREVIEW:
X: 4
Y: 4
Visible: false Visible: false
IgnoreChildMouseOver: true
TooltipContainer: TOOLTIP_CONTAINER
Children:
ResourcePreview@LAYER_PREVIEW:
X: 4
Y: 4
Visible: false
Container@ACTOR_WIDGETS: Container@ACTOR_WIDGETS:
Logic: ActorSelectorLogic
X: WINDOW_RIGHT - 295 X: WINDOW_RIGHT - 295
Y: 318 Y: 318
Width: 290 Width: 290
Height: WINDOW_BOTTOM - 410 Height: WINDOW_BOTTOM - 410
ClickThrough: false Visible: false
Logic: ActorSelectorLogic
Children: Children:
Container@ACTORS_BG: Background@ACTORS_BG:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: 83
Background: panel-black
Children: Children:
Background: Label@SEARCH_LABEL:
Width: 61 Y: 1
Height: 75 Width: 55
Background: panel-black Height: 25
Children: Text: label-actors-bg-search
Label@SEARCH_LABEL: Align: Right
Y: 1 Font: TinyBold
Width: PARENT_RIGHT - 5
Height: 25
Text: label-actors-bg-search
Align: Right
Font: TinyBold
Label@CATEGORIES_LABEL:
Y: 25
Width: PARENT_RIGHT - 5
Height: 25
Text: label-bg-filter
Align: Right
Font: TinyBold
Label@OWNERS_LABEL:
Y: 49
Width: PARENT_RIGHT - 5
Height: 25
Text: label-actor-bg-owner
Align: Right
Font: TinyBold
TextField@SEARCH_TEXTFIELD: TextField@SEARCH_TEXTFIELD:
X: 60 X: 60
Width: PARENT_RIGHT - 60 Width: PARENT_RIGHT - 60
Height: 25 Height: 25
Label@CATEGORIES_LABEL:
Y: 25
Width: 55
Height: 25
Text: label-bg-filter
Align: Right
Font: TinyBold
DropDownButton@CATEGORIES_DROPDOWN: DropDownButton@CATEGORIES_DROPDOWN:
X: 60 X: 60
Y: 24 Y: 24
Width: PARENT_RIGHT - 60 Width: PARENT_RIGHT - 60
Height: 25 Height: 25
Font: Bold Font: Bold
Label@OWNERS_LABEL:
Y: 49
Width: 55
Height: 25
Text: label-actor-bg-owner
Align: Right
Font: TinyBold
DropDownButton@OWNERS_DROPDOWN: DropDownButton@OWNERS_DROPDOWN:
X: 60 X: 60
Y: 48 Y: 48
Width: PARENT_RIGHT - 60 Width: PARENT_RIGHT - 60
Height: 25 Height: 25
Font: Bold Font: Bold
ScrollPanel@ACTORTEMPLATE_LIST: ScrollPanel@ACTORTEMPLATE_LIST:
Y: 72 Y: 72
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM - 50 Height: PARENT_BOTTOM - 72
TopBottomSpacing: 4 TopBottomSpacing: 4
ItemSpacing: 4 ItemSpacing: 4
Children:
ScrollItem@ACTORPREVIEW_TEMPLATE:
Visible: false
Width: PARENT_RIGHT - 35
TooltipContainer: TOOLTIP_CONTAINER
TooltipTemplate: SIMPLE_TOOLTIP
IgnoreChildMouseOver: true
Children: Children:
ScrollItem@ACTORPREVIEW_TEMPLATE: ActorPreview@ACTOR_PREVIEW:
Visible: false X: 4
Width: PARENT_RIGHT - 35 Y: 4
TooltipContainer: TOOLTIP_CONTAINER Visible: true
TooltipTemplate: SIMPLE_TOOLTIP
IgnoreChildMouseOver: true
Children:
ActorPreview@ACTOR_PREVIEW:
X: 4
Y: 4
Visible: true
Container@TOOLS_WIDGETS: Container@TOOLS_WIDGETS:
X: WINDOW_RIGHT - 295 X: WINDOW_RIGHT - 295
Y: 318 Y: 318
Width: 290 Width: 290
Height: WINDOW_BOTTOM - 410 Height: WINDOW_BOTTOM - 410
ClickThrough: false Visible: false
Logic: MapToolsLogic Logic: MapToolsLogic
Children: Children:
Background@TOOLS_EDIT_PANEL: Background@TOOLS_EDIT_PANEL:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 25 Height: 25
Background: panel-black Background: panel-black
Label@TOOLS_LABEL: Children:
Y: 1 Label@TOOLS_LABEL:
Width: 55 Y: 1
Height: 25 Width: 55
Text: label-tools-bg-categories Height: 25
Align: Right Text: label-tools-bg-categories
Font: TinyBold Align: Right
DropDownButton@TOOLS_DROPDOWN: Font: TinyBold
X: 60 DropDownButton@TOOLS_DROPDOWN:
Width: PARENT_RIGHT - 60 X: 60
Height: 25 Width: PARENT_RIGHT - 60
Font: Bold Height: 25
ScrollPanel@MARKER_TOOL_PANEL: Font: Bold
Y: 24 Background@MARKER_TOOL_PANEL:
Width: PARENT_RIGHT - 1 Y: 25
Height: PARENT_BOTTOM Width: PARENT_RIGHT
Visible: true Height: PARENT_BOTTOM - 25
ScrollBar: Hidden Background: scrollpanel-bg
ScrollbarWidth: 0
Logic: MapMarkerTilesLogic Logic: MapMarkerTilesLogic
Children: Children:
ScrollPanel@TILE_COLOR_PANEL: ScrollPanel@TILE_COLOR_PANEL:
X: 6 X: 6
Y: 6 Y: 6
Width: PARENT_RIGHT - 18 Width: PARENT_RIGHT - 19
Height: 31 Height: 31
TopBottomSpacing: 1 TopBottomSpacing: 1
ItemSpacing: 1 ItemSpacing: 1
@@ -529,7 +524,7 @@ Container@EDITOR_WORLD_ROOT:
Label@MODE_LABEL: Label@MODE_LABEL:
X: 6 X: 6
Y: 102 Y: 102
Width: 265 Width: 260
Height: 25 Height: 25
Align: Left Align: Left
Text: label-marker-mirror-mode Text: label-marker-mirror-mode
@@ -585,101 +580,88 @@ Container@EDITOR_WORLD_ROOT:
Align: Left Align: Left
Visible: false Visible: false
Container@HISTORY_WIDGETS: Container@HISTORY_WIDGETS:
Logic: HistoryLogLogic
X: WINDOW_RIGHT - 295 X: WINDOW_RIGHT - 295
Y: 318 Y: 318
Width: 290 Width: 290
Height: WINDOW_BOTTOM - 410 Height: WINDOW_BOTTOM - 410
ClickThrough: false Logic: HistoryLogLogic
Visible: false
Children: Children:
Container@HISTORY_BG: ScrollPanel@HISTORY_LIST:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
CollapseHiddenChildren: True
TopBottomSpacing: 4
ItemSpacing: 4
Children: Children:
ScrollPanel@HISTORY_LIST: ScrollItem@HISTORY_TEMPLATE:
Width: PARENT_RIGHT X: 4
Height: PARENT_BOTTOM Visible: false
CollapseHiddenChildren: True Width: PARENT_RIGHT - 31
TopBottomSpacing: 4 Height: 25
ItemSpacing: 4 IgnoreChildMouseOver: true
TextColor: ffffff
TextColorDisabled: 8f8f8f
Children: Children:
ScrollItem@HISTORY_TEMPLATE: Label@TITLE:
X: 4 X: 5
Visible: false Width: PARENT_RIGHT
Width: PARENT_RIGHT - 31
Height: 25 Height: 25
IgnoreChildMouseOver: true Align: Left
TextColor: ffffff
TextColorDisabled: 8f8f8f
Children:
Label@TITLE:
X: 5
Width: PARENT_RIGHT
Height: 25
Align: Left
Container@SELECT_WIDGETS: Container@SELECT_WIDGETS:
Visible: false
X: WINDOW_RIGHT - 295 X: WINDOW_RIGHT - 295
Y: 318 Y: 318
Width: 290 Width: 290
Height: WINDOW_BOTTOM - 410 Height: WINDOW_BOTTOM - 410
Visible: false
Children: Children:
Background@SELECT_BG: Background@AREA_EDIT_PANEL:
X: 0
Y: 0
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Background: scrollpanel-bg Background: scrollpanel-bg
Container@AREA_EDIT_PANEL:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children: Children:
Label@AREA_EDIT_TITLE: Label@AREA_EDIT_TITLE:
X: 6 Y: 16
Y: 7 Width: PARENT_RIGHT
Width: 278
Height: 24 Height: 24
Align: Center Align: Center
Font: Bold Font: Bold
Text: label-area-selection Text: label-area-selection
Label@AREA_FILTERS_LABEL: Label@AREA_FILTERS_LABEL:
X: 6 X: 7
Y: 36 Y: 45
Width: 150 Width: 150
Height: 25 Height: 25
Font: Bold Font: Bold
Align: Left Align: Left
Text: label-copy-filters Text: label-copy-filters
Checkbox@COPY_FILTER_TERRAIN_CHECKBOX: Checkbox@COPY_FILTER_TERRAIN_CHECKBOX:
X: 6 X: 7
Y: 61 Y: 70
Width: PARENT_RIGHT - 29 Width: PARENT_RIGHT - 29
Height: 20 Height: 20
Text: label-filter-terrain Text: label-filter-terrain
Checkbox@COPY_FILTER_RESOURCES_CHECKBOX: Checkbox@COPY_FILTER_RESOURCES_CHECKBOX:
X: 6 X: 7
Y: 86 Y: 95
Width: PARENT_RIGHT - 29 Width: PARENT_RIGHT - 29
Height: 20 Height: 20
Text: label-filter-resources Text: label-filter-resources
Checkbox@COPY_FILTER_ACTORS_CHECKBOX: Checkbox@COPY_FILTER_ACTORS_CHECKBOX:
X: 6 X: 7
Y: 111 Y: 120
Width: PARENT_RIGHT - 29 Width: PARENT_RIGHT - 29
Height: 20 Height: 20
Text: label-filter-actors Text: label-filter-actors
Label@AREA_INFO_TITLE: Label@AREA_INFO_TITLE:
X: 15
Y: 139 Y: 139
Width: 281 Width: PARENT_RIGHT
Height: 24 Height: 24
Align: Center Align: Center
Font: Bold Font: Bold
Text: label-area-info Text: label-area-info
Label@DIAGONAL_LABEL: Label@DIAGONAL_LABEL:
X: 6 X: 7
Y: 171 Y: 171
Width: 120 Width: 120
Height: 20 Height: 20
@@ -687,7 +669,7 @@ Container@EDITOR_WORLD_ROOT:
Align: Left Align: Left
Text: label-selected-area-diagonal Text: label-selected-area-diagonal
Label@RESOURCE_LABEL: Label@RESOURCE_LABEL:
X: 6 X: 7
Y: 193 Y: 193
Width: 120 Width: 120
Height: 25 Height: 25
@@ -695,59 +677,55 @@ Container@EDITOR_WORLD_ROOT:
Align: Left Align: Left
Text: label-selected-area-resources Text: label-selected-area-resources
Label@DIAGONAL_COUNTER_LABEL: Label@DIAGONAL_COUNTER_LABEL:
X: 150 X: 140
Y: 170 Y: 170
Width: 55 Width: 55
Height: 22 Height: 22
Align: Left Align: Left
Label@RESOURCES_COUNTER_LABEL: Label@RESOURCES_COUNTER_LABEL:
X: 150 X: 140
Y: 195 Y: 195
Width: 55 Width: 55
Height: 22 Height: 22
Align: Left Align: Left
Button@SELECTION_CANCEL_BUTTON: Button@SELECTION_CANCEL_BUTTON:
X: 211 X: 208
Y: 222 Y: 222
Width: 75 Width: 75
Height: 25 Height: 25
Text: button-cancel Text: button-cancel
Font: Bold Font: Bold
Container@ACTOR_EDIT_PANEL: Background@ACTOR_EDIT_PANEL:
X: 0
Y: 0
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
#Background: scrollpanel-bg Background: scrollpanel-bg
Children: Children:
Label@ACTOR_TYPE_LABEL: Label@ACTOR_TYPE_LABEL:
X: 6 Y: 6
Y: 2 Width: PARENT_RIGHT
Width: 278
Height: 24 Height: 24
Align: Center Align: Center
Font: Bold Font: Bold
Label@ACTOR_ID_LABEL: Label@ACTOR_ID_LABEL:
X: 0 Y: 35
Y: 29
Width: 55 Width: 55
Height: 25 Height: 25
Text: label-actor-edit-panel-id Text: label-actor-edit-panel-id
Align: Right Align: Right
TextField@ACTOR_ID: TextField@ACTOR_ID:
X: 67 X: 69
Y: 29 Y: 35
Width: 210 Width: 213
Height: 25 Height: 25
Label@ACTOR_ID_ERROR_LABEL: Label@ACTOR_ID_ERROR_LABEL:
X: 67 X: 69
Y: 45 Y: 35
Width: 210 Width: 213
Height: 15 Height: 25
Font: TinyBold Font: TinyBold
TextColor: FF0000 TextColor: FF0000
Container@ACTOR_INIT_CONTAINER: Container@ACTOR_INIT_CONTAINER:
Y: 57 Y: 63
Width: PARENT_RIGHT Width: PARENT_RIGHT
Children: Children:
Container@CHECKBOX_OPTION_TEMPLATE: Container@CHECKBOX_OPTION_TEMPLATE:
@@ -755,7 +733,7 @@ Container@EDITOR_WORLD_ROOT:
Height: 22 Height: 22
Children: Children:
Checkbox@OPTION: Checkbox@OPTION:
X: 84 X: 60
Y: 1 Y: 1
Width: PARENT_RIGHT - 100 Width: PARENT_RIGHT - 100
Height: 20 Height: 20
@@ -764,18 +742,17 @@ Container@EDITOR_WORLD_ROOT:
Height: 22 Height: 22
Children: Children:
Label@LABEL: Label@LABEL:
X: 0
Y: 1 Y: 1
Width: 55 Width: 55
Height: 16 Height: 16
Align: Right Align: Right
Slider@OPTION: Slider@OPTION:
X: 58 X: 60
Y: 1 Y: 1
Width: 167 Width: 170
Height: 20 Height: 20
TextField@VALUE: TextField@VALUE:
X: 227 X: 232
Y: 1 Y: 1
Width: 50 Width: 50
Height: 20 Height: 20
@@ -785,34 +762,33 @@ Container@EDITOR_WORLD_ROOT:
Height: 27 Height: 27
Children: Children:
Label@LABEL: Label@LABEL:
X: 0
Y: 2 Y: 2
Width: 55 Width: 55
Height: 24 Height: 24
Align: Right Align: Right
DropDownButton@OPTION: DropDownButton@OPTION:
X: 67 X: 69
Y: 1 Y: 1
Width: 210 Width: 213
Height: 25 Height: 25
Font: Bold Font: Bold
Container@BUTTON_CONTAINER: Container@BUTTON_CONTAINER:
Y: 60 Y: 70
Children: Children:
Button@DELETE_BUTTON: Button@DELETE_BUTTON:
X: 4 X: 7
Width: 75 Width: 75
Height: 25 Height: 25
Text: button-container-delete Text: button-container-delete
Font: Bold Font: Bold
Button@CANCEL_BUTTON: Button@CANCEL_BUTTON:
X: 131 X: 127
Width: 75 Width: 75
Height: 25 Height: 25
Text: button-cancel Text: button-cancel
Font: Bold Font: Bold
Button@OK_BUTTON: Button@OK_BUTTON:
X: 211 X: 208
Width: 75 Width: 75
Height: 25 Height: 25
Text: button-container-ok Text: button-container-ok
@@ -823,7 +799,6 @@ Container@EDITOR_WORLD_ROOT:
Y: 294 Y: 294
Width: 290 Width: 290
Height: 25 Height: 25
ClickThrough: false
Children: Children:
Button@SELECT_TAB: Button@SELECT_TAB:
Width: 49 Width: 49
@@ -840,7 +815,7 @@ Container@EDITOR_WORLD_ROOT:
ImageName: select ImageName: select
Button@TILES_TAB: Button@TILES_TAB:
X: 49 X: 49
Width: 48 Width: 49
Height: 25 Height: 25
Key: EditorTilesTab Key: EditorTilesTab
TooltipTemplate: BUTTON_TOOLTIP TooltipTemplate: BUTTON_TOOLTIP
@@ -848,12 +823,12 @@ Container@EDITOR_WORLD_ROOT:
TooltipContainer: TOOLTIP_CONTAINER TooltipContainer: TOOLTIP_CONTAINER
Children: Children:
Image@ICON: Image@ICON:
X: 16 X: 17
Y: 5 Y: 5
ImageCollection: editor ImageCollection: editor
ImageName: tiles ImageName: tiles
Button@OVERLAYS_TAB: Button@OVERLAYS_TAB:
X: 97 X: 98
Width: 48 Width: 48
Height: 25 Height: 25
Key: EditorOverlaysTab Key: EditorOverlaysTab
@@ -862,12 +837,12 @@ Container@EDITOR_WORLD_ROOT:
TooltipContainer: TOOLTIP_CONTAINER TooltipContainer: TOOLTIP_CONTAINER
Children: Children:
Image@ICON: Image@ICON:
X: 16 X: 17
Y: 5 Y: 5
ImageCollection: editor ImageCollection: editor
ImageName: overlays ImageName: overlays
Button@ACTORS_TAB: Button@ACTORS_TAB:
X: 145 X: 146
Width: 48 Width: 48
Height: 25 Height: 25
Key: EditorActorsTab Key: EditorActorsTab
@@ -881,7 +856,7 @@ Container@EDITOR_WORLD_ROOT:
ImageCollection: editor ImageCollection: editor
ImageName: actors ImageName: actors
Button@TOOLS_TAB: Button@TOOLS_TAB:
X: 193 X: 194
Width: 48 Width: 48
Height: 25 Height: 25
Key: EditorToolsTab Key: EditorToolsTab
@@ -896,7 +871,7 @@ Container@EDITOR_WORLD_ROOT:
ImageName: tools ImageName: tools
Button@HISTORY_TAB: Button@HISTORY_TAB:
X: 241 X: 241
Width: 49 Width: 48
Height: 25 Height: 25
Key: EditorHistoryTab Key: EditorHistoryTab
TooltipTemplate: BUTTON_TOOLTIP TooltipTemplate: BUTTON_TOOLTIP
@@ -989,12 +964,14 @@ ScrollPanel@CATEGORY_FILTER_PANEL:
Width: 88 Width: 88
Height: 25 Height: 25
Text: button-select-categories-buttons-all Text: button-select-categories-buttons-all
Font: Bold
Button@SELECT_NONE: Button@SELECT_NONE:
X: 10 + 88 + 10 X: 10 + 88 + 10
Y: 0 - 5 Y: 0 - 5
Width: 88 Width: 88
Height: 25 Height: 25
Text: button-select-categories-buttons-none Text: button-select-categories-buttons-none
Font: Bold
Checkbox@CATEGORY_TEMPLATE: Checkbox@CATEGORY_TEMPLATE:
X: 5 X: 5
Width: PARENT_RIGHT - 29 Width: PARENT_RIGHT - 29

90
mods/common/chrome/editor.yaml
View File

@@ -408,14 +408,12 @@ Container@EDITOR_WORLD_ROOT:
Width: PARENT_RIGHT - 70 Width: PARENT_RIGHT - 70
Height: 25 Height: 25
Font: Bold Font: Bold
ScrollPanel@MARKER_TOOL_PANEL: Background@MARKER_TOOL_PANEL:
X: 9 X: 10
Y: 35 Y: 35
Width: 290 Width: PARENT_RIGHT - 20
Height: WINDOW_BOTTOM - 490 Height: WINDOW_BOTTOM - 490
Visible: true Background: scrollpanel-bg
ScrollBar: Hidden
ScrollbarWidth: 0
Logic: MapMarkerTilesLogic Logic: MapMarkerTilesLogic
Children: Children:
ScrollPanel@TILE_COLOR_PANEL: ScrollPanel@TILE_COLOR_PANEL:
@@ -488,7 +486,7 @@ Container@EDITOR_WORLD_ROOT:
Label@MODE_LABEL: Label@MODE_LABEL:
X: 6 X: 6
Y: 102 Y: 102
Width: 265 Width: 260
Height: 25 Height: 25
Align: Left Align: Left
Text: label-marker-mirror-mode Text: label-marker-mirror-mode
@@ -581,20 +579,22 @@ Container@EDITOR_WORLD_ROOT:
Height: WINDOW_BOTTOM - 458 Height: WINDOW_BOTTOM - 458
Visible: false Visible: false
Children: Children:
Container@AREA_EDIT_PANEL: Background@AREA_EDIT_PANEL:
Width: 310 X: 10
Height: WINDOW_BOTTOM - 458 Y: 10
Width: PARENT_RIGHT - 20
Height: PARENT_BOTTOM - 7
Background: scrollpanel-bg
Children: Children:
Label@AREA_EDIT_TITLE: Label@AREA_EDIT_TITLE:
X: 6
Y: 16 Y: 16
Width: 298 Width: PARENT_RIGHT
Height: 24 Height: 24
Align: Center Align: Center
Font: Bold Font: Bold
Text: label-area-selection Text: label-area-selection
Label@AREA_FILTERS_LABEL: Label@AREA_FILTERS_LABEL:
X: 15 X: 5
Y: 45 Y: 45
Width: 150 Width: 150
Height: 25 Height: 25
@@ -602,33 +602,32 @@ Container@EDITOR_WORLD_ROOT:
Align: Left Align: Left
Text: label-copy-filters Text: label-copy-filters
Checkbox@COPY_FILTER_TERRAIN_CHECKBOX: Checkbox@COPY_FILTER_TERRAIN_CHECKBOX:
X: 15 X: 5
Y: 70 Y: 70
Width: PARENT_RIGHT - 29 Width: PARENT_RIGHT - 29
Height: 20 Height: 20
Text: label-filter-terrain Text: label-filter-terrain
Checkbox@COPY_FILTER_RESOURCES_CHECKBOX: Checkbox@COPY_FILTER_RESOURCES_CHECKBOX:
X: 15 X: 5
Y: 95 Y: 95
Width: PARENT_RIGHT - 29 Width: PARENT_RIGHT - 29
Height: 20 Height: 20
Text: label-filter-resources Text: label-filter-resources
Checkbox@COPY_FILTER_ACTORS_CHECKBOX: Checkbox@COPY_FILTER_ACTORS_CHECKBOX:
X: 15 X: 5
Y: 120 Y: 120
Width: PARENT_RIGHT - 29 Width: PARENT_RIGHT - 29
Height: 20 Height: 20
Text: label-filter-actors Text: label-filter-actors
Label@AREA_INFO_TITLE: Label@AREA_INFO_TITLE:
X: 6
Y: 139 Y: 139
Width: 298 Width: PARENT_RIGHT
Height: 24 Height: 24
Align: Center Align: Center
Font: Bold Font: Bold
Text: label-area-info Text: label-area-info
Label@DIAGONAL_LABEL: Label@DIAGONAL_LABEL:
X: 15 X: 5
Y: 171 Y: 171
Width: 120 Width: 120
Height: 20 Height: 20
@@ -636,7 +635,7 @@ Container@EDITOR_WORLD_ROOT:
Align: Left Align: Left
Text: label-selected-area-diagonal Text: label-selected-area-diagonal
Label@RESOURCE_LABEL: Label@RESOURCE_LABEL:
X: 15 X: 5
Y: 193 Y: 193
Width: 120 Width: 120
Height: 25 Height: 25
@@ -644,52 +643,53 @@ Container@EDITOR_WORLD_ROOT:
Align: Left Align: Left
Text: label-selected-area-resources Text: label-selected-area-resources
Label@DIAGONAL_COUNTER_LABEL: Label@DIAGONAL_COUNTER_LABEL:
X: 150 X: 140
Y: 170 Y: 170
Width: 55 Width: 55
Height: 22 Height: 22
Align: Left Align: Left
Label@RESOURCES_COUNTER_LABEL: Label@RESOURCES_COUNTER_LABEL:
X: 150 X: 140
Y: 195 Y: 195
Width: 55 Width: 55
Height: 22 Height: 22
Align: Left Align: Left
Button@SELECTION_CANCEL_BUTTON: Button@SELECTION_CANCEL_BUTTON:
X: 222 X: 208
Y: 222 Y: 222
Width: 75 Width: 75
Height: 25 Height: 25
Text: button-cancel Text: button-cancel
Font: Bold Font: Bold
Container@ACTOR_EDIT_PANEL: Background@ACTOR_EDIT_PANEL:
Width: 310 X: 10
Height: WINDOW_BOTTOM - 458 Y: 10
Width: PARENT_RIGHT - 20
Height: PARENT_BOTTOM - 7
Background: scrollpanel-bg
Children: Children:
Label@ACTOR_TYPE_LABEL: Label@ACTOR_TYPE_LABEL:
X: 15
Y: 16 Y: 16
Width: 281 Width: PARENT_RIGHT
Height: 24 Height: 24
Align: Center Align: Center
Font: Bold Font: Bold
Label@ACTOR_ID_LABEL: Label@ACTOR_ID_LABEL:
X: 15
Y: 45 Y: 45
Width: 55 Width: 55
Height: 25 Height: 25
Text: label-actor-edit-panel-id Text: label-actor-edit-panel-id
Align: Right Align: Right
TextField@ACTOR_ID: TextField@ACTOR_ID:
X: 84 X: 69
Y: 45 Y: 45
Width: 208 Width: 213
Height: 25 Height: 25
Label@ACTOR_ID_ERROR_LABEL: Label@ACTOR_ID_ERROR_LABEL:
X: 84 X: 69
Y: 71 Y: 45
Width: 208 Width: 213
Height: 15 Height: 25
Font: TinyBold Font: TinyBold
TextColor: FF0000 TextColor: FF0000
Container@ACTOR_INIT_CONTAINER: Container@ACTOR_INIT_CONTAINER:
@@ -701,7 +701,7 @@ Container@EDITOR_WORLD_ROOT:
Height: 22 Height: 22
Children: Children:
Checkbox@OPTION: Checkbox@OPTION:
X: 84 X: 60
Y: 1 Y: 1
Width: PARENT_RIGHT - 100 Width: PARENT_RIGHT - 100
Height: 20 Height: 20
@@ -710,18 +710,17 @@ Container@EDITOR_WORLD_ROOT:
Height: 22 Height: 22
Children: Children:
Label@LABEL: Label@LABEL:
X: 15
Y: 1 Y: 1
Width: 55 Width: 55
Height: 16 Height: 16
Align: Right Align: Right
Slider@OPTION: Slider@OPTION:
X: 75 X: 60
Y: 1 Y: 1
Width: 165 Width: 170
Height: 20 Height: 20
TextField@VALUE: TextField@VALUE:
X: 242 X: 232
Y: 1 Y: 1
Width: 50 Width: 50
Height: 20 Height: 20
@@ -731,34 +730,33 @@ Container@EDITOR_WORLD_ROOT:
Height: 27 Height: 27
Children: Children:
Label@LABEL: Label@LABEL:
X: 15
Y: 2 Y: 2
Width: 55 Width: 55
Height: 24 Height: 24
Align: Right Align: Right
DropDownButton@OPTION: DropDownButton@OPTION:
X: 84 X: 69
Y: 1 Y: 1
Width: 208 Width: 213
Height: 25 Height: 25
Font: Bold Font: Bold
Container@BUTTON_CONTAINER: Container@BUTTON_CONTAINER:
Y: 75 Y: 75
Children: Children:
Button@DELETE_BUTTON: Button@DELETE_BUTTON:
X: 15 X: 5
Width: 75 Width: 75
Height: 25 Height: 25
Text: button-container-delete Text: button-container-delete
Font: Bold Font: Bold
Button@CANCEL_BUTTON: Button@CANCEL_BUTTON:
X: 142 X: 127
Width: 75 Width: 75
Height: 25 Height: 25
Text: button-cancel Text: button-cancel
Font: Bold Font: Bold
Button@OK_BUTTON: Button@OK_BUTTON:
X: 222 X: 208
Width: 75 Width: 75
Height: 25 Height: 25
Text: button-container-ok Text: button-container-ok