clean tests

diff --git a/GOLib.csproj b/GOLib.csproj
index dc6912a6b8262836280d850362fecb138af38884..e2e9dfa56560f972c86cd984987f78475aa832da 100644 (file)
--- a/GOLib.csproj
+++ b/GOLib.csproj
@@ -23,6 +23,7 @@
     <SchemaVersion>2.0</SchemaVersion>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ReleaseVersion>0.2</ReleaseVersion>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">\r
     <DebugSymbols>true</DebugSymbols>\r
@@ -40,6 +41,10 @@
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
     <DefineConstants>__linux__</DefineConstants>\r
+    <OutputPath>bin\Release</OutputPath>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <OutputPath>bin\Debug</OutputPath>\r
   </PropertyGroup>\r
   <!--  <PropertyGroup Condition=" '$(Platform)' == 'Linux_x86' ">\r
     <DefineConstants>__linux__</DefineConstants>\r

diff --git a/GOLib.sln b/GOLib.sln
index 4e5239b23f8969b044ea46b564bb9874e53001c7..05f7d96f7117828c30bcc930661e826b0ad5d826 100644 (file)
--- a/GOLib.sln
+++ b/GOLib.sln
@@ -13,37 +13,19 @@ Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Linux_x86 = Debug|Linux_x86\r
                Release|Linux_x86 = Release|Linux_x86\r
-               Documentation|Any CPU = Documentation|Any CPU\r
-               Nsis|Any CPU = Nsis|Any CPU\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
                {232716B4-D19D-4FD7-B310-94A98FD926F0}.Debug|Linux_x86.ActiveCfg = Debug|Any CPU\r
-               {232716B4-D19D-4FD7-B310-94A98FD926F0}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {232716B4-D19D-4FD7-B310-94A98FD926F0}.Documentation|Any CPU.Build.0 = Debug|Any CPU\r
-               {232716B4-D19D-4FD7-B310-94A98FD926F0}.Nsis|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {232716B4-D19D-4FD7-B310-94A98FD926F0}.Nsis|Any CPU.Build.0 = Debug|Any CPU\r
                {232716B4-D19D-4FD7-B310-94A98FD926F0}.Release|Linux_x86.ActiveCfg = Debug|Any CPU\r
                {74289092-9F70-4941-AFCB-DFD7BE2140B6}.Debug|Linux_x86.ActiveCfg = Debug|Any CPU\r
                {74289092-9F70-4941-AFCB-DFD7BE2140B6}.Debug|Linux_x86.Build.0 = Debug|Any CPU\r
