From 6acb82f102047a9d22cdf2bb51ba580ed733eb43 Mon Sep 17 00:00:00 2001 From: Joacim Breiler Date: Fri, 29 Nov 2024 09:52:59 +0100 Subject: [PATCH] Add option for hiding/showing work position in DRO --- .../universalgcodesender/utils/Settings.java | 12 +- .../resources/MessagesBundle_en_US.properties | 12 +- .../utils/SettingsTest.java | 5 +- .../willwinder/ugs/nbp/dro/FontManager.java | 68 +- .../ugs/nbp/dro/panels/AxisPanel.java | 61 +- .../ugs/nbp/dro/panels/CoordinateLabel.java | 39 +- .../ugs/nbp/dro/panels/DROPopup.java | 54 +- .../nbp/dro/panels/HighlightableLabel.java | 61 + .../nbp/dro/panels/MachineStatusPanel.java | 17 +- .../actions/ResetACoordinateToZeroAction.java | 6 +- .../actions/ResetBCoordinateToZeroAction.java | 6 +- .../actions/ResetCCoordinateToZeroAction.java | 6 +- .../actions/ResetCoordinatesToZeroAction.java | 2 +- .../actions/ResetXCoordinateToZeroAction.java | 6 +- .../actions/ResetYCoordinateToZeroAction.java | 6 +- .../actions/ResetZCoordinateToZeroAction.java | 6 +- .../resources/MessagesBundle.properties | 12 +- .../resources/resources/icons/resetzero.svg | 1643 +---------------- .../resources/resources/icons/resetzero24.svg | 1643 +---------------- .../resources/icons/resetzero24_dark.svg | 1643 +---------------- .../icons/resetzero24_disabled_dark.svg | 1643 +---------------- .../resources/resources/icons/resetzero32.svg | 1643 +---------------- .../resources/icons/resetzero32_dark.svg | 1643 +---------------- .../icons/resetzero32_disabled_dark.svg | 1643 +---------------- .../resources/resources/icons/resetzero_a.svg | 15 - .../resources/icons/resetzero_a24.svg | 15 - .../resources/icons/resetzero_a24_dark.svg | 15 - .../icons/resetzero_a24_disabled_dark.svg | 15 - .../resources/icons/resetzero_a_dark.svg | 15 - .../icons/resetzero_a_disabled_dark.svg | 15 - .../resources/resources/icons/resetzero_b.svg | 15 - .../resources/icons/resetzero_b24.svg | 15 - .../resources/icons/resetzero_b24_dark.svg | 15 - .../icons/resetzero_b24_disabled_dark.svg | 15 - .../resources/icons/resetzero_b_dark.svg | 15 - .../icons/resetzero_b_disabled_dark.svg | 15 - .../resources/resources/icons/resetzero_c.svg | 15 - .../resources/icons/resetzero_c24.svg | 15 - .../resources/icons/resetzero_c24_dark.svg | 15 - .../icons/resetzero_c24_disabled_dark.svg | 15 - .../resources/icons/resetzero_c_dark.svg | 15 - .../icons/resetzero_c_disabled_dark.svg | 15 - .../resources/icons/resetzero_dark.svg | 1643 +---------------- .../icons/resetzero_disabled_dark.svg | 1643 +---------------- .../resources/resources/icons/resetzero_x.svg | 15 - .../resources/icons/resetzero_x24.svg | 15 - .../resources/icons/resetzero_x24_dark.svg | 15 - .../icons/resetzero_x24_disabled_dark.svg | 15 - .../resources/icons/resetzero_x_dark.svg | 15 - .../icons/resetzero_x_disabled_dark.svg | 15 - .../resources/resources/icons/resetzero_y.svg | 15 - .../resources/icons/resetzero_y24.svg | 15 - .../resources/icons/resetzero_y24_dark.svg | 15 - .../icons/resetzero_y24_disabled_dark.svg | 15 - .../resources/icons/resetzero_y_dark.svg | 15 - .../icons/resetzero_y_disabled_dark.svg | 15 - .../resources/resources/icons/resetzero_z.svg | 15 - .../resources/icons/resetzero_z24.svg | 15 - .../resources/icons/resetzero_z24_dark.svg | 15 - .../icons/resetzero_z24_disabled_dark.svg | 15 - .../resources/icons/resetzero_z_dark.svg | 15 - .../icons/resetzero_z_disabled_dark.svg | 15 - 62 files changed, 241 insertions(+), 15465 deletions(-) create mode 100644 ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/HighlightableLabel.java delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a24.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a24_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a24_disabled_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a_disabled_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b24.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b24_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b24_disabled_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b_disabled_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c24.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c24_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c24_disabled_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c_disabled_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x24.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x24_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x24_disabled_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x_disabled_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y24.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y24_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y24_disabled_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y_disabled_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z24.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z24_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z24_disabled_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z_dark.svg delete mode 100644 ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z_disabled_dark.svg diff --git a/ugs-core/src/com/willwinder/universalgcodesender/utils/Settings.java b/ugs-core/src/com/willwinder/universalgcodesender/utils/Settings.java index 1c5710fe21..6c22851eb6 100644 --- a/ugs-core/src/com/willwinder/universalgcodesender/utils/Settings.java +++ b/ugs-core/src/com/willwinder/universalgcodesender/utils/Settings.java @@ -49,7 +49,7 @@ public class Settings { // Transient, don't serialize or deserialize. transient private SettingChangeListener listener = null; - transient public static int HISTORY_SIZE = 20; + transient public static int HISTORY_SIZE = 10; private String firmwareVersion = "GRBL"; private String fileName = System.getProperty("user.home"); @@ -84,6 +84,7 @@ public class Settings { private int statusUpdateRate = 200; private Units preferredUnits = Units.MM; private Set disabledAxes = new HashSet<>(); + private boolean showMachinePosition = false; private boolean showNightlyWarning = true; private boolean showSerialPortWarning = true; @@ -404,6 +405,15 @@ public void setAxisEnabled(Axis a, boolean enabled) { } } + public boolean isShowMachinePosition() { + return showMachinePosition; + } + + public void setShowMachinePosition(boolean showMachinePosition) { + this.showMachinePosition = showMachinePosition; + changed(); + } + public void setPreferredUnits(Units units) { if (units != null) { double scaleUnits = UnitUtils.scaleUnits(preferredUnits, units); diff --git a/ugs-core/src/resources/MessagesBundle_en_US.properties b/ugs-core/src/resources/MessagesBundle_en_US.properties index 670a560c63..fe310bb8dc 100644 --- a/ugs-core/src/resources/MessagesBundle_en_US.properties +++ b/ugs-core/src/resources/MessagesBundle_en_US.properties @@ -97,12 +97,12 @@ mainWindow.swing.hostLabel = Host\: mainWindow.swing.remainingRowsLabel = Remaining Rows\: mainWindow.swing.remainingTimeLabel = Estimated Time Remaining\: mainWindow.swing.resetCoordinatesButton = Reset Zero -action.resetXCoordinatesButton = Reset X Zero -action.resetYCoordinatesButton = Reset Y Zero -action.resetZCoordinatesButton = Reset Z Zero -action.resetACoordinatesButton = Reset A Zero -action.resetBCoordinatesButton = Reset B Zero -action.resetCCoordinatesButton = Reset C Zero +action.resetXCoordinatesButton = Zero X +action.resetYCoordinatesButton = Zero Y +action.resetZCoordinatesButton = Zero Z +action.resetACoordinatesButton = Zero A +action.resetBCoordinatesButton = Zero B +action.resetCCoordinatesButton = Zero C mainWindow.swing.returnToZeroButton = Return to Zero mainWindow.swing.homeMachine = Home Machine mainWindow.swing.openDoor = Open door diff --git a/ugs-core/test/com/willwinder/universalgcodesender/utils/SettingsTest.java b/ugs-core/test/com/willwinder/universalgcodesender/utils/SettingsTest.java index f26c73ef36..0c56bdbcc8 100644 --- a/ugs-core/test/com/willwinder/universalgcodesender/utils/SettingsTest.java +++ b/ugs-core/test/com/willwinder/universalgcodesender/utils/SettingsTest.java @@ -68,6 +68,7 @@ public void settingsShouldHaveDefaultValues() { assertNotNull(target.getVisualizerWindowSettings()); assertEquals(Double.valueOf(1), Double.valueOf(target.getZJogStepSize())); assertFalse(target.isAutoStartPendant()); + assertFalse(target.isShowMachinePosition()); } @Test @@ -123,10 +124,10 @@ public void recentsShouldOverflowOldestAndReturnLIFO() throws IOException { Assertions.assertThat(target.getRecentFiles()) .hasSize(HISTORY_SIZE) .doesNotContain(path + "2"+File.separator+"file.gcode") - .startsWith(path + "21"+File.separator+"file.gcode", path + "1"+File.separator+"file.gcode"); + .startsWith(path + "11"+File.separator+"file.gcode", path + "1"+File.separator+"file.gcode"); Assertions.assertThat(target.getRecentDirectories()) .hasSize(HISTORY_SIZE) .doesNotContain(path + "2") - .startsWith(path + "21", path + "1"); + .startsWith(path + "11", path + "1"); } } diff --git a/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/FontManager.java b/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/FontManager.java index 94b790a998..69d7c12786 100644 --- a/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/FontManager.java +++ b/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/FontManager.java @@ -31,48 +31,33 @@ This file is part of Universal Gcode Sender (UGS). public class FontManager { - private List workCoordinateFont = new ArrayList<>(3); - private List machineCoordinateFont = new ArrayList<>(3); - private List axisResetFont = new ArrayList<>(3); - private List axisResetZeroFont = new ArrayList<>(3); - private List propertyLabelFont = new ArrayList<>(3); - private List speedValueFont = new ArrayList<>(3); - private List activeStateFont = new ArrayList<>(3); - - private List workCoordinateComponents = new ArrayList<>(); - private List machineCoordinateComponents = new ArrayList<>(); - private List axisResetComponents = new ArrayList<>(); - private List axisResetZeroComponents = new ArrayList<>(); - private List propertyLabelComponents = new ArrayList<>(); - private List speedValueComponents = new ArrayList<>(); - private List activeStateLabelComponents = new ArrayList<>(); + private final List workCoordinateFont = new ArrayList<>(3); + private final List machineCoordinateFont = new ArrayList<>(3); + private final List propertyLabelFont = new ArrayList<>(3); + private final List activeStateFont = new ArrayList<>(3); + + private final List workCoordinateComponents = new ArrayList<>(); + private final List machineCoordinateComponents = new ArrayList<>(); + private final List propertyLabelComponents = new ArrayList<>(); + private final List speedValueComponents = new ArrayList<>(); + private final List activeStateLabelComponents = new ArrayList<>(); public void init() { Font font = FontUtils.getLcdFont(); Font boldFont = FontUtils.getSansBoldFont(); Font regularFont = FontUtils.getSansFont(); - workCoordinateFont.add(font.deriveFont(Font.PLAIN,18)); - workCoordinateFont.add(font.deriveFont(Font.PLAIN,24)); - workCoordinateFont.add(font.deriveFont(Font.PLAIN,32)); - machineCoordinateFont.add(font.deriveFont(Font.PLAIN,14)); - machineCoordinateFont.add(font.deriveFont(Font.PLAIN,18)); - machineCoordinateFont.add(font.deriveFont(Font.PLAIN,24)); - speedValueFont.add(font.deriveFont(Font.PLAIN,14)); - speedValueFont.add(font.deriveFont(Font.PLAIN,16)); - speedValueFont.add(font.deriveFont(Font.PLAIN,20)); - - activeStateFont.add(boldFont.deriveFont(Font.PLAIN, 20)); - activeStateFont.add(boldFont.deriveFont(Font.PLAIN, 24)); - activeStateFont.add(boldFont.deriveFont(Font.PLAIN, 30)); + workCoordinateFont.add(font.deriveFont(Font.PLAIN, 20)); + workCoordinateFont.add(font.deriveFont(Font.PLAIN, 26)); + workCoordinateFont.add(font.deriveFont(Font.PLAIN, 34)); - axisResetFont.add(regularFont.deriveFont(Font.PLAIN, 20)); - axisResetFont.add(regularFont.deriveFont(Font.PLAIN, 24)); - axisResetFont.add(regularFont.deriveFont(Font.PLAIN, 30)); + machineCoordinateFont.add(font.deriveFont(Font.PLAIN, 14)); + machineCoordinateFont.add(font.deriveFont(Font.PLAIN, 18)); + machineCoordinateFont.add(font.deriveFont(Font.PLAIN, 24)); - axisResetZeroFont.add(regularFont.deriveFont(Font.PLAIN, 12)); - axisResetZeroFont.add(regularFont.deriveFont(Font.PLAIN, 14)); - axisResetZeroFont.add(regularFont.deriveFont(Font.PLAIN, 18)); + activeStateFont.add(boldFont.deriveFont(Font.PLAIN, 20)); + activeStateFont.add(boldFont.deriveFont(Font.PLAIN, 26)); + activeStateFont.add(boldFont.deriveFont(Font.PLAIN, 34)); propertyLabelFont.add(regularFont.deriveFont(Font.PLAIN, 12)); propertyLabelFont.add(regularFont.deriveFont(Font.PLAIN, 14)); @@ -84,10 +69,8 @@ public void applyFonts(int size) { int index = Math.max(0, Math.min(2, size)); workCoordinateComponents.forEach(c -> c.setFont(workCoordinateFont.get(index))); machineCoordinateComponents.forEach(c -> c.setFont(machineCoordinateFont.get(index))); - axisResetComponents.forEach(c -> c.setFont(axisResetFont.get(index))); - axisResetZeroComponents.forEach(c -> c.setFont(axisResetZeroFont.get(index))); propertyLabelComponents.forEach(c -> c.setFont(propertyLabelFont.get(index))); - speedValueComponents.forEach(c -> c.setFont(speedValueFont.get(index))); + speedValueComponents.forEach(c -> c.setFont(machineCoordinateFont.get(index))); activeStateLabelComponents.forEach(c -> c.setFont(activeStateFont.get(index))); }); } @@ -100,14 +83,6 @@ public void addMachineCoordinateLabel(JComponent... label) { machineCoordinateComponents.addAll(Arrays.asList(label)); } - public void addAxisResetLabel(JLabel... label) { - axisResetComponents.addAll(Arrays.asList(label)); - } - - public void addAxisResetZeroLabel(JLabel... label) { - axisResetZeroComponents.addAll(Arrays.asList(label)); - } - public void addPropertyLabel(JLabel... label) { propertyLabelComponents.addAll(Arrays.asList(label)); } @@ -124,10 +99,7 @@ public void registerFonts(GraphicsEnvironment ge) { List all = new ArrayList<>(); all.addAll(workCoordinateFont); all.addAll(machineCoordinateFont); - all.addAll(axisResetFont); - all.addAll(axisResetZeroFont); all.addAll(propertyLabelFont); - all.addAll(speedValueFont); all.forEach(ge::registerFont); } diff --git a/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/AxisPanel.java b/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/AxisPanel.java index c597af240b..e888c52059 100644 --- a/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/AxisPanel.java +++ b/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/AxisPanel.java @@ -35,6 +35,8 @@ This file is part of Universal Gcode Sender (UGS). import javax.swing.Action; import javax.swing.JButton; import javax.swing.JPanel; +import javax.swing.SwingConstants; +import java.awt.Dimension; import java.awt.Insets; import java.awt.event.MouseEvent; import java.util.HashSet; @@ -47,36 +49,48 @@ This file is part of Universal Gcode Sender (UGS). public class AxisPanel extends JPanel { private static final int RADIUS = 7; public static final int HIGHLIGHT_TIME = 300; - private final CoordinateLabel work = new CoordinateLabel(0.0); - private final CoordinateLabel machine = new CoordinateLabel(0.0); + private final HighlightableLabel axisLabel = new HighlightableLabel(); + private final CoordinateLabel workLabel = new CoordinateLabel(0.0); + private final CoordinateLabel machineLabel = new CoordinateLabel(0.0); private final Set axisPanelListenerList = new HashSet<>(); private transient ScheduledFuture highlightLabelsFuture; public AxisPanel(Axis axis, FontManager fontManager) { - super(new MigLayout("fill, inset 0", "[50]5[grow, fill]")); + super(new MigLayout("fill, inset 0", "[grow, fill]5[50]")); RoundedPanel axisPanel = new RoundedPanel(RADIUS); axisPanel.setBackground(ThemeColors.VERY_DARK_GREY); axisPanel.setForeground(ThemeColors.LIGHT_BLUE); - axisPanel.setLayout(new MigLayout("fillx, inset 4 6 4 6, gap 0", "[grow, right]")); + axisPanel.setLayout(new MigLayout("fill, inset 6 6 6 6, gap 0", "[left][grow, right, fill]")); - work.addMouseListener(new MouseClickListener() { + axisLabel.setText(axis.toString()); + workLabel.addMouseListener(new MouseClickListener() { @Override public void onClick(MouseEvent e) { - axisPanelListenerList.forEach(axisPanelListener -> axisPanelListener.onWorkPositionClick(work, axis)); + axisPanelListenerList.forEach(axisPanelListener -> axisPanelListener.onWorkPositionClick(workLabel, axis)); } }); - axisPanel.add(work, "grow, gapleft 5, wrap"); - axisPanel.add(machine, "span 2"); + fontManager.addWorkCoordinateLabel(axisLabel); + fontManager.addWorkCoordinateLabel(workLabel); + fontManager.addMachineCoordinateLabel(machineLabel); - fontManager.addWorkCoordinateLabel(work); - fontManager.addMachineCoordinateLabel(machine); + JPanel coordinatesPanel = new JPanel(new MigLayout("fill, inset 0, wrap 1, gap 0", "[grow, align right]")); + coordinatesPanel.setOpaque(false); + coordinatesPanel.add(workLabel); + coordinatesPanel.add(machineLabel, "hidemode 3"); + axisPanel.add(axisLabel, "spany 2, growy"); + axisPanel.add(coordinatesPanel, "growy"); + add(axisPanel, "growy"); + + Dimension minimumSize = new Dimension(50, 18); JButton resetButton = new JButton(createAction(axis)); + resetButton.setMinimumSize(minimumSize); + resetButton.setVerticalTextPosition(SwingConstants.TOP); + resetButton.setHorizontalTextPosition(SwingConstants.CENTER); + resetButton.setMargin(new Insets(0, 0, 0, 0)); - resetButton.setText(""); add(resetButton, "grow"); - add(axisPanel); } private static Action createAction(Axis axis) { @@ -101,11 +115,11 @@ public void addListener(AxisPanelListener axisPanelListener) { } public void setMachinePosition(double value) { - setLabelValue(machine, value); + setLabelValue(machineLabel, value); } public void setWorkPosition(double value) { - setLabelValue(work, value); + setLabelValue(workLabel, value); } private void setLabelValue(CoordinateLabel label, double value) { @@ -116,8 +130,9 @@ private void setLabelValue(CoordinateLabel label, double value) { } private void highlightLabels() { - work.setHighlighted(true); - machine.setHighlighted(true); + axisLabel.setHighlighted(true); + workLabel.setHighlighted(true); + machineLabel.setHighlighted(true); // Disable any old future if (highlightLabelsFuture != null && !highlightLabelsFuture.isDone()) { @@ -126,15 +141,21 @@ private void highlightLabels() { // Start new future highlightLabelsFuture = ThreadHelper.invokeLater(() -> { - work.setHighlighted(false); - machine.setHighlighted(false); + workLabel.setHighlighted(false); + machineLabel.setHighlighted(false); + axisLabel.setHighlighted(false); }, HIGHLIGHT_TIME); } @Override public void setEnabled(boolean enabled) { super.setEnabled(enabled); - work.setEnabled(enabled); - machine.setEnabled(enabled); + workLabel.setEnabled(enabled); + machineLabel.setEnabled(enabled); + axisLabel.setEnabled(enabled); + } + + public void setShowMachinePosition(boolean showMachinePosition) { + machineLabel.setVisible(showMachinePosition); } } diff --git a/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/CoordinateLabel.java b/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/CoordinateLabel.java index 95b0272603..5c29f6ccda 100644 --- a/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/CoordinateLabel.java +++ b/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/CoordinateLabel.java @@ -1,5 +1,5 @@ /* - Copyright 2023 Will Winder + Copyright 2023-2024 Will Winder This file is part of Universal Gcode Sender (UGS). @@ -18,61 +18,26 @@ This file is part of Universal Gcode Sender (UGS). */ package com.willwinder.ugs.nbp.dro.panels; -import com.willwinder.universalgcodesender.uielements.helpers.ThemeColors; - -import javax.swing.JLabel; import javax.swing.SwingConstants; -import java.awt.Color; import java.text.DecimalFormat; -public class CoordinateLabel extends JLabel { +public class CoordinateLabel extends HighlightableLabel { private final DecimalFormat decimalFormatter = new DecimalFormat("0.000"); - private double value = 0.0; - private boolean highlighted = false; - private boolean isEnabled = true; public CoordinateLabel(double value) { setValue(value); setHorizontalAlignment(SwingConstants.RIGHT); } - @Override - public void setEnabled(boolean enabled) { - this.isEnabled = enabled; - updateColor(); - } - - @Override - public boolean isEnabled() { - // Force returning true or else we will get problems with colors on some LaFs - return true; - } - public double getValue() { return value; } - public void setValue(double value) { this.value = value; String textValue = decimalFormatter.format(value); setText(textValue); } - - public void setHighlighted(boolean highlighted) { - this.highlighted = highlighted; - updateColor(); - } - - private void updateColor() { - Color color = isEnabled ? ThemeColors.LIGHT_BLUE : ThemeColors.LIGHT_BLUE_GREY; - - if (highlighted) { - color = ThemeColors.GREEN; - } - - setForeground(color); - } } diff --git a/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/DROPopup.java b/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/DROPopup.java index f557e6455b..996a78ac01 100644 --- a/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/DROPopup.java +++ b/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/DROPopup.java @@ -1,5 +1,5 @@ /* - Copyright 2021 Will Winder + Copyright 2021-2024 Will Winder This file is part of Universal Gcode Sender (UGS). @@ -30,37 +30,53 @@ This file is part of Universal Gcode Sender (UGS). */ public class DROPopup extends JPopupMenu { private final BackendAPI backend; - private final Settings settings; public DROPopup(BackendAPI backend) { super(); this.backend = backend; - this.settings = backend.getSettings(); } @Override public void show(Component invoker, int x, int y) { removeAll(); - + addShowMachineCoordinates(); for (Axis a : Axis.values()) { - boolean add = a.isLinear(); + addAxisMenu(a); + } + + super.show(invoker, x, y); + } - // Linear axis by default, or if connected use capabilities. - if (this.backend.isConnected()) { - add = this.backend.getController().getCapabilities().hasAxis(a); - } + private void addAxisMenu(Axis a) { + Settings settings = backend.getSettings(); + boolean add = a.isLinear(); - if (add) { - final JCheckBoxMenuItem menu = new JCheckBoxMenuItem( - String.format("Disable Axis: %s", a.name()), - !this.settings.isAxisEnabled(a)); - menu.addActionListener(e -> { - this.settings.setAxisEnabled(a, !menu.isSelected()); - }); - add(menu); - } + // Linear axis by default, or if connected use capabilities. + if (this.backend.isConnected()) { + add = this.backend.getController().getCapabilities().hasAxis(a); } - super.show(invoker, x, y); + if (!add) { + return; + } + + final JCheckBoxMenuItem menu = new JCheckBoxMenuItem( + String.format("Disable Axis: %s", a.name()), + !settings.isAxisEnabled(a)); + menu.addActionListener(e -> { + settings.setAxisEnabled(a, !menu.isSelected()); + }); + add(menu); + } + + private void addShowMachineCoordinates() { + Settings settings = backend.getSettings(); + final JCheckBoxMenuItem showMachinePositionMenu = new JCheckBoxMenuItem( + "Show machine position", + settings.isShowMachinePosition()); + showMachinePositionMenu.addActionListener(e -> { + settings.setShowMachinePosition(showMachinePositionMenu.isSelected()); + }); + add(showMachinePositionMenu); } } diff --git a/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/HighlightableLabel.java b/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/HighlightableLabel.java new file mode 100644 index 0000000000..2403b689b2 --- /dev/null +++ b/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/HighlightableLabel.java @@ -0,0 +1,61 @@ +/* + Copyright 2023-2024 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.dro.panels; + +import com.willwinder.universalgcodesender.uielements.helpers.ThemeColors; + +import javax.swing.JLabel; +import java.awt.Color; + +/** + * A label which can be highlighted using the {@link #setHighlighted(boolean)} function. + * + * @author Joacim Breiler + */ +public class HighlightableLabel extends JLabel { + private boolean highlighted = false; + private boolean isEnabled = true; + + @Override + public void setEnabled(boolean enabled) { + this.isEnabled = enabled; + updateColor(); + } + + @Override + public boolean isEnabled() { + // Force returning true or else we will get problems with colors on some LaFs + return true; + } + + public void setHighlighted(boolean highlighted) { + this.highlighted = highlighted; + updateColor(); + } + + private void updateColor() { + Color color = isEnabled ? ThemeColors.LIGHT_BLUE : ThemeColors.LIGHT_BLUE_GREY; + + if (highlighted) { + color = ThemeColors.GREEN; + } + + setForeground(color); + } +} diff --git a/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/MachineStatusPanel.java b/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/MachineStatusPanel.java index 44f40ad6af..49d454ee61 100644 --- a/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/MachineStatusPanel.java +++ b/ugs-platform/ugs-platform-plugin-dro/src/main/java/com/willwinder/ugs/nbp/dro/panels/MachineStatusPanel.java @@ -109,9 +109,9 @@ public MachineStatusPanel(BackendAPI backend) { private void initSizer() { SteppedSizeManager sizer = new SteppedSizeManager(this, - new Dimension(160, 330), - new Dimension(240, 420), - new Dimension(310, 420)); + new Dimension(200, 200), + new Dimension(240, 200), + new Dimension(300, 200)); sizer.addListener(fontManager::applyFonts); } @@ -209,8 +209,10 @@ public void UGSEvent(UGSEvent evt) { updateControls(); } else if (evt instanceof ControllerStatusEvent controllerStatusEvent) { onControllerStatusReceived(controllerStatusEvent.getStatus()); - } else if (evt instanceof SettingChangedEvent && backend.getController() != null && backend.getController().getControllerStatus() != null) { - onControllerStatusReceived(backend.getController().getControllerStatus()); + } else if (evt instanceof SettingChangedEvent) { + if (backend.getController() != null) { + onControllerStatusReceived(backend.getController().getControllerStatus()); + } updateControls(); } } @@ -219,10 +221,12 @@ public void UGSEvent(UGSEvent evt) { * Enable and disable the different axes based on capabilities and configuration. */ private void updateControls() { + Settings settings = backend.getSettings(); if (!backend.isConnected()) { axisPanels.forEach((key, value) -> { value.setEnabled(false); value.setVisible(key.isLinear()); + value.setShowMachinePosition(settings.isShowMachinePosition()); }); // Clear out the status color. @@ -232,14 +236,13 @@ private void updateControls() { } Capabilities cap = backend.getController().getCapabilities(); - Settings settings = backend.getSettings(); - boolean enabled = backend.getControllerState() == ControllerState.IDLE; for (Axis a : Axis.values()) { // don't hide every axis while capabilities are being detected. boolean visible = (cap.hasAxis(a) || a.isLinear()) && settings.isAxisEnabled(a); axisPanels.get(a).setEnabled(enabled); axisPanels.get(a).setVisible(visible); + axisPanels.get(a).setShowMachinePosition(settings.isShowMachinePosition()); } } diff --git a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetACoordinateToZeroAction.java b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetACoordinateToZeroAction.java index 77836e99bc..c9a5f2fc99 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetACoordinateToZeroAction.java +++ b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetACoordinateToZeroAction.java @@ -46,12 +46,12 @@ This file is part of Universal Gcode Sender (UGS). @ActionReferences({ @ActionReference( path = LocalizingService.ResetAZeroWindowPath, - position = 1030) + position = 1031) }) public final class ResetACoordinateToZeroAction extends AbstractAction implements UGSEventListener { - public static final String ICON_BASE = "resources/icons/resetzero_a.svg"; - public static final String LARGE_ICON_PATH = "resources/icons/resetzero_a24.svg"; + public static final String ICON_BASE = "resources/icons/resetzero.svg"; + public static final String LARGE_ICON_PATH = "resources/icons/resetzero24.svg"; private final BackendAPI backend; diff --git a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetBCoordinateToZeroAction.java b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetBCoordinateToZeroAction.java index 463a3bc12d..2482c501e3 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetBCoordinateToZeroAction.java +++ b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetBCoordinateToZeroAction.java @@ -46,12 +46,12 @@ This file is part of Universal Gcode Sender (UGS). @ActionReferences({ @ActionReference( path = LocalizingService.ResetBZeroWindowPath, - position = 1031) + position = 1032) }) public final class ResetBCoordinateToZeroAction extends AbstractAction implements UGSEventListener { - public static final String ICON_BASE = "resources/icons/resetzero_b.svg"; - public static final String LARGE_ICON_PATH = "resources/icons/resetzero_b24.svg"; + public static final String ICON_BASE = "resources/icons/resetzero.svg"; + public static final String LARGE_ICON_PATH = "resources/icons/resetzero24.svg"; private final BackendAPI backend; diff --git a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetCCoordinateToZeroAction.java b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetCCoordinateToZeroAction.java index 55f02a43bf..973bd29c48 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetCCoordinateToZeroAction.java +++ b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetCCoordinateToZeroAction.java @@ -46,12 +46,12 @@ This file is part of Universal Gcode Sender (UGS). @ActionReferences({ @ActionReference( path = LocalizingService.ResetCZeroWindowPath, - position = 1032) + position = 1033) }) public final class ResetCCoordinateToZeroAction extends AbstractAction implements UGSEventListener { - public static final String ICON_BASE = "resources/icons/resetzero_c.svg"; - public static final String LARGE_ICON_PATH = "resources/icons/resetzero_c24.svg"; + public static final String ICON_BASE = "resources/icons/resetzero.svg"; + public static final String LARGE_ICON_PATH = "resources/icons/resetzero24.svg"; private final BackendAPI backend; diff --git a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetCoordinatesToZeroAction.java b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetCoordinatesToZeroAction.java index 91672603af..5caa9d28f5 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetCoordinatesToZeroAction.java +++ b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetCoordinatesToZeroAction.java @@ -45,7 +45,7 @@ This file is part of Universal Gcode Sender (UGS). @ActionReferences({ @ActionReference( path = LocalizingService.ResetZeroWindowPath, - position = 1029) + position = 1030) }) public final class ResetCoordinatesToZeroAction extends AbstractAction implements UGSEventListener { diff --git a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetXCoordinateToZeroAction.java b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetXCoordinateToZeroAction.java index b45783cab2..e9ddbff407 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetXCoordinateToZeroAction.java +++ b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetXCoordinateToZeroAction.java @@ -46,12 +46,12 @@ This file is part of Universal Gcode Sender (UGS). @ActionReferences({ @ActionReference( path = LocalizingService.ResetXZeroWindowPath, - position = 1033) + position = 1034) }) public final class ResetXCoordinateToZeroAction extends AbstractAction implements UGSEventListener { - public static final String ICON_BASE = "resources/icons/resetzero_x.svg"; - public static final String LARGE_ICON_PATH = "resources/icons/resetzero_x24.svg"; + public static final String ICON_BASE = "resources/icons/resetzero.svg"; + public static final String LARGE_ICON_PATH = "resources/icons/resetzero24.svg"; private final BackendAPI backend; diff --git a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetYCoordinateToZeroAction.java b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetYCoordinateToZeroAction.java index 7108926e5e..ce3414bce9 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetYCoordinateToZeroAction.java +++ b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetYCoordinateToZeroAction.java @@ -46,12 +46,12 @@ This file is part of Universal Gcode Sender (UGS). @ActionReferences({ @ActionReference( path = LocalizingService.ResetYZeroWindowPath, - position = 1034) + position = 1035) }) public final class ResetYCoordinateToZeroAction extends AbstractAction implements UGSEventListener { - public static final String ICON_BASE = "resources/icons/resetzero_y.svg"; - public static final String LARGE_ICON_PATH = "resources/icons/resetzero_y24.svg"; + public static final String ICON_BASE = "resources/icons/resetzero.svg"; + public static final String LARGE_ICON_PATH = "resources/icons/resetzero24.svg"; private final BackendAPI backend; diff --git a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetZCoordinateToZeroAction.java b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetZCoordinateToZeroAction.java index 2ad58f71a0..b2f8f97a08 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetZCoordinateToZeroAction.java +++ b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/actions/ResetZCoordinateToZeroAction.java @@ -46,12 +46,12 @@ This file is part of Universal Gcode Sender (UGS). @ActionReferences({ @ActionReference( path = LocalizingService.ResetZZeroWindowPath, - position = 1035) + position = 1036) }) public final class ResetZCoordinateToZeroAction extends AbstractAction implements UGSEventListener { - public static final String ICON_BASE = "resources/icons/resetzero_z.svg"; - public static final String LARGE_ICON_PATH = "resources/icons/resetzero_z24.svg"; + public static final String ICON_BASE = "resources/icons/resetzero.svg"; + public static final String LARGE_ICON_PATH = "resources/icons/resetzero24.svg"; private final BackendAPI backend; diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/MessagesBundle.properties b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/MessagesBundle.properties index 7b1d273550..1890daf26b 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/MessagesBundle.properties +++ b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/MessagesBundle.properties @@ -16,12 +16,12 @@ mainWindow.swing.checkMode = Check Mode mainWindow.swing.softResetMachineControl = Soft Reset mainWindow.swing.resetCoordinatesButton = Reset Zero mainWindow.swing.openDoor = Open door -action.resetXCoordinatesButton = Reset X Zero -action.resetYCoordinatesButton = Reset Y Zero -action.resetZCoordinatesButton = Reset Z Zero -action.resetACoordinatesButton = Reset A Zero -action.resetBCoordinatesButton = Reset B Zero -action.resetCCoordinatesButton = Reset C Zero +action.resetXCoordinatesButton = Zero X +action.resetYCoordinatesButton = Zero Y +action.resetZCoordinatesButton = Zero Z +action.resetACoordinatesButton = Zero A +action.resetBCoordinatesButton = Zero B +action.resetCCoordinatesButton = Zero C mainWindow.swing.getState = Get State mainWindow.swing.firmwareSettingsMenu = Firmware Settings mainWindow.ui.connect = Connect diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero.svg index b35159080f..2421e0a018 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero.svg +++ b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero.svg @@ -1,1641 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero24.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero24.svg index 947f3b2c29..7e92b8f300 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero24.svg +++ b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero24.svg @@ -1,1641 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero24_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero24_dark.svg index f0da9256cf..4d14f2c047 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero24_dark.svg +++ b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero24_dark.svg @@ -1,1641 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero24_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero24_disabled_dark.svg index 5790fd9249..f28e16de37 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero24_disabled_dark.svg +++ b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero24_disabled_dark.svg @@ -1,1641 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero32.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero32.svg index 9f9d9f0020..c1bab5c065 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero32.svg +++ b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero32.svg @@ -1,1641 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero32_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero32_dark.svg index a40115bc58..5d5e2b5573 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero32_dark.svg +++ b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero32_dark.svg @@ -1,1641 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero32_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero32_disabled_dark.svg index 3483dacac1..bab2f4e2eb 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero32_disabled_dark.svg +++ b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero32_disabled_dark.svg @@ -1,1641 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a.svg deleted file mode 100644 index 9127f0dac7..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - A - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a24.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a24.svg deleted file mode 100644 index 57e436b0e5..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a24.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - A - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a24_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a24_dark.svg deleted file mode 100644 index 8150a93d5f..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a24_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - A - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a24_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a24_disabled_dark.svg deleted file mode 100644 index eeee43a922..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a24_disabled_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - A - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a_dark.svg deleted file mode 100644 index 1f235ce698..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - A - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a_disabled_dark.svg deleted file mode 100644 index 7e460e8f8c..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_a_disabled_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - A - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b.svg deleted file mode 100644 index 5ce8a8843d..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - B - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b24.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b24.svg deleted file mode 100644 index a0e0160355..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b24.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - B - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b24_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b24_dark.svg deleted file mode 100644 index 75c7a9c74a..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b24_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - B - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b24_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b24_disabled_dark.svg deleted file mode 100644 index 48f0d74484..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b24_disabled_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - B - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b_dark.svg deleted file mode 100644 index 47035cfbeb..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - B - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b_disabled_dark.svg deleted file mode 100644 index 83933bfa72..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_b_disabled_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - B - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c.svg deleted file mode 100644 index 8eaf0a8a06..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - C - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c24.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c24.svg deleted file mode 100644 index f88bc203bf..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c24.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - C - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c24_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c24_dark.svg deleted file mode 100644 index 315d4986a2..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c24_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - C - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c24_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c24_disabled_dark.svg deleted file mode 100644 index 663cf30d2d..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c24_disabled_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - C - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c_dark.svg deleted file mode 100644 index 1fabd8c2df..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - C - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c_disabled_dark.svg deleted file mode 100644 index ed9b90fa9d..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_c_disabled_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - C - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_dark.svg index a85c333a49..8b2bf3e9a4 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_dark.svg +++ b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_dark.svg @@ -1,1641 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_disabled_dark.svg index 5cfb24bf7a..103ed025e8 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_disabled_dark.svg +++ b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_disabled_dark.svg @@ -1,1641 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x.svg deleted file mode 100644 index c9fd770b57..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - X - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x24.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x24.svg deleted file mode 100644 index 0b4573bc61..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x24.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - X - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x24_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x24_dark.svg deleted file mode 100644 index 8f81b8ce6d..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x24_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - X - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x24_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x24_disabled_dark.svg deleted file mode 100644 index 1db7f7871b..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x24_disabled_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - X - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x_dark.svg deleted file mode 100644 index 5f031f6ba7..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - X - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x_disabled_dark.svg deleted file mode 100644 index dfc3c4f23d..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_x_disabled_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - X - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y.svg deleted file mode 100644 index edeaf896e3..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - Y - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y24.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y24.svg deleted file mode 100644 index dc935619d3..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y24.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - Y - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y24_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y24_dark.svg deleted file mode 100644 index 87714cd3de..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y24_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - Y - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y24_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y24_disabled_dark.svg deleted file mode 100644 index 29086571f3..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y24_disabled_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - Y - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y_dark.svg deleted file mode 100644 index e72c16a309..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - Y - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y_disabled_dark.svg deleted file mode 100644 index dabfbcc1ac..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_y_disabled_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - Y - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z.svg deleted file mode 100644 index 6196e7575a..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - Z - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z24.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z24.svg deleted file mode 100644 index 51cabdc0a8..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z24.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - Z - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z24_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z24_dark.svg deleted file mode 100644 index ea11936309..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z24_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - Z - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z24_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z24_disabled_dark.svg deleted file mode 100644 index a7c3f82d00..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z24_disabled_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - Z - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z_dark.svg deleted file mode 100644 index 73d66135e4..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - Z - - - - - - - diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z_disabled_dark.svg b/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z_disabled_dark.svg deleted file mode 100644 index f75a6a6797..0000000000 --- a/ugs-platform/ugs-platform-ugscore/src/main/resources/resources/icons/resetzero_z_disabled_dark.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - Z - - - - - - -