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

Fix bad naming of menu variables

Browse Source
This commit is contained in:
SiboVG 2023-03-27 22:50:45 +02:00
parent e210415a7b
commit 522c3a49b6
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -515,12 +515,12 @@ public class BasicFrame extends JFrame {
fileMenu.add(item); fileMenu.add(item);
//// Edit //// Edit
fileMenu = new JMenu(trans.get("main.menu.edit")); JMenu editMenu = new JMenu(trans.get("main.menu.edit"));
fileMenu.setMnemonic(KeyEvent.VK_E); editMenu.setMnemonic(KeyEvent.VK_E);
//// Rocket editing //// Rocket editing
fileMenu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.edit.desc")); editMenu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.edit.desc"));
menubar.add(fileMenu); menubar.add(editMenu);
Action action = UndoRedoAction.newUndoAction(document); Action action = UndoRedoAction.newUndoAction(document);
item = new JMenuItem(action); item = new JMenuItem(action);
@ -530,7 +530,7 @@ public class BasicFrame extends JFrame {
//// Undo the previous operation //// Undo the previous operation
item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.edit.undo.desc")); item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.edit.undo.desc"));
fileMenu.add(item); editMenu.add(item);
action = UndoRedoAction.newRedoAction(document); action = UndoRedoAction.newRedoAction(document);
item = new JMenuItem(action); item = new JMenuItem(action);
@ -539,42 +539,42 @@ public class BasicFrame extends JFrame {
//// Redo the previously undone operation //// Redo the previously undone operation
item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.edit.redo.desc")); item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.edit.redo.desc"));
fileMenu.add(item); editMenu.add(item);
fileMenu.addSeparator(); editMenu.addSeparator();
item = new JMenuItem(actions.getEditAction()); item = new JMenuItem(actions.getEditAction());
fileMenu.add(item); editMenu.add(item);
item = new JMenuItem(actions.getCutAction()); item = new JMenuItem(actions.getCutAction());
fileMenu.add(item); editMenu.add(item);
item = new JMenuItem(actions.getCopyAction()); item = new JMenuItem(actions.getCopyAction());
fileMenu.add(item); editMenu.add(item);
item = new JMenuItem(actions.getPasteAction()); item = new JMenuItem(actions.getPasteAction());
fileMenu.add(item); editMenu.add(item);
item = new JMenuItem(actions.getDuplicateAction()); item = new JMenuItem(actions.getDuplicateAction());
fileMenu.add(item); editMenu.add(item);
item = new JMenuItem(actions.getDeleteAction()); item = new JMenuItem(actions.getDeleteAction());
fileMenu.add(item); editMenu.add(item);
fileMenu.addSeparator(); editMenu.addSeparator();
JMenu subMenu = new JMenu(trans.get("RocketActions.Select")); JMenu subMenu = new JMenu(trans.get("RocketActions.Select"));
fileMenu.add(subMenu); editMenu.add(subMenu);
item = new JMenuItem(actions.getSelectSameColorAction()); item = new JMenuItem(actions.getSelectSameColorAction());
subMenu.add(item); subMenu.add(item);
item = new JMenuItem(actions.getDeselectAllAction()); item = new JMenuItem(actions.getDeselectAllAction());
subMenu.add(item); subMenu.add(item);
fileMenu.addSeparator(); editMenu.addSeparator();
item = new JMenuItem(actions.getScaleAction()); item = new JMenuItem(actions.getScaleAction());
fileMenu.add(item); editMenu.add(item);
//// Preferences //// Preferences
@ -590,7 +590,7 @@ public class BasicFrame extends JFrame {
PreferencesDialog.showPreferences(BasicFrame.this); PreferencesDialog.showPreferences(BasicFrame.this);
} }
}); });
fileMenu.add(item); editMenu.add(item);
//// Edit Component Preset File //// Edit Component Preset File
if (System.getProperty("openrocket.preseteditor.fileMenu") != null) { if (System.getProperty("openrocket.preseteditor.fileMenu") != null) {
@ -605,13 +605,13 @@ public class BasicFrame extends JFrame {
dialog.setVisible(true); dialog.setVisible(true);
} }
}); });
fileMenu.add(item); editMenu.add(item);
} }
// Tools // Tools
fileMenu = new JMenu(trans.get("main.menu.tools")); JMenu toolsMenu = new JMenu(trans.get("main.menu.tools"));
menubar.add(fileMenu); menubar.add(toolsMenu);
//// Component analysis //// Component analysis
item = new JMenuItem(trans.get("main.menu.tools.componentAnalysis"), KeyEvent.VK_C); item = new JMenuItem(trans.get("main.menu.tools.componentAnalysis"), KeyEvent.VK_C);
@ -625,7 +625,7 @@ public class BasicFrame extends JFrame {
ComponentAnalysisDialog.showDialog(rocketpanel); ComponentAnalysisDialog.showDialog(rocketpanel);
} }
}); });
fileMenu.add(item); toolsMenu.add(item);
//// Optimize //// Optimize
item = new JMenuItem(trans.get("main.menu.tools.optimization"), KeyEvent.VK_O); item = new JMenuItem(trans.get("main.menu.tools.optimization"), KeyEvent.VK_O);
@ -641,7 +641,7 @@ public class BasicFrame extends JFrame {
} }
} }
}); });
fileMenu.add(item); toolsMenu.add(item);
//// Custom expressions //// Custom expressions
item = new JMenuItem(trans.get("main.menu.tools.customExpressions"), KeyEvent.VK_E); item = new JMenuItem(trans.get("main.menu.tools.customExpressions"), KeyEvent.VK_E);
@ -653,7 +653,7 @@ public class BasicFrame extends JFrame {
new CustomExpressionDialog(document, BasicFrame.this).setVisible(true); new CustomExpressionDialog(document, BasicFrame.this).setVisible(true);
} }
}); });
fileMenu.add(item); toolsMenu.add(item);
item = new JMenuItem(trans.get("PhotoFrame.title"), KeyEvent.VK_P); item = new JMenuItem(trans.get("PhotoFrame.title"), KeyEvent.VK_P);
item.getAccessibleContext().setAccessibleDescription(trans.get("PhotoFrame.desc")); item.getAccessibleContext().setAccessibleDescription(trans.get("PhotoFrame.desc"));
@ -665,7 +665,7 @@ public class BasicFrame extends JFrame {
pa.setVisible(true); pa.setVisible(true);
} }
}); });
fileMenu.add(item); toolsMenu.add(item);
//// Debug //// Debug
// // (shown if openrocket.debug.fileMenu is defined) // // (shown if openrocket.debug.fileMenu is defined)