some improvements

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

@@ -63,7 +63,7 @@ public static class Extensions
     /// You usually don't set customClickHandler if you set this parameter to <see cref="true"/>.</param>
     /// <param name="customClickHandler">Adds a custom click handler. If addDefaultHandler is true, it will only work on <see cref="PluginFeature"/>s.<br/>
     /// You usually don't set addDefaultHandler to true if you set this parameter to something not null.</param>
-    public static void InsertItemsTo(this IEnumerable<PluginFeature> features,
+    public static IEnumerable<RadMenuItem> InsertItemsTo(this IEnumerable<PluginFeature> features,
         RadItemOwnerCollection itemsCollection,
         bool addDefaultHandler = false,
         EventHandler? customClickHandler = null,
@@ -76,6 +76,7 @@ public static class Extensions
         var insertDefault = customDefault ?? (insertMode.HasFlag(FeatureInsertMode.DefaultStart) ? 0 : itemsCollection.Count);
         var insertTop = customTop ?? (insertMode.HasFlag(FeatureInsertMode.InsertTop) || insertMode.HasFlag(FeatureInsertMode.DefaultStart) ? 0 : insertDefault);
         var insertBottom = customBottom ?? (insertMode.HasFlag(FeatureInsertMode.InsertBottom) || insertMode.HasFlag(FeatureInsertMode.DefaultEnd) ? itemsCollection.Count : insertDefault);
+        var insertedItems = new List<RadMenuItem>();
 
         foreach (var feature in features)
         {
@@ -112,7 +113,12 @@ public static class Extensions
                     itemsCollection.Insert(insertBottom++, item);
                     break;
             }
+
+            if (item.Parent != null)
+                insertedItems.Add(item);
         }
+
+        return insertedItems;
     }
 
     private static void RadMenuItem_RMMethod_Click(object? sender, EventArgs e)

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

@@ -13,6 +13,7 @@
   
   <ItemGroup>
     <ProjectReference Include="..\Pilz.Plugins.Advanced\Pilz.Plugins.Advanced.csproj" />
+    <ProjectReference Include="..\Pilz.UI\Pilz.UI.csproj" />
   </ItemGroup>
   
 </Project>

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

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0-windows</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Version>1.1.0</Version>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\Pilz.Plugins.Advanced\Pilz.Plugins.Advanced.csproj" />
+    <ProjectReference Include="..\Pilz.UI\Pilz.UI.vbproj" />
+  </ItemGroup>
+  
+</Project>

Pilz.Plugins.Advanced.UI/PluginModule.cs

@@ -1,56 +1,22 @@
-using System.Reflection.Metadata;
+namespace Pilz.Plugins.Advanced.UI;
 
-namespace Pilz.Plugins.Advanced.UI;
+public abstract class PluginModule : PluginModule<PluginModuleUI>
-
-public abstract class PluginModule<TPluginModuleUI> : PluginModuleBase where TPluginModuleUI : Control
 {
-    public delegate void PluginModuleUIEventHandler(PluginModuleBase module, TPluginModuleUI ui);
-
-    /// <summary>
-    /// Fires when a <see cref="PluginModuleUI"/> instance has been created.
-    /// </summary>
-    public static event PluginModuleUIEventHandler? OnUICreated;
-
-    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()
+    public override void ShowUI(PluginFunctionParameter? @params)
     {
-        ShowUI(null);
+        if (CreateNewUI(@params) is PluginModuleUI ui)
-    }
-
-    public virtual void ShowUI(PluginFunctionParameter? @params)
         {
+            ui.BackColor = Color.Transparent;
+            DialogBase.Show(ui, Name!, Image!.ToIcon());
         }
-
-    public virtual TPluginModuleUI CreateUI()
-    {
-        return CreateUI(null);
     }
-
-    public virtual TPluginModuleUI CreateUI(PluginFunctionParameter? @params)
-    {
-        var ui = CreateNewUI(@params);
-        OnUICreated?.Invoke(this, ui);
-        return ui;
-    }
-
-    protected abstract TPluginModuleUI CreateNewUI(PluginFunctionParameter? @params);
 }

Pilz.Plugins.Advanced.UI/PluginModuleUI.cs

