rename propless bind Orientation=>PopDirection in menu, update examples

diff --git a/Templates/MenuItem.template b/Templates/MenuItem.template
index 81b95eeeb9be94e6e3e743d4d42ba99568fa3093..d0a44f7fbbafb386d78c407a89e9e248a6dd89a0 100644 (file)
--- a/Templates/MenuItem.template
+++ b/Templates/MenuItem.template
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Popper Caption="{./Caption}"  Background="{./Background}" PopDirection="{./Orientation}"
+<Popper Caption="{./Caption}"  Background="{./Background}" PopDirection="{./PopDirection}"
        Foreground = "{./Foreground}" CanPop="{./HasChildren}" MouseClick="./onMI_Click"
        Unpop = "{Foreground=LightGray;Background=Transparent}">
        <Template>

diff --git a/Tests/Interfaces/TemplatedGroup/1.crow b/Tests/Interfaces/TemplatedGroup/1.crow
index eb857f98aa181856c498846576f317cfaac4d3a9..f47e7aa0362c994553fd149e33b418ba216717d3 100755 (executable)
--- a/Tests/Interfaces/TemplatedGroup/1.crow
+++ b/Tests/Interfaces/TemplatedGroup/1.crow
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
-<MenuItem Caption="File">
-       <MenuItem Caption="New"/>
-       <MenuItem Caption="Open"/>
-       <MenuItem Caption="Save"/>
-       <MenuItem Caption="Quit"/>
-</MenuItem>
+<Menu>
+       <MenuItem Caption="File">
+               <MenuItem Caption="New"/>
+               <MenuItem Caption="Open"/>
+               <MenuItem Caption="Save"/>
+               <MenuItem Caption="Quit"/>
+       </MenuItem>
+</Menu>

diff --git a/Tests/Interfaces/TemplatedGroup/2.crow b/Tests/Interfaces/TemplatedGroup/2.crow
index 5e5d89401713d78629f82197fbba7dbeeeec5f62..8d25db5a5935e637d3a65e291e9ea361e39d8360 100755 (executable)
--- a/Tests/Interfaces/TemplatedGroup/2.crow
+++ b/Tests/Interfaces/TemplatedGroup/2.crow
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
-<Container>
-<MenuItem Caption="Menu">
-       <MenuItem Caption="File">
-               <MenuItem Caption="New"></MenuItem>
-               <MenuItem Caption="Open"></MenuItem>
-               <MenuItem Caption="Save"></MenuItem>
-               <MenuItem Caption="Quit"></MenuItem>
-       </MenuItem>
-       <MenuItem Caption="Edit">
-               <MenuItem Caption="Cut"/>
-               <MenuItem Caption="Copy"/>
-               <MenuItem Caption="Paste"/>
-               <MenuItem Caption="Special">
+<Menu>
+       <MenuItem Caption="Menu">
+               <MenuItem Caption="File">
+                       <MenuItem Caption="New"></MenuItem>
+                       <MenuItem Caption="Open"></MenuItem>
+                       <MenuItem Caption="Save"></MenuItem>
+                       <MenuItem Caption="Quit"></MenuItem>
+               </MenuItem>
+               <MenuItem Caption="Edit">
                        <MenuItem Caption="Cut"/>
                        <MenuItem Caption="Copy"/>
                        <MenuItem Caption="Paste"/>
+                       <MenuItem Caption="Special">
+                               <MenuItem Caption="Cut"/>
+                               <MenuItem Caption="Copy"/>
+                               <MenuItem Caption="Paste"/>
+                       </MenuItem>
+               </MenuItem>
+               <MenuItem Caption="Help">
+                       <MenuItem Caption="About"/>
+                       <MenuItem Caption="Help"/>
                </MenuItem>
        </MenuItem>
-       <MenuItem Caption="Help">
-               <MenuItem Caption="About"/>
-               <MenuItem Caption="Help"/>
-       </MenuItem>
-</MenuItem>
-</Container>
\ No newline at end of file
+</Menu>
\ No newline at end of file

diff --git a/src/GraphicObjects/Menu.cs b/src/GraphicObjects/Menu.cs
index 561db65c07d3f0da2d183ff05dfe1b035205f772..f3759c68f572ff63afa02fcadacd479f9e329463 100644 (file)
--- a/src/GraphicObjects/Menu.cs
+++ b/src/GraphicObjects/Menu.cs
@@ -48,9 +48,9 @@ namespace Crow
                        base.AddItem (g);
 
                        if (orientation == Orientation.Horizontal)
-                               g.NotifyValueChanged ("Orientation", Alignment.Bottom);
+                               g.NotifyValueChanged ("PopDirection", Alignment.Bottom);
                        else
-                               g.NotifyValueChanged ("Orientation", Alignment.Right);
+                               g.NotifyValueChanged ("PopDirection", Alignment.Right);
                }
        }
 }

diff --git a/src/GraphicObjects/MenuItem.cs b/src/GraphicObjects/MenuItem.cs
index decdf14232e9c9b1db6429eb356f64df2dd71699..9055fc5bdf10bc6fa01d0da21d438bbf8c9f0d35 100644 (file)
--- a/src/GraphicObjects/MenuItem.cs
+++ b/src/GraphicObjects/MenuItem.cs
@@ -72,7 +72,7 @@ namespace Crow
                public override void AddItem (GraphicObject g)
                {
                        base.AddItem (g);
-                       g.NotifyValueChanged ("Orientation", Alignment.Right);
+                       g.NotifyValueChanged ("PopDirection", Alignment.Right);
                }
 
                void onMI_Click (object sender, MouseButtonEventArgs e)