From ea05bc5001070b712ed2746a07a87f9c9a9ee6bc Mon Sep 17 00:00:00 2001 From: SiboVG Date: Thu, 23 Mar 2023 03:16:37 +0100 Subject: [PATCH] Rename "Select none" to "Deselect all" --- core/resources/l10n/messages.properties | 4 ++-- .../sf/openrocket/gui/main/BasicFrame.java | 4 ++-- .../sf/openrocket/gui/main/RocketActions.java | 22 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index 0ad43a056..ae11973ad 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -42,8 +42,8 @@ RocketActions.EditAct.ttip.Edit = Edit the selected component. RocketActions.Select = Select RocketActions.Select.SelectSameColorAct = Components of same color RocketActions.Select.SelectSameColorAct.ttip = Select all components of the same color as this component. -RocketActions.Select.SelectNoneAct = None -RocketActions.Select.SelectNoneAct.ttip = Deselect all components. +RocketActions.Select.DeselectAllAct = Deselect all +RocketActions.Select.DeselectAllAct.ttip = Deselect all currently selected components. RocketActions.ScaleAct.Scale = Scale RocketActions.ScaleAct.ttip.Scale = Scale parts of the rocket design RocketActions.NewStageAct.Newstage = New stage diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java index 44a381457..df08145c6 100644 --- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java +++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java @@ -240,7 +240,7 @@ public class BasicFrame extends JFrame { popupMenu.addSeparator(); JMenu selectMenu = new JMenu(trans.get("RocketActions.Select")); selectMenu.add(actions.getSelectSameColorAction()); - selectMenu.add(actions.getSelectNoneAction()); + selectMenu.add(actions.getDeselectAllAction()); popupMenu.add(selectMenu); popupMenu.addSeparator(); @@ -667,7 +667,7 @@ public class BasicFrame extends JFrame { menu.add(subMenu); item = new JMenuItem(actions.getSelectSameColorAction()); subMenu.add(item); - item = new JMenuItem(actions.getSelectNoneAction()); + item = new JMenuItem(actions.getDeselectAllAction()); subMenu.add(item); menu.addSeparator(); diff --git a/swing/src/net/sf/openrocket/gui/main/RocketActions.java b/swing/src/net/sf/openrocket/gui/main/RocketActions.java index 61bd565cb..200244723 100644 --- a/swing/src/net/sf/openrocket/gui/main/RocketActions.java +++ b/swing/src/net/sf/openrocket/gui/main/RocketActions.java @@ -76,7 +76,7 @@ public class RocketActions { private final RocketAction duplicateAction; private final RocketAction editAction; private final RocketAction selectSameColorAction; - private final RocketAction selectNoneAction; + private final RocketAction deselectAllAction; private final RocketAction scaleAction; private final RocketAction moveUpAction; private final RocketAction moveDownAction; @@ -102,7 +102,7 @@ public class RocketActions { this.duplicateAction = new DuplicateAction(); this.editAction = new EditAction(); this.selectSameColorAction = new SelectSameColorAction(); - this.selectNoneAction = new SelectNoneAction(); + this.deselectAllAction = new DeselectAllAction(); this.scaleAction = new ScaleAction(); this.moveUpAction = new MoveUpAction(); this.moveDownAction = new MoveDownAction(); @@ -137,7 +137,7 @@ public class RocketActions { duplicateAction.clipboardChanged(); editAction.clipboardChanged(); selectSameColorAction.clipboardChanged(); - selectNoneAction.clipboardChanged(); + deselectAllAction.clipboardChanged(); scaleAction.clipboardChanged(); moveUpAction.clipboardChanged(); moveDownAction.clipboardChanged(); @@ -182,8 +182,8 @@ public class RocketActions { return selectSameColorAction; } - public Action getSelectNoneAction() { - return selectNoneAction; + public Action getDeselectAllAction() { + return deselectAllAction; } public Action getScaleAction() { @@ -1104,15 +1104,15 @@ public class RocketActions { } /** - * Action to select all components with the same color as the currently selected component. + * Action to deselect all currently selected components. */ - private class SelectNoneAction extends RocketAction { + private class DeselectAllAction extends RocketAction { private static final long serialVersionUID = 1L; - public SelectNoneAction() { - //// Select none - this.putValue(NAME, trans.get("RocketActions.Select.SelectNoneAct")); - this.putValue(SHORT_DESCRIPTION, trans.get("RocketActions.Select.SelectNoneAct.ttip")); + public DeselectAllAction() { + //// Deselect all + this.putValue(NAME, trans.get("RocketActions.Select.DeselectAllAct")); + this.putValue(SHORT_DESCRIPTION, trans.get("RocketActions.Select.DeselectAllAct.ttip")); clipboardChanged(); }