hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename "Select none" to "Deselect all"

Browse Source
This commit is contained in:
SiboVG 2023-03-23 03:16:37 +01:00
parent 805ea919dc
commit ea05bc5001
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/resources/l10n/messages.properties
View File

@ -42,8 +42,8 @@ RocketActions.EditAct.ttip.Edit = Edit the selected component.
RocketActions.Select = Select RocketActions.Select = Select
RocketActions.Select.SelectSameColorAct = Components of same color RocketActions.Select.SelectSameColorAct = Components of same color
RocketActions.Select.SelectSameColorAct.ttip = Select all components of the same color as this component. RocketActions.Select.SelectSameColorAct.ttip = Select all components of the same color as this component.
RocketActions.Select.SelectNoneAct = None RocketActions.Select.DeselectAllAct = Deselect all
RocketActions.Select.SelectNoneAct.ttip = Deselect all components. RocketActions.Select.DeselectAllAct.ttip = Deselect all currently selected components.
RocketActions.ScaleAct.Scale = Scale RocketActions.ScaleAct.Scale = Scale
RocketActions.ScaleAct.ttip.Scale = Scale parts of the rocket design RocketActions.ScaleAct.ttip.Scale = Scale parts of the rocket design
RocketActions.NewStageAct.Newstage = New stage RocketActions.NewStageAct.Newstage = New stage

4
swing/src/net/sf/openrocket/gui/main/BasicFrame.java
View File

@ -240,7 +240,7 @@ public class BasicFrame extends JFrame {
popupMenu.addSeparator(); popupMenu.addSeparator();
JMenu selectMenu = new JMenu(trans.get("RocketActions.Select")); JMenu selectMenu = new JMenu(trans.get("RocketActions.Select"));
selectMenu.add(actions.getSelectSameColorAction()); selectMenu.add(actions.getSelectSameColorAction());
selectMenu.add(actions.getSelectNoneAction()); selectMenu.add(actions.getDeselectAllAction());
popupMenu.add(selectMenu); popupMenu.add(selectMenu);
popupMenu.addSeparator(); popupMenu.addSeparator();
@ -667,7 +667,7 @@ public class BasicFrame extends JFrame {
menu.add(subMenu); menu.add(subMenu);
item = new JMenuItem(actions.getSelectSameColorAction()); item = new JMenuItem(actions.getSelectSameColorAction());
subMenu.add(item); subMenu.add(item);
item = new JMenuItem(actions.getSelectNoneAction()); item = new JMenuItem(actions.getDeselectAllAction());
subMenu.add(item); subMenu.add(item);
menu.addSeparator(); menu.addSeparator();

22
swing/src/net/sf/openrocket/gui/main/RocketActions.java
View File

@ -76,7 +76,7 @@ public class RocketActions {
private final RocketAction duplicateAction; private final RocketAction duplicateAction;
private final RocketAction editAction; private final RocketAction editAction;
private final RocketAction selectSameColorAction; private final RocketAction selectSameColorAction;
private final RocketAction selectNoneAction; private final RocketAction deselectAllAction;
private final RocketAction scaleAction; private final RocketAction scaleAction;
private final RocketAction moveUpAction; private final RocketAction moveUpAction;
private final RocketAction moveDownAction; private final RocketAction moveDownAction;
@ -102,7 +102,7 @@ public class RocketActions {
this.duplicateAction = new DuplicateAction(); this.duplicateAction = new DuplicateAction();
this.editAction = new EditAction(); this.editAction = new EditAction();
this.selectSameColorAction = new SelectSameColorAction(); this.selectSameColorAction = new SelectSameColorAction();
this.selectNoneAction = new SelectNoneAction(); this.deselectAllAction = new DeselectAllAction();
this.scaleAction = new ScaleAction(); this.scaleAction = new ScaleAction();
this.moveUpAction = new MoveUpAction(); this.moveUpAction = new MoveUpAction();
this.moveDownAction = new MoveDownAction(); this.moveDownAction = new MoveDownAction();
@ -137,7 +137,7 @@ public class RocketActions {
duplicateAction.clipboardChanged(); duplicateAction.clipboardChanged();
editAction.clipboardChanged(); editAction.clipboardChanged();
selectSameColorAction.clipboardChanged(); selectSameColorAction.clipboardChanged();
selectNoneAction.clipboardChanged(); deselectAllAction.clipboardChanged();
scaleAction.clipboardChanged(); scaleAction.clipboardChanged();
moveUpAction.clipboardChanged(); moveUpAction.clipboardChanged();
moveDownAction.clipboardChanged(); moveDownAction.clipboardChanged();
@ -182,8 +182,8 @@ public class RocketActions {
return selectSameColorAction; return selectSameColorAction;
} }
public Action getSelectNoneAction() { public Action getDeselectAllAction() {
return selectNoneAction; return deselectAllAction;
} }
public Action getScaleAction() { 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; private static final long serialVersionUID = 1L;
public SelectNoneAction() { public DeselectAllAction() {
//// Select none //// Deselect all
this.putValue(NAME, trans.get("RocketActions.Select.SelectNoneAct")); this.putValue(NAME, trans.get("RocketActions.Select.DeselectAllAct"));
this.putValue(SHORT_DESCRIPTION, trans.get("RocketActions.Select.SelectNoneAct.ttip")); this.putValue(SHORT_DESCRIPTION, trans.get("RocketActions.Select.DeselectAllAct.ttip"));
clipboardChanged(); clipboardChanged();
} }