diff --git a/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/MessageBox.cs b/Source/LibationWinForms/AvaloniaUI/MessageBox.cs similarity index 96% rename from Source/LibationWinForms/AvaloniaUI/Views/Dialogs/MessageBox.cs rename to Source/LibationWinForms/AvaloniaUI/MessageBox.cs index bf71753a..b1619da8 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/MessageBox.cs +++ b/Source/LibationWinForms/AvaloniaUI/MessageBox.cs @@ -2,15 +2,59 @@ using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; using LibationWinForms.AvaloniaUI.ViewModels.Dialogs; +using LibationWinForms.AvaloniaUI.Views.Dialogs; using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading; using System.Threading.Tasks; -namespace LibationWinForms.AvaloniaUI.Views.Dialogs +namespace LibationWinForms.AvaloniaUI { + public enum DialogResult + { + None = 0, + OK = 1, + Cancel = 2, + Abort = 3, + Retry = 4, + Ignore = 5, + Yes = 6, + No = 7, + TryAgain = 10, + Continue = 11 + } + + + public enum MessageBoxIcon + { + None = 0, + Error = 16, + Hand = 16, + Stop = 16, + Question = 32, + Exclamation = 48, + Warning = 48, + Asterisk = 64, + Information = 64 + } + public enum MessageBoxButtons + { + OK, + OKCancel, + AbortRetryIgnore, + YesNoCancel, + YesNo, + RetryCancel, + CancelTryContinue + } + + public enum MessageBoxDefaultButton + { + Button1, + Button2 = 256, + Button3 = 512, + } + public class MessageBox { diff --git a/Source/LibationWinForms/AvaloniaUI/ViewModels/ProcessBook2.cs b/Source/LibationWinForms/AvaloniaUI/ViewModels/ProcessBook2.cs index 5a56d6e0..acde8b07 100644 --- a/Source/LibationWinForms/AvaloniaUI/ViewModels/ProcessBook2.cs +++ b/Source/LibationWinForms/AvaloniaUI/ViewModels/ProcessBook2.cs @@ -9,7 +9,6 @@ using DataLayer; using Dinah.Core; using FileLiberator; using LibationFileManager; -using LibationWinForms.AvaloniaUI.Views.Dialogs; using ReactiveUI; namespace LibationWinForms.AvaloniaUI.ViewModels diff --git a/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/MessageBoxWindow.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/MessageBoxWindow.axaml.cs index f0e61464..7380b7ad 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/MessageBoxWindow.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/MessageBoxWindow.axaml.cs @@ -7,50 +7,6 @@ using LibationWinForms.AvaloniaUI.ViewModels.Dialogs; namespace LibationWinForms.AvaloniaUI.Views.Dialogs { - public enum DialogResult - { - None = 0, - OK = 1, - Cancel = 2, - Abort = 3, - Retry = 4, - Ignore = 5, - Yes = 6, - No = 7, - TryAgain = 10, - Continue = 11 - } - - - public enum MessageBoxIcon - { - None = 0, - Error = 16, - Hand = 16, - Stop = 16, - Question = 32, - Exclamation = 48, - Warning = 48, - Asterisk = 64, - Information = 64 - } - public enum MessageBoxButtons - { - OK, - OKCancel, - AbortRetryIgnore, - YesNoCancel, - YesNo, - RetryCancel, - CancelTryContinue - } - - public enum MessageBoxDefaultButton - { - Button1, - Button2 = 256, - Button3 = 512, - } public partial class MessageBoxWindow : ReactiveWindow { public MessageBoxWindow() diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Export.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Export.axaml.cs index bac291bf..bf029f11 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Export.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Export.axaml.cs @@ -1,5 +1,4 @@ using ApplicationServices; -using LibationWinForms.AvaloniaUI.Views.Dialogs; using System; using System.Linq; diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Filter.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Filter.axaml.cs index e9f08819..25cefe6f 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Filter.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Filter.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Input; -using LibationWinForms.AvaloniaUI.Views.Dialogs; using LibationWinForms.Dialogs; using System; using System.Linq; diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Liberate.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Liberate.axaml.cs index 82c27a02..ac3b31ea 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Liberate.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Liberate.axaml.cs @@ -1,5 +1,4 @@ using DataLayer; -using LibationWinForms.AvaloniaUI.Views.Dialogs; using System; using System.Linq; using System.Threading.Tasks; diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs index d2d069f3..4246048e 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs @@ -1,7 +1,6 @@ using DataLayer; using Dinah.Core; using LibationFileManager; -using LibationWinForms.AvaloniaUI.Views.Dialogs; using System; using System.Linq; diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanManual.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanManual.axaml.cs index ff158e0c..2564b720 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanManual.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanManual.axaml.cs @@ -2,7 +2,6 @@ using AudibleUtilities; using Avalonia.Controls; using LibationFileManager; -using LibationWinForms.AvaloniaUI.Views.Dialogs; using LibationWinForms.Dialogs; using System; using System.Collections.Generic; diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Settings.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Settings.axaml.cs index f0ac8324..69b74a62 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Settings.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Settings.axaml.cs @@ -1,5 +1,4 @@ -using LibationWinForms.AvaloniaUI.Views.Dialogs; -using LibationWinForms.Dialogs; +using LibationWinForms.Dialogs; using System; using System.Linq; diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.axaml b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.axaml index d6853ad0..5964e3cc 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.axaml +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.axaml @@ -106,9 +106,7 @@ -