X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignExportSettings.java;h=04849d8b49820f766bc6aaaba311273444233ffb;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=49bb64a25a1d0e95fcc9d98739e0a35903e5ac4f;hpb=b4abe1ffdea4b7711cdc72c6c95af4356187302b;p=jalview.git

diff --git a/src/jalview/gui/AlignExportSettings.java b/src/jalview/gui/AlignExportSettings.java
index 49bb64a..04849d8 100644
--- a/src/jalview/gui/AlignExportSettings.java
+++ b/src/jalview/gui/AlignExportSettings.java
@@ -1,21 +1,41 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 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,28 +46,38 @@ 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");
+              JOptionPane.DEFAULT_OPTION, null, new Object[] { this });
+      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();
+
     }
   }
 
-
   public void ok_actionPerformed(ActionEvent e)
   {
     cancelled = false;
     dialog.setVisible(false);
+    dialog.dispose();
   }
 
   public void cancel_actionPerformed(ActionEvent e)
   {
     cancelled = true;
     dialog.setVisible(false);
+    dialog.dispose();
   }
 
   @Override