X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureViewer.java;h=874b0ed2a9abab25c8944f7206845029ab3012f4;hb=02783b1d0f22e82e7854777646e39df0fc77de74;hp=f8c18d94da3f5c49b70b9e615e8e3500805fa7fd;hpb=53425652a9f0611576d751dac961f0f3894f4aea;p=jalview.git

diff --git a/src/jalview/jbgui/GStructureViewer.java b/src/jalview/jbgui/GStructureViewer.java
index f8c18d9..874b0ed 100644
--- a/src/jalview/jbgui/GStructureViewer.java
+++ b/src/jalview/jbgui/GStructureViewer.java
@@ -1,13 +1,13 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
  * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
@@ -83,7 +83,7 @@ public class GStructureViewer extends JInternalFrame
         backGround_actionPerformed(actionEvent);
       }
     });
-    seqColour.setSelected(true);
+    seqColour.setSelected(false);
     seqColour.setText("By Sequence");
     seqColour.addActionListener(new ActionListener()
     {
@@ -164,6 +164,15 @@ public class GStructureViewer extends JInternalFrame
         buriedColour_actionPerformed(actionEvent);
       }
     });
+    purinePyrimidineColour.setText("Purine/Pyrimidine");
+    purinePyrimidineColour.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent actionEvent)
+      {
+        purinePyrimidineColour_actionPerformed(actionEvent);
+      }
+    });
+
     userColour.setText("User Defined ...");
     userColour.addActionListener(new ActionListener()
     {
@@ -172,6 +181,16 @@ public class GStructureViewer extends JInternalFrame
         userColour_actionPerformed(actionEvent);
       }
     });
+    jmolColour.setSelected(false);
+    jmolColour.setText("Colour with Jmol");
+    jmolColour.setToolTipText("Let Jmol manage structure colours.");
+    jmolColour.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent actionEvent)
+      {
+        jmolColour_actionPerformed(actionEvent);
+      }
+    });
     helpMenu.setText("Help");
     jmolHelp.setText("Jmol Help");
     jmolHelp.addActionListener(new ActionListener()
@@ -213,7 +232,9 @@ public class GStructureViewer extends JInternalFrame
     colourMenu.add(strandColour);
     colourMenu.add(turnColour);
     colourMenu.add(buriedColour);
+    colourMenu.add(purinePyrimidineColour);
     colourMenu.add(userColour);
+    colourMenu.add(jmolColour);
     colourMenu.add(backGround);
 
     colourButtons.add(seqColour);
@@ -227,11 +248,16 @@ public class GStructureViewer extends JInternalFrame
     colourButtons.add(turnColour);
     colourButtons.add(buriedColour);
     colourButtons.add(userColour);
+    colourButtons.add(jmolColour);
 
     helpMenu.add(jmolHelp);
     jmolActionMenu.add(alignStructs);
   }
 
+  protected void jmolColour_actionPerformed(ActionEvent actionEvent)
+  {
+  }
+
   protected void alignStructs_actionPerformed(ActionEvent actionEvent)
   {
   }
@@ -256,7 +282,7 @@ public class GStructureViewer extends JInternalFrame
 
   JMenu jMenu1 = new JMenu();
 
-  JMenu colourMenu = new JMenu();
+  protected JMenu colourMenu = new JMenu();
 
   protected JMenu jmolActionMenu = new JMenu();
 
@@ -284,8 +310,12 @@ public class GStructureViewer extends JInternalFrame
 
   protected JRadioButtonMenuItem buriedColour = new JRadioButtonMenuItem();
 
+  protected JRadioButtonMenuItem purinePyrimidineColour = new JRadioButtonMenuItem();
+
   protected JRadioButtonMenuItem userColour = new JRadioButtonMenuItem();
 
+  protected JRadioButtonMenuItem jmolColour = new JRadioButtonMenuItem();
+
   protected ButtonGroup colourButtons = new ButtonGroup();
 
   JMenu helpMenu = new JMenu();
@@ -362,6 +392,11 @@ public class GStructureViewer extends JInternalFrame
 
   }
 
+  public void purinePyrimidineColour_actionPerformed(ActionEvent actionEvent)
+  {
+
+  }
+
   public void userColour_actionPerformed(ActionEvent actionEvent)
   {