X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPreferences.java;h=4774cace33e143b640d03ef8dbaac82b4235a95f;hb=7cf75b5b379dd71b3480726419c7dc55d8e01f0e;hp=9ac8acf3645ce9e8db160af7f574a1992b5f5ba6;hpb=38299bef6dfd4b713f615781e631dcb66e1155f2;p=jalview.git

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 9ac8acf..4774cac 100755
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -47,7 +47,7 @@ public class Preferences extends GPreferences
     static
     {
       String string = Cache.getDefault("SEQUENCE_LINKS",
-                                       "SRS|http://srs.ebi.ac.uk/srs7bin/cgi-bin/wgetz?-e+[uniprot-all:$SEQUENCE_ID$]+-vn+2");
+                                       "SRS|http://srs.ebi.ac.uk/srsbin/cgi-bin/wgetz?-newId+(([uniprot-all:$SEQUENCE_ID$]))+-view+SwissEntry");
       sequenceURLLinks = new Vector();
 
       try
@@ -67,6 +67,8 @@ public class Preferences extends GPreferences
 
     JInternalFrame frame;
 
+    DasSourceBrowser dasSource;
+
 
     /**
      * Creates a new Preferences object.
@@ -76,8 +78,18 @@ public class Preferences extends GPreferences
 
         frame = new JInternalFrame();
         frame.setContentPane(this);
-        Desktop.addInternalFrame(frame, "Preferences", 480, 395);
-        frame.setMinimumSize(new Dimension(480,395));
+        dasSource = new DasSourceBrowser();
+        dasPanel.add(dasSource, BorderLayout.CENTER);
+
+        int width = 500, height = 420;
+        if(System.getProperty("os.name").startsWith("Mac"))
+        {
+          width = 570;
+          height = 460;
+        }
+
+        Desktop.addInternalFrame(frame, "Preferences", width, height);
+        frame.setMinimumSize(new Dimension(width, height));
 
         seqLimit.setSelected(    Cache.getDefault("SHOW_JVSUFFIX", true));
         fullScreen.setSelected(  Cache.getDefault("SHOW_FULLSCREEN", false));
@@ -123,6 +135,8 @@ public class Preferences extends GPreferences
 
         smoothFont.setSelected(Cache.getDefault("ANTI_ALIAS", false));
 
+        wrap.setSelected(Cache.getDefault("WRAP_ALIGNMENT", false));
+
         gapSymbolCB.addItem("-");
         gapSymbolCB.addItem(".");
 
@@ -213,6 +227,8 @@ public class Preferences extends GPreferences
 
       Cache.applicationProperties.setProperty("ANTI_ALIAS", Boolean.toString(smoothFont.isSelected()));
 
+      Cache.applicationProperties.setProperty("WRAP_ALIGNMENT", Boolean.toString(wrap.isSelected()));
+
       Cache.applicationProperties.setProperty("STARTUP_FILE", startupFileTextfield.getText());
       Cache.applicationProperties.setProperty("SHOW_STARTUP_FILE",  Boolean.toString(startupCheckbox.isSelected()));
 
@@ -288,6 +304,9 @@ public class Preferences extends GPreferences
                                                 Boolean.toString(autoCalculateConsCheck.isSelected()));
         Cache.applicationProperties.setProperty("PAD_GAPS",
                                                 Boolean.toString(padGaps.isSelected()));
+
+        dasSource.saveProperties(Cache.applicationProperties);
+
         Cache.saveProperties();
         try
         {