From 5fc76c5f6234fcdcf208607c434a6d5d8bbf79da Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Thu, 18 Aug 2016 17:26:50 +0200
Subject: [PATCH] =?utf8?q?tests=20reorganization=20=09modifi=C3=A9=C2=A0:?=
 =?utf8?q?=20=20=20=20=20=20=20=20=20Crow.csproj=20=09modifi=C3=A9=C2=A0:?=
 =?utf8?q?=20=20=20=20=20=20=20=20=20Tests/BasicTests.cs=20=09renomm=C3=A9?=
 =?utf8?q?=C2=A0:=20=20=20=20=20=20=20=20=20Tests/Interfaces/Expandable/0.?=
 =?utf8?q?crow=20->=20Tests/Interfaces/TemplatedContainer/0.crow=20=09reno?=
 =?utf8?q?mm=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20Tests/Interfaces/Expan?=
 =?utf8?q?dable/6.crow=20->=20Tests/Interfaces/TemplatedContainer/6.crow?=
 =?utf8?q?=20=09renomm=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20Tests/Interf?=
 =?utf8?q?aces/Expandable/7.crow=20->=20Tests/Interfaces/TemplatedContaine?=
 =?utf8?q?r/7.crow=20=09renomm=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20Test?=
 =?utf8?q?s/Interfaces/Divers/testDirViewer2.crow=20->=20Tests/Interfaces/?=
 =?utf8?q?TemplatedContainer/testDirViewer2.crow=20=09renomm=C3=A9=C2=A0:?=
 =?utf8?q?=20=20=20=20=20=20=20=20=20Tests/Interfaces/Divers/testGroupBox.?=
 =?utf8?q?crow=20->=20Tests/Interfaces/TemplatedContainer/testGroupBox.cro?=
 =?utf8?q?w=20=09renomm=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20Tests/Inter?=
 =?utf8?q?faces/Divers/testMsgBox.crow=20->=20Tests/Interfaces/TemplatedCo?=
 =?utf8?q?ntainer/testMsgBox.crow=20=09renomm=C3=A9=C2=A0:=20=20=20=20=20?=
 =?utf8?q?=20=20=20=20Tests/Interfaces/Divers/testPopper.crow=20->=20Tests?=
 =?utf8?q?/Interfaces/TemplatedContainer/testPopper.crow=20=09renomm=C3=A9?=
 =?utf8?q?=C2=A0:=20=20=20=20=20=20=20=20=20Tests/Interfaces/Divers/testTa?=
 =?utf8?q?bView.crow=20->=20Tests/Interfaces/TemplatedContainer/testTabVie?=
 =?utf8?q?w.crow=20=09renomm=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20Tests/?=
 =?utf8?q?Interfaces/Divers/testTreeView.crow=20->=20Tests/Interfaces/Temp?=
 =?utf8?q?latedContainer/testTreeView.crow=20=09renomm=C3=A9=C2=A0:=20=20?=
 =?utf8?q?=20=20=20=20=20=20=20Tests/Interfaces/Divers/testWindow.goml=20-?=
 =?utf8?q?>=20Tests/Interfaces/TemplatedContainer/testWindow.goml=20=09ren?=
 =?utf8?q?omm=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20Tests/Interfaces/Dive?=
 =?utf8?q?rs/testWindow2.goml=20->=20Tests/Interfaces/TemplatedContainer/t?=
 =?utf8?q?estWindow2.goml=20=09renomm=C3=A9=C2=A0:=20=20=20=20=20=20=20=20?=
 =?utf8?q?=20Tests/Interfaces/Divers/testWindow3.goml=20->=20Tests/Interfa?=
 =?utf8?q?ces/TemplatedContainer/testWindow3.goml=20=09renomm=C3=A9=C2=A0:?=
 =?utf8?q?=20=20=20=20=20=20=20=20=20Tests/Interfaces/Divers/test=5FListbo?=
 =?utf8?q?x.crow=20->=20Tests/Interfaces/TemplatedContainer/test=5FListbox?=
 =?utf8?q?.crow=20=09renomm=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20Tests/I?=
 =?utf8?q?nterfaces/Divers/testButton.crow=20->=20Tests/Interfaces/Templat?=
 =?utf8?q?edControl/testButton.crow=20=09renomm=C3=A9=C2=A0:=20=20=20=20?=
 =?utf8?q?=20=20=20=20=20Tests/Interfaces/Divers/testCheckbox.crow=20->=20?=
 =?utf8?q?Tests/Interfaces/TemplatedControl/testCheckbox.crow=20=09renomm?=
 =?utf8?q?=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20Tests/Interfaces/Divers/?=
 =?utf8?q?testCombobox.crow=20->=20Tests/Interfaces/TemplatedControl/testC?=
 =?utf8?q?ombobox.crow=20=09renomm=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20?=
 =?utf8?q?Tests/Interfaces/Divers/testItemTemplateTag.crow=20->=20Tests/In?=
 =?utf8?q?terfaces/TemplatedControl/testItemTemplateTag.crow=20=09renomm?=
 =?utf8?q?=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20Tests/Interfaces/Divers/?=
 =?utf8?q?testRadioButton.crow=20->=20Tests/Interfaces/TemplatedControl/te?=
 =?utf8?q?stRadioButton.crow=20=09renomm=C3=A9=C2=A0:=20=20=20=20=20=20=20?=
 =?utf8?q?=20=20Tests/Interfaces/Divers/testScrollbar.goml=20->=20Tests/In?=
 =?utf8?q?terfaces/TemplatedControl/testScrollbar.goml=20=09renomm=C3=A9?=
 =?utf8?q?=C2=A0:=20=20=20=20=20=20=20=20=20Tests/Interfaces/Divers/testSp?=
 =?utf8?q?inner.goml=20->=20Tests/Interfaces/TemplatedControl/testSpinner.?=
 =?utf8?q?goml=20=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20Tests/Te?=
 =?utf8?q?sts.csproj=20=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20sr?=
 =?utf8?q?c/GraphicObjects/Expandable.cs=20=09modifi=C3=A9=C2=A0:=20=20=20?=
 =?utf8?q?=20=20=20=20=20=20src/GraphicObjects/Group.cs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