@@ -0,0 +1,11 @@
+using Pilz.UI.Dialogs;
+
+namespace Pilz.Plugins.Advanced.UI;
+
+public partial class PluginModuleUI : FlyoutBase, ILoadContent
+{
+    public PluginModuleUI()
+    {
+        InitializeComponent();
+    }
+}

Pilz.Plugins.Advanced.UI/PluginModule{T}.cs

@@ -0,0 +1,56 @@
+using System.Reflection.Metadata;
+
+namespace Pilz.Plugins.Advanced.UI;
+
+public abstract class PluginModule<TPluginModuleUI> : PluginModuleBase where TPluginModuleUI : Control
+{
+    public delegate void PluginModuleUIEventHandler(PluginModuleBase module, TPluginModuleUI ui);
+
+    /// <summary>
+    /// Fires when a <see cref="PluginModuleUI"/> instance has been created.
+    /// </summary>
+    public static event PluginModuleUIEventHandler? OnUICreated;
+
+    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()
+    {
+        ShowUI(null);
+    }
+
+    public virtual void ShowUI(PluginFunctionParameter? @params)
+    {
+    }
+
+    public virtual TPluginModuleUI CreateUI()
+    {
+        return CreateUI(null);
+    }
+
+    public virtual TPluginModuleUI CreateUI(PluginFunctionParameter? @params)
+    {
+        var ui = CreateNewUI(@params);
+        OnUICreated?.Invoke(this, ui);
+        return ui;
+    }
+
+    protected abstract TPluginModuleUI CreateNewUI(PluginFunctionParameter? @params);
+}

Pilz.UI.Telerik.SymbolFactory/Extensions.cs

@@ -6,11 +6,6 @@ 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/Dialogs/DialogBase.Statics.cs

@@ -0,0 +1,76 @@
+namespace Pilz.UI.Dialogs;
+
+partial class DialogBase
+{
+    public delegate void DialogLoadingEventHandler(DialogLoadingEventArgs e);
+    public delegate void DialogClosedEventHandler(DialogClosedEventArgs e);
+
+    public static event DialogLoadingEventHandler? DialogLoading;
+    public static event DialogClosedEventHandler? DialogClosed;
+
+    public static T Show<T>(string title, Icon icon, object? tag = null) where T : FlyoutBase
+    {
+        return Show<T>(null, title, icon, tag);
+    }
+
+    public static T ShowDialog<T>(string title, Icon icon, object? tag = null) where T : FlyoutBase
+    {
+        return ShowDialog<T>(null, title, icon, tag);
+    }
+
+    public static T Show<T>(IWin32Window? parent, string title, Icon icon, object? tag = null) where T : FlyoutBase
+    {
+        return Show(CreatePanelInstance<T>(tag), parent, title, icon);
+    }
+
+    public static T ShowDialog<T>(IWin32Window? parent, string title, Icon icon, object? tag = null) where T : FlyoutBase
+    {
+        return ShowDialog(CreatePanelInstance<T>(tag), parent, title, icon);
+    }
+
+    public static T Show<T>(T dialogPanel, string title, Icon icon) where T : FlyoutBase
+    {
+        return Show(dialogPanel, null, title, icon);
+    }
+
+    public static T ShowDialog<T>(T dialogPanel, string title, Icon icon) where T : FlyoutBase
+    {
+        return ShowDialog(dialogPanel, null, title, icon);
+    }
+
+    public static T Show<T>(T dialogPanel, IWin32Window? parent, string title, Icon icon) where T : FlyoutBase
+    {
+        CreateForm(dialogPanel, parent, title, icon).Show();
+        return dialogPanel;
+    }
+
+    public static T ShowDialog<T>(T dialogPanel, IWin32Window? parent, string title, Icon icon) where T : FlyoutBase
+    {
+        CreateForm(dialogPanel, parent, title, icon).ShowDialog();
+        return dialogPanel;
+    }
+
+    private static T CreatePanelInstance<T>(object? tag) where T : FlyoutBase
+    {
+        T dialogPanel = Activator.CreateInstance<T>();
+        dialogPanel.Tag = tag;
+        return dialogPanel;
+    }
+
+    private static DialogBase CreateForm<T>(T dialogPanel, IWin32Window? parent, string title, Icon icon) where T : FlyoutBase
+    {
+        dialogPanel.Dock = DockStyle.Fill;
+
+        var dialog = new DialogBase(dialogPanel)
+        {
+            Text = title,
+            Icon = icon,
+            StartPosition = parent == null ? FormStartPosition.CenterScreen : FormStartPosition.CenterParent,
+            ClientSize = dialogPanel.Size
+        };
+
+        dialog.Controls.Add(dialogPanel);
+
+        return dialog;
+    }
+}

