From f1376592efe86a9d2a98553633978a5f5834d7a3 Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Wed, 27 Jan 2016 18:49:01 +0100 Subject: [PATCH] Rename GOLib to Crow --- GOLib.csproj => Crow.csproj | 26 ++--- GOLib.sln => Crow.sln | 2 +- Crow.userprefs | 48 ++++++++ MonoDevelop.GOLib/MonoDevelop.GOLib.csproj | 4 +- MonoDevelop.GOLib/src/GOLibGtkHost.cs | 8 +- MonoDevelop.GOLib/src/GOLibView.cs | 2 +- Tests/GOLIBTest_0.cs | 2 +- Tests/GOLIBTest_4.cs | 2 +- Tests/GOLIBTest_5.cs | 2 +- Tests/GOLIBTest_DirViewer.cs | 2 +- Tests/GOLIBTest_Listbox.cs | 2 +- Tests/GOLIBTest_TypeViewer.cs | 2 +- Tests/GOLIBTests.cs | 2 +- Tests/Interfaces/testBorder.goml.cs | 8 +- Tests/Tests.csproj | 4 +- src/BmpPicture.cs | 2 +- src/Cairo/CairoHelpers.cs | 2 +- src/Colors.cs | 2 +- src/CompilerServices/CompilerServices.cs | 2 +- src/DynAttribute.cs | 2 +- src/Enums.cs | 2 +- src/ExtensionsMethods.cs | 2 +- src/Font.cs | 2 +- src/GraphicObjects/AnalogMeter.cs | 4 +- src/GraphicObjects/Border.cs | 2 +- src/GraphicObjects/Button.cs | 4 +- src/GraphicObjects/Checkbox.cs | 6 +- src/GraphicObjects/Combobox.cs | 10 +- src/GraphicObjects/Container.cs | 4 +- src/GraphicObjects/Expandable.cs | 6 +- src/GraphicObjects/FileDialog.cs | 4 +- src/GraphicObjects/GenericStack.cs | 6 +- src/GraphicObjects/GraduatedSlider.cs | 2 +- src/GraphicObjects/GraphicObject.cs | 2 +- src/GraphicObjects/Grid.cs | 2 +- src/GraphicObjects/Group.cs | 4 +- src/GraphicObjects/Groupbox.cs | 4 +- src/GraphicObjects/HorizontalStack.cs | 4 +- src/GraphicObjects/IGOLibHost.cs | 2 +- src/GraphicObjects/ILayoutable.cs | 2 +- src/GraphicObjects/IValueChange.cs | 2 +- src/GraphicObjects/Image.cs | 4 +- src/GraphicObjects/Label.cs | 2 +- src/GraphicObjects/ListBox.cs | 124 ++++++++++----------- src/GraphicObjects/MessageBox.cs | 4 +- src/GraphicObjects/NumericControl.cs | 2 +- src/GraphicObjects/Popper.cs | 6 +- src/GraphicObjects/PrivateContainer.cs | 2 +- src/GraphicObjects/ProgressBar.cs | 2 +- src/GraphicObjects/RadioButton.cs | 6 +- src/GraphicObjects/Scrollbar.cs | 4 +- src/GraphicObjects/Scroller.cs | 2 +- src/GraphicObjects/Slider.cs | 2 +- src/GraphicObjects/Spinner.cs | 4 +- src/GraphicObjects/TemplatedContainer.cs | 4 +- src/GraphicObjects/TemplatedControl.cs | 6 +- src/GraphicObjects/TextBox.cs | 2 +- src/GraphicObjects/TextRun.cs | 2 +- src/GraphicObjects/VerticalStack.cs | 4 +- src/GraphicObjects/Window.cs | 6 +- src/Interface.cs | 4 +- src/LayoutChangeEventArgs.cs | 2 +- src/LayoutingQueue.cs | 2 +- src/LayoutingQueueItem.cs | 2 +- src/OpenGL/QuadVAO.cs | 2 +- src/OpenGL/Shader.cs | 2 +- src/OpenGL/TexturedShader.cs | 2 +- src/OpenGL/VertexArrayObject.cs | 2 +- src/OpenTKGameWindow.cs | 24 ++-- src/Picture.cs | 2 +- src/Point.cs | 2 +- src/Rectangle.cs | 2 +- src/Rectangles.cs | 2 +- src/ReflexionExtensions.cs | 2 +- src/SelectionChangeEventArgs.cs | 2 +- src/Size.cs | 2 +- src/SvgPicture.cs | 2 +- src/TextChangeEventArgs.cs | 2 +- src/ValueChangeEventArgs.cs | 2 +- src/XCursor.cs | 2 +- src/win32/Win32.cs | 2 +- 81 files changed, 252 insertions(+), 204 deletions(-) rename GOLib.csproj => Crow.csproj (95%) rename GOLib.sln => Crow.sln (94%) create mode 100644 Crow.userprefs mode change 100755 => 100644 src/Cairo/CairoHelpers.cs mode change 100755 => 100644 src/Colors.cs mode change 100755 => 100644 src/DynAttribute.cs mode change 100755 => 100644 src/Enums.cs mode change 100755 => 100644 src/GraphicObjects/GraduatedSlider.cs mode change 100755 => 100644 src/GraphicObjects/HorizontalStack.cs mode change 100755 => 100644 src/GraphicObjects/Image.cs mode change 100755 => 100644 src/GraphicObjects/Label.cs mode change 100755 => 100644 src/GraphicObjects/TextRun.cs mode change 100755 => 100644 src/GraphicObjects/VerticalStack.cs mode change 100755 => 100644 src/OpenTKGameWindow.cs mode change 100755 => 100644 src/Point.cs mode change 100755 => 100644 src/Rectangle.cs mode change 100755 => 100644 src/Size.cs mode change 100755 => 100644 src/win32/Win32.cs diff --git a/GOLib.csproj b/Crow.csproj similarity index 95% rename from GOLib.csproj rename to Crow.csproj index 4c22d811..10a3514c 100644 --- a/GOLib.csproj +++ b/Crow.csproj @@ -6,8 +6,8 @@ {C2980F9B-4798-4C05-99E2-E174810F7C7B} Library Properties - go - golib + Crow + Crow 512 True False @@ -191,15 +191,7 @@ - - - - - - - - @@ -210,11 +202,19 @@ + + + + + + + + + + + - - - diff --git a/GOLib.sln b/Crow.sln similarity index 94% rename from GOLib.sln rename to Crow.sln index 03d54156..c396e5dc 100644 --- a/GOLib.sln +++ b/Crow.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GOLib", "GOLib.csproj", "{C2980F9B-4798-4C05-99E2-E174810F7C7B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crow", "Crow.csproj", "{C2980F9B-4798-4C05-99E2-E174810F7C7B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{74289092-9F70-4941-AFCB-DFD7BE2140B6}" EndProject diff --git a/Crow.userprefs b/Crow.userprefs new file mode 100644 index 00000000..21fdf1d4 --- /dev/null +++ b/Crow.userprefs @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj b/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj index b2099b5a..fdf16c93 100644 --- a/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj +++ b/MonoDevelop.GOLib/MonoDevelop.GOLib.csproj @@ -103,9 +103,9 @@ - + {C2980F9B-4798-4C05-99E2-E174810F7C7B} - GOLib + Crow \ No newline at end of file diff --git a/MonoDevelop.GOLib/src/GOLibGtkHost.cs b/MonoDevelop.GOLib/src/GOLibGtkHost.cs index d041bba7..ea45e679 100644 --- a/MonoDevelop.GOLib/src/GOLibGtkHost.cs +++ b/MonoDevelop.GOLib/src/GOLibGtkHost.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using go; +using Crow; using MonoDevelop.Core; using MonoDevelop.Ide; using MonoDevelop.Projects; @@ -84,7 +84,7 @@ namespace MonoDevelop.GOLib cr.Rectangle (_hoverWidget.ScreenCoordinates(_hoverWidget.getSlot ())); cr.LineWidth = 1; cr.SetDash (dashed, 0); - cr.Color = go.Color.Yellow; + cr.Color = Crow.Color.Yellow; cr.Stroke (); } ((IDisposable) cr.Target).Dispose(); @@ -259,7 +259,7 @@ namespace MonoDevelop.GOLib GraphicObjects.CopyTo (invGOList,0); invGOList = invGOList.Reverse ().ToArray (); - go.Size newSize = this.ClientRectangle.Size; + Crow.Size newSize = this.ClientRectangle.Size; if (lastSize != newSize) { foreach (GraphicObject g in GraphicObjects) g.RegisterForLayouting ((int)LayoutingType.All); @@ -522,7 +522,7 @@ namespace MonoDevelop.GOLib Size lastSize; public Rectangle ClientRectangle { get { - go.Size newSize = new go.Size (Allocation.Width, Allocation.Height); + Crow.Size newSize = new Crow.Size (Allocation.Width, Allocation.Height); return newSize; } } diff --git a/MonoDevelop.GOLib/src/GOLibView.cs b/MonoDevelop.GOLib/src/GOLibView.cs index a7cc3713..52dbf2cb 100644 --- a/MonoDevelop.GOLib/src/GOLibView.cs +++ b/MonoDevelop.GOLib/src/GOLibView.cs @@ -53,7 +53,7 @@ using MonoDevelop.Ide.Fonts; using Mono.Addins; using MonoDevelop.Core; using MonoDevelop.Ide; -using go; +using Crow; using MonoDevelop.DesignerSupport; using MonoDevelop.SourceEditor; diff --git a/Tests/GOLIBTest_0.cs b/Tests/GOLIBTest_0.cs index a41cdb41..e6cf60b2 100644 --- a/Tests/GOLIBTest_0.cs +++ b/Tests/GOLIBTest_0.cs @@ -10,7 +10,7 @@ using OpenTK.Input; using System.Diagnostics; //using GGL; -using go; +using Crow; using System.Threading; diff --git a/Tests/GOLIBTest_4.cs b/Tests/GOLIBTest_4.cs index 62b9d257..df6b44f2 100644 --- a/Tests/GOLIBTest_4.cs +++ b/Tests/GOLIBTest_4.cs @@ -10,7 +10,7 @@ using OpenTK.Input; using System.Diagnostics; -using go; +using Crow; using System.Threading; using System.Collections.Generic; using System.IO; diff --git a/Tests/GOLIBTest_5.cs b/Tests/GOLIBTest_5.cs index d5a8a343..d2a06195 100644 --- a/Tests/GOLIBTest_5.cs +++ b/Tests/GOLIBTest_5.cs @@ -7,7 +7,7 @@ using OpenTK.Input; using System.Diagnostics; //using GGL; -using go; +using Crow; using System.Threading; using System.Collections.Generic; diff --git a/Tests/GOLIBTest_DirViewer.cs b/Tests/GOLIBTest_DirViewer.cs index 04ef3871..a293f992 100644 --- a/Tests/GOLIBTest_DirViewer.cs +++ b/Tests/GOLIBTest_DirViewer.cs @@ -10,7 +10,7 @@ using OpenTK.Input; using System.Diagnostics; //using GGL; -using go; +using Crow; using System.Threading; using System.Reflection; using System.Linq; diff --git a/Tests/GOLIBTest_Listbox.cs b/Tests/GOLIBTest_Listbox.cs index cedf695a..a0f097b4 100644 --- a/Tests/GOLIBTest_Listbox.cs +++ b/Tests/GOLIBTest_Listbox.cs @@ -10,7 +10,7 @@ using OpenTK.Input; using System.Diagnostics; //using GGL; -using go; +using Crow; using System.Threading; using System.Collections.Generic; using System.IO; diff --git a/Tests/GOLIBTest_TypeViewer.cs b/Tests/GOLIBTest_TypeViewer.cs index b0e4df42..b6635622 100644 --- a/Tests/GOLIBTest_TypeViewer.cs +++ b/Tests/GOLIBTest_TypeViewer.cs @@ -10,7 +10,7 @@ using OpenTK.Input; using System.Diagnostics; //using GGL; -using go; +using Crow; using System.Threading; using System.Reflection; using System.Linq; diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs index 36bec18d..6598517f 100644 --- a/Tests/GOLIBTests.cs +++ b/Tests/GOLIBTests.cs @@ -10,7 +10,7 @@ using OpenTK.Input; using System.Diagnostics; //using GGL; -using go; +using Crow; using System.Threading; using System.Collections.Generic; diff --git a/Tests/Interfaces/testBorder.goml.cs b/Tests/Interfaces/testBorder.goml.cs index f473a4fd..8c7663a4 100644 --- a/Tests/Interfaces/testBorder.goml.cs +++ b/Tests/Interfaces/testBorder.goml.cs @@ -11,7 +11,7 @@ using System; -namespace go { +namespace Crow { public partial class testBorder : Border { public testBorder() { @@ -20,10 +20,10 @@ namespace go { this.Height = 200; this.CornerRadius = 20; this.Margin = 0; - this.Background = go.Color.Mantis; - this.SetChild(new go.GraphicObject()); + this.Background = Crow.Color.Mantis; + this.SetChild(new Crow.GraphicObject()); this.Child.CornerRadius = 0; - this.Child.Background = go.Color.CornflowerBlue; + this.Child.Background = Crow.Color.CornflowerBlue; this.Child.Height = 100; this.Child.Width = 100; } diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 4b4b8d34..90d1a498 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -201,9 +201,9 @@ - + {C2980F9B-4798-4C05-99E2-E174810F7C7B} - GOLib + Crow diff --git a/src/BmpPicture.cs b/src/BmpPicture.cs index 0fd92da0..65901694 100644 --- a/src/BmpPicture.cs +++ b/src/BmpPicture.cs @@ -22,7 +22,7 @@ using System; using System.IO; using Cairo; -namespace go +namespace Crow { public class BmpPicture : Picture { diff --git a/src/Cairo/CairoHelpers.cs b/src/Cairo/CairoHelpers.cs old mode 100755 new mode 100644 index 00303e79..307eaccb --- a/src/Cairo/CairoHelpers.cs +++ b/src/Cairo/CairoHelpers.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace go +namespace Crow { public static class CairoHelpers { diff --git a/src/Colors.cs b/src/Colors.cs old mode 100755 new mode 100644 index 82f1dfb0..de41514a --- a/src/Colors.cs +++ b/src/Colors.cs @@ -8,7 +8,7 @@ using System.Diagnostics; -namespace go +namespace Crow { public struct Color : IXmlSerializable { diff --git a/src/CompilerServices/CompilerServices.cs b/src/CompilerServices/CompilerServices.cs index e7395383..20856794 100644 --- a/src/CompilerServices/CompilerServices.cs +++ b/src/CompilerServices/CompilerServices.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; -namespace go +namespace Crow { public class MemberReference { diff --git a/src/DynAttribute.cs b/src/DynAttribute.cs old mode 100755 new mode 100644 index db2be2b0..f978a6b4 --- a/src/DynAttribute.cs +++ b/src/DynAttribute.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace go +namespace Crow { public class DynAttribute { diff --git a/src/Enums.cs b/src/Enums.cs old mode 100755 new mode 100644 index 34e368d7..6d234fb0 --- a/src/Enums.cs +++ b/src/Enums.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace go +namespace Crow { public enum Orientation { diff --git a/src/ExtensionsMethods.cs b/src/ExtensionsMethods.cs index 71be8baa..af756a78 100644 --- a/src/ExtensionsMethods.cs +++ b/src/ExtensionsMethods.cs @@ -20,7 +20,7 @@ // along with this program. If not, see . using System; -namespace go +namespace Crow { public static class ExtensionsMethods { diff --git a/src/Font.cs b/src/Font.cs index 9b4285a4..bb5ef5c7 100644 --- a/src/Font.cs +++ b/src/Font.cs @@ -1,7 +1,7 @@ using System; using Cairo; -namespace go +namespace Crow { public enum FontStyle { diff --git a/src/GraphicObjects/AnalogMeter.cs b/src/GraphicObjects/AnalogMeter.cs index 1be24c4f..39e012dd 100644 --- a/src/GraphicObjects/AnalogMeter.cs +++ b/src/GraphicObjects/AnalogMeter.cs @@ -3,9 +3,9 @@ using System.Xml.Serialization; using System.ComponentModel; using Cairo; -namespace go +namespace Crow { - [DefaultTemplate("#go.Templates.AnalogMeter0.goml")] + [DefaultTemplate("#Crow.Templates.AnalogMeter0.goml")] public class AnalogMeter : NumericControl { #region CTOR diff --git a/src/GraphicObjects/Border.cs b/src/GraphicObjects/Border.cs index 84adfc0a..f412268c 100644 --- a/src/GraphicObjects/Border.cs +++ b/src/GraphicObjects/Border.cs @@ -3,7 +3,7 @@ using System.Xml.Serialization; using System.ComponentModel; using System.Diagnostics; -namespace go +namespace Crow { public class Border : Container { diff --git a/src/GraphicObjects/Button.cs b/src/GraphicObjects/Button.cs index 8a4bbed7..c598c3e3 100644 --- a/src/GraphicObjects/Button.cs +++ b/src/GraphicObjects/Button.cs @@ -11,7 +11,7 @@ using Cairo; using OpenTK.Input; using System.ComponentModel; -namespace go +namespace Crow { public class Button : Container, IXmlSerializable { @@ -47,7 +47,7 @@ namespace go get { return base.Focusable; } set { base.Focusable = value; } } - [XmlAttributeAttribute()][DefaultValue("#go.Images.button.svg")] + [XmlAttributeAttribute()][DefaultValue("#Crow.Images.button.svg")] public override Picture BackgroundImage { get { return base.BackgroundImage; diff --git a/src/GraphicObjects/Checkbox.cs b/src/GraphicObjects/Checkbox.cs index ede5d520..36181602 100644 --- a/src/GraphicObjects/Checkbox.cs +++ b/src/GraphicObjects/Checkbox.cs @@ -14,9 +14,9 @@ using System.Xml.Serialization; using OpenTK.Input; using System.ComponentModel; -namespace go +namespace Crow { - [DefaultTemplate("#go.Templates.Checkbox.goml")] + [DefaultTemplate("#Crow.Templates.Checkbox.goml")] public class Checkbox : TemplatedControl { string caption; @@ -56,7 +56,7 @@ namespace go NotifyValueChanged ("Caption", caption); } } - [XmlAttributeAttribute()][DefaultValue("#go.Images.Icons.checkbox.svg")] + [XmlAttributeAttribute()][DefaultValue("#Crow.Images.Icons.checkbox.svg")] public string Image { get { return image; } set { diff --git a/src/GraphicObjects/Combobox.cs b/src/GraphicObjects/Combobox.cs index bed9f131..473c10ff 100644 --- a/src/GraphicObjects/Combobox.cs +++ b/src/GraphicObjects/Combobox.cs @@ -18,10 +18,10 @@ using System.IO; using System.Collections; using System.Threading; -namespace go +namespace Crow { - [DefaultTemplate("#go.Templates.Combobox.goml")] - [DefaultOverlayTemplate("#go.Templates.ComboboxOverlay.goml")] + [DefaultTemplate("#Crow.Templates.Combobox.goml")] + [DefaultOverlayTemplate("#Crow.Templates.ComboboxOverlay.goml")] public class Combobox : TemplatedContainer { #region CTOR @@ -69,7 +69,7 @@ namespace go _list = Overlay.FindByName ("List") as Group; } - [XmlAttributeAttribute][DefaultValue("#go.Templates.ItemTemplate.goml")] + [XmlAttributeAttribute][DefaultValue("#Crow.Templates.ItemTemplate.goml")] public string ItemTemplate { get { return _itemTemplate; } set { @@ -77,7 +77,7 @@ namespace go _itemTemplate = value; } } - [XmlAttributeAttribute][DefaultValue("#go.Templates.ComboboxOverlay.goml")] + [XmlAttributeAttribute][DefaultValue("#Crow.Templates.ComboboxOverlay.goml")] public string OverlayTemplate { get { return _overlayTemplate; } set { diff --git a/src/GraphicObjects/Container.cs b/src/GraphicObjects/Container.cs index 0283017b..144eb764 100644 --- a/src/GraphicObjects/Container.cs +++ b/src/GraphicObjects/Container.cs @@ -5,7 +5,7 @@ using OpenTK.Input; using System.ComponentModel; using System.Linq; -namespace go +namespace Crow { public class Container : PrivateContainer, IXmlSerializable { @@ -50,7 +50,7 @@ namespace go if (!subTree.IsStartElement()) return; - Type t = Type.GetType("go." + subTree.Name); + Type t = Type.GetType("Crow." + subTree.Name); GraphicObject go = (GraphicObject)Activator.CreateInstance(t); (go as IXmlSerializable).ReadXml(subTree); diff --git a/src/GraphicObjects/Expandable.cs b/src/GraphicObjects/Expandable.cs index d4dd315f..172406c2 100644 --- a/src/GraphicObjects/Expandable.cs +++ b/src/GraphicObjects/Expandable.cs @@ -16,9 +16,9 @@ using System.ComponentModel; using System.Xml; using System.IO; -namespace go +namespace Crow { - [DefaultTemplate("#go.Templates.Expandable.goml")] + [DefaultTemplate("#Crow.Templates.Expandable.goml")] public class Expandable : TemplatedContainer { bool _isExpanded; @@ -71,7 +71,7 @@ namespace go NotifyValueChanged ("Title", title); } } - [XmlAttributeAttribute()][DefaultValue("#go.Images.Icons.expandable.svg")] + [XmlAttributeAttribute()][DefaultValue("#Crow.Images.Icons.expandable.svg")] public string Image { get { return image; } set { diff --git a/src/GraphicObjects/FileDialog.cs b/src/GraphicObjects/FileDialog.cs index 3a5e6cb3..bed42a05 100644 --- a/src/GraphicObjects/FileDialog.cs +++ b/src/GraphicObjects/FileDialog.cs @@ -28,7 +28,7 @@ using OpenTK.Input; using System.Linq; using System.Text.RegularExpressions; -namespace go +namespace Crow { public class FileDialog: IValueChange { @@ -49,7 +49,7 @@ namespace go public FileDialog () { currentDir = new DirectoryInfo (Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)); - window = Interface.Load("#go.Templates.FileDialog.goml") as Window; + window = Interface.Load("#Crow.Templates.FileDialog.goml") as Window; window.DataSource = this; } #endregion diff --git a/src/GraphicObjects/GenericStack.cs b/src/GraphicObjects/GenericStack.cs index b5af394d..ae98971c 100644 --- a/src/GraphicObjects/GenericStack.cs +++ b/src/GraphicObjects/GenericStack.cs @@ -6,7 +6,7 @@ using System.Text; using System.Xml.Serialization; using System.ComponentModel; -namespace go +namespace Crow { public class GenericStack : Group { @@ -87,13 +87,13 @@ namespace go foreach (GraphicObject c in Children.Where(ch=>ch.Visible)) { c.Slot.X = d; d += c.Slot.Width + Spacing; - c.RegisterForLayouting ((int)LayoutingType.Y); + //c.RegisterForLayouting ((int)LayoutingType.Y); } } else { foreach (GraphicObject c in Children.Where(ch=>ch.Visible)) { c.Slot.Y = d; d += c.Slot.Height + Spacing; - c.RegisterForLayouting ((int)LayoutingType.X); + //c.RegisterForLayouting ((int)LayoutingType.X); } } } diff --git a/src/GraphicObjects/GraduatedSlider.cs b/src/GraphicObjects/GraduatedSlider.cs old mode 100755 new mode 100644 index c3de8d11..e885ecb8 --- a/src/GraphicObjects/GraduatedSlider.cs +++ b/src/GraphicObjects/GraduatedSlider.cs @@ -5,7 +5,7 @@ using System.Text; using Cairo; using System.Xml.Serialization; -namespace go +namespace Crow { public class GraduatedSlider : Slider { diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs index e03a9d4f..ff94392c 100644 --- a/src/GraphicObjects/GraphicObject.cs +++ b/src/GraphicObjects/GraphicObject.cs @@ -19,7 +19,7 @@ using System.Xml; using System.Runtime.CompilerServices; using System.Reflection.Emit; -namespace go +namespace Crow { public class GraphicObject : IXmlSerializable, ILayoutable, IValueChange { diff --git a/src/GraphicObjects/Grid.cs b/src/GraphicObjects/Grid.cs index e8bd7ba6..a3233c96 100644 --- a/src/GraphicObjects/Grid.cs +++ b/src/GraphicObjects/Grid.cs @@ -6,7 +6,7 @@ using System.Text; using System.Xml.Serialization; using System.ComponentModel; -namespace go +namespace Crow { /// /// Simple grid container diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs index 89afa5f2..7f2ce060 100644 --- a/src/GraphicObjects/Group.cs +++ b/src/GraphicObjects/Group.cs @@ -8,7 +8,7 @@ using Cairo; using System.Xml.Serialization; using System.ComponentModel; -namespace go +namespace Crow { public class Group : GraphicObject, IXmlSerializable { @@ -292,7 +292,7 @@ namespace go if (!subTree.IsStartElement()) break; - Type t = Type.GetType("go." + subTree.Name); + Type t = Type.GetType("Crow." + subTree.Name); GraphicObject go = (GraphicObject)Activator.CreateInstance(t); (go as IXmlSerializable).ReadXml(subTree); addChild(go); diff --git a/src/GraphicObjects/Groupbox.cs b/src/GraphicObjects/Groupbox.cs index 60c2dd08..e1f33d84 100644 --- a/src/GraphicObjects/Groupbox.cs +++ b/src/GraphicObjects/Groupbox.cs @@ -16,9 +16,9 @@ using System.ComponentModel; using System.Xml; using System.IO; -namespace go +namespace Crow { - [DefaultTemplate("#go.Templates.Groupbox.goml")] + [DefaultTemplate("#Crow.Templates.Groupbox.goml")] public class Groupbox : TemplatedContainer { string title; diff --git a/src/GraphicObjects/HorizontalStack.cs b/src/GraphicObjects/HorizontalStack.cs old mode 100755 new mode 100644 index 6a192f9a..21991a9a --- a/src/GraphicObjects/HorizontalStack.cs +++ b/src/GraphicObjects/HorizontalStack.cs @@ -4,14 +4,14 @@ using System.Linq; using System.Text; using System.Xml.Serialization; -namespace go +namespace Crow { public class HorizontalStack : GenericStack { public HorizontalStack() : base() { - Orientation = go.Orientation.Horizontal; + Orientation = Crow.Orientation.Horizontal; } [XmlIgnore] diff --git a/src/GraphicObjects/IGOLibHost.cs b/src/GraphicObjects/IGOLibHost.cs index cdf94282..1c50d558 100644 --- a/src/GraphicObjects/IGOLibHost.cs +++ b/src/GraphicObjects/IGOLibHost.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace go +namespace Crow { public interface IGOLibHost { diff --git a/src/GraphicObjects/ILayoutable.cs b/src/GraphicObjects/ILayoutable.cs index f732a2ca..0d4201d9 100644 --- a/src/GraphicObjects/ILayoutable.cs +++ b/src/GraphicObjects/ILayoutable.cs @@ -1,6 +1,6 @@ using System; -namespace go +namespace Crow { public interface ILayoutable { diff --git a/src/GraphicObjects/IValueChange.cs b/src/GraphicObjects/IValueChange.cs index 4dc886b0..ee1acd4f 100644 --- a/src/GraphicObjects/IValueChange.cs +++ b/src/GraphicObjects/IValueChange.cs @@ -20,7 +20,7 @@ // along with this program. If not, see . using System; -namespace go +namespace Crow { public interface IValueChange { diff --git a/src/GraphicObjects/Image.cs b/src/GraphicObjects/Image.cs old mode 100755 new mode 100644 index 71d568fd..0aa48ac7 --- a/src/GraphicObjects/Image.cs +++ b/src/GraphicObjects/Image.cs @@ -9,7 +9,7 @@ using System.Xml.Serialization; using System.ComponentModel; using System.Diagnostics; -namespace go +namespace Crow { public class Image : GraphicObject { @@ -84,7 +84,7 @@ namespace go protected override Size measureRawSize () { // if (_pic == null) -// _pic = "#go.Images.Icons.IconAlerte.svg"; +// _pic = "#Crow.Images.Icons.IconAlerte.svg"; return _pic.Dimensions + Margin * 2; } diff --git a/src/GraphicObjects/Label.cs b/src/GraphicObjects/Label.cs old mode 100755 new mode 100644 index 94c13790..5ad5474a --- a/src/GraphicObjects/Label.cs +++ b/src/GraphicObjects/Label.cs @@ -9,7 +9,7 @@ using System.Xml.Serialization; using System.ComponentModel; using OpenTK.Input; -namespace go +namespace Crow { [Serializable] public class Label : GraphicObject diff --git a/src/GraphicObjects/ListBox.cs b/src/GraphicObjects/ListBox.cs index ee9fb49d..8d9880ad 100644 --- a/src/GraphicObjects/ListBox.cs +++ b/src/GraphicObjects/ListBox.cs @@ -29,11 +29,11 @@ using System.Xml; using System.Collections.Generic; using System.Threading; -namespace go +namespace Crow { - [DefaultTemplate("#go.Templates.Listbox.goml")] - //[DefaultTemplate("#go.Templates.ItemTemplate.goml")] - public class ListBox : TemplatedControl, IXmlSerializable + [DefaultTemplate("#Crow.Templates.Listbox.goml")] + //[DefaultTemplate("#Crow.Templates.ItemTemplate.goml")] + public class ListBox : TemplatedControl//, IXmlSerializable { #region CTOR public ListBox () : base() {} @@ -54,7 +54,7 @@ namespace go } #endregion - [XmlAttributeAttribute][DefaultValue("#go.Templates.ItemTemplate.goml")] + [XmlAttributeAttribute][DefaultValue("#Crow.Templates.ItemTemplate.goml")] public string ItemTemplate { get { return _itemTemplate; } set { @@ -176,63 +176,63 @@ namespace go } #region IXmlSerializable - public override System.Xml.Schema.XmlSchema GetSchema(){ return null; } - public override void ReadXml(System.Xml.XmlReader reader) - { - //Template could be either an attribute containing path or expressed inlined - //as a Template Element - using (System.Xml.XmlReader subTree = reader.ReadSubtree()) - { - subTree.Read (); - - string template = reader.GetAttribute ("Template"); - string tmp = subTree.ReadOuterXml (); - - //Load template from path set as attribute in templated control - if (string.IsNullOrEmpty (template)) { - //seek for template tag first - using (XmlReader xr = new XmlTextReader (tmp, XmlNodeType.Element, null)) { - //load template first if inlined - - xr.Read (); //skip current node - - while (!xr.EOF) { - xr.Read (); //read first child - if (!xr.IsStartElement ()) - continue; - if (xr.Name == "Template") { - xr.Read (); - - Type t = Type.GetType ("go." + xr.Name); - GraphicObject go = (GraphicObject)Activator.CreateInstance (t); - (go as IXmlSerializable).ReadXml (xr); - - loadTemplate (go); - - xr.Read ();//go close tag - xr.Read ();//Template close tag - break; - } else { - xr.ReadInnerXml (); - } - } - } - } else - loadTemplate (Interface.Load (template, this)); - - - //normal xml read - using (XmlReader xr = new XmlTextReader (tmp, XmlNodeType.Element, null)) { - xr.Read (); - base.ReadXml(xr); - } - } - } - public override void WriteXml(System.Xml.XmlWriter writer) - { - //TODO: - throw new NotImplementedException(); - } +// public override System.Xml.Schema.XmlSchema GetSchema(){ return null; } +// public override void ReadXml(System.Xml.XmlReader reader) +// { +// //Template could be either an attribute containing path or expressed inlined +// //as a Template Element +// using (System.Xml.XmlReader subTree = reader.ReadSubtree()) +// { +// subTree.Read (); +// +// string template = reader.GetAttribute ("Template"); +// string tmp = subTree.ReadOuterXml (); +// +// //Load template from path set as attribute in templated control +// if (string.IsNullOrEmpty (template)) { +// //seek for template tag first +// using (XmlReader xr = new XmlTextReader (tmp, XmlNodeType.Element, null)) { +// //load template first if inlined +// +// xr.Read (); //skip current node +// +// while (!xr.EOF) { +// xr.Read (); //read first child +// if (!xr.IsStartElement ()) +// continue; +// if (xr.Name == "Template") { +// xr.Read (); +// +// Type t = Type.GetType ("Crow." + xr.Name); +// GraphicObject go = (GraphicObject)Activator.CreateInstance (t); +// (go as IXmlSerializable).ReadXml (xr); +// +// loadTemplate (go); +// +// xr.Read ();//go close tag +// xr.Read ();//Template close tag +// break; +// } else { +// xr.ReadInnerXml (); +// } +// } +// } +// } else +// loadTemplate (Interface.Load (template, this)); +// +// +// //normal xml read +// using (XmlReader xr = new XmlTextReader (tmp, XmlNodeType.Element, null)) { +// xr.Read (); +// base.ReadXml(xr); +// } +// } +// } +// public override void WriteXml(System.Xml.XmlWriter writer) +// { +// //TODO: +// throw new NotImplementedException(); +// } #endregion } } diff --git a/src/GraphicObjects/MessageBox.cs b/src/GraphicObjects/MessageBox.cs index d750dee5..40f48e4a 100644 --- a/src/GraphicObjects/MessageBox.cs +++ b/src/GraphicObjects/MessageBox.cs @@ -21,9 +21,9 @@ using System; using System.Xml.Serialization; using System.ComponentModel; -namespace go +namespace Crow { - [DefaultTemplate("#go.Templates.MessageBox.goml")] + [DefaultTemplate("#Crow.Templates.MessageBox.goml")] public class MessageBox : Window { public MessageBox ():base(){} diff --git a/src/GraphicObjects/NumericControl.cs b/src/GraphicObjects/NumericControl.cs index d22180be..e323ef3e 100644 --- a/src/GraphicObjects/NumericControl.cs +++ b/src/GraphicObjects/NumericControl.cs @@ -2,7 +2,7 @@ using System.Xml.Serialization; using System.ComponentModel; -namespace go +namespace Crow { public abstract class NumericControl : TemplatedControl { diff --git a/src/GraphicObjects/Popper.cs b/src/GraphicObjects/Popper.cs index 381b6281..5842faf8 100644 --- a/src/GraphicObjects/Popper.cs +++ b/src/GraphicObjects/Popper.cs @@ -16,9 +16,9 @@ using System.ComponentModel; using System.Xml; using System.IO; -namespace go +namespace Crow { - [DefaultTemplate("#go.Templates.Popper.goml")] + [DefaultTemplate("#Crow.Templates.Popper.goml")] public class Popper : TemplatedContainer { #region CTOR @@ -125,7 +125,7 @@ namespace go NotifyValueChanged ("Title", title); } } - [XmlAttributeAttribute()][DefaultValue("#go.Images.Icons.expandable.svg")] + [XmlAttributeAttribute()][DefaultValue("#Crow.Images.Icons.expandable.svg")] public string Image { get { return image; } set { diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/PrivateContainer.cs index a412a707..f4190f9b 100644 --- a/src/GraphicObjects/PrivateContainer.cs +++ b/src/GraphicObjects/PrivateContainer.cs @@ -24,7 +24,7 @@ using System.ComponentModel; using OpenTK.Input; using Cairo; -namespace go +namespace Crow { /// /// Implement drawing and layouting for a single child, but diff --git a/src/GraphicObjects/ProgressBar.cs b/src/GraphicObjects/ProgressBar.cs index ed3c09df..3554dea3 100644 --- a/src/GraphicObjects/ProgressBar.cs +++ b/src/GraphicObjects/ProgressBar.cs @@ -7,7 +7,7 @@ using System.Diagnostics; using System.Xml.Serialization; using System.ComponentModel; -namespace go +namespace Crow { [Serializable] public class ProgressBar : Border diff --git a/src/GraphicObjects/RadioButton.cs b/src/GraphicObjects/RadioButton.cs index 7aa9370c..5985b2c3 100644 --- a/src/GraphicObjects/RadioButton.cs +++ b/src/GraphicObjects/RadioButton.cs @@ -14,9 +14,9 @@ using System.Xml.Serialization; using OpenTK.Input; using System.ComponentModel; -namespace go +namespace Crow { - [DefaultTemplate("#go.Templates.RadioButton.goml")] + [DefaultTemplate("#Crow.Templates.RadioButton.goml")] public class RadioButton : TemplatedControl { string caption; @@ -51,7 +51,7 @@ namespace go NotifyValueChanged ("Caption", caption); } } - [XmlAttributeAttribute()][DefaultValue("#go.Images.Icons.radiobutton.svg")] + [XmlAttributeAttribute()][DefaultValue("#Crow.Images.Icons.radiobutton.svg")] public string Image { get { return image; } set { diff --git a/src/GraphicObjects/Scrollbar.cs b/src/GraphicObjects/Scrollbar.cs index 956d96ab..f68bdb77 100644 --- a/src/GraphicObjects/Scrollbar.cs +++ b/src/GraphicObjects/Scrollbar.cs @@ -14,9 +14,9 @@ using System.Xml.Serialization; using OpenTK.Input; using System.ComponentModel; -namespace go +namespace Crow { - [DefaultTemplate("#go.Templates.Scrollbar.goml")] + [DefaultTemplate("#Crow.Templates.Scrollbar.goml")] public class Scrollbar : TemplatedControl, IValueChange { #region IValueChange implementation diff --git a/src/GraphicObjects/Scroller.cs b/src/GraphicObjects/Scroller.cs index 2f21870a..ec0def4d 100644 --- a/src/GraphicObjects/Scroller.cs +++ b/src/GraphicObjects/Scroller.cs @@ -9,7 +9,7 @@ using System.Xml.Serialization; using OpenTK.Input; using System.ComponentModel; -namespace go +namespace Crow { public class Scroller : Container, IValueChange { diff --git a/src/GraphicObjects/Slider.cs b/src/GraphicObjects/Slider.cs index 0f5ba5d0..97bc177f 100644 --- a/src/GraphicObjects/Slider.cs +++ b/src/GraphicObjects/Slider.cs @@ -7,7 +7,7 @@ using System.Xml.Serialization; using System.ComponentModel; using System.Diagnostics; -namespace go +namespace Crow { public class Slider : NumericControl { diff --git a/src/GraphicObjects/Spinner.cs b/src/GraphicObjects/Spinner.cs index 5336a0bb..c86cde14 100644 --- a/src/GraphicObjects/Spinner.cs +++ b/src/GraphicObjects/Spinner.cs @@ -21,9 +21,9 @@ using System; using OpenTK.Input; -namespace go +namespace Crow { - [DefaultTemplate("#go.Templates.Spinner.goml")] + [DefaultTemplate("#Crow.Templates.Spinner.goml")] public class Spinner : NumericControl { Label labCpt; diff --git a/src/GraphicObjects/TemplatedContainer.cs b/src/GraphicObjects/TemplatedContainer.cs index cef8266b..0bb11fc7 100644 --- a/src/GraphicObjects/TemplatedContainer.cs +++ b/src/GraphicObjects/TemplatedContainer.cs @@ -22,7 +22,7 @@ using System; using System.Xml.Serialization; using System.Xml; -namespace go +namespace Crow { public abstract class TemplatedContainer : TemplatedControl { @@ -79,7 +79,7 @@ namespace go if (xr.Name == "Template") continue; - Type t = Type.GetType ("go." + xr.Name); + Type t = Type.GetType ("Crow." + xr.Name); GraphicObject go = (GraphicObject)Activator.CreateInstance (t); (go as IXmlSerializable).ReadXml (xr); diff --git a/src/GraphicObjects/TemplatedControl.cs b/src/GraphicObjects/TemplatedControl.cs index 32c75a5c..1f527bc3 100644 --- a/src/GraphicObjects/TemplatedControl.cs +++ b/src/GraphicObjects/TemplatedControl.cs @@ -26,7 +26,7 @@ using System.Xml; using System.Linq; using System.Diagnostics; -namespace go +namespace Crow { // [AttributeUsage(AttributeTargets.Class)] public class TemplateAttribute : Attribute @@ -61,7 +61,7 @@ namespace go string _template; - [XmlAttributeAttribute][DefaultValue("#go.Templates.Template.goml")] + [XmlAttributeAttribute][DefaultValue("#Crow.Templates.Template.goml")] public string Template { get { return _template; } set { _template = value; } @@ -148,7 +148,7 @@ namespace go if (xr.Name == "Template") { xr.Read (); - Type t = Type.GetType ("go." + xr.Name); + Type t = Type.GetType ("Crow." + xr.Name); GraphicObject go = (GraphicObject)Activator.CreateInstance (t); (go as IXmlSerializable).ReadXml (xr); diff --git a/src/GraphicObjects/TextBox.cs b/src/GraphicObjects/TextBox.cs index 65bfacb7..097ecaa1 100644 --- a/src/GraphicObjects/TextBox.cs +++ b/src/GraphicObjects/TextBox.cs @@ -10,7 +10,7 @@ using System.Globalization; using System.ComponentModel; using System.Runtime.InteropServices; -namespace go +namespace Crow { public class TextBoxWidget : Label { diff --git a/src/GraphicObjects/TextRun.cs b/src/GraphicObjects/TextRun.cs old mode 100755 new mode 100644 index 2dda5acf..1fa43963 --- a/src/GraphicObjects/TextRun.cs +++ b/src/GraphicObjects/TextRun.cs @@ -9,7 +9,7 @@ using System.Xml.Serialization; using System.ComponentModel; using OpenTK.Input; -namespace go +namespace Crow { [Serializable] public class TextRun : GraphicObject diff --git a/src/GraphicObjects/VerticalStack.cs b/src/GraphicObjects/VerticalStack.cs old mode 100755 new mode 100644 index 0fd063a0..b23e6813 --- a/src/GraphicObjects/VerticalStack.cs +++ b/src/GraphicObjects/VerticalStack.cs @@ -3,14 +3,14 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace go +namespace Crow { public class VerticalStack : GenericStack { public VerticalStack() : base() { - Orientation = go.Orientation.Vertical; + Orientation = Crow.Orientation.Vertical; } [System.Xml.Serialization.XmlIgnore] diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs index 0af4c762..8e2724c4 100644 --- a/src/GraphicObjects/Window.cs +++ b/src/GraphicObjects/Window.cs @@ -4,9 +4,9 @@ using System.ComponentModel; using System.Diagnostics; using OpenTK.Input; -namespace go +namespace Crow { - [DefaultTemplate("#go.Templates.Window.goml")] + [DefaultTemplate("#Crow.Templates.Window.goml")] public class Window : TemplatedContainer { enum Direction @@ -57,7 +57,7 @@ namespace go NotifyValueChanged ("Title", _title); } } - [XmlAttributeAttribute()][DefaultValue("#go.Images.Icons.tetra.png")] + [XmlAttributeAttribute()][DefaultValue("#Crow.Images.Icons.tetra.png")] public string Icon { get { return _icon; } set { diff --git a/src/Interface.cs b/src/Interface.cs index 7836b903..c1713838 100644 --- a/src/Interface.cs +++ b/src/Interface.cs @@ -31,7 +31,7 @@ using System.CodeDom; using Microsoft.CSharp; using System.CodeDom.Compiler; -namespace go +namespace Crow { public static class Interface { @@ -143,7 +143,7 @@ namespace go } } - Type t = Type.GetType ("go." + root); + Type t = Type.GetType ("Crow." + root); stream.Seek (0, SeekOrigin.Begin); return t; diff --git a/src/LayoutChangeEventArgs.cs b/src/LayoutChangeEventArgs.cs index bbe6f6fd..35ef9c5c 100644 --- a/src/LayoutChangeEventArgs.cs +++ b/src/LayoutChangeEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace go +namespace Crow { public class LayoutChangeEventArgs: EventArgs { diff --git a/src/LayoutingQueue.cs b/src/LayoutingQueue.cs index 2d96788f..ca4dede9 100644 --- a/src/LayoutingQueue.cs +++ b/src/LayoutingQueue.cs @@ -22,7 +22,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace go +namespace Crow { public class LayoutingQueue : List { diff --git a/src/LayoutingQueueItem.cs b/src/LayoutingQueueItem.cs index 8e8f8a98..c2d84c54 100644 --- a/src/LayoutingQueueItem.cs +++ b/src/LayoutingQueueItem.cs @@ -21,7 +21,7 @@ using System; using System.Diagnostics; -namespace go +namespace Crow { public enum LayoutingType { diff --git a/src/OpenGL/QuadVAO.cs b/src/OpenGL/QuadVAO.cs index 374f2f71..08ef680e 100644 --- a/src/OpenGL/QuadVAO.cs +++ b/src/OpenGL/QuadVAO.cs @@ -1,7 +1,7 @@ using System; using OpenTK; -namespace go +namespace Crow { public class QuadVAO : VertexArrayObject { diff --git a/src/OpenGL/Shader.cs b/src/OpenGL/Shader.cs index 4f92abb3..f13000d7 100644 --- a/src/OpenGL/Shader.cs +++ b/src/OpenGL/Shader.cs @@ -5,7 +5,7 @@ using System.Reflection; using OpenTK; using OpenTK.Graphics.OpenGL; -namespace go.GLBackend +namespace Crow { public class Shader : IDisposable { diff --git a/src/OpenGL/TexturedShader.cs b/src/OpenGL/TexturedShader.cs index e62613d1..c8f44c26 100644 --- a/src/OpenGL/TexturedShader.cs +++ b/src/OpenGL/TexturedShader.cs @@ -1,7 +1,7 @@ using System; using OpenTK.Graphics.OpenGL; -namespace go.GLBackend +namespace Crow { public class TexturedShader : Shader { diff --git a/src/OpenGL/VertexArrayObject.cs b/src/OpenGL/VertexArrayObject.cs index 9b75af29..c4fde5b4 100644 --- a/src/OpenGL/VertexArrayObject.cs +++ b/src/OpenGL/VertexArrayObject.cs @@ -2,7 +2,7 @@ using OpenTK; using OpenTK.Graphics.OpenGL; -namespace go +namespace Crow { public class VertexArrayObject : IDisposable { diff --git a/src/OpenTKGameWindow.cs b/src/OpenTKGameWindow.cs old mode 100755 new mode 100644 index 5fbcd9c1..e29f44c8 --- a/src/OpenTKGameWindow.cs +++ b/src/OpenTKGameWindow.cs @@ -14,7 +14,7 @@ using OpenTK.Input; -namespace go +namespace Crow { public class OpenTKGameWindow : GameWindow, ILayoutable, IGOLibHost { @@ -24,7 +24,7 @@ namespace go // GameWindowFlags.Fullscreen, // DisplayDevice.Default, // 3,0,OpenTK.Graphics.GraphicsContextFlags.Default) - public OpenTKGameWindow(int _width, int _height, string _title="golib") + public OpenTKGameWindow(int _width, int _height, string _title="Crow") : base(_width, _height, new OpenTK.Graphics.GraphicsMode(32, 24, 0, 1), _title,GameWindowFlags.Default,DisplayDevice.GetDisplay(DisplayIndex.Second), 3,3,OpenTK.Graphics.GraphicsContextFlags.Debug) @@ -34,14 +34,14 @@ namespace go //VSync = VSyncMode.On; currentWindow = this; //Load cursors - XCursor.Cross = XCursorFile.Load("#go.Images.Icons.Cursors.cross").Cursors[0]; - XCursor.Default = XCursorFile.Load("#go.Images.Icons.Cursors.arrow").Cursors[0]; - XCursor.NW = XCursorFile.Load("#go.Images.Icons.Cursors.top_left_corner").Cursors[0]; - XCursor.NE = XCursorFile.Load("#go.Images.Icons.Cursors.top_right_corner").Cursors[0]; - XCursor.SW = XCursorFile.Load("#go.Images.Icons.Cursors.bottom_left_corner").Cursors[0]; - XCursor.SE = XCursorFile.Load("#go.Images.Icons.Cursors.bottom_right_corner").Cursors[0]; - XCursor.H = XCursorFile.Load("#go.Images.Icons.Cursors.sb_h_double_arrow").Cursors[0]; - XCursor.V = XCursorFile.Load("#go.Images.Icons.Cursors.sb_v_double_arrow").Cursors[0]; + XCursor.Cross = XCursorFile.Load("#Crow.Images.Icons.Cursors.cross").Cursors[0]; + XCursor.Default = XCursorFile.Load("#Crow.Images.Icons.Cursors.arrow").Cursors[0]; + XCursor.NW = XCursorFile.Load("#Crow.Images.Icons.Cursors.top_left_corner").Cursors[0]; + XCursor.NE = XCursorFile.Load("#Crow.Images.Icons.Cursors.top_right_corner").Cursors[0]; + XCursor.SW = XCursorFile.Load("#Crow.Images.Icons.Cursors.bottom_left_corner").Cursors[0]; + XCursor.SE = XCursorFile.Load("#Crow.Images.Icons.Cursors.bottom_right_corner").Cursors[0]; + XCursor.H = XCursorFile.Load("#Crow.Images.Icons.Cursors.sb_h_double_arrow").Cursors[0]; + XCursor.V = XCursorFile.Load("#Crow.Images.Icons.Cursors.sb_v_double_arrow").Cursors[0]; } #endregion @@ -162,7 +162,7 @@ namespace go int texID; public QuadVAO uiQuad, uiQuad2; - go.GLBackend.Shader shader; + Crow.Shader shader; int[] viewport = new int[4]; Rectangle dirtyZone = Rectangle.Empty; @@ -409,7 +409,7 @@ namespace go int matl = GL.GetInteger (GetPName.MaxArrayTextureLayers); int mts = GL.GetInteger (GetPName.MaxTextureSize); - shader = new go.GLBackend.TexturedShader (); + shader = new Crow.TexturedShader (); } protected override void OnResize(EventArgs e) diff --git a/src/Picture.cs b/src/Picture.cs index 954878af..99be57bb 100644 --- a/src/Picture.cs +++ b/src/Picture.cs @@ -22,7 +22,7 @@ using System; using System.IO; using Cairo; -namespace go +namespace Crow { public abstract class Picture { diff --git a/src/Point.cs b/src/Point.cs old mode 100755 new mode 100644 index 58305f00..108651ff --- a/src/Point.cs +++ b/src/Point.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace go +namespace Crow { public struct Point { diff --git a/src/Rectangle.cs b/src/Rectangle.cs old mode 100755 new mode 100644 index 0944af66..91b14cbc --- a/src/Rectangle.cs +++ b/src/Rectangle.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.Xml.Serialization; -namespace go +namespace Crow { public struct Rectangle { diff --git a/src/Rectangles.cs b/src/Rectangles.cs index def2f66d..daf1587b 100644 --- a/src/Rectangles.cs +++ b/src/Rectangles.cs @@ -5,7 +5,7 @@ using System.Text; using Cairo; using System.Diagnostics; -namespace go +namespace Crow { public class Rectangles { diff --git a/src/ReflexionExtensions.cs b/src/ReflexionExtensions.cs index fc16c9d4..1009852c 100644 --- a/src/ReflexionExtensions.cs +++ b/src/ReflexionExtensions.cs @@ -21,7 +21,7 @@ using System; using System.Reflection; -namespace go +namespace Crow { public static class ReflexionExtensions { diff --git a/src/SelectionChangeEventArgs.cs b/src/SelectionChangeEventArgs.cs index da706db7..c477379d 100644 --- a/src/SelectionChangeEventArgs.cs +++ b/src/SelectionChangeEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace go +namespace Crow { public class SelectionChangeEventArgs: EventArgs { diff --git a/src/Size.cs b/src/Size.cs old mode 100755 new mode 100644 index e5d2c0f5..6c5e79a5 --- a/src/Size.cs +++ b/src/Size.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace go +namespace Crow { public struct Size { diff --git a/src/SvgPicture.cs b/src/SvgPicture.cs index 4a0bf922..94230311 100644 --- a/src/SvgPicture.cs +++ b/src/SvgPicture.cs @@ -22,7 +22,7 @@ using System; using System.IO; using Cairo; -namespace go +namespace Crow { public class SvgPicture : Picture { diff --git a/src/TextChangeEventArgs.cs b/src/TextChangeEventArgs.cs index 9b9d3a2f..555dbab2 100644 --- a/src/TextChangeEventArgs.cs +++ b/src/TextChangeEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace go +namespace Crow { public class TextChangeEventArgs: EventArgs { diff --git a/src/ValueChangeEventArgs.cs b/src/ValueChangeEventArgs.cs index 532d72f0..49bde54c 100644 --- a/src/ValueChangeEventArgs.cs +++ b/src/ValueChangeEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace go +namespace Crow { public class ValueChangeEventArgs: EventArgs { diff --git a/src/XCursor.cs b/src/XCursor.cs index 9c42c8da..d24b1687 100644 --- a/src/XCursor.cs +++ b/src/XCursor.cs @@ -24,7 +24,7 @@ using System.Diagnostics; using OpenTK; using System.Collections.Generic; -namespace go +namespace Crow { public class XCursorFile { diff --git a/src/win32/Win32.cs b/src/win32/Win32.cs old mode 100755 new mode 100644 index c2f976b0..bff468bd --- a/src/win32/Win32.cs +++ b/src/win32/Win32.cs @@ -5,7 +5,7 @@ using System.Text; using System.Runtime.InteropServices; using System.Diagnostics; -namespace go +namespace Crow { public static class Win32 { -- 2.47.3