TemplatedGroup class
	nouveau fichier : src/GraphicObjects/TemplatedGroup.cs
	nouveau fichier : Tests/Interfaces/TemplatedGroup/0.crow
	modifié :         src/IMLReader.cs
---
 Crow.csproj                                   |   1 +
 Tests/BasicTests.cs                           |   4 +-
 .../{Expandable => TemplatedContainer}/0.crow |   0
 .../{Expandable => TemplatedContainer}/6.crow |   0
 .../{Expandable => TemplatedContainer}/7.crow |   0
 .../testDirViewer2.crow                       |   0
 .../testGroupBox.crow                         |   0
 .../testMsgBox.crow                           |   0
 .../testPopper.crow                           |   0
 .../testTabView.crow                          |   1 -
 .../testTreeView.crow                         |   4 +-
 .../testWindow.goml                           |   6 +-
 .../testWindow2.goml                          |   0
 .../testWindow3.goml                          |   2 +-
 .../test_Listbox.crow                         |   6 +-
 .../testButton.crow                           |   0
 .../testCheckbox.crow                         |   1 -
 .../testCombobox.crow                         |   0
 .../testItemTemplateTag.crow                  |   6 +-
 .../testRadioButton.crow                      |   1 -
 .../testScrollbar.goml                        |   0
 .../testSpinner.goml                          |   0
 Tests/Interfaces/TemplatedGroup/0.crow        |   1 +
 Tests/Tests.csproj                            |  85 ++++++-----
 src/GraphicObjects/Expandable.cs              |   1 +
 src/GraphicObjects/Group.cs                   |   2 -
 src/GraphicObjects/TemplatedGroup.cs          | 144 ++++++++++++++++++
 src/IMLReader.cs                              |  24 ++-
 28 files changed, 224 insertions(+), 65 deletions(-)
 rename Tests/Interfaces/{Expandable => TemplatedContainer}/0.crow (100%)
 rename Tests/Interfaces/{Expandable => TemplatedContainer}/6.crow (100%)
 rename Tests/Interfaces/{Expandable => TemplatedContainer}/7.crow (100%)
 rename Tests/Interfaces/{Divers => TemplatedContainer}/testDirViewer2.crow (100%)
 rename Tests/Interfaces/{Divers => TemplatedContainer}/testGroupBox.crow (100%)
 rename Tests/Interfaces/{Divers => TemplatedContainer}/testMsgBox.crow (100%)
 rename Tests/Interfaces/{Divers => TemplatedContainer}/testPopper.crow (100%)
 rename Tests/Interfaces/{Divers => TemplatedContainer}/testTabView.crow (99%)
 rename Tests/Interfaces/{Divers => TemplatedContainer}/testTreeView.crow (97%)
 rename Tests/Interfaces/{Divers => TemplatedContainer}/testWindow.goml (97%)
 rename Tests/Interfaces/{Divers => TemplatedContainer}/testWindow2.goml (100%)
 rename Tests/Interfaces/{Divers => TemplatedContainer}/testWindow3.goml (93%)
 rename Tests/Interfaces/{Divers => TemplatedContainer}/test_Listbox.crow (97%)
 rename Tests/Interfaces/{Divers => TemplatedControl}/testButton.crow (100%)
 rename Tests/Interfaces/{Divers => TemplatedControl}/testCheckbox.crow (99%)
 rename Tests/Interfaces/{Divers => TemplatedControl}/testCombobox.crow (100%)
 rename Tests/Interfaces/{Divers => TemplatedControl}/testItemTemplateTag.crow (97%)
 rename Tests/Interfaces/{Divers => TemplatedControl}/testRadioButton.crow (99%)
 rename Tests/Interfaces/{Divers => TemplatedControl}/testScrollbar.goml (100%)
 rename Tests/Interfaces/{Divers => TemplatedControl}/testSpinner.goml (100%)
 create mode 100755 Tests/Interfaces/TemplatedGroup/0.crow
 create mode 100644 src/GraphicObjects/TemplatedGroup.cs

