Add Export tab

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 320592e..8c3f937 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -86,8 +86,9 @@ public class GPreferences extends JPanel
   JLabel sortLabel = new JLabel();\r
   JPanel jPanel2 = new JPanel();\r
   GridLayout gridLayout2 = new GridLayout();\r
-  JLabel jLabel1 = new JLabel();\r
   JPanel jPanel3 = new JPanel();\r
+  JPanel exportTab = new JPanel();\r
+  JLabel epsLabel = new JLabel();\r
   protected JComboBox epsRendering = new JComboBox();\r
   /**\r
      * Creates a new GPreferences object.\r
@@ -173,30 +174,30 @@ public class GPreferences extends JPanel
             });\r
         gapLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
         gapLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
-        gapLabel.setText("Gap Symbol");\r
+        gapLabel.setText("Gap Symbol ");\r
     colour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-        colour.setBounds(new Rectangle(154, 151, 154, 21));\r
+        colour.setBounds(new Rectangle(147, 189, 154, 21));\r
         colourLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
         colourLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
-        colourLabel.setText("Colour");\r
+        colourLabel.setText("Colour ");\r
     fontLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
         fontLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
-        fontLabel.setText("Font");\r
+        fontLabel.setText("Font ");\r
     fontSizeCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-        fontSizeCB.setBounds(new Rectangle(322, 98, 49, 21));\r
+        fontSizeCB.setBounds(new Rectangle(316, 124, 49, 21));\r
         fontStyleCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-        fontStyleCB.setBounds(new Rectangle(370, 98, 70, 21));\r
+        fontStyleCB.setBounds(new Rectangle(364, 124, 70, 21));\r
         fontNameCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-        fontNameCB.setBounds(new Rectangle(153, 98, 169, 21));\r
+        fontNameCB.setBounds(new Rectangle(147, 124, 169, 21));\r
         gapSymbolCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-        gapSymbolCB.setBounds(new Rectangle(154, 125, 67, 21));\r
+        gapSymbolCB.setBounds(new Rectangle(147, 156, 67, 21));\r
         startupCheckbox.setText("Open file");\r
     startupCheckbox.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
         startupCheckbox.setHorizontalAlignment(SwingConstants.RIGHT);\r
         startupCheckbox.setHorizontalTextPosition(SwingConstants.LEFT);\r
         startupCheckbox.setSelected(true);\r
         startupFileTextfield.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-        startupFileTextfield.setBounds(new Rectangle(154, 204, 285, 20));\r
+        startupFileTextfield.setBounds(new Rectangle(147, 255, 302, 20));\r
         startupFileTextfield.addMouseListener(new MouseAdapter()\r
             {\r
                 public void mouseClicked(MouseEvent e)\r
@@ -294,19 +295,21 @@ public class GPreferences extends JPanel
     jPanel1.setBorder(titledBorder1);\r
     jPanel1.setLayout(gridBagLayout1);\r
     sortby.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-    sortby.setBounds(new Rectangle(154, 178, 286, 21));\r
+    sortby.setBounds(new Rectangle(147, 222, 302, 21));\r
     sortLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
     sortLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
-    sortLabel.setText("Sort by");\r
-    jPanel2.setBounds(new Rectangle(7, 19, 141, 242));\r
+    sortLabel.setText("Sort by ");\r
+    jPanel2.setBounds(new Rectangle(7, 19, 138, 270));\r
     jPanel2.setLayout(gridLayout2);\r
-    gridLayout2.setRows(9);\r
-    jLabel1.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-    jLabel1.setHorizontalAlignment(SwingConstants.RIGHT);\r
-    jLabel1.setText("EPS Rendering Style");\r
-    jPanel3.setBounds(new Rectangle(149, 42, 278, 26));\r
+    gridLayout2.setRows(8);\r
+    jPanel3.setBounds(new Rectangle(146, 53, 274, 26));\r
+    exportTab.setLayout(null);\r
+    epsLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    epsLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    epsLabel.setText("EPS Rendering Style");\r
+    epsLabel.setBounds(new Rectangle(3, 47, 134, 21));\r
     epsRendering.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-    epsRendering.setBounds(new Rectangle(154, 228, 286, 21));\r
+    epsRendering.setBounds(new Rectangle(145, 47, 286, 21));\r
     jPanel2.add(fullScreen);\r
     jPanel2.add(annotations);\r
     jPanel2.add(fullID);\r
@@ -315,11 +318,6 @@ public class GPreferences extends JPanel
     jPanel2.add(colourLabel);\r
     jPanel2.add(sortLabel);\r
     jPanel2.add(startupCheckbox);\r
-    jPanel2.add(jLabel1);\r
-    visualTab.add(jPanel3);\r
-    jPanel3.add(conservation);\r
-    jPanel3.add(quality);\r
-    jPanel3.add(identity);\r
     visualTab.add(fontNameCB);\r
     visualTab.add(fontSizeCB);\r
     visualTab.add(fontStyleCB);\r
@@ -327,7 +325,10 @@ public class GPreferences extends JPanel
     visualTab.add(colour);\r
     visualTab.add(sortby);\r
     visualTab.add(startupFileTextfield);\r
-    visualTab.add(epsRendering);\r
+    visualTab.add(jPanel3);\r
+    jPanel3.add(conservation);\r
+    jPanel3.add(quality);\r
+    jPanel3.add(identity);\r
     visualTab.add(jPanel2);\r
 \r
     linkPanel.add(editLinkButtons, BorderLayout.EAST);\r
@@ -340,7 +341,7 @@ public class GPreferences extends JPanel
     linkPanel2.add(linkNameList, BorderLayout.WEST);\r
         okCancelPanel.add(ok);\r
         okCancelPanel.add(cancel);\r
-        this.add(tabbedPane, java.awt.BorderLayout.CENTER);\r
+    this.add(tabbedPane, java.awt.BorderLayout.CENTER);\r
 \r
         this.add(okCancelPanel, java.awt.BorderLayout.SOUTH);\r
     jPanel1.add(serverLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0\r
@@ -369,6 +370,9 @@ public class GPreferences extends JPanel
         , GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL,\r
         new Insets(15, 0, 0, 15), 307, 1));\r
 \r
+    exportTab.add(epsLabel);\r
+    exportTab.add(epsRendering);\r
+\r
     jPanel1.add(useProxy, new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0\r
                                                  , GridBagConstraints.WEST,\r
                                                  GridBagConstraints.NONE,\r
@@ -380,7 +384,8 @@ public class GPreferences extends JPanel
 \r
     tabbedPane.add(visualTab, "Visual");\r
     tabbedPane.add(connectTab, "Connections");\r
-    }\r
+    tabbedPane.add(exportTab, "Export");\r
+  }\r
 \r
     /**\r
      * DOCUMENT ME!\r