X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignExportSettings.java;fp=src%2Fjalview%2Fgui%2FAlignExportSettings.java;h=08563652d758b65af9a3c1852e24fbdfd3dfc60d;hb=f06554784411ddbf871d642e66c8dcb7f147d4a8;hp=49bb64a25a1d0e95fcc9d98739e0a35903e5ac4f;hpb=cf06ee5d732af6cc874115aece1138adafca8ad7;p=jalview.git

diff --git a/src/jalview/gui/AlignExportSettings.java b/src/jalview/gui/AlignExportSettings.java
index 49bb64a..0856365 100644
--- 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.util.MessageManager;
 
 import java.awt.event.ActionEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 
 import javax.swing.JDialog;
-import javax.swing.JInternalFrame;
 import javax.swing.JOptionPane;
 
 @SuppressWarnings("serial")
 public class AlignExportSettings extends GAlignExportSettings implements
         AlignExportSettingI
 {
-  protected JInternalFrame frame;
-
   boolean cancelled = false;
 
   JDialog dialog;
@@ -26,14 +26,24 @@ public class AlignExportSettings extends GAlignExportSettings implements
     super(hasHiddenSeq, hasHiddenCols, alignFileFormat);
     if (!Jalview.isHeadlessMode() && isShowDialog())
     {
+
       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();
+
     }
   }
 
@@ -42,12 +52,14 @@ public class AlignExportSettings extends GAlignExportSettings implements
   {
     cancelled = false;
     dialog.setVisible(false);
+    dialog.dispose();
   }
 
   public void cancel_actionPerformed(ActionEvent e)
   {
     cancelled = true;
     dialog.setVisible(false);
+    dialog.dispose();
   }
 
   @Override