From 8e0a800f3fdec3ce0815ac797f365837eec67d30 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Tue, 23 Aug 2016 10:31:14 +0200
Subject: [PATCH] rename propless bind Orientation=>PopDirection in menu,
 update examples

---
 Templates/MenuItem.template            |  2 +-
 Tests/Interfaces/TemplatedGroup/1.crow | 14 ++++++----
 Tests/Interfaces/TemplatedGroup/2.crow | 38 +++++++++++++-------------
 src/GraphicObjects/Menu.cs             |  4 +--
 src/GraphicObjects/MenuItem.cs         |  2 +-
 5 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/Templates/MenuItem.template b/Templates/MenuItem.template
index 81b95eee..d0a44f7f 100644
--- 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 eb857f98..f47e7aa0 100755
--- 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 5e5d8940..8d25db5a 100755
--- 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 561db65c..f3759c68 100644
--- 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 decdf142..9055fc5b 100644
--- 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)
-- 
2.47.3