diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml index f436914aad..836b70ee86 100644 --- a/mods/cnc/chrome.yaml +++ b/mods/cnc/chrome.yaml @@ -762,6 +762,10 @@ editor: tools: 904, 68, 16, 16 history: 904, 51, 16, 16 erase: 818, 170, 16, 16 + copy: 835, 170, 16, 16 + paste: 852, 170, 16, 16 + undo: 869, 170, 16, 16 + redo: 886, 170, 16, 16 encyclopedia: Image: encyclopedia/scanlines.png diff --git a/mods/cnc/chrome/editor.yaml b/mods/cnc/chrome/editor.yaml index 7fad8991db..d6ea3d3256 100644 --- a/mods/cnc/chrome/editor.yaml +++ b/mods/cnc/chrome/editor.yaml @@ -259,16 +259,16 @@ Container@EDITOR_WORLD_ROOT: MenuButton@OPTIONS_BUTTON: Logic: MenuButtonsChromeLogic Key: escape - X: WINDOW_WIDTH - 294 - WIDTH - Y: 5 - Width: 30 + X: 0 + Y: 0 + Width: 50 Height: 25 TooltipText: button-editor-world-root-options-tooltip TooltipContainer: TOOLTIP_CONTAINER Children: Image: - X: 7 - Y: 5 + X: 17 + Y: 4 ImageCollection: order-icons ImageName: options Background@TOOLS_BG: @@ -785,67 +785,85 @@ Container@EDITOR_WORLD_ROOT: Y: 5 ImageCollection: editor ImageName: history - Button@UNDO_BUTTON: - X: WINDOW_WIDTH - 764 - Y: 5 - Height: 25 - Width: 100 - Text: button-editor-world-root-undo.label - Font: Bold - Key: EditorUndo - TooltipTemplate: BUTTON_TOOLTIP - TooltipText: button-editor-world-root-undo.tooltip - TooltipContainer: TOOLTIP_CONTAINER - Button@REDO_BUTTON: - X: WINDOW_WIDTH - 654 - Y: 5 - Height: 25 - Width: 100 - Text: button-editor-world-root-redo.label - Font: Bold - Key: EditorRedo - TooltipTemplate: BUTTON_TOOLTIP - TooltipText: button-editor-world-root-redo.tooltip - TooltipContainer: TOOLTIP_CONTAINER Button@COPY_BUTTON: - X: WINDOW_WIDTH - 544 - Y: 5 + X: 50 + Y: 0 + Width: 50 Height: 25 - Width: 100 - Text: button-editor-world-root-copy.label - Font: Bold Key: EditorCopy TooltipTemplate: BUTTON_TOOLTIP - TooltipText: button-editor-world-root-copy.tooltip + TooltipText: button-editor-world-root-copy-tooltip TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 17 + Y: 4 + ImageCollection: editor + ImageName: copy Button@PASTE_BUTTON: - X: WINDOW_WIDTH - 434 - Y: 5 + X: 100 + Y: 0 + Width: 50 Height: 25 - Width: 100 - Text: button-editor-world-root-paste.label - Font: Bold Key: EditorPaste TooltipTemplate: BUTTON_TOOLTIP - TooltipText: button-editor-world-root-paste.tooltip + TooltipText: button-editor-world-root-paste-tooltip TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 17 + Y: 4 + ImageCollection: editor + ImageName: paste + Button@UNDO_BUTTON: + X: 150 + Y: 0 + Width: 50 + Height: 25 + Key: EditorUndo + TooltipTemplate: BUTTON_TOOLTIP + TooltipText: button-editor-world-root-undo-tooltip + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 17 + Y: 4 + ImageCollection: editor + ImageName: undo + Button@REDO_BUTTON: + X: 200 + Y: 0 + Width: 50 + Height: 25 + Key: EditorRedo + TooltipTemplate: BUTTON_TOOLTIP + TooltipText: button-editor-world-root-redo-tooltip + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 17 + Y: 4 + ImageCollection: editor + ImageName: redo DropDownButton@OVERLAY_BUTTON: - X: WINDOW_WIDTH - 914 - Y: 5 + X: 250 + Y: 0 Width: 140 Height: 25 Text: dropdownbutton-editor-world-root-overlay-button Font: Bold Label@COORDINATE_LABEL: - X: 10 - Width: 50 + X: 400 + Y: 0 + Width: 100 Height: 25 Align: Left Font: Bold Contrast: true Label@CASH_LABEL: - X: 125 - Width: 50 + X: 505 + Y: 0 + Width: 100 Height: 25 Align: Left Font: Bold diff --git a/mods/cnc/fluent/chrome.ftl b/mods/cnc/fluent/chrome.ftl index 31c40ac2f6..ef543e77f6 100644 --- a/mods/cnc/fluent/chrome.ftl +++ b/mods/cnc/fluent/chrome.ftl @@ -103,21 +103,13 @@ button-delete-actor = .label = Delete .tooltip = Remove the selected actor -button-editor-world-root-copy = - .label = Copy - .tooltip = Copy the selected area +button-editor-world-root-copy-tooltip = Copy the selected area -button-editor-world-root-paste = - .label = Paste - .tooltip = Paste the saved area +button-editor-world-root-paste-tooltip = Paste the saved area -button-editor-world-root-undo = - .label = Undo - .tooltip = Undo last step +button-editor-world-root-undo-tooltip = Undo last step -button-editor-world-root-redo = - .label = Redo - .tooltip = Redo last step +button-editor-world-root-redo-tooltip = Redo last step dropdownbutton-editor-world-root-overlay-button = Overlays button-select-categories-buttons-all = All diff --git a/mods/cnc/uibits/chrome-2x.png b/mods/cnc/uibits/chrome-2x.png index 0777295606..ae768fa7c4 100644 Binary files a/mods/cnc/uibits/chrome-2x.png and b/mods/cnc/uibits/chrome-2x.png differ diff --git a/mods/cnc/uibits/chrome-3x.png b/mods/cnc/uibits/chrome-3x.png index afdedc0768..c201d71fa2 100644 Binary files a/mods/cnc/uibits/chrome-3x.png and b/mods/cnc/uibits/chrome-3x.png differ diff --git a/mods/cnc/uibits/chrome.png b/mods/cnc/uibits/chrome.png index 3574411bc8..c6d1b9c2c8 100644 Binary files a/mods/cnc/uibits/chrome.png and b/mods/cnc/uibits/chrome.png differ diff --git a/mods/common/chrome/editor.yaml b/mods/common/chrome/editor.yaml index f75dc12404..fb5c7998dd 100644 --- a/mods/common/chrome/editor.yaml +++ b/mods/common/chrome/editor.yaml @@ -765,62 +765,78 @@ Container@EDITOR_WORLD_ROOT: Y: 5 ImageCollection: editor ImageName: history - Button@UNDO_BUTTON: - X: 70 - Height: 25 - Width: 70 - Text: button-editor-world-root-undo.label - Font: Bold - Key: EditorUndo - TooltipTemplate: BUTTON_TOOLTIP - TooltipText: button-editor-world-root-undo.tooltip - TooltipContainer: TOOLTIP_CONTAINER - Button@REDO_BUTTON: - X: 150 - Height: 25 - Width: 70 - Text: button-editor-world-root-redo.label - Font: Bold - Key: EditorRedo - TooltipTemplate: BUTTON_TOOLTIP - TooltipText: button-editor-world-root-redo.tooltip - TooltipContainer: TOOLTIP_CONTAINER Button@COPY_BUTTON: - X: 230 + X: 60 + Width: 50 Height: 25 - Text: button-editor-world-root-copy.label - Width: 70 - Font: Bold Key: EditorCopy TooltipTemplate: BUTTON_TOOLTIP - TooltipText: button-editor-world-root-copy.tooltip + TooltipText: button-editor-world-root-copy-tooltip TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 17 + Y: 5 + ImageCollection: editor + ImageName: copy Button@PASTE_BUTTON: - X: 310 - Width: 70 + X: 110 + Width: 50 Height: 25 - Text: button-editor-world-root-paste.label - Font: Bold Key: EditorPaste TooltipTemplate: BUTTON_TOOLTIP - TooltipText: button-editor-world-root-paste.tooltip + TooltipText: button-editor-world-root-paste-tooltip TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 17 + Y: 4 + ImageCollection: editor + ImageName: paste + Button@UNDO_BUTTON: + X: 160 + Width: 50 + Height: 25 + Key: EditorUndo + TooltipTemplate: BUTTON_TOOLTIP + TooltipText: button-editor-world-root-undo-tooltip + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 17 + Y: 4 + ImageCollection: editor + ImageName: undo + Button@REDO_BUTTON: + X: 210 + Width: 50 + Height: 25 + Key: EditorRedo + TooltipTemplate: BUTTON_TOOLTIP + TooltipText: button-editor-world-root-redo-tooltip + TooltipContainer: TOOLTIP_CONTAINER + Children: + Image@ICON: + X: 17 + Y: 4 + ImageCollection: editor + ImageName: redo DropDownButton@OVERLAY_BUTTON: - X: 390 + X: 260 Width: 140 Height: 25 Text: dropdownbutton-editor-world-root-overlay-button Font: Bold Label@COORDINATE_LABEL: - X: 540 - Width: 50 + X: 410 + Width: 100 Height: 25 Align: Left Font: Bold Contrast: true Label@CASH_LABEL: - X: 655 - Width: 50 + X: 515 + Width: 100 Height: 25 Align: Left Font: Bold diff --git a/mods/common/fluent/chrome.ftl b/mods/common/fluent/chrome.ftl index f457ad2286..073f557d85 100644 --- a/mods/common/fluent/chrome.ftl +++ b/mods/common/fluent/chrome.ftl @@ -103,21 +103,13 @@ button-editor-world-root-options = .label = Menu .tooltip = Menu -button-editor-world-root-copy = - .label = Copy - .tooltip = Copy the selected area +button-editor-world-root-copy-tooltip = Copy the selected area -button-editor-world-root-paste = - .label = Paste - .tooltip = Paste the saved area +button-editor-world-root-paste-tooltip = Paste the saved area -button-editor-world-root-undo = - .label = Undo - .tooltip = Undo last step +button-editor-world-root-undo-tooltip = Undo last step -button-editor-world-root-redo = - .label = Redo - .tooltip = Redo last step +button-editor-world-root-redo-tooltip = Redo last step dropdownbutton-editor-world-root-overlay-button = Overlays button-select-categories-buttons-all = All diff --git a/mods/d2k/chrome.yaml b/mods/d2k/chrome.yaml index 59ba928a24..898ecd7fec 100644 --- a/mods/d2k/chrome.yaml +++ b/mods/d2k/chrome.yaml @@ -547,3 +547,7 @@ editor: tools: 34, 144, 16, 16 history: 136, 51, 16, 16 erase: 67, 144, 16, 16 + copy: 84, 144, 16, 16 + paste: 101, 144, 16, 16 + undo: 118, 144, 16, 16 + redo: 135, 144, 16, 16 diff --git a/mods/d2k/uibits/glyphs-2x.png b/mods/d2k/uibits/glyphs-2x.png index c4863cb669..d9ed253c22 100644 Binary files a/mods/d2k/uibits/glyphs-2x.png and b/mods/d2k/uibits/glyphs-2x.png differ diff --git a/mods/d2k/uibits/glyphs-3x.png b/mods/d2k/uibits/glyphs-3x.png index 061d09e10c..a54ef84903 100644 Binary files a/mods/d2k/uibits/glyphs-3x.png and b/mods/d2k/uibits/glyphs-3x.png differ diff --git a/mods/d2k/uibits/glyphs.png b/mods/d2k/uibits/glyphs.png index cc211c39ba..8e789ce02f 100644 Binary files a/mods/d2k/uibits/glyphs.png and b/mods/d2k/uibits/glyphs.png differ diff --git a/mods/ra/chrome.yaml b/mods/ra/chrome.yaml index 7af2062a8f..8204191afc 100644 --- a/mods/ra/chrome.yaml +++ b/mods/ra/chrome.yaml @@ -667,3 +667,7 @@ editor: tools: 136, 68, 16, 16 history: 136, 51, 16, 16 erase: 50, 187, 16, 16 + copy: 67, 187, 16, 16 + paste: 84, 187, 16, 16 + undo: 101, 187, 16, 16 + redo: 118, 187, 16, 16 diff --git a/mods/ra/uibits/glyphs-2x.png b/mods/ra/uibits/glyphs-2x.png index d6df5b4ac3..b101eb7e97 100644 Binary files a/mods/ra/uibits/glyphs-2x.png and b/mods/ra/uibits/glyphs-2x.png differ diff --git a/mods/ra/uibits/glyphs-3x.png b/mods/ra/uibits/glyphs-3x.png index a4bbb598c7..b90bd0887c 100644 Binary files a/mods/ra/uibits/glyphs-3x.png and b/mods/ra/uibits/glyphs-3x.png differ diff --git a/mods/ra/uibits/glyphs.png b/mods/ra/uibits/glyphs.png index 7d1112f0d4..c2eb9d4700 100644 Binary files a/mods/ra/uibits/glyphs.png and b/mods/ra/uibits/glyphs.png differ diff --git a/mods/ts/chrome.yaml b/mods/ts/chrome.yaml index 82d7c6cd7b..936a63b6a0 100644 --- a/mods/ts/chrome.yaml +++ b/mods/ts/chrome.yaml @@ -798,3 +798,7 @@ editor: tools: 34, 144, 16, 16 history: 136, 51, 16, 16 erase: 67, 144, 16, 16 + copy: 84, 144, 16, 16 + paste: 101, 144, 16, 16 + undo: 118, 144, 16, 16 + redo: 135, 144, 16, 16 diff --git a/mods/ts/uibits/glyphs-2x.png b/mods/ts/uibits/glyphs-2x.png index 7bffe03f4e..ebdeeff6a0 100644 Binary files a/mods/ts/uibits/glyphs-2x.png and b/mods/ts/uibits/glyphs-2x.png differ diff --git a/mods/ts/uibits/glyphs-3x.png b/mods/ts/uibits/glyphs-3x.png index dbcb22d100..03e01ea2f3 100644 Binary files a/mods/ts/uibits/glyphs-3x.png and b/mods/ts/uibits/glyphs-3x.png differ diff --git a/mods/ts/uibits/glyphs.png b/mods/ts/uibits/glyphs.png index 432cdb80d1..7ebc5965b9 100644 Binary files a/mods/ts/uibits/glyphs.png and b/mods/ts/uibits/glyphs.png differ