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

Clean up code

Browse Source
This commit is contained in:
SiboVG 2022-05-31 23:05:26 +02:00
parent 8d3e67bfb1
commit 49658600b7
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -351,7 +351,9 @@ public class BasicFrame extends JFrame {
button = new SelectColorButton(actions.getMoveDownAction()); button = new SelectColorButton(actions.getMoveDownAction());
panel.add(button, "sizegroup buttons, aligny 0%"); panel.add(button, "sizegroup buttons, aligny 0%");
button = new SelectColorButton(actions.getEditActionNoIcon()); button = new SelectColorButton(actions.getEditAction());
button.setIcon(null);
button.setMnemonic(0);
panel.add(button, "sizegroup buttons"); panel.add(button, "sizegroup buttons");
button = new SelectColorButton(actions.getDeleteAction()); button = new SelectColorButton(actions.getDeleteAction());

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

@ -72,7 +72,6 @@ public class RocketActions {
private final RocketAction pasteAction; private final RocketAction pasteAction;
private final RocketAction duplicateAction; private final RocketAction duplicateAction;
private final RocketAction editAction; private final RocketAction editAction;
private final RocketAction editActionNoIcon;
private final RocketAction scaleAction; private final RocketAction scaleAction;
private final RocketAction newStageAction; private final RocketAction newStageAction;
private final RocketAction moveUpAction; private final RocketAction moveUpAction;
@ -98,11 +97,7 @@ public class RocketActions {
this.pasteAction = new PasteAction(); this.pasteAction = new PasteAction();
this.duplicateAction = new DuplicateAction(); this.duplicateAction = new DuplicateAction();
this.editAction = new EditAction(); this.editAction = new EditAction();
this.editActionNoIcon = new EditAction();
this.scaleAction = new ScaleAction(); this.scaleAction = new ScaleAction();
this.editActionNoIcon.putValue(Action.SMALL_ICON, null);
this.editActionNoIcon.putValue(Action.MNEMONIC_KEY, null);
this.editActionNoIcon.putValue(Action.ACCELERATOR_KEY, null);
this.newStageAction = new NewStageAction(); this.newStageAction = new NewStageAction();
this.moveUpAction = new MoveUpAction(); this.moveUpAction = new MoveUpAction();
this.moveDownAction = new MoveDownAction(); this.moveDownAction = new MoveDownAction();
@ -136,7 +131,6 @@ public class RocketActions {
pasteAction.clipboardChanged(); pasteAction.clipboardChanged();
duplicateAction.clipboardChanged(); duplicateAction.clipboardChanged();
editAction.clipboardChanged(); editAction.clipboardChanged();
editActionNoIcon.clipboardChanged();
scaleAction.clipboardChanged(); scaleAction.clipboardChanged();
newStageAction.clipboardChanged(); newStageAction.clipboardChanged();
moveUpAction.clipboardChanged(); moveUpAction.clipboardChanged();
@ -178,10 +172,6 @@ public class RocketActions {
return editAction; return editAction;
} }
public Action getEditActionNoIcon() {
return editActionNoIcon;
}
public Action getScaleAction() { public Action getScaleAction() {
return scaleAction; return scaleAction;
} }