diff --git a/Crow.csproj b/Crow.csproj
index 0bebc5f2..570a8941 100644
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -140,6 +140,7 @@
     <Compile Include="src\ItemTemplate.cs" />
     <Compile Include="src\Style.cs" />
     <Compile Include="src\GraphicObjects\Wrapper.cs" />
+    <Compile Include="src\GraphicObjects\TemplatedGroup.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/Tests/BasicTests.cs b/Tests/BasicTests.cs
index 9717c230..b2299f42 100644
--- a/Tests/BasicTests.cs
+++ b/Tests/BasicTests.cs
@@ -95,14 +95,16 @@ namespace Tests
 			this.KeyDown += KeyboardKeyDown1;
 
 			testFiles = new string [] { @"Interfaces/Divers/welcome.crow" };
+			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/TemplatedGroup", "*.crow")).ToArray ();
 			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/GraphicObject", "*.crow")).ToArray ();
 			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Container", "*.crow")).ToArray ();
 			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Group", "*.crow")).ToArray ();
 			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Stack", "*.crow")).ToArray ();
 			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Wrapper", "*.crow")).ToArray ();
 			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Splitter", "*.crow")).ToArray ();
-			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Expandable", "*.crow")).ToArray ();
 			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Divers", "*.crow")).ToArray ();
+			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/TemplatedControl", "*.crow")).ToArray ();
+			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/TemplatedContainer", "*.crow")).ToArray ();
 
 			this.Title = testFiles [idx] + ". Press <F3> to switch example.";
 			CrowInterface.LoadInterface(testFiles[idx]).DataSource = this;
diff --git a/Tests/Interfaces/Expandable/0.crow b/Tests/Interfaces/TemplatedContainer/0.crow
similarity index 100%
rename from Tests/Interfaces/Expandable/0.crow
rename to Tests/Interfaces/TemplatedContainer/0.crow
diff --git a/Tests/Interfaces/Expandable/6.crow b/Tests/Interfaces/TemplatedContainer/6.crow
similarity index 100%
rename from Tests/Interfaces/Expandable/6.crow
rename to Tests/Interfaces/TemplatedContainer/6.crow
diff --git a/Tests/Interfaces/Expandable/7.crow b/Tests/Interfaces/TemplatedContainer/7.crow
similarity index 100%
rename from Tests/Interfaces/Expandable/7.crow
rename to Tests/Interfaces/TemplatedContainer/7.crow
diff --git a/Tests/Interfaces/Divers/testDirViewer2.crow b/Tests/Interfaces/TemplatedContainer/testDirViewer2.crow
similarity index 100%
rename from Tests/Interfaces/Divers/testDirViewer2.crow
rename to Tests/Interfaces/TemplatedContainer/testDirViewer2.crow
diff --git a/Tests/Interfaces/Divers/testGroupBox.crow b/Tests/Interfaces/TemplatedContainer/testGroupBox.crow
similarity index 100%
rename from Tests/Interfaces/Divers/testGroupBox.crow
rename to Tests/Interfaces/TemplatedContainer/testGroupBox.crow
diff --git a/Tests/Interfaces/Divers/testMsgBox.crow b/Tests/Interfaces/TemplatedContainer/testMsgBox.crow
similarity index 100%
rename from Tests/Interfaces/Divers/testMsgBox.crow
rename to Tests/Interfaces/TemplatedContainer/testMsgBox.crow
diff --git a/Tests/Interfaces/Divers/testPopper.crow b/Tests/Interfaces/TemplatedContainer/testPopper.crow
similarity index 100%
rename from Tests/Interfaces/Divers/testPopper.crow
rename to Tests/Interfaces/TemplatedContainer/testPopper.crow
diff --git a/Tests/Interfaces/Divers/testTabView.crow b/Tests/Interfaces/TemplatedContainer/testTabView.crow
similarity index 99%
rename from Tests/Interfaces/Divers/testTabView.crow
rename to Tests/Interfaces/TemplatedContainer/testTabView.crow
index 27c221f4..ca558d14 100644
--- a/Tests/Interfaces/Divers/testTabView.crow
+++ b/Tests/Interfaces/TemplatedContainer/testTabView.crow
@@ -32,4 +32,3 @@
 			Caption="Add new tab" Width="Fit" Height="30" MouseClick="onAddTabButClick"/>
 	</VerticalStack>
 </HorizontalStack>
