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

minor updates for 1.1.4

Browse Source
This commit is contained in:
Sampo Niskanen 2011-03-05 11:23:37 +00:00
parent de0b71f1fd
commit 3e3d26b958
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/net/sf/openrocket/gui/dialogs/AboutDialog.java
View File

@ -21,7 +21,7 @@ public class AboutDialog extends JDialog {
public static final String OPENROCKET_URL = "http://openrocket.sourceforge.net/"; public static final String OPENROCKET_URL = "http://openrocket.sourceforge.net/";
public AboutDialog(JFrame parent) { public AboutDialog(JFrame parent) {
super(parent, true); super(parent, true);
@ -29,21 +29,21 @@ public class AboutDialog extends JDialog {
JPanel panel = new JPanel(new MigLayout("fill")); 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"); "spany 5, top");
panel.add(new StyledLabel("OpenRocket", 20), "ax 50%, growy, wrap para"); panel.add(new StyledLabel("OpenRocket", 20), "ax 50%, growy, wrap para");
panel.add(new StyledLabel("Version " + version, 3), "ax 50%, growy, wrap rel"); panel.add(new StyledLabel("Version " + version, 3), "ax 50%, growy, wrap rel");
// String source = Prefs.getBuildSource(); // String source = Prefs.getBuildSource();
// if (!Prefs.DEFAULT_BUILD_SOURCE.equalsIgnoreCase(source)) { // if (!Prefs.DEFAULT_BUILD_SOURCE.equalsIgnoreCase(source)) {
// panel.add(new StyledLabel("Distributed by " + source, -1), // panel.add(new StyledLabel("Distributed by " + source, -1),
// "ax 50%, growy, wrap para"); // "ax 50%, growy, wrap para");
// } else { // } else {
// panel.add(new StyledLabel(" ", -1), "ax 50%, growy, wrap para"); // 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"); "ax 50%, growy, wrap para");
panel.add(new URLLabel(OPENROCKET_URL), "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); GUIUtil.setDisposableDialogOptions(this, close);
} }
} }

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

@ -41,7 +41,6 @@ import javax.swing.JMenuItem;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JSeparator;
import javax.swing.JSplitPane; import javax.swing.JSplitPane;
import javax.swing.JTabbedPane; import javax.swing.JTabbedPane;
import javax.swing.JTextField; import javax.swing.JTextField;
@ -491,6 +490,7 @@ public class BasicFrame extends JFrame {
item.addActionListener(new ActionListener() { item.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
log.user("Print action selected");
printAction(); printAction();
} }
}); });
@ -1303,6 +1303,13 @@ public class BasicFrame extends JFrame {
* *
*/ */
public void printAction() { 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); new PrintDialog(document);
} }