X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignExportSettings.java;h=8b2e4e1a6778908cae44d17422bcf2412166566e;hb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;hp=2583b6ba0feef250e929fe49451236a32720fbd6;hpb=60bf4c4778ecca475a951c4dd00731933d0b7c59;p=jalview.git

diff --git a/src/jalview/jbgui/GAlignExportSettings.java b/src/jalview/jbgui/GAlignExportSettings.java
index 2583b6b..8b2e4e1 100644
--- a/src/jalview/jbgui/GAlignExportSettings.java
+++ b/src/jalview/jbgui/GAlignExportSettings.java
@@ -1,5 +1,7 @@
 package jalview.jbgui;
 
+import jalview.util.MessageManager;
+
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -27,34 +29,31 @@ public abstract class GAlignExportSettings extends JPanel
 
   protected BorderLayout mainLayout = new BorderLayout();
 
-  protected JCheckBox chkAll = new JCheckBox("Check All");
-
-  protected JCheckBox chkHiddenSeqs = new JCheckBox(
-          "Export Hidden Sequences");
+  protected JCheckBox chkAll = new JCheckBox();
 
-  protected JCheckBox chkHiddenCols = new JCheckBox("Export Hidden Columns");
+  protected JCheckBox chkHiddenSeqs = new JCheckBox();
 
-  protected JCheckBox chkExportAnnots = new JCheckBox("Export Annotations");
+  protected JCheckBox chkHiddenCols = new JCheckBox();
 
-  protected JCheckBox chkExportFeats = new JCheckBox("Export Features");
+  protected JCheckBox chkExportAnnots = new JCheckBox();
 
-  protected JCheckBox chkExportGrps = new JCheckBox("Export Groups");
+  protected JCheckBox chkExportFeats = new JCheckBox();
 
-  JButton btnOk = new JButton("Ok");
+  protected JCheckBox chkExportGrps = new JCheckBox();
 
-  JButton btnCancel = new JButton("Cancel");
+  JButton btnOk = new JButton();
 
-  private boolean hasHiddenSeq, hasHiddenCols, isComplexAlignFile;
+  JButton btnCancel = new JButton();
 
-  boolean isComplexFormat = false;
+  private boolean hasHiddenSeq, hasHiddenCols, isComplexAlignFile,
+          showDialog;
 
   public GAlignExportSettings(boolean hasHiddenSeq, boolean hasHiddenCols,
           String alignFileFormat)
   {
     this.hasHiddenSeq = hasHiddenSeq;
     this.hasHiddenCols = hasHiddenCols;
-    String[] complexFormats =
-    { "JSON", "HTML" };
+    String[] complexFormats = { "JSON", "HTML" };
 
     for (String format : complexFormats)
     {
@@ -64,12 +63,28 @@ public abstract class GAlignExportSettings extends JPanel
         break;
       }
     }
-
+    if (this.hasHiddenCols || this.hasHiddenSeq || this.isComplexAlignFile)
+    {
+      this.showDialog = true;
+    }
     init();
   }
 
   public void init()
   {
+    chkHiddenSeqs.setText(MessageManager
+            .getString("action.export_hidden_sequences"));
+    chkHiddenCols.setText(MessageManager
+            .getString("action.export_hidden_columns"));
+    chkExportAnnots.setText(MessageManager
+            .getString("action.export_annotations"));
+    chkExportFeats.setText(MessageManager
+            .getString("action.export_features"));
+    chkExportGrps.setText(MessageManager.getString("action.export_groups"));
+    btnOk.setText(MessageManager.getString("action.ok"));
+    btnCancel.setText(MessageManager.getString("action.cancel"));
+    chkAll.setText(MessageManager.getString("action.select_all"));
+
     hiddenRegionConfPanel.setLayout(hiddenRegionLayout);
     complexExportPanel.setLayout(complexExportLayout);
     setLayout(mainLayout);
@@ -98,7 +113,7 @@ public abstract class GAlignExportSettings extends JPanel
       }
     });
 
-    hiddenRegionConfPanel.add(chkAll, BorderLayout.NORTH);
+    // hiddenRegionConfPanel.add(chkAll, BorderLayout.NORTH);
     hiddenRegionConfPanel.add(chkHiddenSeqs, BorderLayout.CENTER);
     hiddenRegionConfPanel.add(chkHiddenCols, BorderLayout.SOUTH);
     chkHiddenSeqs.setEnabled(hasHiddenSeq);
@@ -108,15 +123,18 @@ public abstract class GAlignExportSettings extends JPanel
     complexExportPanel.add(chkExportFeats, BorderLayout.CENTER);
     complexExportPanel.add(chkExportGrps, BorderLayout.SOUTH);
 
-    if (hasHiddenSeq || hasHiddenCols)
+    actionPanel.add(chkAll);
+
+    if (this.isComplexAlignFile)
     {
-      optionsPanel.add(hiddenRegionConfPanel);
+      optionsPanel.add(complexExportPanel);
     }
 
-    if (isComplexAlignFile)
+    if (hasHiddenSeq || hasHiddenCols)
     {
-      optionsPanel.add(complexExportPanel);
+      optionsPanel.add(hiddenRegionConfPanel);
     }
+
     actionPanel.add(btnCancel);
     actionPanel.add(btnOk);
 
@@ -125,8 +143,6 @@ public abstract class GAlignExportSettings extends JPanel
 
   }
 
-
-  
   private void checkAllAction()
   {
     boolean isSelected = chkAll.isSelected();
@@ -140,6 +156,16 @@ public abstract class GAlignExportSettings extends JPanel
             && chkExportGrps.isEnabled() && isSelected);
   }
 
+  public boolean isShowDialog()
+  {
+    return showDialog;
+  }
+
+  public void setShowDialog(boolean showDialog)
+  {
+    this.showDialog = showDialog;
+  }
+
   public abstract void ok_actionPerformed(ActionEvent e);
 
   public abstract void cancel_actionPerformed(ActionEvent e);