You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by jm...@apache.org on 2006/12/08 05:59:01 UTC
svn commit: r483840 - in /incubator/xap/trunk/WebContent/examples/widgets:
menu.xal popupMenu.xal window.xal
Author: jmargaris
Date: Thu Dec 7 21:59:00 2006
New Revision: 483840
URL: http://svn.apache.org/viewvc?view=rev&rev=483840
Log:
updated syntax on menu examples to match previous changes to source
Modified:
incubator/xap/trunk/WebContent/examples/widgets/menu.xal
incubator/xap/trunk/WebContent/examples/widgets/popupMenu.xal
incubator/xap/trunk/WebContent/examples/widgets/window.xal
Modified: incubator/xap/trunk/WebContent/examples/widgets/menu.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/menu.xal?view=diff&rev=483840&r1=483839&r2=483840
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/menu.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/menu.xal Thu Dec 7 21:59:00 2006
@@ -14,43 +14,43 @@
<!--- layout issues prevent putting the menu into a horizpanel-->
<xal:verticalBoxPane>
<xal:menuBar id="testComponent" height="50px" onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMouseOver="mco:attributeSetter.reportEvent(event)" onMouseUp="mco:attributeSetter.reportEvent(event)">
- <xal:menuBarItem text="Edit" id="testMenuBarItem">
- <xal:menu onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onCommand="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onKeyChar="mco:attributeSetter.reportEvent(event)" onKeyDown="mco:attributeSetter.reportEvent(event)" onKeyUp="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMouseOver="mco:attributeSetter.reportEvent(event)" onMouseUp="mco:attributeSetter.reportEvent(event)">
+ <xal:menu text="Edit" id="testMenuBarItem">
+ <xal:popupMenu onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onCommand="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onKeyChar="mco:attributeSetter.reportEvent(event)" onKeyDown="mco:attributeSetter.reportEvent(event)" onKeyUp="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMouseOver="mco:attributeSetter.reportEvent(event)" onMouseUp="mco:attributeSetter.reportEvent(event)">
<xal:menuItem text="Cut" onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onCommand="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onKeyChar="mco:attributeSetter.reportEvent(event)" onKeyDown="mco:attributeSetter.reportEvent(event)" onKeyUp="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMouseOver="mco:attributeSetter.reportEvent(event)" onMouseUp="mco:attributeSetter.reportEvent(event)"/>
<xal:menuItem text="Copy" />
<xal:horizontalSeparator />
<xal:menuItem text="Paste"/>
- </xal:menu>
- </xal:menuBarItem>
+ </xal:popupMenu>
+ </xal:menu>
- <xal:menuBarItem text="File">
- <xal:menu>
+ <xal:menu text="File">
+ <xal:popupMenu>
<xal:menuItem text="Open" enabled="false" onCommand="mco:attributeSetter.reportEvent(event)"/>
<xal:menuItem text="Close" onCommand="mco:attributeSetter.reportEvent(event)"/>
<xal:menuItem text="Preferences.">
- <xal:menu>
+ <xal:popupMenu>
<xal:menuItem text="A preference"/>
<xal:menuItem text="A different preference"/>
- </xal:menu>
+ </xal:popupMenu>
</xal:menuItem>
- </xal:menu>
- </xal:menuBarItem>
+ </xal:popupMenu>
+ </xal:menu>
- <xal:menuBarItem text="Format" enabled="false">
- <xal:menu>
+ <xal:menu text="Format" enabled="false">
+ <xal:popupMenu>
<xal:menuItem text="Cut"/>
<xal:menuItem text="Copy"/>
<xal:menuItem text="Paste"/>
- </xal:menu>
- </xal:menuBarItem>
+ </xal:popupMenu>
+ </xal:menu>
- <xal:menuBarItem text="Run">
- <xal:menu>
+ <xal:menu text="Run">
+ <xal:popupMenu>
<xal:menuItem text="Open" id="testMenuItem"/>
<xal:menuItem text="Close"/>
<xal:menuItem text="Preferences..."/>
- </xal:menu>
- </xal:menuBarItem>
+ </xal:popupMenu>
+ </xal:menu>
</xal:menuBar>
Modified: incubator/xap/trunk/WebContent/examples/widgets/popupMenu.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/popupMenu.xal?view=diff&rev=483840&r1=483839&r2=483840
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/popupMenu.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/popupMenu.xal Thu Dec 7 21:59:00 2006
@@ -14,18 +14,18 @@
<xal:verticalBoxPane>
<xal:defs>
- <xal:menu id="testComponent">
+ <xal:popupMenu id="testComponent">
<xal:menuItem text="Cut" id="cut" onCommand="mco:attributeSetter.reportEvent(event)"/>
<xal:menuItem text="Copy"/>
<xal:horizontalSeparator />
<xal:menuItem text="Paste">
- <xal:menu>
+ <xal:popupMenu>
<xal:menuItem text="Cut"/> <xal:menuItem text="Copy"/>
<xal:horizontalSeparator />
<xal:menuItem text="Paste"/>
- </xal:menu>
+ </xal:popupMenu>
</xal:menuItem>
- </xal:menu>
+ </xal:popupMenu>
</xal:defs>
<xal:button text="I have a popup" popup="#testComponent"/>
Modified: incubator/xap/trunk/WebContent/examples/widgets/window.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/window.xal?view=diff&rev=483840&r1=483839&r2=483840
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/window.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/window.xal Thu Dec 7 21:59:00 2006
@@ -30,43 +30,43 @@
>
<xal:borderPane backgroundColor="green">
<xal:menuBar borderPosition="north">
- <xal:menuBarItem text="Edit">
- <xal:menu>
+ <xal:menu text="Edit">
+ <xal:popupMenu>
<xal:menuItem text="Cut" onCommand="mco:attributeSetter.reportEvent(event)"/>
<xal:menuItem text="Copy"/>
<xal:horizontalSeparator />
<xal:menuItem text="Paste"/>
- </xal:menu>
- </xal:menuBarItem>
+ </xal:popupMenu>
+ </xal:menu>
- <xal:menuBarItem text="File">
- <xal:menu>
+ <xal:menu text="File">
+ <xal:popupMenu>
<xal:menuItem text="Open"/>
<xal:menuItem text="Close"/>
<xal:menuItem text="Preferences.">
- <xal:menu>
+ <xal:popupMenu>
<xal:menuItem text="A preference"/>
<xal:menuItem text="A different preference"/>
- </xal:menu>
+ </xal:popupMenu>
</xal:menuItem>
- </xal:menu>
- </xal:menuBarItem>
+ </xal:popupMenu>
+ </xal:menu>
- <xal:menuBarItem text="Format">
- <xal:menu>
+ <xal:menu text="Format">
+ <xal:popupMenu>
<xal:menuItem text="Cut"/>
<xal:menuItem text="Copy"/>
<xal:menuItem text="Paste"/>
- </xal:menu>
- </xal:menuBarItem>
+ </xal:popupMenu>
+ </xal:menu>
- <xal:menuBarItem text="Run">
- <xal:menu>
+ <xal:menu text="Run">
+ <xal:popupMenu>
<xal:menuItem text="Open"/>
<xal:menuItem text="Close"/>
<xal:menuItem text="Preferences..."/>
- </xal:menu>
- </xal:menuBarItem>
+ </xal:popupMenu>
+ </xal:menu>
</xal:menuBar>