From: jpbruyere <jp.bruyere@hotmail.com>
Date: Tue, 31 Jan 2017 15:09:14 +0000 (+0100)
Subject: replace Title in Window class by Caption
X-Git-Tag: v0.5.1~22
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=3925d9b2989533906a117e601134b9f76a7f6a6f;p=jp%2Fcrow.git

replace Title in Window class by Caption
---

diff --git a/Templates/FileDialog.template b/Templates/FileDialog.template
index db145f0f..25453032 100644
--- a/Templates/FileDialog.template
+++ b/Templates/FileDialog.template
@@ -8,7 +8,7 @@
 				Name="hs" Margin="2" Spacing="0" Height="Fit">
 			<GraphicObject Width="5"/>
 			<Image Margin="1" Width="12" Height="12" Path="{./Icon}"/>
-			<Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Center" Text="{./Title}" />
+			<Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Center" Text="{./Caption}" />
 			<Border CornerRadius="6" BorderWidth="1" Foreground="Transparent"  Height="12" Width="12"
 				MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
 				<Image Focusable="true" Name="Image" Margin="0" Width="Stretched" Height="Stretched" Path="#Crow.Images.Icons.exit2.svg"
diff --git a/Templates/MessageBox.template b/Templates/MessageBox.template
index 9c361ea6..8c58d61d 100644
--- a/Templates/MessageBox.template
+++ b/Templates/MessageBox.template
@@ -8,7 +8,7 @@
 			<HorizontalStack Name="hs" Margin="2" Spacing="1" Height="Fit" >
 				<GraphicObject Width="5" Height="5"/>
 				<Image Margin="1" Width="12" Height="12" Path="{./Icon}"/>
-				<Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Center" Text="{./Title}" />
+				<Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Center" Text="{./Caption}" />
 				<Border CornerRadius="6" BorderWidth="1" Foreground="Transparent"  Height="12" Width="12"
 					MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
 					<Image Focusable="true" Name="Image" Path="#Crow.Images.Icons.exit2.svg"
diff --git a/Templates/ToolWindow.template b/Templates/ToolWindow.template
index 7325193c..f021f6ee 100755
--- a/Templates/ToolWindow.template
+++ b/Templates/ToolWindow.template
@@ -10,7 +10,7 @@
 					Name="hs" Margin="2" Spacing="0" Height="Fit">
 				<GraphicObject Width="5"/>
 				<Image Margin="1" Width="12" Height="12" Path="{./Icon}"/>
-				<Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Center" Text="{./Title}" />
+				<Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Center" Text="{./Caption}" />
 				<Border CornerRadius="6" BorderWidth="1" Foreground="Transparent"  Height="12" Width="12"
 					MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
 					<Image Focusable="true" Name="Image" Margin="0" Width="Stretched" Height="Stretched" Path="#Crow.Images.Icons.exit2.svg"
diff --git a/Templates/Window.template b/Templates/Window.template
index d729021c..20b23147 100755
--- a/Templates/Window.template
+++ b/Templates/Window.template
@@ -10,7 +10,7 @@
 					Name="hs" Margin="2" Spacing="0" Height="Fit">
 				<GraphicObject Width="5"/>
 				<Image Margin="1" Width="12" Height="12" Path="{./Icon}"/>
-				<Label Width="Stretched" Foreground="White" Margin="2" TextAlignment="Center" Text="{./Title}" />
+				<Label Width="Stretched" Foreground="White" Margin="2" TextAlignment="Center" Text="{./Caption}" />
 				<Border Visible="{./ShowMinimize}" BorderWidth="1" Foreground="Transparent"  Height="12" Width="12"
 					MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
 					<Image Focusable="true" Path="#Crow.Images.Icons.minimize.svg"
diff --git a/Tests/HelloCube.cs b/Tests/HelloCube.cs
index d9223f5a..f16f8203 100644
--- a/Tests/HelloCube.cs
+++ b/Tests/HelloCube.cs
@@ -66,7 +66,7 @@ namespace Tests
 			AddWidget(
 				new Window ()
 				{
-					Title = "Hello World"
+					Caption = "Hello World"
 				}
 			);
 			initGL ();
diff --git a/Tests/Interfaces/Divers/0.crow b/Tests/Interfaces/Divers/0.crow
index 3c53ab01..480dde3b 100755
--- a/Tests/Interfaces/Divers/0.crow
+++ b/Tests/Interfaces/Divers/0.crow
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Window Title="Showcase" Height="90%" Width="90%">
+<Window Caption="Showcase" Height="90%" Width="90%">
 	<HorizontalStack >
 		<VerticalStack Width="30%" Margin="5">
 			<GroupBox Caption="Performance" Height="Fit">
@@ -137,7 +137,8 @@
 			</TabView>-->
 			<MessageBox Movable="false"/>
 			<ColorPicker SelectedColor="{²../go.Background}" Name="colorPicker" Background="Onyx" Margin="5" Fit="True" />
-			<GraphicObject Name="go" Width="100" Height="60" Background="DarkBlue"/>
+			<GraphicObject Name="go" Width="100" Height="60" Background="{../../colorList.SelectedItem}"/>
+			<Label Text="{../../colorPicker.SelectedRawColor}"/>
 		</VerticalStack>
 		<Splitter/>
 		<VerticalStack Width="30%" Margin="5">
@@ -148,7 +149,7 @@
 				<DirectoryView Name="dv" CurrentDirectory="/" Margin="1"/>
 			</Border>
 			<Splitter/>
-			<ListBox Data="{TestList}" Margin="5"
+			<ListBox Name="colorList" Data="{TestList}" Margin="5"
 					 ItemTemplate="#Tests.Interfaces.colorItem.crow"
 					 Template="#Crow.Templates.ScrollingListBox.goml"
 					 />
diff --git a/Tests/Interfaces/Divers/perfMeasures.crow b/Tests/Interfaces/Divers/perfMeasures.crow
index 3a0cb575..c0d0d8b9 100755
--- a/Tests/Interfaces/Divers/perfMeasures.crow
+++ b/Tests/Interfaces/Divers/perfMeasures.crow
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Window Focusable="true" Title="Measures" Width="30%" Height="Fit" MinimumSize="100,100">
+<Window Focusable="true" Caption="Measures" Width="30%" Height="Fit" MinimumSize="100,100">
 	<ListBox Data="{PerfMeasures}"
 		ItemTemplate="#Tests.Interfaces.perfMsr.crow"/>
 </Window>
diff --git a/Tests/Interfaces/TemplatedContainer/testMsgBox.crow b/Tests/Interfaces/TemplatedContainer/testMsgBox.crow
index 95366377..d60c281e 100755
--- a/Tests/Interfaces/TemplatedContainer/testMsgBox.crow
+++ b/Tests/Interfaces/TemplatedContainer/testMsgBox.crow
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<MessageBox Title="message" Message="this is a message box"/>
+<MessageBox Caption="message" Message="this is a message box"/>
 <!--	Ok="onMsgBoxOk"
 	Cancel="onMsgBoxCancel"/>-->
\ No newline at end of file
diff --git a/Tests/Interfaces/TemplatedGroup/0.crow b/Tests/Interfaces/TemplatedGroup/0.crow
index c502e63a..92cd224b 100755
--- a/Tests/Interfaces/TemplatedGroup/0.crow
+++ b/Tests/Interfaces/TemplatedGroup/0.crow
@@ -1,27 +1,27 @@
 <?xml version="1.0"?>
 <Menu>
-	<MenuItem Caption="File">
-		<MenuItem Caption="New" Execute="onNew"/>
+	<MenuItem Caption="File" Width="Fit">
+		<MenuItem Caption="New" />
 		<MenuItem Caption="Open"/>
 		<MenuItem Caption="Save"/>
 		<MenuItem Caption="Quit"/>
 	</MenuItem>
-	<MenuItem Caption="Edit" Name="edit">
+	<MenuItem Caption="Edit" Name="edit" Width="Fit">
 		<MenuItem Caption="Cut"/>
 		<MenuItem Caption="Copy"/>
 		<MenuItem Caption="Paste"/>
-		<MenuItem Caption="Special" Name="special">
+		<MenuItem Caption="Special" Name="special" Width="Fit">
 			<MenuItem Caption="Cut"/>
 			<MenuItem Caption="Copy"/>
 			<MenuItem Caption="Paste"/>
 		</MenuItem>
-		<MenuItem Caption="Special2" Name="special">
+		<MenuItem Caption="Special2" Name="special" Width="Fit">
 			<MenuItem Caption="Cut"/>
 			<MenuItem Caption="Copy"/>
 			<MenuItem Caption="Paste"/>
 		</MenuItem>
 	</MenuItem>
-	<MenuItem Caption="Help">
+	<MenuItem Caption="Help" Width="Fit">
 		<MenuItem Caption="About"/>
 		<MenuItem Caption="Help"/>
 	</MenuItem>
diff --git a/Tests/Interfaces/Unsorted/testFileDialog.crow b/Tests/Interfaces/Unsorted/testFileDialog.crow
index fd54b551..d24b1c99 100644
--- a/Tests/Interfaces/Unsorted/testFileDialog.crow
+++ b/Tests/Interfaces/Unsorted/testFileDialog.crow
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
-<FileDialog Title="Open File" CurrentDirectory="/"/>
+<FileDialog Caption="Open File" CurrentDirectory="/"/>
 
diff --git a/Tests/Interfaces/Wrapper/1.crow b/Tests/Interfaces/Wrapper/1.crow
index feddc6ef..e8ffd6b2 100755
--- a/Tests/Interfaces/Wrapper/1.crow
+++ b/Tests/Interfaces/Wrapper/1.crow
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Window Width="50%" Height="50%">
+<Window Caption="Vertical Wrapper" Width="50%" Height="50%">
 	<Wrapper Orientation="Vertical" Height="Fit" Width="Fit" Margin="5" Background="Teal" Spacing="1" >
 		<GraphicObject Width="50" Height="50" Background="Mantis"/>
 		<GraphicObject Width="50" Height="50" Background="Mantis"/>
diff --git a/Tests/Interfaces/Wrapper/2.crow b/Tests/Interfaces/Wrapper/2.crow
index 4fa1cd9a..14b005e8 100755
--- a/Tests/Interfaces/Wrapper/2.crow
+++ b/Tests/Interfaces/Wrapper/2.crow
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Window Width="50%" Height="50%">	
+<Window Caption="Horizontal Wrapper" Width="50%" Height="50%">
 	<Wrapper Orientation="Horizontal" Height="Fit" Width="Fit" Margin="5" Background="Teal" Spacing="1" >
 		<GraphicObject Width="50" Height="50" Background="Mantis"/>
 		<GraphicObject Width="50" Height="50" Background="Mantis"/>
diff --git a/Tests/UIEditor.cs b/Tests/UIEditor.cs
index 2c03bdbb..6a7815f4 100644
--- a/Tests/UIEditor.cs
+++ b/Tests/UIEditor.cs
@@ -47,7 +47,7 @@ namespace Tests
 			AddWidget(
 				new Window ()
 				{
-					Title = "Hello World"
+					Caption = "Hello World"
 				}
 			);
 		}
diff --git a/Tests/ui/test.crow b/Tests/ui/test.crow
index da776371..9a0e22c0 100755
--- a/Tests/ui/test.crow
+++ b/Tests/ui/test.crow
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Window Font="droid bold, 10" Title="Open GL" HorizontalAlignment="Left" Width="30%" Height="90%">
+<Window Font="droid bold, 10" Caption="Open GL" HorizontalAlignment="Left" Width="30%" Height="90%">
 	<VerticalStack>
 		<HorizontalStack Background="Jet" Height="Fit" Width="Stretched"  Margin="2">
 			<Popper Caption="File" Template="#Tests.ui.Popper.template" Width="Fit">
diff --git a/Tests/ui/tmpWindow.crow b/Tests/ui/tmpWindow.crow
index 64c97d55..8af356bf 100755
--- a/Tests/ui/tmpWindow.crow
+++ b/Tests/ui/tmpWindow.crow
@@ -5,7 +5,7 @@
 	Background="vgradient|0:0.6,0.6,0.6,0.9|1:0.4,0.4,0.4,0.6">
 	<VerticalStack>
 		<HorizontalStack Height="Fit">
-			<Label Margin="2" Font="{../../../../Font}" Text="{../../../../Title}" Width="Stretched"/>
+			<Label Margin="2" Font="{../../../../Font}" Text="{../../../../Caption}" Width="Stretched"/>
 			<Border HorizontalAlignment="Right" Margin="0" VerticalAlignment="Top"
 				CornerRadius="6" BorderWidth="1" Foreground="Transparent"
 				Height="12" Width="12"
diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs
index 9c1a0124..ab779609 100644
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@ -41,7 +41,6 @@ namespace Crow
 			SE,
 		}
 
-		string _title;
 		string _icon;
 		bool _resizable;
 		bool _movable;
@@ -84,16 +83,6 @@ namespace Crow
 		#endregion
 
 		#region public properties
-		[XmlAttributeAttribute][DefaultValue("Window")]
-		public string Title {
-			get { return _title; } 
-			set {
-				if (_title == value)
-					return;
-				_title = value;
-				NotifyValueChanged ("Title", _title);
-			}
-		}
 		[XmlAttributeAttribute][DefaultValue("#Crow.Images.Icons.crow.png")]
 		public string Icon {
 			get { return _icon; }