Pilz.UI/Dialogs/DialogBase.cs

@@ -0,0 +1,30 @@
+namespace Pilz.UI.Dialogs;
+
+public partial class DialogBase : Form
+{
+    public FlyoutBase? DialogPanel { get; private set; }
+
+    private DialogBase()
+    {
+        Load += DialogBaseForm_Load;
+        FormClosed += DialogBaseForm_FormClosed;
+    }
+
+    public DialogBase(FlyoutBase? dialogPanel) : this()
+    {
+        DialogPanel = dialogPanel;
+    }
+
+    private void DialogBaseForm_Load(object? sender, EventArgs e)
+    {
+        if (DialogPanel is ILoadContent iLoadContent)
+            iLoadContent.LoadContent();
+
+        DialogLoading?.Invoke(new DialogLoadingEventArgs(this));
+    }
+
+    private void DialogBaseForm_FormClosed(object? sender, FormClosedEventArgs e)
+    {
+        DialogClosed?.Invoke(new DialogClosedEventArgs(this));
+    }
+}

Pilz.UI/Dialogs/DialogClosedEventArgs.cs

@@ -0,0 +1,7 @@
+namespace Pilz.UI.Dialogs;
+
+public class DialogClosedEventArgs(DialogBase dialog) : EventArgs
+{
+    public DialogBase Parent { get; } = dialog;
+    public FlyoutBase? Content => Parent?.DialogPanel;
+}

Pilz.UI/Dialogs/DialogLoadingEventArgs.cs

@@ -0,0 +1,7 @@
+namespace Pilz.UI.Dialogs;
+
+public class DialogLoadingEventArgs(DialogBase dialog) : EventArgs
+{
+    public DialogBase Parent { get; } = dialog;
+    public FlyoutBase? Content => Parent?.DialogPanel;
+}

Pilz.UI/Dialogs/FlyoutBase.Designer.cs

