git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor formatting of tooltip
[jalview.git]
/
src
/
jalview
/
gui
/
EPSOptions.java
diff --git
a/src/jalview/gui/EPSOptions.java
b/src/jalview/gui/EPSOptions.java
index
78c1f02
..
dc7b650
100755
(executable)
--- a/
src/jalview/gui/EPSOptions.java
+++ b/
src/jalview/gui/EPSOptions.java
@@
-1,6
+1,6
@@
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
@@
-18,16
+18,15
@@
*/
\r
package jalview.gui;
\r
\r
*/
\r
package jalview.gui;
\r
\r
-import javax.swing.*;
\r
import java.awt.*;
\r
import java.awt.*;
\r
-import java.awt.event.ActionListener;
\r
-import java.awt.event.ActionEvent;
\r
+import java.awt.event.*;
\r
+import javax.swing.*;
\r
\r
public class EPSOptions
\r
extends JPanel
\r
{
\r
JDialog dialog;
\r
\r
public class EPSOptions
\r
extends JPanel
\r
{
\r
JDialog dialog;
\r
- boolean cancelled = false;
\r
+ public boolean cancelled = false;
\r
String value;
\r
\r
public EPSOptions()
\r
String value;
\r
\r
public EPSOptions()
\r
@@
-46,11
+45,13
@@
public class EPSOptions
bg.add(text);
\r
\r
JOptionPane pane = new JOptionPane(null,
\r
bg.add(text);
\r
\r
JOptionPane pane = new JOptionPane(null,
\r
- JOptionPane.DEFAULT_OPTION, JOptionPane.DEFAULT_OPTION,
\r
- null, new Object[]{this});
\r
+ JOptionPane.DEFAULT_OPTION,
\r
+ JOptionPane.DEFAULT_OPTION,
\r
+ null, new Object[]
\r
+ {this});
\r
\r
dialog = pane.createDialog(Desktop.desktop, "EPS Rendering options");
\r
\r
dialog = pane.createDialog(Desktop.desktop, "EPS Rendering options");
\r
- dialog.show();
\r
+ dialog.setVisible(true);
\r
\r
}
\r
\r
\r
}
\r
\r
@@
-58,10
+59,10
@@
public class EPSOptions
throws Exception
\r
{
\r
lineart.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
\r
throws Exception
\r
{
\r
lineart.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
\r
- lineart.setSelected(true);
\r
lineart.setText("Lineart");
\r
text.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
\r
text.setText("Text");
\r
lineart.setText("Lineart");
\r
text.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
\r
text.setText("Text");
\r
+ text.setSelected(true);
\r
askAgain.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
\r
askAgain.setText("Don\'t ask me again");
\r
ok.setText("OK");
\r
askAgain.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
\r
askAgain.setText("Don\'t ask me again");
\r
ok.setText("OK");
\r
@@
-84,8
+85,8
@@
public class EPSOptions
jLabel1.setText("Select EPS character rendering style");
\r
this.setLayout(borderLayout1);
\r
jPanel3.setBorder(BorderFactory.createEtchedBorder());
\r
jLabel1.setText("Select EPS character rendering style");
\r
this.setLayout(borderLayout1);
\r
jPanel3.setBorder(BorderFactory.createEtchedBorder());
\r
- jPanel2.add(lineart);
\r
jPanel2.add(text);
\r
jPanel2.add(text);
\r
+ jPanel2.add(lineart);
\r
jPanel2.add(askAgain);
\r
jPanel1.add(ok);
\r
jPanel1.add(cancel);
\r
jPanel2.add(askAgain);
\r
jPanel1.add(ok);
\r
jPanel1.add(cancel);
\r
@@
-109,9
+110,13
@@
public class EPSOptions
public void ok_actionPerformed(ActionEvent e)
\r
{
\r
if (lineart.isSelected())
\r
public void ok_actionPerformed(ActionEvent e)
\r
{
\r
if (lineart.isSelected())
\r
+ {
\r
value = "Lineart";
\r
value = "Lineart";
\r
+ }
\r
else
\r
else
\r
+ {
\r
value = "Text";
\r
value = "Text";
\r
+ }
\r
\r
if (!askAgain.isSelected())
\r
{
\r
\r
if (!askAgain.isSelected())
\r
{
\r
@@
-122,13
+127,13
@@
public class EPSOptions
jalview.bin.Cache.setProperty("EPS_RENDERING", value);
\r
}
\r
\r
jalview.bin.Cache.setProperty("EPS_RENDERING", value);
\r
}
\r
\r
- dialog.hide();
\r
+ dialog.setVisible(false);
\r
}
\r
\r
public void cancel_actionPerformed(ActionEvent e)
\r
{
\r
cancelled = true;
\r
}
\r
\r
public void cancel_actionPerformed(ActionEvent e)
\r
{
\r
cancelled = true;
\r
- dialog.hide();
\r
+ dialog.setVisible(false);
\r
}
\r
\r
public String getValue()
\r
}
\r
\r
public String getValue()
\r