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

Wired in the ComponentPresetEditor into the Edit menu. It is currently disabled because of some bugs in the ComponentPresetEditor.

Browse Source
This commit is contained in:
Kevin Ruland 2012-09-26 14:45:55 +00:00
parent d5d0c7f8b8
commit a28c99fc54
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1097,6 +1097,7 @@ main.menu.edit.paste = Paste
main.menu.edit.delete = Delete
main.menu.edit.resize = Scale...
main.menu.edit.resize.desc = Scale parts of the rocket design
main.menu.edit.editpreset= Edit Component Preset File
main.menu.edit.preferences = Preferences
main.menu.edit.preferences.desc = Setup the application preferences

23
core/src/net/sf/openrocket/gui/main/BasicFrame.java
View File

@ -28,6 +28,7 @@ import net.sf.openrocket.gui.dialogs.optimization.GeneralOptimizationDialog;
import net.sf.openrocket.gui.dialogs.preferences.PreferencesDialog;
import net.sf.openrocket.gui.help.tours.GuidedTourSelectionDialog;
import net.sf.openrocket.gui.main.componenttree.ComponentTree;
import net.sf.openrocket.gui.preset.ComponentPresetEditor;
import net.sf.openrocket.gui.scalefigure.RocketPanel;
import net.sf.openrocket.gui.util.FileHelper;
import net.sf.openrocket.gui.util.GUIUtil;
@ -54,6 +55,7 @@ import javax.swing.BorderFactory;
import javax.swing.InputMap;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.JMenu;
@ -523,7 +525,7 @@ public class BasicFrame extends JFrame {
menu.add(item);
menu.addSeparator();
//// Quit
item = new JMenuItem(trans.get("main.menu.file.quit"), KeyEvent.VK_Q);
item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q, ActionEvent.CTRL_MASK));
@ -615,9 +617,22 @@ public class BasicFrame extends JFrame {
});
menu.add(item);
//// Edit Component Preset File
/*
item = new JMenuItem(trans.get("main.menu.edit.editpreset"));
item.addActionListener( new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
JFrame dialog = new JFrame();
dialog.getContentPane().add(new ComponentPresetEditor(dialog));
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
dialog.pack();
dialog.setVisible(true);
}
});
menu.add(item);
*/
//// Analyze
menu = new JMenu(trans.get("main.menu.analyze"));
menu.setMnemonic(KeyEvent.VK_A);

7
core/src/net/sf/openrocket/gui/preset/ComponentPresetEditor.java
View File

@ -1,5 +1,6 @@
package net.sf.openrocket.gui.preset;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
@ -25,6 +26,7 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSeparator;
import javax.swing.JTable;
import javax.swing.SwingUtilities;
import javax.swing.table.DefaultTableModel;
import javax.xml.bind.JAXBException;
@ -198,11 +200,12 @@ public class ComponentPresetEditor extends JPanel implements PresetResultListene
JSeparator separator_1 = new JSeparator();
mnFile.add(separator_1);
JMenuItem mntmExit = new JMenuItem("Exit");
JMenuItem mntmExit = new JMenuItem("Close");
mnFile.add(mntmExit);
mntmExit.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
System.exit(0);
Window w = SwingUtilities.getWindowAncestor(ComponentPresetEditor.this);
w.dispose();
}
});