@@ -0,0 +1,121 @@
+namespace Pilz.UI.Dialogs;
+
+partial class FlyoutBase
+{
+    /// <summary> 
+    /// Erforderliche Designervariable.
+    /// </summary>
+    private System.ComponentModel.IContainer components = null;
+
+    /// <summary> 
+    /// Verwendete Ressourcen bereinigen.
+    /// </summary>
+    /// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param>
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing && (components != null))
+        {
+            components.Dispose();
+        }
+        base.Dispose(disposing);
+    }
+
+    #region Vom Komponenten-Designer generierter Code
+
+    /// <summary> 
+    /// Erforderliche Methode für die Designerunterstützung. 
+    /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
+    /// </summary>
+    private void InitializeComponent()
+    {
+        tableLayoutPanel_TitlePanel = new System.Windows.Forms.TableLayoutPanel();
+        label_Title = new System.Windows.Forms.Label();
+        tableLayoutPanel_ActionPanel = new System.Windows.Forms.TableLayoutPanel();
+        button_Accept = new System.Windows.Forms.Button();
+        button_Cancel = new System.Windows.Forms.Button();
+        tableLayoutPanel_TitlePanel.SuspendLayout();
+        tableLayoutPanel_ActionPanel.SuspendLayout();
+        SuspendLayout();
+        // 
+        // tableLayoutPanel_TitlePanel
+        // 
+        tableLayoutPanel_TitlePanel.ColumnCount = 1;
+        tableLayoutPanel_TitlePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+        tableLayoutPanel_TitlePanel.Controls.Add(label_Title, 0, 0);
+        tableLayoutPanel_TitlePanel.Dock = System.Windows.Forms.DockStyle.Top;
+        tableLayoutPanel_TitlePanel.Location = new System.Drawing.Point(0, 0);
+        tableLayoutPanel_TitlePanel.Name = "tableLayoutPanel_TitlePanel";
+        tableLayoutPanel_TitlePanel.RowCount = 1;
+        tableLayoutPanel_TitlePanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+        tableLayoutPanel_TitlePanel.Size = new System.Drawing.Size(300, 29);
+        tableLayoutPanel_TitlePanel.TabIndex = 0;
+        // 
+        // label_Title
+        // 
+        label_Title.Dock = System.Windows.Forms.DockStyle.Fill;
+        label_Title.Location = new System.Drawing.Point(3, 0);
+        label_Title.Name = "label_Title";
+        label_Title.Size = new System.Drawing.Size(294, 29);
+        label_Title.TabIndex = 0;
+        label_Title.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+        // 
+        // tableLayoutPanel_ActionPanel
+        // 
+        tableLayoutPanel_ActionPanel.AutoSize = true;
+        tableLayoutPanel_ActionPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+        tableLayoutPanel_ActionPanel.ColumnCount = 3;
+        tableLayoutPanel_ActionPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+        tableLayoutPanel_ActionPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+        tableLayoutPanel_ActionPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+        tableLayoutPanel_ActionPanel.Controls.Add(button_Cancel, 2, 0);
+        tableLayoutPanel_ActionPanel.Controls.Add(button_Accept, 1, 0);
+        tableLayoutPanel_ActionPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
+        tableLayoutPanel_ActionPanel.Location = new System.Drawing.Point(0, 121);
+        tableLayoutPanel_ActionPanel.Name = "tableLayoutPanel_ActionPanel";
+        tableLayoutPanel_ActionPanel.RowCount = 1;
+        tableLayoutPanel_ActionPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
+        tableLayoutPanel_ActionPanel.Size = new System.Drawing.Size(300, 29);
+        tableLayoutPanel_ActionPanel.TabIndex = 1;
+        // 
+        // button_Accept
+        // 
+        button_Accept.Location = new System.Drawing.Point(141, 3);
+        button_Accept.Name = "button_Accept";
+        button_Accept.Size = new System.Drawing.Size(75, 23);
+        button_Accept.TabIndex = 2;
+        button_Accept.Text = "Accept";
+        button_Accept.UseVisualStyleBackColor = true;
+        button_Accept.Click += Button_Accept_Click;
+        // 
+        // button_Cancel
+        // 
+        button_Cancel.Location = new System.Drawing.Point(222, 3);
+        button_Cancel.Name = "button_Cancel";
+        button_Cancel.Size = new System.Drawing.Size(75, 23);
+        button_Cancel.TabIndex = 3;
+        button_Cancel.Text = "Cancel";
+        button_Cancel.UseVisualStyleBackColor = true;
+        button_Cancel.Click += Button_Cancel_Click;
+        // 
+        // FlyoutBase
+        // 
+        AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+        AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+        Controls.Add(tableLayoutPanel_ActionPanel);
+        Controls.Add(tableLayoutPanel_TitlePanel);
+        Name = "FlyoutBase";
+        Size = new System.Drawing.Size(300, 150);
+        tableLayoutPanel_TitlePanel.ResumeLayout(false);
+        tableLayoutPanel_ActionPanel.ResumeLayout(false);
+        ResumeLayout(false);
+        PerformLayout();
+    }
+
+    #endregion
+
+    private System.Windows.Forms.TableLayoutPanel tableLayoutPanel_TitlePanel;
+    private System.Windows.Forms.Label label_Title;
+    private System.Windows.Forms.TableLayoutPanel tableLayoutPanel_ActionPanel;
+    private System.Windows.Forms.Button button_Cancel;
+    private System.Windows.Forms.Button button_Accept;
+}

Pilz.UI/Dialogs/FlyoutBase.cs