-               {74289092-9F70-4941-AFCB-DFD7BE2140B6}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {74289092-9F70-4941-AFCB-DFD7BE2140B6}.Documentation|Any CPU.Build.0 = Debug|Any CPU\r
-               {74289092-9F70-4941-AFCB-DFD7BE2140B6}.Nsis|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {74289092-9F70-4941-AFCB-DFD7BE2140B6}.Nsis|Any CPU.Build.0 = Debug|Any CPU\r
                {74289092-9F70-4941-AFCB-DFD7BE2140B6}.Release|Linux_x86.ActiveCfg = Release|Any CPU\r
                {74289092-9F70-4941-AFCB-DFD7BE2140B6}.Release|Linux_x86.Build.0 = Release|Any CPU\r
                {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Debug|Linux_x86.ActiveCfg = Debug|Any CPU\r
                {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Debug|Linux_x86.Build.0 = Debug|Any CPU\r
-               {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Documentation|Any CPU.Build.0 = Debug|Any CPU\r
-               {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Nsis|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Nsis|Any CPU.Build.0 = Debug|Any CPU\r
                {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Linux_x86.ActiveCfg = Release|Any CPU\r
                {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Linux_x86.Build.0 = Release|Any CPU\r
                {E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Debug|Linux_x86.ActiveCfg = Debug|Any CPU\r
-               {E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Documentation|Any CPU.Build.0 = Debug|Any CPU\r
-               {E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Nsis|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Nsis|Any CPU.Build.0 = Debug|Any CPU\r
                {E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Release|Linux_x86.ActiveCfg = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(MonoDevelopProperties) = preSolution\r
@@ -51,5 +33,9 @@ Global
                $0.StandardHeader = $1\r
                $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/>.\r
                $1.IncludeInNewFiles = True\r
+               $0.DotNetNamingPolicy = $2\r
+               $2.DirectoryNamespaceAssociation = None\r
+               $2.ResourceNamePolicy = FileFormatDefault\r
+               version = 0.2\r
        EndGlobalSection\r
 EndGlobal\r

diff --git a/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj b/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj
index 845ec7d704dae328d20e3eb36c2b1c6242cabe1a..cde06bd157b74339015b623f437fd5448bc0d692 100644 (file)
--- 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 ee903bc384dd6cade30ac24b71276cc1e9161f38..5092258523a5a747368b3fd6b9594766dea6b8a1 100755 (executable)
--- 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">\r
        <VerticalStack Name="List" Margin="1" Height="{TemplatedHeight}" Width="{TemplatedWidth}"/>\r
 </Border>-->\r
-<Border BorderWidth="1" Margin="1" MinimumSize="100;100" Height="{TemplatedHeight}" Width="{TemplatedWidth}" >\r
+<Border BorderWidth="1" Margin="1" MinimumSize="20;20" Height="{TemplatedHeight}" Width="{TemplatedWidth}" >\r
        <Scroller  Name="scroller1" Margin="1" VerticalScrolling="true"\r
                Height="{TemplatedHeight}" Width="{TemplatedWidth}">\r
                <VerticalStack Height="-1" Width="{TemplatedWidth}" Name="List" Margin="0" VerticalAlignment="Top"/>\r

diff --git a/Tests/GOLIBTest_Listbox.cs b/Tests/GOLIBTest_Listbox.cs
index 607b2f0593452439ab397a8b5413aabbc630f0a6..0189e3f6b9f8f5c908476e06edfd840d6f0ae56e 100644 (file)
--- a/Tests/GOLIBTest_Listbox.cs
+++ b/Tests/GOLIBTest_Listbox.cs
@@ -76,7 +76,7 @@ namespace test
                {\r
                        base.OnLoad (e);\r
 \r
-                       TestList = Directory.GetFileSystemEntries("/mnt/data/MagicCardDataBase/", "*.txt",SearchOption.AllDirectories).ToList();\r
+                       TestList = Directory.GetFileSystemEntries("/mnt/data/MagicCardDataBase/a/", "*.txt",SearchOption.AllDirectories).ToList();\r
                        LoadInterface("Interfaces/test_Listbox.goml");\r
 \r
 //                     TestList [1].Field = "test string";\r

diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index a9014d3f4dd565795341a2e3b2038f071b4497f3..14c6c1a159968ba860a58dec23963d086f184862 100644 (file)
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -25,38 +25,27 @@ namespace test
                #endregion\r
 \r
                public GOLIBTests ()\r
-                       : base(800, 600,"test")\r
+                       : base(600, 400,"test: press spacebar to toogle test files")\r
                {}\r
 \r
                int frameCpt = 0;\r
                int idx = 0;\r
                string[] testFiles = {\r
-                       "testGroupBox.goml",\r
                        "testBorder.goml",\r
-                       "testCheckbox.goml",\r
-                       "testWindow.goml",\r
-                       "test0.goml",\r
-                       "test1.goml",\r
-                       "test1.1.goml",\r
-                       "test1.2.goml",\r
-                       "testLabel.goml",\r
                        "testContainer.goml",\r
+                       "testLabel.goml",\r
+                       "testCheckbox.goml",\r
                        "testRadioButton.goml",\r
                        "testSpinner.goml",\r
                        "testPopper.goml",\r
                        "testExpandable.goml",\r
+                       "testGroupBox.goml",\r
+                       "test_stack.goml",\r
+                       "testWindow.goml",\r
                        "testMsgBox.goml",\r
                        "testGrid.goml",\r
                        "fps.goml",\r
                        "testMeter.goml",\r
-                       "test6.goml",\r
-                       "testHStack.goml",\r
-                       "test2.goml",\r
-                       "test_stack.goml",\r
-                       "testScrollbar.goml",\r
-                       "test3.goml",\r
-                       "test4.1.goml",\r
-                       "test7.goml",\r
                };\r
 \r
                #region FPS\r

diff --git a/Tests/Interfaces/fps.goml b/Tests/Interfaces/fps.goml
index edc63e70b48c2dd082f78d75b73fb210f299902b..baa85b6377b2b9e1a2de1f8a8694130718eed39d 100755 (executable)
--- a/Tests/Interfaces/fps.goml
+++ b/Tests/Interfaces/fps.goml
@@ -1,25 +1,22 @@
 <?xml version="1.0"?>\r
 <Container Name="MainGrp" Background="0,5;0,5;0,5;0,5"\r
-       HorizontalAlignment="Left" VerticalAlignment="Top"\r
        Margin="10" Width="-1" Height="-1" Focusable="True" >\r
-\r
                <VerticalStack Name="vsFps"  BorderWidth="1" Margin="5" Spacing="4" Fit="true">\r
                        <HorizontalStack Height="-1">\r
                                <Label Text="Update:" FontColor="White" />\r
                                <Label Name="labUpdate" Text="{update}" FontSize="12" Background="DarkGreen"/>\r
                        </HorizontalStack>\r
-                       <HorizontalStack Height="-1" Name="hsFps" Background="Red" >\r
+                       <HorizontalStack Height="-1" Name="hsFps" Background="Mantis" >\r
                                <Label Name="captionFps" Text="Fps:" />\r
                                <Label Name="valueFps" Text="{fps}" Font="droid bold, 12" TextAlignment="Center" Background="AoEnglish"/>\r
                        </HorizontalStack>\r
-                       <HorizontalStack Height="-1" Background="Red">\r
+                       <HorizontalStack Height="-1" Background="UniversityOfCaliforniaGold">\r
                                <Label Text="Min:" Width = "30" />\r
                                <Label Text="{fpsMin}" Font="droid bold, 12" TextAlignment="Center" Background="AoEnglish"/>\r
                        </HorizontalStack>\r
-                       <HorizontalStack Height="-1" Background="Red" >\r
+                       <HorizontalStack Height="-1" Background="Sienna" >\r
                                <Label Text="Max:" Width = "30"/>\r
                                <Label Text="{fpsMax}" Font="droid bold, 12" TextAlignment="Center" Background="AoEnglish"/>\r
                        </HorizontalStack>\r
-\r
                </VerticalStack>                                \r
 </Container>
\ No newline at end of file

diff --git a/Tests/Interfaces/testBorder.goml b/Tests/Interfaces/testBorder.goml
index 8a6627b614bde258106bca4bd3cafc2d12f6f13b..90863352df7243d065f4f40a5e563dec3f476cf6 100755 (executable)
--- a/Tests/Interfaces/testBorder.goml
+++ b/Tests/Interfaces/testBorder.goml
@@ -1,8 +1,4 @@
 <?xml version="1.0"?>\r
-<Container Fit="true" Margin="5" Background="Blue">\r
-<Group Fit="true" Margin="5" Background="Green">\r
-<Border Fit="true" Background="Red" Margin="10">\r
-       <Checkbox/>\r
+<Border BorderWidth="5" Width="200" Height="200" CornerRadius="20" Margin="0" Background="Mantis">\r
+       <GraphicObject CornerRadius="0" Background="CornflowerBlue" Height="100" Width="100"/>\r
 </Border>\r
-</Group>\r
-</Container>\r

diff --git a/Tests/Interfaces/testPopper.goml b/Tests/Interfaces/testPopper.goml
index 114f471a32b5cf3585c2c7c195b262ff60201469..4c6ba76bf5488e0bbc2c712ab955b405d6651613 100755 (executable)
--- a/Tests/Interfaces/testPopper.goml
+++ b/Tests/Interfaces/testPopper.goml
@@ -2,7 +2,7 @@
 <Popper Title="TestPopper" Width="100" Background="DimGray">\r
        <Border Fit="True" Background="ArmyGreen">\r
 <!--           <Image Fit="true" Path="#go.Images.Icons.tetra.png" Margin="10"/>-->\r
-               <VerticalStack Fit="true" Background="Blue">\r
+               <VerticalStack Fit="true" Margin="10" Background="CornflowerBlue">\r
                        <Checkbox Name="chk1"/>\r
                        <Checkbox Name="chk2" IsChecked="true"/>\r
                        <Checkbox Name="chk3"/>\r

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 6e504bad637e6d1ce830d7bb21076b7ed4002378..06eba8421a5e63ca87610d167f8cde443e7578a2 100644 (file)
--- 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>