diff --git a/Pilz.UI.Telerik/Dialogs/DialogBaseForm.Statics.cs b/Pilz.UI.Telerik/Dialogs/DialogBase.Statics.cs similarity index 78% rename from Pilz.UI.Telerik/Dialogs/DialogBaseForm.Statics.cs rename to Pilz.UI.Telerik/Dialogs/DialogBase.Statics.cs index d07bb09..0413f27 100644 --- a/Pilz.UI.Telerik/Dialogs/DialogBaseForm.Statics.cs +++ b/Pilz.UI.Telerik/Dialogs/DialogBase.Statics.cs @@ -9,7 +9,7 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window; namespace Pilz.UI.Telerik.Dialogs { - partial class DialogBaseForm + partial class DialogBase { public delegate void DialogLoadingEventHandler(DialogLoadingEventArgs e); public delegate void DialogClosedEventHandler(DialogClosedEventArgs e); @@ -17,60 +17,60 @@ namespace Pilz.UI.Telerik.Dialogs public static event DialogLoadingEventHandler? DialogLoading; public static event DialogClosedEventHandler? DialogClosed; - public static T Show(string title, Icon icon, object? tag = null) where T : FlyoutDialogBase + public static T Show(string title, Icon icon, object? tag = null) where T : FlyoutBase { return Show(null, title, icon, tag); } - public static T ShowDialog(string title, Icon icon, object? tag = null) where T : FlyoutDialogBase + public static T ShowDialog(string title, Icon icon, object? tag = null) where T : FlyoutBase { return ShowDialog(null, title, icon, tag); } - public static T Show(IWin32Window? parent, string title, Icon icon, object? tag = null) where T : FlyoutDialogBase + public static T Show(IWin32Window? parent, string title, Icon icon, object? tag = null) where T : FlyoutBase { return Show(CreatePanelInstance(tag), parent, title, icon); } - public static T ShowDialog(IWin32Window? parent, string title, Icon icon, object? tag = null) where T : FlyoutDialogBase + public static T ShowDialog(IWin32Window? parent, string title, Icon icon, object? tag = null) where T : FlyoutBase { return ShowDialog(CreatePanelInstance(tag), parent, title, icon); } - public static T Show(T dialogPanel, string title, Icon icon) where T : FlyoutDialogBase + public static T Show(T dialogPanel, string title, Icon icon) where T : FlyoutBase { return Show(dialogPanel, null, title, icon); } - public static T ShowDialog(T dialogPanel, string title, Icon icon) where T : FlyoutDialogBase + public static T ShowDialog(T dialogPanel, string title, Icon icon) where T : FlyoutBase { return ShowDialog(dialogPanel, null, title, icon); } - public static T Show(T dialogPanel, IWin32Window? parent, string title, Icon icon) where T : FlyoutDialogBase + public static T Show(T dialogPanel, IWin32Window? parent, string title, Icon icon) where T : FlyoutBase { CreateForm(dialogPanel, parent, title, icon).Show(); return dialogPanel; } - public static T ShowDialog(T dialogPanel, IWin32Window? parent, string title, Icon icon) where T : FlyoutDialogBase + public static T ShowDialog(T dialogPanel, IWin32Window? parent, string title, Icon icon) where T : FlyoutBase { CreateForm(dialogPanel, parent, title, icon).ShowDialog(); return dialogPanel; } - private static T CreatePanelInstance(object? tag) where T : FlyoutDialogBase + private static T CreatePanelInstance(object? tag) where T : FlyoutBase { T dialogPanel = Activator.CreateInstance(); dialogPanel.Tag = tag; return dialogPanel; } - private static DialogBaseForm CreateForm(T dialogPanel, IWin32Window? parent, string title, Icon icon) where T : FlyoutDialogBase + private static DialogBase CreateForm(T dialogPanel, IWin32Window? parent, string title, Icon icon) where T : FlyoutBase { dialogPanel.Dock = DockStyle.Fill; - var dialog = new DialogBaseForm(dialogPanel) + var dialog = new DialogBase(dialogPanel) { Text = title, Icon = icon, diff --git a/Pilz.UI.Telerik/Dialogs/DialogBaseForm.cs b/Pilz.UI.Telerik/Dialogs/DialogBase.cs similarity index 79% rename from Pilz.UI.Telerik/Dialogs/DialogBaseForm.cs rename to Pilz.UI.Telerik/Dialogs/DialogBase.cs index e73bd15..efe326f 100644 --- a/Pilz.UI.Telerik/Dialogs/DialogBaseForm.cs +++ b/Pilz.UI.Telerik/Dialogs/DialogBase.cs @@ -8,17 +8,17 @@ using Telerik.WinControls.UI; namespace Pilz.UI.Telerik.Dialogs { - public partial class DialogBaseForm : RadForm + public partial class DialogBase : RadForm { - public FlyoutDialogBase? DialogPanel { get; private set; } + public FlyoutBase? DialogPanel { get; private set; } - private DialogBaseForm() + private DialogBase() { Load += DialogBaseForm_Load; FormClosed += DialogBaseForm_FormClosed; } - public DialogBaseForm(FlyoutDialogBase? dialogPanel) : this() + public DialogBase(FlyoutBase? dialogPanel) : this() { DialogPanel = dialogPanel; } diff --git a/Pilz.UI.Telerik/Dialogs/DialogClosedEventArgs.cs b/Pilz.UI.Telerik/Dialogs/DialogClosedEventArgs.cs index 8f0b05d..3f1f33a 100644 --- a/Pilz.UI.Telerik/Dialogs/DialogClosedEventArgs.cs +++ b/Pilz.UI.Telerik/Dialogs/DialogClosedEventArgs.cs @@ -9,10 +9,10 @@ namespace Pilz.UI.Telerik.Dialogs { public class DialogClosedEventArgs : EventArgs { - public DialogBaseForm Parent { get; private set; } - public FlyoutDialogBase? Content => Parent?.DialogPanel; + public DialogBase Parent { get; private set; } + public FlyoutBase? Content => Parent?.DialogPanel; - public DialogClosedEventArgs(DialogBaseForm dialog) + public DialogClosedEventArgs(DialogBase dialog) { Parent = dialog; } diff --git a/Pilz.UI.Telerik/Dialogs/DialogLoadingEventArgs.cs b/Pilz.UI.Telerik/Dialogs/DialogLoadingEventArgs.cs index 2e47dbf..1ae2030 100644 --- a/Pilz.UI.Telerik/Dialogs/DialogLoadingEventArgs.cs +++ b/Pilz.UI.Telerik/Dialogs/DialogLoadingEventArgs.cs @@ -10,10 +10,10 @@ namespace Pilz.UI.Telerik.Dialogs { public class DialogLoadingEventArgs : EventArgs { - public DialogBaseForm Parent { get; private set; } - public FlyoutDialogBase? Content => Parent?.DialogPanel; + public DialogBase Parent { get; private set; } + public FlyoutBase? Content => Parent?.DialogPanel; - public DialogLoadingEventArgs(DialogBaseForm dialog) + public DialogLoadingEventArgs(DialogBase dialog) { Parent = dialog; } diff --git a/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.Designer.cs b/Pilz.UI.Telerik/Dialogs/FlyoutBase.Designer.cs similarity index 98% rename from Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.Designer.cs rename to Pilz.UI.Telerik/Dialogs/FlyoutBase.Designer.cs index e939fc9..4616c92 100644 --- a/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.Designer.cs +++ b/Pilz.UI.Telerik/Dialogs/FlyoutBase.Designer.cs @@ -1,6 +1,6 @@ namespace Pilz.UI.Telerik.Dialogs { - partial class FlyoutDialogBase + partial class FlyoutBase { /// /// Erforderliche Designervariable. @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlyoutDialogBase)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlyoutBase)); radButton_Cancel = new global::Telerik.WinControls.UI.RadButton(); radButton_Confirm = new global::Telerik.WinControls.UI.RadButton(); tableLayoutPanel_ActionButtons = new TableLayoutPanel(); diff --git a/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.Statics.cs b/Pilz.UI.Telerik/Dialogs/FlyoutBase.Statics.cs similarity index 93% rename from Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.Statics.cs rename to Pilz.UI.Telerik/Dialogs/FlyoutBase.Statics.cs index 25b1c3b..ec4d545 100644 --- a/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.Statics.cs +++ b/Pilz.UI.Telerik/Dialogs/FlyoutBase.Statics.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace Pilz.UI.Telerik.Dialogs { - partial class FlyoutDialogBase + partial class FlyoutBase { public delegate void FlyoutCreatedEventHandler(FlyoutCreatedEventArgs e); public delegate void FlyoutClosedEventHandler(FlyoutClosedEventArgs e); @@ -32,7 +32,7 @@ namespace Pilz.UI.Telerik.Dialogs private static object? tagToAssign = null; public static Control? ParentContext { get; private set; } = null; - static FlyoutDialogBase() + static FlyoutBase() { RadFlyoutManager.ContentCreated += RadFlyoutManager_ContentCreated; RadFlyoutManager.FlyoutClosed += RadFlyoutManager_FlyoutClosed; @@ -40,12 +40,12 @@ namespace Pilz.UI.Telerik.Dialogs private static void RadFlyoutManager_ContentCreated(ContentCreatedEventArgs e) { - if (e.Content is FlyoutDialogBase dialogBase) + if (e.Content is FlyoutBase dialogBase) { if (tagToAssign != null) dialogBase.Tag = tagToAssign; - var eventArgs = new FlyoutCreatedEventArgs((FlyoutDialogBase)e.Content); + var eventArgs = new FlyoutCreatedEventArgs((FlyoutBase)e.Content); if (dialogBase is ILoadContent iLoadContent) iLoadContent.LoadContent(); @@ -62,9 +62,9 @@ namespace Pilz.UI.Telerik.Dialogs private static void RadFlyoutManager_FlyoutClosed(global::Telerik.WinControls.UI.SplashScreen.FlyoutClosedEventArgs e) { - if (e.Content is FlyoutDialogBase dialogBase) + if (e.Content is FlyoutBase dialogBase) { - var eventArgs = new FlyoutClosedEventArgs((FlyoutDialogBase)e.Content); + var eventArgs = new FlyoutClosedEventArgs((FlyoutBase)e.Content); foreach (var args in flyoutCloseHandlers) { diff --git a/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.cs b/Pilz.UI.Telerik/Dialogs/FlyoutBase.cs similarity index 94% rename from Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.cs rename to Pilz.UI.Telerik/Dialogs/FlyoutBase.cs index 303d188..acc771f 100644 --- a/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.cs +++ b/Pilz.UI.Telerik/Dialogs/FlyoutBase.cs @@ -15,7 +15,7 @@ using static Telerik.WinControls.UI.PopupEditorNotificationData; namespace Pilz.UI.Telerik.Dialogs { - public partial class FlyoutDialogBase : UserControl + public partial class FlyoutBase : UserControl { public static RadSvgImage? CancelSvg { get; set; } = null; public static RadSvgImage? ConfirmSvg { get; set; } = null; @@ -48,7 +48,7 @@ namespace Pilz.UI.Telerik.Dialogs set => radButton_Confirm.Enabled = value; } - protected FlyoutDialogBase() + protected FlyoutBase() { InitializeComponent(); ParentChanged += FlyoutDialogBase_ParentChanged; @@ -74,7 +74,7 @@ namespace Pilz.UI.Telerik.Dialogs { Result = result; - if (FindForm() is DialogBaseForm dialogForm) + if (FindForm() is DialogBase dialogForm) dialogForm.Close(); else CloseFlyout(); diff --git a/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.resx b/Pilz.UI.Telerik/Dialogs/FlyoutBase.resx similarity index 100% rename from Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.resx rename to Pilz.UI.Telerik/Dialogs/FlyoutBase.resx diff --git a/Pilz.UI.Telerik/Dialogs/FlyoutClosedEventArgs.cs b/Pilz.UI.Telerik/Dialogs/FlyoutClosedEventArgs.cs index 3c310d4..21d51a3 100644 --- a/Pilz.UI.Telerik/Dialogs/FlyoutClosedEventArgs.cs +++ b/Pilz.UI.Telerik/Dialogs/FlyoutClosedEventArgs.cs @@ -9,9 +9,9 @@ namespace Pilz.UI.Telerik.Dialogs { public class FlyoutClosedEventArgs : global::Telerik.WinControls.UI.SplashScreen.FlyoutClosedEventArgs { - public new FlyoutDialogBase? Content => base.Content as FlyoutDialogBase; + public new FlyoutBase? Content => base.Content as FlyoutBase; - public FlyoutClosedEventArgs(FlyoutDialogBase content) : base(content) + public FlyoutClosedEventArgs(FlyoutBase content) : base(content) { } } diff --git a/Pilz.UI.Telerik/Dialogs/FlyoutCreatedEventArgs.cs b/Pilz.UI.Telerik/Dialogs/FlyoutCreatedEventArgs.cs index e39597c..f7263cb 100644 --- a/Pilz.UI.Telerik/Dialogs/FlyoutCreatedEventArgs.cs +++ b/Pilz.UI.Telerik/Dialogs/FlyoutCreatedEventArgs.cs @@ -10,9 +10,9 @@ namespace Pilz.UI.Telerik.Dialogs { public class FlyoutCreatedEventArgs : ContentCreatedEventArgs { - public new FlyoutDialogBase? Content => base.Content as FlyoutDialogBase; + public new FlyoutBase? Content => base.Content as FlyoutBase; - public FlyoutCreatedEventArgs(FlyoutDialogBase content) : base(content) + public FlyoutCreatedEventArgs(FlyoutBase content) : base(content) { } }