ColourSchemeKey now in documentation

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index b0d1b32..5173fed 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -687,13 +687,6 @@ public class AlignFrame extends GAlignFrame
 \r
 \r
 \r
-  protected void schemeKeyMenuItem_actionPerformed(ActionEvent e)\r
-  {\r
-    ColourKey colourKey = new ColourKey( viewport.getGlobalColourScheme() );\r
-    Desktop.addInternalFrame(colourKey, "Colour scheme key", 400, 320);\r
-  }\r
-\r
-\r
   public void sortPairwiseMenuItem_actionPerformed(ActionEvent e)\r
   {\r
     addHistoryItem("sort");\r

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index b0f000e..464ec59 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -214,7 +214,6 @@ public class Desktop extends jalview.jbgui.GDesktop
                                       +"Fasta, MSF, Clustal, BLC, PIR, MSP or PFAM",\r
                                       "Error parsing text", JOptionPane.WARNING_MESSAGE);\r
 \r
-\r
    }\r
  }\r
 \r
@@ -230,12 +229,6 @@ public class Desktop extends jalview.jbgui.GDesktop
  }\r
 \r
 \r
- protected void colourIndexMenuItem_actionPerformed(ActionEvent e)\r
- {\r
-   ColourKey colourKey = new ColourKey(null);\r
-   addInternalFrame(colourKey, "Colour scheme key", 400, 320);\r
- }\r
-\r
 \r
  public void aboutMenuItem_actionPerformed(ActionEvent e)\r
  {\r
@@ -250,10 +243,22 @@ public class Desktop extends jalview.jbgui.GDesktop
 \r
  public void documentationMenuItem_actionPerformed(ActionEvent e)\r
  {\r
-   try{\r
-     jalview.util.BrowserLauncher.openURL("http://www.jalview.org/documentation.html");\r
-   }catch(Exception ex){}\r
+   try\r
+   {\r
+      ClassLoader cl = jalview.gui.Desktop.class.getClassLoader();\r
+      java.net.URL url = javax.help.HelpSet.findHelpSet(cl,"help/help");\r
+      javax.help.HelpSet hs = new javax.help.HelpSet(cl,url);\r
+\r
+      javax.help.HelpBroker hb = hs.createHelpBroker();\r
+      hb.setLocation(new Point(200, 50));\r
+      hb.setSize(new Dimension(800,700));\r
+      hb.setCurrentID("home");\r
+      hb.setDisplayed(true);\r
+   }\r
+   catch (Exception ex)\r
+   {\r
+     ex.printStackTrace();\r
+   }\r
  }\r
 \r
-\r
 }\r

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index a74c5e7..484287c 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -68,7 +68,6 @@ public class GAlignFrame extends JInternalFrame
   protected JCheckBoxMenuItem consensusGraphMenuItem = new JCheckBoxMenuItem();\r
   protected JCheckBoxMenuItem colourTextMenuItem = new JCheckBoxMenuItem();\r
   JMenuItem htmlMenuItem = new JMenuItem();\r
-  JMenuItem schemeKeyMenuItem = new JMenuItem();\r
   JMenuItem overviewMenuItem = new JMenuItem();\r
   protected JMenuItem undoMenuItem = new JMenuItem();\r
   protected JMenuItem redoMenuItem = new JMenuItem();\r
@@ -500,14 +499,6 @@ public class GAlignFrame extends JInternalFrame
         htmlMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    schemeKeyMenuItem.setText("Colour Scheme Key");\r
-    schemeKeyMenuItem.addActionListener(new java.awt.event.ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent e)\r
-      {\r
-        schemeKeyMenuItem_actionPerformed(e);\r
-      }\r
-    });\r
     overviewMenuItem.setText("Overview window");\r
     overviewMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
@@ -687,8 +678,6 @@ public class GAlignFrame extends JInternalFrame
     colourMenu.addSeparator();\r
     colourMenu.add(abovePIDThreshold);\r
     colourMenu.add(conservationMenuItem);\r
-    colourMenu.addSeparator();\r
-    colourMenu.add(schemeKeyMenuItem);\r
     calculateMenu.add(sortPairwiseMenuItem);\r
     calculateMenu.add(sortIDMenuItem);\r
     calculateMenu.add(sortGroupMenuItem);\r
@@ -968,10 +957,6 @@ public class GAlignFrame extends JInternalFrame
 \r
   }\r
 \r
-  protected void schemeKeyMenuItem_actionPerformed(ActionEvent e)\r
-  {\r
-\r
-  }\r
 \r
   protected void noColourmenuItem_actionPerformed(ActionEvent e)\r
   {\r

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index 475153d..2ef7ad6 100755 (executable)
--- a/src/jalview/jbgui/GDesktop.java
+++ b/src/jalview/jbgui/GDesktop.java
@@ -24,7 +24,6 @@ public class GDesktop extends JFrame
   JMenuItem quit = new JMenuItem();
   JMenuItem aboutMenuItem = new JMenuItem();
   JMenuItem documentationMenuItem = new JMenuItem();
-  JMenuItem colourIndexMenuItem = new JMenuItem();
   FlowLayout flowLayout1 = new FlowLayout();
   protected static JMenu windowMenu = new JMenu();
   public GDesktop()
@@ -97,14 +96,6 @@ public class GDesktop extends JFrame
         documentationMenuItem_actionPerformed(e);
       }
     });
-    colourIndexMenuItem.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        colourIndexMenuItem_actionPerformed(e);
-      }
-    });
-    colourIndexMenuItem.setText("Colour Scheme Key");
     this.getContentPane().setLayout(flowLayout1);
     windowMenu.setText("Window");
     DesktopMenubar.add(FileMenu);
@@ -115,7 +106,6 @@ public class GDesktop extends JFrame
     FileMenu.add(inputTextboxMenuItem);
     FileMenu.addSeparator();
     FileMenu.add(quit);
-    HelpMenu.add(colourIndexMenuItem);
     HelpMenu.add(aboutMenuItem);
     HelpMenu.add(documentationMenuItem);
   }
@@ -138,8 +128,4 @@ public class GDesktop extends JFrame
   protected void documentationMenuItem_actionPerformed(ActionEvent e)
   {  }
 
-  protected void colourIndexMenuItem_actionPerformed(ActionEvent e)
-  {
-
-  }
 }