From b56c22ad826a49b7ea0013c1ca78cf64169fc326 Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Tue, 2 Jun 2015 10:44:23 +0200 Subject: [PATCH] TemplatedControls, Picture objects for pixmap and svg raw data sharing among controls --- GOLib.csproj | 52 +- Images/Icons/butAqua.svg | 304 + Images/Icons/buttest.svg | 140 + Images/Icons/buttest2.svg | 140 + Images/Icons/buttest4.svg | 172 + Images/Icons/button.svg | 151 + Images/Icons/buttonB.svg | 125 + Images/Icons/checkbox.svg | 82 + Images/Icons/radiobutton.svg | 77 + Templates/Checkbox.goml | 5 + Templates/ItemTemplate.goml | 2 + Templates/Listbox.goml | 3 + Templates/RadioButton.goml | 5 + Templates/Slider.goml | 1 + Templates/Spinner (copier).goml | 14 + Templates/Spinner.goml | 14 + Tests/GOLIBTest_0.cs | 22 +- Tests/GOLIBTest_4.cs | 31 +- Tests/Interfaces/Checkbox.goml | 18 + Tests/Interfaces/test0.goml | 23 +- Tests/Interfaces/test1.2.goml | 2 +- Tests/Interfaces/test4.1.goml | 24 +- Tests/Interfaces/test4.goml | 53 +- Tests/Tests.csproj | 10 +- dependencies/OpenTK.Compatibility.dll | Bin 3215872 -> 0 bytes dependencies/OpenTK.Compatibility.dll.config | 11 - dependencies/OpenTK.Compatibility.dll.mdb | Bin 785399 -> 0 bytes dependencies/OpenTK.GLControl.dll | Bin 35328 -> 0 bytes dependencies/OpenTK.GLControl.xml | 189 - dependencies/OpenTK.dll | Bin 4036096 -> 0 bytes dependencies/OpenTK.dll.config | 25 - dependencies/OpenTK.dll.mdb | Bin 289903 -> 0 bytes dependencies/OpenTK.xml | 442052 ---------------- src/BmpPicture.cs | 105 + src/GraphicObjects/AnalogMeter.cs | 9 + src/GraphicObjects/Button.cs | 23 +- src/GraphicObjects/Checkbox.cs | 266 +- src/GraphicObjects/GenericStack.cs | 10 +- src/GraphicObjects/GraphicObject.cs | 28 +- src/GraphicObjects/Image.cs | 131 +- src/GraphicObjects/Label.cs | 2 +- src/GraphicObjects/ListBox.cs | 31 +- src/GraphicObjects/NumericControl.cs | 2 +- src/GraphicObjects/RadioButton.cs | 73 + src/GraphicObjects/Scroller.cs | 17 +- src/GraphicObjects/Slider.cs | 23 +- src/GraphicObjects/Spinner.cs | 46 +- src/GraphicObjects/TemplatedControl.cs | 57 + src/Interface.cs | 77 +- src/Picture.cs | 102 + src/SvgPicture.cs | 89 + 51 files changed, 2091 insertions(+), 442747 deletions(-) create mode 100755 Images/Icons/butAqua.svg create mode 100644 Images/Icons/buttest.svg create mode 100644 Images/Icons/buttest2.svg create mode 100644 Images/Icons/buttest4.svg create mode 100644 Images/Icons/button.svg create mode 100755 Images/Icons/buttonB.svg create mode 100644 Images/Icons/checkbox.svg create mode 100644 Images/Icons/radiobutton.svg create mode 100755 Templates/Checkbox.goml create mode 100755 Templates/ItemTemplate.goml create mode 100755 Templates/Listbox.goml create mode 100755 Templates/RadioButton.goml create mode 100755 Templates/Slider.goml create mode 100755 Templates/Spinner (copier).goml create mode 100755 Templates/Spinner.goml create mode 100755 Tests/Interfaces/Checkbox.goml delete mode 100755 dependencies/OpenTK.Compatibility.dll delete mode 100644 dependencies/OpenTK.Compatibility.dll.config delete mode 100644 dependencies/OpenTK.Compatibility.dll.mdb delete mode 100755 dependencies/OpenTK.GLControl.dll delete mode 100644 dependencies/OpenTK.GLControl.xml delete mode 100755 dependencies/OpenTK.dll delete mode 100644 dependencies/OpenTK.dll.config delete mode 100644 dependencies/OpenTK.dll.mdb delete mode 100644 dependencies/OpenTK.xml create mode 100644 src/BmpPicture.cs create mode 100644 src/GraphicObjects/RadioButton.cs create mode 100644 src/GraphicObjects/TemplatedControl.cs create mode 100644 src/Picture.cs create mode 100644 src/SvgPicture.cs diff --git a/GOLib.csproj b/GOLib.csproj index b8b0fb24..a89eeb50 100644 --- a/GOLib.csproj +++ b/GOLib.csproj @@ -182,10 +182,6 @@ - - - - @@ -250,6 +246,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -265,6 +285,9 @@ + + OpenTK\Binaries\OpenTK\Release\OpenTK.dll + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/Images/Icons/buttest2.svg b/Images/Icons/buttest2.svg new file mode 100644 index 00000000..0323295d --- /dev/null +++ b/Images/Icons/buttest2.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/Images/Icons/buttest4.svg b/Images/Icons/buttest4.svg new file mode 100644 index 00000000..00880ad0 --- /dev/null +++ b/Images/Icons/buttest4.svg @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/Images/Icons/button.svg b/Images/Icons/button.svg new file mode 100644 index 00000000..7c8a9945 --- /dev/null +++ b/Images/Icons/button.svg @@ -0,0 +1,151 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Images/Icons/buttonB.svg b/Images/Icons/buttonB.svg new file mode 100755 index 00000000..56bc8d9c --- /dev/null +++ b/Images/Icons/buttonB.svg @@ -0,0 +1,125 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Images/Icons/checkbox.svg b/Images/Icons/checkbox.svg new file mode 100644 index 00000000..0aa8706c --- /dev/null +++ b/Images/Icons/checkbox.svg @@ -0,0 +1,82 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/Images/Icons/radiobutton.svg b/Images/Icons/radiobutton.svg new file mode 100644 index 00000000..d0f81c5d --- /dev/null +++ b/Images/Icons/radiobutton.svg @@ -0,0 +1,77 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/Templates/Checkbox.goml b/Templates/Checkbox.goml new file mode 100755 index 00000000..f9aca19d --- /dev/null +++ b/Templates/Checkbox.goml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/Templates/ItemTemplate.goml b/Templates/ItemTemplate.goml new file mode 100755 index 00000000..e4370966 --- /dev/null +++ b/Templates/ItemTemplate.goml @@ -0,0 +1,2 @@ + +