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
JAL-1840 correct setting status bar for structure mouseover
[jalview.git]
/
src
/
jalview
/
gui
/
AlignExportSettings.java
diff --git
a/src/jalview/gui/AlignExportSettings.java
b/src/jalview/gui/AlignExportSettings.java
index
49bb64a
..
0856365
100644
(file)
--- a/
src/jalview/gui/AlignExportSettings.java
+++ b/
src/jalview/gui/AlignExportSettings.java
@@
-3,19
+3,19
@@
package jalview.gui;
import jalview.api.AlignExportSettingI;
import jalview.bin.Jalview;
import jalview.jbgui.GAlignExportSettings;
import jalview.api.AlignExportSettingI;
import jalview.bin.Jalview;
import jalview.jbgui.GAlignExportSettings;
+import jalview.util.MessageManager;
import java.awt.event.ActionEvent;
import java.awt.event.ActionEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import javax.swing.JDialog;
import javax.swing.JDialog;
-import javax.swing.JInternalFrame;
import javax.swing.JOptionPane;
@SuppressWarnings("serial")
public class AlignExportSettings extends GAlignExportSettings implements
AlignExportSettingI
{
import javax.swing.JOptionPane;
@SuppressWarnings("serial")
public class AlignExportSettings extends GAlignExportSettings implements
AlignExportSettingI
{
- protected JInternalFrame frame;
-
boolean cancelled = false;
JDialog dialog;
boolean cancelled = false;
JDialog dialog;
@@
-26,14
+26,24
@@
public class AlignExportSettings extends GAlignExportSettings implements
super(hasHiddenSeq, hasHiddenCols, alignFileFormat);
if (!Jalview.isHeadlessMode() && isShowDialog())
{
super(hasHiddenSeq, hasHiddenCols, alignFileFormat);
if (!Jalview.isHeadlessMode() && isShowDialog())
{
+
JOptionPane pane = new JOptionPane(null, JOptionPane.DEFAULT_OPTION,
JOptionPane.DEFAULT_OPTION, null, new Object[]
{ this });
JOptionPane pane = new JOptionPane(null, JOptionPane.DEFAULT_OPTION,
JOptionPane.DEFAULT_OPTION, null, new Object[]
{ this });
- dialog = pane.createDialog(Desktop.desktop, "Export Settings");
+ dialog = pane.createDialog(Desktop.desktop,
+ MessageManager.getString("label.export_settings"));
+ dialog.addWindowListener(new WindowAdapter()
+ {
+ public void windowClosing(WindowEvent e)
+ {
+ cancelled = true;
+ }
+ });
dialog.pack();
dialog.setVisible(true);
dialog.setContentPane(this);
dialog.validate();
dialog.pack();
dialog.setVisible(true);
dialog.setContentPane(this);
dialog.validate();
+
}
}
}
}
@@
-42,12
+52,14
@@
public class AlignExportSettings extends GAlignExportSettings implements
{
cancelled = false;
dialog.setVisible(false);
{
cancelled = false;
dialog.setVisible(false);
+ dialog.dispose();
}
public void cancel_actionPerformed(ActionEvent e)
{
cancelled = true;
dialog.setVisible(false);
}
public void cancel_actionPerformed(ActionEvent e)
{
cancelled = true;
dialog.setVisible(false);
+ dialog.dispose();
}
@Override
}
@Override