From fcf901fc6657fc57027dcf5f8bf0efbe589dbf7a Mon Sep 17 00:00:00 2001 From: Joacim Breiler Date: Mon, 27 May 2024 19:03:10 +0200 Subject: [PATCH] Added actions for jogging to the entities extents (#2528) --- .../actions/JogMachineAbstractAction.java | 52 +++++++++++ .../actions/JogMachineToCenterAction.java | 51 ++--------- .../JogMachineToLowerLeftCornerAction.java | 68 ++++++++++++++ .../JogMachineToLowerRightCornerAction.java | 68 ++++++++++++++ .../JogMachineToTopLeftCornerAction.java | 68 ++++++++++++++ .../JogMachineToTopRightCornerAction.java | 68 ++++++++++++++ .../nbp/designer/gui/PopupMenuFactory.java | 10 ++- .../ugs/nbp/designer/gui/ToolBox.java | 50 ++++++----- .../src/main/resources/img/cutfill24_dark.svg | 89 +++++++++++++++++++ .../resources/img/cutfill24_disabled_dark.svg | 89 +++++++++++++++++++ .../src/main/resources/img/cutfill32_dark.svg | 89 +++++++++++++++++++ .../resources/img/cutfill32_disabled_dark.svg | 89 +++++++++++++++++++ .../src/main/resources/img/cutfill_dark.svg | 89 +++++++++++++++++++ .../resources/img/cutfill_disabled_dark.svg | 89 +++++++++++++++++++ .../main/resources/img/jog-to-lower-left.svg | 58 ++++++++++++ .../resources/img/jog-to-lower-left24.svg | 58 ++++++++++++ .../img/jog-to-lower-left24_dark.svg | 58 ++++++++++++ .../img/jog-to-lower-left24_disabled_dark.svg | 58 ++++++++++++ .../resources/img/jog-to-lower-left32.svg | 58 ++++++++++++ .../img/jog-to-lower-left32_dark.svg | 58 ++++++++++++ .../img/jog-to-lower-left32_disabled_dark.svg | 58 ++++++++++++ .../resources/img/jog-to-lower-left_dark.svg | 58 ++++++++++++ .../img/jog-to-lower-left_disabled_dark.svg | 58 ++++++++++++ .../main/resources/img/jog-to-lower-right.svg | 58 ++++++++++++ .../resources/img/jog-to-lower-right24.svg | 58 ++++++++++++ .../img/jog-to-lower-right24_dark.svg | 58 ++++++++++++ .../jog-to-lower-right24_disabled_dark.svg | 58 ++++++++++++ .../resources/img/jog-to-lower-right32.svg | 58 ++++++++++++ .../img/jog-to-lower-right32_dark.svg | 58 ++++++++++++ .../jog-to-lower-right32_disabled_dark.svg | 58 ++++++++++++ .../resources/img/jog-to-lower-right_dark.svg | 58 ++++++++++++ .../img/jog-to-lower-right_disabled_dark.svg | 58 ++++++++++++ .../main/resources/img/jog-to-top-left.svg | 58 ++++++++++++ .../main/resources/img/jog-to-top-left24.svg | 58 ++++++++++++ .../resources/img/jog-to-top-left24_dark.svg | 58 ++++++++++++ .../img/jog-to-top-left24_disabled_dark.svg | 58 ++++++++++++ .../main/resources/img/jog-to-top-left32.svg | 58 ++++++++++++ .../resources/img/jog-to-top-left32_dark.svg | 58 ++++++++++++ .../img/jog-to-top-left32_disabled_dark.svg | 58 ++++++++++++ .../resources/img/jog-to-top-left_dark.svg | 58 ++++++++++++ .../img/jog-to-top-left_disabled_dark.svg | 58 ++++++++++++ .../main/resources/img/jog-to-top-right.svg | 58 ++++++++++++ .../main/resources/img/jog-to-top-right24.svg | 58 ++++++++++++ .../resources/img/jog-to-top-right24_dark.svg | 58 ++++++++++++ .../img/jog-to-top-right24_disabled_dark.svg | 58 ++++++++++++ .../main/resources/img/jog-to-top-right32.svg | 58 ++++++++++++ .../resources/img/jog-to-top-right32_dark.svg | 58 ++++++++++++ .../img/jog-to-top-right32_disabled_dark.svg | 58 ++++++++++++ .../resources/img/jog-to-top-right_dark.svg | 58 ++++++++++++ .../img/jog-to-top-right_disabled_dark.svg | 58 ++++++++++++ .../src/main/resources/img/jog-to.svg | 31 ++++--- .../src/main/resources/img/jog-to24.svg | 39 ++++---- .../src/main/resources/img/jog-to24_dark.svg | 39 ++++---- .../resources/img/jog-to24_disabled_dark.svg | 39 ++++---- .../src/main/resources/img/jog-to32.svg | 77 ++++++++++++++++ .../src/main/resources/img/jog-to32_dark.svg | 77 ++++++++++++++++ .../resources/img/jog-to32_disabled_dark.svg | 77 ++++++++++++++++ .../src/main/resources/img/jog-to_dark.svg | 31 ++++--- .../resources/img/jog-to_disabled_dark.svg | 31 ++++--- 59 files changed, 3331 insertions(+), 167 deletions(-) create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineAbstractAction.java create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToLowerLeftCornerAction.java create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToLowerRightCornerAction.java create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToTopLeftCornerAction.java create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToTopRightCornerAction.java create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill24_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill24_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill32_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill32_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left24.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left24_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left24_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left32.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left32_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left32_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right24.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right24_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right24_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right32.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right32_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right32_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left24.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left24_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left24_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left32.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left32_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left32_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right24.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right24_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right24_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right32.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right32_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right32_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right_disabled_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to32.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to32_dark.svg create mode 100644 ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to32_disabled_dark.svg diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineAbstractAction.java b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineAbstractAction.java new file mode 100644 index 0000000000..5091e3ad9e --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineAbstractAction.java @@ -0,0 +1,52 @@ +package com.willwinder.ugs.nbp.designer.actions; + +import com.willwinder.ugs.nbp.designer.entities.selection.SelectionEvent; +import com.willwinder.ugs.nbp.designer.entities.selection.SelectionListener; +import com.willwinder.ugs.nbp.designer.entities.selection.SelectionManager; +import com.willwinder.ugs.nbp.designer.logic.ControllerFactory; +import com.willwinder.ugs.nbp.lib.lookup.CentralLookup; +import com.willwinder.universalgcodesender.listeners.ControllerState; +import com.willwinder.universalgcodesender.listeners.UGSEventListener; +import com.willwinder.universalgcodesender.model.BackendAPI; +import com.willwinder.universalgcodesender.model.UGSEvent; +import com.willwinder.universalgcodesender.model.events.ControllerStateEvent; + +import javax.swing.SwingUtilities; + +public abstract class JogMachineAbstractAction extends AbstractDesignAction implements SelectionListener, UGSEventListener { + + private final transient BackendAPI backend; + + protected JogMachineAbstractAction() { + backend = CentralLookup.getDefault().lookup(BackendAPI.class); + backend.addUGSEventListener(this); + registerControllerListener(); + setEnabled(isEnabled()); + } + + private void registerControllerListener() { + SelectionManager selectionManager = ControllerFactory.getController().getSelectionManager(); + selectionManager.addSelectionListener(this); + setEnabled(isEnabled()); + } + + @Override + public boolean isEnabled() { + SelectionManager selectionManager = ControllerFactory.getController().getSelectionManager(); + boolean hasSelection = !selectionManager.getSelection().isEmpty(); + boolean isIdle = backend.getControllerState() == ControllerState.IDLE; + return hasSelection && isIdle; + } + + @Override + public void onSelectionEvent(SelectionEvent selectionEvent) { + setEnabled(isEnabled()); + } + + @Override + public void UGSEvent(UGSEvent event) { + if (event instanceof ControllerStateEvent) { + SwingUtilities.invokeLater(() -> setEnabled(isEnabled())); + } + } +} diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToCenterAction.java b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToCenterAction.java index 0dd70dd321..b002dfa708 100644 --- a/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToCenterAction.java +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToCenterAction.java @@ -1,5 +1,5 @@ /* - Copyright 2023 Will Winder + Copyright 2023-2024 Will Winder This file is part of Universal Gcode Sender (UGS). @@ -18,30 +18,20 @@ This file is part of Universal Gcode Sender (UGS). */ package com.willwinder.ugs.nbp.designer.actions; -import com.willwinder.ugs.nbp.designer.entities.selection.SelectionEvent; -import com.willwinder.ugs.nbp.designer.entities.selection.SelectionListener; -import com.willwinder.ugs.nbp.designer.entities.selection.SelectionManager; import com.willwinder.ugs.nbp.designer.logic.ControllerFactory; import com.willwinder.ugs.nbp.lib.lookup.CentralLookup; import com.willwinder.ugs.nbp.lib.services.LocalizingService; -import com.willwinder.universalgcodesender.listeners.ControllerState; -import com.willwinder.universalgcodesender.listeners.UGSEventListener; -import com.willwinder.universalgcodesender.model.BackendAPI; import com.willwinder.universalgcodesender.model.PartialPosition; -import com.willwinder.universalgcodesender.model.UGSEvent; -import com.willwinder.universalgcodesender.model.events.ControllerStateEvent; +import static com.willwinder.universalgcodesender.model.UnitUtils.Units.MM; import com.willwinder.universalgcodesender.services.JogService; import com.willwinder.universalgcodesender.utils.ThreadHelper; import org.openide.awt.ActionID; import org.openide.awt.ActionRegistration; import org.openide.util.ImageUtilities; -import javax.swing.SwingUtilities; import java.awt.event.ActionEvent; import java.awt.geom.Point2D; -import static com.willwinder.universalgcodesender.model.UnitUtils.Units.MM; - /** * An action that will jog the machine to the center of the selected objects * @@ -52,38 +42,19 @@ This file is part of Universal Gcode Sender (UGS). id = "JogMachineToCenterAction") @ActionRegistration( iconBase = JogMachineToCenterAction.SMALL_ICON_PATH, - displayName = "Jog machine to center", + displayName = "Jog to center", lazy = false) -public class JogMachineToCenterAction extends AbstractDesignAction implements SelectionListener, UGSEventListener { +public class JogMachineToCenterAction extends JogMachineAbstractAction { public static final String SMALL_ICON_PATH = "img/jog-to.svg"; public static final String LARGE_ICON_PATH = "img/jog-to24.svg"; - private final transient BackendAPI backend; public JogMachineToCenterAction() { + super(); putValue("menuText", "Jog machine to center"); putValue(NAME, "Jog machine to center"); putValue("iconBase", SMALL_ICON_PATH); putValue(SMALL_ICON, ImageUtilities.loadImageIcon(SMALL_ICON_PATH, false)); putValue(LARGE_ICON_KEY, ImageUtilities.loadImageIcon(LARGE_ICON_PATH, false)); - - backend = CentralLookup.getDefault().lookup(BackendAPI.class); - backend.addUGSEventListener(this); - registerControllerListener(); - setEnabled(isEnabled()); - } - - private void registerControllerListener() { - SelectionManager selectionManager = ControllerFactory.getController().getSelectionManager(); - selectionManager.addSelectionListener(this); - setEnabled(isEnabled()); - } - - @Override - public boolean isEnabled() { - SelectionManager selectionManager = ControllerFactory.getController().getSelectionManager(); - boolean hasSelection = !selectionManager.getSelection().isEmpty(); - boolean isIdle = backend.getControllerState() == ControllerState.IDLE; - return hasSelection && isIdle; } @Override @@ -96,16 +67,4 @@ public void actionPerformed(ActionEvent e) { jogService.jogTo(centerPosition); }); } - - @Override - public void onSelectionEvent(SelectionEvent selectionEvent) { - setEnabled(isEnabled()); - } - - @Override - public void UGSEvent(UGSEvent event) { - if (event instanceof ControllerStateEvent) { - SwingUtilities.invokeLater(() -> setEnabled(isEnabled())); - } - } } diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToLowerLeftCornerAction.java b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToLowerLeftCornerAction.java new file mode 100644 index 0000000000..5de4488b01 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToLowerLeftCornerAction.java @@ -0,0 +1,68 @@ +/* + Copyright 2023 Will Winder + + This file is part of Universal Gcode Sender (UGS). + + UGS is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + UGS is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with UGS. If not, see . + */ +package com.willwinder.ugs.nbp.designer.actions; + +import com.willwinder.ugs.nbp.designer.logic.ControllerFactory; +import com.willwinder.ugs.nbp.lib.lookup.CentralLookup; +import com.willwinder.ugs.nbp.lib.services.LocalizingService; +import com.willwinder.universalgcodesender.model.PartialPosition; +import static com.willwinder.universalgcodesender.model.UnitUtils.Units.MM; +import com.willwinder.universalgcodesender.services.JogService; +import com.willwinder.universalgcodesender.utils.ThreadHelper; +import org.openide.awt.ActionID; +import org.openide.awt.ActionRegistration; +import org.openide.util.ImageUtilities; + +import java.awt.event.ActionEvent; +import java.awt.geom.Rectangle2D; + +/** + * @author Joacim Breiler + */ +@ActionID( + category = LocalizingService.CATEGORY_DESIGNER, + id = "JogMachineToLowerLeftCornerAction") +@ActionRegistration( + iconBase = JogMachineToLowerLeftCornerAction.SMALL_ICON_PATH, + displayName = "Jog machine to lower left", + lazy = false) +public class JogMachineToLowerLeftCornerAction extends JogMachineAbstractAction { + public static final String SMALL_ICON_PATH = "img/jog-to-lower-left.svg"; + public static final String LARGE_ICON_PATH = "img/jog-to-lower-left24.svg"; + + public JogMachineToLowerLeftCornerAction() { + super(); + putValue("menuText", "Jog to lower left corner"); + putValue(NAME, "Jog to lower left corner"); + putValue("iconBase", SMALL_ICON_PATH); + putValue(SMALL_ICON, ImageUtilities.loadImageIcon(SMALL_ICON_PATH, false)); + putValue(LARGE_ICON_KEY, ImageUtilities.loadImageIcon(LARGE_ICON_PATH, false)); + } + + @Override + public void actionPerformed(ActionEvent e) { + ThreadHelper.invokeLater(() -> { + Rectangle2D bounds = ControllerFactory.getController().getSelectionManager().getBounds(); + PartialPosition centerPosition = new PartialPosition(bounds.getMinX(), bounds.getMinY(), MM); + + JogService jogService = CentralLookup.getDefault().lookup(JogService.class); + jogService.jogTo(centerPosition); + }); + } +} diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToLowerRightCornerAction.java b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToLowerRightCornerAction.java new file mode 100644 index 0000000000..136fbf34ed --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToLowerRightCornerAction.java @@ -0,0 +1,68 @@ +/* + Copyright 2023 Will Winder + + This file is part of Universal Gcode Sender (UGS). + + UGS is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + UGS is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with UGS. If not, see . + */ +package com.willwinder.ugs.nbp.designer.actions; + +import com.willwinder.ugs.nbp.designer.logic.ControllerFactory; +import com.willwinder.ugs.nbp.lib.lookup.CentralLookup; +import com.willwinder.ugs.nbp.lib.services.LocalizingService; +import com.willwinder.universalgcodesender.model.PartialPosition; +import static com.willwinder.universalgcodesender.model.UnitUtils.Units.MM; +import com.willwinder.universalgcodesender.services.JogService; +import com.willwinder.universalgcodesender.utils.ThreadHelper; +import org.openide.awt.ActionID; +import org.openide.awt.ActionRegistration; +import org.openide.util.ImageUtilities; + +import java.awt.event.ActionEvent; +import java.awt.geom.Rectangle2D; + +/** + * @author Joacim Breiler + */ +@ActionID( + category = LocalizingService.CATEGORY_DESIGNER, + id = "JogMachineToLowerRightCornerAction") +@ActionRegistration( + iconBase = JogMachineToLowerRightCornerAction.SMALL_ICON_PATH, + displayName = "Jog machine to lower right", + lazy = false) +public class JogMachineToLowerRightCornerAction extends JogMachineAbstractAction { + public static final String SMALL_ICON_PATH = "img/jog-to-lower-right.svg"; + public static final String LARGE_ICON_PATH = "img/jog-to-lower-right24.svg"; + + public JogMachineToLowerRightCornerAction() { + super(); + putValue("menuText", "Jog to lower right corner"); + putValue(NAME, "Jog to lower right corner"); + putValue("iconBase", SMALL_ICON_PATH); + putValue(SMALL_ICON, ImageUtilities.loadImageIcon(SMALL_ICON_PATH, false)); + putValue(LARGE_ICON_KEY, ImageUtilities.loadImageIcon(LARGE_ICON_PATH, false)); + } + + @Override + public void actionPerformed(ActionEvent e) { + ThreadHelper.invokeLater(() -> { + Rectangle2D bounds = ControllerFactory.getController().getSelectionManager().getBounds(); + PartialPosition centerPosition = new PartialPosition(bounds.getMaxX(), bounds.getMinY(), MM); + + JogService jogService = CentralLookup.getDefault().lookup(JogService.class); + jogService.jogTo(centerPosition); + }); + } +} diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToTopLeftCornerAction.java b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToTopLeftCornerAction.java new file mode 100644 index 0000000000..4a8ea4d0a4 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToTopLeftCornerAction.java @@ -0,0 +1,68 @@ +/* + Copyright 2023 Will Winder + + This file is part of Universal Gcode Sender (UGS). + + UGS is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + UGS is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with UGS. If not, see . + */ +package com.willwinder.ugs.nbp.designer.actions; + +import com.willwinder.ugs.nbp.designer.logic.ControllerFactory; +import com.willwinder.ugs.nbp.lib.lookup.CentralLookup; +import com.willwinder.ugs.nbp.lib.services.LocalizingService; +import com.willwinder.universalgcodesender.model.PartialPosition; +import static com.willwinder.universalgcodesender.model.UnitUtils.Units.MM; +import com.willwinder.universalgcodesender.services.JogService; +import com.willwinder.universalgcodesender.utils.ThreadHelper; +import org.openide.awt.ActionID; +import org.openide.awt.ActionRegistration; +import org.openide.util.ImageUtilities; + +import java.awt.event.ActionEvent; +import java.awt.geom.Rectangle2D; + +/** + * @author Joacim Breiler + */ +@ActionID( + category = LocalizingService.CATEGORY_DESIGNER, + id = "JogMachineToTopLeftCornerAction") +@ActionRegistration( + iconBase = JogMachineToTopLeftCornerAction.SMALL_ICON_PATH, + displayName = "Jog machine to top left", + lazy = false) +public class JogMachineToTopLeftCornerAction extends JogMachineAbstractAction { + public static final String SMALL_ICON_PATH = "img/jog-to-top-left.svg"; + public static final String LARGE_ICON_PATH = "img/jog-to-top-left24.svg"; + + public JogMachineToTopLeftCornerAction() { + super(); + putValue("menuText", "Jog to top left corner"); + putValue(NAME, "Jog to top left corner"); + putValue("iconBase", SMALL_ICON_PATH); + putValue(SMALL_ICON, ImageUtilities.loadImageIcon(SMALL_ICON_PATH, false)); + putValue(LARGE_ICON_KEY, ImageUtilities.loadImageIcon(LARGE_ICON_PATH, false)); + } + + @Override + public void actionPerformed(ActionEvent e) { + ThreadHelper.invokeLater(() -> { + Rectangle2D bounds = ControllerFactory.getController().getSelectionManager().getBounds(); + PartialPosition centerPosition = new PartialPosition(bounds.getMinX(), bounds.getMaxY(), MM); + + JogService jogService = CentralLookup.getDefault().lookup(JogService.class); + jogService.jogTo(centerPosition); + }); + } +} diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToTopRightCornerAction.java b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToTopRightCornerAction.java new file mode 100644 index 0000000000..bdfa9e296e --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/actions/JogMachineToTopRightCornerAction.java @@ -0,0 +1,68 @@ +/* + Copyright 2023 Will Winder + + This file is part of Universal Gcode Sender (UGS). + + UGS is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + UGS is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with UGS. If not, see . + */ +package com.willwinder.ugs.nbp.designer.actions; + +import com.willwinder.ugs.nbp.designer.logic.ControllerFactory; +import com.willwinder.ugs.nbp.lib.lookup.CentralLookup; +import com.willwinder.ugs.nbp.lib.services.LocalizingService; +import com.willwinder.universalgcodesender.model.PartialPosition; +import static com.willwinder.universalgcodesender.model.UnitUtils.Units.MM; +import com.willwinder.universalgcodesender.services.JogService; +import com.willwinder.universalgcodesender.utils.ThreadHelper; +import org.openide.awt.ActionID; +import org.openide.awt.ActionRegistration; +import org.openide.util.ImageUtilities; + +import java.awt.event.ActionEvent; +import java.awt.geom.Rectangle2D; + +/** + * @author Joacim Breiler + */ +@ActionID( + category = LocalizingService.CATEGORY_DESIGNER, + id = "JogMachineToTopRightCornerAction") +@ActionRegistration( + iconBase = JogMachineToTopRightCornerAction.SMALL_ICON_PATH, + displayName = "Jog machine to top right", + lazy = false) +public class JogMachineToTopRightCornerAction extends JogMachineAbstractAction { + public static final String SMALL_ICON_PATH = "img/jog-to-top-right.svg"; + public static final String LARGE_ICON_PATH = "img/jog-to-top-right24.svg"; + + public JogMachineToTopRightCornerAction() { + super(); + putValue("menuText", "Jog to top right corner"); + putValue(NAME, "Jog to top right corner"); + putValue("iconBase", SMALL_ICON_PATH); + putValue(SMALL_ICON, ImageUtilities.loadImageIcon(SMALL_ICON_PATH, false)); + putValue(LARGE_ICON_KEY, ImageUtilities.loadImageIcon(LARGE_ICON_PATH, false)); + } + + @Override + public void actionPerformed(ActionEvent e) { + ThreadHelper.invokeLater(() -> { + Rectangle2D bounds = ControllerFactory.getController().getSelectionManager().getBounds(); + PartialPosition centerPosition = new PartialPosition(bounds.getMaxX(), bounds.getMaxY(), MM); + + JogService jogService = CentralLookup.getDefault().lookup(JogService.class); + jogService.jogTo(centerPosition); + }); + } +} diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/PopupMenuFactory.java b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/PopupMenuFactory.java index 91204116c7..a46e0687c3 100644 --- a/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/PopupMenuFactory.java +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/PopupMenuFactory.java @@ -21,12 +21,16 @@ This file is part of Universal Gcode Sender (UGS). import com.willwinder.ugs.nbp.designer.actions.BreakApartAction; import com.willwinder.ugs.nbp.designer.actions.ClearSelectionAction; import com.willwinder.ugs.nbp.designer.actions.CopyAction; -import com.willwinder.ugs.nbp.designer.actions.GroupAction; import com.willwinder.ugs.nbp.designer.actions.DeleteAction; import com.willwinder.ugs.nbp.designer.actions.FlipHorizontallyAction; import com.willwinder.ugs.nbp.designer.actions.FlipVerticallyAction; +import com.willwinder.ugs.nbp.designer.actions.GroupAction; import com.willwinder.ugs.nbp.designer.actions.IntersectionAction; import com.willwinder.ugs.nbp.designer.actions.JogMachineToCenterAction; +import com.willwinder.ugs.nbp.designer.actions.JogMachineToLowerLeftCornerAction; +import com.willwinder.ugs.nbp.designer.actions.JogMachineToLowerRightCornerAction; +import com.willwinder.ugs.nbp.designer.actions.JogMachineToTopLeftCornerAction; +import com.willwinder.ugs.nbp.designer.actions.JogMachineToTopRightCornerAction; import com.willwinder.ugs.nbp.designer.actions.PasteAction; import com.willwinder.ugs.nbp.designer.actions.SelectAllAction; import com.willwinder.ugs.nbp.designer.actions.SubtractAction; @@ -71,6 +75,10 @@ public static JPopupMenu createPopupMenu() { popupMenu.add(new ToggleHidden()); popupMenu.addSeparator(); popupMenu.add(new JogMachineToCenterAction()); + popupMenu.add(new JogMachineToLowerLeftCornerAction()); + popupMenu.add(new JogMachineToLowerRightCornerAction()); + popupMenu.add(new JogMachineToTopLeftCornerAction()); + popupMenu.add(new JogMachineToTopRightCornerAction()); return popupMenu; } } diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/ToolBox.java b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/ToolBox.java index 50cf398cd9..8a939d3109 100644 --- a/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/ToolBox.java +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/ToolBox.java @@ -19,24 +19,7 @@ This file is part of Universal Gcode Sender (UGS). package com.willwinder.ugs.nbp.designer.gui; import com.willwinder.ugs.nbp.core.ui.ToolBar; -import com.willwinder.ugs.nbp.designer.actions.BreakApartAction; -import com.willwinder.ugs.nbp.designer.actions.FlipHorizontallyAction; -import com.willwinder.ugs.nbp.designer.actions.FlipVerticallyAction; -import com.willwinder.ugs.nbp.designer.actions.IntersectionAction; -import com.willwinder.ugs.nbp.designer.actions.JogMachineToCenterAction; -import com.willwinder.ugs.nbp.designer.actions.MultiplyAction; -import com.willwinder.ugs.nbp.designer.actions.SubtractAction; -import com.willwinder.ugs.nbp.designer.actions.ToggleHidden; -import com.willwinder.ugs.nbp.designer.actions.ToolClipartAction; -import com.willwinder.ugs.nbp.designer.actions.ToolDrawCircleAction; -import com.willwinder.ugs.nbp.designer.actions.ToolDrawPointAction; -import com.willwinder.ugs.nbp.designer.actions.ToolDrawRectangleAction; -import com.willwinder.ugs.nbp.designer.actions.ToolDrawTextAction; -import com.willwinder.ugs.nbp.designer.actions.ToolImportAction; -import com.willwinder.ugs.nbp.designer.actions.ToolSelectAction; -import com.willwinder.ugs.nbp.designer.actions.ToolZoomAction; -import com.willwinder.ugs.nbp.designer.actions.TraceImageAction; -import com.willwinder.ugs.nbp.designer.actions.UnionAction; +import com.willwinder.ugs.nbp.designer.actions.*; import com.willwinder.ugs.nbp.designer.logic.Controller; import com.willwinder.ugs.nbp.designer.logic.ControllerEventType; import org.openide.awt.DropDownButtonFactory; @@ -123,12 +106,7 @@ public ToolBox(Controller controller) { multiply.setBorderPainted(false); add(multiply); - JButton jogTo = new JButton(new JogMachineToCenterAction()); - jogTo.setText(""); - jogTo.setToolTipText("Jog machine to center"); - jogTo.setBorderPainted(false); - add(jogTo); - + add(createJogDropDownButton()); addSeparator(); JToggleButton zoom = new JToggleButton(new ToolZoomAction()); @@ -167,6 +145,30 @@ public ToolBox(Controller controller) { }); } + private JToggleButton createJogDropDownButton() { + ActionListener toolMenuListener = e -> { + if (toolDropDownButton == null) { + return; + } + + JMenuItem source = (JMenuItem) e.getSource(); + toolDropDownButton.setIcon((Icon) source.getAction().getValue(Action.LARGE_ICON_KEY)); + toolDropDownButton.setSelected(true); + toolDropDownButton.setAction(source.getAction()); + }; + + JogMachineToCenterAction toolDrawRectangleAction = new JogMachineToCenterAction(); + JPopupMenu popupMenu = new JPopupMenu(); + addDropDownAction(popupMenu, toolDrawRectangleAction, toolMenuListener); + addDropDownAction(popupMenu, new JogMachineToTopLeftCornerAction(), toolMenuListener); + addDropDownAction(popupMenu, new JogMachineToTopRightCornerAction(), toolMenuListener); + addDropDownAction(popupMenu, new JogMachineToLowerLeftCornerAction(), toolMenuListener); + addDropDownAction(popupMenu, new JogMachineToLowerRightCornerAction(), toolMenuListener); + toolDropDownButton = DropDownButtonFactory.createDropDownToggleButton(ImageUtilities.loadImageIcon(JogMachineToCenterAction.LARGE_ICON_PATH, false), popupMenu); + toolDropDownButton.setAction(toolDrawRectangleAction); + return toolDropDownButton; + } + private JToggleButton createToolDropDownButton() { // An action listener that listens to the popup menu items and changes the current action ActionListener toolMenuListener = e -> { diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill24_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill24_dark.svg new file mode 100644 index 0000000000..5affcebb5d --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill24_dark.svg @@ -0,0 +1,89 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill24_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill24_disabled_dark.svg new file mode 100644 index 0000000000..80b5b6c0ce --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill24_disabled_dark.svg @@ -0,0 +1,89 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill32_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill32_dark.svg new file mode 100644 index 0000000000..2bcc04fa57 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill32_dark.svg @@ -0,0 +1,89 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill32_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill32_disabled_dark.svg new file mode 100644 index 0000000000..7b819acc10 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill32_disabled_dark.svg @@ -0,0 +1,89 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill_dark.svg new file mode 100644 index 0000000000..c535c0de7a --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill_dark.svg @@ -0,0 +1,89 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill_disabled_dark.svg new file mode 100644 index 0000000000..4dc1b5a281 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/cutfill_disabled_dark.svg @@ -0,0 +1,89 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left.svg new file mode 100644 index 0000000000..89ff5ed18f --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left24.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left24.svg new file mode 100644 index 0000000000..b1bb13b364 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left24.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left24_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left24_dark.svg new file mode 100644 index 0000000000..bc47ff9686 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left24_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left24_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left24_disabled_dark.svg new file mode 100644 index 0000000000..68313b1df3 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left24_disabled_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left32.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left32.svg new file mode 100644 index 0000000000..7f3549b985 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left32.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left32_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left32_dark.svg new file mode 100644 index 0000000000..4ca11e294d --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left32_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left32_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left32_disabled_dark.svg new file mode 100644 index 0000000000..fc2bf8e017 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left32_disabled_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left_dark.svg new file mode 100644 index 0000000000..77287bff77 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left_disabled_dark.svg new file mode 100644 index 0000000000..078278c8ca --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-left_disabled_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right.svg new file mode 100644 index 0000000000..2d33b38aa4 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right24.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right24.svg new file mode 100644 index 0000000000..8e31cf874d --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right24.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right24_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right24_dark.svg new file mode 100644 index 0000000000..0404ec1444 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right24_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right24_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right24_disabled_dark.svg new file mode 100644 index 0000000000..f7618ff619 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right24_disabled_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right32.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right32.svg new file mode 100644 index 0000000000..4b1a1c4d95 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right32.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right32_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right32_dark.svg new file mode 100644 index 0000000000..d3df13b790 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right32_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right32_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right32_disabled_dark.svg new file mode 100644 index 0000000000..1df3e6a987 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right32_disabled_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right_dark.svg new file mode 100644 index 0000000000..2ffa8116e6 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right_disabled_dark.svg new file mode 100644 index 0000000000..7e2e398c6a --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-lower-right_disabled_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left.svg new file mode 100644 index 0000000000..8a89c19143 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left24.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left24.svg new file mode 100644 index 0000000000..0b22b1a8d0 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left24.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left24_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left24_dark.svg new file mode 100644 index 0000000000..e441117b98 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left24_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left24_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left24_disabled_dark.svg new file mode 100644 index 0000000000..129618364a --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left24_disabled_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left32.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left32.svg new file mode 100644 index 0000000000..28946002d3 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left32.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left32_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left32_dark.svg new file mode 100644 index 0000000000..7ff19f4981 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left32_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left32_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left32_disabled_dark.svg new file mode 100644 index 0000000000..d240827785 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left32_disabled_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left_dark.svg new file mode 100644 index 0000000000..8528685026 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left_disabled_dark.svg new file mode 100644 index 0000000000..804ff97afa --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-left_disabled_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right.svg new file mode 100644 index 0000000000..dc94724e46 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right24.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right24.svg new file mode 100644 index 0000000000..1d439e8048 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right24.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right24_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right24_dark.svg new file mode 100644 index 0000000000..8bc4880b7f --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right24_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right24_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right24_disabled_dark.svg new file mode 100644 index 0000000000..10cf155d10 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right24_disabled_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right32.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right32.svg new file mode 100644 index 0000000000..0db2e1a240 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right32.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right32_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right32_dark.svg new file mode 100644 index 0000000000..a8028c13af --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right32_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right32_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right32_disabled_dark.svg new file mode 100644 index 0000000000..ad08b58c5d --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right32_disabled_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right_dark.svg new file mode 100644 index 0000000000..bf34e61a8f --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right_disabled_dark.svg new file mode 100644 index 0000000000..0ea8adea81 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to-top-right_disabled_dark.svg @@ -0,0 +1,58 @@ + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to.svg index 742c6a183b..d62cf4c6a3 100644 --- a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to.svg +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to.svg @@ -6,7 +6,7 @@ sodipodi:docname="jog-to.svg" width="16" height="16" - inkscape:version="1.1-dev (0486c1a, 2020-10-10)" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -42,33 +42,36 @@ showgrid="false" width="16px" inkscape:zoom="22.1" - inkscape:cx="14.660633" - inkscape:cy="4.0045249" - inkscape:window-x="219" - inkscape:window-y="104" + inkscape:cx="8.6877828" + inkscape:cy="4.0271493" + inkscape:window-x="441" + inkscape:window-y="253" inkscape:window-maximized="0" inkscape:current-layer="svg832" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" /> + fill="currentColor" + d="m 15.625,2.999998 c 0.207094,0 0.375,-0.167906 0.375,-0.375 V 0.374999 C 16,0.167906 15.832094,0 15.625,0 h -2.25 C 13.167906,0 13,0.167906 13,0.374999 v 0.375 H 2.9999999 v -0.375 C 2.9999999,0.167906 2.8320938,0 2.625,0 H 0.375 C 0.1679062,0 0,0.167906 0,0.374999 v 2.249999 c 0,0.207094 0.1679062,0.375 0.375,0.375 H 0.75 V 13 H 0.375 C 0.1679062,13 0,13.167906 0,13.374999 V 15.625 C 0,15.832093 0.1679062,16 0.375,16 h 2.25 c 0.2070938,0 0.3749999,-0.167907 0.3749999,-0.375 V 15.25 H 13 v 0.375 C 13,15.832093 13.167906,16 13.375,16 h 2.25 C 15.832094,16 16,15.832093 16,15.625 V 13.374999 C 16,13.167906 15.832094,13 15.625,13 H 15.25 V 2.999998 Z M 14,0.99999804 h 1 V 1.999998 h -1 z m -13,0 H 2 V 1.999998 H 1 Z M 2,15 H 1 v -1.000001 h 1 z m 13,0 h -1 v -1.000001 h 1 z M 13.75,13 H 13.375 C 13.167906,13 13,13.167906 13,13.374999 V 13.75 H 2.9999999 V 13.374999 C 2.9999999,13.167906 2.8320938,13 2.625,13 H 2.25 V 2.999998 h 0.375 c 0.2070938,0 0.3749999,-0.167906 0.3749999,-0.375 v -0.375 H 13 v 0.375 c 0,0.207094 0.167906,0.375 0.375,0.375 h 0.375 z" + id="path830-6" + style="fill:#353a40;fill-opacity:1;stroke-width:0.499997" + sodipodi:nodetypes="ssssssccssssssccssssssccssssssccscccccccccccccccccccccssccssccssccsscc" /> diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to24.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to24.svg index c7cee6ca3a..642b4adf98 100644 --- a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to24.svg +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to24.svg @@ -6,7 +6,7 @@ sodipodi:docname="jog-to24.svg" width="24" height="24" - inkscape:version="1.1-dev (0486c1a, 2020-10-10)" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -40,35 +40,38 @@ inkscape:window-height="963" id="namedview834" showgrid="false" - width="24px" - inkscape:zoom="25.386234" - inkscape:cx="14.653611" - inkscape:cy="9.0797242" - inkscape:window-x="219" - inkscape:window-y="104" + width="16px" + inkscape:zoom="22.1" + inkscape:cx="8.6877828" + inkscape:cy="4.0271493" + inkscape:window-x="441" + inkscape:window-y="253" inkscape:window-maximized="0" inkscape:current-layer="svg832" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" /> + fill="currentColor" + d="M 23.4375,4.499997 C 23.748141,4.499997 24,4.248138 24,3.937497 V 0.5624985 C 24,0.251859 23.748141,0 23.4375,0 h -3.375 C 19.751859,0 19.5,0.251859 19.5,0.5624985 v 0.5625 H 4.4999998 v -0.5625 C 4.4999998,0.251859 4.2481407,0 3.9375,0 H 0.5625 C 0.2518593,0 0,0.251859 0,0.5624985 V 3.937497 c 0,0.310641 0.2518593,0.5625 0.5625,0.5625 H 1.125 V 19.5 H 0.5625 C 0.2518593,19.5 0,19.751859 0,20.062498 V 23.4375 C 0,23.748139 0.2518593,24 0.5625,24 h 3.375 c 0.3106407,0 0.5624998,-0.251861 0.5624998,-0.5625 V 22.875 H 19.5 v 0.5625 C 19.5,23.748139 19.751859,24 20.0625,24 h 3.375 C 23.748141,24 24,23.748139 24,23.4375 V 20.062498 C 24,19.751859 23.748141,19.5 23.4375,19.5 H 22.875 V 4.499997 Z M 21,1.4999971 h 1.5 V 2.999997 H 21 Z m -19.5,0 H 3 V 2.999997 H 1.5 Z M 3,22.5 H 1.5 V 20.999998 H 3 Z m 19.5,0 H 21 v -1.500002 h 1.5 z m -1.875,-3 H 20.0625 C 19.751859,19.5 19.5,19.751859 19.5,20.062498 V 20.625 H 4.4999998 V 20.062498 C 4.4999998,19.751859 4.2481407,19.5 3.9375,19.5 H 3.375 V 4.499997 h 0.5625 c 0.3106407,0 0.5624998,-0.251859 0.5624998,-0.5625 v -0.5625 H 19.5 v 0.5625 c 0,0.310641 0.251859,0.5625 0.5625,0.5625 h 0.5625 z" + id="path830-6" + style="fill:#353a40;fill-opacity:1;stroke-width:0.749995" + sodipodi:nodetypes="ssssssccssssssccssssssccssssssccscccccccccccccccccccccssccssccssccsscc" /> diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to24_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to24_dark.svg index 7824102939..d8ce527b8a 100644 --- a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to24_dark.svg +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to24_dark.svg @@ -6,7 +6,7 @@ sodipodi:docname="jog-to24.svg" width="24" height="24" - inkscape:version="1.1-dev (0486c1a, 2020-10-10)" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -40,35 +40,38 @@ inkscape:window-height="963" id="namedview834" showgrid="false" - width="24px" - inkscape:zoom="25.386234" - inkscape:cx="14.653611" - inkscape:cy="9.0797242" - inkscape:window-x="219" - inkscape:window-y="104" + width="16px" + inkscape:zoom="22.1" + inkscape:cx="8.6877828" + inkscape:cy="4.0271493" + inkscape:window-x="441" + inkscape:window-y="253" inkscape:window-maximized="0" inkscape:current-layer="svg832" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" /> + fill="currentColor" + d="M 23.4375,4.499997 C 23.748141,4.499997 24,4.248138 24,3.937497 V 0.5624985 C 24,0.251859 23.748141,0 23.4375,0 h -3.375 C 19.751859,0 19.5,0.251859 19.5,0.5624985 v 0.5625 H 4.4999998 v -0.5625 C 4.4999998,0.251859 4.2481407,0 3.9375,0 H 0.5625 C 0.2518593,0 0,0.251859 0,0.5624985 V 3.937497 c 0,0.310641 0.2518593,0.5625 0.5625,0.5625 H 1.125 V 19.5 H 0.5625 C 0.2518593,19.5 0,19.751859 0,20.062498 V 23.4375 C 0,23.748139 0.2518593,24 0.5625,24 h 3.375 c 0.3106407,0 0.5624998,-0.251861 0.5624998,-0.5625 V 22.875 H 19.5 v 0.5625 C 19.5,23.748139 19.751859,24 20.0625,24 h 3.375 C 23.748141,24 24,23.748139 24,23.4375 V 20.062498 C 24,19.751859 23.748141,19.5 23.4375,19.5 H 22.875 V 4.499997 Z M 21,1.4999971 h 1.5 V 2.999997 H 21 Z m -19.5,0 H 3 V 2.999997 H 1.5 Z M 3,22.5 H 1.5 V 20.999998 H 3 Z m 19.5,0 H 21 v -1.500002 h 1.5 z m -1.875,-3 H 20.0625 C 19.751859,19.5 19.5,19.751859 19.5,20.062498 V 20.625 H 4.4999998 V 20.062498 C 4.4999998,19.751859 4.2481407,19.5 3.9375,19.5 H 3.375 V 4.499997 h 0.5625 c 0.3106407,0 0.5624998,-0.251859 0.5624998,-0.5625 v -0.5625 H 19.5 v 0.5625 c 0,0.310641 0.251859,0.5625 0.5625,0.5625 h 0.5625 z" + id="path830-6" + style="fill:#afb1b3;fill-opacity:1;stroke-width:0.749995" + sodipodi:nodetypes="ssssssccssssssccssssssccssssssccscccccccccccccccccccccssccssccssccsscc" /> diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to24_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to24_disabled_dark.svg index 6377dd61f3..76478d5ee6 100644 --- a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to24_disabled_dark.svg +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to24_disabled_dark.svg @@ -6,7 +6,7 @@ sodipodi:docname="jog-to24.svg" width="24" height="24" - inkscape:version="1.1-dev (0486c1a, 2020-10-10)" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -40,35 +40,38 @@ inkscape:window-height="963" id="namedview834" showgrid="false" - width="24px" - inkscape:zoom="25.386234" - inkscape:cx="14.653611" - inkscape:cy="9.0797242" - inkscape:window-x="219" - inkscape:window-y="104" + width="16px" + inkscape:zoom="22.1" + inkscape:cx="8.6877828" + inkscape:cy="4.0271493" + inkscape:window-x="441" + inkscape:window-y="253" inkscape:window-maximized="0" inkscape:current-layer="svg832" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" /> + fill="currentColor" + d="M 23.4375,4.499997 C 23.748141,4.499997 24,4.248138 24,3.937497 V 0.5624985 C 24,0.251859 23.748141,0 23.4375,0 h -3.375 C 19.751859,0 19.5,0.251859 19.5,0.5624985 v 0.5625 H 4.4999998 v -0.5625 C 4.4999998,0.251859 4.2481407,0 3.9375,0 H 0.5625 C 0.2518593,0 0,0.251859 0,0.5624985 V 3.937497 c 0,0.310641 0.2518593,0.5625 0.5625,0.5625 H 1.125 V 19.5 H 0.5625 C 0.2518593,19.5 0,19.751859 0,20.062498 V 23.4375 C 0,23.748139 0.2518593,24 0.5625,24 h 3.375 c 0.3106407,0 0.5624998,-0.251861 0.5624998,-0.5625 V 22.875 H 19.5 v 0.5625 C 19.5,23.748139 19.751859,24 20.0625,24 h 3.375 C 23.748141,24 24,23.748139 24,23.4375 V 20.062498 C 24,19.751859 23.748141,19.5 23.4375,19.5 H 22.875 V 4.499997 Z M 21,1.4999971 h 1.5 V 2.999997 H 21 Z m -19.5,0 H 3 V 2.999997 H 1.5 Z M 3,22.5 H 1.5 V 20.999998 H 3 Z m 19.5,0 H 21 v -1.500002 h 1.5 z m -1.875,-3 H 20.0625 C 19.751859,19.5 19.5,19.751859 19.5,20.062498 V 20.625 H 4.4999998 V 20.062498 C 4.4999998,19.751859 4.2481407,19.5 3.9375,19.5 H 3.375 V 4.499997 h 0.5625 c 0.3106407,0 0.5624998,-0.251859 0.5624998,-0.5625 v -0.5625 H 19.5 v 0.5625 c 0,0.310641 0.251859,0.5625 0.5625,0.5625 h 0.5625 z" + id="path830-6" + style="fill:#565656;fill-opacity:1;stroke-width:0.749995" + sodipodi:nodetypes="ssssssccssssssccssssssccssssssccscccccccccccccccccccccssccssccssccsscc" /> diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to32.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to32.svg new file mode 100644 index 0000000000..2b6d77f204 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to32.svg @@ -0,0 +1,77 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to32_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to32_dark.svg new file mode 100644 index 0000000000..376bc7a380 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to32_dark.svg @@ -0,0 +1,77 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to32_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to32_disabled_dark.svg new file mode 100644 index 0000000000..3b0f409461 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to32_disabled_dark.svg @@ -0,0 +1,77 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to_dark.svg index a881477fb1..d5356d3881 100644 --- a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to_dark.svg +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to_dark.svg @@ -6,7 +6,7 @@ sodipodi:docname="jog-to.svg" width="16" height="16" - inkscape:version="1.1-dev (0486c1a, 2020-10-10)" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -42,33 +42,36 @@ showgrid="false" width="16px" inkscape:zoom="22.1" - inkscape:cx="14.660633" - inkscape:cy="4.0045249" - inkscape:window-x="219" - inkscape:window-y="104" + inkscape:cx="8.6877828" + inkscape:cy="4.0271493" + inkscape:window-x="441" + inkscape:window-y="253" inkscape:window-maximized="0" inkscape:current-layer="svg832" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" /> + fill="currentColor" + d="m 15.625,2.999998 c 0.207094,0 0.375,-0.167906 0.375,-0.375 V 0.374999 C 16,0.167906 15.832094,0 15.625,0 h -2.25 C 13.167906,0 13,0.167906 13,0.374999 v 0.375 H 2.9999999 v -0.375 C 2.9999999,0.167906 2.8320938,0 2.625,0 H 0.375 C 0.1679062,0 0,0.167906 0,0.374999 v 2.249999 c 0,0.207094 0.1679062,0.375 0.375,0.375 H 0.75 V 13 H 0.375 C 0.1679062,13 0,13.167906 0,13.374999 V 15.625 C 0,15.832093 0.1679062,16 0.375,16 h 2.25 c 0.2070938,0 0.3749999,-0.167907 0.3749999,-0.375 V 15.25 H 13 v 0.375 C 13,15.832093 13.167906,16 13.375,16 h 2.25 C 15.832094,16 16,15.832093 16,15.625 V 13.374999 C 16,13.167906 15.832094,13 15.625,13 H 15.25 V 2.999998 Z M 14,0.99999804 h 1 V 1.999998 h -1 z m -13,0 H 2 V 1.999998 H 1 Z M 2,15 H 1 v -1.000001 h 1 z m 13,0 h -1 v -1.000001 h 1 z M 13.75,13 H 13.375 C 13.167906,13 13,13.167906 13,13.374999 V 13.75 H 2.9999999 V 13.374999 C 2.9999999,13.167906 2.8320938,13 2.625,13 H 2.25 V 2.999998 h 0.375 c 0.2070938,0 0.3749999,-0.167906 0.3749999,-0.375 v -0.375 H 13 v 0.375 c 0,0.207094 0.167906,0.375 0.375,0.375 h 0.375 z" + id="path830-6" + style="fill:#afb1b3;fill-opacity:1;stroke-width:0.499997" + sodipodi:nodetypes="ssssssccssssssccssssssccssssssccscccccccccccccccccccccssccssccssccsscc" /> diff --git a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to_disabled_dark.svg b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to_disabled_dark.svg index eee9381a6d..2d6a4d8e78 100644 --- a/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to_disabled_dark.svg +++ b/ugs-platform/ugs-platform-plugin-designer/src/main/resources/img/jog-to_disabled_dark.svg @@ -6,7 +6,7 @@ sodipodi:docname="jog-to.svg" width="16" height="16" - inkscape:version="1.1-dev (0486c1a, 2020-10-10)" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -42,33 +42,36 @@ showgrid="false" width="16px" inkscape:zoom="22.1" - inkscape:cx="14.660633" - inkscape:cy="4.0045249" - inkscape:window-x="219" - inkscape:window-y="104" + inkscape:cx="8.6877828" + inkscape:cy="4.0271493" + inkscape:window-x="441" + inkscape:window-y="253" inkscape:window-maximized="0" inkscape:current-layer="svg832" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" /> + fill="currentColor" + d="m 15.625,2.999998 c 0.207094,0 0.375,-0.167906 0.375,-0.375 V 0.374999 C 16,0.167906 15.832094,0 15.625,0 h -2.25 C 13.167906,0 13,0.167906 13,0.374999 v 0.375 H 2.9999999 v -0.375 C 2.9999999,0.167906 2.8320938,0 2.625,0 H 0.375 C 0.1679062,0 0,0.167906 0,0.374999 v 2.249999 c 0,0.207094 0.1679062,0.375 0.375,0.375 H 0.75 V 13 H 0.375 C 0.1679062,13 0,13.167906 0,13.374999 V 15.625 C 0,15.832093 0.1679062,16 0.375,16 h 2.25 c 0.2070938,0 0.3749999,-0.167907 0.3749999,-0.375 V 15.25 H 13 v 0.375 C 13,15.832093 13.167906,16 13.375,16 h 2.25 C 15.832094,16 16,15.832093 16,15.625 V 13.374999 C 16,13.167906 15.832094,13 15.625,13 H 15.25 V 2.999998 Z M 14,0.99999804 h 1 V 1.999998 h -1 z m -13,0 H 2 V 1.999998 H 1 Z M 2,15 H 1 v -1.000001 h 1 z m 13,0 h -1 v -1.000001 h 1 z M 13.75,13 H 13.375 C 13.167906,13 13,13.167906 13,13.374999 V 13.75 H 2.9999999 V 13.374999 C 2.9999999,13.167906 2.8320938,13 2.625,13 H 2.25 V 2.999998 h 0.375 c 0.2070938,0 0.3749999,-0.167906 0.3749999,-0.375 v -0.375 H 13 v 0.375 c 0,0.207094 0.167906,0.375 0.375,0.375 h 0.375 z" + id="path830-6" + style="fill:#565656;fill-opacity:1;stroke-width:0.499997" + sodipodi:nodetypes="ssssssccssssssccssssssccssssssccscccccccccccccccccccccssccssccssccsscc" />