Jalview 2.6 source licence

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

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index e5397bf..c9c5f6d 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -1,5 +1,5 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
  * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
@@ -98,6 +98,8 @@ public class Preferences extends GPreferences
 
   DasSourceBrowser dasSource;
 
+  private WsPreferences wsPrefs;
+
   /**
    * Creates a new Preferences object.
    */
@@ -108,7 +110,8 @@ public class Preferences extends GPreferences
     frame.setContentPane(this);
     dasSource = new DasSourceBrowser();
     dasPanel.add(dasSource, BorderLayout.CENTER);
-
+    wsPrefs = new WsPreferences();
+    wsPanel.add(wsPrefs, BorderLayout.CENTER);
     int width = 500, height = 420;
     if (new jalview.util.Platform().isAMac())
     {
@@ -135,7 +138,7 @@ public class Preferences extends GPreferences
     showDbRefTooltip.setSelected(Cache.getDefault("SHOW_DBREFS_TOOLTIP",
             true));
 
-    for (int i = 0; i < 13; i++)
+    for (int i = ColourSchemeProperty.FIRST_COLOUR; i <= ColourSchemeProperty.LAST_COLOUR; i++)
     {
       colour.addItem(ColourSchemeProperty.getColourName(i));
     }
@@ -444,7 +447,7 @@ public class Preferences extends GPreferences
             .toString(padGaps.isSelected()));
 
     dasSource.saveProperties(Cache.applicationProperties);
-
+    wsPrefs.updateAndRefreshWsMenuConfig(false);
     Cache.saveProperties();
     try
     {
@@ -489,6 +492,7 @@ public class Preferences extends GPreferences
   {
     try
     {
+      wsPrefs.updateWsMenuConfig(true);
       frame.setClosed(true);
     } catch (Exception ex)
     {