debug renaming, debug template loading not skipping template tag in templatedContainer

10 files changed, 46 insertions, 20 deletions

diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index 6598517f..1e6c79be 100644
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -36,16 +36,17 @@ namespace test
 		int frameCpt = 0;

 		int idx = 0;

 		string[] testFiles = {

+			"testWindow2.goml",

 //			"testCombobox.goml",

 			"testWindow3.goml",

+			"testWindow.goml",

+			"testGroupBox.goml",

 			"testExpandable.goml",

-			"testPopper.goml",

 			"testCheckbox.goml",

+			"testPopper.goml",

 			"fps.goml",

 			"testLabel.goml",

 			"testAll.goml",

-			"testWindow.goml",

-			"testWindow2.goml",

 //			"testSpinner.goml",

 			"test4.goml",

 			"testRadioButton2.goml",

@@ -53,7 +54,6 @@ namespace test
 			"testBorder.goml",

 			"testRadioButton.goml",

 			"testSpinner.goml",

-			"testGroupBox.goml",

 			"testMsgBox.goml",

 			"testGrid.goml",

 			"testMeter.goml",

diff --git a/Tests/Interfaces/test4.goml b/Tests/Interfaces/test4.goml
index 6bd2e14c..bdb6656c 100755
--- a/Tests/Interfaces/test4.goml
+++ b/Tests/Interfaces/test4.goml
@@ -50,7 +50,7 @@
 				</Button>

 				<Popper Width="100">

 					<Border Margin="10" Fit="True" Background="ArmyGreen">

-						<Image Fit="true" Path="#go.Images.Icons.tetra.png"/>

+						<Image Fit="true" Path="#Crow.Images.Icons.tetra.png"/>

 					</Border>

 				</Popper>

 				<Expandable Name="expander" Width="150" Height="-1">

diff --git a/Tests/Interfaces/testExpandable.goml b/Tests/Interfaces/testExpandable.goml
index 35cf3d64..a4c5013f 100755
--- a/Tests/Interfaces/testExpandable.goml
+++ b/Tests/Interfaces/testExpandable.goml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>

-<Expandable Title="Test expandable" Width="-1" Background="DimGray">

+<Expandable Title="Test expandable" Background="DimGray">

 		<VerticalStack Width="-1" Height="-1">

-			<Checkbox Name="chk1"/>

+			<Checkbox Name="chk1" Background="Red"/>

 			<Checkbox Name="chk2" IsChecked="true"/>

 			<Checkbox Name="chk3"/>

 			<Checkbox Name="chk4"/>

-			<HorizontalStack Fit="true" Margin="20">

-				<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>

-				<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="AoEnglish"/>

+			<HorizontalStack Fit="true" Margin="2" Background="Blue">

+				<Label Name="captionFps" Text="Fps:" Width="30" TextAlignment="RightCenter"/>

+				<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="-1" TextAlignment="Center" Background="AoEnglish"/>

 			</HorizontalStack>

 		</VerticalStack>

 </Expandable>

diff --git a/Tests/Interfaces/testPopper.goml b/Tests/Interfaces/testPopper.goml
index 3686599a..b5c9b606 100755
--- a/Tests/Interfaces/testPopper.goml
+++ b/Tests/Interfaces/testPopper.goml
@@ -3,7 +3,7 @@
 	<Border Fit="True" Background="ArmyGreen">

 <!--		<Image Fit="true" Path="#go.Images.Icons.tetra.png" Margin="10"/>-->

 		<VerticalStack Fit="true" Margin="10" Background="CornflowerBlue">

-			<Checkbox Name="chk1"/>

+			<Checkbox Name="chk1" Background="Red"/>

 			<Checkbox Name="chk2" IsChecked="true"/>

 			<Checkbox Name="chk3"/>

 			<Checkbox Name="chk4"/>

diff --git a/Tests/Interfaces/testWindow.goml b/Tests/Interfaces/testWindow.goml
index c48f08e2..b2dd8a1a 100755
--- a/Tests/Interfaces/testWindow.goml
+++ b/Tests/Interfaces/testWindow.goml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>

-<Window Name="window1" Left="10" Top="10" Title="Test window" 

+<Window Left="10" Top="10" Title="Test window" 

 		Width="250" Height="300" >

 	<VerticalStack Name="contentVSStack" Margin="10" Spacing="10">

 		<Slider Name="slider" Height="10" Width="0"/>

diff --git a/Tests/Interfaces/testWindow.goml.sav b/Tests/Interfaces/testWindow.goml.sav
new file mode 100755
index 00000000..740cfc53
--- /dev/null
+++ b/Tests/Interfaces/testWindow.goml.sav
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>

+<!--<Group>-->

+<Window Name="window1" Left="10" Top="10" Title="Test window" 

+		Width="250" Height="300" >

+	<VerticalStack Name="contentVSStack" Margin="10" Spacing="10">

+		<Slider Name="slider" Height="10" Width="0"/>

+

+		<HorizontalStack Width="0" Height="-1" Margin="10" Background="BlueCrayola">

+			<Checkbox Height="-1" Width="80"/>

+			<GraphicObject Width="0"/>

+			<Checkbox Height="-1" Width="80"/>

+		</HorizontalStack>

+		<Groupbox Text="test"  Height="-1" Width="-1" Margin="5">

+			<VerticalStack  Height="-1" Width="0" >

+				<RadioButton  Caption="Radio 1" Background="Red" />

+				<RadioButton  Caption="Radio 2" IsChecked="true" />

+				<RadioButton  Caption="Radio 3" />

+			</VerticalStack>

+		</Groupbox>

+<!--		<Checkbox Height="-1" Width="-1" Background="Red" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Right"/>-->

+	</VerticalStack>

+</Window>

+<!--</Group>-->

+<!--		<Label Text="{fps}"  Background="DarkRed"/>

+		<Label Text="{fpsMin}"  />

+		<Label Text="{fpsMax}"  />-->
\ No newline at end of file
diff --git a/Tests/Interfaces/testWindow2.goml b/Tests/Interfaces/testWindow2.goml
index 999c68e4..235f0806 100755
--- a/Tests/Interfaces/testWindow2.goml
+++ b/Tests/Interfaces/testWindow2.goml
@@ -12,7 +12,7 @@
 						<Label Foreground="White" Width="{../../../../../TemplatedWidth}" Margin="1" TextAlignment="Center" Text="{../../../../../Title}" />

 						<Border CornerRadius="6" BorderWidth="1" BorderColor="Transparent"  Height="12" Width="12"

 							MouseEnter="{BorderColor=White}" MouseLeave="{BorderColor=Transparent}">

-							<Image Focusable="true" Name="Image" Margin="0" Width="0" Height="0" Path="#go.Images.Icons.exit2.svg"

+							<Image Focusable="true" Name="Image" Margin="0" Width="0" Height="0" Path="#Crow.Images.Icons.exit2.svg"

 								 MouseClick="../../../../../../butQuitPress"/>

 						</Border>

 						<GraphicObject Width="5"/>

diff --git a/Tests/Interfaces/testWindow3.goml b/Tests/Interfaces/testWindow3.goml
index 0c846b15..fc6c1dc9 100755
--- a/Tests/Interfaces/testWindow3.goml
+++ b/Tests/Interfaces/testWindow3.goml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>

-<Window Name="window1" 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="{../TemplatedHeight}" Width="{../TemplatedWidth}" Background="0,5;0,5;0,5;0,5"/>

 	</Template>

-	<Group Background="Green">

-<!--		<GraphicObject Height="50" Width="50" Background="Red" Margin="5"/>-->

-		<Scrollbar Orientation="Vertical" Height="0" Width="10" Background="Blue" Margin="0" HorizontalAlignment="Right"/>

-	</Group>

+<!--	<Group Background="Green">-->

+		<GraphicObject Height="50" Width="50" Background="Red" Margin="5"/>

+<!--		<Scrollbar Orientation="Vertical" Height="0" Width="10" Background="Blue" Margin="0" HorizontalAlignment="Right"/>-->

+<!--	</Group>-->

 </Window>

diff --git a/Tests/Interfaces/tmpMembers.goml b/Tests/Interfaces/tmpMembers.goml
index 4c823e72..fae4fdf0 100755
--- a/Tests/Interfaces/tmpMembers.goml
+++ b/Tests/Interfaces/tmpMembers.goml
@@ -2,7 +2,7 @@
 	<HorizontalStack Width="0" Height="-1" Focusable="true" 

 			MouseEnter="{Background=Red}"

 			MouseLeave="{Background=Transparent}">

-		<Image Width="8" Height="8" Path="#go.Images.Icons.member.svg" SvgSub="{GetIcon}"/>

+		<Image Width="8" Height="8" Path="#Crow.Images.Icons.member.svg" SvgSub="{GetIcon}"/>

 		<Label Text="{Name}" Width="0" Height="-1" Margin="2"/>

 		<Label Text="{MemberType}" Width="-1" Height="-1" Margin="0"/>

 	</HorizontalStack>

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 90d1a498..1e63ae8e 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Tests</RootNamespace>
     <AssemblyName>Tests</AssemblyName>
-    <StartupObject>test.GOLIBTest_Listbox</StartupObject>
+    <StartupObject>test.GOLIBTests</StartupObject>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <OutputPath>..\bin\$(configuration)</OutputPath>
     <IntermediateOutputPath>obj\$(configuration)</IntermediateOutputPath>