fixes & version bump

Pilz.Plugins.Advanced.UI.Telerik/Pilz.Plugins.Advanced.UI.Telerik.csproj

@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <Version>1.3.0</Version>
+    <Version>1.4.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

Pilz.Plugins.Advanced.UI/Pilz.Plugins.Advanced.UI.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.1.0</Version>
+    <Version>1.5.0</Version>
   </PropertyGroup>
   
   <ItemGroup>

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<PluginModuleUI>
 {

Pilz.Plugins.Advanced.UI/PluginModuleUI.cs

@@ -6,6 +6,9 @@ public partial class PluginModuleUI : FlyoutBase, ILoadContent
 {
     public PluginModuleUI()
     {
-        InitializeComponent();
+    }
+
+    public virtual void LoadContent()
+    {
     }
 }

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);

Pilz.UI.Telerik.SymbolFactory/Pilz.UI.Telerik.SymbolFactory.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Pilz.UI.Telerik</RootNamespace>
   </PropertyGroup>
   <PropertyGroup>
-    <Version>2.0.1</Version>
+    <Version>2.0.2</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Drawing.Common" Version="8.0.4" />

Pilz.UI.Telerik/Pilz.UI.Telerik.csproj

@@ -6,7 +6,7 @@
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <PropertyGroup>
-    <Version>2.3.0</Version>
+    <Version>2.4.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="UI.for.WinForms.AllControls.Net70" Version="2024.1.312">

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());

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;

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<PaintingObject>
     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<PaintingObject>
 
     public PaintingObjectList(PaintingControl parent)
     {
+        Layering = new(this);
         MyParent = parent;
     }
 

Pilz.UI/Pilz.UI.csproj

@@ -9,7 +9,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <PropertyGroup>
-    <Version>2.0.0</Version>
+    <Version>2.1.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />