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

diff --git a/src/jalview/jbgui/GStructureViewer.java b/src/jalview/jbgui/GStructureViewer.java
index f8c18d9..8116d82 100644
--- a/src/jalview/jbgui/GStructureViewer.java
+++ b/src/jalview/jbgui/GStructureViewer.java
@@ -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()
     {
@@ -172,6 +172,17 @@ 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()
@@ -214,6 +225,7 @@ public class GStructureViewer extends JInternalFrame
     colourMenu.add(turnColour);
     colourMenu.add(buriedColour);
     colourMenu.add(userColour);
+    colourMenu.add(jmolColour);
     colourMenu.add(backGround);
 
     colourButtons.add(seqColour);
@@ -227,11 +239,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 +273,7 @@ public class GStructureViewer extends JInternalFrame
 
   JMenu jMenu1 = new JMenu();
 
-  JMenu colourMenu = new JMenu();
+  protected JMenu colourMenu = new JMenu();
 
   protected JMenu jmolActionMenu = new JMenu();
 
@@ -286,6 +303,8 @@ public class GStructureViewer extends JInternalFrame
 
   protected JRadioButtonMenuItem userColour = new JRadioButtonMenuItem();
 
+  protected JRadioButtonMenuItem jmolColour = new JRadioButtonMenuItem();
+
   protected ButtonGroup colourButtons = new ButtonGroup();
 
   JMenu helpMenu = new JMenu();