From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 29 Apr 2005 15:27:31 +0000 (+0000)
Subject: selects default colour
X-Git-Tag: Release_2_0~343
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7d950a6744d6e16de24734b90dddf2bc94b04c12;p=jalview.git

selects default colour
---

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 22671fb..e83a074 100755
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -12,6 +12,9 @@ import javax.swing.*;
 import java.awt.event.*;
 import java.awt.*;
 
+import jalview.gui.Preferences;
+import jalview.schemes.ColourSchemeProperty;
+
 public class GAlignFrame extends JInternalFrame
 {
   protected JMenuBar alignFrameMenuBar = new JMenuBar();
@@ -99,6 +102,41 @@ public class GAlignFrame extends JInternalFrame
   JMenuItem msaAlignMenuItem = new JMenuItem();
   public GAlignFrame()
   {
+    ButtonGroup colours = new ButtonGroup();
+    colours.add(noColourmenuItem);
+    colours.add(clustalColour);
+    colours.add(zappoColour);
+    colours.add(taylorColour);
+    colours.add(hydrophobicityColour);
+    colours.add(helixColour);
+    colours.add(strandColour);
+    colours.add(turnColour);
+    colours.add(buriedColour);
+    colours.add(userDefinedColour);
+    colours.add(PIDColour);
+    colours.add(BLOSUM62Colour);
+    colours.add(nucleotideColour);
+
+   noColourmenuItem.setSelected(true);
+   String defaultColour = Preferences.defaultColour;
+   if(defaultColour!=null)
+   {
+   int index = ColourSchemeProperty.getColourIndexFromName(defaultColour);
+   switch(index)
+   {
+     case ColourSchemeProperty.CLUSTAL : clustalColour.setSelected(true); break;
+     case ColourSchemeProperty.BLOSUM : BLOSUM62Colour.setSelected(true); break;
+     case ColourSchemeProperty.PID : PIDColour.setSelected(true); break;
+     case ColourSchemeProperty.ZAPPO : zappoColour.setSelected(true); break;
+     case ColourSchemeProperty.HYDROPHOBIC: hydrophobicityColour.setSelected(true); break;
+     case ColourSchemeProperty.HELIX: helixColour.setSelected(true); break;
+     case ColourSchemeProperty.STRAND: strandColour.setSelected(true); break;
+     case ColourSchemeProperty.TURN : turnColour.setSelected(true); break;
+     case ColourSchemeProperty.BURIED: buriedColour.setSelected(true); break;
+     case ColourSchemeProperty.NUCLEOTIDE: nucleotideColour.setSelected(true); break;
+     case ColourSchemeProperty.USER_DEFINED : userDefinedColour.setSelected(true); break;
+   }
+   }
 
 
     try
@@ -137,20 +175,6 @@ public class GAlignFrame extends JInternalFrame
       e.printStackTrace();
     }
 
-    ButtonGroup colours = new ButtonGroup();
-    colours.add(noColourmenuItem);
-    colours.add(clustalColour);
-    colours.add(zappoColour);
-    colours.add(taylorColour);
-    colours.add(hydrophobicityColour);
-    colours.add(helixColour);
-    colours.add(strandColour);
-    colours.add(turnColour);
-    colours.add(buriedColour);
-    colours.add(userDefinedColour);
-    colours.add(PIDColour);
-    colours.add(BLOSUM62Colour);
-    colours.add(nucleotideColour);
   }
   private void jbInit() throws Exception
   {
@@ -331,8 +355,8 @@ public class GAlignFrame extends JInternalFrame
     statusBar.setText("Status bar");
     outputTextboxMenu.setMnemonic('T');
     outputTextboxMenu.setText("Output to Textbox");
-    clustalColour.setSelected(false);
     clustalColour.setText("Clustalx");
+
     clustalColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -438,7 +462,7 @@ public class GAlignFrame extends JInternalFrame
     });
     annotationPanelMenuItem.setActionCommand("");
     annotationPanelMenuItem.setText("Show Annotations");
-    annotationPanelMenuItem.setState(true);
+    annotationPanelMenuItem.setState( jalview.gui.Preferences.showAnnotation );
     annotationPanelMenuItem.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -501,7 +525,6 @@ public class GAlignFrame extends JInternalFrame
       }
     });
     noColourmenuItem.setText("None");
-    noColourmenuItem.setSelected(true);
     noColourmenuItem.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -568,7 +591,6 @@ public class GAlignFrame extends JInternalFrame
         nucleotideColour_actionPerformed(e);
       }
     });
-    deleteGroups.setSelected(false);
     deleteGroups.setText("Undefine groups");
     deleteGroups.addActionListener(new java.awt.event.ActionListener()
     {