From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 1 Sep 2005 13:20:12 +0000 (+0000)
Subject: Sort by added to preferences
X-Git-Tag: Release_2_05b~71
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=65310fba3ddf0942d5f868130bca9e093888ce7a;p=jalview.git

Sort by added to preferences
---

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index be1455b..ff44fe4 100755
--- 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",
          "http://www.jalview.org/examples/exampleFile.jar"));
 
+        sortby.addItem("No sort");
+        sortby.addItem("Id");
+        sortby.addItem("Pairwise Identity");
+        sortby.setSelectedItem( Cache.getDefault("SORT_ALIGNMENT", "No sort") );
+
   /****************************************************
    * Set up Connections
    */
@@ -191,6 +196,8 @@ public class Preferences extends GPreferences
       Cache.applicationProperties.setProperty("STARTUP_FILE", startupFileTextfield.getText());
       Cache.applicationProperties.setProperty("SHOW_STARTUP_FILE",  Boolean.toString(startupCheckbox.isSelected()));
 
+      Cache.applicationProperties.setProperty("SORT_ALIGNMENT", sortby.getSelectedItem().toString() );
+
       if(defaultBrowser.getText().trim().length()<1)
         Cache.applicationProperties.remove("DEFAULT_BROWSER");
       else
diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 7826ce4..ab1d4e7 100755
--- 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();
   GridBagLayout gridBagLayout1 = new GridBagLayout();
   GridBagLayout gridBagLayout3 = new GridBagLayout();
+  protected JComboBox sortby = new JComboBox();
+  JLabel sortLabel = new JLabel();
   /**
      * Creates a new GPreferences object.
      */
@@ -197,7 +199,7 @@ public class GPreferences extends JPanel
         startupCheckbox.setHorizontalTextPosition(SwingConstants.LEFT);
         startupCheckbox.setSelected(true);
         startupFileTextfield.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
-        startupFileTextfield.setBounds(new Rectangle(122, 202, 309, 20));
+        startupFileTextfield.setBounds(new Rectangle(121, 200, 309, 20));
         startupFileTextfield.addMouseListener(new MouseAdapter()
             {
                 public void mouseClicked(MouseEvent e)
@@ -294,6 +296,12 @@ public class GPreferences extends JPanel
     });
     jPanel1.setBorder(titledBorder1);
     jPanel1.setLayout(gridBagLayout1);
+    sortby.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    sortby.setBounds(new Rectangle(122, 232, 308, 21));
+    sortLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    sortLabel.setHorizontalAlignment(SwingConstants.RIGHT);
+    sortLabel.setText("Sort by");
+    sortLabel.setBounds(new Rectangle(53, 235, 64, 15));
     visualTab.add(annotations);
         visualTab.add(conservation);
         visualTab.add(quality);
@@ -301,15 +309,17 @@ public class GPreferences extends JPanel
         visualTab.add(gapSymbolCB);
         visualTab.add(fontLabel);
         visualTab.add(fontNameCB);
-        visualTab.add(colourLabel);
+    visualTab.add(colourLabel);
         visualTab.add(gapLabel);
-        visualTab.add(colour);
+    visualTab.add(colour);
         visualTab.add(fontSizeCB);
         visualTab.add(fontStyleCB);
         visualTab.add(identity);
         visualTab.add(fullScreen);
-        visualTab.add(startupCheckbox);
-        visualTab.add(startupFileTextfield);
+    visualTab.add(startupCheckbox);
+    visualTab.add(startupFileTextfield);
+    visualTab.add(sortby);
+    visualTab.add(sortLabel);
 
     tabbedPane.add(visualTab, "Visual");
     tabbedPane.add(connectTab, "Connections");