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

Move scale action to RocketActions

Browse Source
This commit is contained in:
SiboVG 2022-05-30 21:05:28 +02:00
parent 3ceefa0ba4
commit 8c3e67642f
2 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -726,19 +726,7 @@ public class BasicFrame extends JFrame {
menu.addSeparator(); menu.addSeparator();
item = new JMenuItem(actions.getScaleAction());
item = new JMenuItem(trans.get("main.menu.edit.resize"));
item.setIcon(Icons.EDIT_SCALE);
item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.edit.resize.desc"));
item.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
log.info(Markers.USER_MARKER, "Scale... selected");
ScaleDialog dialog = new ScaleDialog(document, getSelectedComponents(), BasicFrame.this);
dialog.setVisible(true);
dialog.dispose();
}
});
menu.add(item); menu.add(item);

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

@ -21,8 +21,10 @@ import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.gui.components.StyledLabel; import net.sf.openrocket.gui.components.StyledLabel;
import net.sf.openrocket.gui.configdialog.ComponentConfigDialog; import net.sf.openrocket.gui.configdialog.ComponentConfigDialog;
import net.sf.openrocket.gui.dialogs.ScaleDialog;
import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.gui.util.Icons;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.Markers;
import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
import net.sf.openrocket.rocketcomponent.ComponentChangeListener; import net.sf.openrocket.rocketcomponent.ComponentChangeListener;
import net.sf.openrocket.rocketcomponent.ParallelStage; import net.sf.openrocket.rocketcomponent.ParallelStage;
@ -32,7 +34,8 @@ import net.sf.openrocket.rocketcomponent.AxialStage;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.startup.Preferences; import net.sf.openrocket.startup.Preferences;
import net.sf.openrocket.util.Pair; import net.sf.openrocket.util.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
@ -69,10 +72,12 @@ public class RocketActions {
private final RocketAction duplicateAction; private final RocketAction duplicateAction;
private final RocketAction editAction; private final RocketAction editAction;
private final RocketAction editActionNoIcon; private final RocketAction editActionNoIcon;
private final RocketAction scaleAction;
private final RocketAction newStageAction; private final RocketAction newStageAction;
private final RocketAction moveUpAction; private final RocketAction moveUpAction;
private final RocketAction moveDownAction; private final RocketAction moveDownAction;
private static final Translator trans = Application.getTranslator(); private static final Translator trans = Application.getTranslator();
private static final Logger log = LoggerFactory.getLogger(RocketActions.class);
public RocketActions(OpenRocketDocument document, DocumentSelectionModel selectionModel, public RocketActions(OpenRocketDocument document, DocumentSelectionModel selectionModel,
@ -92,6 +97,7 @@ public class RocketActions {
this.duplicateAction = new DuplicateAction(); this.duplicateAction = new DuplicateAction();
this.editAction = new EditAction(); this.editAction = new EditAction();
this.editActionNoIcon = new EditAction(); this.editActionNoIcon = new EditAction();
this.scaleAction = new ScaleAction();
this.editActionNoIcon.putValue(Action.SMALL_ICON, null); this.editActionNoIcon.putValue(Action.SMALL_ICON, null);
this.editActionNoIcon.putValue(Action.MNEMONIC_KEY, null); this.editActionNoIcon.putValue(Action.MNEMONIC_KEY, null);
this.editActionNoIcon.putValue(Action.ACCELERATOR_KEY, null); this.editActionNoIcon.putValue(Action.ACCELERATOR_KEY, null);
@ -129,6 +135,7 @@ public class RocketActions {
duplicateAction.clipboardChanged(); duplicateAction.clipboardChanged();
editAction.clipboardChanged(); editAction.clipboardChanged();
editActionNoIcon.clipboardChanged(); editActionNoIcon.clipboardChanged();
scaleAction.clipboardChanged();
newStageAction.clipboardChanged(); newStageAction.clipboardChanged();
moveUpAction.clipboardChanged(); moveUpAction.clipboardChanged();
moveDownAction.clipboardChanged(); moveDownAction.clipboardChanged();
@ -173,6 +180,10 @@ public class RocketActions {
return editActionNoIcon; return editActionNoIcon;
} }
public Action getScaleAction() {
return scaleAction;
}
public Action getNewStageAction() { public Action getNewStageAction() {
return newStageAction; return newStageAction;
} }
@ -924,7 +935,33 @@ public class RocketActions {
} }
} }
/**
* Action to scale the currently selected component.
*/
private class ScaleAction extends RocketAction {
private static final long serialVersionUID = 1L;
public ScaleAction() {
//// Scale
this.putValue(NAME, trans.get("RocketActions.ScaleAct.Scale"));
this.putValue(SHORT_DESCRIPTION, trans.get("RocketActions.ScaleAct.ttip.Scale"));
this.putValue(SMALL_ICON, Icons.EDIT_SCALE);
clipboardChanged();
}
@Override
public void actionPerformed(ActionEvent e) {
log.info(Markers.USER_MARKER, "Scale... selected");
ScaleDialog dialog = new ScaleDialog(document, selectionModel.getSelectedComponents(), null);
dialog.setVisible(true);
dialog.dispose();
}
@Override
public void clipboardChanged() {
this.setEnabled(true);
}
}