clean tests

10 files changed, 25 insertions, 51 deletions

diff --git a/GOLib.csproj b/GOLib.csproj
index dc6912a6..e2e9dfa5 100644
--- a/GOLib.csproj
+++ b/GOLib.csproj
@@ -23,6 +23,7 @@
     <SchemaVersion>2.0</SchemaVersion>

     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ReleaseVersion>0.2</ReleaseVersion>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

     <DebugSymbols>true</DebugSymbols>

@@ -40,6 +41,10 @@
   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <DefineConstants>__linux__</DefineConstants>

+    <OutputPath>bin\Release</OutputPath>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <OutputPath>bin\Debug</OutputPath>

   </PropertyGroup>

   <!--  <PropertyGroup Condition=" '$(Platform)' == 'Linux_x86' ">

     <DefineConstants>__linux__</DefineConstants>

diff --git a/GOLib.sln b/GOLib.sln
index 4e5239b2..05f7d96f 100644
--- a/GOLib.sln
+++ b/GOLib.sln
@@ -13,37 +13,19 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Linux_x86 = Debug|Linux_x86

 		Release|Linux_x86 = Release|Linux_x86

-		Documentation|Any CPU = Documentation|Any CPU

-		Nsis|Any CPU = Nsis|Any CPU

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

 		{232716B4-D19D-4FD7-B310-94A98FD926F0}.Debug|Linux_x86.ActiveCfg = Debug|Any CPU

-		{232716B4-D19D-4FD7-B310-94A98FD926F0}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU

-		{232716B4-D19D-4FD7-B310-94A98FD926F0}.Documentation|Any CPU.Build.0 = Debug|Any CPU

-		{232716B4-D19D-4FD7-B310-94A98FD926F0}.Nsis|Any CPU.ActiveCfg = Debug|Any CPU

-		{232716B4-D19D-4FD7-B310-94A98FD926F0}.Nsis|Any CPU.Build.0 = Debug|Any CPU

 		{232716B4-D19D-4FD7-B310-94A98FD926F0}.Release|Linux_x86.ActiveCfg = Debug|Any CPU

 		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Debug|Linux_x86.ActiveCfg = Debug|Any CPU

 		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Debug|Linux_x86.Build.0 = Debug|Any CPU

-		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU

-		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Documentation|Any CPU.Build.0 = Debug|Any CPU

-		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Nsis|Any CPU.ActiveCfg = Debug|Any CPU

-		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Nsis|Any CPU.Build.0 = Debug|Any CPU

 		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Release|Linux_x86.ActiveCfg = Release|Any CPU

 		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Release|Linux_x86.Build.0 = Release|Any CPU

 		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Debug|Linux_x86.ActiveCfg = Debug|Any CPU

 		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Debug|Linux_x86.Build.0 = Debug|Any CPU

-		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU

-		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Documentation|Any CPU.Build.0 = Debug|Any CPU

-		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Nsis|Any CPU.ActiveCfg = Debug|Any CPU

