Output to text window added

[jalview.git] / src / jalview / gui / Preferences.java

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 81acb7c..ec9ea34 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -67,6 +67,8 @@ public class Preferences extends GPreferences
 \r
     JInternalFrame frame;\r
 \r
+    DasSourceBrowser dasSource;\r
+\r
 \r
     /**\r
      * Creates a new Preferences object.\r
@@ -76,8 +78,18 @@ public class Preferences extends GPreferences
 \r
         frame = new JInternalFrame();\r
         frame.setContentPane(this);\r
-        Desktop.addInternalFrame(frame, "Preferences", 480, 390);\r
-        frame.setMinimumSize(new Dimension(480,390));\r
+        dasSource = new DasSourceBrowser();\r
+        dasPanel.add(dasSource, BorderLayout.CENTER);\r
+\r
+        int width = 500, height = 420;\r
+        if(System.getProperty("os.name").startsWith("Mac"))\r
+        {\r
+          width = 570;\r
+          height = 460;\r
+        }\r
+\r
+        Desktop.addInternalFrame(frame, "Preferences", width, height);\r
+        frame.setMinimumSize(new Dimension(width, height));\r
 \r
         seqLimit.setSelected(    Cache.getDefault("SHOW_JVSUFFIX", true));\r
         fullScreen.setSelected(  Cache.getDefault("SHOW_FULLSCREEN", false));\r
@@ -123,6 +135,8 @@ public class Preferences extends GPreferences
 \r
         smoothFont.setSelected(Cache.getDefault("ANTI_ALIAS", false));\r
 \r
+        wrap.setSelected(Cache.getDefault("WRAP_ALIGNMENT", false));\r
+\r
         gapSymbolCB.addItem("-");\r
         gapSymbolCB.addItem(".");\r
 \r
@@ -150,6 +164,11 @@ public class Preferences extends GPreferences
         pileupjv.setSelected( Cache.getDefault("PILEUP_JVSUFFIX", true) );\r
         pirjv.setSelected( Cache.getDefault("PIR_JVSUFFIX", true) );\r
 \r
+        modellerOutput.setSelected( Cache.getDefault("PIR_MODELLER", false));\r
+\r
+        autoCalculateConsCheck.setSelected( Cache.getDefault("AUTO_CALC_CONSENSUS", true));\r
+        padGaps.setSelected( Cache.getDefault("PAD_GAPS", false));\r
+\r
   /****************************************************\r
    * Set up Connections\r
    */\r
@@ -208,6 +227,8 @@ public class Preferences extends GPreferences
 \r
       Cache.applicationProperties.setProperty("ANTI_ALIAS", Boolean.toString(smoothFont.isSelected()));\r
 \r
+      Cache.applicationProperties.setProperty("WRAP_ALIGNMENT", Boolean.toString(wrap.isSelected()));\r
+\r
       Cache.applicationProperties.setProperty("STARTUP_FILE", startupFileTextfield.getText());\r
       Cache.applicationProperties.setProperty("SHOW_STARTUP_FILE",  Boolean.toString(startupCheckbox.isSelected()));\r
 \r
@@ -276,7 +297,15 @@ public class Preferences extends GPreferences
         Cache.applicationProperties.setProperty("PFAM_JVSUFFIX", Boolean.toString(pfamjv.isSelected()) );\r
         Cache.applicationProperties.setProperty("PILEUP_JVSUFFIX", Boolean.toString(pileupjv.isSelected()) );\r
         Cache.applicationProperties.setProperty("PIR_JVSUFFIX", Boolean.toString(pirjv.isSelected()) );\r
+        Cache.applicationProperties.setProperty("PIR_MODELLER", Boolean.toString(modellerOutput.isSelected()) );\r
+        jalview.io.PIRFile.useModellerOutput = modellerOutput.isSelected();\r
+\r
+        Cache.applicationProperties.setProperty("AUTO_CALC_CONSENSUS",\r
+                                                Boolean.toString(autoCalculateConsCheck.isSelected()));\r
+        Cache.applicationProperties.setProperty("PAD_GAPS",\r
+                                                Boolean.toString(padGaps.isSelected()));\r
 \r
+        dasSource.saveProperties(Cache.applicationProperties);\r
 \r
         Cache.saveProperties();\r
         try\r