merge from develop

[jalview.git] / src / jalview / jbgui / GAlignExportSettings.java

diff --git a/src/jalview/jbgui/GAlignExportSettings.java b/src/jalview/jbgui/GAlignExportSettings.java
index 15498c6..58005e8 100644 (file)
--- 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,22 +29,21 @@ public abstract class GAlignExportSettings extends JPanel
 
   protected BorderLayout mainLayout = new BorderLayout();
 
-  protected JCheckBox chkAll = new JCheckBox("Check All");
+  protected JCheckBox chkAll = new JCheckBox();
 
-  protected JCheckBox chkHiddenSeqs = new JCheckBox(
-          "Export Hidden Sequences");
+  protected JCheckBox chkHiddenSeqs = new JCheckBox();
 
-  protected JCheckBox chkHiddenCols = new JCheckBox("Export Hidden Columns");
+  protected JCheckBox chkHiddenCols = new JCheckBox();
 
-  protected JCheckBox chkExportAnnots = new JCheckBox("Export Annotations");
+  protected JCheckBox chkExportAnnots = new JCheckBox();
 
-  protected JCheckBox chkExportFeats = new JCheckBox("Export Features");
+  protected JCheckBox chkExportFeats = new JCheckBox();
 
-  protected JCheckBox chkExportGrps = new JCheckBox("Export Groups");
+  protected JCheckBox chkExportGrps = new JCheckBox();
 
-  JButton btnOk = new JButton("Ok");
+  JButton btnOk = new JButton();
 
-  JButton btnCancel = new JButton("Cancel");
+  JButton btnCancel = new JButton();
 
   private boolean hasHiddenSeq, hasHiddenCols, isComplexAlignFile,
           showDialog;
@@ -72,6 +73,19 @@ public abstract class GAlignExportSettings extends JPanel
 
   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);
@@ -100,7 +114,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);
@@ -110,15 +124,18 @@ public abstract class GAlignExportSettings extends JPanel
     complexExportPanel.add(chkExportFeats, BorderLayout.CENTER);
     complexExportPanel.add(chkExportGrps, BorderLayout.SOUTH);
 
-    if (hasHiddenSeq || hasHiddenCols)
-    {
-      optionsPanel.add(hiddenRegionConfPanel);
-    }
+    actionPanel.add(chkAll);
 
     if (this.isComplexAlignFile)
     {
       optionsPanel.add(complexExportPanel);
     }
+
+    if (hasHiddenSeq || hasHiddenCols)
+    {
+      optionsPanel.add(hiddenRegionConfPanel);
+    }
+
     actionPanel.add(btnCancel);
     actionPanel.add(btnOk);