-
diff --git a/Tests/Interfaces/Divers/testTreeView.crow b/Tests/Interfaces/TemplatedContainer/testTreeView.crow
similarity index 97%
rename from Tests/Interfaces/Divers/testTreeView.crow
rename to Tests/Interfaces/TemplatedContainer/testTreeView.crow
index 3ec7ce6a..3a44bf34 100755
--- a/Tests/Interfaces/Divers/testTreeView.crow
+++ b/Tests/Interfaces/TemplatedContainer/testTreeView.crow
@@ -9,7 +9,7 @@
 				MouseLeave="{Background=Transparent}"/>
 		</HorizontalStack>
 	</ItemTemplate>
-	<ItemTemplate DataType="System.IO.DirectoryInfo" Data="GetFileSystemInfos">		
+	<ItemTemplate DataType="System.IO.DirectoryInfo" Data="GetFileSystemInfos">
 		<Expandable Caption="{Name}" >
 			<Template>
 				<VerticalStack Height="{./HeightPolicy}" Width="{./WidthPolicy}">
@@ -18,7 +18,7 @@
 							MouseLeave="{Background=Transparent}">
 						<Image Margin="2" Width="12" Height="12"
 							Visible="{./HasContent}"
-							Path="{./Image}" 
+							Path="{./Image}"
 							SvgSub="{./IsExpanded}"/>
 						<Image Margin="2" Width="14" Height="14"
 							Path="#Crow.Images.Icons.folder.svg"/>
diff --git a/Tests/Interfaces/Divers/testWindow.goml b/Tests/Interfaces/TemplatedContainer/testWindow.goml
similarity index 97%
rename from Tests/Interfaces/Divers/testWindow.goml
rename to Tests/Interfaces/TemplatedContainer/testWindow.goml
index 09db6193..c930d92e 100755
--- a/Tests/Interfaces/Divers/testWindow.goml
+++ b/Tests/Interfaces/TemplatedContainer/testWindow.goml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Window Left="10" Top="10" Title="Test window" 
+<Window Left="10" Top="10" Title="Test window"
 		Width="250" Height="550" >
 	<VerticalStack Name="contentVSStack" Margin="10" Spacing="10" Background="0.4,0.4,0.4,0.4">
 		<Slider Name="slider" Height="12" Width="Stretched" CornerRadius="3"/>
@@ -43,7 +43,7 @@
 						</HorizontalStack>
 						<HorizontalStack Fit="true">
 							<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-							<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
+							<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
 								Background="vgradient|0:AoEnglish|1:Black"/>
 						</HorizontalStack>
 						<HorizontalStack Fit="true">
@@ -56,7 +56,7 @@
 							<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
 								Background="vgradient|0:AoEnglish|1:Black"/>
 						</HorizontalStack>
-					</VerticalStack>				
+					</VerticalStack>
 			</Container>
 		</Border>
 		<HorizontalStack Fit="true" Background="BlueCrayola" Margin="3">
diff --git a/Tests/Interfaces/Divers/testWindow2.goml b/Tests/Interfaces/TemplatedContainer/testWindow2.goml
similarity index 100%
rename from Tests/Interfaces/Divers/testWindow2.goml
rename to Tests/Interfaces/TemplatedContainer/testWindow2.goml
diff --git a/Tests/Interfaces/Divers/testWindow3.goml b/Tests/Interfaces/TemplatedContainer/testWindow3.goml
similarity index 93%
rename from Tests/Interfaces/Divers/testWindow3.goml
rename to Tests/Interfaces/TemplatedContainer/testWindow3.goml
index 42459bd5..d66de1d6 100755
--- a/Tests/Interfaces/Divers/testWindow3.goml
+++ b/Tests/Interfaces/TemplatedContainer/testWindow3.goml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Window Left="10" Top="10" Title="Test window" Width="200" Height="200" Background="0.5,0.5,0.5,0.8" 
+<Window Left="10" Top="10" Title="Test window" Width="200" Height="200" Background="0.5,0.5,0.5,0.8"
 	Focusable="True"  CornerRadius="20" MinimumSize="100,100" MaximumSize="500,500">
 	<Template>
 		<Container Margin="20" Name="Content" Height="{../HeightPolicy}" Width="{../WidthPolicy}" Background="0.5,0.5,0.5,0.5"/>
diff --git a/Tests/Interfaces/Divers/test_Listbox.crow b/Tests/Interfaces/TemplatedContainer/test_Listbox.crow
similarity index 97%
rename from Tests/Interfaces/Divers/test_Listbox.crow
rename to Tests/Interfaces/TemplatedContainer/test_Listbox.crow
index 321ea58c..8b12cb8c 100755
--- a/Tests/Interfaces/Divers/test_Listbox.crow
+++ b/Tests/Interfaces/TemplatedContainer/test_Listbox.crow
@@ -12,15 +12,15 @@
 <!--			<Template>
 				<Border BorderWidth="1" Height="{../HeightPolicy}" Width="{../WidthPolicy}">
 					<HorizontalStack Margin="1" Height="{../../HeightPolicy}" Width="{../../WidthPolicy}" >
