Move "Online Help" to the main panel menu

Author: mikekucera

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/control/ControlPanel.java

@@ -5,7 +5,6 @@
 import static javax.swing.GroupLayout.Alignment.CENTER;
 import static javax.swing.GroupLayout.Alignment.LEADING;
 import static javax.swing.GroupLayout.Alignment.TRAILING;
-import static org.baderlab.csplugins.enrichmentmap.EMBuildProps.HELP_URL_CONTROL;
 import static org.baderlab.csplugins.enrichmentmap.view.util.IconUtil.*;
 import static org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil.makeSmall;
 import static org.cytoscape.util.swing.IconManager.*;
@@ -155,8 +154,6 @@ private void createContents() {
 		setMinimumSize(new Dimension(390, 400));
 		setPreferredSize(new Dimension(390, 600));
 
-		JButton helpButton = SwingUtil.createOnlineHelpButton(HELP_URL_CONTROL, "Online Manual...", serviceRegistrar);
-		
 		makeSmall(getClosePanelButton());
 
 		final GroupLayout layout = new GroupLayout(this);
@@ -168,8 +165,6 @@ private void createContents() {
    				.addGroup(layout.createSequentialGroup()
    						.addComponent(getEmViewCombo(), DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE)
    						.addPreferredGap(ComponentPlacement.RELATED)
-   						.addComponent(helpButton, PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
-   						.addPreferredGap(ComponentPlacement.RELATED)
    						.addComponent(getCreateEmButton(), PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
    						.addPreferredGap(ComponentPlacement.RELATED)
    						.addComponent(getOptionsButton(), PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
@@ -183,7 +178,6 @@ private void createContents() {
    		layout.setVerticalGroup(layout.createSequentialGroup()
    				.addGroup(layout.createParallelGroup(CENTER, false)
    						.addComponent(getEmViewCombo(), PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
-   						.addComponent(helpButton, PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
    						.addComponent(getCreateEmButton(), PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
    						.addComponent(getOptionsButton(), PREFERRED_SIZE, DEFAULT_SIZE, PREFERRED_SIZE)
    				)

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/control/ControlPanelMediator.java

@@ -1,5 +1,6 @@
 package org.baderlab.csplugins.enrichmentmap.view.control;
 
+import static org.baderlab.csplugins.enrichmentmap.EMBuildProps.HELP_URL_CONTROL;
 import static org.baderlab.csplugins.enrichmentmap.style.EMStyleBuilder.Columns.EDGE_DATASET_VALUE_COMPOUND;
 import static org.baderlab.csplugins.enrichmentmap.style.EMStyleBuilder.Columns.EDGE_INTERACTION_VALUE_SIG;
 import static org.baderlab.csplugins.enrichmentmap.style.EMStyleBuilder.Columns.NODE_GS_TYPE;
@@ -96,6 +97,7 @@
 import org.baderlab.csplugins.enrichmentmap.view.postanalysis.EdgeWidthDialog;
 import org.baderlab.csplugins.enrichmentmap.view.postanalysis.PADialogMediator;
 import org.baderlab.csplugins.enrichmentmap.view.util.IconUtil;
+import org.baderlab.csplugins.enrichmentmap.view.util.OpenBrowser;
 import org.baderlab.csplugins.enrichmentmap.view.util.SliderBarPanel;
 import org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil;
 import org.cytoscape.application.CyApplicationManager;
@@ -998,10 +1000,16 @@ private JPopupMenu getOptionsMenu() {
 		menu.addSeparator();
 
 
-		JMenuItem setEdgeWidthItem = new JMenuItem("Set Signature  Edge Width...");
+		JMenuItem setEdgeWidthItem = new JMenuItem("Set Signature Edge Width...");
 		setEdgeWidthItem.addActionListener(evt -> showEdgeWidthDialog());
 		menu.add(setEdgeWidthItem);
 
+		menu.addSeparator();
+		
+		JMenuItem helpItem = new JMenuItem("Online Help...");
+		helpItem.addActionListener(evt -> new OpenBrowser().openURL(HELP_URL_CONTROL));
+		menu.add(helpItem);
+		
 		menu.add(new JMenuItem(showAboutDialogActionProvider.get()));
 
 		return menu;