Author: ruschein
Date: 2010-02-09 12:47:04 -0800 (Tue, 09 Feb 2010)
New Revision: 19265
Modified:
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/MCODEPlugin.java
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/internal/ui/MCODEMainPanel.java
Log:
Unified button labelling and layout with that of other module finding plugins.
Modified: csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/MCODEPlugin.java
===================================================================
--- csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/MCODEPlugin.java
2010-02-09 20:18:23 UTC (rev 19264)
+++ csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/MCODEPlugin.java
2010-02-09 20:47:04 UTC (rev 19265)
@@ -43,8 +43,6 @@
import javax.swing.JMenu;
import javax.swing.JMenuItem;
-import csplugins.mcode.internal.action.MCODEAboutAction;
-import csplugins.mcode.internal.action.MCODEHelpAction;
import csplugins.mcode.internal.action.MCODEMainPanelAction;
/**
@@ -68,15 +66,5 @@
final JMenuItem menuItem = new JMenuItem("MCODE...");
menuItem.addActionListener(new MCODEMainPanelAction());
Cytoscape.getDesktop().getCyMenus().getMenuBar().getMenu("Plugins.Module
Finders...").add(menuItem);
-
- //Help box
- //item = new JMenuItem("Help");
- //item.addActionListener(new MCODEHelpAction());
- //submenu.add(item);
-
- //About box
- //item = new JMenuItem("About");
- //item.addActionListener(new MCODEAboutAction());
- //submenu.add(item);
}
}
Modified:
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/internal/ui/MCODEMainPanel.java
===================================================================
---
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/internal/ui/MCODEMainPanel.java
2010-02-09 20:18:23 UTC (rev 19264)
+++
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/internal/ui/MCODEMainPanel.java
2010-02-09 20:47:04 UTC (rev 19265)
@@ -9,6 +9,8 @@
import csplugins.mcode.internal.MCODECurrentParameters;
import csplugins.mcode.internal.MCODEParameterSet;
+import csplugins.mcode.internal.action.MCODEAboutAction;
+import csplugins.mcode.internal.action.MCODEHelpAction;
import csplugins.mcode.internal.action.MCODEScoreAndFindAction;
import java.awt.*;
@@ -490,19 +492,27 @@
/**
* Utility method that creates a panel for buttons at the bottom of the
<code>MCODEMainPanel</code>
*
- * @return a flow layout panel containing the analyze and quite buttons
+ * @return a flow layout panel containing the "search" and "cancel" buttons
*/
private JPanel createBottomPanel() {
JPanel panel = new JPanel();
panel.setLayout(new FlowLayout());
- JButton analyzeButton = new JButton("Analyze");
- analyzeButton.addActionListener(new
MCODEScoreAndFindAction(currentParamsCopy));
+ JButton helpButton = new JButton("?");
+ helpButton.addActionListener(new MCODEHelpAction());
- JButton closeButton = new JButton("Close MCODE");
+ JButton aboutButton = new JButton("About");
+ aboutButton.addActionListener(new MCODEAboutAction());
+
+ JButton searchButton = new JButton("Search");
+ searchButton.addActionListener(new
MCODEScoreAndFindAction(currentParamsCopy));
+
+ JButton closeButton = new JButton("Close");
closeButton.addActionListener(new MCODEMainPanel.CloseAction(this));
- panel.add(analyzeButton);
+ panel.add(helpButton);
+ panel.add(aboutButton);
+ panel.add(searchButton);
panel.add(closeButton);
return panel;
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
