diff options
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/GraphicObjects/ColorCircleSelector.cs | 2 | ||||
| -rw-r--r-- | Tests/GraphicObjects/HexaContainer.cs | 2 | ||||
| -rw-r--r-- | Tests/GraphicObjects/SimpleGauge.cs | 2 | ||||
| -rw-r--r-- | Tests/GraphicObjects/TechBorder.cs | 3 | ||||
| -rw-r--r-- | Tests/HelloWorld.cs | 20 | ||||
| -rw-r--r-- | Tests/InterfaceControler.cs | 2 | ||||
| -rwxr-xr-x | Tests/Interfaces/GraphicObject/0.crow | 5 | ||||
| -rw-r--r-- | Tests/Tests.csproj | 34 |
8 files changed, 38 insertions, 32 deletions
diff --git a/Tests/GraphicObjects/ColorCircleSelector.cs b/Tests/GraphicObjects/ColorCircleSelector.cs index 7ab9a9bf..a6fe502d 100644 --- a/Tests/GraphicObjects/ColorCircleSelector.cs +++ b/Tests/GraphicObjects/ColorCircleSelector.cs @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using Cairo; +using vkvg; using Crow; namespace Test diff --git a/Tests/GraphicObjects/HexaContainer.cs b/Tests/GraphicObjects/HexaContainer.cs index 23964e9c..22eb1a81 100644 --- a/Tests/GraphicObjects/HexaContainer.cs +++ b/Tests/GraphicObjects/HexaContainer.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; using Crow; -using Cairo; +using vkvg; namespace Tutorials2 { diff --git a/Tests/GraphicObjects/SimpleGauge.cs b/Tests/GraphicObjects/SimpleGauge.cs index ce92abef..2ff9635c 100644 --- a/Tests/GraphicObjects/SimpleGauge.cs +++ b/Tests/GraphicObjects/SimpleGauge.cs @@ -26,7 +26,7 @@ using System; using Crow; using System.ComponentModel; -using Cairo; +using vkvg; namespace Tutorials { diff --git a/Tests/GraphicObjects/TechBorder.cs b/Tests/GraphicObjects/TechBorder.cs index 4f818e51..dd16c30c 100644 --- a/Tests/GraphicObjects/TechBorder.cs +++ b/Tests/GraphicObjects/TechBorder.cs @@ -25,6 +25,7 @@ // THE SOFTWARE. using System; using Crow; +using vkvg; namespace Tests { @@ -37,7 +38,7 @@ namespace Tests { return base.measureRawSize (lt) + 6; } - protected override void onDraw (Cairo.Context gr) + protected override void onDraw (Context gr) { gr.Save (); diff --git a/Tests/HelloWorld.cs b/Tests/HelloWorld.cs index 75cc9bd5..8149ac0e 100644 --- a/Tests/HelloWorld.cs +++ b/Tests/HelloWorld.cs @@ -26,28 +26,26 @@ using System; using Crow; -using Tutorials; +//using Tutorials; namespace Tests { - class HelloWorld : CrowWindow + class HelloWorld : CrowApplication { public HelloWorld () - : base(800, 600,"Crow Test with OpenTK") + : base(800, 600) { } - protected override void OnLoad (EventArgs e) - { - base.OnLoad (e); - LoadIMLFragment (@"<SimpleGauge Level='40' Margin='5' Background='Jet' Foreground='Gray' Width='30' Height='50%'/>"); - } - [STAThread] static void Main () { - HelloWorld win = new HelloWorld (); - win.Run (30); + using (HelloWorld win = new HelloWorld ()) { + + //win.Load (@"Interfaces/Divers/0.crow").DataSource = win; + win.Load (@"Interfaces/GraphicObject/0.crow"); + win.Run (); + } } } }
\ No newline at end of file diff --git a/Tests/InterfaceControler.cs b/Tests/InterfaceControler.cs index 034cab39..68bfc63b 100644 --- a/Tests/InterfaceControler.cs +++ b/Tests/InterfaceControler.cs @@ -133,7 +133,7 @@ namespace Crow public InterfaceControler(Rectangle ifaceBounds){ iRect = ifaceBounds; - CrowInterface = new Interface (); + //CrowInterface = new Interface (); CrowInterface.Init (); #if MEASURE_TIME diff --git a/Tests/Interfaces/GraphicObject/0.crow b/Tests/Interfaces/GraphicObject/0.crow index 7fdd607f..4856f1c3 100755 --- a/Tests/Interfaces/GraphicObject/0.crow +++ b/Tests/Interfaces/GraphicObject/0.crow @@ -1,3 +1,4 @@ <?xml version="1.0"?> -<GraphicObject Margin="10" Width="Stretched" Height="Stretched" Background="SeaGreen" - MinimumSize="50,50"/>
\ No newline at end of file +<Group Background="Red"> + <Label Background="SeaGreen"/> +</Group>
\ No newline at end of file diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index c86ff9cb..082f1aab 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -8,7 +8,7 @@ <OutputType>Exe</OutputType> <RootNamespace>Tests</RootNamespace> <AssemblyName>Tests</AssemblyName> - <StartupObject>Tests.BasicTests</StartupObject> + <StartupObject>Tests.HelloWorld</StartupObject> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ReleaseVersion>0.5</ReleaseVersion> @@ -75,6 +75,12 @@ <StartWorkingDirectory>%24{SolutionDir}\build\%24{ProjectConfigName}</StartWorkingDirectory> <ConsolePause>false</ConsolePause> </PropertyGroup> + <PropertyGroup Condition=" '$(RunConfiguration)' == 'Custom Command' "> + <StartAction>Program</StartAction> + <StartProgram>%24{TargetName}</StartProgram> + <StartWorkingDirectory>%24{SolutionDir}\build\%24{ProjectConfigName}</StartWorkingDirectory> + <ConsolePause>false</ConsolePause> + </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Data" /> @@ -86,24 +92,11 @@ </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> - <Compile Include="BasicTests.cs" /> <Compile Include="OpenGL\Shader.cs" /> <Compile Include="OpenGL\vaoMesh.cs" /> <Compile Include="OpenGL\Texture.cs" /> <Compile Include="HelloWorld.cs" /> - <Compile Include="CrowWindow.cs" /> - <Compile Include="Hello3D.cs" /> <Compile Include="OpenGL\Extensions.cs" /> - <Compile Include="InterfaceControler.cs" /> - <Compile Include="Showcase.cs" /> - <Compile Include="GraphicObjects\ColorCircleSelector.cs" /> - <Compile Include="GraphicObjects\SimpleGauge.cs" /> - <Compile Include="Tutorials\T1_HelloWorld.cs" /> - <Compile Include="Tutorials\T3_OpenGLCube.cs" /> - <Compile Include="Tutorials\T4_Gauge.cs" /> - <Compile Include="Tutorials\T2_IML.cs" /> - <Compile Include="GraphicObjects\HexaContainer.cs" /> - <Compile Include="GraphicObjects\TechBorder.cs" /> </ItemGroup> <ItemGroup> <None Include="image\u.svg"> @@ -382,6 +375,19 @@ <None Include="Interfaces\TemplatedContainer\testTabView2.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> + <None Include="InterfaceControler.cs" /> + <None Include="CrowWindow.cs" /> + <None Include="BasicTests.cs" /> + <None Include="Hello3D.cs" /> + <None Include="Showcase.cs" /> + <None Include="Tutorials\T1_HelloWorld.cs" /> + <None Include="Tutorials\T3_OpenGLCube.cs" /> + <None Include="Tutorials\T4_Gauge.cs" /> + <None Include="Tutorials\T2_IML.cs" /> + <None Include="GraphicObjects\ColorCircleSelector.cs" /> + <None Include="GraphicObjects\SimpleGauge.cs" /> + <None Include="GraphicObjects\HexaContainer.cs" /> + <None Include="GraphicObjects\TechBorder.cs" /> </ItemGroup> <ItemGroup> <Folder Include="Interfaces\" /> |