Sort by added to preferences

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index be1455b..ff44fe4 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -132,6 +132,11 @@ public class Preferences extends GPreferences
         startupFileTextfield.setText(Cache.getDefault("STARTUP_FILE",\r
          "http://www.jalview.org/examples/exampleFile.jar"));\r
 \r
+        sortby.addItem("No sort");\r
+        sortby.addItem("Id");\r
+        sortby.addItem("Pairwise Identity");\r
+        sortby.setSelectedItem( Cache.getDefault("SORT_ALIGNMENT", "No sort") );\r
+\r
   /****************************************************\r
    * Set up Connections\r
    */\r
@@ -191,6 +196,8 @@ public class Preferences extends GPreferences
       Cache.applicationProperties.setProperty("STARTUP_FILE", startupFileTextfield.getText());\r
       Cache.applicationProperties.setProperty("SHOW_STARTUP_FILE",  Boolean.toString(startupCheckbox.isSelected()));\r
 \r
+      Cache.applicationProperties.setProperty("SORT_ALIGNMENT", sortby.getSelectedItem().toString() );\r
+\r
       if(defaultBrowser.getText().trim().length()<1)\r
         Cache.applicationProperties.remove("DEFAULT_BROWSER");\r
       else\r

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 7826ce4..ab1d4e7 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -82,6 +82,8 @@ public class GPreferences extends JPanel
   GridBagLayout gridBagLayout2 = new GridBagLayout();\r
   GridBagLayout gridBagLayout1 = new GridBagLayout();\r
   GridBagLayout gridBagLayout3 = new GridBagLayout();\r
+  protected JComboBox sortby = new JComboBox();\r
+  JLabel sortLabel = new JLabel();\r
   /**\r
      * Creates a new GPreferences object.\r
      */\r
@@ -197,7 +199,7 @@ public class GPreferences extends JPanel
         startupCheckbox.setHorizontalTextPosition(SwingConstants.LEFT);\r
         startupCheckbox.setSelected(true);\r
         startupFileTextfield.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-        startupFileTextfield.setBounds(new Rectangle(122, 202, 309, 20));\r
+        startupFileTextfield.setBounds(new Rectangle(121, 200, 309, 20));\r
         startupFileTextfield.addMouseListener(new MouseAdapter()\r
             {\r
                 public void mouseClicked(MouseEvent e)\r
@@ -294,6 +296,12 @@ public class GPreferences extends JPanel
     });\r
     jPanel1.setBorder(titledBorder1);\r
     jPanel1.setLayout(gridBagLayout1);\r
+    sortby.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    sortby.setBounds(new Rectangle(122, 232, 308, 21));\r
+    sortLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    sortLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    sortLabel.setText("Sort by");\r
+    sortLabel.setBounds(new Rectangle(53, 235, 64, 15));\r
     visualTab.add(annotations);\r
         visualTab.add(conservation);\r
         visualTab.add(quality);\r
@@ -301,15 +309,17 @@ public class GPreferences extends JPanel
         visualTab.add(gapSymbolCB);\r
         visualTab.add(fontLabel);\r
         visualTab.add(fontNameCB);\r
-        visualTab.add(colourLabel);\r
+    visualTab.add(colourLabel);\r
         visualTab.add(gapLabel);\r
-        visualTab.add(colour);\r
+    visualTab.add(colour);\r
         visualTab.add(fontSizeCB);\r
         visualTab.add(fontStyleCB);\r
         visualTab.add(identity);\r
         visualTab.add(fullScreen);\r
-        visualTab.add(startupCheckbox);\r
-        visualTab.add(startupFileTextfield);\r
+    visualTab.add(startupCheckbox);\r
+    visualTab.add(startupFileTextfield);\r
+    visualTab.add(sortby);\r
+    visualTab.add(sortLabel);\r
 \r
     tabbedPane.add(visualTab, "Visual");\r
     tabbedPane.add(connectTab, "Connections");\r