-						<Scroller Name="scroller1" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}" 
+						<Scroller Name="scroller1" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}"
 								Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Value}"
 								ValueChanged="../../../_scroller_ValueChanged">
 							<VerticalStack Width="{../../../../WidthPolicy}" Height="Fit" MinimumSize="100,100"
 								Name="List" Margin="0" VerticalAlignment="Top"
 								LayoutChanged="../../../../_list_LayoutChanged"/>
 						</Scroller>
-						<ScrollBar Name="scrollbar1" Value="{../scroller1.ScrollY}" 
-							Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical" 
+						<ScrollBar Name="scrollbar1" Value="{../scroller1.ScrollY}"
+							Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical"
 							Width="12" Height="{../../../HeightPolicy}" />
 					</HorizontalStack>
 				</Border>
diff --git a/Tests/Interfaces/Divers/testButton.crow b/Tests/Interfaces/TemplatedControl/testButton.crow
similarity index 100%
rename from Tests/Interfaces/Divers/testButton.crow
rename to Tests/Interfaces/TemplatedControl/testButton.crow
diff --git a/Tests/Interfaces/Divers/testCheckbox.crow b/Tests/Interfaces/TemplatedControl/testCheckbox.crow
similarity index 99%
rename from Tests/Interfaces/Divers/testCheckbox.crow
rename to Tests/Interfaces/TemplatedControl/testCheckbox.crow
index ddde673d..5147a151 100755
--- a/Tests/Interfaces/Divers/testCheckbox.crow
+++ b/Tests/Interfaces/TemplatedControl/testCheckbox.crow
@@ -9,4 +9,3 @@
 	<CheckBox Background="Gray" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/>
 	<CheckBox Background="Gray" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/>
 </VerticalStack>
-
diff --git a/Tests/Interfaces/Divers/testCombobox.crow b/Tests/Interfaces/TemplatedControl/testCombobox.crow
similarity index 100%
rename from Tests/Interfaces/Divers/testCombobox.crow
rename to Tests/Interfaces/TemplatedControl/testCombobox.crow
diff --git a/Tests/Interfaces/Divers/testItemTemplateTag.crow b/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow
similarity index 97%
rename from Tests/Interfaces/Divers/testItemTemplateTag.crow
rename to Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow
index e05c2d1e..5f860719 100755
--- a/Tests/Interfaces/Divers/testItemTemplateTag.crow
+++ b/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow
@@ -6,7 +6,7 @@
 			<Template>
 				<Border BorderWidth="1" Height="{../HeightPolicy}" Width="{../WidthPolicy}">
 					<HorizontalStack Margin="1" Height="{../../HeightPolicy}" Width="{../../WidthPolicy}" >
-						<Scroller Name="scroller1" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}" 
+						<Scroller Name="scroller1" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}"
 								Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Value}"
 								ValueChanged="../../../_scroller_ValueChanged">
 							<VerticalStack Width="{../../../../WidthPolicy}" Height="Fit" MinimumSize="10,10"
@@ -15,8 +15,8 @@
 								HorizontalAlignment="Left"
 								LayoutChanged="../../../../_list_LayoutChanged"/>
 						</Scroller>
-						<ScrollBar Name="scrollbar1" Value="{../scroller1.ScrollY}" 
-							Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical" 
+						<ScrollBar Name="scrollbar1" Value="{../scroller1.ScrollY}"
+							Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical"
 							Width="14" Height="{../../../HeightPolicy}" />
 					</HorizontalStack>
 				</Border>
diff --git a/Tests/Interfaces/Divers/testRadioButton.crow b/Tests/Interfaces/TemplatedControl/testRadioButton.crow
similarity index 99%
rename from Tests/Interfaces/Divers/testRadioButton.crow
rename to Tests/Interfaces/TemplatedControl/testRadioButton.crow
index de07e250..905cdeba 100755
--- a/Tests/Interfaces/Divers/testRadioButton.crow
+++ b/Tests/Interfaces/TemplatedControl/testRadioButton.crow
@@ -5,4 +5,3 @@
 	<RadioButton Caption="Radio3"/>
 	<RadioButton Caption="Radio4"/>
 </VerticalStack>