-		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Nsis|Any CPU.Build.0 = Debug|Any CPU

 		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Linux_x86.ActiveCfg = Release|Any CPU

 		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Linux_x86.Build.0 = Release|Any CPU

 		{E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Debug|Linux_x86.ActiveCfg = Debug|Any CPU

-		{E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU

-		{E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Documentation|Any CPU.Build.0 = Debug|Any CPU

-		{E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Nsis|Any CPU.ActiveCfg = Debug|Any CPU

-		{E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Nsis|Any CPU.Build.0 = Debug|Any CPU

 		{E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Release|Linux_x86.ActiveCfg = Release|Any CPU

 	EndGlobalSection

 	GlobalSection(MonoDevelopProperties) = preSolution

@@ -51,5 +33,9 @@ Global
 		$0.StandardHeader = $1

 		$1.Text = @ \n ${FileName}\n \n Author:\n      ${AuthorName} <${AuthorEmail}>\n\n Copyright (c) ${Year} ${CopyrightHolder}\n\n This program is free software: you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation, either version 3 of the License, or\n (at your option) any later version.\n\n This program is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n\n You should have received a copy of the GNU General Public License\n along with this program.  If not, see <http://www.gnu.org/licenses/>.

 		$1.IncludeInNewFiles = True

+		$0.DotNetNamingPolicy = $2

+		$2.DirectoryNamespaceAssociation = None

+		$2.ResourceNamePolicy = FileFormatDefault

+		version = 0.2

 	EndGlobalSection

 EndGlobal

diff --git a/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj b/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj
index 845ec7d7..cde06bd1 100644
--- a/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj
+++ b/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj
@@ -19,6 +19,7 @@
         </Command>
       </CustomCommands>
     </CustomCommands>
+    <ReleaseVersion>0.2</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Templates/Listbox.goml b/Templates/Listbox.goml
index ee903bc3..50922585 100755
--- a/Templates/Listbox.goml
+++ b/Templates/Listbox.goml
@@ -2,7 +2,7 @@
 <!--<Border BorderWidth="1" Margin="1" MinimumSize="0;100" Height="{TemplatedHeight}" Width="{TemplatedWidth}" Background="Gray">

 	<VerticalStack Name="List" Margin="1" Height="{TemplatedHeight}" Width="{TemplatedWidth}"/>

 </Border>-->

-<Border BorderWidth="1" Margin="1" MinimumSize="100;100" Height="{TemplatedHeight}" Width="{TemplatedWidth}" >

+<Border BorderWidth="1" Margin="1" MinimumSize="20;20" Height="{TemplatedHeight}" Width="{TemplatedWidth}" >

 	<Scroller  Name="scroller1" Margin="1" VerticalScrolling="true"

 		Height="{TemplatedHeight}" Width="{TemplatedWidth}">

 		<VerticalStack Height="-1" Width="{TemplatedWidth}" Name="List" Margin="0" VerticalAlignment="Top"/>

diff --git a/Tests/GOLIBTest_Listbox.cs b/Tests/GOLIBTest_Listbox.cs
index 607b2f05..0189e3f6 100644
--- a/Tests/GOLIBTest_Listbox.cs
+++ b/Tests/GOLIBTest_Listbox.cs
@@ -76,7 +76,7 @@ namespace test
 		{

 			base.OnLoad (e);

 

-			TestList = Directory.GetFileSystemEntries("/mnt/data/MagicCardDataBase/", "*.txt",SearchOption.AllDirectories).ToList();

+			TestList = Directory.GetFileSystemEntries("/mnt/data/MagicCardDataBase/a/", "*.txt",SearchOption.AllDirectories).ToList();

 			LoadInterface("Interfaces/test_Listbox.goml");

 

 //			TestList [1].Field = "test string";

diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index a9014d3f..14c6c1a1 100644
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -25,38 +25,27 @@ namespace test
 		#endregion

 

 		public GOLIBTests ()

-			: base(800, 600,"test")

+			: base(600, 400,"test: press spacebar to toogle test files")

 		{}

 

 		int frameCpt = 0;

 		int idx = 0;

 		string[] testFiles = {

-			"testGroupBox.goml",

 			"testBorder.goml",

-			"testCheckbox.goml",

-			"testWindow.goml",

-			"test0.goml",

-			"test1.goml",

-			"test1.1.goml",

-			"test1.2.goml",

-			"testLabel.goml",

 			"testContainer.goml",

+			"testLabel.goml",

+			"testCheckbox.goml",

 			"testRadioButton.goml",

 			"testSpinner.goml",

 			"testPopper.goml",

 			"testExpandable.goml",

+			"testGroupBox.goml",

+			"test_stack.goml",

+			"testWindow.goml",

 			"testMsgBox.goml",

 			"testGrid.goml",

 			"fps.goml",

 			"testMeter.goml",

-			"test6.goml",

-			"testHStack.goml",

-			"test2.goml",

-			"test_stack.goml",

-			"testScrollbar.goml",

-			"test3.goml",

-			"test4.1.goml",

-			"test7.goml",

 		};

 

 		#region FPS

diff --git a/Tests/Interfaces/fps.goml b/Tests/Interfaces/fps.goml
index edc63e70..baa85b63 100755
--- a/Tests/Interfaces/fps.goml
+++ b/Tests/Interfaces/fps.goml
@@ -1,25 +1,22 @@
 <?xml version="1.0"?>

 <Container Name="MainGrp" Background="0,5;0,5;0,5;0,5"

-	HorizontalAlignment="Left" VerticalAlignment="Top"

 	Margin="10" Width="-1" Height="-1" Focusable="True" >

-

 		<VerticalStack Name="vsFps"  BorderWidth="1" Margin="5" Spacing="4" Fit="true">

 			<HorizontalStack Height="-1">

 				<Label Text="Update:" FontColor="White" />

 				<Label Name="labUpdate" Text="{update}" FontSize="12" Background="DarkGreen"/>

 			</HorizontalStack>

-			<HorizontalStack Height="-1" Name="hsFps" Background="Red" >

+			<HorizontalStack Height="-1" Name="hsFps" Background="Mantis" >

 				<Label Name="captionFps" Text="Fps:" />

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

 			</HorizontalStack>

-			<HorizontalStack Height="-1" Background="Red">

+			<HorizontalStack Height="-1" Background="UniversityOfCaliforniaGold">

 				<Label Text="Min:" Width = "30" />

 				<Label Text="{fpsMin}" Font="droid bold, 12" TextAlignment="Center" Background="AoEnglish"/>

 			</HorizontalStack>

-			<HorizontalStack Height="-1" Background="Red" >

+			<HorizontalStack Height="-1" Background="Sienna" >

 				<Label Text="Max:" Width = "30"/>

 				<Label Text="{fpsMax}" Font="droid bold, 12" TextAlignment="Center" Background="AoEnglish"/>

 			</HorizontalStack>

-

 		</VerticalStack>				

 </Container>
\ No newline at end of file
diff --git a/Tests/Interfaces/testBorder.goml b/Tests/Interfaces/testBorder.goml
index 8a6627b6..90863352 100755
--- a/Tests/Interfaces/testBorder.goml
+++ b/Tests/Interfaces/testBorder.goml
@@ -1,8 +1,4 @@
 <?xml version="1.0"?>

-<Container Fit="true" Margin="5" Background="Blue">

-<Group Fit="true" Margin="5" Background="Green">

-<Border Fit="true" Background="Red" Margin="10">

-	<Checkbox/>

+<Border BorderWidth="5" Width="200" Height="200" CornerRadius="20" Margin="0" Background="Mantis">

+	<GraphicObject CornerRadius="0" Background="CornflowerBlue" Height="100" Width="100"/>

 </Border>

-</Group>

-</Container>

diff --git a/Tests/Interfaces/testPopper.goml b/Tests/Interfaces/testPopper.goml
index 114f471a..4c6ba76b 100755
--- a/Tests/Interfaces/testPopper.goml
+++ b/Tests/Interfaces/testPopper.goml
@@ -2,7 +2,7 @@
 <Popper Title="TestPopper" Width="100" Background="DimGray">

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

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

-		<VerticalStack Fit="true" Background="Blue">

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

 			<Checkbox Name="chk1"/>

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

 			<Checkbox Name="chk3"/>

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 6e504bad..06eba842 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_TypeViewer</StartupObject>
+    <StartupObject>test.GOLIBTests</StartupObject>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <OutputPath>..\bin\$(configuration)</OutputPath>
     <IntermediateOutputPath>obj\$(configuration)</IntermediateOutputPath>