diff --git a/Pilz.Plugins.Advanced.UI.Telerik/Pilz.Plugins.Advanced.UI.Telerik.csproj b/Pilz.Plugins.Advanced.UI.Telerik/Pilz.Plugins.Advanced.UI.Telerik.csproj
index 4f51b7a..9a763e6 100644
--- a/Pilz.Plugins.Advanced.UI.Telerik/Pilz.Plugins.Advanced.UI.Telerik.csproj
+++ b/Pilz.Plugins.Advanced.UI.Telerik/Pilz.Plugins.Advanced.UI.Telerik.csproj
@@ -14,7 +14,7 @@
- 1.3.0
+ 1.4.0
diff --git a/Pilz.Plugins.Advanced.UI/Pilz.Plugins.Advanced.UI.csproj b/Pilz.Plugins.Advanced.UI/Pilz.Plugins.Advanced.UI.csproj
index 046b813..8e58470 100644
--- a/Pilz.Plugins.Advanced.UI/Pilz.Plugins.Advanced.UI.csproj
+++ b/Pilz.Plugins.Advanced.UI/Pilz.Plugins.Advanced.UI.csproj
@@ -8,7 +8,7 @@
- 1.1.0
+ 1.5.0
diff --git a/Pilz.Plugins.Advanced.UI/PluginModule.cs b/Pilz.Plugins.Advanced.UI/PluginModule.cs
index 3d2b8a4..746e3bd 100644
--- a/Pilz.Plugins.Advanced.UI/PluginModule.cs
+++ b/Pilz.Plugins.Advanced.UI/PluginModule.cs
@@ -1,4 +1,7 @@
-namespace Pilz.Plugins.Advanced.UI;
+using Pilz.UI;
+using Pilz.UI.Dialogs;
+
+namespace Pilz.Plugins.Advanced.UI;
public abstract class PluginModule : PluginModule
{
diff --git a/Pilz.Plugins.Advanced.UI/PluginModuleUI.cs b/Pilz.Plugins.Advanced.UI/PluginModuleUI.cs
index d96e480..e567dde 100644
--- a/Pilz.Plugins.Advanced.UI/PluginModuleUI.cs
+++ b/Pilz.Plugins.Advanced.UI/PluginModuleUI.cs
@@ -6,6 +6,9 @@ public partial class PluginModuleUI : FlyoutBase, ILoadContent
{
public PluginModuleUI()
{
- InitializeComponent();
+ }
+
+ public virtual void LoadContent()
+ {
}
}
diff --git a/Pilz.UI.Telerik.SymbolFactory/Extensions.cs b/Pilz.UI.Telerik.SymbolFactory/Extensions.cs
index a8a2f4e..fd8fe55 100644
--- a/Pilz.UI.Telerik.SymbolFactory/Extensions.cs
+++ b/Pilz.UI.Telerik.SymbolFactory/Extensions.cs
@@ -6,6 +6,11 @@ namespace Pilz.UI.Telerik;
public static class Extensions
{
+ public static Image ToImage(this RadSvgImage svg)
+ {
+ return svg.Document.Draw(svg.Width, svg.Height);
+ }
+
public static void ApplyColor(this RadSvgImage svg, Color color)
{
svg.Document.Fill = new SvgColourServer(color);
diff --git a/Pilz.UI.Telerik.SymbolFactory/Pilz.UI.Telerik.SymbolFactory.csproj b/Pilz.UI.Telerik.SymbolFactory/Pilz.UI.Telerik.SymbolFactory.csproj
index d93941b..8bb0867 100644
--- a/Pilz.UI.Telerik.SymbolFactory/Pilz.UI.Telerik.SymbolFactory.csproj
+++ b/Pilz.UI.Telerik.SymbolFactory/Pilz.UI.Telerik.SymbolFactory.csproj
@@ -6,7 +6,7 @@
Pilz.UI.Telerik
- 2.0.1
+ 2.0.2
diff --git a/Pilz.UI.Telerik/Pilz.UI.Telerik.csproj b/Pilz.UI.Telerik/Pilz.UI.Telerik.csproj
index ebaa9e0..5935d52 100644
--- a/Pilz.UI.Telerik/Pilz.UI.Telerik.csproj
+++ b/Pilz.UI.Telerik/Pilz.UI.Telerik.csproj
@@ -6,7 +6,7 @@
true
- 2.3.0
+ 2.4.0
diff --git a/Pilz.UI/Extensions.cs b/Pilz.UI/Extensions.cs
index 7a345f4..68e37f7 100644
--- a/Pilz.UI/Extensions.cs
+++ b/Pilz.UI/Extensions.cs
@@ -1,10 +1,8 @@
-using System.Drawing;
-
-namespace Pilz.UI;
+namespace Pilz.UI;
public static class Extensions
{
- public static Image? ToIcon(this Image image)
+ public static Icon? ToIcon(this Image image)
{
if (image is Bitmap bmp)
return Icon.FromHandle(bmp.GetHicon());
diff --git a/Pilz.UI/PaintingControl/PaintingControl.cs b/Pilz.UI/PaintingControl/PaintingControl.cs
index caf31c7..b56a35d 100644
--- a/Pilz.UI/PaintingControl/PaintingControl.cs
+++ b/Pilz.UI/PaintingControl/PaintingControl.cs
@@ -30,7 +30,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer
private new string Text { get; set; }
public PointF Offset { get; set; } = PointF.Empty;
- public PaintingObjectList PaintingObjects { get; private set; } = new PaintingObjectList(this);
+ public PaintingObjectList PaintingObjects { get; private set; }
public bool VisibleForMouseEvents { get; set; } = true;
public bool AutoAreaSelection { get; set; } = true;
public bool AutoSingleSelection { get; set; } = true;
@@ -147,6 +147,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer
public PaintingControl()
{
+ PaintingObjects = new(this);
PaintingObjectResizing.CheckEnabled += PaintingObjectResizing_CheckEnabled;
DoubleBuffered = true;
KeyDown += CheckKeyDown;
diff --git a/Pilz.UI/PaintingControl/PaintingObject.cs b/Pilz.UI/PaintingControl/PaintingObject.cs
index 5134016..1f80b2a 100644
--- a/Pilz.UI/PaintingControl/PaintingObject.cs
+++ b/Pilz.UI/PaintingControl/PaintingObject.cs
@@ -64,8 +64,8 @@ public class PaintingObject : ICloneable, IPaintingObjectContainer
[JsonProperty]
private bool _AutoAlignToGrid = false;
public bool MouseTransparency { get; set; } = false;
- public PaintingObjectLayering Layering { get; private set; } = new PaintingObjectLayering(this);
- public PaintingObjectList PaintingObjects { get; private set; } = new PaintingObjectList(_Parent) { EnableRaisingEvents = false };
+ public PaintingObjectLayering Layering { get; private set; }
+ public PaintingObjectList PaintingObjects { get; private set; }
[JsonIgnore]
public ulong ErrorsAtDrawing { get; private set; } = 0UL;
@@ -105,9 +105,11 @@ public class PaintingObject : ICloneable, IPaintingObjectContainer
public PaintingObject()
{
+ Layering = new(this);
+ PaintingObjects = new PaintingObjectList(_Parent) { EnableRaisingEvents = false };
}
- public PaintingObject(PaintingObjectType @type)
+ public PaintingObject(PaintingObjectType @type) : this()
{
Type = type;
}
@@ -737,7 +739,7 @@ public class PaintingObjectList : List
internal PaintingControl MyParent { get; private set; }
internal bool EnableRaisingEvents { get; set; } = true;
[JsonIgnore]
- public PaintingObjectListLayering Layering { get; private set; } = new PaintingObjectListLayering(this);
+ public PaintingObjectListLayering Layering { get; private set; }
public PaintingObjectList() : this(null)
{
@@ -745,6 +747,7 @@ public class PaintingObjectList : List
public PaintingObjectList(PaintingControl parent)
{
+ Layering = new(this);
MyParent = parent;
}
diff --git a/Pilz.UI/Pilz.UI.csproj b/Pilz.UI/Pilz.UI.csproj
index bbf97ac..c044e31 100644
--- a/Pilz.UI/Pilz.UI.csproj
+++ b/Pilz.UI/Pilz.UI.csproj
@@ -9,7 +9,7 @@
enable
- 2.0.0
+ 2.1.0