-
diff --git a/Tests/Interfaces/Divers/testScrollbar.goml b/Tests/Interfaces/TemplatedControl/testScrollbar.goml
similarity index 100%
rename from Tests/Interfaces/Divers/testScrollbar.goml
rename to Tests/Interfaces/TemplatedControl/testScrollbar.goml
diff --git a/Tests/Interfaces/Divers/testSpinner.goml b/Tests/Interfaces/TemplatedControl/testSpinner.goml
similarity index 100%
rename from Tests/Interfaces/Divers/testSpinner.goml
rename to Tests/Interfaces/TemplatedControl/testSpinner.goml
diff --git a/Tests/Interfaces/TemplatedGroup/0.crow b/Tests/Interfaces/TemplatedGroup/0.crow
new file mode 100755
index 00000000..9c7bb705
--- /dev/null
+++ b/Tests/Interfaces/TemplatedGroup/0.crow
@@ -0,0 +1 @@
+<?xml version="1.0"?>
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 10529858..566abf23 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -173,9 +173,6 @@
     <None Include="Interfaces\Divers\fps.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\test_Listbox.crow">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="Interfaces\Divers\test_stack.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -188,108 +185,114 @@
     <None Include="Interfaces\Divers\test1.2.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testButton.crow">
+    <None Include="Interfaces\Divers\testStacks.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\Divers\testTextBox.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testCheckbox.crow">
+    <None Include="Interfaces\Splitter\1.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testCombobox.crow">
+    <None Include="OpenTK.dll.config" />
+    <None Include="image\textest.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testGroupBox.crow">
+    <None Include="Interfaces\Divers\welcome.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testPopper.crow">
+    <None Include="packages.config" />
+    <None Include="Interfaces\Unsorted\testFileDialog.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testRadioButton.crow">
+    <None Include="Interfaces\Unsorted\testTypeViewer.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testScrollbar.goml">
+    <None Include="Interfaces\Divers\testPropLess.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testSpinner.goml">
+    <None Include="Interfaces\Wrapper\1.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testStacks.crow">
+    <None Include="Interfaces\Wrapper\2.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testTextBox.crow">
+    <None Include="Interfaces\Divers\testImage.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\Divers\testOutOfClipUpdate.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testWindow.goml">
+    <None Include="Interfaces\Divers\0.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testWindow2.goml">
+    <None Include="Interfaces\Divers\testDisable.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testWindow3.goml">
+    <None Include="Interfaces\Divers\3.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Expandable\0.crow">
+    <None Include="Interfaces\TemplatedContainer\0.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Expandable\7.crow">
+    <None Include="Interfaces\TemplatedContainer\6.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Splitter\1.crow">
+    <None Include="Interfaces\TemplatedContainer\7.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="OpenTK.dll.config" />
-    <None Include="image\textest.png">
+    <None Include="Interfaces\TemplatedControl\testButton.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\welcome.crow">
+    <None Include="Interfaces\TemplatedControl\testCheckbox.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
-    <None Include="Interfaces\Unsorted\testFileDialog.goml">
+    <None Include="Interfaces\TemplatedControl\testCombobox.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Unsorted\testTypeViewer.goml">
+    <None Include="Interfaces\TemplatedControl\testItemTemplateTag.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testDirViewer2.crow">
+    <None Include="Interfaces\TemplatedControl\testRadioButton.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testPropLess.crow">
+    <None Include="Interfaces\TemplatedControl\testScrollbar.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Wrapper\1.crow">
+    <None Include="Interfaces\TemplatedControl\testSpinner.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Wrapper\2.crow">
+    <None Include="Interfaces\TemplatedContainer\test_Listbox.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testImage.crow">
+    <None Include="Interfaces\TemplatedContainer\testDirViewer2.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testOutOfClipUpdate.crow">
+    <None Include="Interfaces\TemplatedContainer\testGroupBox.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testMsgBox.crow">
+    <None Include="Interfaces\TemplatedContainer\testMsgBox.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testTabView.crow">
+    <None Include="Interfaces\TemplatedContainer\testPopper.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testItemTemplateTag.crow">
+    <None Include="Interfaces\TemplatedContainer\testTabView.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testTreeView.crow">
+    <None Include="Interfaces\TemplatedContainer\testTreeView.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\0.crow">
+    <None Include="Interfaces\TemplatedContainer\testWindow.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Expandable\6.crow">
+    <None Include="Interfaces\TemplatedContainer\testWindow2.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\testDisable.crow">
+    <None Include="Interfaces\TemplatedContainer\testWindow3.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\Divers\3.crow">
+    <None Include="Interfaces\TemplatedGroup\0.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
@@ -299,10 +302,12 @@
     <Folder Include="Interfaces\GraphicObject\" />
     <Folder Include="Interfaces\Group\" />
     <Folder Include="Interfaces\Divers\" />
-    <Folder Include="Interfaces\Expandable\" />
     <Folder Include="Interfaces\Splitter\" />
     <Folder Include="Interfaces\Unsorted\" />
     <Folder Include="Interfaces\Wrapper\" />
