separate plugin ui & make Pilz.Plugins.Advanced package platform independent

Pilz.Plugins.Advanced.UI.Telerik/Extensions.cs

@@ -4,7 +4,7 @@ using Telerik.WinControls;
 using Telerik.WinControls.Elements;
 using Telerik.WinControls.UI;
 
-namespace Pilz.Plugins.Advanced
+namespace Pilz.Plugins.Advanced.UI.Telerik
 {
     public static class Extensions
     {
@@ -15,12 +15,12 @@ namespace Pilz.Plugins.Advanced
             return null;
         }
 
-        public static RadMenuItem GetAsItem(this PluginModule module)
+        public static RadMenuItem GetAsItem(this PluginModuleBase module)
         {
             return GetAsItem(module, true);
         }
 
-        public static RadMenuItem GetAsItem(this PluginModule module, bool addDefaultHandler)
+        public static RadMenuItem GetAsItem(this PluginModuleBase module, bool addDefaultHandler)
         {
             return GetAsItem(module, addDefaultHandler ? RadMenuItem_RMMethod_Click : null);
         }
@@ -40,7 +40,8 @@ namespace Pilz.Plugins.Advanced
             var item = new RadMenuItem
             {
                 Text = module.Name,
-                SvgImage = module.Icon,
+                Image = module.Icon as Image,
+                SvgImage = module.Icon as RadSvgImage,
                 Tag = module,
                 Visibility = module.Enabled ? ElementVisibility.Visible : ElementVisibility.Collapsed
             };
@@ -77,7 +78,7 @@ namespace Pilz.Plugins.Advanced
 
                 if (feature is PluginFunction function)
                     item = function.GetAsItem(addDefaultHandler);
-                else if (feature is PluginModule module)
+                else if (feature is PluginModuleBase module)
                     item = module.GetAsItem(addDefaultHandler);
                 else
                     item = feature.GetAsItem(null);

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

@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0-windows</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <PackageProjectUrl>https://gitlab.com/Pilzinsel64/pilz-framework</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Pilz.Plugins.Advanced.UI\Pilz.Plugins.Advanced.UI.csproj" />
+    <ProjectReference Include="..\Pilz.UI.Telerik.SymbolFactory\Pilz.UI.Telerik.SymbolFactory.csproj" />
+    <ProjectReference Include="..\Pilz.UI.Telerik\Pilz.UI.Telerik.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <Version>1.0.0</Version>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="UI.for.WinForms.AllControls.Net70" Version="2024.1.312">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="PluginModuleUI.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+  </ItemGroup>
+
+</Project>

Pilz.Plugins.Advanced.UI.Telerik/PluginModule.cs

@@ -0,0 +1,39 @@
+using Pilz.Plugins.Advanced.UI;
+using Pilz.UI.Telerik;
+using Pilz.UI.Telerik.Dialogs;
+using System.Drawing;
+using System.Windows.Forms;
+using Telerik.WinControls;
+
+namespace Pilz.Plugins.Advanced.UI.Telerik
+{
+    public abstract class PluginModule : PluginModule<PluginModuleUI>
+    {
+        /// <summary>
+        /// Wrapper for the <see cref="PluginFeature.Icon"/> property to directly use it as <see cref="RadSvgImage"/>.
+        /// </summary>
+        public RadSvgImage? SvgImage
+        {
+            get => base.Icon as RadSvgImage;
+            set => base.Icon = value;
+        }
+
+        protected PluginModule(string moduleType, string moduleIdentifier) : base(moduleType, moduleIdentifier)
+        {
+
+        }
+
+        protected PluginModule(string moduleType, string moduleIdentifier, string moduleName) : base(moduleType, moduleIdentifier, moduleName)
+        {
+        }
+
+        public override void ShowUI()
+        {
+            if (CreateNewUI() is PluginModuleUI ui)
+            {
+                ui.BackColor = Color.Transparent;
+                DialogBaseForm.Show(ui, Name!, SvgImage!.ToImage().ToIcon()!);
+            }
+        }
+    }
+}

Pilz.Plugins.Advanced.UI.Telerik/PluginModuleUI.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace Pilz.Plugins.Advanced
+namespace Pilz.Plugins.Advanced.UI.Telerik
 {
     public class PluginModuleUI : FlyoutDialogBase, ILoadContent
     {

Pilz.Plugins.Advanced.UI/FeatureInsertMode.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Pilz.Plugins.Advanced
+namespace Pilz.Plugins.Advanced.UI
 {
     [Flags]
     public enum FeatureInsertMode

Pilz.Plugins.Advanced.UI/FeatureInsertPosition.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Pilz.Plugins.Advanced
+namespace Pilz.Plugins.Advanced.UI
 {
     [Flags]
     public enum FeatureInsertPosition

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

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0-windows</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <PackageProjectUrl>https://gitlab.com/Pilzinsel64/pilz-framework</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <Version>1.0.0</Version>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\Pilz.Plugins.Advanced\Pilz.Plugins.Advanced.csproj" />
+  </ItemGroup>
+  
+</Project>

Pilz.Plugins.Advanced.UI/PluginModule.cs

@@ -1,14 +1,11 @@
-using Pilz.UI.Telerik;
+using System.Drawing;
-using Pilz.UI.Telerik.Dialogs;
-using System.Drawing;
 using System.Windows.Forms;
-using Telerik.WinControls;
 
-namespace Pilz.Plugins.Advanced
+namespace Pilz.Plugins.Advanced.UI
 {
-    public abstract class PluginModule : PluginFeature
+    public abstract class PluginModule<TPluginModuleUI> : PluginModuleBase where TPluginModuleUI : Control
     {
-        public delegate void PluginModuleUIEventHandler(PluginModule module, PluginModuleUI ui);
+        public delegate void PluginModuleUIEventHandler(PluginModuleBase module, TPluginModuleUI ui);
 
         /// <summary>
         /// Fires when a <see cref="PluginModuleUI"/> instance has been created.
@@ -18,26 +15,34 @@ namespace Pilz.Plugins.Advanced
         public bool Visible { get; set; } = true;
         public bool AllowEmbedding { get; set; } = true;
 
+        /// <summary>
+        /// Wrapper for the <see cref="PluginFeature.Icon"/> property to directly use it as <see cref="System.Drawing.Image"/>.
+        /// </summary>
+        public Image? Image
+        {
+            get => base.Icon as Image;
+            set => base.Icon = value;
+        }
+
+        protected PluginModule(string moduleType, string moduleIdentifier) : base(moduleType, moduleIdentifier)
+        {
+        }
+
         protected PluginModule(string moduleType, string moduleIdentifier, string moduleName) : base(moduleType, moduleIdentifier, moduleName)
         {
         }
 
         public virtual void ShowUI()
         {
-            if (CreateNewUI() is PluginModuleUI ui)
-            {
-                ui.BackColor = Color.Transparent;
-                DialogBaseForm.Show(ui, Name!, Icon!.ToImage().ToIcon()!);
-            }
         }
 
-        public virtual PluginModuleUI CreateUI()
+        public virtual TPluginModuleUI CreateUI()
         {
             var ui = CreateNewUI();
             OnUICreated?.Invoke(this, ui);
             return ui;
         }
 
-        protected abstract PluginModuleUI CreateNewUI();
+        protected abstract TPluginModuleUI CreateNewUI();
     }
 }

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

@@ -1,23 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  
   <PropertyGroup>
-    <TargetFrameworks>net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <UseWindowsForms>true</UseWindowsForms>
     <PackageProjectUrl>https://gitlab.com/Pilzinsel64/pilz-framework</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
+  
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>2.6.1</Version>
+    <Version>2.7.0</Version>
   </PropertyGroup>
-  <ItemGroup>
+  
-    <ProjectReference Include="..\Pilz.UI.Telerik.SymbolFactory\Pilz.UI.Telerik.SymbolFactory.csproj" />
-    <ProjectReference Include="..\Pilz.UI.Telerik\Pilz.UI.Telerik.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="UI.for.WinForms.AllControls.Net70" Version="2024.1.312">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
 </Project>

Pilz.Plugins.Advanced/PluginFeature.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Telerik.WinControls;
 
 namespace Pilz.Plugins.Advanced
 {
@@ -30,7 +29,7 @@ namespace Pilz.Plugins.Advanced
         /// <summary>
         /// The symbol for the feature.
         /// </summary>
-        public virtual RadSvgImage? Icon { get; set; }
+        public virtual object? Icon { get; set; }
         /// <summary>
         /// Sets the prioritization of the feature.
         /// This will be respected on abfragen features and on inserting as items using the extension methods"/>.

Pilz.Plugins.Advanced/PluginFeatureController.cs

@@ -4,8 +4,6 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
-using Telerik.Pdf;
-using Telerik.WinControls;
 
 namespace Pilz.Plugins.Advanced
 {
@@ -167,7 +165,7 @@ namespace Pilz.Plugins.Advanced
             }
         }
 
-        public class ModuleController(PluginFeatureController controller) : FeatureController<PluginModule>(controller)
+        public class ModuleController(PluginFeatureController controller) : FeatureController<PluginModuleBase>(controller)
         {
         }
 

Pilz.Plugins.Advanced/PluginFunction.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Telerik.WinControls;
 
 namespace Pilz.Plugins.Advanced
 {

Pilz.Plugins.Advanced/PluginModuleBase.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel;
+
+namespace Pilz.Plugins.Advanced
+{
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public abstract class PluginModuleBase : PluginFeature
+    {
+        protected PluginModuleBase(string moduleType, string moduleIdentifier) : base(moduleType, moduleIdentifier)
+        {
+        }
+
+        protected PluginModuleBase(string moduleType, string moduleIdentifier, string moduleName) : base(moduleType, moduleIdentifier, moduleName)
+        {
+        }
+    }
+}

Pilz.sln

@@ -41,6 +41,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Plugins.Advanced", "Pi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Gaming.Minecraft", "Pilz.Gaming.Minecraft\Pilz.Gaming.Minecraft.csproj", "{B285DA24-39C9-4BA2-AF3D-A1A05737268B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pilz.Plugins.Advanced.UI", "Pilz.Plugins.Advanced.UI\Pilz.Plugins.Advanced.UI.csproj", "{5030C047-B04B-4BA7-8CEF-3B6C3F3A2C59}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pilz.Plugins.Advanced.UI.Telerik", "Pilz.Plugins.Advanced.UI.Telerik\Pilz.Plugins.Advanced.UI.Telerik.csproj", "{0A837BD6-A19C-4A05-A57D-CBB0CD64B244}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -201,6 +205,22 @@ Global
 		{B285DA24-39C9-4BA2-AF3D-A1A05737268B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B285DA24-39C9-4BA2-AF3D-A1A05737268B}.Release|x86.ActiveCfg = Release|Any CPU
 		{B285DA24-39C9-4BA2-AF3D-A1A05737268B}.Release|x86.Build.0 = Release|Any CPU
+		{5030C047-B04B-4BA7-8CEF-3B6C3F3A2C59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5030C047-B04B-4BA7-8CEF-3B6C3F3A2C59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5030C047-B04B-4BA7-8CEF-3B6C3F3A2C59}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5030C047-B04B-4BA7-8CEF-3B6C3F3A2C59}.Debug|x86.Build.0 = Debug|Any CPU
+		{5030C047-B04B-4BA7-8CEF-3B6C3F3A2C59}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5030C047-B04B-4BA7-8CEF-3B6C3F3A2C59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5030C047-B04B-4BA7-8CEF-3B6C3F3A2C59}.Release|x86.ActiveCfg = Release|Any CPU
+		{5030C047-B04B-4BA7-8CEF-3B6C3F3A2C59}.Release|x86.Build.0 = Release|Any CPU
+		{0A837BD6-A19C-4A05-A57D-CBB0CD64B244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A837BD6-A19C-4A05-A57D-CBB0CD64B244}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A837BD6-A19C-4A05-A57D-CBB0CD64B244}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0A837BD6-A19C-4A05-A57D-CBB0CD64B244}.Debug|x86.Build.0 = Debug|Any CPU
+		{0A837BD6-A19C-4A05-A57D-CBB0CD64B244}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A837BD6-A19C-4A05-A57D-CBB0CD64B244}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A837BD6-A19C-4A05-A57D-CBB0CD64B244}.Release|x86.ActiveCfg = Release|Any CPU
+		{0A837BD6-A19C-4A05-A57D-CBB0CD64B244}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE