Merged l10n branch to trunk

[debian/openrocket] / src / net / sf / openrocket / gui / main / BasicFrame.java

diff --git a/src/net/sf/openrocket/gui/main/BasicFrame.java b/src/net/sf/openrocket/gui/main/BasicFrame.java
index 966354bf8a1f0b3ab3f20c0307a28a5027bf269f..55df50394d49fbd9b3b5cbb00d384b031852ae69 100644 (file)
--- a/src/net/sf/openrocket/gui/main/BasicFrame.java
+++ b/src/net/sf/openrocket/gui/main/BasicFrame.java
@@ -41,7 +41,6 @@ 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;
@@ -127,7 +126,7 @@ public class BasicFrame extends JFrame {
                        new SimpleFileFilter(trans.get("BasicFrame.SimpleFileFilter3"), ".rkt", ".rkt.gz");
        
 
-       
+
 
        public static final int COMPONENT_TAB = 0;
        public static final int SIMULATION_TAB = 1;
@@ -509,6 +508,7 @@ public class BasicFrame extends JFrame {
                item.addActionListener(new ActionListener() {
                        @Override
                        public void actionPerformed(ActionEvent e) {
+                               log.user("Print action selected");
                                printAction();
                        }
                });
@@ -1146,10 +1146,10 @@ public class BasicFrame extends JFrame {
                        log.info("Warnings while reading file: " + warnings);
                        WarningDialog.showWarnings(parent,
                                        new Object[] {
-                                       //// The following problems were encountered while opening
-                                       trans.get("BasicFrame.WarningDialog.txt1") +" " + filename + ".",
+                                                       //// 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")
+                                                       trans.get("BasicFrame.WarningDialog.txt2")
                                        },
                                        //// Warnings while opening file
                                        trans.get("BasicFrame.WarningDialog.title"), warnings);
@@ -1306,9 +1306,9 @@ public class BasicFrame extends JFrame {
                        log.info("Confirming whether to save the design");
                        ComponentConfigDialog.hideDialog();
                        int result = JOptionPane.showConfirmDialog(this,
-                                       trans.get("BasicFrame.dlg.lbl1") + rocket.getName() + 
-                                       trans.get("BasicFrame.dlg.lbl2")+ "  " +
-                                       trans.get("BasicFrame.dlg.lbl3"),
+                                       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) {
@@ -1349,7 +1349,14 @@ public class BasicFrame extends JFrame {
         * 
         */
        public void printAction() {
-               new PrintDialog(document);
+               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);
        }
        
        /**