Proxy server, default browser, multiple links added
authoramwaterhouse <Andrew Waterhouse>
Tue, 9 Aug 2005 16:53:16 +0000 (16:53 +0000)
committeramwaterhouse <Andrew Waterhouse>
Tue, 9 Aug 2005 16:53:16 +0000 (16:53 +0000)
src/jalview/gui/Preferences.java
src/jalview/jbgui/GPreferences.java

index 8a3c372..8a2650b 100755 (executable)
@@ -31,6 +31,10 @@ import java.awt.event.*;
 \r
 import javax.swing.*;\r
 \r
+import java.util.*;\r
+\r
+import jalview.bin.Cache;\r
+\r
 \r
 /**\r
  * DOCUMENT ME!\r
@@ -40,86 +44,42 @@ import javax.swing.*;
  */\r
 public class Preferences extends GPreferences\r
 {\r
-    static boolean preferencesLoaded = false;\r
-\r
-    /** DOCUMENT ME!! */\r
-    public static boolean showFullscreen = false;\r
-\r
-    /** DOCUMENT ME!! */\r
-    public static boolean showFullId = true;\r
-\r
-    /** DOCUMENT ME!! */\r
-    public static boolean showAnnotation = true;\r
-\r
-    /** DOCUMENT ME!! */\r
-    public static boolean showConservation = true;\r
-\r
-    /** DOCUMENT ME!! */\r
-    public static boolean showQuality = true;\r
-\r
-    /** DOCUMENT ME!! */\r
-    public static boolean showIdentity = true;\r
+    /** Holds name and link separated with | character. Sequence ID must be $SEQUENCE_ID$ */\r
+   public static Vector sequenceURLLinks = new Vector();\r
+    Vector nameLinks, urlLinks;\r
 \r
-    /** DOCUMENT ME!! */\r
-    public static String fontName = "SansSerif";\r
-\r
-    /** DOCUMENT ME!! */\r
-    public static String fontSize = "10";\r
-\r
-    /** DOCUMENT ME!! */\r
-    public static String fontStyle = Font.PLAIN + "";\r
-\r
-    /** DOCUMENT ME!! */\r
-    public static char gapSymbol = '-';\r
-\r
-    /** DOCUMENT ME!! */\r
-    public static String defaultColour = null;\r
-\r
-    /** DOCUMENT ME!! */\r
-    public static boolean showStartupFile = true;\r
-\r
-    /** DOCUMENT ME!! */\r
-    public static String startupFile = "http://www.jalview.org/examples/exampleFile.jar";\r
     JInternalFrame frame;\r
 \r
+\r
     /**\r
      * Creates a new Preferences object.\r
      */\r
     public Preferences()\r
     {\r
-        initPreferences();\r
 \r
         frame = new JInternalFrame();\r
         frame.setContentPane(this);\r
         Desktop.addInternalFrame(frame, "Preferences", 480, 390);\r
+        frame.setMinimumSize(new Dimension(480,390));\r
 \r
-        fullID.setSelected(showFullId);\r
+        fullID.setSelected(      Cache.getDefault("SHOW_FULL_ID", true));\r
+        fullScreen.setSelected(  Cache.getDefault("SHOW_FULLSCREEN", false));\r
+        annotations.setSelected( Cache.getDefault("SHOW_FULL_ID", true));\r
+        conservation.setEnabled( Cache.getDefault("SHOW_ANNOTATIONS", true));\r
 \r
-        String string = Cache.getProperty("SHOW_FULLSCREEN");\r
-        boolean value = false;\r
+        quality.setEnabled(Cache.getDefault("SHOW_ANNOTATIONS", true));\r
+        identity.setEnabled(Cache.getDefault("SHOW_ANNOTATIONS", true));\r
 \r
-        if (string != null)\r
-        {\r
-            value = Boolean.valueOf(string).booleanValue();\r
-        }\r
-\r
-        fullScreen.setSelected(value);\r
-        annotations.setSelected(showAnnotation);\r
-\r
-        conservation.setEnabled(showAnnotation);\r
-        quality.setEnabled(showAnnotation);\r
-        identity.setEnabled(showAnnotation);\r
-\r
-        conservation.setSelected(showConservation);\r
-        quality.setSelected(showQuality);\r
-        identity.setSelected(showIdentity);\r
+        conservation.setSelected(Cache.getDefault("SHOW_CONSERVATION", true));\r
+        quality.setSelected(Cache.getDefault("SHOW_QUALITY", true));\r
+        identity.setSelected(Cache.getDefault("SHOW_IDENTITY", true));\r
 \r
         for (int i = 0; i < 12; i++)\r
         {\r
             colour.addItem(ColourSchemeProperty.getColourName(i));\r
         }\r
 \r
-        string = Cache.getProperty("DEFAULT_COLOUR");\r
+        String string = Cache.getProperty("DEFAULT_COLOUR");\r
 \r
         if (string != null)\r
         {\r
@@ -147,165 +107,122 @@ public class Preferences extends GPreferences
         fontStyleCB.addItem("bold");\r
         fontStyleCB.addItem("italic");\r
 \r
-        fontNameCB.setSelectedItem(fontName);\r
-        fontSizeCB.setSelectedItem(fontSize);\r
-        fontStyleCB.setSelectedItem(fontStyle);\r
+        fontNameCB.setSelectedItem(Cache.getDefault("FONT_NAME", "SansSerif"));\r
+        fontSizeCB.setSelectedItem(Cache.getDefault("FONT_SIZE", "10"));\r
+        fontStyleCB.setSelectedItem(Cache.getDefault("FONT_STYLE", Font.PLAIN + "") );\r
 \r
         gapSymbolCB.addItem("-");\r
         gapSymbolCB.addItem(".");\r
 \r
-        gapSymbolCB.setSelectedItem(gapSymbol + "");\r
+        gapSymbolCB.setSelectedItem( Cache.getDefault("GAP_SYMBOL", "-"));\r
 \r
-        startupCheckbox.setSelected(showStartupFile);\r
-        startupFileTextfield.setText(startupFile);\r
-    }\r
+        startupCheckbox.setSelected( Cache.getDefault("SHOW_STARTUP_FILE", true) );\r
+        startupFileTextfield.setText(Cache.getDefault("STARTUP_FILE",\r
+         "http://www.jalview.org/examples/exampleFile.jar"));\r
 \r
-    /**\r
-     * DOCUMENT ME!\r
-     */\r
-    public static void initPreferences()\r
-    {\r
-        String string = Cache.getProperty("SHOW_FULL_ID");\r
+  /****************************************************\r
+   * Set up Connections\r
+   */\r
 \r
-        if (string != null)\r
-        {\r
-            showFullId = Boolean.valueOf(string).booleanValue();\r
-        }\r
+  string = Cache.getDefault("SEQUENCE_LINKS",\r
+                            "SRS|http://srs.ebi.ac.uk/srs7bin/cgi-bin/wgetz?-e+[uniprot-all:$SEQUENCE_ID$]+-vn+2");\r
+      sequenceURLLinks = new Vector();\r
 \r
-        string = Cache.getProperty("SHOW_FULLSCREEN");\r
+        try{\r
+          StringTokenizer st = new StringTokenizer(string, "|");\r
+          while (st.hasMoreElements())\r
+          {\r
+            sequenceURLLinks.addElement(st.nextToken() + "|" + st.nextToken());\r
+          }\r
+        }catch(Exception ex)\r
+        {System.out.println(ex+"\nError parsing sequence links");}\r
 \r
-        if (string != null)\r
-        {\r
-            showFullscreen = Boolean.valueOf(string).booleanValue();\r
-        }\r
-\r
-        string = Cache.getProperty("SHOW_ANNOTATIONS");\r
-\r
-        if (string != null)\r
-        {\r
-            showAnnotation = Boolean.valueOf(string).booleanValue();\r
-        }\r
-\r
-        string = Cache.getProperty("SHOW_CONSERVATION");\r
-\r
-        if (string != null)\r
-        {\r
-            showConservation = Boolean.valueOf(string).booleanValue();\r
-        }\r
-\r
-        string = Cache.getProperty("SHOW_QUALITY");\r
-\r
-        if (string != null)\r
-        {\r
-            showQuality = Boolean.valueOf(string).booleanValue();\r
-        }\r
-\r
-        string = Cache.getProperty("SHOW_IDENTITY");\r
-\r
-        if (string != null)\r
+        nameLinks = new Vector();\r
+        urlLinks = new Vector();\r
+        for(int i=0; i<sequenceURLLinks.size(); i++)\r
         {\r
-            showIdentity = Boolean.valueOf(string).booleanValue();\r
+          String link = sequenceURLLinks.elementAt(i).toString();\r
+          nameLinks.addElement(link.substring(0, link.indexOf("|")) );\r
+          urlLinks.addElement(link.substring(link.indexOf("|")+1));\r
         }\r
 \r
-        string = Cache.getProperty("GAP_SYMBOL");\r
+        updateLinkData();\r
 \r
-        if (string != null)\r
-        {\r
-            gapSymbol = string.charAt(0);\r
-        }\r
-\r
-        string = Cache.getProperty("SHOW_FULL_ID");\r
+        useProxy.setSelected( Cache.getDefault("USE_PROXY", false));\r
+        proxyServerTB.setEnabled(useProxy.isSelected());\r
+        proxyPortTB.setEnabled(useProxy.isSelected());\r
+        proxyServerTB.setText( Cache.getDefault("PROXY_SERVER", ""));\r
+        proxyPortTB.setText(Cache.getDefault("PROXY_PORT", ""));\r
 \r
-        if (string != null)\r
-        {\r
-            showFullId = Boolean.valueOf(string).booleanValue();\r
-        }\r
+        defaultBrowser.setText( Cache.getDefault("DEFAULT_BROWSER",""));\r
+    try\r
+    {\r
+      jbInit();\r
+    }\r
+    catch (Exception ex)\r
+    {\r
+      ex.printStackTrace();\r
+    }\r
 \r
-        string = Cache.getProperty("FONT_NAME");\r
+  }\r
 \r
-        if (string != null)\r
-        {\r
-            fontName = string;\r
-        }\r
 \r
-        string = Cache.getProperty("FONT_STYLE");\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void ok_actionPerformed(ActionEvent e)\r
+    {\r
 \r
-        if (string != null)\r
-        {\r
-            fontStyle = string;\r
-        }\r
+      Cache.applicationProperties.setProperty("SHOW_FULL_ID", Boolean.toString(fullID.isSelected()));\r
+      Cache.applicationProperties.setProperty("SHOW_FULLSCREEN", Boolean.toString(fullScreen.isSelected()));\r
 \r
-        string = Cache.getProperty("FONT_SIZE");\r
+      Cache.applicationProperties.setProperty("SHOW_ANNOTATIONS", Boolean.toString(annotations.isSelected()));\r
+      Cache.applicationProperties.setProperty("SHOW_CONSERVATION", Boolean.toString(conservation.isSelected()));\r
+      Cache.applicationProperties.setProperty("SHOW_QUALITY", Boolean.toString(quality.isSelected()));\r
+      Cache.applicationProperties.setProperty("SHOW_IDENTITY", Boolean.toString(identity.isSelected()));\r
 \r
-        if (string != null)\r
-        {\r
-            fontSize = string;\r
-        }\r
+      Cache.applicationProperties.setProperty("DEFAULT_COLOUR", colour.getSelectedItem().toString());\r
+      Cache.applicationProperties.setProperty("GAP_SYMBOL", gapSymbolCB.getSelectedItem().toString());\r
 \r
-        string = Cache.getProperty("DEFAULT_COLOUR");\r
+      Cache.applicationProperties.setProperty("FONT_NAME", fontNameCB.getSelectedItem().toString());\r
+      Cache.applicationProperties.setProperty("FONT_STYLE", fontStyleCB.getSelectedItem().toString());\r
+      Cache.applicationProperties.setProperty("FONT_SIZE", fontSizeCB.getSelectedItem().toString());\r
 \r
-        if (string != null)\r
-        {\r
-            defaultColour = string;\r
-        }\r
+      Cache.applicationProperties.setProperty("STARTUP_FILE", startupFileTextfield.getText());\r
+      Cache.applicationProperties.setProperty("SHOW_STARTUP_FILE",  Boolean.toString(startupCheckbox.isSelected()));\r
 \r
-        string = Cache.getProperty("STARTUP_FILE");\r
+      Cache.applicationProperties.setProperty("DEFAULT_BROWSER", defaultBrowser.getText());\r
 \r
-        if (string != null)\r
+        if(nameLinks.size()>0)\r
         {\r
-            startupFile = string;\r
+          StringBuffer links = new StringBuffer();\r
+          sequenceURLLinks = new Vector();\r
+          for (int i = 0; i < nameLinks.size(); i++)\r
+          {\r
+            sequenceURLLinks.addElement(nameLinks.elementAt(i)+"|"+urlLinks.elementAt(i));\r
+            links.append(sequenceURLLinks.elementAt(i).toString());\r
+            links.append("|");\r
+          }\r
+          // remove last "|"\r
+          links.setLength( links.length()-1 );\r
+          Cache.applicationProperties.setProperty("SEQUENCE_LINKS", links.toString());\r
         }\r
 \r
-        string = Cache.getProperty("SHOW_STARTUP_FILE");\r
+        Cache.applicationProperties.setProperty("USE_PROXY", Boolean.toString(useProxy.isSelected()));\r
+        Cache.applicationProperties.setProperty("PROXY_SERVER",proxyServerTB.getText());\r
+        Cache.applicationProperties.setProperty("PROXY_PORT", proxyPortTB.getText());\r
 \r
-        if (string != null)\r
+        if(useProxy.isSelected())\r
         {\r
-            showStartupFile = Boolean.valueOf(string).booleanValue();\r
+          System.setProperty("http.proxyHost", proxyServerTB.getText());\r
+          System.setProperty("http.proxyPort", proxyPortTB.getText());\r
         }\r
 \r
-        preferencesLoaded = true;\r
-    }\r
 \r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param e DOCUMENT ME!\r
-     */\r
-    public void ok_actionPerformed(ActionEvent e)\r
-    {\r
-        showFullId = fullID.isSelected();\r
-        showFullscreen = fullScreen.isSelected();\r
-        showAnnotation = annotations.isSelected();\r
-        showConservation = conservation.isSelected();\r
-        showQuality = quality.isSelected();\r
-        showIdentity = identity.isSelected();\r
-        defaultColour = colour.getSelectedItem().toString();\r
-        gapSymbol = gapSymbolCB.getSelectedItem().toString().charAt(0);\r
-        fontName = fontNameCB.getSelectedItem().toString();\r
-        fontSize = fontSizeCB.getSelectedItem().toString();\r
-        fontStyle = fontStyleCB.getSelectedItem().toString();\r
-        startupFile = startupFileTextfield.getText();\r
-        showStartupFile = startupCheckbox.isSelected();\r
-\r
-        Cache.setProperty("SHOW_FULL_ID", Boolean.toString(showFullId));\r
-        Cache.setProperty("SHOW_FULLSCREEN", Boolean.toString(showFullscreen));\r
-\r
-        Cache.setProperty("SHOW_ANNOTATIONS", Boolean.toString(showAnnotation));\r
-        Cache.setProperty("SHOW_CONSERVATION",\r
-            Boolean.toString(showConservation));\r
-        Cache.setProperty("SHOW_QUALITY", Boolean.toString(showQuality));\r
-        Cache.setProperty("SHOW_IDENTITY", Boolean.toString(showIdentity));\r
-\r
-        Cache.setProperty("DEFAULT_COLOUR", defaultColour);\r
-        Cache.setProperty("GAP_SYMBOL", gapSymbol + "");\r
-\r
-        Cache.setProperty("FONT_NAME", fontName);\r
-        Cache.setProperty("FONT_STYLE", fontStyle);\r
-        Cache.setProperty("FONT_SIZE", fontSize);\r
-\r
-        Cache.setProperty("STARTUP_FILE", startupFile);\r
-        Cache.setProperty("SHOW_STARTUP_FILE", Boolean.toString(showStartupFile));\r
 \r
+        Cache.saveProperties();\r
         try\r
         {\r
             frame.setClosed(true);\r
@@ -338,7 +255,7 @@ public class Preferences extends GPreferences
 \r
         if (value == JalviewFileChooser.APPROVE_OPTION)\r
         {\r
-            jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT",\r
+            jalview.bin.Cache.applicationProperties.setProperty("DEFAULT_FILE_FORMAT",\r
                 chooser.getSelectedFormat());\r
             startupFileTextfield.setText(chooser.getSelectedFile()\r
                                                 .getAbsolutePath());\r
@@ -372,4 +289,106 @@ public class Preferences extends GPreferences
         quality.setEnabled(annotations.isSelected());\r
         identity.setEnabled(annotations.isSelected());\r
     }\r
+\r
+\r
+    public void newLink_actionPerformed(ActionEvent e) {\r
+\r
+      GSequenceLink link = new GSequenceLink();\r
+      boolean valid = false;\r
+      while( !valid )\r
+      {\r
+        if (JOptionPane.showInternalConfirmDialog(Desktop.desktop, link,\r
+                                                  "New sequence URL link",\r
+                                                  JOptionPane.OK_CANCEL_OPTION\r
+                                                  ,-1, null)\r
+            == JOptionPane.OK_OPTION)\r
+        {\r
+          if (link.checkValid())\r
+          {\r
+            nameLinks.addElement(link.getName());\r
+            urlLinks.addElement(link.getURL());\r
+            updateLinkData();\r
+            valid = true;\r
+          }\r
+        }\r
+        else\r
+          break;\r
+      }\r
+    }\r
+\r
+    public void editLink_actionPerformed(ActionEvent e) {\r
+      GSequenceLink link = new GSequenceLink();\r
+\r
+      int index = linkNameList.getSelectedIndex();\r
+      if(index==-1)\r
+      {\r
+        JOptionPane.showInternalMessageDialog(Desktop.desktop, "No link selected!"\r
+            ,"No link selected", JOptionPane.WARNING_MESSAGE);\r
+        return;\r
+      }\r
+\r
+      link.setName( nameLinks.elementAt(index).toString() );\r
+      link.setURL( urlLinks.elementAt(index).toString() );\r
+\r
+      boolean valid = false;\r
+      while (!valid)\r
+      {\r
+\r
+        if (JOptionPane.showInternalConfirmDialog(Desktop.desktop, link,\r
+                                                  "New sequence URL link",\r
+                                                  JOptionPane.OK_CANCEL_OPTION\r
+                                                  ,-1, null)\r
+            == JOptionPane.OK_OPTION)\r
+        {\r
+          if (link.checkValid())\r
+          {\r
+            nameLinks.setElementAt(link.getName(), index);\r
+            urlLinks.setElementAt(link.getURL(), index);\r
+            updateLinkData();\r
+            valid = true;\r
+          }\r
+        }\r
+\r
+        else\r
+          break;\r
+      }\r
+    }\r
+\r
+    public void deleteLink_actionPerformed(ActionEvent e) {\r
+      int index = linkNameList.getSelectedIndex();\r
+      if(index==-1)\r
+      {\r
+        JOptionPane.showInternalMessageDialog(Desktop.desktop, "No link selected!"\r
+            ,"No link selected", JOptionPane.WARNING_MESSAGE);\r
+        return;\r
+      }\r
+      nameLinks.removeElementAt(index);\r
+      urlLinks.removeElementAt(index);\r
+      updateLinkData();\r
+    }\r
+\r
+    void updateLinkData()\r
+    {\r
+      linkNameList.setListData(nameLinks);\r
+      linkURLList.setListData(urlLinks);\r
+    }\r
+\r
+    public void defaultBrowser_mouseClicked(MouseEvent e)\r
+    {\r
+      JFileChooser chooser = new JFileChooser(".");\r
+      chooser.setDialogTitle("Select default web browser");\r
+\r
+      int value = chooser.showOpenDialog(this);\r
+\r
+      if (value == JFileChooser.APPROVE_OPTION)\r
+      {\r
+        defaultBrowser.setText(chooser.getSelectedFile().getAbsolutePath());\r
+      }\r
+\r
+  }\r
+\r
+  private void jbInit()\r
+      throws Exception\r
+  {\r
+  }\r
 }\r
index fd61014..7826ce4 100755 (executable)
 package jalview.jbgui;\r
 \r
 import java.awt.*;\r
-import java.awt.event.ActionEvent;\r
-import java.awt.event.ActionListener;\r
-import java.awt.event.MouseAdapter;\r
-import java.awt.event.MouseEvent;\r
 \r
 import javax.swing.*;\r
 import javax.swing.border.TitledBorder;\r
+import java.awt.event.*;\r
+import javax.swing.event.*;\r
 \r
 \r
 /**\r
@@ -36,32 +34,55 @@ import javax.swing.border.TitledBorder;
  */\r
 public class GPreferences extends JPanel\r
 {\r
-    JTabbedPane visaulTab = new JTabbedPane();\r
-    JPanel visual = new JPanel();\r
+    JTabbedPane tabbedPane = new JTabbedPane();\r
+\r
     JButton ok = new JButton();\r
     JButton cancel = new JButton();\r
-    JPanel jPanel1 = new JPanel();\r
+    JPanel okCancelPanel = new JPanel();\r
     BorderLayout borderLayout1 = new BorderLayout();\r
     protected JCheckBox quality = new JCheckBox();\r
-    JPanel jPanel2 = new JPanel();\r
-    TitledBorder titledBorder1 = new TitledBorder("Open new alignment");\r
+    JPanel visualTab = new JPanel();\r
     protected JCheckBox fullID = new JCheckBox();\r
     protected JCheckBox fullScreen = new JCheckBox();\r
     protected JCheckBox conservation = new JCheckBox();\r
     protected JCheckBox identity = new JCheckBox();\r
     protected JCheckBox annotations = new JCheckBox();\r
-    JLabel jLabel1 = new JLabel();\r
+    JLabel gapLabel = new JLabel();\r
     protected JComboBox colour = new JComboBox();\r
-    JLabel jLabel2 = new JLabel();\r
-    JLabel jLabel3 = new JLabel();\r
+    JLabel colourLabel = new JLabel();\r
+    JLabel fontLabel = new JLabel();\r
     protected JComboBox fontSizeCB = new JComboBox();\r
     protected JComboBox fontStyleCB = new JComboBox();\r
     protected JComboBox fontNameCB = new JComboBox();\r
     protected JComboBox gapSymbolCB = new JComboBox();\r
     protected JCheckBox startupCheckbox = new JCheckBox();\r
     protected JTextField startupFileTextfield = new JTextField();\r
-\r
-    /**\r
+  JPanel connectTab = new JPanel();\r
+  JLabel serverLabel = new JLabel();\r
+  protected JList linkURLList = new JList();\r
+  protected JTextField proxyServerTB = new JTextField();\r
+  protected JTextField proxyPortTB = new JTextField();\r
+  JLabel portLabel = new JLabel();\r
+  JLabel browserLabel = new JLabel();\r
+  protected JTextField defaultBrowser = new JTextField();\r
+  JButton newLink = new JButton();\r
+  JButton editLink = new JButton();\r
+  JButton deleteLink = new JButton();\r
+  JScrollPane linkScrollPane = new JScrollPane();\r
+  JPanel linkPanel = new JPanel();\r
+  BorderLayout borderLayout2 = new BorderLayout();\r
+  JPanel editLinkButtons = new JPanel();\r
+  GridLayout gridLayout1 = new GridLayout();\r
+  protected JList linkNameList = new JList();\r
+  JPanel linkPanel2 = new JPanel();\r
+  BorderLayout borderLayout3 = new BorderLayout();\r
+  protected JCheckBox useProxy = new JCheckBox();\r
+  JPanel jPanel1 = new JPanel();\r
+  TitledBorder titledBorder1 = new TitledBorder("Proxy Server");\r
+  GridBagLayout gridBagLayout2 = new GridBagLayout();\r
+  GridBagLayout gridBagLayout1 = new GridBagLayout();\r
+  GridBagLayout gridBagLayout3 = new GridBagLayout();\r
+  /**\r
      * Creates a new GPreferences object.\r
      */\r
     public GPreferences()\r
@@ -100,7 +121,6 @@ public class GPreferences extends JPanel
                     cancel_actionPerformed(e);\r
                 }\r
             });\r
-        visual.setLayout(null);\r
         quality.setEnabled(false);\r
         quality.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
         quality.setHorizontalAlignment(SwingConstants.RIGHT);\r
@@ -108,9 +128,9 @@ public class GPreferences extends JPanel
         quality.setSelected(true);\r
         quality.setText("Quality");\r
         quality.setBounds(new Rectangle(248, 53, 81, 23));\r
-        jPanel2.setBorder(titledBorder1);\r
-        jPanel2.setBounds(new Rectangle(9, 20, 442, 241));\r
-        jPanel2.setLayout(null);\r
+        visualTab.setBorder(new TitledBorder("Open new alignment"));\r
+        visualTab.setBounds(new Rectangle(9, 20, 442, 241));\r
+        visualTab.setLayout(null);\r
         fullID.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
         fullID.setHorizontalAlignment(SwingConstants.RIGHT);\r
         fullID.setHorizontalTextPosition(SwingConstants.LEFT);\r
@@ -148,20 +168,20 @@ public class GPreferences extends JPanel
                     annotations_actionPerformed(e);\r
                 }\r
             });\r
-        jLabel1.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-        jLabel1.setHorizontalAlignment(SwingConstants.RIGHT);\r
-        jLabel1.setText("Gap Symbol");\r
-        jLabel1.setBounds(new Rectangle(41, 142, 76, 15));\r
+        gapLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+        gapLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
+        gapLabel.setText("Gap Symbol");\r
+        gapLabel.setBounds(new Rectangle(41, 142, 76, 15));\r
         colour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
         colour.setBounds(new Rectangle(121, 168, 154, 21));\r
-        jLabel2.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-        jLabel2.setHorizontalAlignment(SwingConstants.RIGHT);\r
-        jLabel2.setText("Colour");\r
-        jLabel2.setBounds(new Rectangle(60, 172, 58, 15));\r
-        jLabel3.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
-        jLabel3.setHorizontalAlignment(SwingConstants.RIGHT);\r
-        jLabel3.setText("Font");\r
-        jLabel3.setBounds(new Rectangle(83, 114, 34, 15));\r
+        colourLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+        colourLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
+        colourLabel.setText("Colour");\r
+        colourLabel.setBounds(new Rectangle(60, 172, 58, 15));\r
+        fontLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+        fontLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
+        fontLabel.setText("Font");\r
+        fontLabel.setBounds(new Rectangle(83, 114, 34, 15));\r
         fontSizeCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
         fontSizeCB.setBounds(new Rectangle(304, 109, 49, 21));\r
         fontStyleCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
