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

Added Undo Redo to editor

Browse Source
This commit is contained in:
teinarss
2019-07-13 18:21:01 +02:00
committed by abcdefg30
parent 1f78b3a425
commit 76034c198e
19 changed files with 1155 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -292,15 +292,21 @@ Container@EDITOR_WORLD_ROOT:
Children:
Button@DELETE_BUTTON:
X: 4
Width: 85
Width: 75
Height: 25
Text: Delete
Font: Bold
Button@CLOSE_BUTTON:
X: 180
Width: 85
Button@CANCEL_BUTTON:
X: 110
Width: 75
Height: 25
Text: Close
Text: Cancel
Font: Bold
Button@OK_BUTTON:
X: 190
Width: 75
Height: 25
Text: OK
Font: Bold
ViewportController:
Width: WINDOW_RIGHT
@@ -318,10 +324,10 @@ Container@EDITOR_WORLD_ROOT:
BookmarkRestoreKeyPrefix: MapBookmarkRestore
BookmarkKeyCount: 4
Background@RADAR_BG:
X: WINDOW_RIGHT - 255
X: WINDOW_RIGHT - 295
Y: 5
Width: 250
Height: 250
Width: 290
Height: 290
Background: panel-gray
Children:
Radar@INGAME_RADAR:
@@ -332,7 +338,7 @@ Container@EDITOR_WORLD_ROOT:
MenuButton@OPTIONS_BUTTON:
Logic: MenuButtonsChromeLogic
Key: escape
X: WINDOW_RIGHT - 254 - WIDTH
X: WINDOW_RIGHT - 294 - WIDTH
Y: 5
Width: 30
Height: 25
@@ -346,10 +352,10 @@ Container@EDITOR_WORLD_ROOT:
ImageName: options
Container@TILE_WIDGETS:
Logic: TileSelectorLogic
X: WINDOW_RIGHT - 255
Y: 278
Width: 250
Height: WINDOW_BOTTOM - 370
X: WINDOW_RIGHT - 295
Y: 318
Width: 290
Height: WINDOW_BOTTOM - 410
ClickThrough: false
Children:
Container@TILES_BG:
@@ -402,10 +408,10 @@ Container@EDITOR_WORLD_ROOT:
Y: 4
Container@LAYER_WIDGETS:
Logic: LayerSelectorLogic
X: WINDOW_RIGHT - 255
Y: 278
Width: 250
Height: WINDOW_BOTTOM - 370
X: WINDOW_RIGHT - 295
Y: 318
Width: 290
Height: WINDOW_BOTTOM - 410
ClickThrough: false
Children:
Container@LAYERS_BG:
@@ -429,10 +435,10 @@ Container@EDITOR_WORLD_ROOT:
Visible: false
Container@ACTOR_WIDGETS:
Logic: ActorSelectorLogic
X: WINDOW_RIGHT - 255
Y: 278
Width: 250
Height: WINDOW_BOTTOM - 370
X: WINDOW_RIGHT - 295
Y: 318
Width: 290
Height: WINDOW_BOTTOM - 410
ClickThrough: false
Children:
Container@ACTORS_BG:
@@ -499,33 +505,72 @@ Container@EDITOR_WORLD_ROOT:
X: 4
Y: 4
Visible: true
Container@HISTORY_WIDGETS:
Logic: HistoryLogLogic
X: WINDOW_RIGHT - 295
Y: 318
Width: 290
Height: WINDOW_BOTTOM - 410
ClickThrough: false
Children:
Container@HISTORY_BG:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
ScrollPanel@HISTORY_LIST:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
CollapseHiddenChildren: True
TopBottomSpacing: 4
ItemSpacing: 4
Children:
ScrollItem@HISTORY_TEMPLATE:
X: 4
Visible: false
Width: PARENT_RIGHT - 31
Height: 25
IgnoreChildMouseOver: true
TextColor: ffffff
TextColorDisabled: 8f8f8f
Children:
Label@TITLE:
X: 5
Width: PARENT_RIGHT
Height: 25
Align: Left
Container@MAP_EDITOR_TAB_CONTAINER:
Logic: MapEditorTabsLogic
X: WINDOW_RIGHT - 255
Y: 254
Width: 250
X: WINDOW_RIGHT - 295
Y: 294
Width: 290
Height: 25
ClickThrough: false
Children:
Button@TILES_TAB:
Width: 81
Width: 71
Height: 25
Text: Tiles
Font: Bold
Button@OVERLAYS_TAB:
X: 80
Width: 90
X: 70
Width: 80
Height: 25
Text: Overlays
Font: Bold
Button@ACTORS_TAB:
X: 169
Width: 81
X: 149
Width: 71
Height: 25
Text: Actors
Font: Bold
Button@HISTORY_TAB:
X: 219
Width: 71
Height: 25
Text: History
Font: Bold
Button@GRID_BUTTON:
X: WINDOW_RIGHT - 650
X: WINDOW_RIGHT - 690
Y: 5
Width: 100
Height: 25
@@ -536,7 +581,7 @@ Container@EDITOR_WORLD_ROOT:
TooltipText: Toggle the terrain grid
TooltipContainer: TOOLTIP_CONTAINER
Label@ZOOM_LABEL:
X: WINDOW_RIGHT - 730 - 55
X: WINDOW_RIGHT - 770 - 55
Y: 5
Width: 50
Height: 25
@@ -545,7 +590,7 @@ Container@EDITOR_WORLD_ROOT:
Font: Bold
Contrast: true
DropDownButton@ZOOM_BUTTON:
X: WINDOW_RIGHT - 730
X: WINDOW_RIGHT - 770
Y: 5
Width: 70
Height: 25
@@ -555,7 +600,7 @@ Container@EDITOR_WORLD_ROOT:
TooltipText: Zoom
TooltipContainer: TOOLTIP_CONTAINER
Button@COPYPASTE_BUTTON:
X: WINDOW_RIGHT - 540
X: WINDOW_RIGHT - 580
Y: 5
Width: 96
Height: 25
@@ -565,7 +610,7 @@ Container@EDITOR_WORLD_ROOT:
TooltipText: Copy
TooltipContainer: TOOLTIP_CONTAINER
DropDownButton@COPYFILTER_BUTTON:
X: WINDOW_RIGHT - 435
X: WINDOW_RIGHT - 475
Y: 5
Width: 140
Height: 25
@@ -585,6 +630,26 @@ Container@EDITOR_WORLD_ROOT:
Align: Left
Font: Bold
Contrast: true
Button@UNDO_BUTTON:
X: 200
Height: 25
Width: 100
Text: Undo
Font: Bold
Key: z ctrl
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: Undo last step
TooltipContainer: TOOLTIP_CONTAINER
Button@REDO_BUTTON:
X: 305
Height: 25
Width: 100
Text: Redo
Font: Bold
Key: y ctrl
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: Redo last step
TooltipContainer: TOOLTIP_CONTAINER
ScrollPanel@CATEGORY_FILTER_PANEL:
Width: 190

1
mods/cnc/rules/world.yaml
View File

@@ -268,3 +268,4 @@ EditorWorld:
EditorResourceLayer:
EditorSelectionLayer:
LoadWidgetAtGameStart:
EditorActionManager:

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

@@ -287,15 +287,21 @@ Container@EDITOR_WORLD_ROOT:
Children:
Button@DELETE_BUTTON:
X: 15
Width: 85
Width: 75
Height: 25
Text: Delete
Font: Bold
Button@CLOSE_BUTTON:
X: 195
Width: 85
Button@CANCEL_BUTTON:
X: 125
Width: 75
Height: 25
Text: Close
Text: Cancel
Font: Bold
Button@OK_BUTTON:
X: 205
Width: 75
Height: 25
Text: OK
Font: Bold
ViewportController:
Width: WINDOW_RIGHT
@@ -313,10 +319,10 @@ Container@EDITOR_WORLD_ROOT:
BookmarkRestoreKeyPrefix: MapBookmarkRestore
BookmarkKeyCount: 4
Background@RADAR_BG:
X: WINDOW_RIGHT - 255
X: WINDOW_RIGHT - 325
Y: 5
Width: 250
Height: 250
Width: 320
Height: 320
Children:
Radar@INGAME_RADAR:
X: 10
@@ -327,10 +333,10 @@ Container@EDITOR_WORLD_ROOT:
Logic: TileSelectorLogic
Children:
Background@TILES_BG:
X: WINDOW_RIGHT - 250
Y: 290
Width: 240
Height: WINDOW_BOTTOM - 382
X: WINDOW_RIGHT - 320
Y: 360
Width: 310
Height: WINDOW_BOTTOM - 452
Children:
Label@SEARCH_LABEL:
Y: 12
@@ -378,10 +384,10 @@ Container@EDITOR_WORLD_ROOT:
Logic: LayerSelectorLogic
Children:
Background@LAYERS_BG:
X: WINDOW_RIGHT - 250
Y: 290
Width: 240
Height: WINDOW_BOTTOM - 382
X: WINDOW_RIGHT - 320
Y: 360
Width: 310
Height: WINDOW_BOTTOM - 452
Children:
ScrollPanel@LAYERTEMPLATE_LIST:
X: 10
@@ -405,10 +411,10 @@ Container@EDITOR_WORLD_ROOT:
Logic: ActorSelectorLogic
Children:
Background@ACTORS_BG:
X: WINDOW_RIGHT - 250
Y: 290
Width: 240
Height: WINDOW_BOTTOM - 382
X: WINDOW_RIGHT - 320
Y: 360
Width: 310
Height: WINDOW_BOTTOM - 452
Children:
Label@SEARCH_LABEL:
Y: 12
@@ -467,11 +473,44 @@ Container@EDITOR_WORLD_ROOT:
X: 4
Y: 4
Visible: true
Container@HISTORY_WIDGETS:
Logic: HistoryLogLogic
Visible: false
Children:
Background@HISTORY_BG:
X: WINDOW_RIGHT - 320
Y: 360
Width: 310
Height: WINDOW_BOTTOM - 452
Children:
ScrollPanel@HISTORY_LIST:
X: 10
Y: 10
Width: PARENT_RIGHT - 20
Height: PARENT_BOTTOM - 20
CollapseHiddenChildren: True
TopBottomSpacing: 4
ItemSpacing: 4
Children:
ScrollItem@HISTORY_TEMPLATE:
X: 4
Visible: false
Width: PARENT_RIGHT - 31
Height: 25
IgnoreChildMouseOver: true
TextColor: ffffff
TextColorDisabled: 8f8f8f
Children:
Label@TITLE:
X: 5
Width: PARENT_RIGHT
Height: 25
Align: Left
Container@MAP_EDITOR_TAB_CONTAINER:
Logic: MapEditorTabsLogic
X: WINDOW_RIGHT - 245
Y: 260
Width: 240
X: WINDOW_RIGHT - 315
Y: 330
Width: 310
Height: 25
Children:
Button@TILES_TAB:
@@ -492,6 +531,12 @@ Container@EDITOR_WORLD_ROOT:
Height: 25
Text: Actors
Font: Bold
Button@HISTORY_TAB:
X: 230
Width: 70
Height: 25
Text: History
Font: Bold
MenuButton@OPTIONS_BUTTON:
Logic: MenuButtonsChromeLogic
MenuContainer: INGAME_MENU
@@ -547,15 +592,35 @@ Container@EDITOR_WORLD_ROOT:
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: Zoom
TooltipContainer: TOOLTIP_CONTAINER
Button@UNDO_BUTTON:
X: 630
Height: 25
Width: 90
Text: Undo
Font: Bold
Key: z ctrl
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: Undo last step
TooltipContainer: TOOLTIP_CONTAINER
Button@REDO_BUTTON:
X: 730
Height: 25
Width: 90
Text: Redo
Font: Bold
Key: y ctrl
TooltipTemplate: BUTTON_TOOLTIP
TooltipText: Redo last step
TooltipContainer: TOOLTIP_CONTAINER
Label@COORDINATE_LABEL:
X: 635
X: 835
Width: 50
Height: 25
Align: Left
Font: Bold
Contrast: true
Label@CASH_LABEL:
X: 750
X: 950
Width: 50
Height: 25
Align: Left

1
mods/d2k/rules/world.yaml
View File

@@ -243,3 +243,4 @@ EditorWorld:
D2kEditorResourceLayer:
EditorSelectionLayer:
LoadWidgetAtGameStart:
EditorActionManager:

1
mods/ra/rules/world.yaml
View File

@@ -284,3 +284,4 @@ EditorWorld:
EditorResourceLayer:
EditorSelectionLayer:
LoadWidgetAtGameStart:
EditorActionManager:

1
mods/ts/rules/world.yaml
View File

@@ -379,3 +379,4 @@ EditorWorld:
EditorSelectionLayer:
Palette: placefootprint
LoadWidgetAtGameStart:
EditorActionManager: