import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.concurrent.ExecutionException;
import javax.swing.Action;
+import javax.swing.BorderFactory;
import javax.swing.InputMap;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
+import javax.swing.JSpinner;
import javax.swing.JSplitPane;
import javax.swing.JTabbedPane;
import javax.swing.JTextField;
import javax.swing.ListSelectionModel;
import javax.swing.ScrollPaneConstants;
import javax.swing.SwingUtilities;
+import javax.swing.border.BevelBorder;
import javax.swing.border.TitledBorder;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import net.sf.openrocket.gui.dialogs.WarningDialog;
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.optimization.OptimizationTestDialog;
import net.sf.openrocket.gui.scalefigure.RocketPanel;
+import net.sf.openrocket.gui.util.FileHelper;
+import net.sf.openrocket.gui.util.GUIUtil;
+import net.sf.openrocket.gui.util.Icons;
+import net.sf.openrocket.gui.util.OpenFileWorker;
+import net.sf.openrocket.gui.util.SaveFileWorker;
+import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
import net.sf.openrocket.rocketcomponent.Stage;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.BugException;
-import net.sf.openrocket.util.FileHelper;
-import net.sf.openrocket.util.GUIUtil;
-import net.sf.openrocket.util.Icons;
import net.sf.openrocket.util.MemoryManagement;
import net.sf.openrocket.util.MemoryManagement.MemoryData;
-import net.sf.openrocket.util.OpenFileWorker;
-import net.sf.openrocket.util.Prefs;
import net.sf.openrocket.util.Reflection;
-import net.sf.openrocket.util.SaveFileWorker;
import net.sf.openrocket.util.TestRockets;
public class BasicFrame extends JFrame {
private static final ArrayList<BasicFrame> frames = new ArrayList<BasicFrame>();
-
-
-
/**
* Whether "New" and "Open" should replace this frame.
* Should be set to false on the first rocket modification.
setTitle();
this.pack();
- Dimension size = Prefs.getWindowSize(this.getClass());
- if (size == null) {
- size = Toolkit.getDefaultToolkit().getScreenSize();
- size.width = size.width * 9 / 10;
- size.height = size.height * 9 / 10;
- }
+
+ // Set initial window size
+ Dimension size = Toolkit.getDefaultToolkit().getScreenSize();
+ size.width = size.width * 9 / 10;
+ size.height = size.height * 9 / 10;
this.setSize(size);
- this.addComponentListener(new ComponentAdapter() {
- @Override
- public void componentResized(ComponentEvent e) {
- Prefs.setWindowSize(BasicFrame.this.getClass(), BasicFrame.this.getSize());
- }
- });
+
+ // Remember changed size
+ GUIUtil.rememberWindowSize(this);
+
this.setLocationByPlatform(true);
GUIUtil.setWindowIcons(this);
closeAction();
}
});
- frames.add(this);
+ frames.add(this);
log.debug("BasicFrame instantiation complete");
}
scroll.setBorder(null);
scroll.setViewportBorder(null);
- TitledBorder border = new TitledBorder(trans.get("BasicFrame.title.Addnewcomp"));
- border.setTitleFont(border.getTitleFont().deriveFont(Font.BOLD));
+ TitledBorder border = BorderFactory.createTitledBorder(trans.get("BasicFrame.title.Addnewcomp"));
+ GUIUtil.changeFontStyle(border, Font.BOLD);
scroll.setBorder(border);
panel.add(scroll, "grow");
menu.add(item);
+ item = new JMenuItem(trans.get("main.menu.analyze.optimization"), KeyEvent.VK_O);
+ item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.optimization.desc"));
+ item.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ log.user("Rocket optimization selected");
+ new GeneralOptimizationDialog(document, BasicFrame.this).setVisible(true);
+ }
+ });
+ menu.add(item);
+
+
+
//// Debug
// (shown if openrocket.debug.menu is defined)
if (System.getProperty("openrocket.debug.menu") != null) {
menu = new JMenu(trans.get("main.menu.help"));
menu.setMnemonic(KeyEvent.VK_H);
- //// Information about OpenRocket
menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.desc"));
menubar.add(menu);
+ // Guided tours
+
+ item = new JMenuItem(trans.get("main.menu.help.tours"), KeyEvent.VK_L);
+ // TODO: Icon
+ item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.tours.desc"));
+ item.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ log.user("Guided tours selected");
+ // FIXME: Singleton
+ new GuidedTourSelectionDialog(BasicFrame.this).setVisible(true);
+ }
+ });
+ menu.add(item);
+
+ menu.addSeparator();
+
+
//// License
item = new JMenuItem(trans.get("main.menu.help.license"), KeyEvent.VK_L);
- //// OpenRocket license information
+ item.setIcon(Icons.HELP_LICENSE);
item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.license.desc"));
item.addActionListener(new ActionListener() {
@Override
//// Bug report
item = new JMenuItem(trans.get("main.menu.help.bugReport"), KeyEvent.VK_B);
- //// Information about reporting bugs in OpenRocket
+ item.setIcon(Icons.HELP_BUG_REPORT);
item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.bugReport.desc"));
item.addActionListener(new ActionListener() {
@Override
//// Debug log
item = new JMenuItem(trans.get("main.menu.help.debugLog"));
- //// View the OpenRocket debug log
+ item.setIcon(Icons.HELP_DEBUG_LOG);
item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.debugLog.desc"));
item.addActionListener(new ActionListener() {
@Override
//// About
item = new JMenuItem(trans.get("main.menu.help.about"), KeyEvent.VK_A);
- //// About OpenRocket
+ item.setIcon(Icons.HELP_ABOUT);
item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.about.desc"));
item.addActionListener(new ActionListener() {
@Override
menu.add(item);
- item = new JMenuItem("General optimization test");
- item.addActionListener(new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- new GeneralOptimizationDialog(document, BasicFrame.this).setVisible(true);
- }
- });
- menu.add(item);
+ menu.addSeparator();
- item = new JMenuItem("Optimization test");
+ item = new JMenuItem("Test popup");
item.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- new OptimizationTestDialog(BasicFrame.this, document).setVisible(true);
+ log.user("Test popup selected");
+ JPanel panel = new JPanel();
+ panel.add(new JTextField(40));
+ panel.add(new JSpinner());
+ JPopupMenu popup = new JPopupMenu();
+ popup.setBorder(BorderFactory.createBevelBorder(BevelBorder.RAISED));
+ popup.add(panel);
+ popup.show(BasicFrame.this, -50, 100);
}
});
menu.add(item);
+
+
+
return menu;
}
chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
chooser.setMultiSelectionEnabled(true);
- chooser.setCurrentDirectory(Prefs.getDefaultDirectory());
+ chooser.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultDirectory());
int option = chooser.showOpenDialog(this);
if (option != JFileChooser.APPROVE_OPTION) {
log.user("Decided not to open files, option=" + option);
return;
}
- Prefs.setDefaultDirectory(chooser.getCurrentDirectory());
+ ((SwingPreferences) Application.getPreferences()).setDefaultDirectory(chooser.getCurrentDirectory());
File[] files = chooser.getSelectedFiles();
log.user("Opening files " + Arrays.toString(files));
// Close previous window if replacing
if (replaceable && document.isSaved()) {
+ // We are replacing the frame, make new window have current location
+ BasicFrame newFrame = frames.get(frames.size() - 1);
+ newFrame.setLocation(this.getLocation());
+
log.info("Closing window because it is replaceable");
closeAction();
replaceable = false;
doc.setFile(file);
doc.setSaved(true);
+
// Open the frame
log.debug("Opening new frame with the document");
BasicFrame frame = new BasicFrame(doc);
new StorageOptionChooser(document, document.getDefaultStorageOptions());
JFileChooser chooser = new JFileChooser();
chooser.setFileFilter(FileHelper.OPENROCKET_DESIGN_FILTER);
- chooser.setCurrentDirectory(Prefs.getDefaultDirectory());
+ chooser.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultDirectory());
chooser.setAccessory(storageChooser);
if (document.getFile() != null)
chooser.setSelectedFile(document.getFile());
return false;
}
- Prefs.setDefaultDirectory(chooser.getCurrentDirectory());
+ ((SwingPreferences) Application.getPreferences()).setDefaultDirectory(chooser.getCurrentDirectory());
storageChooser.storeOptions(document.getDefaultStorageOptions());
file = FileHelper.ensureExtension(file, "ork");
*
*/
public void printAction() {
- if (!Prefs.getBoolean("printing.experimental.communicated", false)) {
- log.info("Showing printing is experimental warning to the user");
- JOptionPane.showMessageDialog(this, "Printing is an currently an experimental feature " +
- "and might not fully work on all platforms",
- "Experimental feature", JOptionPane.WARNING_MESSAGE);
- Prefs.putBoolean("printing.experimental.communicated", true);
- }
new PrintDialog(this, document).setVisible(true);
}
projects / debian / openrocket / blobdiff