@@ -172,13 +192,6 @@ public class GPreferences extends JPanel
         gapSymbolCB.setBounds(new Rectangle(121, 140, 67, 21));\r
         startupCheckbox.setText("Open file");\r
         startupCheckbox.setBounds(new Rectangle(4, 200, 115, 23));\r
-        startupCheckbox.addActionListener(new ActionListener()\r
-            {\r
-                public void actionPerformed(ActionEvent e)\r
-                {\r
-                    jCheckBox1_actionPerformed(e);\r
-                }\r
-            });\r
         startupCheckbox.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
         startupCheckbox.setHorizontalAlignment(SwingConstants.RIGHT);\r
         startupCheckbox.setHorizontalTextPosition(SwingConstants.LEFT);\r
@@ -196,30 +209,155 @@ public class GPreferences extends JPanel
                 }\r
             });\r
 \r
-        jPanel2.add(annotations);\r
-        jPanel2.add(conservation);\r
-        jPanel2.add(quality);\r
-        jPanel2.add(fullID);\r
-        jPanel2.add(gapSymbolCB);\r
-        jPanel2.add(jLabel1);\r
-        jPanel2.add(fontNameCB);\r
-        jPanel2.add(jLabel2);\r
-        jPanel2.add(jLabel3);\r
-        jPanel2.add(colour);\r
-        jPanel2.add(fontSizeCB);\r
-        jPanel2.add(fontStyleCB);\r
-        jPanel2.add(identity);\r
-        jPanel2.add(fullScreen);\r
-        jPanel2.add(startupCheckbox);\r
-        jPanel2.add(startupFileTextfield);\r
-        jPanel1.add(ok);\r
-        jPanel1.add(cancel);\r
-        this.add(visaulTab, java.awt.BorderLayout.CENTER);\r
-        visaulTab.add(visual, "visual");\r
-        visual.add(jPanel2);\r
-        this.add(jPanel1, java.awt.BorderLayout.SOUTH);\r
+     connectTab.setLayout(gridBagLayout3);\r
+    serverLabel.setText("Address");\r
+    serverLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    serverLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    proxyServerTB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    proxyPortTB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    portLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    portLabel.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    portLabel.setText("Port");\r
+    browserLabel.setFont(new java.awt.Font("SansSerif", 0, 11));\r
+    browserLabel.setHorizontalAlignment(SwingConstants.TRAILING);\r
+    browserLabel.setText("Default Browser (Unix)");\r
+    defaultBrowser.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    defaultBrowser.setText("");\r
+    newLink.setText("New");\r
+    newLink.addActionListener(new java.awt.event.ActionListener() {\r
+      public void actionPerformed(ActionEvent e) {\r
+        newLink_actionPerformed(e);\r
+      }\r
+    });\r
+    editLink.setText("Edit");\r
+    editLink.addActionListener(new java.awt.event.ActionListener() {\r
+      public void actionPerformed(ActionEvent e) {\r
+        editLink_actionPerformed(e);\r
+      }\r
+    });\r
+    deleteLink.setText("Delete");\r
+    deleteLink.addActionListener(new java.awt.event.ActionListener() {\r
+      public void actionPerformed(ActionEvent e) {\r
+        deleteLink_actionPerformed(e);\r
+      }\r
+    });\r
+\r
+    linkURLList.addListSelectionListener(new ListSelectionListener()\r
+         {\r
+            public void valueChanged(ListSelectionEvent e)\r
+            {\r
+               int index = linkURLList.getSelectedIndex();\r
+               linkNameList.setSelectedIndex(index);\r
+            }\r
+         });\r
+\r
+    linkNameList.addListSelectionListener(new ListSelectionListener()\r
+        {\r
+          public void valueChanged(ListSelectionEvent e)\r
+          {\r
+              int index = linkNameList.getSelectedIndex();\r
+              linkURLList.setSelectedIndex(index);\r
+          }\r
+        });\r
+\r
+    linkScrollPane.setBorder(null);\r
+    linkPanel.setBorder(new TitledBorder("URL link from Sequence ID"));\r
+    linkPanel.setLayout(borderLayout2);\r
+    editLinkButtons.setLayout(gridLayout1);\r
+    gridLayout1.setRows(3);\r
+    linkNameList.setFont(new java.awt.Font("Verdana", Font.ITALIC, 11));\r
+    linkNameList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+    linkPanel2.setLayout(borderLayout3);\r
+    linkURLList.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    linkURLList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+\r
+    defaultBrowser.addMouseListener(new MouseAdapter()\r
+    {\r
+      public void mouseClicked(MouseEvent e)\r
+      {\r
+        if (e.getClickCount() > 1)\r
+            {\r
+              defaultBrowser_mouseClicked(e);\r
+            }\r
+      }\r
+    });\r
+    useProxy.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    useProxy.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    useProxy.setHorizontalTextPosition(SwingConstants.LEADING);\r
+    useProxy.setText("Use a proxy server");\r
+    useProxy.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        useProxy_actionPerformed();\r
+      }\r
+    });\r
+    jPanel1.setBorder(titledBorder1);\r
+    jPanel1.setLayout(gridBagLayout1);\r
+    visualTab.add(annotations);\r
+        visualTab.add(conservation);\r
+        visualTab.add(quality);\r
+        visualTab.add(fullID);\r
+        visualTab.add(gapSymbolCB);\r
+        visualTab.add(fontLabel);\r
+        visualTab.add(fontNameCB);\r
+        visualTab.add(colourLabel);\r
+        visualTab.add(gapLabel);\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
+\r
+    tabbedPane.add(visualTab, "Visual");\r
+    tabbedPane.add(connectTab, "Connections");\r
+\r
+    linkPanel.add(editLinkButtons, BorderLayout.EAST);\r
+    editLinkButtons.add(newLink, null);\r
+    editLinkButtons.add(editLink, null);\r
+    editLinkButtons.add(deleteLink, null);\r
+    linkPanel.add(linkScrollPane, BorderLayout.CENTER);\r
+    linkScrollPane.getViewport().add(linkPanel2, null);\r
+    linkPanel2.add(linkURLList, BorderLayout.CENTER);\r
+    linkPanel2.add(linkNameList, BorderLayout.WEST);\r
+        okCancelPanel.add(ok);\r
+        okCancelPanel.add(cancel);\r
+        this.add(tabbedPane, java.awt.BorderLayout.CENTER);\r
 \r