@@ -0,0 +1,89 @@
+namespace Pilz.UI.Dialogs;
+
+public partial class FlyoutBase : UserControl
+{
+    public DialogResult Result { get; protected set; }
+    public bool RegisterDialogAccept { get; set; } = true;
+    public bool RegisterDialogCancel { get; set; } = false;
+
+    protected bool ActionPanelVisible
+    {
+        get => tableLayoutPanel_ActionPanel.Visible;
+        set => tableLayoutPanel_ActionPanel.Visible = value;
+    }
+
+    protected bool CancelButtonVisible
+    {
+        get => button_Cancel.Visible;
+        set => button_Cancel.Visible = value;
+    }
+
+    protected bool CancelButtonEnable
+    {
+        get => button_Cancel.Enabled;
+        set => button_Cancel.Enabled = value;
+    }
+
+    protected bool ConfirmButtonEnable
+    {
+        get => button_Accept.Enabled;
+        set => button_Accept.Enabled = value;
+    }
+
+    public string Title
+    {
+        get => label_Title.Text;
+        set
+        {
+            label_Title.Text = value;
+            SetShowTitlePanel();
+        }
+    }
+
+    public FlyoutBase()
+    {
+        InitializeComponent();
+        ParentChanged += FlyoutBase_ParentChanged; ;
+    }
+
+    private void FlyoutBase_ParentChanged(object sender, System.EventArgs e)
+    {
+        var frm = FindForm();
+        if (frm != null)
+        {
+            if (RegisterDialogAccept)
+                frm.AcceptButton = button_Accept;
+            if (RegisterDialogCancel)
+                frm.CancelButton = button_Cancel;
+        }
+    }
+
+    protected void Close(DialogResult result)
+    {
+        Result = result;
+
+        if (FindForm() is DialogBase dialogForm)
+            dialogForm.Close();
+    }
+
+    protected virtual bool ValidateOK()
+    {
+        return true;
+    }
+
+    private void SetShowTitlePanel()
+    {
+        tableLayoutPanel_TitlePanel.Visible = !string.IsNullOrWhiteSpace(label_Title.Text);
+    }
+
+    private void Button_Accept_Click(object sender, System.EventArgs e)
+    {
+        if (ValidateOK())
+            Close(DialogResult.OK);
+    }
+
+    private void Button_Cancel_Click(object sender, System.EventArgs e)
+    {
+        Close(DialogResult.Cancel);
+    }
+}

Pilz.UI/Dialogs/FlyoutBase.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Pilz.UI/Dialogs/ILoadContent.cs

@@ -0,0 +1,6 @@
+namespace Pilz.UI.Dialogs;
+
+public interface ILoadContent
+{
+    void LoadContent();
+}

Pilz.UI/Highlighter.cs

@@ -442,7 +442,7 @@ public class Highlighter : Component
         }
     }
 
-    private Timer _DelayTimer = null;
+    private System.Windows.Forms.Timer _DelayTimer = null;
 
     private void ContainerControlSizeChanged(object sender, EventArgs e)
     {
@@ -453,7 +453,7 @@ public class Highlighter : Component
 
             if (_DelayTimer is null)
             {
-                _DelayTimer = new Timer();
+                _DelayTimer = new();
                 _DelayTimer.Interval = 100;
                 _DelayTimer.Tick += new EventHandler(DelayTimerTick);
                 _DelayTimer.Start();

Pilz.UI/Pilz.UI.csproj

@@ -1,42 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <MyType>Windows</MyType>
-    <TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows</TargetFrameworks>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DocumentationFile>Pilz.UI.xml</DocumentationFile>
     <UseWindowsForms>true</UseWindowsForms>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
     <LangVersion>latest</LangVersion>
-    <DefineConstants>TRACE</DefineConstants>
+    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DefineConstants>DEBUG</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <RemoveIntegerChecks>true</RemoveIntegerChecks>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionExplicit>On</OptionExplicit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionCompare>Binary</OptionCompare>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionStrict>Off</OptionStrict>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionInfer>On</OptionInfer>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-    <DefineConstants>DEBUG</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <RemoveIntegerChecks>true</RemoveIntegerChecks>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
     <Version>2.0.0</Version>

Pilz.Win32/Internals/IconFactory.vb

@@ -1,11 +1,4 @@
-' Nicht gemergte Änderung aus Projekt "Pilz.Win32 (net6.0-windows)" 
+Imports System.Drawing
-' Vor:
-' Imports System.Runtime.InteropServices
-' Imports Microsoft.Win32
-' Nach:
-' Imports System.Collections.Generic
-' Imports System.Drawing
-.Drawing
 Imports System.Reflection
 Imports System.Runtime.InteropServices