]> git.gag.com Git - debian/openrocket/blobdiff - src/net/sf/openrocket/gui/main/BasicFrame.java
guided tours implementation
[debian/openrocket] / src / net / sf / openrocket / gui / main / BasicFrame.java
index 3c8f4e2c7e76ed02230525f04147421db1776323..417b67e64110876932e2ea63a86dc2b01f492015 100644 (file)
@@ -1,5 +1,62 @@
 package net.sf.openrocket.gui.main;
 
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+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.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+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.KeyStroke;
+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 javax.swing.tree.DefaultTreeSelectionModel;
+import javax.swing.tree.TreePath;
+import javax.swing.tree.TreeSelectionModel;
+
 import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.aerodynamics.WarningSet;
 import net.sf.openrocket.document.OpenRocketDocument;
@@ -19,11 +76,21 @@ import net.sf.openrocket.gui.dialogs.ExampleDesignDialog;
 import net.sf.openrocket.gui.dialogs.LicenseDialog;
 import net.sf.openrocket.gui.dialogs.MotorDatabaseLoadingDialog;
 import net.sf.openrocket.gui.dialogs.PrintDialog;
+import net.sf.openrocket.gui.dialogs.ScaleDialog;
 import net.sf.openrocket.gui.dialogs.SwingWorkerDialog;
 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.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.ComponentChangeListener;
@@ -32,72 +99,11 @@ import net.sf.openrocket.rocketcomponent.RocketComponent;
 import net.sf.openrocket.rocketcomponent.Stage;
 import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.util.BugException;
-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;
 
-import javax.swing.Action;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JSplitPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
-import javax.swing.ListSelectionModel;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.filechooser.FileFilter;
-import javax.swing.tree.DefaultTreeSelectionModel;
-import javax.swing.tree.TreePath;
-import javax.swing.tree.TreeSelectionModel;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Toolkit;
-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.awt.event.MouseListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
 public class BasicFrame extends JFrame {
        private static final LogHelper log = Application.getLogger();
        
@@ -108,21 +114,8 @@ public class BasicFrame extends JFrame {
        
        private static final RocketSaver ROCKET_SAVER = new OpenRocketSaver();
        
-
-       // FileFilters for different types of rocket design files
-       private static final FileFilter ALL_DESIGNS_FILTER =
-                       new SimpleFileFilter("All rocket designs (*.ork; *.rkt)",
-                                       ".ork", ".ork.gz", ".rkt", ".rkt.gz");
-       
-       private static final FileFilter OPENROCKET_DESIGN_FILTER =
-                       new SimpleFileFilter("OpenRocket designs (*.ork)", ".ork", ".ork.gz");
+       private static final Translator trans = Application.getTranslator();
        
-       private static final FileFilter ROCKSIM_DESIGN_FILTER =
-                       new SimpleFileFilter("RockSim designs (*.rkt)", ".rkt", ".rkt.gz");
-       
-
-
-
        public static final int COMPONENT_TAB = 0;
        public static final int SIMULATION_TAB = 1;
        
@@ -134,9 +127,6 @@ 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.
@@ -177,6 +167,7 @@ public class BasicFrame extends JFrame {
 
                // Set replaceable flag to false at first modification
                rocket.addComponentChangeListener(new ComponentChangeListener() {
+                       @Override
                        public void componentChanged(ComponentChangeEvent e) {
                                replaceable = false;
                                BasicFrame.this.rocket.removeComponentChangeListener(this);
@@ -211,8 +202,10 @@ public class BasicFrame extends JFrame {
 
                // The top tabbed pane
                tabbedPane = new JTabbedPane();
-               tabbedPane.addTab("Rocket design", null, designTab());
-               tabbedPane.addTab("Flight simulations", null, simulationPanel);
+               //// Rocket design
+               tabbedPane.addTab(trans.get("BasicFrame.tab.Rocketdesign"), null, designTab());
+               //// Flight simulations
+               tabbedPane.addTab(trans.get("BasicFrame.tab.Flightsim"), null, simulationPanel);
                
                vertical.setTopComponent(tabbedPane);
                
@@ -230,6 +223,7 @@ public class BasicFrame extends JFrame {
                
 
                rocket.addComponentChangeListener(new ComponentChangeListener() {
+                       @Override
                        public void componentChanged(ComponentChangeEvent e) {
                                setTitle();
                        }
@@ -238,19 +232,16 @@ public class BasicFrame extends JFrame {
                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);
@@ -264,8 +255,8 @@ public class BasicFrame extends JFrame {
                                closeAction();
                        }
                });
-               frames.add(this);
                
+               frames.add(this);
                log.debug("BasicFrame instantiation complete");
        }
        
@@ -319,6 +310,7 @@ public class BasicFrame extends JFrame {
                
                // Update dialog when selection is changed
                componentSelectionModel.addTreeSelectionListener(new TreeSelectionListener() {
+                       @Override
                        public void valueChanged(TreeSelectionEvent e) {
                                // Scroll tree to the selected item
                                TreePath path = componentSelectionModel.getSelectionPath();
@@ -371,8 +363,8 @@ public class BasicFrame extends JFrame {
                scroll.setBorder(null);
                scroll.setViewportBorder(null);
                
-               TitledBorder border = new TitledBorder("Add new component");
-               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");
@@ -384,6 +376,19 @@ public class BasicFrame extends JFrame {
        
        
 
+       /**
+        * Return the currently selected rocket component, or <code>null</code> if none selected.
+        */
+       private RocketComponent getSelectedComponent() {
+               TreePath path = componentSelectionModel.getSelectionPath();
+               if (path == null)
+                       return null;
+               tree.scrollPathToVisible(path);
+               
+               return (RocketComponent) path.getLastPathComponent();
+       }
+       
+       
        /**
         * Creates the menu for the window.
         */
@@ -393,17 +398,21 @@ public class BasicFrame extends JFrame {
                JMenuItem item;
                
                ////  File
-               menu = new JMenu("File");
+               menu = new JMenu(trans.get("main.menu.file"));
                menu.setMnemonic(KeyEvent.VK_F);
-               menu.getAccessibleContext().setAccessibleDescription("File-handling related tasks");
+               //// File-handling related tasks
+               menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.file.desc"));
                menubar.add(menu);
                
-               item = new JMenuItem("New", KeyEvent.VK_N);
+               //// New 
+               item = new JMenuItem(trans.get("main.menu.file.new"), KeyEvent.VK_N);
                item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, ActionEvent.CTRL_MASK));
                item.setMnemonic(KeyEvent.VK_N);
-               item.getAccessibleContext().setAccessibleDescription("Create a new rocket design");
+               //// Create a new rocket design
+               item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.file.new.desc"));
                item.setIcon(Icons.FILE_NEW);
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("New... selected");
                                newAction();
@@ -415,11 +424,14 @@ public class BasicFrame extends JFrame {
                });
                menu.add(item);
                
-               item = new JMenuItem("Open...", KeyEvent.VK_O);
+               //// Open...
+               item = new JMenuItem(trans.get("main.menu.file.open"), KeyEvent.VK_O);
                item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, ActionEvent.CTRL_MASK));
-               item.getAccessibleContext().setAccessibleDescription("Open a rocket design");
+               //// Open a rocket design
+               item.getAccessibleContext().setAccessibleDescription(trans.get("BasicFrame.item.Openrocketdesign"));
                item.setIcon(Icons.FILE_OPEN);
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("Open... selected");
                                openAction();
@@ -427,12 +439,15 @@ public class BasicFrame extends JFrame {
                });
                menu.add(item);
                
-               item = new JMenuItem("Open example...");
-               item.getAccessibleContext().setAccessibleDescription("Open an example rocket design");
+               //// Open example...
+               item = new JMenuItem(trans.get("main.menu.file.openExample"));
+               //// Open an example rocket design
+               item.getAccessibleContext().setAccessibleDescription(trans.get("BasicFrame.item.Openexamplerocketdesign"));
                item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O,
                                ActionEvent.CTRL_MASK | ActionEvent.SHIFT_MASK));
                item.setIcon(Icons.FILE_OPEN_EXAMPLE);
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("Open example... selected");
                                URL[] urls = ExampleDesignDialog.selectExampleDesigns(BasicFrame.this);
@@ -448,11 +463,14 @@ public class BasicFrame extends JFrame {
                
                menu.addSeparator();
                
-               item = new JMenuItem("Save", KeyEvent.VK_S);
+               //// Save
+               item = new JMenuItem(trans.get("main.menu.file.save"), KeyEvent.VK_S);
                item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, ActionEvent.CTRL_MASK));
-               item.getAccessibleContext().setAccessibleDescription("Save the current rocket design");
+               //// Save the current rocket design
+               item.getAccessibleContext().setAccessibleDescription(trans.get("BasicFrame.item.SavecurRocketdesign"));
                item.setIcon(Icons.FILE_SAVE);
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("Save selected");
                                saveAction();
@@ -460,13 +478,15 @@ public class BasicFrame extends JFrame {
                });
                menu.add(item);
                
-               item = new JMenuItem("Save as...", KeyEvent.VK_A);
+               //// Save as...
+               item = new JMenuItem(trans.get("main.menu.file.saveAs"), KeyEvent.VK_A);
                item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S,
                                ActionEvent.CTRL_MASK | ActionEvent.SHIFT_MASK));
-               item.getAccessibleContext().setAccessibleDescription("Save the current rocket design " +
-                               "to a new file");
+               //// Save the current rocket design to a new file
+               item.getAccessibleContext().setAccessibleDescription(trans.get("BasicFrame.item.SavecurRocketdesnewfile"));
                item.setIcon(Icons.FILE_SAVE_AS);
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("Save as... selected");
                                saveAsAction();
@@ -474,14 +494,32 @@ public class BasicFrame extends JFrame {
                });
                menu.add(item);
                
-               //              menu.addSeparator();
-               menu.add(new JSeparator());
+               //// Print...
+               item = new JMenuItem(trans.get("main.menu.file.print"), KeyEvent.VK_P);
+               item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_P, ActionEvent.CTRL_MASK));
+               //// Print parts list and fin template
+               item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.file.print.desc"));
+               item.setIcon(Icons.FILE_PRINT);
+               item.addActionListener(new ActionListener() {
+                       @Override
+                       public void actionPerformed(ActionEvent e) {
+                               log.user("Print action selected");
+                               printAction();
+                       }
+               });
+               menu.add(item);
+               
+
+               menu.addSeparator();
                
-               item = new JMenuItem("Close", KeyEvent.VK_C);
+               //// Close
+               item = new JMenuItem(trans.get("main.menu.file.close"), KeyEvent.VK_C);
                item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_W, ActionEvent.CTRL_MASK));
-               item.getAccessibleContext().setAccessibleDescription("Close the current rocket design");
+               //// Close the current rocket design
+               item.getAccessibleContext().setAccessibleDescription(trans.get("BasicFrame.item.Closedesign"));
                item.setIcon(Icons.FILE_CLOSE);
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("Close selected");
                                closeAction();
@@ -490,23 +528,15 @@ public class BasicFrame extends JFrame {
                menu.add(item);
                
                menu.addSeparator();
-
-
-        item = new JMenuItem("Print...", KeyEvent.VK_P);
-        item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_P, ActionEvent.CTRL_MASK));
-        item.getAccessibleContext().setAccessibleDescription("Print parts list and fin template");
-        item.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                printAction();
-            }
-        });
-        menu.add(item);
-        
-               item = new JMenuItem("Quit", KeyEvent.VK_Q);
+               
+               //// Quit
+               item = new JMenuItem(trans.get("main.menu.file.quit"), KeyEvent.VK_Q);
                item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q, ActionEvent.CTRL_MASK));
-               item.getAccessibleContext().setAccessibleDescription("Quit the program");
+               //// Quit the program
+               item.getAccessibleContext().setAccessibleDescription(trans.get("BasicFrame.item.Quitprogram"));
                item.setIcon(Icons.FILE_QUIT);
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("Quit selected");
                                quitAction();
@@ -517,9 +547,10 @@ public class BasicFrame extends JFrame {
 
 
                ////  Edit
-               menu = new JMenu("Edit");
+               menu = new JMenu(trans.get("main.menu.edit"));
                menu.setMnemonic(KeyEvent.VK_E);
-               menu.getAccessibleContext().setAccessibleDescription("Rocket editing");
+               //// Rocket editing
+               menu.getAccessibleContext().setAccessibleDescription(trans.get("BasicFrame.menu.Rocketedt"));
                menubar.add(menu);
                
 
@@ -527,7 +558,8 @@ public class BasicFrame extends JFrame {
                item = new JMenuItem(action);
                item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Z, ActionEvent.CTRL_MASK));
                item.setMnemonic(KeyEvent.VK_U);
-               item.getAccessibleContext().setAccessibleDescription("Undo the previous operation");
+               //// Undo the previous operation
+               item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.edit.undo.desc"));
                
                menu.add(item);
                
@@ -535,8 +567,8 @@ public class BasicFrame extends JFrame {
                item = new JMenuItem(action);
                item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Y, ActionEvent.CTRL_MASK));
                item.setMnemonic(KeyEvent.VK_R);
-               item.getAccessibleContext().setAccessibleDescription("Redo the previously undone " +
-                               "operation");
+               //// Redo the previously undone operation
+               item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.edit.redo.desc"));
                menu.add(item);
                
                menu.addSeparator();
@@ -556,14 +588,34 @@ public class BasicFrame extends JFrame {
                
                menu.addSeparator();
                
-               item = new JMenuItem("Preferences");
+
+
+               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.user("Scale... selected");
+                               ScaleDialog dialog = new ScaleDialog(document, getSelectedComponent(), BasicFrame.this);
+                               dialog.setVisible(true);
+                               dialog.dispose();
+                       }
+               });
+               menu.add(item);
+               
+
+
+               //// Preferences
+               item = new JMenuItem(trans.get("main.menu.edit.preferences"));
                item.setIcon(Icons.PREFERENCES);
-               item.getAccessibleContext().setAccessibleDescription("Setup the application " +
-                               "preferences");
+               //// Setup the application preferences
+               item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.edit.preferences.desc"));
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("Preferences selected");
-                               PreferencesDialog.showPreferences();
+                               PreferencesDialog.showPreferences(BasicFrame.this);
                        }
                });
                menu.add(item);
@@ -572,15 +624,18 @@ public class BasicFrame extends JFrame {
 
 
                ////  Analyze
-               menu = new JMenu("Analyze");
+               menu = new JMenu(trans.get("main.menu.analyze"));
                menu.setMnemonic(KeyEvent.VK_A);
-               menu.getAccessibleContext().setAccessibleDescription("Analyzing the rocket");
+               //// Analyzing the rocket
+               menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.desc"));
                menubar.add(menu);
                
-               item = new JMenuItem("Component analysis", KeyEvent.VK_C);
-               item.getAccessibleContext().setAccessibleDescription("Analyze the rocket components " +
-                               "separately");
+               //// Component analysis
+               item = new JMenuItem(trans.get("main.menu.analyze.componentAnalysis"), KeyEvent.VK_C);
+               //// Analyze the rocket components separately
+               item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.componentAnalysis.desc"));
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("Component analysis selected");
                                ComponentAnalysisDialog.showDialog(rocketpanel);
@@ -589,6 +644,19 @@ public class BasicFrame extends JFrame {
                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) {
@@ -599,16 +667,36 @@ public class BasicFrame extends JFrame {
 
                ////  Help
                
-               menu = new JMenu("Help");
+               menu = new JMenu(trans.get("main.menu.help"));
                menu.setMnemonic(KeyEvent.VK_H);
-               menu.getAccessibleContext().setAccessibleDescription("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();
+               
 
-               item = new JMenuItem("License", KeyEvent.VK_L);
-               item.getAccessibleContext().setAccessibleDescription("OpenRocket license information");
+               //// License
+               item = new JMenuItem(trans.get("main.menu.help.license"), KeyEvent.VK_L);
+               item.setIcon(Icons.HELP_LICENSE);
+               item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.license.desc"));
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("License selected");
                                new LicenseDialog(BasicFrame.this).setVisible(true);
@@ -618,10 +706,12 @@ public class BasicFrame extends JFrame {
                
                menu.addSeparator();
                
-               item = new JMenuItem("Bug report", KeyEvent.VK_B);
-               item.getAccessibleContext().setAccessibleDescription("Information about reporting " +
-                               "bugs in OpenRocket");
+               //// Bug report
+               item = new JMenuItem(trans.get("main.menu.help.bugReport"), KeyEvent.VK_B);
+               item.setIcon(Icons.HELP_BUG_REPORT);
+               item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.bugReport.desc"));
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("Bug report selected");
                                BugReportDialog.showBugReportDialog(BasicFrame.this);
@@ -629,9 +719,12 @@ public class BasicFrame extends JFrame {
                });
                menu.add(item);
                
-               item = new JMenuItem("Debug log");
-               item.getAccessibleContext().setAccessibleDescription("View the OpenRocket debug log");
+               //// Debug log
+               item = new JMenuItem(trans.get("main.menu.help.debugLog"));
+               item.setIcon(Icons.HELP_DEBUG_LOG);
+               item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.debugLog.desc"));
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("Debug log selected");
                                new DebugLogDialog(BasicFrame.this).setVisible(true);
@@ -641,9 +734,12 @@ public class BasicFrame extends JFrame {
                
                menu.addSeparator();
                
-               item = new JMenuItem("About", KeyEvent.VK_A);
-               item.getAccessibleContext().setAccessibleDescription("About OpenRocket");
+               //// About
+               item = new JMenuItem(trans.get("main.menu.help.about"), KeyEvent.VK_A);
+               item.setIcon(Icons.HELP_ABOUT);
+               item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.about.desc"));
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("About selected");
                                new AboutDialog(BasicFrame.this).setVisible(true);
@@ -655,17 +751,23 @@ public class BasicFrame extends JFrame {
                this.setJMenuBar(menubar);
        }
        
-       
        private JMenu makeDebugMenu() {
                JMenu menu;
                JMenuItem item;
                
+               /*
+                * This menu is intentionally left untranslated.
+                */
+
                ////  Debug menu
                menu = new JMenu("Debug");
+               //// OpenRocket debugging tasks
                menu.getAccessibleContext().setAccessibleDescription("OpenRocket debugging tasks");
                
+               //// What is this menu?
                item = new JMenuItem("What is this menu?");
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("What is this menu? selected");
                                JOptionPane.showMessageDialog(BasicFrame.this,
@@ -682,6 +784,7 @@ public class BasicFrame extends JFrame {
                
                menu.addSeparator();
                
+               //// Create test rocket
                item = new JMenuItem("Create test rocket");
                item.addActionListener(new ActionListener() {
                        @Override
@@ -754,7 +857,7 @@ public class BasicFrame extends JFrame {
                                log.user("Memory statistics selected");
                                
                                // Get discarded but remaining objects (this also runs System.gc multiple times)
-                               List<MemoryData> objects = MemoryManagement.getRemainingObjects();
+                               List<MemoryData> objects = MemoryManagement.getRemainingCollectableObjects();
                                StringBuilder sb = new StringBuilder();
                                sb.append("Objects that should have been garbage-collected but have not been:\n");
                                int count = 0;
@@ -788,7 +891,7 @@ public class BasicFrame extends JFrame {
                });
                menu.add(item);
                
-
+               //// Exhaust memory
                item = new JMenuItem("Exhaust memory");
                item.addActionListener(new ActionListener() {
                        @Override
@@ -821,6 +924,7 @@ public class BasicFrame extends JFrame {
 
                menu.addSeparator();
                
+               //// Exception here
                item = new JMenuItem("Exception here");
                item.addActionListener(new ActionListener() {
                        @Override
@@ -833,6 +937,7 @@ public class BasicFrame extends JFrame {
                
                item = new JMenuItem("Exception from EDT");
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("Exception from EDT selected");
                                SwingUtilities.invokeLater(new Runnable() {
@@ -848,13 +953,13 @@ public class BasicFrame extends JFrame {
                
                item = new JMenuItem("Exception from other thread");
                item.addActionListener(new ActionListener() {
+                       @Override
                        public void actionPerformed(ActionEvent e) {
                                log.user("Exception from other thread selected");
                                new Thread() {
                                        @Override
                                        public void run() {
-                                               throw new RuntimeException("Testing exception from " +
-                                                               "newly created thread");
+                                               throw new RuntimeException("Testing exception from newly created thread");
                                        }
                                }.start();
                        }
@@ -872,6 +977,27 @@ public class BasicFrame extends JFrame {
                menu.add(item);
                
 
+               menu.addSeparator();
+               
+
+               item = new JMenuItem("Test popup");
+               item.addActionListener(new ActionListener() {
+                       @Override
+                       public void actionPerformed(ActionEvent e) {
+                               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;
        }
@@ -891,21 +1017,21 @@ public class BasicFrame extends JFrame {
        private void openAction() {
                JFileChooser chooser = new JFileChooser();
                
-               chooser.addChoosableFileFilter(ALL_DESIGNS_FILTER);
-               chooser.addChoosableFileFilter(OPENROCKET_DESIGN_FILTER);
-               chooser.addChoosableFileFilter(ROCKSIM_DESIGN_FILTER);
-               chooser.setFileFilter(ALL_DESIGNS_FILTER);
+               chooser.addChoosableFileFilter(FileHelper.ALL_DESIGNS_FILTER);
+               chooser.addChoosableFileFilter(FileHelper.OPENROCKET_DESIGN_FILTER);
+               chooser.addChoosableFileFilter(FileHelper.ROCKSIM_DESIGN_FILTER);
+               chooser.setFileFilter(FileHelper.ALL_DESIGNS_FILTER);
                
                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));
@@ -916,6 +1042,10 @@ public class BasicFrame extends JFrame {
                                
                                // 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;
@@ -1083,10 +1213,13 @@ public class BasicFrame extends JFrame {
                        log.info("Warnings while reading file: " + warnings);
                        WarningDialog.showWarnings(parent,
                                        new Object[] {
-                                                       "The following problems were encountered while opening " + filename + ".",
-                                                       "Some design features may not have been loaded correctly."
+                                                       //// The following problems were encountered while opening
+                                                       trans.get("BasicFrame.WarningDialog.txt1") + " " + filename + ".",
+                                                       //// Some design features may not have been loaded correctly.
+                                                       trans.get("BasicFrame.WarningDialog.txt2")
                                        },
-                                       "Warnings while opening file", warnings);
+                                       //// Warnings while opening file
+                                       trans.get("BasicFrame.WarningDialog.title"), warnings);
                }
                
 
@@ -1094,6 +1227,7 @@ public class BasicFrame extends JFrame {
                doc.setFile(file);
                doc.setSaved(true);
                
+
                // Open the frame
                log.debug("Opening new frame with the document");
                BasicFrame frame = new BasicFrame(doc);
@@ -1115,7 +1249,7 @@ public class BasicFrame extends JFrame {
                log.info("Saving document to " + file);
                
                // Saving RockSim designs is not supported
-               if (ROCKSIM_DESIGN_FILTER.accept(file)) {
+               if (FileHelper.ROCKSIM_DESIGN_FILTER.accept(file)) {
                        file = new File(file.getAbsolutePath().replaceAll(".[rR][kK][tT](.[gG][zZ])?$",
                                        ".ork"));
                        
@@ -1143,8 +1277,8 @@ public class BasicFrame extends JFrame {
                StorageOptionChooser storageChooser =
                                new StorageOptionChooser(document, document.getDefaultStorageOptions());
                JFileChooser chooser = new JFileChooser();
-               chooser.setFileFilter(OPENROCKET_DESIGN_FILTER);
-               chooser.setCurrentDirectory(Prefs.getDefaultDirectory());
+               chooser.setFileFilter(FileHelper.OPENROCKET_DESIGN_FILTER);
+               chooser.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultDirectory());
                chooser.setAccessory(storageChooser);
                if (document.getFile() != null)
                        chooser.setSelectedFile(document.getFile());
@@ -1161,25 +1295,12 @@ public class BasicFrame extends JFrame {
                        return false;
                }
                
-               Prefs.setDefaultDirectory(chooser.getCurrentDirectory());
+               ((SwingPreferences) Application.getPreferences()).setDefaultDirectory(chooser.getCurrentDirectory());
                storageChooser.storeOptions(document.getDefaultStorageOptions());
                
-               if (file.getName().indexOf('.') < 0) {
-                       log.debug("File name does not contain extension, adding .ork");
-                       String name = file.getAbsolutePath();
-                       name = name + ".ork";
-                       file = new File(name);
-               }
-               
-               if (file.exists()) {
-                       log.info("File " + file + " exists, confirming overwrite from user");
-                       int result = JOptionPane.showConfirmDialog(this,
-                                       "File '" + file.getName() + "' exists.  Do you want to overwrite it?",
-                                       "File exists", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
-                       if (result != JOptionPane.YES_OPTION) {
-                               log.user("User decided not to overwrite the file");
-                               return false;
-                       }
+               file = FileHelper.ensureExtension(file, "ork");
+               if (!FileHelper.confirmWrite(file, this)) {
+                       return false;
                }
                
                return saveAs(file);
@@ -1240,9 +1361,10 @@ public class BasicFrame extends JFrame {
                        log.info("Confirming whether to save the design");
                        ComponentConfigDialog.hideDialog();
                        int result = JOptionPane.showConfirmDialog(this,
-                                       "Design '" + rocket.getName() + "' has not been saved.  " +
-                                                       "Do you want to save it?",
-                                       "Design not saved", JOptionPane.YES_NO_CANCEL_OPTION,
+                                       trans.get("BasicFrame.dlg.lbl1") + rocket.getName() +
+                                                       trans.get("BasicFrame.dlg.lbl2") + "  " +
+                                                       trans.get("BasicFrame.dlg.lbl3"),
+                                       trans.get("BasicFrame.dlg.title"), JOptionPane.YES_NO_CANCEL_OPTION,
                                        JOptionPane.QUESTION_MESSAGE);
                        if (result == JOptionPane.YES_OPTION) {
                                // Save
@@ -1278,13 +1400,13 @@ public class BasicFrame extends JFrame {
        
        
 
-    /**
-     * 
-     */
-    public void printAction() {
-        new PrintDialog(document);
-    }
-    
+       /**
+        
+        */
+       public void printAction() {
+               new PrintDialog(this, document).setVisible(true);
+       }
+       
        /**
         * Open a new design window with a basic rocket+stage.
         */
@@ -1293,7 +1415,8 @@ public class BasicFrame extends JFrame {
                
                Rocket rocket = new Rocket();
                Stage stage = new Stage();
-               stage.setName("Sustainer");
+               //// Sustainer
+               stage.setName(trans.get("BasicFrame.StageName.Sustainer"));
                rocket.addChild(stage);
                OpenRocketDocument doc = new OpenRocketDocument(rocket);
                doc.setSaved(true);