From: plaa <plaa@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Sat, 5 Mar 2011 11:23:37 +0000 (+0000)
Subject: minor updates for 1.1.4
X-Git-Tag: upstream/1.1.4^2~2
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=12754e9e1c69f274c48333477108a2231f6eee22;p=debian%2Fopenrocket

minor updates for 1.1.4

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@111 180e2498-e6e9-4542-8430-84ac67f01cd8
---

diff --git a/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
index 88d78e5f..69146435 100644
--- a/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
+++ b/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
@@ -21,7 +21,7 @@ public class AboutDialog extends JDialog {
 	
 	public static final String OPENROCKET_URL = "http://openrocket.sourceforge.net/";
 	
-
+	
 	public AboutDialog(JFrame parent) {
 		super(parent, true);
 		
@@ -29,21 +29,21 @@ public class AboutDialog extends JDialog {
 		
 		JPanel panel = new JPanel(new MigLayout("fill"));
 		
-		panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-about.png", "OpenRocket")), 
+		panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-about.png", "OpenRocket")),
 				"spany 5, top");
 		
 		panel.add(new StyledLabel("OpenRocket", 20), "ax 50%, growy, wrap para");
 		panel.add(new StyledLabel("Version " + version, 3), "ax 50%, growy, wrap rel");
 		
-//		String source = Prefs.getBuildSource();
-//		if (!Prefs.DEFAULT_BUILD_SOURCE.equalsIgnoreCase(source)) {
-//			panel.add(new StyledLabel("Distributed by " + source, -1), 
-//					"ax 50%, growy, wrap para");
-//		} else {
-//			panel.add(new StyledLabel(" ", -1), "ax 50%, growy, wrap para");
-//		}
+		//		String source = Prefs.getBuildSource();
+		//		if (!Prefs.DEFAULT_BUILD_SOURCE.equalsIgnoreCase(source)) {
+		//			panel.add(new StyledLabel("Distributed by " + source, -1), 
+		//					"ax 50%, growy, wrap para");
+		//		} else {
+		//			panel.add(new StyledLabel(" ", -1), "ax 50%, growy, wrap para");
+		//		}
 		
-		panel.add(new StyledLabel("Copyright " + Chars.COPY +" 2007-2010 Sampo Niskanen"), 
+		panel.add(new StyledLabel("Copyright " + Chars.COPY + " 2007-2011 Sampo Niskanen"),
 				"ax 50%, growy, wrap para");
 		
 		panel.add(new URLLabel(OPENROCKET_URL), "ax 50%, growy, wrap para");
@@ -67,5 +67,5 @@ public class AboutDialog extends JDialog {
 		GUIUtil.setDisposableDialogOptions(this, close);
 	}
 	
-	
+
 }
diff --git a/src/net/sf/openrocket/gui/main/BasicFrame.java b/src/net/sf/openrocket/gui/main/BasicFrame.java
index 9d79c13b..d7fd4ec1 100644
--- 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;
@@ -491,6 +490,7 @@ public class BasicFrame extends JFrame {
 		item.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
+				log.user("Print action selected");
 				printAction();
 			}
 		});
@@ -1303,6 +1303,13 @@ public class BasicFrame extends JFrame {
 	 * 
 	 */
 	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(document);
 	}