From fb42b0675b674ca07dabe009569aac006ad350f7 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Thu, 6 Nov 2025 11:49:46 +0100 Subject: [PATCH] rename Pilz.Plugins.Advanced to Pilz.Features --- .../Preview/ModelPreview.vb | 3 +-- {Pilz.Plugins.Advanced => Pilz.Features}/Delegates.cs | 2 +- .../Exceptions/PluginFeatureExceptions.cs | 2 +- {Pilz.Plugins.Advanced => Pilz.Features}/Extensions.cs | 2 +- .../FeaturePrioritization.cs | 2 +- .../IPluginFeatureConstructor.cs | 2 +- .../IPluginFeatureProvider.cs | 4 ++-- .../IPluginFeaturesProvider.cs | 2 +- .../Pilz.Features.csproj | 0 {Pilz.Plugins.Advanced => Pilz.Features}/PluginFeature.cs | 2 +- .../PluginFeatureController.cs | 5 ++--- .../PluginFeatureExecuteEventArgs.cs | 2 +- .../PluginFeatureExecuteEventType.cs | 2 +- {Pilz.Plugins.Advanced => Pilz.Features}/PluginFunction.cs | 2 +- .../PluginFunctionParameter.cs | 2 +- .../PluginFunctionSimpleParamter.cs | 2 +- .../PluginModuleBase.cs | 2 +- .../ControlExecuteReason.cs | 2 +- .../ControlListener.cs | 5 +++-- .../ControlListenerDummy.cs | 4 +++- .../ControlListenerFeature.cs | 4 +++- .../ControlParameters.cs | 4 +++- .../Extensions/PluginFeatureControllerExtensions.cs | 4 +++- .../FeatureInsertMode.cs | 4 +++- .../FeatureInsertPosition.cs | 2 +- .../IControlListener.cs | 4 +++- .../Pilz.UI.WinForms.Features.csproj | 2 +- .../PluginModule.cs | 5 +++-- .../PluginModuleUI.cs | 5 ++--- .../PluginModule{T}.cs | 4 +++- .../Extensions.cs | 6 ++++-- .../Pilz.UI.WinForms.Telerik.Features.csproj | 2 +- .../PluginButtonType.cs | 2 +- .../RadPluginModule.cs | 6 ++++-- .../RadPluginModuleUI.cs | 5 ++--- Pilz.sln | 6 +++--- Pilz/Data/Json/JsonDataContainer.cs | 2 +- 37 files changed, 66 insertions(+), 50 deletions(-) rename {Pilz.Plugins.Advanced => Pilz.Features}/Delegates.cs (74%) rename {Pilz.Plugins.Advanced => Pilz.Features}/Exceptions/PluginFeatureExceptions.cs (72%) rename {Pilz.Plugins.Advanced => Pilz.Features}/Extensions.cs (96%) rename {Pilz.Plugins.Advanced => Pilz.Features}/FeaturePrioritization.cs (70%) rename {Pilz.Plugins.Advanced => Pilz.Features}/IPluginFeatureConstructor.cs (57%) rename {Pilz.Plugins.Advanced => Pilz.Features}/IPluginFeatureProvider.cs (71%) rename {Pilz.Plugins.Advanced => Pilz.Features}/IPluginFeaturesProvider.cs (72%) rename Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj => Pilz.Features/Pilz.Features.csproj (100%) rename {Pilz.Plugins.Advanced => Pilz.Features}/PluginFeature.cs (99%) rename {Pilz.Plugins.Advanced => Pilz.Features}/PluginFeatureController.cs (99%) rename {Pilz.Plugins.Advanced => Pilz.Features}/PluginFeatureExecuteEventArgs.cs (90%) rename {Pilz.Plugins.Advanced => Pilz.Features}/PluginFeatureExecuteEventType.cs (67%) rename {Pilz.Plugins.Advanced => Pilz.Features}/PluginFunction.cs (97%) rename {Pilz.Plugins.Advanced => Pilz.Features}/PluginFunctionParameter.cs (53%) rename {Pilz.Plugins.Advanced => Pilz.Features}/PluginFunctionSimpleParamter.cs (86%) rename {Pilz.Plugins.Advanced => Pilz.Features}/PluginModuleBase.cs (91%) rename {Pilz.Plugins.Advanced.UI.WinForms => Pilz.UI.WinForms.Features}/ControlExecuteReason.cs (65%) rename {Pilz.Plugins.Advanced.UI.WinForms => Pilz.UI.WinForms.Features}/ControlListener.cs (96%) rename {Pilz.Plugins.Advanced.UI.WinForms => Pilz.UI.WinForms.Features}/ControlListenerDummy.cs (85%) rename {Pilz.Plugins.Advanced.UI.WinForms => Pilz.UI.WinForms.Features}/ControlListenerFeature.cs (89%) rename {Pilz.Plugins.Advanced.UI.WinForms => Pilz.UI.WinForms.Features}/ControlParameters.cs (67%) rename {Pilz.Plugins.Advanced.UI.WinForms => Pilz.UI.WinForms.Features}/Extensions/PluginFeatureControllerExtensions.cs (95%) rename {Pilz.Plugins.Advanced.UI.WinForms => Pilz.UI.WinForms.Features}/FeatureInsertMode.cs (95%) rename {Pilz.Plugins.Advanced.UI.WinForms => Pilz.UI.WinForms.Features}/FeatureInsertPosition.cs (73%) rename {Pilz.Plugins.Advanced.UI.WinForms => Pilz.UI.WinForms.Features}/IControlListener.cs (60%) rename Pilz.Plugins.Advanced.UI.WinForms/Pilz.Plugins.Advanced.UI.WinForms.csproj => Pilz.UI.WinForms.Features/Pilz.UI.WinForms.Features.csproj (84%) rename {Pilz.Plugins.Advanced.UI.WinForms => Pilz.UI.WinForms.Features}/PluginModule.cs (86%) rename {Pilz.Plugins.Advanced.UI.WinForms => Pilz.UI.WinForms.Features}/PluginModuleUI.cs (62%) rename {Pilz.Plugins.Advanced.UI.WinForms => Pilz.UI.WinForms.Features}/PluginModule{T}.cs (95%) rename {Pilz.Plugins.Advanced.UI.WinForms.Telerik => Pilz.UI.WinForms.Telerik.Features}/Extensions.cs (98%) rename Pilz.Plugins.Advanced.UI.WinForms.Telerik/Pilz.Plugins.Advanced.UI.WinForms.Telerik.csproj => Pilz.UI.WinForms.Telerik.Features/Pilz.UI.WinForms.Telerik.Features.csproj (86%) rename {Pilz.Plugins.Advanced.UI.WinForms.Telerik => Pilz.UI.WinForms.Telerik.Features}/PluginButtonType.cs (62%) rename {Pilz.Plugins.Advanced.UI.WinForms.Telerik => Pilz.UI.WinForms.Telerik.Features}/RadPluginModule.cs (86%) rename {Pilz.Plugins.Advanced.UI.WinForms.Telerik => Pilz.UI.WinForms.Telerik.Features}/RadPluginModuleUI.cs (63%) diff --git a/Pilz.Drawing.Drawing3D.OpenGLRenderer/Preview/ModelPreview.vb b/Pilz.Drawing.Drawing3D.OpenGLRenderer/Preview/ModelPreview.vb index 09a00f0..f1986be 100644 --- a/Pilz.Drawing.Drawing3D.OpenGLRenderer/Preview/ModelPreview.vb +++ b/Pilz.Drawing.Drawing3D.OpenGLRenderer/Preview/ModelPreview.vb @@ -1,5 +1,4 @@ Imports System.Drawing - ' Nicht gemergte Änderung aus Projekt "Pilz.Drawing.Drawing3D.OpenGLFactory (net6.0-windows)" ' Vor: ' Imports System.Windows.Forms @@ -15,9 +14,9 @@ Imports System.Drawing ' Imports Pilz.Drawing.Drawing3D.OpenGLFactory.CameraN Imports System.Windows.Forms +Imports OpenTK.GLControl Imports OpenTK.Graphics.OpenGL Imports OpenTK.Mathematics -Imports OpenTK.GLControl Imports Pilz.Drawing.Drawing3D.OpenGLFactory.CameraN Imports Pilz.Drawing.Drawing3D.OpenGLFactory.RenderingN diff --git a/Pilz.Plugins.Advanced/Delegates.cs b/Pilz.Features/Delegates.cs similarity index 74% rename from Pilz.Plugins.Advanced/Delegates.cs rename to Pilz.Features/Delegates.cs index 8e1ab6a..43978bd 100644 --- a/Pilz.Plugins.Advanced/Delegates.cs +++ b/Pilz.Features/Delegates.cs @@ -1,3 +1,3 @@ -namespace Pilz.Plugins.Advanced; +namespace Pilz.Features; public delegate void PluginFeatureExecuteEventHandler(object sender, PluginFeatureExecuteEventArgs e); diff --git a/Pilz.Plugins.Advanced/Exceptions/PluginFeatureExceptions.cs b/Pilz.Features/Exceptions/PluginFeatureExceptions.cs similarity index 72% rename from Pilz.Plugins.Advanced/Exceptions/PluginFeatureExceptions.cs rename to Pilz.Features/Exceptions/PluginFeatureExceptions.cs index df882a1..977ebe8 100644 --- a/Pilz.Plugins.Advanced/Exceptions/PluginFeatureExceptions.cs +++ b/Pilz.Features/Exceptions/PluginFeatureExceptions.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced.Exceptions; +namespace Pilz.Features.Exceptions; public class PluginFeatureException : Exception; diff --git a/Pilz.Plugins.Advanced/Extensions.cs b/Pilz.Features/Extensions.cs similarity index 96% rename from Pilz.Plugins.Advanced/Extensions.cs rename to Pilz.Features/Extensions.cs index 31ea105..66a2989 100644 --- a/Pilz.Plugins.Advanced/Extensions.cs +++ b/Pilz.Features/Extensions.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced; +namespace Pilz.Features; public static class Extensions { diff --git a/Pilz.Plugins.Advanced/FeaturePrioritization.cs b/Pilz.Features/FeaturePrioritization.cs similarity index 70% rename from Pilz.Plugins.Advanced/FeaturePrioritization.cs rename to Pilz.Features/FeaturePrioritization.cs index 28ef367..483bf23 100644 --- a/Pilz.Plugins.Advanced/FeaturePrioritization.cs +++ b/Pilz.Features/FeaturePrioritization.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced; +namespace Pilz.Features; public enum FeaturePrioritization { diff --git a/Pilz.Plugins.Advanced/IPluginFeatureConstructor.cs b/Pilz.Features/IPluginFeatureConstructor.cs similarity index 57% rename from Pilz.Plugins.Advanced/IPluginFeatureConstructor.cs rename to Pilz.Features/IPluginFeatureConstructor.cs index 57fbf26..af2833c 100644 --- a/Pilz.Plugins.Advanced/IPluginFeatureConstructor.cs +++ b/Pilz.Features/IPluginFeatureConstructor.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced; +namespace Pilz.Features; public interface IPluginFeatureConstructor { diff --git a/Pilz.Plugins.Advanced/IPluginFeatureProvider.cs b/Pilz.Features/IPluginFeatureProvider.cs similarity index 71% rename from Pilz.Plugins.Advanced/IPluginFeatureProvider.cs rename to Pilz.Features/IPluginFeatureProvider.cs index 8e35415..5c9e744 100644 --- a/Pilz.Plugins.Advanced/IPluginFeatureProvider.cs +++ b/Pilz.Features/IPluginFeatureProvider.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced; +namespace Pilz.Features; public interface IPluginFeatureProvider { @@ -8,5 +8,5 @@ public interface IPluginFeatureProvider public interface IPluginFeatureProvider : IPluginFeatureProvider where T : PluginFeature, IPluginFeatureProvider { static new abstract T Instance { get; } - static PluginFeature IPluginFeatureProvider.Instance => T.Instance; + static PluginFeature IPluginFeatureProvider.Instance => Instance; } diff --git a/Pilz.Plugins.Advanced/IPluginFeaturesProvider.cs b/Pilz.Features/IPluginFeaturesProvider.cs similarity index 72% rename from Pilz.Plugins.Advanced/IPluginFeaturesProvider.cs rename to Pilz.Features/IPluginFeaturesProvider.cs index 1e136f7..1d10684 100644 --- a/Pilz.Plugins.Advanced/IPluginFeaturesProvider.cs +++ b/Pilz.Features/IPluginFeaturesProvider.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced; +namespace Pilz.Features; public interface IPluginFeaturesProvider { diff --git a/Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj b/Pilz.Features/Pilz.Features.csproj similarity index 100% rename from Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj rename to Pilz.Features/Pilz.Features.csproj diff --git a/Pilz.Plugins.Advanced/PluginFeature.cs b/Pilz.Features/PluginFeature.cs similarity index 99% rename from Pilz.Plugins.Advanced/PluginFeature.cs rename to Pilz.Features/PluginFeature.cs index e049b55..2cf7abd 100644 --- a/Pilz.Plugins.Advanced/PluginFeature.cs +++ b/Pilz.Features/PluginFeature.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced; +namespace Pilz.Features; public abstract class PluginFeature { diff --git a/Pilz.Plugins.Advanced/PluginFeatureController.cs b/Pilz.Features/PluginFeatureController.cs similarity index 99% rename from Pilz.Plugins.Advanced/PluginFeatureController.cs rename to Pilz.Features/PluginFeatureController.cs index d63d08f..1322257 100644 --- a/Pilz.Plugins.Advanced/PluginFeatureController.cs +++ b/Pilz.Features/PluginFeatureController.cs @@ -1,7 +1,6 @@ -using Pilz.Plugins.Advanced.Exceptions; -using System.Reflection; +using System.Reflection; -namespace Pilz.Plugins.Advanced; +namespace Pilz.Features; public class PluginFeatureController { diff --git a/Pilz.Plugins.Advanced/PluginFeatureExecuteEventArgs.cs b/Pilz.Features/PluginFeatureExecuteEventArgs.cs similarity index 90% rename from Pilz.Plugins.Advanced/PluginFeatureExecuteEventArgs.cs rename to Pilz.Features/PluginFeatureExecuteEventArgs.cs index 2031af0..a0225b5 100644 --- a/Pilz.Plugins.Advanced/PluginFeatureExecuteEventArgs.cs +++ b/Pilz.Features/PluginFeatureExecuteEventArgs.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced; +namespace Pilz.Features; public class PluginFeatureExecuteEventArgs(PluginFeatureExecuteEventType eventType, PluginFunctionParameter? parameters) : EventArgs { diff --git a/Pilz.Plugins.Advanced/PluginFeatureExecuteEventType.cs b/Pilz.Features/PluginFeatureExecuteEventType.cs similarity index 67% rename from Pilz.Plugins.Advanced/PluginFeatureExecuteEventType.cs rename to Pilz.Features/PluginFeatureExecuteEventType.cs index b4e6caa..5f63ed5 100644 --- a/Pilz.Plugins.Advanced/PluginFeatureExecuteEventType.cs +++ b/Pilz.Features/PluginFeatureExecuteEventType.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced; +namespace Pilz.Features; public enum PluginFeatureExecuteEventType { diff --git a/Pilz.Plugins.Advanced/PluginFunction.cs b/Pilz.Features/PluginFunction.cs similarity index 97% rename from Pilz.Plugins.Advanced/PluginFunction.cs rename to Pilz.Features/PluginFunction.cs index 0d77a98..50884a6 100644 --- a/Pilz.Plugins.Advanced/PluginFunction.cs +++ b/Pilz.Features/PluginFunction.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced; +namespace Pilz.Features; public abstract class PluginFunction : PluginFeature { diff --git a/Pilz.Plugins.Advanced/PluginFunctionParameter.cs b/Pilz.Features/PluginFunctionParameter.cs similarity index 53% rename from Pilz.Plugins.Advanced/PluginFunctionParameter.cs rename to Pilz.Features/PluginFunctionParameter.cs index e9d16ed..f7ed587 100644 --- a/Pilz.Plugins.Advanced/PluginFunctionParameter.cs +++ b/Pilz.Features/PluginFunctionParameter.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced; +namespace Pilz.Features; public class PluginFunctionParameter { diff --git a/Pilz.Plugins.Advanced/PluginFunctionSimpleParamter.cs b/Pilz.Features/PluginFunctionSimpleParamter.cs similarity index 86% rename from Pilz.Plugins.Advanced/PluginFunctionSimpleParamter.cs rename to Pilz.Features/PluginFunctionSimpleParamter.cs index b55415e..902949f 100644 --- a/Pilz.Plugins.Advanced/PluginFunctionSimpleParamter.cs +++ b/Pilz.Features/PluginFunctionSimpleParamter.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced; +namespace Pilz.Features; public sealed class PluginFunctionSimpleParamter : PluginFunctionParameter { diff --git a/Pilz.Plugins.Advanced/PluginModuleBase.cs b/Pilz.Features/PluginModuleBase.cs similarity index 91% rename from Pilz.Plugins.Advanced/PluginModuleBase.cs rename to Pilz.Features/PluginModuleBase.cs index ff8343c..6a9e156 100644 --- a/Pilz.Plugins.Advanced/PluginModuleBase.cs +++ b/Pilz.Features/PluginModuleBase.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Pilz.Plugins.Advanced; +namespace Pilz.Features; [EditorBrowsable(EditorBrowsableState.Never)] public abstract class PluginModuleBase : PluginFeature diff --git a/Pilz.Plugins.Advanced.UI.WinForms/ControlExecuteReason.cs b/Pilz.UI.WinForms.Features/ControlExecuteReason.cs similarity index 65% rename from Pilz.Plugins.Advanced.UI.WinForms/ControlExecuteReason.cs rename to Pilz.UI.WinForms.Features/ControlExecuteReason.cs index 18adf6f..6b53630 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms/ControlExecuteReason.cs +++ b/Pilz.UI.WinForms.Features/ControlExecuteReason.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced.UI.WinForms; +namespace Pilz.UI.WinForms.Features; public enum ControlExecuteReason { diff --git a/Pilz.Plugins.Advanced.UI.WinForms/ControlListener.cs b/Pilz.UI.WinForms.Features/ControlListener.cs similarity index 96% rename from Pilz.Plugins.Advanced.UI.WinForms/ControlListener.cs rename to Pilz.UI.WinForms.Features/ControlListener.cs index 6f3a16c..8df1f41 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms/ControlListener.cs +++ b/Pilz.UI.WinForms.Features/ControlListener.cs @@ -1,6 +1,7 @@ -using System.Text.RegularExpressions; +using Pilz.Features; +using System.Text.RegularExpressions; -namespace Pilz.Plugins.Advanced.UI.WinForms; +namespace Pilz.UI.WinForms.Features; internal class ControlListener(IEnumerable features, Control control, bool recursive) : IControlListener { diff --git a/Pilz.Plugins.Advanced.UI.WinForms/ControlListenerDummy.cs b/Pilz.UI.WinForms.Features/ControlListenerDummy.cs similarity index 85% rename from Pilz.Plugins.Advanced.UI.WinForms/ControlListenerDummy.cs rename to Pilz.UI.WinForms.Features/ControlListenerDummy.cs index 949621a..2a96f8a 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms/ControlListenerDummy.cs +++ b/Pilz.UI.WinForms.Features/ControlListenerDummy.cs @@ -1,4 +1,6 @@ -namespace Pilz.Plugins.Advanced.UI.WinForms; +using Pilz.Features; + +namespace Pilz.UI.WinForms.Features; internal class ControlListenerDummy(IEnumerable features, Control control, bool recursive) : ControlListener(features, control, recursive) { diff --git a/Pilz.Plugins.Advanced.UI.WinForms/ControlListenerFeature.cs b/Pilz.UI.WinForms.Features/ControlListenerFeature.cs similarity index 89% rename from Pilz.Plugins.Advanced.UI.WinForms/ControlListenerFeature.cs rename to Pilz.UI.WinForms.Features/ControlListenerFeature.cs index 8c6a021..63b6f54 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms/ControlListenerFeature.cs +++ b/Pilz.UI.WinForms.Features/ControlListenerFeature.cs @@ -1,4 +1,6 @@ -namespace Pilz.Plugins.Advanced.UI.WinForms; +using Pilz.Features; + +namespace Pilz.UI.WinForms.Features; public abstract class ControlListenerFeature : PluginFeature { diff --git a/Pilz.Plugins.Advanced.UI.WinForms/ControlParameters.cs b/Pilz.UI.WinForms.Features/ControlParameters.cs similarity index 67% rename from Pilz.Plugins.Advanced.UI.WinForms/ControlParameters.cs rename to Pilz.UI.WinForms.Features/ControlParameters.cs index 322fd8c..dc680ad 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms/ControlParameters.cs +++ b/Pilz.UI.WinForms.Features/ControlParameters.cs @@ -1,4 +1,6 @@ -namespace Pilz.Plugins.Advanced.UI.WinForms; +using Pilz.Features; + +namespace Pilz.UI.WinForms.Features; public class ControlParameters(Control? control) : PluginFunctionParameter { diff --git a/Pilz.Plugins.Advanced.UI.WinForms/Extensions/PluginFeatureControllerExtensions.cs b/Pilz.UI.WinForms.Features/Extensions/PluginFeatureControllerExtensions.cs similarity index 95% rename from Pilz.Plugins.Advanced.UI.WinForms/Extensions/PluginFeatureControllerExtensions.cs rename to Pilz.UI.WinForms.Features/Extensions/PluginFeatureControllerExtensions.cs index 0fcab6a..8921250 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms/Extensions/PluginFeatureControllerExtensions.cs +++ b/Pilz.UI.WinForms.Features/Extensions/PluginFeatureControllerExtensions.cs @@ -1,4 +1,6 @@ -namespace Pilz.Plugins.Advanced.UI.WinForms.Extensions; +using Pilz.Features; + +namespace Pilz.UI.WinForms.Features.Extensions; public static class PluginFeatureControllerExtensions { diff --git a/Pilz.Plugins.Advanced.UI.WinForms/FeatureInsertMode.cs b/Pilz.UI.WinForms.Features/FeatureInsertMode.cs similarity index 95% rename from Pilz.Plugins.Advanced.UI.WinForms/FeatureInsertMode.cs rename to Pilz.UI.WinForms.Features/FeatureInsertMode.cs index d9bdcd2..2774a40 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms/FeatureInsertMode.cs +++ b/Pilz.UI.WinForms.Features/FeatureInsertMode.cs @@ -1,4 +1,6 @@ -namespace Pilz.Plugins.Advanced.UI.WinForms; +using Pilz.Features; + +namespace Pilz.UI.WinForms.Features; [Flags] public enum FeatureInsertMode diff --git a/Pilz.Plugins.Advanced.UI.WinForms/FeatureInsertPosition.cs b/Pilz.UI.WinForms.Features/FeatureInsertPosition.cs similarity index 73% rename from Pilz.Plugins.Advanced.UI.WinForms/FeatureInsertPosition.cs rename to Pilz.UI.WinForms.Features/FeatureInsertPosition.cs index 6e2b1d9..3a230d8 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms/FeatureInsertPosition.cs +++ b/Pilz.UI.WinForms.Features/FeatureInsertPosition.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced.UI.WinForms; +namespace Pilz.UI.WinForms.Features; [Flags] public enum FeatureInsertPosition diff --git a/Pilz.Plugins.Advanced.UI.WinForms/IControlListener.cs b/Pilz.UI.WinForms.Features/IControlListener.cs similarity index 60% rename from Pilz.Plugins.Advanced.UI.WinForms/IControlListener.cs rename to Pilz.UI.WinForms.Features/IControlListener.cs index f54fc69..4bb4a64 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms/IControlListener.cs +++ b/Pilz.UI.WinForms.Features/IControlListener.cs @@ -1,4 +1,6 @@ -namespace Pilz.Plugins.Advanced.UI.WinForms; +using Pilz.Features; + +namespace Pilz.UI.WinForms.Features; public interface IControlListener { diff --git a/Pilz.Plugins.Advanced.UI.WinForms/Pilz.Plugins.Advanced.UI.WinForms.csproj b/Pilz.UI.WinForms.Features/Pilz.UI.WinForms.Features.csproj similarity index 84% rename from Pilz.Plugins.Advanced.UI.WinForms/Pilz.Plugins.Advanced.UI.WinForms.csproj rename to Pilz.UI.WinForms.Features/Pilz.UI.WinForms.Features.csproj index db52db1..bb292e3 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms/Pilz.Plugins.Advanced.UI.WinForms.csproj +++ b/Pilz.UI.WinForms.Features/Pilz.UI.WinForms.Features.csproj @@ -13,7 +13,7 @@ - + diff --git a/Pilz.Plugins.Advanced.UI.WinForms/PluginModule.cs b/Pilz.UI.WinForms.Features/PluginModule.cs similarity index 86% rename from Pilz.Plugins.Advanced.UI.WinForms/PluginModule.cs rename to Pilz.UI.WinForms.Features/PluginModule.cs index 562dd2f..28c471f 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms/PluginModule.cs +++ b/Pilz.UI.WinForms.Features/PluginModule.cs @@ -1,7 +1,8 @@ -using Pilz.UI.WinForms.Dialogs; +using Pilz.Features; +using Pilz.UI.WinForms.Dialogs; using Pilz.UI.WinForms.Extensions; -namespace Pilz.Plugins.Advanced.UI.WinForms; +namespace Pilz.UI.WinForms.Features; public abstract class PluginModule : PluginModule { diff --git a/Pilz.Plugins.Advanced.UI.WinForms/PluginModuleUI.cs b/Pilz.UI.WinForms.Features/PluginModuleUI.cs similarity index 62% rename from Pilz.Plugins.Advanced.UI.WinForms/PluginModuleUI.cs rename to Pilz.UI.WinForms.Features/PluginModuleUI.cs index e5e115a..077687e 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms/PluginModuleUI.cs +++ b/Pilz.UI.WinForms.Features/PluginModuleUI.cs @@ -1,7 +1,6 @@ -using Pilz.UI; -using Pilz.UI.WinForms.Dialogs; +using Pilz.UI.WinForms.Dialogs; -namespace Pilz.Plugins.Advanced.UI.WinForms; +namespace Pilz.UI.WinForms.Features; public partial class PluginModuleUI : FlyoutBase, ILoadContent { diff --git a/Pilz.Plugins.Advanced.UI.WinForms/PluginModule{T}.cs b/Pilz.UI.WinForms.Features/PluginModule{T}.cs similarity index 95% rename from Pilz.Plugins.Advanced.UI.WinForms/PluginModule{T}.cs rename to Pilz.UI.WinForms.Features/PluginModule{T}.cs index b729746..deeff91 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms/PluginModule{T}.cs +++ b/Pilz.UI.WinForms.Features/PluginModule{T}.cs @@ -1,4 +1,6 @@ -namespace Pilz.Plugins.Advanced.UI.WinForms; +using Pilz.Features; + +namespace Pilz.UI.WinForms.Features; public abstract class PluginModule : PluginModuleBase where TPluginModuleUI : Control { diff --git a/Pilz.Plugins.Advanced.UI.WinForms.Telerik/Extensions.cs b/Pilz.UI.WinForms.Telerik.Features/Extensions.cs similarity index 98% rename from Pilz.Plugins.Advanced.UI.WinForms.Telerik/Extensions.cs rename to Pilz.UI.WinForms.Telerik.Features/Extensions.cs index c99a22b..aa02db6 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms.Telerik/Extensions.cs +++ b/Pilz.UI.WinForms.Telerik.Features/Extensions.cs @@ -1,7 +1,9 @@ -using Telerik.WinControls; +using Pilz.Features; +using Pilz.UI.WinForms.Features; +using Telerik.WinControls; using Telerik.WinControls.UI; -namespace Pilz.Plugins.Advanced.UI.WinForms.Telerik; +namespace Pilz.UI.WinForms.Telerik.Features; public static class Extensions { diff --git a/Pilz.Plugins.Advanced.UI.WinForms.Telerik/Pilz.Plugins.Advanced.UI.WinForms.Telerik.csproj b/Pilz.UI.WinForms.Telerik.Features/Pilz.UI.WinForms.Telerik.Features.csproj similarity index 86% rename from Pilz.Plugins.Advanced.UI.WinForms.Telerik/Pilz.Plugins.Advanced.UI.WinForms.Telerik.csproj rename to Pilz.UI.WinForms.Telerik.Features/Pilz.UI.WinForms.Telerik.Features.csproj index 8ad041c..9d2d5c0 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms.Telerik/Pilz.Plugins.Advanced.UI.WinForms.Telerik.csproj +++ b/Pilz.UI.WinForms.Telerik.Features/Pilz.UI.WinForms.Telerik.Features.csproj @@ -9,7 +9,7 @@ - + diff --git a/Pilz.Plugins.Advanced.UI.WinForms.Telerik/PluginButtonType.cs b/Pilz.UI.WinForms.Telerik.Features/PluginButtonType.cs similarity index 62% rename from Pilz.Plugins.Advanced.UI.WinForms.Telerik/PluginButtonType.cs rename to Pilz.UI.WinForms.Telerik.Features/PluginButtonType.cs index 6c98208..9a804f9 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms.Telerik/PluginButtonType.cs +++ b/Pilz.UI.WinForms.Telerik.Features/PluginButtonType.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced.UI.WinForms.Telerik; +namespace Pilz.UI.WinForms.Telerik.Features; public enum PluginButtonType { diff --git a/Pilz.Plugins.Advanced.UI.WinForms.Telerik/RadPluginModule.cs b/Pilz.UI.WinForms.Telerik.Features/RadPluginModule.cs similarity index 86% rename from Pilz.Plugins.Advanced.UI.WinForms.Telerik/RadPluginModule.cs rename to Pilz.UI.WinForms.Telerik.Features/RadPluginModule.cs index 4457e1c..d337257 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms.Telerik/RadPluginModule.cs +++ b/Pilz.UI.WinForms.Telerik.Features/RadPluginModule.cs @@ -1,8 +1,10 @@ -using Pilz.UI.WinForms.Telerik.Dialogs; +using Pilz.Features; +using Pilz.UI.WinForms.Features; +using Pilz.UI.WinForms.Telerik.Dialogs; using Pilz.UI.WinForms.Telerik.Extensions; using Telerik.WinControls; -namespace Pilz.Plugins.Advanced.UI.WinForms.Telerik; +namespace Pilz.UI.WinForms.Telerik.Features; public abstract class RadPluginModule : PluginModule { diff --git a/Pilz.Plugins.Advanced.UI.WinForms.Telerik/RadPluginModuleUI.cs b/Pilz.UI.WinForms.Telerik.Features/RadPluginModuleUI.cs similarity index 63% rename from Pilz.Plugins.Advanced.UI.WinForms.Telerik/RadPluginModuleUI.cs rename to Pilz.UI.WinForms.Telerik.Features/RadPluginModuleUI.cs index f98bf47..86c1914 100644 --- a/Pilz.Plugins.Advanced.UI.WinForms.Telerik/RadPluginModuleUI.cs +++ b/Pilz.UI.WinForms.Telerik.Features/RadPluginModuleUI.cs @@ -1,7 +1,6 @@ -using Pilz.UI; -using Pilz.UI.WinForms.Telerik.Dialogs; +using Pilz.UI.WinForms.Telerik.Dialogs; -namespace Pilz.Plugins.Advanced.UI.WinForms.Telerik; +namespace Pilz.UI.WinForms.Telerik.Features; public class RadPluginModuleUI : RadFlyoutBase, ILoadContent { diff --git a/Pilz.sln b/Pilz.sln index a5b3664..5097624 100644 --- a/Pilz.sln +++ b/Pilz.sln @@ -35,13 +35,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Net.CloudProviders.Nex EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Plugins", "Pilz.Plugins\Pilz.Plugins.csproj", "{1170FCA6-192D-42FE-A79F-49EE03035554}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Plugins.Advanced", "Pilz.Plugins.Advanced\Pilz.Plugins.Advanced.csproj", "{72153EC8-B297-4A94-80AA-3574544BE8CF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Features", "Pilz.Features\Pilz.Features.csproj", "{72153EC8-B297-4A94-80AA-3574544BE8CF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Gaming.Minecraft", "Pilz.Gaming.Minecraft\Pilz.Gaming.Minecraft.csproj", "{B285DA24-39C9-4BA2-AF3D-A1A05737268B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Plugins.Advanced.UI.WinForms", "Pilz.Plugins.Advanced.UI.WinForms\Pilz.Plugins.Advanced.UI.WinForms.csproj", "{5030C047-B04B-4BA7-8CEF-3B6C3F3A2C59}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.UI.WinForms.Features", "Pilz.UI.WinForms.Features\Pilz.UI.WinForms.Features.csproj", "{5030C047-B04B-4BA7-8CEF-3B6C3F3A2C59}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Plugins.Advanced.UI.WinForms.Telerik", "Pilz.Plugins.Advanced.UI.WinForms.Telerik\Pilz.Plugins.Advanced.UI.WinForms.Telerik.csproj", "{0A837BD6-A19C-4A05-A57D-CBB0CD64B244}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.UI.WinForms.Telerik.Features", "Pilz.UI.WinForms.Telerik.Features\Pilz.UI.WinForms.Telerik.Features.csproj", "{0A837BD6-A19C-4A05-A57D-CBB0CD64B244}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pilz.Extensions", "Pilz.Extensions\Pilz.Extensions.csproj", "{63DA7581-F35E-4EDD-BEAE-01E281B0BDC3}" EndProject diff --git a/Pilz/Data/Json/JsonDataContainer.cs b/Pilz/Data/Json/JsonDataContainer.cs index 24d0a31..38b4a64 100644 --- a/Pilz/Data/Json/JsonDataContainer.cs +++ b/Pilz/Data/Json/JsonDataContainer.cs @@ -24,7 +24,7 @@ public abstract class JsonDataContainer list = new(); sets.Add(list); } - + return list; } }