Author: mes
Date: 2011-01-18 15:58:33 -0800 (Tue, 18 Jan 2011)
New Revision: 23501
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/CytoPanelAction.java
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/layout/ui/SettingsAction.java
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeMenus.java
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
more menu tweaks
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/CytoPanelAction.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/CytoPanelAction.java
2011-01-18 23:58:18 UTC (rev 23500)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/CytoPanelAction.java
2011-01-18 23:58:33 UTC (rev 23501)
@@ -50,8 +50,7 @@
protected CytoPanelName position;
private CySwingApplication desktop;
- public CytoPanelAction(final CytoPanelName position, final boolean
show, final CySwingApplication desktop,
- final CyApplicationManager applicationManager)
+ public CytoPanelAction(final CytoPanelName position, final boolean
show, final CySwingApplication desktop, final CyApplicationManager
applicationManager, float menuGravity)
{
super(show ? HIDE + " " + position.getTitle() : SHOW + " " +
position.getTitle(),
applicationManager);
@@ -59,6 +58,7 @@
this.title = position.getTitle();
this.position = position;
setPreferredMenu("View");
+ setMenuGravity(menuGravity);
this.desktop = desktop;
}
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/layout/ui/SettingsAction.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/layout/ui/SettingsAction.java
2011-01-18 23:58:18 UTC (rev 23500)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/layout/ui/SettingsAction.java
2011-01-18 23:58:33 UTC (rev 23501)
@@ -52,6 +52,7 @@
{
super("Settings...",appMgr);
setPreferredMenu("Layout");
+ setMenuGravity(3.0f);
this.cyl = cyl;
this.desk = desk;
this.menuMgr = menuMgr;
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeMenus.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeMenus.java
2011-01-18 23:58:18 UTC (rev 23500)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeMenus.java
2011-01-18 23:58:33 UTC (rev 23501)
@@ -57,6 +57,8 @@
menuBar.addMenu("Edit",0.0f);
menuBar.addMenu("View",0.0f);
menuBar.addMenu("Select",0.0f);
+ menuBar.addMenu("Select.Nodes",1.0f);
+ menuBar.addMenu("Select.Edges",1.1f);
menuBar.addMenu("Layout",0.0f);
menuBar.addMenu("Plugins",0.0f);
menuBar.addMenu("Tools",0.0f);
@@ -77,9 +79,11 @@
menuBar.addSeparator("Select",2.0f);
menuBar.addSeparator("Select",4.0f);
+ menuBar.addSeparator("Select",6.0f);
menuBar.addSeparator("Layout",2.0f);
menuBar.addSeparator("Layout",4.0f);
+ menuBar.addSeparator("Layout",6.0f);
menuBar.addSeparator("Plugins",2.0f);
Modified:
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-18 23:58:18 UTC (rev 23500)
+++
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-18 23:58:33 UTC (rev 23501)
@@ -214,24 +214,28 @@
<constructor-arg value="true" />
<constructor-arg ref="cytoscapeDesktop" />
<constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg type="float" value="1.0" />
</bean>
<bean id="cytoPanelSouthAction"
class="org.cytoscape.internal.actions.CytoPanelAction">
<constructor-arg
type="org.cytoscape.application.swing.CytoPanelName" value="SOUTH" />
<constructor-arg value="true" />
<constructor-arg ref="cytoscapeDesktop" />
<constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg type="float" value="1.1" />
</bean>
<bean id="cytoPanelEastAction"
class="org.cytoscape.internal.actions.CytoPanelAction">
<constructor-arg
type="org.cytoscape.application.swing.CytoPanelName" value="EAST" />
<constructor-arg value="false" />
<constructor-arg ref="cytoscapeDesktop" />
<constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg type="float" value="1.2" />
</bean>
<bean id="cytoPanelSouthWestAction"
class="org.cytoscape.internal.actions.CytoPanelAction">
<constructor-arg
type="org.cytoscape.application.swing.CytoPanelName" value="SOUTH_WEST" />
<constructor-arg value="false" />
<constructor-arg ref="cytoscapeDesktop" />
<constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg type="float" value="1.3" />
</bean>
<!-- Other stuff to be started -->
--
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.
