Author: mes
Date: 2010-02-19 11:39:10 -0800 (Fri, 19 Feb 2010)
New Revision: 19387
Added:
csplugins/trunk/ucsd/mes/MCODE3/resources/images/
Removed:
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/resources/
Modified:
csplugins/trunk/ucsd/mes/MCODE3/build.xml
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/internal/ui/MCODEAboutDialog.java
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/internal/ui/MCODECollapsiblePanel.java
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/internal/ui/MCODEMainPanel.java
Log:
fixed the use of images for collapible panel buttons and therefore removed the
+- scheme
Modified: csplugins/trunk/ucsd/mes/MCODE3/build.xml
===================================================================
--- csplugins/trunk/ucsd/mes/MCODE3/build.xml 2010-02-19 19:14:21 UTC (rev
19386)
+++ csplugins/trunk/ucsd/mes/MCODE3/build.xml 2010-02-19 19:39:10 UTC (rev
19387)
@@ -59,6 +59,9 @@
<!-- Create PlugIn Jar File -->
<target name="jar" depends="compile" description="Creates PlugIn Jar
File.">
<copy file="${resources.dir}/plugin.props"
todir="${build.classes}/csplugins/mcode" />
+ <copy todir="${build.classes}/csplugins/mcode/images">
+ <fileset dir="${resources.dir}/images" />
+ </copy>
<jar destfile="${build.dir}/${plugin.name}.jar">
<fileset dir="${build.classes}" />
<manifest>
Modified:
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/internal/ui/MCODEAboutDialog.java
===================================================================
---
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/internal/ui/MCODEAboutDialog.java
2010-02-19 19:14:21 UTC (rev 19386)
+++
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/internal/ui/MCODEAboutDialog.java
2010-02-19 19:39:10 UTC (rev 19387)
@@ -67,7 +67,7 @@
editorPane.setEditorKit(new HTMLEditorKit());
editorPane.addHyperlinkListener(new HyperlinkAction(editorPane));
- URL logoURL = MCODEPlugin.class.getResource("resources/logo1.png");
+ URL logoURL =
MCODEPlugin.class.getResource("/csplugins/mcode/images/logo1.png");
String logoCode = "";
if (logoURL != null) {
logoCode = "<center><img src='"+logoURL+"'></center>";
@@ -102,4 +102,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified:
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/internal/ui/MCODECollapsiblePanel.java
===================================================================
---
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/internal/ui/MCODECollapsiblePanel.java
2010-02-19 19:14:21 UTC (rev 19386)
+++
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/internal/ui/MCODECollapsiblePanel.java
2010-02-19 19:39:10 UTC (rev 19387)
@@ -153,18 +153,15 @@
* @param collapse When set to true, the panel is collapsed, else it is
expanded
*/
public void setCollapsed(boolean collapse) {
- final String arrowText = arrow.getText().substring(1);
if (collapse) {
//collapse the panel, remove content and set border to empty border
remove(panel);
arrow.setIcon(iconArrow[COLLAPSED]);
- arrow.setText("+" + arrowText);
border = new CollapsableTitledBorder(collapsedBorderLine,
titleComponent);
} else {
//expand the panel, add content and set border to titled border
add(panel, BorderLayout.NORTH);
arrow.setIcon(iconArrow[EXPANDED]);
- arrow.setText("-" + arrowText);
border = new CollapsableTitledBorder(expandedBorderLine,
titleComponent);
}
setBorder(border);
@@ -190,11 +187,11 @@
ImageIcon[] iconArrow = new ImageIcon[2];
URL iconURL;
- iconURL =
MCODEPlugin.class.getResource("resources/arrow_collapsed.gif");
+ iconURL =
MCODEPlugin.class.getResource("/csplugins/mcode/images/arrow_collapsed.gif");
if (iconURL != null) {
iconArrow[COLLAPSED] = new ImageIcon(iconURL);
}
- iconURL =
MCODEPlugin.class.getResource("resources/arrow_expanded.gif");
+ iconURL =
MCODEPlugin.class.getResource("/csplugins/mcode/images/arrow_expanded.gif");
if (iconURL != null) {
iconArrow[EXPANDED] = new ImageIcon(iconURL);
}
@@ -404,4 +401,4 @@
return compR;
}
}
-}
\ No newline at end of file
+}
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-19 19:14:21 UTC (rev 19386)
+++
csplugins/trunk/ucsd/mes/MCODE3/src/csplugins/mcode/internal/ui/MCODEMainPanel.java
2010-02-19 19:39:10 UTC (rev 19387)
@@ -193,7 +193,7 @@
* @return collapsablePanel
*/
private MCODECollapsiblePanel createAdvancedOptionsPanel() {
- MCODECollapsiblePanel collapsiblePanel = new
MCODECollapsiblePanel("+Advanced Options");
+ MCODECollapsiblePanel collapsiblePanel = new
MCODECollapsiblePanel("Advanced Options");
JPanel panel = new JPanel();
panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
@@ -217,7 +217,7 @@
* @return panel containing the network scoring parameter inputs
*/
private MCODECollapsiblePanel createNetworkScoringPanel() {
- MCODECollapsiblePanel collapsiblePanel = new
MCODECollapsiblePanel("+Network Scoring");
+ MCODECollapsiblePanel collapsiblePanel = new
MCODECollapsiblePanel("Network Scoring");
JPanel panel = new JPanel();
panel.setLayout(new GridLayout(0, 1));
@@ -285,7 +285,7 @@
* @return collapsablePanel
*/
private MCODECollapsiblePanel createClusterFindingPanel() {
- MCODECollapsiblePanel collapsiblePanel = new
MCODECollapsiblePanel("+Cluster Finding");
+ MCODECollapsiblePanel collapsiblePanel = new
MCODECollapsiblePanel("Cluster Finding");
JPanel panel = new JPanel();
panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
--
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.