-        DefaultListCellRenderer dlcr = new DefaultListCellRenderer();\r
+        this.add(okCancelPanel, java.awt.BorderLayout.SOUTH);\r
+    jPanel1.add(serverLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0\r
+        , GridBagConstraints.WEST, GridBagConstraints.NONE,\r
+        new Insets(0, 2, 4, 0), 5, 0));\r
+    jPanel1.add(portLabel, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0\r
+                                                  , GridBagConstraints.WEST,\r
+                                                  GridBagConstraints.NONE,\r
+                                                  new Insets(0, 0, 4, 0), 11, 6));\r
+    connectTab.add(linkPanel, new GridBagConstraints(0, 0, 2, 1, 1.0, 1.0\r
+        , GridBagConstraints.CENTER, GridBagConstraints.BOTH,\r
+        new Insets(16, 0, 0, 12), 359, -17));\r
+    connectTab.add(jPanel1, new GridBagConstraints(0, 2, 2, 1, 1.0, 1.0\r
+        , GridBagConstraints.CENTER, GridBagConstraints.BOTH,\r
+        new Insets(21, 0, 35, 12), 4, 6));\r
+    connectTab.add(browserLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0\r
+        , GridBagConstraints.WEST, GridBagConstraints.NONE,\r
+        new Insets(16, 0, 0, 0), 5, 1));\r
+    jPanel1.add(proxyPortTB, new GridBagConstraints(3, 1, 1, 1, 1.0, 0.0\r
+        , GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL,\r
+        new Insets(0, 2, 4, 2), 54, 1));\r
+    jPanel1.add(proxyServerTB, new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0\r
+        , GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL,\r
+        new Insets(0, 2, 4, 0), 263, 1));\r
+    connectTab.add(defaultBrowser, new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0\r
+        , GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL,\r
+        new Insets(15, 0, 0, 15), 307, 1));\r
+    jPanel1.add(useProxy, new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0\r
+                                                 , GridBagConstraints.WEST,\r
+                                                 GridBagConstraints.NONE,\r
+                                                 new Insets(0, 2, 5, 185), 2,\r
+                                                 -4));\r
+    DefaultListCellRenderer dlcr = new DefaultListCellRenderer();\r
         dlcr.setHorizontalAlignment(DefaultListCellRenderer.CENTER);\r
         gapSymbolCB.setRenderer(dlcr);\r
     }\r
@@ -251,14 +389,6 @@ public class GPreferences extends JPanel
     {\r
     }\r
 \r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param e DOCUMENT ME!\r
-     */\r
-    public void jCheckBox1_actionPerformed(ActionEvent e)\r
-    {\r
-    }\r
 \r
     /**\r
      * DOCUMENT ME!\r
@@ -266,4 +396,33 @@ public class GPreferences extends JPanel
     public void startupFileTextfield_mouseClicked()\r
     {\r
     }\r
+\r
+\r
+  public void newLink_actionPerformed(ActionEvent e) {\r
+\r
+  }\r
+\r
+  public void editLink_actionPerformed(ActionEvent e) {\r
+\r
+  }\r
+\r
+  public void deleteLink_actionPerformed(ActionEvent e) {\r
+\r
+  }\r
+\r
+  public void defaultBrowser_mouseClicked(MouseEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  public void linkURLList_keyTyped(KeyEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  public void useProxy_actionPerformed()\r
+  {\r
+      proxyServerTB.setEnabled(useProxy.isSelected());\r
+      proxyPortTB.setEnabled(useProxy.isSelected());\r
+  }\r
 }\r