+    <Folder Include="Interfaces\TemplatedControl\" />
+    <Folder Include="Interfaces\TemplatedContainer\" />
+    <Folder Include="Interfaces\TemplatedGroup\" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="image\tetra.png">
diff --git a/src/GraphicObjects/Expandable.cs b/src/GraphicObjects/Expandable.cs
index 059cab8b..70451f41 100644
--- a/src/GraphicObjects/Expandable.cs
+++ b/src/GraphicObjects/Expandable.cs
@@ -63,6 +63,7 @@ namespace Crow
 				NotifyValueChanged ("HasContent", HasContent);
 			}
 		}
+		//TODO: move loadTemplate and ResolveBinding in TemplatedContainer
 		protected override void loadTemplate(GraphicObject template = null)
 		{
 			base.loadTemplate (template);
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index 950992e2..402128b0 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -27,8 +27,6 @@ namespace Crow
         bool _multiSelect = false;
 		List<GraphicObject> children = new List<GraphicObject>();
 
-        public GraphicObject activeWidget;
-
         public virtual List<GraphicObject> Children {
 			get { return children; }
 		}
diff --git a/src/GraphicObjects/TemplatedGroup.cs b/src/GraphicObjects/TemplatedGroup.cs
new file mode 100644
index 00000000..12448b82
--- /dev/null
+++ b/src/GraphicObjects/TemplatedGroup.cs
@@ -0,0 +1,144 @@
+//
+//  TemplatedContainer.cs
+//
+//  Author:
+//       Jean-Philippe Bruyère <jp.bruyere@hotmail.com>
+//
+//  Copyright (c) 2015 jp
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+using System;
+using System.Xml.Serialization;
+using System.Xml;
+using System.Reflection;
+using System.Collections.Generic;
+
+namespace Crow
+{
+	public abstract class TemplatedGroup : TemplatedControl
+	{
+		#region CTOR
+		public TemplatedGroup () : base(){}
+		#endregion
+
+		protected Group items;
+
+		public virtual List<GraphicObject> Items{ get { return items.Children; }}
+
+		public virtual void AddItem(GraphicObject g){
+			items.AddChild (g);
+			g.LogicalParent = this;
+		}
+		public virtual void RemoveItem(GraphicObject g)
+		{
+			items.RemoveChild (g);
+		}
+
+		public virtual void ClearItems()
+		{
+			items.ClearChildren ();
+		}
+
+		protected override void loadTemplate(GraphicObject template = null)
+		{
+			base.loadTemplate (template);
+
+			items = this.child.FindByName ("ItemsContainer") as Group;
+			if (items == null)
+				throw new Exception ("TemplatedGroup template Must contain a Group named 'ItemsContainer'");
+		}
+
+		#region GraphicObject overrides
+		public override GraphicObject FindByName (string nameToFind)
+		{
+			if (Name == nameToFind)
+				return this;
+
+			foreach (GraphicObject w in Items) {
+				GraphicObject r = w.FindByName (nameToFind);
+				if (r != null)
+					return r;
+			}
+			return null;
+		}
+		public override bool Contains (GraphicObject goToFind)
+		{
+			foreach (GraphicObject w in Items) {
+				if (w == goToFind)
+					return true;
+				if (w.Contains (goToFind))
+					return true;
+			}
+			return false;
+		}
+		#endregion
+
+		#region IXmlSerialisation Overrides
+		public override void ReadXml(System.Xml.XmlReader reader)
+		{
+			using (System.Xml.XmlReader subTree = reader.ReadSubtree ()) {
+				subTree.Read ();
+				string tmp = subTree.ReadOuterXml ();
+
+				//seek for template tag
+				using (XmlReader xr = new XmlTextReader (tmp, XmlNodeType.Element, null)) {
+					xr.Read ();
+					base.ReadXml (xr);
+				}
+				//process content
+				using (XmlReader xr = new XmlTextReader (tmp, XmlNodeType.Element, null)) {
+					xr.Read (); //skip current node
+
+					while (!xr.EOF) {
+						xr.Read (); //read first child
+
+						if (!xr.IsStartElement ())
+							continue;
+
+						if (xr.Name == "Template" || Name == "ItemTemplate"){
+							xr.Skip ();
+							if (!xr.IsStartElement ())
+								continue;
+						}
+
+						Type t = Type.GetType ("Crow." + xr.Name);
+						if (t == null) {
+							Assembly a = Assembly.GetEntryAssembly ();
+							foreach (Type expT in a.GetExportedTypes ()) {
+								if (expT.Name == xr.Name)
+									t = expT;
+							}
+						}
+						if (t == null)
+							throw new Exception (xr.Name + " type not found");
+
+						GraphicObject go = (GraphicObject)Activator.CreateInstance (t);
+
+						(go as IXmlSerializable).ReadXml (xr);
+
+						AddItem (go);
+
+						xr.Read (); //closing tag
+					}
+
+				}
+			}
+		}
+		public override void WriteXml(System.Xml.XmlWriter writer)
+		{
+			throw new NotImplementedException ();
+		}
+		#endregion
+	}
+}
diff --git a/src/IMLReader.cs b/src/IMLReader.cs
index e4f98ecb..922a48d7 100644
--- a/src/IMLReader.cs
+++ b/src/IMLReader.cs
@@ -107,6 +107,7 @@ namespace Crow
 
 			il.Emit (OpCodes.Ldloc_0);//save current go onto the stack if child has to be added
 
+			#region Template and TemplateItems loading
 			if (typeof(TemplatedControl).IsAssignableFrom (crowType)) {
 				//if its a template, first read template elements
 				using (IMLReader reader = new IMLReader (il, tmpXml)) {
@@ -188,10 +189,12 @@ namespace Crow
 					}
 				}
 			}
