diff --git a/Pilz.Plugins.Advanced.UI.Telerik/Extensions.cs b/Pilz.Plugins.Advanced.UI.WinForms.Telerik/Extensions.cs similarity index 94% rename from Pilz.Plugins.Advanced.UI.Telerik/Extensions.cs rename to Pilz.Plugins.Advanced.UI.WinForms.Telerik/Extensions.cs index 4070253..65e7418 100644 --- a/Pilz.Plugins.Advanced.UI.Telerik/Extensions.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms.Telerik/Extensions.cs @@ -1,7 +1,7 @@ using Telerik.WinControls; using Telerik.WinControls.UI; -namespace Pilz.Plugins.Advanced.UI.Telerik; +namespace Pilz.Plugins.Advanced.UI.WinForms.Telerik; public static class Extensions { @@ -14,27 +14,27 @@ public static class Extensions public static RadButtonItem GetAsItem(this PluginModuleBase module, PluginButtonType buttonType = PluginButtonType.RadMenuItem) { - return GetAsItem(module, true, buttonType: buttonType); + return module.GetAsItem(true, buttonType: buttonType); } public static RadButtonItem GetAsItem(this PluginModuleBase module, bool addDefaultHandler, PluginButtonType buttonType = PluginButtonType.RadMenuItem) { - return GetAsItem(module, addDefaultHandler ? RadMenuItem_RMMethod_Click : null, buttonType: buttonType); + return module.GetAsItem(addDefaultHandler ? RadMenuItem_RMMethod_Click : null, buttonType: buttonType); } public static RadButtonItem GetAsItem(this PluginFunction function, PluginButtonType buttonType = PluginButtonType.RadMenuItem) { - return GetAsItem(function, true, buttonType: buttonType); + return function.GetAsItem(true, buttonType: buttonType); } public static RadButtonItem GetAsItem(this PluginFunction function, bool addDefaultHandler, PluginButtonType buttonType = PluginButtonType.RadMenuItem) { - return GetAsItem(function, addDefaultHandler ? RadMenuItem_RMFunction_Click : null, buttonType: buttonType); + return function.GetAsItem(addDefaultHandler ? RadMenuItem_RMFunction_Click : null, buttonType: buttonType); } public static RadButtonItem GetAsItem(this PluginFeature module, EventHandler? clickHandler, PluginButtonType buttonType = PluginButtonType.RadMenuItem) { - RadButtonItem item = buttonType switch + var item = buttonType switch { PluginButtonType.RadMenuItem => new RadMenuItem(), PluginButtonType.RadButtonElement => new RadButtonElement(), diff --git a/Pilz.Plugins.Advanced.UI.Telerik/Pilz.Plugins.Advanced.UI.Telerik.csproj b/Pilz.Plugins.Advanced.UI.WinForms.Telerik/Pilz.Plugins.Advanced.UI.WinForms.Telerik.csproj similarity index 72% rename from Pilz.Plugins.Advanced.UI.Telerik/Pilz.Plugins.Advanced.UI.Telerik.csproj rename to Pilz.Plugins.Advanced.UI.WinForms.Telerik/Pilz.Plugins.Advanced.UI.WinForms.Telerik.csproj index aecbdef..8d70348 100644 --- a/Pilz.Plugins.Advanced.UI.Telerik/Pilz.Plugins.Advanced.UI.Telerik.csproj +++ b/Pilz.Plugins.Advanced.UI.WinForms.Telerik/Pilz.Plugins.Advanced.UI.WinForms.Telerik.csproj @@ -9,12 +9,12 @@ - - + + - 1.7.5 + 1.8.0 diff --git a/Pilz.Plugins.Advanced.UI.Telerik/PluginButtonType.cs b/Pilz.Plugins.Advanced.UI.WinForms.Telerik/PluginButtonType.cs similarity index 62% rename from Pilz.Plugins.Advanced.UI.Telerik/PluginButtonType.cs rename to Pilz.Plugins.Advanced.UI.WinForms.Telerik/PluginButtonType.cs index b1f757b..6c98208 100644 --- a/Pilz.Plugins.Advanced.UI.Telerik/PluginButtonType.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms.Telerik/PluginButtonType.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced.UI.Telerik; +namespace Pilz.Plugins.Advanced.UI.WinForms.Telerik; public enum PluginButtonType { diff --git a/Pilz.Plugins.Advanced.UI.Telerik/RadPluginModule.cs b/Pilz.Plugins.Advanced.UI.WinForms.Telerik/RadPluginModule.cs similarity index 90% rename from Pilz.Plugins.Advanced.UI.Telerik/RadPluginModule.cs rename to Pilz.Plugins.Advanced.UI.WinForms.Telerik/RadPluginModule.cs index 43e6f06..a177f96 100644 --- a/Pilz.Plugins.Advanced.UI.Telerik/RadPluginModule.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms.Telerik/RadPluginModule.cs @@ -1,8 +1,8 @@ using Pilz.UI.Telerik.Dialogs; -using Pilz.UI.Telerik.Extensions; +using Pilz.UI.WinForms.Telerik.Extensions; using Telerik.WinControls; -namespace Pilz.Plugins.Advanced.UI.Telerik; +namespace Pilz.Plugins.Advanced.UI.WinForms.Telerik; public abstract class RadPluginModule : PluginModule { diff --git a/Pilz.Plugins.Advanced.UI.Telerik/RadPluginModuleUI.cs b/Pilz.Plugins.Advanced.UI.WinForms.Telerik/RadPluginModuleUI.cs similarity index 63% rename from Pilz.Plugins.Advanced.UI.Telerik/RadPluginModuleUI.cs rename to Pilz.Plugins.Advanced.UI.WinForms.Telerik/RadPluginModuleUI.cs index 6f1231e..37e05a5 100644 --- a/Pilz.Plugins.Advanced.UI.Telerik/RadPluginModuleUI.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms.Telerik/RadPluginModuleUI.cs @@ -1,7 +1,7 @@ -using Pilz.UI; -using Pilz.UI.Telerik.Dialogs; +using Pilz.UI.Telerik.Dialogs; +using Pilz.UI.WinForms; -namespace Pilz.Plugins.Advanced.UI.Telerik; +namespace Pilz.Plugins.Advanced.UI.WinForms.Telerik; public class RadPluginModuleUI : RadFlyoutBase, ILoadContent { diff --git a/Pilz.Plugins.Advanced.UI/ControlExecuteReason.cs b/Pilz.Plugins.Advanced.UI.WinForms/ControlExecuteReason.cs similarity index 65% rename from Pilz.Plugins.Advanced.UI/ControlExecuteReason.cs rename to Pilz.Plugins.Advanced.UI.WinForms/ControlExecuteReason.cs index 3d3ff13..18adf6f 100644 --- a/Pilz.Plugins.Advanced.UI/ControlExecuteReason.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms/ControlExecuteReason.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced.UI; +namespace Pilz.Plugins.Advanced.UI.WinForms; public enum ControlExecuteReason { diff --git a/Pilz.Plugins.Advanced.UI/ControlListener.cs b/Pilz.Plugins.Advanced.UI.WinForms/ControlListener.cs similarity index 98% rename from Pilz.Plugins.Advanced.UI/ControlListener.cs rename to Pilz.Plugins.Advanced.UI.WinForms/ControlListener.cs index f9673ae..6f3a16c 100644 --- a/Pilz.Plugins.Advanced.UI/ControlListener.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms/ControlListener.cs @@ -1,6 +1,6 @@ using System.Text.RegularExpressions; -namespace Pilz.Plugins.Advanced.UI; +namespace Pilz.Plugins.Advanced.UI.WinForms; internal class ControlListener(IEnumerable features, Control control, bool recursive) : IControlListener { diff --git a/Pilz.Plugins.Advanced.UI/ControlListenerDummy.cs b/Pilz.Plugins.Advanced.UI.WinForms/ControlListenerDummy.cs similarity index 88% rename from Pilz.Plugins.Advanced.UI/ControlListenerDummy.cs rename to Pilz.Plugins.Advanced.UI.WinForms/ControlListenerDummy.cs index c08b7db..949621a 100644 --- a/Pilz.Plugins.Advanced.UI/ControlListenerDummy.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms/ControlListenerDummy.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced.UI; +namespace Pilz.Plugins.Advanced.UI.WinForms; internal class ControlListenerDummy(IEnumerable features, Control control, bool recursive) : ControlListener(features, control, recursive) { diff --git a/Pilz.Plugins.Advanced.UI/ControlListenerFeature.cs b/Pilz.Plugins.Advanced.UI.WinForms/ControlListenerFeature.cs similarity index 91% rename from Pilz.Plugins.Advanced.UI/ControlListenerFeature.cs rename to Pilz.Plugins.Advanced.UI.WinForms/ControlListenerFeature.cs index 9c43117..477518c 100644 --- a/Pilz.Plugins.Advanced.UI/ControlListenerFeature.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms/ControlListenerFeature.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced.UI; +namespace Pilz.Plugins.Advanced.UI.WinForms; public abstract class ControlListenerFeature : PluginFeature { diff --git a/Pilz.Plugins.Advanced.UI/ControlParameters.cs b/Pilz.Plugins.Advanced.UI.WinForms/ControlParameters.cs similarity index 72% rename from Pilz.Plugins.Advanced.UI/ControlParameters.cs rename to Pilz.Plugins.Advanced.UI.WinForms/ControlParameters.cs index 7456a16..322fd8c 100644 --- a/Pilz.Plugins.Advanced.UI/ControlParameters.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms/ControlParameters.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced.UI; +namespace Pilz.Plugins.Advanced.UI.WinForms; public class ControlParameters(Control? control) : PluginFunctionParameter { diff --git a/Pilz.Plugins.Advanced.UI/Extensions/PluginFeatureControllerExtensions.cs b/Pilz.Plugins.Advanced.UI.WinForms/Extensions/PluginFeatureControllerExtensions.cs similarity index 78% rename from Pilz.Plugins.Advanced.UI/Extensions/PluginFeatureControllerExtensions.cs rename to Pilz.Plugins.Advanced.UI.WinForms/Extensions/PluginFeatureControllerExtensions.cs index 0f69e73..0fcab6a 100644 --- a/Pilz.Plugins.Advanced.UI/Extensions/PluginFeatureControllerExtensions.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms/Extensions/PluginFeatureControllerExtensions.cs @@ -1,20 +1,20 @@ -namespace Pilz.Plugins.Advanced.UI.Extensions; +namespace Pilz.Plugins.Advanced.UI.WinForms.Extensions; public static class PluginFeatureControllerExtensions { public static IControlListener ApplyControlManager(this PluginFeatureController @this, string featureType, Control control) { - return ApplyControlManager(@this, featureType, control, true, true); + return @this.ApplyControlManager(featureType, control, true, true); } public static IControlListener ApplyControlManager(this PluginFeatureController @this, string featureType, Control control, PluginFunctionParameter? parameter) { - return ApplyControlManager(@this, featureType, control, true, true, parameter); + return @this.ApplyControlManager(featureType, control, true, true, parameter); } public static IControlListener ApplyControlManager(this PluginFeatureController @this, string featureType, Control control, bool recursive, bool autoTrack) { - return ApplyControlManager(@this, featureType, control, recursive, autoTrack, null); + return @this.ApplyControlManager(featureType, control, recursive, autoTrack, null); } public static IControlListener ApplyControlManager(this PluginFeatureController @this, string featureType, Control control, bool recursive, bool autoTrack, PluginFunctionParameter? parameter) diff --git a/Pilz.Plugins.Advanced.UI/FeatureInsertMode.cs b/Pilz.Plugins.Advanced.UI.WinForms/FeatureInsertMode.cs similarity index 96% rename from Pilz.Plugins.Advanced.UI/FeatureInsertMode.cs rename to Pilz.Plugins.Advanced.UI.WinForms/FeatureInsertMode.cs index f7fb3fd..d9bdcd2 100644 --- a/Pilz.Plugins.Advanced.UI/FeatureInsertMode.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms/FeatureInsertMode.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced.UI; +namespace Pilz.Plugins.Advanced.UI.WinForms; [Flags] public enum FeatureInsertMode diff --git a/Pilz.Plugins.Advanced.UI/FeatureInsertPosition.cs b/Pilz.Plugins.Advanced.UI.WinForms/FeatureInsertPosition.cs similarity index 73% rename from Pilz.Plugins.Advanced.UI/FeatureInsertPosition.cs rename to Pilz.Plugins.Advanced.UI.WinForms/FeatureInsertPosition.cs index 1c0ab10..6e2b1d9 100644 --- a/Pilz.Plugins.Advanced.UI/FeatureInsertPosition.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms/FeatureInsertPosition.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced.UI; +namespace Pilz.Plugins.Advanced.UI.WinForms; [Flags] public enum FeatureInsertPosition diff --git a/Pilz.Plugins.Advanced.UI/IControlListener.cs b/Pilz.Plugins.Advanced.UI.WinForms/IControlListener.cs similarity index 65% rename from Pilz.Plugins.Advanced.UI/IControlListener.cs rename to Pilz.Plugins.Advanced.UI.WinForms/IControlListener.cs index 58b1762..f54fc69 100644 --- a/Pilz.Plugins.Advanced.UI/IControlListener.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms/IControlListener.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced.UI; +namespace Pilz.Plugins.Advanced.UI.WinForms; public interface IControlListener { diff --git a/Pilz.Plugins.Advanced.UI/Pilz.Plugins.Advanced.UI.csproj b/Pilz.Plugins.Advanced.UI.WinForms/Pilz.Plugins.Advanced.UI.WinForms.csproj similarity index 81% rename from Pilz.Plugins.Advanced.UI/Pilz.Plugins.Advanced.UI.csproj rename to Pilz.Plugins.Advanced.UI.WinForms/Pilz.Plugins.Advanced.UI.WinForms.csproj index 31a0b22..c693d83 100644 --- a/Pilz.Plugins.Advanced.UI/Pilz.Plugins.Advanced.UI.csproj +++ b/Pilz.Plugins.Advanced.UI.WinForms/Pilz.Plugins.Advanced.UI.WinForms.csproj @@ -9,12 +9,12 @@ - 1.8.3 + 1.9.0 - + diff --git a/Pilz.Plugins.Advanced.UI/PluginModule.cs b/Pilz.Plugins.Advanced.UI.WinForms/PluginModule.cs similarity index 87% rename from Pilz.Plugins.Advanced.UI/PluginModule.cs rename to Pilz.Plugins.Advanced.UI.WinForms/PluginModule.cs index 79f5800..473228c 100644 --- a/Pilz.Plugins.Advanced.UI/PluginModule.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms/PluginModule.cs @@ -1,7 +1,7 @@ using Pilz.UI.Dialogs; -using Pilz.UI.Extensions; +using Pilz.UI.WinForms.Extensions; -namespace Pilz.Plugins.Advanced.UI; +namespace Pilz.Plugins.Advanced.UI.WinForms; public abstract class PluginModule : PluginModule { diff --git a/Pilz.Plugins.Advanced.UI/PluginModuleUI.cs b/Pilz.Plugins.Advanced.UI.WinForms/PluginModuleUI.cs similarity index 60% rename from Pilz.Plugins.Advanced.UI/PluginModuleUI.cs rename to Pilz.Plugins.Advanced.UI.WinForms/PluginModuleUI.cs index 554266b..b14bca2 100644 --- a/Pilz.Plugins.Advanced.UI/PluginModuleUI.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms/PluginModuleUI.cs @@ -1,7 +1,7 @@ -using Pilz.UI; -using Pilz.UI.Dialogs; +using Pilz.UI.WinForms; +using Pilz.UI.WinForms.Dialogs; -namespace Pilz.Plugins.Advanced.UI; +namespace Pilz.Plugins.Advanced.UI.WinForms; public partial class PluginModuleUI : FlyoutBase, ILoadContent { diff --git a/Pilz.Plugins.Advanced.UI/PluginModule{T}.cs b/Pilz.Plugins.Advanced.UI.WinForms/PluginModule{T}.cs similarity index 96% rename from Pilz.Plugins.Advanced.UI/PluginModule{T}.cs rename to Pilz.Plugins.Advanced.UI.WinForms/PluginModule{T}.cs index d20b17d..b729746 100644 --- a/Pilz.Plugins.Advanced.UI/PluginModule{T}.cs +++ b/Pilz.Plugins.Advanced.UI.WinForms/PluginModule{T}.cs @@ -1,4 +1,4 @@ -namespace Pilz.Plugins.Advanced.UI; +namespace Pilz.Plugins.Advanced.UI.WinForms; public abstract class PluginModule : PluginModuleBase where TPluginModuleUI : Control { diff --git a/Pilz.UI.Telerik.Symbols/Factories/BasicFactory.cs b/Pilz.UI.WinForms.Telerik.Symbols/Factories/BasicFactory.cs similarity index 88% rename from Pilz.UI.Telerik.Symbols/Factories/BasicFactory.cs rename to Pilz.UI.WinForms.Telerik.Symbols/Factories/BasicFactory.cs index f6f6a90..9b663f7 100644 --- a/Pilz.UI.Telerik.Symbols/Factories/BasicFactory.cs +++ b/Pilz.UI.WinForms.Telerik.Symbols/Factories/BasicFactory.cs @@ -1,6 +1,6 @@ using System.Reflection; -namespace Pilz.UI.Telerik.Symbols.Factories; +namespace Pilz.UI.WinForms.Telerik.Symbols.Factories; public class BasicFactory(string baseName) : RadSymbolFactory where T : Enum { diff --git a/Pilz.UI.Telerik.Symbols/Pilz.UI.Telerik.Symbols.csproj b/Pilz.UI.WinForms.Telerik.Symbols/Pilz.UI.WinForms.Telerik.Symbols.csproj similarity index 79% rename from Pilz.UI.Telerik.Symbols/Pilz.UI.Telerik.Symbols.csproj rename to Pilz.UI.WinForms.Telerik.Symbols/Pilz.UI.WinForms.Telerik.Symbols.csproj index 3ecc71c..1773bd8 100644 --- a/Pilz.UI.Telerik.Symbols/Pilz.UI.Telerik.Symbols.csproj +++ b/Pilz.UI.WinForms.Telerik.Symbols/Pilz.UI.WinForms.Telerik.Symbols.csproj @@ -8,7 +8,7 @@ - 1.0.10 + 1.2.0 True @@ -17,7 +17,7 @@ - + diff --git a/Pilz.UI.Telerik.Symbols/RadSymbols.cs b/Pilz.UI.WinForms.Telerik.Symbols/RadSymbols.cs similarity index 91% rename from Pilz.UI.Telerik.Symbols/RadSymbols.cs rename to Pilz.UI.WinForms.Telerik.Symbols/RadSymbols.cs index 01ecc36..cca8464 100644 --- a/Pilz.UI.Telerik.Symbols/RadSymbols.cs +++ b/Pilz.UI.WinForms.Telerik.Symbols/RadSymbols.cs @@ -1,7 +1,7 @@ using Pilz.SymbolPacks.Sets; using Pilz.UI.Telerik.Symbols.Factories; -namespace Pilz.UI.Telerik.Symbols; +namespace Pilz.UI.WinForms.Telerik.Symbols; public static class RadSymbols { diff --git a/Pilz.UI.Telerik/Controls/RadValidationProvider/IRadValidationRuleEx.cs b/Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/IRadValidationRuleEx.cs similarity index 96% rename from Pilz.UI.Telerik/Controls/RadValidationProvider/IRadValidationRuleEx.cs rename to Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/IRadValidationRuleEx.cs index f3ce290..32ca342 100644 --- a/Pilz.UI.Telerik/Controls/RadValidationProvider/IRadValidationRuleEx.cs +++ b/Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/IRadValidationRuleEx.cs @@ -1,7 +1,7 @@ //using System.Linq; using Telerik.WinControls; -namespace Pilz.UI.Telerik.Controls.RadValidationProvider; +namespace Pilz.UI.WinForms.Telerik.Controls.RadValidationProvider; /// diff --git a/Pilz.UI.Telerik/Controls/RadValidationProvider/RadCompositeValidationRuleEx.cs b/Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadCompositeValidationRuleEx.cs similarity index 95% rename from Pilz.UI.Telerik/Controls/RadValidationProvider/RadCompositeValidationRuleEx.cs rename to Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadCompositeValidationRuleEx.cs index ba89ef6..b1b1ac5 100644 --- a/Pilz.UI.Telerik/Controls/RadValidationProvider/RadCompositeValidationRuleEx.cs +++ b/Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadCompositeValidationRuleEx.cs @@ -5,7 +5,7 @@ using Telerik.WinControls; //using System.Linq; using Telerik.WinControls.Data; -namespace Pilz.UI.Telerik.Controls.RadValidationProvider; +namespace Pilz.UI.WinForms.Telerik.Controls.RadValidationProvider; /// /// RadCompositeValidationRule evaluates two or more RadValidationRules or RadValidationRuleWithTargetControl @@ -30,12 +30,10 @@ public class RadCompositeValidationRuleEx : CompositeFilterDescriptor, IRadValid List controls = []; foreach (IRadValidationRuleEx validationRule in ValidationRules) { - foreach (Control control in validationRule.Controls) + foreach (var control in validationRule.Controls) { if (!controls.Contains(control)) - { controls.Add(control); - } } } @@ -58,16 +56,12 @@ public class RadCompositeValidationRuleEx : CompositeFilterDescriptor, IRadValid public virtual void AddControl(RadControl control) { if (control == null) - { return; - } foreach (IRadValidationRuleEx validationRule in ValidationRules) { if (!validationRule.Controls.Contains(control)) - { validationRule.AddControl(control); - } } } @@ -78,9 +72,7 @@ public class RadCompositeValidationRuleEx : CompositeFilterDescriptor, IRadValid public void RemoveControl(RadControl control) { if (control == null) - { return; - } foreach (IRadValidationRuleEx validationRule in ValidationRules) { diff --git a/Pilz.UI.Telerik/Controls/RadValidationProvider/RadValidationEventArgsEx.cs b/Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadValidationEventArgsEx.cs similarity index 98% rename from Pilz.UI.Telerik/Controls/RadValidationProvider/RadValidationEventArgsEx.cs rename to Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadValidationEventArgsEx.cs index f3a0f28..1b32b71 100644 --- a/Pilz.UI.Telerik/Controls/RadValidationProvider/RadValidationEventArgsEx.cs +++ b/Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadValidationEventArgsEx.cs @@ -1,7 +1,7 @@ using Telerik.WinControls; using Telerik.WinControls.UI; -namespace Pilz.UI.Telerik.Controls.RadValidationProvider; +namespace Pilz.UI.WinForms.Telerik.Controls.RadValidationProvider; public delegate void RadValidationEventHandlerEx(object sender, RadValidationEventArgsEx e); diff --git a/Pilz.UI.Telerik/Controls/RadValidationProvider/RadValidationProviderEx.cs b/Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadValidationProviderEx.cs similarity index 99% rename from Pilz.UI.Telerik/Controls/RadValidationProvider/RadValidationProviderEx.cs rename to Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadValidationProviderEx.cs index 3c3984d..61b1725 100644 --- a/Pilz.UI.Telerik/Controls/RadValidationProvider/RadValidationProviderEx.cs +++ b/Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadValidationProviderEx.cs @@ -11,7 +11,7 @@ using Telerik.WinControls.Data; using Telerik.WinControls.Design; using Telerik.WinControls.UI; -namespace Pilz.UI.Telerik.Controls.RadValidationProvider; +namespace Pilz.UI.WinForms.Telerik.Controls.RadValidationProvider; /// /// Provides a validation management for RadControl descendant editors. diff --git a/Pilz.UI.Telerik/Controls/RadValidationProvider/RadValidationRuleEx.cs b/Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadValidationRuleEx.cs similarity index 92% rename from Pilz.UI.Telerik/Controls/RadValidationProvider/RadValidationRuleEx.cs rename to Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadValidationRuleEx.cs index 2effbe6..127f318 100644 --- a/Pilz.UI.Telerik/Controls/RadValidationProvider/RadValidationRuleEx.cs +++ b/Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadValidationRuleEx.cs @@ -3,7 +3,7 @@ using System.Drawing.Design; using Telerik.WinControls; using Telerik.WinControls.Data; -namespace Pilz.UI.Telerik.Controls.RadValidationProvider; +namespace Pilz.UI.WinForms.Telerik.Controls.RadValidationProvider; /// /// RadValidationRule provides a validation logic which compares RadControl's Property with Rule's Value. @@ -42,9 +42,7 @@ public class RadValidationRuleEx : FilterDescriptor, IRadValidationRuleEx public virtual void AddControl(RadControl control) { if (control != null && !controls.Contains(control)) - { controls.Add(control); - } } /// @@ -54,9 +52,7 @@ public class RadValidationRuleEx : FilterDescriptor, IRadValidationRuleEx public virtual void RemoveControl(RadControl control) { if (control == null) - { return; - } while (controls.Contains(control)) { @@ -120,8 +116,8 @@ public class RadValidationRuleEx : FilterDescriptor, IRadValidationRuleEx [DefaultValue(false)] public bool AutoToolTip { - get { return this.autoToolTip; } - set { this.autoToolTip = value; } + get { return autoToolTip; } + set { autoToolTip = value; } } /// @@ -130,8 +126,8 @@ public class RadValidationRuleEx : FilterDescriptor, IRadValidationRuleEx [DefaultValue("Validation Failed")] public string ToolTipTitle { - get { return this.toolTipTitle; } - set { this.toolTipTitle = value; } + get { return toolTipTitle; } + set { toolTipTitle = value; } } @@ -141,8 +137,8 @@ public class RadValidationRuleEx : FilterDescriptor, IRadValidationRuleEx [DefaultValue(false)] public bool CaseSensitive { - get { return this.caseSensitive; } - set { this.caseSensitive = value; } + get { return caseSensitive; } + set { caseSensitive = value; } } /// diff --git a/Pilz.UI.Telerik/Controls/RadValidationProvider/RadValidationRuleWithTargetControlEx.cs b/Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadValidationRuleWithTargetControlEx.cs similarity index 79% rename from Pilz.UI.Telerik/Controls/RadValidationProvider/RadValidationRuleWithTargetControlEx.cs rename to Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadValidationRuleWithTargetControlEx.cs index 05e3ec2..a181d67 100644 --- a/Pilz.UI.Telerik/Controls/RadValidationProvider/RadValidationRuleWithTargetControlEx.cs +++ b/Pilz.UI.WinForms.Telerik/Controls/RadValidationProvider/RadValidationRuleWithTargetControlEx.cs @@ -2,7 +2,7 @@ using Telerik.WinControls.Data; //using System.Linq; -namespace Pilz.UI.Telerik.Controls.RadValidationProvider; +namespace Pilz.UI.WinForms.Telerik.Controls.RadValidationProvider; /// @@ -29,8 +29,8 @@ public class RadValidationRuleWithTargetControlEx : RadValidationRuleEx [DefaultValue("Text")] public string TargetControlPropertyName { - get { return this.sourceControlPropertyName; } - set { this.sourceControlPropertyName = value; } + get { return sourceControlPropertyName; } + set { sourceControlPropertyName = value; } } /// @@ -41,10 +41,8 @@ public class RadValidationRuleWithTargetControlEx : RadValidationRuleEx { get { - if (this.TargetControl != null) - { - this.Value = this.CalculateValue(); - } + if (TargetControl != null) + Value = CalculateValue(); return base.Expression; } @@ -60,7 +58,7 @@ public class RadValidationRuleWithTargetControlEx : RadValidationRuleEx { get { - if (this.TargetControl != null && !string.IsNullOrEmpty(this.TargetControlPropertyName)) + if (TargetControl != null && !string.IsNullOrEmpty(TargetControlPropertyName)) { try { @@ -80,12 +78,10 @@ public class RadValidationRuleWithTargetControlEx : RadValidationRuleEx protected virtual object CalculateValue() { - if (this.TargetControl.Site != null) - { - return string.Format("{0}.{1}", this.TargetControl.Name, this.TargetControlPropertyName); - } + if (TargetControl.Site != null) + return string.Format("{0}.{1}", TargetControl.Name, TargetControlPropertyName); - if (!string.IsNullOrEmpty(this.TargetControlPropertyName)) + if (!string.IsNullOrEmpty(TargetControlPropertyName)) { try { diff --git a/Pilz.UI.Telerik/Dialogs/DialogClosedEventArgs.cs b/Pilz.UI.WinForms.Telerik/Dialogs/DialogClosedEventArgs.cs similarity index 76% rename from Pilz.UI.Telerik/Dialogs/DialogClosedEventArgs.cs rename to Pilz.UI.WinForms.Telerik/Dialogs/DialogClosedEventArgs.cs index 0f67c13..c2873e6 100644 --- a/Pilz.UI.Telerik/Dialogs/DialogClosedEventArgs.cs +++ b/Pilz.UI.WinForms.Telerik/Dialogs/DialogClosedEventArgs.cs @@ -1,4 +1,6 @@ -namespace Pilz.UI.Telerik.Dialogs; +using Pilz.UI.Telerik.Dialogs; + +namespace Pilz.UI.WinForms.Telerik.Dialogs; public class DialogClosedEventArgs : EventArgs { diff --git a/Pilz.UI.Telerik/Dialogs/DialogLoadingEventArgs.cs b/Pilz.UI.WinForms.Telerik/Dialogs/DialogLoadingEventArgs.cs similarity index 76% rename from Pilz.UI.Telerik/Dialogs/DialogLoadingEventArgs.cs rename to Pilz.UI.WinForms.Telerik/Dialogs/DialogLoadingEventArgs.cs index bd68b7d..6ede8d1 100644 --- a/Pilz.UI.Telerik/Dialogs/DialogLoadingEventArgs.cs +++ b/Pilz.UI.WinForms.Telerik/Dialogs/DialogLoadingEventArgs.cs @@ -1,4 +1,6 @@ -namespace Pilz.UI.Telerik.Dialogs; +using Pilz.UI.Telerik.Dialogs; + +namespace Pilz.UI.WinForms.Telerik.Dialogs; public class DialogLoadingEventArgs : EventArgs { diff --git a/Pilz.UI.Telerik/Dialogs/FlyoutClosedEventArgs.cs b/Pilz.UI.WinForms.Telerik/Dialogs/FlyoutClosedEventArgs.cs similarity index 72% rename from Pilz.UI.Telerik/Dialogs/FlyoutClosedEventArgs.cs rename to Pilz.UI.WinForms.Telerik/Dialogs/FlyoutClosedEventArgs.cs index c11222d..8bfc908 100644 --- a/Pilz.UI.Telerik/Dialogs/FlyoutClosedEventArgs.cs +++ b/Pilz.UI.WinForms.Telerik/Dialogs/FlyoutClosedEventArgs.cs @@ -1,4 +1,6 @@ -namespace Pilz.UI.Telerik.Dialogs; +using Pilz.UI.Telerik.Dialogs; + +namespace Pilz.UI.WinForms.Telerik.Dialogs; public class FlyoutClosedEventArgs(RadFlyoutBase content) : global::Telerik.WinControls.UI.SplashScreen.FlyoutClosedEventArgs(content) { diff --git a/Pilz.UI.Telerik/Dialogs/FlyoutCreatedEventArgs.cs b/Pilz.UI.WinForms.Telerik/Dialogs/FlyoutCreatedEventArgs.cs similarity index 58% rename from Pilz.UI.Telerik/Dialogs/FlyoutCreatedEventArgs.cs rename to Pilz.UI.WinForms.Telerik/Dialogs/FlyoutCreatedEventArgs.cs index b01cf7a..1f38b89 100644 --- a/Pilz.UI.Telerik/Dialogs/FlyoutCreatedEventArgs.cs +++ b/Pilz.UI.WinForms.Telerik/Dialogs/FlyoutCreatedEventArgs.cs @@ -1,6 +1,7 @@ -using Telerik.WinControls.UI.SplashScreen; +using Pilz.UI.Telerik.Dialogs; +using Telerik.WinControls.UI.SplashScreen; -namespace Pilz.UI.Telerik.Dialogs; +namespace Pilz.UI.WinForms.Telerik.Dialogs; public class FlyoutCreatedEventArgs(RadFlyoutBase content) : ContentCreatedEventArgs(content) { diff --git a/Pilz.UI.Telerik/Dialogs/RadDialogBase.Statics.cs b/Pilz.UI.WinForms.Telerik/Dialogs/RadDialogBase.Statics.cs similarity index 95% rename from Pilz.UI.Telerik/Dialogs/RadDialogBase.Statics.cs rename to Pilz.UI.WinForms.Telerik/Dialogs/RadDialogBase.Statics.cs index f36e700..bc26bf3 100644 --- a/Pilz.UI.Telerik/Dialogs/RadDialogBase.Statics.cs +++ b/Pilz.UI.WinForms.Telerik/Dialogs/RadDialogBase.Statics.cs @@ -1,5 +1,6 @@ -using Pilz.UI.Extensions; -using Pilz.UI.Telerik.Extensions; +using Pilz.UI.WinForms.Extensions; +using Pilz.UI.WinForms.Telerik.Dialogs; +using Pilz.UI.WinForms.Telerik.Extensions; using Telerik.WinControls; namespace Pilz.UI.Telerik.Dialogs; diff --git a/Pilz.UI.Telerik/Dialogs/RadDialogBase.cs b/Pilz.UI.WinForms.Telerik/Dialogs/RadDialogBase.cs similarity index 94% rename from Pilz.UI.Telerik/Dialogs/RadDialogBase.cs rename to Pilz.UI.WinForms.Telerik/Dialogs/RadDialogBase.cs index 9fdf236..eae2b3a 100644 --- a/Pilz.UI.Telerik/Dialogs/RadDialogBase.cs +++ b/Pilz.UI.WinForms.Telerik/Dialogs/RadDialogBase.cs @@ -1,4 +1,5 @@ -using Telerik.WinControls.UI; +using Pilz.UI.WinForms; +using Telerik.WinControls.UI; namespace Pilz.UI.Telerik.Dialogs; diff --git a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.Statics.cs b/Pilz.UI.WinForms.Telerik/Dialogs/RadFlyoutBase.Statics.cs similarity index 97% rename from Pilz.UI.Telerik/Dialogs/RadFlyoutBase.Statics.cs rename to Pilz.UI.WinForms.Telerik/Dialogs/RadFlyoutBase.Statics.cs index bd1ea71..e3c98e1 100644 --- a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.Statics.cs +++ b/Pilz.UI.WinForms.Telerik/Dialogs/RadFlyoutBase.Statics.cs @@ -1,4 +1,6 @@ -using Telerik.WinControls; +using Pilz.UI.WinForms; +using Pilz.UI.WinForms.Telerik.Dialogs; +using Telerik.WinControls; using Telerik.WinControls.UI; using Telerik.WinControls.UI.SplashScreen; diff --git a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs b/Pilz.UI.WinForms.Telerik/Dialogs/RadFlyoutBase.cs similarity index 99% rename from Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs rename to Pilz.UI.WinForms.Telerik/Dialogs/RadFlyoutBase.cs index 6dd1af7..92faab6 100644 --- a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs +++ b/Pilz.UI.WinForms.Telerik/Dialogs/RadFlyoutBase.cs @@ -1,4 +1,4 @@ -using Pilz.UI.Telerik.Controls.RadValidationProvider; +using Pilz.UI.WinForms.Telerik.Controls.RadValidationProvider; using System.ComponentModel; using Telerik.WinControls; using Telerik.WinControls.Data; diff --git a/Pilz.UI.Telerik/Extensions/RadFlyoutBaseExtensions.cs b/Pilz.UI.WinForms.Telerik/Extensions/RadFlyoutBaseExtensions.cs similarity index 81% rename from Pilz.UI.Telerik/Extensions/RadFlyoutBaseExtensions.cs rename to Pilz.UI.WinForms.Telerik/Extensions/RadFlyoutBaseExtensions.cs index 7d120a5..a203af7 100644 --- a/Pilz.UI.Telerik/Extensions/RadFlyoutBaseExtensions.cs +++ b/Pilz.UI.WinForms.Telerik/Extensions/RadFlyoutBaseExtensions.cs @@ -1,6 +1,6 @@ using Pilz.UI.Telerik.Dialogs; -namespace Pilz.UI.Telerik.Extensions.Extensions; +namespace Pilz.UI.WinForms.Telerik.Extensions; public static class RadFlyoutBaseExtensions { diff --git a/Pilz.UI.Telerik/Extensions/RadListDataItemCollectionExtensions.cs b/Pilz.UI.WinForms.Telerik/Extensions/RadListDataItemCollectionExtensions.cs similarity index 86% rename from Pilz.UI.Telerik/Extensions/RadListDataItemCollectionExtensions.cs rename to Pilz.UI.WinForms.Telerik/Extensions/RadListDataItemCollectionExtensions.cs index ff56e54..9f0e8a2 100644 --- a/Pilz.UI.Telerik/Extensions/RadListDataItemCollectionExtensions.cs +++ b/Pilz.UI.WinForms.Telerik/Extensions/RadListDataItemCollectionExtensions.cs @@ -1,17 +1,17 @@ using Telerik.WinControls.UI; -namespace Pilz.UI.Telerik.Extensions; +namespace Pilz.UI.WinForms.Telerik.Extensions; public static class RadListDataItemCollectionExtensions { public static IEnumerable AddEnumValues(this RadListDataItemCollection @this) where T : struct, Enum { - return AddEnumValues(@this, false); + return @this.AddEnumValues(false); } public static IEnumerable AddEnumValues(this RadListDataItemCollection @this, bool clearCollection) where T : struct, Enum { - return AddEnumValues(@this, clearCollection, null, null); + return @this.AddEnumValues(clearCollection, null, null); } public static IEnumerable AddEnumValues(this RadListDataItemCollection @this, bool clearCollection, Func? filter, Func? format) where T : struct, Enum diff --git a/Pilz.UI.Telerik/Extensions/RadSvgImageExtensions.cs b/Pilz.UI.WinForms.Telerik/Extensions/RadSvgImageExtensions.cs similarity index 92% rename from Pilz.UI.Telerik/Extensions/RadSvgImageExtensions.cs rename to Pilz.UI.WinForms.Telerik/Extensions/RadSvgImageExtensions.cs index 901f380..b66333b 100644 --- a/Pilz.UI.Telerik/Extensions/RadSvgImageExtensions.cs +++ b/Pilz.UI.WinForms.Telerik/Extensions/RadSvgImageExtensions.cs @@ -1,7 +1,7 @@ using Telerik.WinControls; using Telerik.WinControls.Svg; -namespace Pilz.UI.Telerik.Extensions; +namespace Pilz.UI.WinForms.Telerik.Extensions; public static class RadSvgImageExtensions { diff --git a/Pilz.UI.Telerik/Patches/Patches.cs b/Pilz.UI.WinForms.Telerik/Patches/Patches.cs similarity index 82% rename from Pilz.UI.Telerik/Patches/Patches.cs rename to Pilz.UI.WinForms.Telerik/Patches/Patches.cs index a6e76bd..54427ce 100644 --- a/Pilz.UI.Telerik/Patches/Patches.cs +++ b/Pilz.UI.WinForms.Telerik/Patches/Patches.cs @@ -1,7 +1,7 @@ using HarmonyLib; using System.Reflection; -namespace Pilz.UI.Telerik.Patches; +namespace Pilz.UI.WinForms.Telerik.Patches; public static class Patches { diff --git a/Pilz.UI.Telerik/Patches/TelerikUiForWinForms/RadPictureBoxElement_PasteImageFixes.cs b/Pilz.UI.WinForms.Telerik/Patches/TelerikUiForWinForms/RadPictureBoxElement_PasteImageFixes.cs similarity index 93% rename from Pilz.UI.Telerik/Patches/TelerikUiForWinForms/RadPictureBoxElement_PasteImageFixes.cs rename to Pilz.UI.WinForms.Telerik/Patches/TelerikUiForWinForms/RadPictureBoxElement_PasteImageFixes.cs index 50637a9..d6a1473 100644 --- a/Pilz.UI.Telerik/Patches/TelerikUiForWinForms/RadPictureBoxElement_PasteImageFixes.cs +++ b/Pilz.UI.WinForms.Telerik/Patches/TelerikUiForWinForms/RadPictureBoxElement_PasteImageFixes.cs @@ -1,7 +1,7 @@ using HarmonyLib; using Telerik.WinControls.UI; -namespace Pilz.UI.Telerik.Patches.TelerikUiForWinForms; +namespace Pilz.UI.WinForms.Telerik.Patches.TelerikUiForWinForms; [HarmonyPatch(typeof(RadPictureBoxElement))] [HarmonyPatch("PasteImage")] diff --git a/Pilz.UI.Telerik/Pilz.UI.Telerik.csproj b/Pilz.UI.WinForms.Telerik/Pilz.UI.WinForms.Telerik.csproj similarity index 87% rename from Pilz.UI.Telerik/Pilz.UI.Telerik.csproj rename to Pilz.UI.WinForms.Telerik/Pilz.UI.WinForms.Telerik.csproj index 2e59279..b33faaf 100644 --- a/Pilz.UI.Telerik/Pilz.UI.Telerik.csproj +++ b/Pilz.UI.WinForms.Telerik/Pilz.UI.WinForms.Telerik.csproj @@ -9,7 +9,7 @@ - 2.10.9 + 2.12.0 True @@ -23,7 +23,7 @@ - + \ No newline at end of file diff --git a/Pilz.UI.Telerik/Symbols/IRadSymbolFactory.cs b/Pilz.UI.WinForms.Telerik/Symbols/IRadSymbolFactory.cs similarity index 88% rename from Pilz.UI.Telerik/Symbols/IRadSymbolFactory.cs rename to Pilz.UI.WinForms.Telerik/Symbols/IRadSymbolFactory.cs index 0763779..e18183e 100644 --- a/Pilz.UI.Telerik/Symbols/IRadSymbolFactory.cs +++ b/Pilz.UI.WinForms.Telerik/Symbols/IRadSymbolFactory.cs @@ -1,7 +1,7 @@ -using Pilz.UI.Symbols; +using Pilz.UI.WinForms.Symbols; using Telerik.WinControls; -namespace Pilz.UI.Telerik.Symbols; +namespace Pilz.UI.WinForms.Telerik.Symbols; public interface IRadSymbolFactory : ISymbolFactory { diff --git a/Pilz.UI.Telerik/Symbols/RadSymbolFactory.cs b/Pilz.UI.WinForms.Telerik/Symbols/RadSymbolFactory.cs similarity index 93% rename from Pilz.UI.Telerik/Symbols/RadSymbolFactory.cs rename to Pilz.UI.WinForms.Telerik/Symbols/RadSymbolFactory.cs index 8a6d92f..11f0496 100644 --- a/Pilz.UI.Telerik/Symbols/RadSymbolFactory.cs +++ b/Pilz.UI.WinForms.Telerik/Symbols/RadSymbolFactory.cs @@ -1,8 +1,8 @@ -using Pilz.UI.Symbols; -using Pilz.UI.Telerik.Extensions; +using Pilz.UI.WinForms.Symbols; +using Pilz.UI.WinForms.Telerik.Extensions; using Telerik.WinControls; -namespace Pilz.UI.Telerik.Symbols; +namespace Pilz.UI.WinForms.Telerik.Symbols; public abstract class RadSymbolFactory : SymbolFactory, IRadSymbolFactory { diff --git a/Pilz.UI.Telerik/Theming/ApplicationTheme.cs b/Pilz.UI.WinForms.Telerik/Theming/ApplicationTheme.cs similarity index 61% rename from Pilz.UI.Telerik/Theming/ApplicationTheme.cs rename to Pilz.UI.WinForms.Telerik/Theming/ApplicationTheme.cs index 56e1cac..f911d34 100644 --- a/Pilz.UI.Telerik/Theming/ApplicationTheme.cs +++ b/Pilz.UI.WinForms.Telerik/Theming/ApplicationTheme.cs @@ -1,4 +1,4 @@ -namespace Pilz.UI.Telerik.Theming; +namespace Pilz.UI.WinForms.Telerik.Theming; public enum ApplicationTheme { diff --git a/Pilz.UI.Telerik/Theming/HighContrastMode.cs b/Pilz.UI.WinForms.Telerik/Theming/HighContrastMode.cs similarity index 59% rename from Pilz.UI.Telerik/Theming/HighContrastMode.cs rename to Pilz.UI.WinForms.Telerik/Theming/HighContrastMode.cs index a8fe806..b2d0fac 100644 --- a/Pilz.UI.Telerik/Theming/HighContrastMode.cs +++ b/Pilz.UI.WinForms.Telerik/Theming/HighContrastMode.cs @@ -1,4 +1,4 @@ -namespace Pilz.UI.Telerik.Theming; +namespace Pilz.UI.WinForms.Telerik.Theming; public enum HighContrastMode { diff --git a/Pilz.UI.Telerik/Theming/ThemeDefinition.cs b/Pilz.UI.WinForms.Telerik/Theming/ThemeDefinition.cs similarity index 87% rename from Pilz.UI.Telerik/Theming/ThemeDefinition.cs rename to Pilz.UI.WinForms.Telerik/Theming/ThemeDefinition.cs index f32022d..e63b1f4 100644 --- a/Pilz.UI.Telerik/Theming/ThemeDefinition.cs +++ b/Pilz.UI.WinForms.Telerik/Theming/ThemeDefinition.cs @@ -1,4 +1,4 @@ -namespace Pilz.UI.Telerik.Theming; +namespace Pilz.UI.WinForms.Telerik.Theming; public class ThemeDefinition { diff --git a/Pilz.UI.Telerik/Theming/ThemeHelper.cs b/Pilz.UI.WinForms.Telerik/Theming/ThemeHelper.cs similarity index 98% rename from Pilz.UI.Telerik/Theming/ThemeHelper.cs rename to Pilz.UI.WinForms.Telerik/Theming/ThemeHelper.cs index 9ef8def..25381b5 100644 --- a/Pilz.UI.Telerik/Theming/ThemeHelper.cs +++ b/Pilz.UI.WinForms.Telerik/Theming/ThemeHelper.cs @@ -1,6 +1,6 @@ using Telerik.WinControls; -namespace Pilz.UI.Telerik.Theming; +namespace Pilz.UI.WinForms.Telerik.Theming; public static class ThemeHelper { diff --git a/Pilz.UI/Controls/ConfigurationManager/ConfigurationEntry.cs b/Pilz.UI.WinForms/Controls/ConfigurationManager/ConfigurationEntry.cs similarity index 83% rename from Pilz.UI/Controls/ConfigurationManager/ConfigurationEntry.cs rename to Pilz.UI.WinForms/Controls/ConfigurationManager/ConfigurationEntry.cs index c3558bd..480cc42 100644 --- a/Pilz.UI/Controls/ConfigurationManager/ConfigurationEntry.cs +++ b/Pilz.UI.WinForms/Controls/ConfigurationManager/ConfigurationEntry.cs @@ -1,4 +1,4 @@ -namespace Pilz.UI.Controls.ConfigurationManager; +namespace Pilz.UI.WinForms.Controls.ConfigurationManager; public class ConfigurationEntry(string name, string title, ConfigurationValueListener Listener) { diff --git a/Pilz.UI/Controls/ConfigurationManager/ConfigurationManager.cs b/Pilz.UI.WinForms/Controls/ConfigurationManager/ConfigurationManager.cs similarity index 85% rename from Pilz.UI/Controls/ConfigurationManager/ConfigurationManager.cs rename to Pilz.UI.WinForms/Controls/ConfigurationManager/ConfigurationManager.cs index de185b6..71206fb 100644 --- a/Pilz.UI/Controls/ConfigurationManager/ConfigurationManager.cs +++ b/Pilz.UI.WinForms/Controls/ConfigurationManager/ConfigurationManager.cs @@ -1,4 +1,4 @@ -namespace Pilz.UI.Controls.ConfigurationManager; +namespace Pilz.UI.WinForms.Controls.ConfigurationManager; public class ConfigurationManager { diff --git a/Pilz.UI/Controls/ConfigurationManager/ConfigurationPanel.cs b/Pilz.UI.WinForms/Controls/ConfigurationManager/ConfigurationPanel.cs similarity index 92% rename from Pilz.UI/Controls/ConfigurationManager/ConfigurationPanel.cs rename to Pilz.UI.WinForms/Controls/ConfigurationManager/ConfigurationPanel.cs index 7d0d4ba..931d7d0 100644 --- a/Pilz.UI/Controls/ConfigurationManager/ConfigurationPanel.cs +++ b/Pilz.UI.WinForms/Controls/ConfigurationManager/ConfigurationPanel.cs @@ -1,4 +1,4 @@ -namespace Pilz.UI.Controls.ConfigurationManager; +namespace Pilz.UI.WinForms.Controls.ConfigurationManager; public class ConfigurationPanel : TableLayoutPanel { diff --git a/Pilz.UI/Controls/ConfigurationManager/ConfigurationValueListener.cs b/Pilz.UI.WinForms/Controls/ConfigurationManager/ConfigurationValueListener.cs similarity index 84% rename from Pilz.UI/Controls/ConfigurationManager/ConfigurationValueListener.cs rename to Pilz.UI.WinForms/Controls/ConfigurationManager/ConfigurationValueListener.cs index 7e674fc..72805d5 100644 --- a/Pilz.UI/Controls/ConfigurationManager/ConfigurationValueListener.cs +++ b/Pilz.UI.WinForms/Controls/ConfigurationManager/ConfigurationValueListener.cs @@ -1,4 +1,4 @@ -namespace Pilz.UI.Controls.ConfigurationManager; +namespace Pilz.UI.WinForms.Controls.ConfigurationManager; public abstract class ConfigurationValueListener : IDisposable { diff --git a/Pilz.UI/Dialogs/DialogBase.Statics.cs b/Pilz.UI.WinForms/Dialogs/DialogBase.Statics.cs similarity index 97% rename from Pilz.UI/Dialogs/DialogBase.Statics.cs rename to Pilz.UI.WinForms/Dialogs/DialogBase.Statics.cs index e74b20e..67b969c 100644 --- a/Pilz.UI/Dialogs/DialogBase.Statics.cs +++ b/Pilz.UI.WinForms/Dialogs/DialogBase.Statics.cs @@ -1,4 +1,6 @@ -namespace Pilz.UI.Dialogs; +using Pilz.UI.WinForms.Dialogs; + +namespace Pilz.UI.Dialogs; partial class DialogBase { diff --git a/Pilz.UI/Dialogs/DialogBase.cs b/Pilz.UI.WinForms/Dialogs/DialogBase.cs similarity index 90% rename from Pilz.UI/Dialogs/DialogBase.cs rename to Pilz.UI.WinForms/Dialogs/DialogBase.cs index 4e95ea8..f681ee0 100644 --- a/Pilz.UI/Dialogs/DialogBase.cs +++ b/Pilz.UI.WinForms/Dialogs/DialogBase.cs @@ -1,4 +1,7 @@ -namespace Pilz.UI.Dialogs; +using Pilz.UI.WinForms; +using Pilz.UI.WinForms.Dialogs; + +namespace Pilz.UI.Dialogs; public partial class DialogBase : Form { diff --git a/Pilz.UI/Dialogs/DialogClosedEventArgs.cs b/Pilz.UI.WinForms/Dialogs/DialogClosedEventArgs.cs similarity index 73% rename from Pilz.UI/Dialogs/DialogClosedEventArgs.cs rename to Pilz.UI.WinForms/Dialogs/DialogClosedEventArgs.cs index 77af862..6d1c32d 100644 --- a/Pilz.UI/Dialogs/DialogClosedEventArgs.cs +++ b/Pilz.UI.WinForms/Dialogs/DialogClosedEventArgs.cs @@ -1,4 +1,6 @@ -namespace Pilz.UI.Dialogs; +using Pilz.UI.Dialogs; + +namespace Pilz.UI.WinForms.Dialogs; public class DialogClosedEventArgs(DialogBase dialog) : EventArgs { diff --git a/Pilz.UI/Dialogs/DialogLoadingEventArgs.cs b/Pilz.UI.WinForms/Dialogs/DialogLoadingEventArgs.cs similarity index 73% rename from Pilz.UI/Dialogs/DialogLoadingEventArgs.cs rename to Pilz.UI.WinForms/Dialogs/DialogLoadingEventArgs.cs index 1811e4e..47aa2d9 100644 --- a/Pilz.UI/Dialogs/DialogLoadingEventArgs.cs +++ b/Pilz.UI.WinForms/Dialogs/DialogLoadingEventArgs.cs @@ -1,4 +1,6 @@ -namespace Pilz.UI.Dialogs; +using Pilz.UI.Dialogs; + +namespace Pilz.UI.WinForms.Dialogs; public class DialogLoadingEventArgs(DialogBase dialog) : EventArgs { diff --git a/Pilz.UI/Dialogs/FlyoutBase.cs b/Pilz.UI.WinForms/Dialogs/FlyoutBase.cs similarity index 98% rename from Pilz.UI/Dialogs/FlyoutBase.cs rename to Pilz.UI.WinForms/Dialogs/FlyoutBase.cs index 8d1845b..a98f889 100644 --- a/Pilz.UI/Dialogs/FlyoutBase.cs +++ b/Pilz.UI.WinForms/Dialogs/FlyoutBase.cs @@ -1,7 +1,8 @@ -using System.ComponentModel; +using Pilz.UI.Dialogs; +using System.ComponentModel; using System.Diagnostics.CodeAnalysis; -namespace Pilz.UI.Dialogs; +namespace Pilz.UI.WinForms.Dialogs; public partial class FlyoutBase : UserControl { diff --git a/Pilz.UI/DisplayHelp.cs b/Pilz.UI.WinForms/DisplayHelp.cs similarity index 99% rename from Pilz.UI/DisplayHelp.cs rename to Pilz.UI.WinForms/DisplayHelp.cs index f80cae0..fcb34f9 100644 --- a/Pilz.UI/DisplayHelp.cs +++ b/Pilz.UI.WinForms/DisplayHelp.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Drawing.Drawing2D; -namespace Pilz.UI; +namespace Pilz.UI.WinForms; public class DisplayHelp { @@ -211,7 +211,7 @@ public class DisplayHelp if (cornerDiameter == 0) cornerDiameter = 1; - int diameter = cornerDiameter * 2; + var diameter = cornerDiameter * 2; return corner switch { diff --git a/Pilz.UI/DisplayHelp.vb b/Pilz.UI.WinForms/DisplayHelp.vb similarity index 100% rename from Pilz.UI/DisplayHelp.vb rename to Pilz.UI.WinForms/DisplayHelp.vb diff --git a/Pilz.UI/Extensions.vb b/Pilz.UI.WinForms/Extensions.vb similarity index 100% rename from Pilz.UI/Extensions.vb rename to Pilz.UI.WinForms/Extensions.vb diff --git a/Pilz.UI/Extensions/DialogResultExtensions.cs b/Pilz.UI.WinForms/Extensions/DialogResultExtensions.cs similarity index 96% rename from Pilz.UI/Extensions/DialogResultExtensions.cs rename to Pilz.UI.WinForms/Extensions/DialogResultExtensions.cs index 975f95f..814629c 100644 --- a/Pilz.UI/Extensions/DialogResultExtensions.cs +++ b/Pilz.UI.WinForms/Extensions/DialogResultExtensions.cs @@ -1,4 +1,4 @@ -namespace Pilz.UI.Extensions; +namespace Pilz.UI.WinForms.Extensions; public static class DialogResultExtensions { diff --git a/Pilz.UI/Extensions/FlyoutBaseExtensions.cs b/Pilz.UI.WinForms/Extensions/FlyoutBaseExtensions.cs similarity index 74% rename from Pilz.UI/Extensions/FlyoutBaseExtensions.cs rename to Pilz.UI.WinForms/Extensions/FlyoutBaseExtensions.cs index 6a3b8dc..90306e3 100644 --- a/Pilz.UI/Extensions/FlyoutBaseExtensions.cs +++ b/Pilz.UI.WinForms/Extensions/FlyoutBaseExtensions.cs @@ -1,7 +1,7 @@ -using Pilz.UI.Dialogs; +using Pilz.UI.WinForms.Dialogs; using System.Diagnostics.CodeAnalysis; -namespace Pilz.UI.Extensions; +namespace Pilz.UI.WinForms.Extensions; public static class FlyoutBaseExtensions { diff --git a/Pilz.UI/Extensions/ImageExtensions.cs b/Pilz.UI.WinForms/Extensions/ImageExtensions.cs similarity index 83% rename from Pilz.UI/Extensions/ImageExtensions.cs rename to Pilz.UI.WinForms/Extensions/ImageExtensions.cs index e76be7b..40fbc92 100644 --- a/Pilz.UI/Extensions/ImageExtensions.cs +++ b/Pilz.UI.WinForms/Extensions/ImageExtensions.cs @@ -1,4 +1,4 @@ -namespace Pilz.UI.Extensions; +namespace Pilz.UI.WinForms.Extensions; public static class ImageExtensions { diff --git a/Pilz.UI/HelpfulFunctions.cs b/Pilz.UI.WinForms/HelpfulFunctions.cs similarity index 92% rename from Pilz.UI/HelpfulFunctions.cs rename to Pilz.UI.WinForms/HelpfulFunctions.cs index 7d776e7..1c682de 100644 --- a/Pilz.UI/HelpfulFunctions.cs +++ b/Pilz.UI.WinForms/HelpfulFunctions.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using System.Windows.Forms; -namespace Pilz.UI; +namespace Pilz.UI.WinForms; public static class HelpfulFunctions { diff --git a/Pilz.UI/HelpfulFunctions.vb b/Pilz.UI.WinForms/HelpfulFunctions.vb similarity index 100% rename from Pilz.UI/HelpfulFunctions.vb rename to Pilz.UI.WinForms/HelpfulFunctions.vb diff --git a/Pilz.UI/HighlightPanel.cs b/Pilz.UI.WinForms/HighlightPanel.cs similarity index 90% rename from Pilz.UI/HighlightPanel.cs rename to Pilz.UI.WinForms/HighlightPanel.cs index fad51d7..1cac074 100644 --- a/Pilz.UI/HighlightPanel.cs +++ b/Pilz.UI.WinForms/HighlightPanel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; -namespace Pilz.UI; +namespace Pilz.UI.WinForms; internal class HighlightPanel : Control @@ -28,9 +28,9 @@ internal class HighlightPanel : Control var g = e.Graphics; g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias; - foreach (HighlightRegion highlightRegion in _HighlightRegions) + foreach (var highlightRegion in _HighlightRegions) { - Color[] colors = GetHighlightColors(highlightRegion.HighlightColor); + var colors = GetHighlightColors(highlightRegion.HighlightColor); var r = highlightRegion.Bounds; var back = highlightRegion.BackColor; r.Inflate(1, 1); @@ -48,7 +48,7 @@ internal class HighlightPanel : Control private Color[] GetHighlightColors(eHighlightColor color) { - Color[] colors = new Color[3]; + var colors = new Color[3]; if (color == eHighlightColor.Blue) { @@ -129,10 +129,10 @@ internal class HighlightPanel : Control return; } - bool processFocusControl = true; + var processFocusControl = true; Region region = null; - foreach (KeyValuePair item in _Highlights) + foreach (var item in _Highlights) { if (item.Value == eHighlightColor.None || !GetIsVisible(item.Key)) continue; @@ -221,13 +221,13 @@ internal class HighlightPanel : Control return false; if (control.Parent is null || !control.IsHandleCreated) return control.Visible; - var rect = new Pilz.Win32.Native.RECT(); - Pilz.Win32.Native.User32.GetWindowRect(control.Handle, ref rect); + var rect = new Win32.Native.RECT(); + Win32.Native.User32.GetWindowRect(control.Handle, ref rect); var pp = control.Parent.PointToClient(new Point(rect.Left + 3, rect.Top + 3)); - var handle = Pilz.Win32.Native.User32.ChildWindowFromPointEx(control.Parent.Handle, new Pilz.Win32.Native.POINT(pp.X, pp.Y), (uint)Pilz.Win32.Native.WindowFromPointFlags.CWP_SKIPINVISIBLE); - if (handle == IntPtr.Zero) + var handle = Win32.Native.User32.ChildWindowFromPointEx(control.Parent.Handle, new Win32.Native.POINT(pp.X, pp.Y), (uint)Win32.Native.WindowFromPointFlags.CWP_SKIPINVISIBLE); + if (handle == nint.Zero) return control.Visible; - var c = Control.FromHandle(handle); + var c = FromHandle(handle); if (c is not null && !ReferenceEquals(c, control) && !ReferenceEquals(c, this) && !ReferenceEquals(c, control.Parent)) return false; @@ -259,9 +259,9 @@ internal class HighlightPanel : Control { if (!c.IsHandleCreated) return Rectangle.Empty; - var rect = default(Pilz.Win32.Native.RECT); - Pilz.Win32.Native.User32.GetWindowRect(c.Handle, ref rect); - var p = this.PointToClient(rect.Location); + var rect = default(Win32.Native.RECT); + Win32.Native.User32.GetWindowRect(c.Handle, ref rect); + var p = PointToClient(rect.Location); return new Rectangle(p, rect.Size); } diff --git a/Pilz.UI/HighlightPanel.vb b/Pilz.UI.WinForms/HighlightPanel.vb similarity index 100% rename from Pilz.UI/HighlightPanel.vb rename to Pilz.UI.WinForms/HighlightPanel.vb diff --git a/Pilz.UI/Highlighter.cs b/Pilz.UI.WinForms/Highlighter.cs similarity index 96% rename from Pilz.UI/Highlighter.cs rename to Pilz.UI.WinForms/Highlighter.cs index 9dfd19b..4c6254a 100644 --- a/Pilz.UI/Highlighter.cs +++ b/Pilz.UI.WinForms/Highlighter.cs @@ -11,7 +11,7 @@ using System.Drawing; // Imports System.Windows.Forms using System.Windows.Forms; -namespace Pilz.UI; +namespace Pilz.UI.WinForms; public class Highlighter : Component @@ -172,14 +172,14 @@ public class Highlighter : Component private void ControlParentChanged(object sender, EventArgs e) { - Control c = (Control)sender; + var c = (Control)sender; c.ParentChanged -= ControlParentChanged; AddTabControlHandlers(c); } private void AddTabControlHandlers(Control c) { - TabControl tab2 = GetParentControl(c, typeof(TabControl)) as TabControl; + var tab2 = GetParentControl(c, typeof(TabControl)) as TabControl; if (tab2 is not null) { @@ -194,7 +194,7 @@ public class Highlighter : Component } else { - Panel parentPanel = GetParentControl(c, typeof(Panel)) as Panel; + var parentPanel = GetParentControl(c, typeof(Panel)) as Panel; if (parentPanel is not null) { @@ -272,7 +272,7 @@ public class Highlighter : Component c.LocationChanged -= new EventHandler(ControlLocationChanged); c.SizeChanged -= new EventHandler(ControlSizeChanged); c.VisibleChanged -= new EventHandler(ControlVisibleChanged); - TabControl tab2 = GetParentControl(c, typeof(TabControl)) as TabControl; + var tab2 = GetParentControl(c, typeof(TabControl)) as TabControl; if (tab2 is not null) { @@ -293,7 +293,7 @@ public class Highlighter : Component } else { - Panel parentPanel = GetParentControl(c, typeof(Panel)) as Panel; + var parentPanel = GetParentControl(c, typeof(Panel)) as Panel; if (parentPanel is not null) { @@ -419,7 +419,7 @@ public class Highlighter : Component { if (_HighlightPanel.Parent is Form) { - Form form = _HighlightPanel.Parent as Form; + var form = _HighlightPanel.Parent as Form; if (form.AutoSize) { @@ -445,7 +445,7 @@ public class Highlighter : Component private void ContainerControlSizeChanged(object sender, EventArgs e) { - Form form = sender as Form; + var form = sender as Form; if (form is not null) { diff --git a/Pilz.UI/Highlighter.vb b/Pilz.UI.WinForms/Highlighter.vb similarity index 100% rename from Pilz.UI/Highlighter.vb rename to Pilz.UI.WinForms/Highlighter.vb diff --git a/Pilz.UI/ILoadContent.cs b/Pilz.UI.WinForms/ILoadContent.cs similarity index 65% rename from Pilz.UI/ILoadContent.cs rename to Pilz.UI.WinForms/ILoadContent.cs index b410bc8..22ac3da 100644 --- a/Pilz.UI/ILoadContent.cs +++ b/Pilz.UI.WinForms/ILoadContent.cs @@ -1,4 +1,4 @@ -namespace Pilz.UI; +namespace Pilz.UI.WinForms; public interface ILoadContent { diff --git a/Pilz.UI/ILoadContentAsync.cs b/Pilz.UI.WinForms/ILoadContentAsync.cs similarity index 69% rename from Pilz.UI/ILoadContentAsync.cs rename to Pilz.UI.WinForms/ILoadContentAsync.cs index f381ebd..1027fe2 100644 --- a/Pilz.UI/ILoadContentAsync.cs +++ b/Pilz.UI.WinForms/ILoadContentAsync.cs @@ -1,4 +1,4 @@ -namespace Pilz.UI; +namespace Pilz.UI.WinForms; public interface ILoadContentAsync { diff --git a/Pilz.UI/PaintingControl/ArrowLineCapProps.cs b/Pilz.UI.WinForms/PaintingControl/ArrowLineCapProps.cs similarity index 90% rename from Pilz.UI/PaintingControl/ArrowLineCapProps.cs rename to Pilz.UI.WinForms/PaintingControl/ArrowLineCapProps.cs index caee79f..306c55f 100644 --- a/Pilz.UI/PaintingControl/ArrowLineCapProps.cs +++ b/Pilz.UI.WinForms/PaintingControl/ArrowLineCapProps.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Drawing.Drawing2D; -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl; public class ArrowLineCapProps : LineCapProps { diff --git a/Pilz.UI/PaintingControl/ArrowLineCapProps.vb b/Pilz.UI.WinForms/PaintingControl/ArrowLineCapProps.vb similarity index 100% rename from Pilz.UI/PaintingControl/ArrowLineCapProps.vb rename to Pilz.UI.WinForms/PaintingControl/ArrowLineCapProps.vb diff --git a/Pilz.UI/PaintingControl/DefaultDrawMethodes.cs b/Pilz.UI.WinForms/PaintingControl/DefaultDrawMethodes.cs similarity index 93% rename from Pilz.UI/PaintingControl/DefaultDrawMethodes.cs rename to Pilz.UI.WinForms/PaintingControl/DefaultDrawMethodes.cs index df9a0e7..f9dc903 100644 --- a/Pilz.UI/PaintingControl/DefaultDrawMethodes.cs +++ b/Pilz.UI.WinForms/PaintingControl/DefaultDrawMethodes.cs @@ -1,10 +1,11 @@ using Pilz.Drawing; +using Pilz.UI.WinForms.PaintingControl.EventArgs; using System; using System.Drawing; using System.Drawing.Drawing2D; using System.Windows.Forms; -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl; /// @@ -44,7 +45,7 @@ public class DefaultDrawMethodes RectangleF result; Bitmap image; SizeF zoomf; - bool hasNoParent = e.PaintingObject.Parent is null; + var hasNoParent = e.PaintingObject.Parent is null; object syncObj; if (hasNoParent) @@ -74,7 +75,7 @@ public class DefaultDrawMethodes if (image is null) { - bool needRescaleImageBecauseRot = false; + var needRescaleImageBecauseRot = false; image = DrawToNewImage((Bitmap)objImg, result.Size); @@ -162,10 +163,10 @@ public class DefaultDrawMethodes var objrect = new RectangleF(obj.Location, obj.Size); var size = new SizeF(imageSize.Width * zoom.Width, imageSize.Height * zoom.Height); var clientRectangle = objrect; - float val = clientRectangle.Width / size.Width; + var val = clientRectangle.Width / size.Width; clientRectangle = objrect; - float num = Math.Min(val, clientRectangle.Height / size.Height); + var num = Math.Min(val, clientRectangle.Height / size.Height); result.Width = (int)Math.Round(Math.Truncate((double)(size.Width * num))); result.Height = (int)Math.Round(Math.Truncate((double)(size.Height * num))); @@ -195,7 +196,7 @@ public class DefaultDrawMethodes if (obj.EnableOutline) { - float lw = obj.OutlineThicknes; + var lw = obj.OutlineThicknes; var p = new Pen(obj.OutlineColor, obj.OutlineThicknes) { DashStyle = obj.OutlineDashStyle, Alignment = PenAlignment.Inset }; e.Graphics.DrawPolygon(p, new[] { p1, p2, p3 }); } @@ -204,7 +205,7 @@ public class DefaultDrawMethodes public static void DrawRectangle(PaintingObjectPaintEventArgs e) { var obj = e.PaintingObject; - float hol = obj.OutlineThicknes / 2f; + var hol = obj.OutlineThicknes / 2f; if (obj.EnableFill) { @@ -243,10 +244,10 @@ public class DefaultDrawMethodes public static void DrawSelection(PaintingObjectPaintEventArgs e) { var obj = e.PaintingObject; - float lw = 2.5f; - float hlw = lw / 2f; - float hlwphol = hlw; // + hol - float hlwpholm2 = hlwphol * 2f; + var lw = 2.5f; + var hlw = lw / 2f; + var hlwphol = hlw; // + hol + var hlwpholm2 = hlwphol * 2f; var p = new Pen(Color.CornflowerBlue, lw) { DashStyle = obj.SelectionDashStyle, Alignment = PenAlignment.Outset }; var rect = new Rectangle((int)Math.Round(e.X - hlwphol), (int)Math.Round(e.Y - hlwphol), (int)Math.Round(obj.Size.Width + hlwpholm2), (int)Math.Round(obj.Size.Height + hlwpholm2)); @@ -257,14 +258,14 @@ public class DefaultDrawMethodes { var p = new Pen(pc.GridColor, 0.5f); - int curX = (int)Math.Round(pc.GridChunkSize.Width * pc.ZoomFactor.Width - offset.X); + var curX = (int)Math.Round(pc.GridChunkSize.Width * pc.ZoomFactor.Width - offset.X); while (curX < pc.Width) { e.Graphics.DrawLine(p, curX, -offset.Y, curX, pc.Height); curX = (int)Math.Round(curX + pc.GridChunkSize.Width * pc.ZoomFactor.Width); } - int curY = (int)Math.Round(pc.GridChunkSize.Height * pc.ZoomFactor.Height - offset.Y); + var curY = (int)Math.Round(pc.GridChunkSize.Height * pc.ZoomFactor.Height - offset.Y); while (curY < pc.Height) { e.Graphics.DrawLine(p, -offset.X, curY, pc.Width, curY); diff --git a/Pilz.UI/PaintingControl/DefaultDrawMethodes.vb b/Pilz.UI.WinForms/PaintingControl/DefaultDrawMethodes.vb similarity index 100% rename from Pilz.UI/PaintingControl/DefaultDrawMethodes.vb rename to Pilz.UI.WinForms/PaintingControl/DefaultDrawMethodes.vb diff --git a/Pilz.UI/PaintingControl/DefaultLineCapProps.cs b/Pilz.UI.WinForms/PaintingControl/DefaultLineCapProps.cs similarity index 88% rename from Pilz.UI/PaintingControl/DefaultLineCapProps.cs rename to Pilz.UI.WinForms/PaintingControl/DefaultLineCapProps.cs index 59c8ed1..f4938b3 100644 --- a/Pilz.UI/PaintingControl/DefaultLineCapProps.cs +++ b/Pilz.UI.WinForms/PaintingControl/DefaultLineCapProps.cs @@ -1,6 +1,6 @@ using System.Drawing.Drawing2D; -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl; public class DefaultLineCapProps : LineCapProps diff --git a/Pilz.UI/PaintingControl/DefaultLineCapProps.vb b/Pilz.UI.WinForms/PaintingControl/DefaultLineCapProps.vb similarity index 100% rename from Pilz.UI/PaintingControl/DefaultLineCapProps.vb rename to Pilz.UI.WinForms/PaintingControl/DefaultLineCapProps.vb diff --git a/Pilz.UI/PaintingControl/EventArgs/PaintingObjectEventArgs.cs b/Pilz.UI.WinForms/PaintingControl/EventArgs/PaintingObjectEventArgs.cs similarity index 77% rename from Pilz.UI/PaintingControl/EventArgs/PaintingObjectEventArgs.cs rename to Pilz.UI.WinForms/PaintingControl/EventArgs/PaintingObjectEventArgs.cs index b0c0a39..1996508 100644 --- a/Pilz.UI/PaintingControl/EventArgs/PaintingObjectEventArgs.cs +++ b/Pilz.UI.WinForms/PaintingControl/EventArgs/PaintingObjectEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl.EventArgs; public class PaintingObjectEventArgs(PaintingObject[] paintingObjects) : EventArgs { diff --git a/Pilz.UI/PaintingControl/EventArgs/PaintingObjectEventArgs.vb b/Pilz.UI.WinForms/PaintingControl/EventArgs/PaintingObjectEventArgs.vb similarity index 100% rename from Pilz.UI/PaintingControl/EventArgs/PaintingObjectEventArgs.vb rename to Pilz.UI.WinForms/PaintingControl/EventArgs/PaintingObjectEventArgs.vb diff --git a/Pilz.UI/PaintingControl/EventArgs/PaintingObjectPaintEventArgs.cs b/Pilz.UI.WinForms/PaintingControl/EventArgs/PaintingObjectPaintEventArgs.cs similarity index 96% rename from Pilz.UI/PaintingControl/EventArgs/PaintingObjectPaintEventArgs.cs rename to Pilz.UI.WinForms/PaintingControl/EventArgs/PaintingObjectPaintEventArgs.cs index 4d8b665..13f5a18 100644 --- a/Pilz.UI/PaintingControl/EventArgs/PaintingObjectPaintEventArgs.cs +++ b/Pilz.UI.WinForms/PaintingControl/EventArgs/PaintingObjectPaintEventArgs.cs @@ -1,7 +1,7 @@ using System; using System.Drawing; -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl.EventArgs; public class PaintingObjectPaintEventArgs(PaintingObject obj, Graphics g, PointF offset) : EventArgs { diff --git a/Pilz.UI/PaintingControl/EventArgs/PaintingObjectPaintEventArgs.vb b/Pilz.UI.WinForms/PaintingControl/EventArgs/PaintingObjectPaintEventArgs.vb similarity index 100% rename from Pilz.UI/PaintingControl/EventArgs/PaintingObjectPaintEventArgs.vb rename to Pilz.UI.WinForms/PaintingControl/EventArgs/PaintingObjectPaintEventArgs.vb diff --git a/Pilz.UI/PaintingControl/IPaintingObjectContainer.cs b/Pilz.UI.WinForms/PaintingControl/IPaintingObjectContainer.cs similarity index 50% rename from Pilz.UI/PaintingControl/IPaintingObjectContainer.cs rename to Pilz.UI.WinForms/PaintingControl/IPaintingObjectContainer.cs index 50a7fce..699a3d5 100644 --- a/Pilz.UI/PaintingControl/IPaintingObjectContainer.cs +++ b/Pilz.UI.WinForms/PaintingControl/IPaintingObjectContainer.cs @@ -1,5 +1,4 @@ - -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl; public interface IPaintingObjectContainer { diff --git a/Pilz.UI/PaintingControl/IPaintingObjectContainer.vb b/Pilz.UI.WinForms/PaintingControl/IPaintingObjectContainer.vb similarity index 100% rename from Pilz.UI/PaintingControl/IPaintingObjectContainer.vb rename to Pilz.UI.WinForms/PaintingControl/IPaintingObjectContainer.vb diff --git a/Pilz.UI/PaintingControl/ImageProperties.cs b/Pilz.UI.WinForms/PaintingControl/ImageProperties.cs similarity index 79% rename from Pilz.UI/PaintingControl/ImageProperties.cs rename to Pilz.UI.WinForms/PaintingControl/ImageProperties.cs index c92c615..44dc8e3 100644 --- a/Pilz.UI/PaintingControl/ImageProperties.cs +++ b/Pilz.UI.WinForms/PaintingControl/ImageProperties.cs @@ -1,5 +1,4 @@ - -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl; public class PaintingObjectImageProperties { diff --git a/Pilz.UI/PaintingControl/ImageProperties.vb b/Pilz.UI.WinForms/PaintingControl/ImageProperties.vb similarity index 100% rename from Pilz.UI/PaintingControl/ImageProperties.vb rename to Pilz.UI.WinForms/PaintingControl/ImageProperties.vb diff --git a/Pilz.UI/PaintingControl/LineCapConfigurationArgs.cs b/Pilz.UI.WinForms/PaintingControl/LineCapConfigurationArgs.cs similarity index 92% rename from Pilz.UI/PaintingControl/LineCapConfigurationArgs.cs rename to Pilz.UI.WinForms/PaintingControl/LineCapConfigurationArgs.cs index 7b7eef6..6ca9049 100644 --- a/Pilz.UI/PaintingControl/LineCapConfigurationArgs.cs +++ b/Pilz.UI.WinForms/PaintingControl/LineCapConfigurationArgs.cs @@ -1,6 +1,6 @@ using System.Drawing.Drawing2D; -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl; public class LineCapConfigurationArgs diff --git a/Pilz.UI/PaintingControl/LineCapConfigurationArgs.vb b/Pilz.UI.WinForms/PaintingControl/LineCapConfigurationArgs.vb similarity index 100% rename from Pilz.UI/PaintingControl/LineCapConfigurationArgs.vb rename to Pilz.UI.WinForms/PaintingControl/LineCapConfigurationArgs.vb diff --git a/Pilz.UI/PaintingControl/LineCapProps.cs b/Pilz.UI.WinForms/PaintingControl/LineCapProps.cs similarity index 68% rename from Pilz.UI/PaintingControl/LineCapProps.cs rename to Pilz.UI.WinForms/PaintingControl/LineCapProps.cs index 58045b0..3a13220 100644 --- a/Pilz.UI/PaintingControl/LineCapProps.cs +++ b/Pilz.UI.WinForms/PaintingControl/LineCapProps.cs @@ -1,5 +1,4 @@ - -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl; public abstract class LineCapProps { diff --git a/Pilz.UI/PaintingControl/LineCapProps.vb b/Pilz.UI.WinForms/PaintingControl/LineCapProps.vb similarity index 100% rename from Pilz.UI/PaintingControl/LineCapProps.vb rename to Pilz.UI.WinForms/PaintingControl/LineCapProps.vb diff --git a/Pilz.UI/PaintingControl/PaintingControl.cs b/Pilz.UI.WinForms/PaintingControl/PaintingControl.cs similarity index 91% rename from Pilz.UI/PaintingControl/PaintingControl.cs rename to Pilz.UI.WinForms/PaintingControl/PaintingControl.cs index ccbd478..f70b27a 100644 --- a/Pilz.UI/PaintingControl/PaintingControl.cs +++ b/Pilz.UI.WinForms/PaintingControl/PaintingControl.cs @@ -1,4 +1,6 @@ using Pilz.Drawing; +using Pilz.UI.WinForms.PaintingControl.EventArgs; +using Pilz.UI.WinForms.Utilities; using System; using System.Collections; using System.Collections.Generic; @@ -9,7 +11,7 @@ using System.Drawing.Drawing2D; using System.Linq; using System.Windows.Forms; -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl; public class PaintingControl : UserControl, IPaintingObjectContainer @@ -79,7 +81,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer { var objs = new List(); - foreach (PaintingObject obj in PaintingObjects) + foreach (var obj in PaintingObjects) { if (obj.Selected) objs.Add(obj); @@ -173,7 +175,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer private void ResetAllBufferedImages() { - foreach (PaintingObject ob in PaintingObjects) + foreach (var ob in PaintingObjects) ob.ResetImageBuffer(); Refresh(); } @@ -195,7 +197,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer protected void CheckMouseClick(object sender, MouseEventArgs e) { - foreach (PaintingObject obj in GetObjects(new Point((int)Math.Round(e.X + Offset.X), (int)Math.Round(e.Y + Offset.Y)))) + foreach (var obj in GetObjects(new Point((int)Math.Round(e.X + Offset.X), (int)Math.Round(e.Y + Offset.Y)))) { if (!obj.MouseTransparency) obj.RaiseMouseClick(GetMouseEventArgs(e, obj)); @@ -211,10 +213,10 @@ public class PaintingControl : UserControl, IPaintingObjectContainer if (curObjMouseDown is null || !curObjMouseDown.Selected || pressedControl) { - bool hasMovedObjects = false; + var hasMovedObjects = false; if (IsMovingObjects) { - foreach (PaintingObject obj in GetSelectedObjects()) + foreach (var obj in GetSelectedObjects()) { if (HelpfulDrawingFunctions.IsPointInRectangle(lastMousePos, obj.Rectangle)) { @@ -230,7 +232,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer if (AutoRemoveSelection && !pressedControl) { - foreach (PaintingObject obj in PaintingObjects) + foreach (var obj in PaintingObjects) { if (obj.Selected) { @@ -306,7 +308,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer if (IsMovingObjects) { IsMovingObjects = false; - foreach (PaintingObject obj in GetSelectedObjects()) + foreach (var obj in GetSelectedObjects()) obj.RaiseMoved(new EventArgs()); AutoArrangeToGrid(); } @@ -337,7 +339,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer if (IsMovingObjects) UpdateObjectPositions(e); - foreach (PaintingObject obj in GetObjects(new Point((int)Math.Round(e.X + Offset.X), (int)Math.Round(e.Y + Offset.Y)))) + foreach (var obj in GetObjects(new Point((int)Math.Round(e.X + Offset.X), (int)Math.Round(e.Y + Offset.Y)))) { if (!obj.MouseTransparency) obj.RaiseMouseMove(GetMouseEventArgs(e, obj)); @@ -381,7 +383,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer { var objs = new List(); - foreach (PaintingObject obj in PaintingObjects) + foreach (var obj in PaintingObjects) { if (obj.Selected) objs.Add(obj); @@ -416,7 +418,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer SuspendDrawing(); - foreach (PaintingObject obj in objs) + foreach (var obj in objs) { var sp = savedPos[obj]; @@ -438,7 +440,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer private bool UpdateObjectPosition(MouseEventArgs e, PaintingObject obj, PointF sp) { - bool moved = false; + var moved = false; var cancel = new CancelEventArgs(false); obj.RaiseMovingBeforePositionUpdated(cancel); @@ -454,7 +456,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer private bool IsResizingObjs(IList objs) { - foreach (PaintingObject obj in objs) + foreach (var obj in objs) { if (obj.IsResizing) return true; @@ -471,7 +473,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer { PaintingObject val = null; - for (int i = PaintingObjects.Count - 1; i >= 0; i -= 1) + for (var i = PaintingObjects.Count - 1; i >= 0; i -= 1) { var obj = PaintingObjects[i]; @@ -496,7 +498,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer { var objs = new List(); - foreach (PaintingObject obj in PaintingObjects) + foreach (var obj in PaintingObjects) { if (HelpfulDrawingFunctions.IsPointInRectangle(p, obj.RectangleExtended)) objs.Add(obj); @@ -514,7 +516,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer { var objs = new List(); - foreach (PaintingObject obj in PaintingObjects) + foreach (var obj in PaintingObjects) { var objRect = obj.Rectangle; if (HelpfulDrawingFunctions.IsPointInRectangle(objRect.Location, rect) || HelpfulDrawingFunctions.IsPointInRectangle(objRect.Location + objRect.Size, rect) || HelpfulDrawingFunctions.IsPointInRectangle(new PointF(objRect.Left, objRect.Bottom), rect) || HelpfulDrawingFunctions.IsPointInRectangle(new PointF(objRect.Right, objRect.Top), rect)) @@ -586,7 +588,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer var baserect = new RectangleF(Offset, Size); - foreach (PaintingObject obj in PaintingObjects) + foreach (var obj in PaintingObjects) { if (obj.Visible && HelpfulDrawingFunctions.OverlapsTwoRectangles(obj.Rectangle, baserect)) obj.Draw(e, Offset); @@ -610,7 +612,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer public void PaintFullView(Graphics g) { - foreach (PaintingObject obj in PaintingObjects) + foreach (var obj in PaintingObjects) { if (obj.Visible) obj.Draw(g, PointF.Empty); @@ -630,7 +632,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer private void SelectControlsInArea() { var rect = HelpfulDrawingFunctions.GetRectangle(startMousePos, lastMousePos); - foreach (PaintingObject obj in PaintingObjects) + foreach (var obj in PaintingObjects) obj.Selected = startMousePos.X >= lastMousePos.X ? HelpfulDrawingFunctions.OverlapsTwoRectangles(obj.Rectangle, rect) : HelpfulDrawingFunctions.RectangleContainsRectangle(rect, obj.Rectangle); } @@ -640,11 +642,11 @@ public class PaintingControl : UserControl, IPaintingObjectContainer { var zoomedGridChunkSize = new SizeF(GridChunkSize.Width * ZoomFactor.Width, GridChunkSize.Height * ZoomFactor.Height); - int modTop = (int)Math.Round(obj.Y % zoomedGridChunkSize.Height); - int modLeft = (int)Math.Round(obj.X % zoomedGridChunkSize.Width); + var modTop = (int)Math.Round(obj.Y % zoomedGridChunkSize.Height); + var modLeft = (int)Math.Round(obj.X % zoomedGridChunkSize.Width); - int halfHeight = (int)Math.Round(zoomedGridChunkSize.Height / 2f); - int halfWidth = (int)Math.Round(zoomedGridChunkSize.Width / 2f); + var halfHeight = (int)Math.Round(zoomedGridChunkSize.Height / 2f); + var halfWidth = (int)Math.Round(zoomedGridChunkSize.Width / 2f); void zoomLocation(PaintingObject obj2) { @@ -665,25 +667,25 @@ public class PaintingControl : UserControl, IPaintingObjectContainer zoomLocation(obj); - foreach (PaintingObject pinned in obj.PinnedObjects) + foreach (var pinned in obj.PinnedObjects) zoomLocation(pinned); - int modH = (int)Math.Round(obj.Height % zoomedGridChunkSize.Height); - int modW = (int)Math.Round(obj.Width % zoomedGridChunkSize.Width); + var modH = (int)Math.Round(obj.Height % zoomedGridChunkSize.Height); + var modW = (int)Math.Round(obj.Width % zoomedGridChunkSize.Width); void zoomSize(PaintingObject obj2) { if (obj2.EnableResize && !obj2.HardcodedSize) { if (modH > halfHeight) obj2.Height += zoomedGridChunkSize.Height - modH; else { obj2.Height -= modH; } if (modW > halfWidth) obj2.Width += zoomedGridChunkSize.Width - modW; else { obj2.Width -= modW; } } }; zoomSize(obj); - foreach (PaintingObject pinned in obj.PinnedObjects) + foreach (var pinned in obj.PinnedObjects) zoomSize(pinned); } } public bool IsPinnedObject(PaintingObject o) { - foreach (PaintingObject obj in PaintingObjects) + foreach (var obj in PaintingObjects) { if (obj.PinnedObjects.Contains(o)) return true; @@ -695,7 +697,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer { if (GridEnabled) { - foreach (PaintingObject obj in GetSelectedObjects()) + foreach (var obj in GetSelectedObjects()) { if (obj.AutoAlignToGrid) ArrangeToGrid(obj, false); @@ -712,15 +714,15 @@ public class PaintingControl : UserControl, IPaintingObjectContainer public static SizeF GetFullSize(IEnumerable objects) { - float curX = 0f; - float curY = 0f; + var curX = 0f; + var curY = 0f; - foreach (PaintingObject po in objects) + foreach (var po in objects) { - float myX = po.X + po.Width; + var myX = po.X + po.Width; if (curX < myX) curX = myX; - float myY = po.Y + po.Height; + var myY = po.Y + po.Height; if (curY < myY) curY = myY; } @@ -746,7 +748,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer { if (pressedAlt) { - float val = (float)(e.Delta / 120d / 10d); + var val = (float)(e.Delta / 120d / 10d); ZoomFactor = new SizeF((float)Math.Max((double)(ZoomFactor.Width + val), 0.25d), (float)Math.Max((double)(ZoomFactor.Height + val), 0.25d)); Refresh(); } @@ -761,7 +763,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer if (_stopDrawing < 0) // bufferedImg = New Bitmap(Width, Height) // DrawToBitmap(bufferedImg, New Rectangle(0, 0, bufferedImg.Width, bufferedImg.Height)) - Utils.DrawingControl.SuspendDrawing(this); + DrawingControl.SuspendDrawing(this); _stopDrawing += 1; } @@ -779,7 +781,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer // bufferedImg.Dispose() // bufferedImg = Nothing // If executeRefresh Then Refresh() - Utils.DrawingControl.ResumeDrawing(this, executeRefresh); + DrawingControl.ResumeDrawing(this, executeRefresh); } } \ No newline at end of file diff --git a/Pilz.UI/PaintingControl/PaintingControl.resx b/Pilz.UI.WinForms/PaintingControl/PaintingControl.resx similarity index 100% rename from Pilz.UI/PaintingControl/PaintingControl.resx rename to Pilz.UI.WinForms/PaintingControl/PaintingControl.resx diff --git a/Pilz.UI/PaintingControl/PaintingControl.vb b/Pilz.UI.WinForms/PaintingControl/PaintingControl.vb similarity index 100% rename from Pilz.UI/PaintingControl/PaintingControl.vb rename to Pilz.UI.WinForms/PaintingControl/PaintingControl.vb diff --git a/Pilz.UI/PaintingControl/PaintingControlDelegates.cs b/Pilz.UI.WinForms/PaintingControl/PaintingControlDelegates.cs similarity index 76% rename from Pilz.UI/PaintingControl/PaintingControlDelegates.cs rename to Pilz.UI.WinForms/PaintingControl/PaintingControlDelegates.cs index 14d04f6..3b6b86c 100644 --- a/Pilz.UI/PaintingControl/PaintingControlDelegates.cs +++ b/Pilz.UI.WinForms/PaintingControl/PaintingControlDelegates.cs @@ -1,7 +1,8 @@ -using System.Drawing; +using Pilz.UI.WinForms.PaintingControl.EventArgs; +using System.Drawing; using System.Windows.Forms; -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl; public delegate void DelegateDrawPaintingObjectMethode(PaintingObjectPaintEventArgs e); diff --git a/Pilz.UI/PaintingControl/PaintingControlDelegates.vb b/Pilz.UI.WinForms/PaintingControl/PaintingControlDelegates.vb similarity index 100% rename from Pilz.UI/PaintingControl/PaintingControlDelegates.vb rename to Pilz.UI.WinForms/PaintingControl/PaintingControlDelegates.vb diff --git a/Pilz.UI/PaintingControl/PaintingObject.cs b/Pilz.UI.WinForms/PaintingControl/PaintingObject.cs similarity index 97% rename from Pilz.UI/PaintingControl/PaintingObject.cs rename to Pilz.UI.WinForms/PaintingControl/PaintingObject.cs index 2beb8f9..9acd47b 100644 --- a/Pilz.UI/PaintingControl/PaintingObject.cs +++ b/Pilz.UI.WinForms/PaintingControl/PaintingObject.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Reflection; using System.Windows.Forms; -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl; [Serializable] @@ -157,7 +157,7 @@ public class PaintingObject : ICloneable, IPaintingObjectContainer { var tt = PaintingObjectType.Custom; - foreach (DelegateDrawPaintingObjectMethode d in DrawMethodes) + foreach (var d in DrawMethodes) { if (ReferenceEquals(d.Method.DeclaringType, typeof(DefaultDrawMethodes))) { @@ -335,7 +335,7 @@ public class PaintingObject : ICloneable, IPaintingObjectContainer } set { - bool re = !ReferenceEquals(value, _Parent); + var re = !ReferenceEquals(value, _Parent); _Parent = value; if (re) ParentChanged?.Invoke(this, new EventArgs()); @@ -663,7 +663,7 @@ public class PaintingObject : ICloneable, IPaintingObjectContainer { var poevargs = new PaintingObjectPaintEventArgs(this, g, offset); - foreach (DelegateDrawPaintingObjectMethode dm in DrawMethodes) + foreach (var dm in DrawMethodes) { try { @@ -689,12 +689,12 @@ public class PaintingObject : ICloneable, IPaintingObjectContainer { var obj = new PaintingObject(); var metype = GetType(); - string[] blackField = new[] { nameof(PinnedObjects), nameof(resizeEngine), nameof(_Parent), nameof(BufferedImage), nameof(ImageProperties) }; + var blackField = new[] { nameof(PinnedObjects), nameof(resizeEngine), nameof(_Parent), nameof(BufferedImage), nameof(ImageProperties) }; void copyFields(object source, object dest, string[] blackFields, Type t) { var fields = new List(t.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.IgnoreCase | BindingFlags.Instance)); - foreach (FieldInfo @field in fields) + foreach (var @field in fields) { if (!blackFields.Contains(@field.Name)) @field.SetValue(dest, @field.GetValue(source)); @@ -761,10 +761,10 @@ public class PaintingObjectList : List public void AddRange(PaintingObject[] items) { - foreach (PaintingObject item in items) + foreach (var item in items) item.Parent = MyParent; base.AddRange(items); - foreach (PaintingObject item in items) + foreach (var item in items) item.AutoArrangeToGrid(); if (EnableRaisingEvents) MyParent?.RaisePaintingObjectAdded(new PaintingObjectEventArgs(items)); diff --git a/Pilz.UI/PaintingControl/PaintingObject.vb b/Pilz.UI.WinForms/PaintingControl/PaintingObject.vb similarity index 100% rename from Pilz.UI/PaintingControl/PaintingObject.vb rename to Pilz.UI.WinForms/PaintingControl/PaintingObject.vb diff --git a/Pilz.UI/PaintingControl/PaintingObjectJsonSerializer.cs b/Pilz.UI.WinForms/PaintingControl/PaintingObjectJsonSerializer.cs similarity index 50% rename from Pilz.UI/PaintingControl/PaintingObjectJsonSerializer.cs rename to Pilz.UI.WinForms/PaintingControl/PaintingObjectJsonSerializer.cs index 6cfbabc..be3a6be 100644 --- a/Pilz.UI/PaintingControl/PaintingObjectJsonSerializer.cs +++ b/Pilz.UI.WinForms/PaintingControl/PaintingObjectJsonSerializer.cs @@ -1,5 +1,4 @@ - -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl; public class PaintingObjectJsonSerializer { diff --git a/Pilz.UI/PaintingControl/PaintingObjectJsonSerializer.vb b/Pilz.UI.WinForms/PaintingControl/PaintingObjectJsonSerializer.vb similarity index 100% rename from Pilz.UI/PaintingControl/PaintingObjectJsonSerializer.vb rename to Pilz.UI.WinForms/PaintingControl/PaintingObjectJsonSerializer.vb diff --git a/Pilz.UI/PaintingControl/PaintingObjectLayering.cs b/Pilz.UI.WinForms/PaintingControl/PaintingObjectLayering.cs similarity index 94% rename from Pilz.UI/PaintingControl/PaintingObjectLayering.cs rename to Pilz.UI.WinForms/PaintingControl/PaintingObjectLayering.cs index eeac487..15755c1 100644 --- a/Pilz.UI/PaintingControl/PaintingObjectLayering.cs +++ b/Pilz.UI.WinForms/PaintingControl/PaintingObjectLayering.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl; public class PaintingObjectLayering @@ -46,8 +46,8 @@ public class PaintingObjectLayering /// The number how many objects it should be moved. public void MoveObject(int count) { - int oldIndex = ObjectList.IndexOf(PaintingObject); - int newIndex = oldIndex + count; + var oldIndex = ObjectList.IndexOf(PaintingObject); + var newIndex = oldIndex + count; MoveObjectTo(newIndex); } diff --git a/Pilz.UI/PaintingControl/PaintingObjectLayering.vb b/Pilz.UI.WinForms/PaintingControl/PaintingObjectLayering.vb similarity index 100% rename from Pilz.UI/PaintingControl/PaintingObjectLayering.vb rename to Pilz.UI.WinForms/PaintingControl/PaintingObjectLayering.vb diff --git a/Pilz.UI/PaintingControl/PaintingObjectListLayering.cs b/Pilz.UI.WinForms/PaintingControl/PaintingObjectListLayering.cs similarity index 94% rename from Pilz.UI/PaintingControl/PaintingObjectListLayering.cs rename to Pilz.UI.WinForms/PaintingControl/PaintingObjectListLayering.cs index 19f7df2..df5b4a7 100644 --- a/Pilz.UI/PaintingControl/PaintingObjectListLayering.cs +++ b/Pilz.UI.WinForms/PaintingControl/PaintingObjectListLayering.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Data; using System.Linq; -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl; public class PaintingObjectListLayering { @@ -59,7 +59,7 @@ public class PaintingObjectListLayering { var func = kvp.Value; - foreach (PaintingObject obj in listOld) + foreach (var obj in listOld) { if (func(obj)) { @@ -72,7 +72,7 @@ public class PaintingObjectListLayering } // Remove remembered objects - foreach (PaintingObject obj in toRemove) + foreach (var obj in toRemove) listOld.Remove(obj); toRemove.Clear(); } diff --git a/Pilz.UI/PaintingControl/PaintingObjectListLayering.vb b/Pilz.UI.WinForms/PaintingControl/PaintingObjectListLayering.vb similarity index 100% rename from Pilz.UI/PaintingControl/PaintingObjectListLayering.vb rename to Pilz.UI.WinForms/PaintingControl/PaintingObjectListLayering.vb diff --git a/Pilz.UI/PaintingControl/PaintingObjectResizing.cs b/Pilz.UI.WinForms/PaintingControl/PaintingObjectResizing.cs similarity index 93% rename from Pilz.UI/PaintingControl/PaintingObjectResizing.cs rename to Pilz.UI.WinForms/PaintingControl/PaintingObjectResizing.cs index 5372a22..8df0832 100644 --- a/Pilz.UI/PaintingControl/PaintingObjectResizing.cs +++ b/Pilz.UI.WinForms/PaintingControl/PaintingObjectResizing.cs @@ -4,7 +4,7 @@ using System.Drawing; using System.Runtime.CompilerServices; using System.Windows.Forms; -namespace Pilz.UI; +namespace Pilz.UI.WinForms.PaintingControl; [Serializable] @@ -140,7 +140,7 @@ internal class PaintingObjectResizing private bool IsEnabled() { - bool enabled = Enabled; + var enabled = Enabled; CheckEnabled?.Invoke(this, ref enabled); @@ -172,8 +172,8 @@ internal class PaintingObjectResizing if (mMouseDown && mEdge != EdgeEnum.None) { - int eX = (int)Math.Round(e.X + mObj.Parent.Offset.X); - int eY = (int)Math.Round(e.Y + mObj.Parent.Offset.Y); + var eX = (int)Math.Round(e.X + mObj.Parent.Offset.X); + var eY = (int)Math.Round(e.Y + mObj.Parent.Offset.Y); switch (mEdge) { @@ -227,14 +227,14 @@ internal class PaintingObjectResizing else if (!mMouseDown) { - int eXo = e.X; - int eYo = e.Y; - int realX = (int)Math.Round(eXo + mObj.Parent.Offset.X); - int realY = (int)Math.Round(eYo + mObj.Parent.Offset.Y); - int eXwo = (int)Math.Round(eXo - mObj.X); - int eYwo = (int)Math.Round(eYo - mObj.Y); - int eX = (int)Math.Round(eXwo + mObj.Parent.Offset.X); - int eY = (int)Math.Round(eYwo + mObj.Parent.Offset.Y); + var eXo = e.X; + var eYo = e.Y; + var realX = (int)Math.Round(eXo + mObj.Parent.Offset.X); + var realY = (int)Math.Round(eYo + mObj.Parent.Offset.Y); + var eXwo = (int)Math.Round(eXo - mObj.X); + var eYwo = (int)Math.Round(eYo - mObj.Y); + var eX = (int)Math.Round(eXwo + mObj.Parent.Offset.X); + var eY = (int)Math.Round(eYwo + mObj.Parent.Offset.Y); var eLocation = new Point(eX, eY); RectangleF extRect = mObj.RectangleExtended; var oldRect = mObj.Rectangle; @@ -245,8 +245,8 @@ internal class PaintingObjectResizing newRect.Width = (extRect.Width - oldRect.Width) / 2f; newRect.Height = (extRect.Height - oldRect.Height) / 2f; - bool setToNone = false; - bool isOnTop = ReferenceEquals(mObj.Parent.GetObject(new PointF(realX, realY), true), mObj); + var setToNone = false; + var isOnTop = ReferenceEquals(mObj.Parent.GetObject(new PointF(realX, realY), true), mObj); if (IsEnabled() && isOnTop) { diff --git a/Pilz.UI/PaintingControl/PaintingObjectResizing.vb b/Pilz.UI.WinForms/PaintingControl/PaintingObjectResizing.vb similarity index 100% rename from Pilz.UI/PaintingControl/PaintingObjectResizing.vb rename to Pilz.UI.WinForms/PaintingControl/PaintingObjectResizing.vb diff --git a/Pilz.UI/Pilz.UI.csproj b/Pilz.UI.WinForms/Pilz.UI.WinForms.csproj similarity index 98% rename from Pilz.UI/Pilz.UI.csproj rename to Pilz.UI.WinForms/Pilz.UI.WinForms.csproj index d780857..e3c76e7 100644 --- a/Pilz.UI/Pilz.UI.csproj +++ b/Pilz.UI.WinForms/Pilz.UI.WinForms.csproj @@ -10,7 +10,7 @@ annotations - 2.4.7 + 2.6.0 diff --git a/Pilz.UI/Pilz.UI.vbproj b/Pilz.UI.WinForms/Pilz.UI.vbproj similarity index 100% rename from Pilz.UI/Pilz.UI.vbproj rename to Pilz.UI.WinForms/Pilz.UI.vbproj diff --git a/Pilz.UI.WinForms/Resources.Designer.cs b/Pilz.UI.WinForms/Resources.Designer.cs new file mode 100644 index 0000000..b23e49f --- /dev/null +++ b/Pilz.UI.WinForms/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. +// +//------------------------------------------------------------------------------ + +namespace Pilz.UI.My.Resources { + using System; + + + /// + /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// + // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Pilz.UI.WinForms.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/Pilz.UI/Resources.resx b/Pilz.UI.WinForms/Resources.resx similarity index 100% rename from Pilz.UI/Resources.resx rename to Pilz.UI.WinForms/Resources.resx diff --git a/Pilz.UI/Symbols/ISymbolFactory.cs b/Pilz.UI.WinForms/Symbols/ISymbolFactory.cs similarity index 90% rename from Pilz.UI/Symbols/ISymbolFactory.cs rename to Pilz.UI.WinForms/Symbols/ISymbolFactory.cs index a6bf507..791de21 100644 --- a/Pilz.UI/Symbols/ISymbolFactory.cs +++ b/Pilz.UI.WinForms/Symbols/ISymbolFactory.cs @@ -1,6 +1,6 @@ using System.Reflection; -namespace Pilz.UI.Symbols; +namespace Pilz.UI.WinForms.Symbols; public interface ISymbolFactory { diff --git a/Pilz.UI/Symbols/SymbolFactory.cs b/Pilz.UI.WinForms/Symbols/SymbolFactory.cs similarity index 97% rename from Pilz.UI/Symbols/SymbolFactory.cs rename to Pilz.UI.WinForms/Symbols/SymbolFactory.cs index 91693b6..55cea40 100644 --- a/Pilz.UI/Symbols/SymbolFactory.cs +++ b/Pilz.UI.WinForms/Symbols/SymbolFactory.cs @@ -1,6 +1,6 @@ using System.Reflection; -namespace Pilz.UI.Symbols; +namespace Pilz.UI.WinForms.Symbols; public abstract class SymbolFactory : ISymbolFactory { diff --git a/Pilz.UI/Symbols/SymbolSize.cs b/Pilz.UI.WinForms/Symbols/SymbolSize.cs similarity index 97% rename from Pilz.UI/Symbols/SymbolSize.cs rename to Pilz.UI.WinForms/Symbols/SymbolSize.cs index 85efff1..29c626d 100644 --- a/Pilz.UI/Symbols/SymbolSize.cs +++ b/Pilz.UI.WinForms/Symbols/SymbolSize.cs @@ -1,4 +1,4 @@ -namespace Pilz.UI.Symbols; +namespace Pilz.UI.WinForms.Symbols; public enum SymbolSize { diff --git a/Pilz.UI/Utilities/DrawingControl.cs b/Pilz.UI.WinForms/Utilities/DrawingControl.cs similarity index 94% rename from Pilz.UI/Utilities/DrawingControl.cs rename to Pilz.UI.WinForms/Utilities/DrawingControl.cs index 9659f4d..46d85a5 100644 --- a/Pilz.UI/Utilities/DrawingControl.cs +++ b/Pilz.UI.WinForms/Utilities/DrawingControl.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Windows.Forms; -namespace Pilz.UI.Utils; +namespace Pilz.UI.WinForms.Utilities; public static class DrawingControl @@ -30,7 +30,7 @@ public static class DrawingControl public static void ResumeDrawing(this Control control, bool redraw) { - bool doRedraw = true; + var doRedraw = true; if (dicSuspendCount.ContainsKey(control.Handle)) { diff --git a/Pilz.UI/Utilities/DrawingControl.vb b/Pilz.UI.WinForms/Utilities/DrawingControl.vb similarity index 100% rename from Pilz.UI/Utilities/DrawingControl.vb rename to Pilz.UI.WinForms/Utilities/DrawingControl.vb diff --git a/Pilz.UI/Utilities/User32Bridge.cs b/Pilz.UI.WinForms/Utilities/User32Bridge.cs similarity index 85% rename from Pilz.UI/Utilities/User32Bridge.cs rename to Pilz.UI.WinForms/Utilities/User32Bridge.cs index 499c075..b214f53 100644 --- a/Pilz.UI/Utilities/User32Bridge.cs +++ b/Pilz.UI.WinForms/Utilities/User32Bridge.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Pilz.UI; +namespace Pilz.UI.WinForms.Utilities; public static class User32Bridge { diff --git a/Pilz.UI/Utilities/User32Bridge.vb b/Pilz.UI.WinForms/Utilities/User32Bridge.vb similarity index 100% rename from Pilz.UI/Utilities/User32Bridge.vb rename to Pilz.UI.WinForms/Utilities/User32Bridge.vb diff --git a/Pilz.UI/Resources.Designer.cs b/Pilz.UI/Resources.Designer.cs deleted file mode 100644 index 1da33d7..0000000 --- a/Pilz.UI/Resources.Designer.cs +++ /dev/null @@ -1,69 +0,0 @@ -// ------------------------------------------------------------------------------ -// -// Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.42000 -// -// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -// der Code erneut generiert wird. -// -// ------------------------------------------------------------------------------ - - -using System.Diagnostics; -using Microsoft.VisualBasic; - -namespace Pilz.UI.My.Resources -{ - - // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert - // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. - // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen - // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - /// - /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - /// - [System.CodeDom.Compiler.GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] - [DebuggerNonUserCode()] - [System.Runtime.CompilerServices.CompilerGenerated()] - internal static class Resources - { - - private static System.Resources.ResourceManager resourceMan; - - private static System.Globalization.CultureInfo resourceCulture; - - /// - /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - /// - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Resources.ResourceManager ResourceManager - { - get - { - if (ReferenceEquals(resourceMan, null)) - { - var temp = new System.Resources.ResourceManager("Pilz.UI.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. - /// - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} \ No newline at end of file diff --git a/Pilz.sln b/Pilz.sln index a18176b..a741793 100644 --- a/Pilz.sln +++ b/Pilz.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz", "Pilz\Pilz.csproj", EndProject Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Pilz.Drawing", "Pilz.Drawing\Pilz.Drawing.vbproj", "{1A0B8106-2449-4908-B5E1-A00D8E9CF8F6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.UI", "Pilz.UI\Pilz.UI.csproj", "{3058E1D4-81CA-02C8-10A8-88FBF0A55201}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.UI.WinForms", "Pilz.UI.WinForms\Pilz.UI.WinForms.csproj", "{3058E1D4-81CA-02C8-10A8-88FBF0A55201}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Collections", "Pilz.Collections\Pilz.Collections.csproj", "{569653FF-4821-0FE5-1675-C1386CD2094A}" EndProject @@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Net", "Pilz.Net\Pilz.N EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Cryptography", "Pilz.Cryptography\Pilz.Cryptography.csproj", "{3F5988E6-439E-4A9D-B2C6-47EFFB161AC6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.UI.Telerik", "Pilz.UI.Telerik\Pilz.UI.Telerik.csproj", "{DF674119-CC28-40AA-968F-1E23D184A491}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.UI.WinForms.Telerik", "Pilz.UI.WinForms.Telerik\Pilz.UI.WinForms.Telerik.csproj", "{DF674119-CC28-40AA-968F-1E23D184A491}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Net.CloudProviders.Nextcloud", "Pilz.Net.CloudProviders.Nextcloud\Pilz.Net.CloudProviders.Nextcloud.csproj", "{A91E966B-3A82-4F32-A703-2FC1C7654FD1}" EndProject @@ -39,13 +39,13 @@ 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Plugins.Advanced.UI", "Pilz.Plugins.Advanced.UI\Pilz.Plugins.Advanced.UI.csproj", "{5030C047-B04B-4BA7-8CEF-3B6C3F3A2C59}" +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}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Plugins.Advanced.UI.Telerik", "Pilz.Plugins.Advanced.UI.Telerik\Pilz.Plugins.Advanced.UI.Telerik.csproj", "{0A837BD6-A19C-4A05-A57D-CBB0CD64B244}" +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}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pilz.Extensions", "Pilz.Extensions\Pilz.Extensions.csproj", "{63DA7581-F35E-4EDD-BEAE-01E281B0BDC3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pilz.UI.Telerik.Symbols", "Pilz.UI.Telerik.Symbols\Pilz.UI.Telerik.Symbols.csproj", "{9F10C26F-1D9F-4B0B-8A7A-73A6082C5BF7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pilz.UI.WinForms.Telerik.Symbols", "Pilz.UI.WinForms.Telerik.Symbols\Pilz.UI.WinForms.Telerik.Symbols.csproj", "{9F10C26F-1D9F-4B0B-8A7A-73A6082C5BF7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution