X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FAppletPDBViewer.java;h=3f4e42c608bbc24fc8ebc27736f5b80bb24067cb;hb=19609f31cb839e3e86de561283fa1cdb508c6eae;hp=e704f15923a0c25743d9675f669e79aef454809a;hpb=28c093f681b769feb7b69bd4cbe309d580ef6179;p=jalview.git

diff --git a/src/MCview/AppletPDBViewer.java b/src/MCview/AppletPDBViewer.java
index e704f15..3f4e42c 100755
--- a/src/MCview/AppletPDBViewer.java
+++ b/src/MCview/AppletPDBViewer.java
@@ -87,61 +87,59 @@ public class AppletPDBViewer extends Frame
           }
         });
         charge.setLabel("Charge & Cysteine");
-        charge.addItemListener(new ItemListener()
+        charge.addActionListener(new ActionListener()
         {
-          public void itemStateChanged(ItemEvent e)
+          public void actionPerformed(ActionEvent e)
           {
             charge_actionPerformed();
           }
         });
         hydro.setLabel("Hydrophobicity");
-        hydro.addItemListener(new ItemListener()
+        hydro.addActionListener(new ActionListener()
         {
-          public void itemStateChanged(ItemEvent e)
+          public void actionPerformed(ActionEvent e)
           {
             hydro_actionPerformed();
           }
         });
         chain.setLabel("By Chain");
-        chain.addItemListener(new ItemListener()
+        chain.addActionListener(new ActionListener()
         {
-          public void itemStateChanged(ItemEvent e)
+          public void actionPerformed(ActionEvent e)
           {
             chain_actionPerformed();
           }
         });
-        seqButton.setState(true);
         seqButton.setLabel("By Sequence");
-        seqButton.addItemListener(new ItemListener()
+        seqButton.addActionListener(new ActionListener()
         {
-          public void itemStateChanged(ItemEvent e)
-          {
+          public void actionPerformed(ActionEvent e){
             seqButton_actionPerformed();
           }
         });
-        molecule.setLabel("By Molecule");
-        molecule.addItemListener(new ItemListener()
-        {
-          public void itemStateChanged(ItemEvent e)
-          {
-            molecule_actionPerformed();
-          }
-        });
-        jMenuBar1.add(fileMenu);
+    allchains.setLabel("All Chains Visible");
+    allchains.addItemListener(new ItemListener()
+    {
+      public void itemStateChanged(ItemEvent itemEvent)
+      {
+        allchains_itemStateChanged(itemEvent);
+      }
+    });
+    jMenuBar1.add(fileMenu);
         jMenuBar1.add(coloursMenu);
         fileMenu.add(mapping);;
 
         coloursMenu.add(seqButton);
         coloursMenu.add(chain);
-        coloursMenu.add(hydro);
-        coloursMenu.add(charge);
-        coloursMenu.addSeparator();
+    coloursMenu.add(hydro);
+    coloursMenu.add(charge);
+    coloursMenu.addSeparator();
         coloursMenu.add(wire);
         coloursMenu.add(depth);
         coloursMenu.add(zbuffer);
-        coloursMenu.add(molecule);
-
-      }
+    coloursMenu.add(allchains);
+    allchains.setState(true);
+  }
 
       MenuBar jMenuBar1 = new MenuBar();
       Menu fileMenu = new Menu();
@@ -151,15 +149,15 @@ public class AppletPDBViewer extends Frame
       CheckboxMenuItem wire = new CheckboxMenuItem();
       CheckboxMenuItem depth = new CheckboxMenuItem();
       CheckboxMenuItem zbuffer = new CheckboxMenuItem();
-      CheckboxMenuItem charge = new CheckboxMenuItem();
 
+      MenuItem charge = new MenuItem();
+      MenuItem hydro = new MenuItem();
+      MenuItem chain = new MenuItem();
+      MenuItem seqButton = new MenuItem();
 
-      CheckboxMenuItem hydro = new CheckboxMenuItem();
-      CheckboxMenuItem chain = new CheckboxMenuItem();
-      CheckboxMenuItem seqButton = new CheckboxMenuItem();
-      CheckboxMenuItem molecule = new CheckboxMenuItem();
+     CheckboxMenuItem allchains = new CheckboxMenuItem();
 
-       public void charge_actionPerformed()
+  public void charge_actionPerformed()
       {
         clearButtonGroup();
         pdbcanvas.pdb.setChargeColours();
@@ -190,13 +188,6 @@ public class AppletPDBViewer extends Frame
         pdbcanvas.repaint();
       }
 
-      public void molecule_actionPerformed()
-      {
-        pdbcanvas.bymolecule = ! pdbcanvas.bymolecule;
-        pdbcanvas.redrawneeded=true;
-        pdbcanvas.repaint();
-      }
-
       public void depth_actionPerformed()
       {
       pdbcanvas.depthcue = ! pdbcanvas.depthcue;
@@ -214,7 +205,7 @@ public class AppletPDBViewer extends Frame
       public void seqButton_actionPerformed()
       {
         clearButtonGroup();
-        pdbcanvas.bysequence = seqButton.getState();
+        pdbcanvas.bysequence = true;
         pdbcanvas.updateSeqColours();
       }
 
@@ -233,4 +224,9 @@ public class AppletPDBViewer extends Frame
         jalview.bin.JalviewLite.addFrame(frame, "PDB - Sequence Mapping", 500, 600);
         cap.setText(pdbcanvas.mappingDetails.toString());
       }
-    }
+
+      public void allchains_itemStateChanged(ItemEvent itemEvent)
+      {
+        pdbcanvas.setAllchainsVisible(allchains.getState());
+      }
+}