+			#endregion
 
 			using (IMLReader reader = new IMLReader(il,tmpXml)){
 				reader.Read ();
 
+				#region Styling and default values loading
 				if (reader.HasAttributes) {
 					string style = reader.GetAttribute ("Style");
 					if (!string.IsNullOrEmpty (style)) {
@@ -201,7 +204,9 @@ namespace Crow
 				}
 				reader.il.Emit (OpCodes.Ldloc_0);
 				reader.il.Emit (OpCodes.Callvirt, typeof(GraphicObject).GetMethod ("loadDefaultValues"));
+				#endregion
 
+				#region Attributes reading
 				if (reader.HasAttributes) {
 
 					MethodInfo miAddBinding = typeof(GraphicObject).GetMethod ("BindMember");
@@ -229,6 +234,7 @@ namespace Crow
 					}
 					reader.MoveToElement ();
 				}
+				#endregion
 
 				if (reader.IsEmptyElement) {
 					reader.il.Emit (OpCodes.Pop);//pop saved ref to current object
@@ -253,7 +259,7 @@ namespace Crow
 				case XmlNodeType.Element:
 					//Templates
 					if (reader.Name == "Template" ||
-						reader.Name == "ItemTemplate") {
+					    reader.Name == "ItemTemplate") {
 						reader.Skip ();
 						continue;
 					}
@@ -263,16 +269,18 @@ namespace Crow
 							miAddChild = typeof(Group).GetMethod ("AddChild");
 						else if (typeof(Container).IsAssignableFrom (crowType))
 							miAddChild = typeof(Container).GetMethod ("SetChild");
-						else if (typeof(TemplatedContainer).IsAssignableFrom (crowType)&&!templateLoading)
-							miAddChild = typeof(TemplatedContainer).GetProperty("Content").GetSetMethod();
+						else if (typeof(TemplatedContainer).IsAssignableFrom (crowType) && !templateLoading)
+							miAddChild = typeof(TemplatedContainer).GetProperty ("Content").GetSetMethod ();
+						else if (typeof(TemplatedGroup).IsAssignableFrom (crowType) && !templateLoading)
+							miAddChild = typeof(TemplatedGroup).GetMethod ("AddItem",
+								BindingFlags.Instance | BindingFlags.Public);
 						else if (typeof(TemplatedControl).IsAssignableFrom (crowType))
 							miAddChild = typeof(TemplatedControl).GetMethod ("loadTemplate",
-								BindingFlags.Instance | BindingFlags.NonPublic);						
+								BindingFlags.Instance | BindingFlags.NonPublic);
 						else if (typeof(PrivateContainer).IsAssignableFrom (crowType))
 							miAddChild = typeof(PrivateContainer).GetMethod ("SetChild",
 								BindingFlags.Instance | BindingFlags.NonPublic);
 					}
-
 					//push current instance on stack for parenting
 					//loc_0 will be used for child
 					reader.il.Emit (OpCodes.Ldloc_0);
@@ -288,13 +296,15 @@ namespace Crow
 					if (t == null)
 						throw new Exception (reader.Name + " type not found");
 
-					reader.il.Emit(OpCodes.Newobj, t.GetConstructors () [0]);//TODO:search parameterless ctor
+					reader.il.Emit (OpCodes.Newobj, t.GetConstructors () [0]);//TODO:search parameterless ctor
 					reader.il.Emit (OpCodes.Stloc_0);//child is now loc_0
 					CompilerServices.emitSetCurInterface (il);
 
-					reader.emitLoader(t);
+					reader.emitLoader (t);
 
 					reader.il.Emit (OpCodes.Ldloc_0);//load child on stack for parenting
+					if (miAddChild == null)
+						System.Diagnostics.Debugger.Break ();
 					reader.il.Emit (OpCodes.Callvirt, miAddChild);
 					reader.il.Emit (OpCodes.Stloc_0); //reset local to current go
 					reader.il.Emit (OpCodes.Ldloc_0);//save current go onto the stack if child has to be added
-- 
2.47.3