From 8dd59cb08a532da8529719f989095548f6626368 Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Sat, 23 Jul 2022 20:54:02 -0600 Subject: [PATCH] Refactor --- Source/AaxDecrypter/AaxDecrypter.csproj | 1 - .../{AvaloniaUI => }/App.axaml | 8 +- .../{AvaloniaUI => }/App.axaml.cs | 10 +- .../{AvaloniaUI => }/Assets/1x1.png | Bin .../Assets/DataGridTheme.xaml | 0 .../Assets/LibationStyles.xaml | 0 .../Assets/MBIcons/Asterisk.png | Bin .../Assets/MBIcons/Exclamation.png | Bin .../Assets/MBIcons/Question.png | Bin .../{AvaloniaUI => }/Assets/MBIcons/error.png | Bin .../{AvaloniaUI => }/Assets/SEGOEUI.TTF | Bin .../{AvaloniaUI => }/Assets/WINGDING.TTF | Bin .../{AvaloniaUI => }/Assets/cancel.png | Bin .../{AvaloniaUI => }/Assets/completed.png | Bin .../{AvaloniaUI => }/Assets/down.png | Bin .../Assets/download-arrow.png | Bin .../Assets/edit-tags-25x25.png | Bin .../Assets/edit-tags-50x50.png | Bin .../{AvaloniaUI => }/Assets/edit_25x25.png | Bin .../{AvaloniaUI => }/Assets/edit_64x64.png | Bin .../{AvaloniaUI => }/Assets/error.png | Bin .../{AvaloniaUI => }/Assets/errored.png | Bin .../{AvaloniaUI => }/Assets/first.png | Bin .../Assets/glass-with-glow_16.png | Bin .../img-coverart-prod-unavailable_300x300.jpg | Bin .../img-coverart-prod-unavailable_500x500.jpg | Bin .../img-coverart-prod-unavailable_80x80.jpg | Bin .../{AvaloniaUI => }/Assets/import_16x16.png | Bin .../{AvaloniaUI => }/Assets/last.png | Bin .../{AvaloniaUI => }/Assets/libation.ico | Bin .../Assets/liberate_green.png | Bin .../Assets/liberate_green_pdf_no.png | Bin .../Assets/liberate_green_pdf_yes.png | Bin .../{AvaloniaUI => }/Assets/liberate_red.png | Bin .../Assets/liberate_red_pdf_no.png | Bin .../Assets/liberate_red_pdf_yes.png | Bin .../Assets/liberate_yellow.png | Bin .../Assets/liberate_yellow_pdf_no.png | Bin .../Assets/liberate_yellow_pdf_yes.png | Bin .../{AvaloniaUI => }/Assets/minus.png | Bin .../{AvaloniaUI => }/Assets/plus.png | Bin .../{AvaloniaUI => }/Assets/queued.png | Bin .../{AvaloniaUI => }/Assets/up.png | Bin .../{AvaloniaUI => }/AvaloniaUtils.cs | 2 +- .../Controls/DataGridCheckBoxColumnExt.axaml | 2 +- .../DataGridCheckBoxColumnExt.axaml.cs | 4 +- .../DirectoryOrCustomSelectControl.axaml | 4 +- .../DirectoryOrCustomSelectControl.axaml.cs | 2 +- .../Controls/DirectorySelectControl.axaml | 4 +- .../Controls/DirectorySelectControl.axaml.cs | 2 +- .../{AvaloniaUI => }/Controls/GroupBox.axaml | 4 +- .../Controls/GroupBox.axaml.cs | 2 +- .../{AvaloniaUI => }/Controls/LinkLabel.axaml | 2 +- .../Controls/LinkLabel.axaml.cs | 2 +- .../Controls/WheelComboBox.axaml | 2 +- .../Controls/WheelComboBox.axaml.cs | 2 +- .../Views => }/Dialogs/AccountsDialog.axaml | 4 +- .../Dialogs/AccountsDialog.axaml.cs | 2 +- .../Dialogs/BookDetailsDialog.axaml | 6 +- .../Dialogs/BookDetailsDialog.axaml.cs | 4 +- .../Dialogs/DescriptionDisplayDialog.axaml | 2 +- .../Dialogs/DescriptionDisplayDialog.axaml.cs | 2 +- .../Views => }/Dialogs/DialogWindow.cs | 2 +- .../Views => }/Dialogs/EditQuickFilters.axaml | 4 +- .../Dialogs/EditQuickFilters.axaml.cs | 2 +- .../Dialogs/EditReplacementChars.axaml | 2 +- .../Dialogs/EditReplacementChars.axaml.cs | 2 +- .../Dialogs/EditTemplateDialog.axaml | 6 +- .../Dialogs/EditTemplateDialog.axaml.cs | 2 +- .../Dialogs/ImageDisplayDialog.axaml | 4 +- .../Dialogs/ImageDisplayDialog.axaml.cs | 2 +- .../Dialogs/LibationFilesDialog.axaml | 6 +- .../Dialogs/LibationFilesDialog.axaml.cs | 4 +- .../Dialogs/LiberatedStatusBatchDialog.axaml | 6 +- .../LiberatedStatusBatchDialog.axaml.cs | 2 +- .../Dialogs/Login/ApprovalNeededDialog.axaml | 4 +- .../Login/ApprovalNeededDialog.axaml.cs | 2 +- .../Dialogs/Login/AvaloniaLoginBase.cs | 2 +- .../Dialogs/Login/AvaloniaLoginCallback.cs | 2 +- .../Dialogs/Login/AvaloniaLoginChoiceEager.cs | 2 +- .../Dialogs/Login/CaptchaDialog.axaml | 4 +- .../Dialogs/Login/CaptchaDialog.axaml.cs | 2 +- .../Dialogs/Login/LoginCallbackDialog.axaml | 4 +- .../Login/LoginCallbackDialog.axaml.cs | 2 +- .../Login/LoginChoiceEagerDialog.axaml | 6 +- .../Login/LoginChoiceEagerDialog.axaml.cs | 2 +- .../Dialogs/Login/LoginExternalDialog.axaml | 4 +- .../Login/LoginExternalDialog.axaml.cs | 2 +- .../Views => }/Dialogs/Login/MfaDialog.axaml | 4 +- .../Dialogs/Login/MfaDialog.axaml.cs | 2 +- .../Dialogs/Login/_2faCodeDialog.axaml | 4 +- .../Dialogs/Login/_2faCodeDialog.axaml.cs | 2 +- .../Dialogs/MessageBoxAlertAdminDialog.axaml | 8 +- .../MessageBoxAlertAdminDialog.axaml.cs | 2 +- .../Views => }/Dialogs/MessageBoxWindow.axaml | 14 +-- .../Dialogs/MessageBoxWindow.axaml.cs | 4 +- .../Dialogs/ScanAccountsDialog.axaml | 4 +- .../Dialogs/ScanAccountsDialog.axaml.cs | 2 +- .../Dialogs/SearchSyntaxDialog.axaml | 4 +- .../Dialogs/SearchSyntaxDialog.axaml.cs | 2 +- .../Views => }/Dialogs/SettingsDialog.axaml | 6 +- .../Dialogs/SettingsDialog.axaml.cs | 2 +- .../Views => }/Dialogs/TagsBatchDialog.axaml | 4 +- .../Dialogs/TagsBatchDialog.axaml.cs | 2 +- ...SaveExtension2.cs => FormSaveExtension.cs} | 13 +-- .../LibationAvalonia/LibationAvalonia.csproj | 104 +++++++++--------- .../{AvaloniaUI => }/LogMe.cs | 2 +- .../{AvaloniaUI => }/MessageBox.cs | 6 +- Source/LibationAvalonia/Program.cs | 35 ++---- .../PublishProfiles/FolderProfile.pubxml | 16 +++ .../{AvaloniaUI => }/ViewLocator.cs | 4 +- .../{AvaloniaUI => }/ViewModels/BookTags.cs | 2 +- .../ViewModels/Dialogs/MessageBoxViewModel.cs | 2 +- .../{AvaloniaUI => }/ViewModels/GridEntry.cs | 2 +- .../ViewModels/GridEntryCollection.cs | 2 +- .../ViewModels/LiberateButtonStatus.cs | 2 +- .../ViewModels/LibraryBookEntry.cs | 2 +- .../ViewModels/MainWindowViewModel.cs | 2 +- .../ViewModels/ProcessBookViewModel.cs | 2 +- .../ViewModels/ProcessQueueViewModel.cs | 2 +- .../ViewModels/ProductsDisplayViewModel.cs | 7 +- .../ViewModels/QueryExtensions.cs | 2 +- .../ViewModels/RowComparer.cs | 2 +- .../ViewModels/SeriesEntry.cs | 2 +- .../ViewModels/TrackedQueue[T].cs | 2 +- .../ViewModels/ViewModelBase.cs | 2 +- .../MainWindow.BackupCounts.axaml.cs | 2 +- .../MainWindow/MainWindow.Export.axaml.cs | 2 +- .../MainWindow/MainWindow.Filter.axaml.cs | 4 +- .../MainWindow/MainWindow.Liberate.axaml.cs | 2 +- .../MainWindow.ProcessQueue.axaml.cs | 2 +- .../MainWindow.QuickFilters.axaml.cs | 2 +- .../MainWindow.RemoveBooks.axaml.cs | 2 +- .../MainWindow/MainWindow.ScanAuto.axaml.cs | 2 +- .../MainWindow/MainWindow.ScanManual.axaml.cs | 2 +- .../MainWindow.ScanNotification.axaml.cs | 2 +- .../MainWindow/MainWindow.Settings.axaml.cs | 2 +- .../MainWindow.VisibleBooks.axaml.cs | 2 +- .../MainWindow/MainWindow._NoUI.axaml.cs | 2 +- .../Views/MainWindow/MainWindow.axaml | 12 +- .../Views/MainWindow/MainWindow.axaml.cs | 8 +- .../Views/ProcessBookControl.axaml | 12 +- .../Views/ProcessBookControl.axaml.cs | 4 +- .../Views/ProcessQueueControl.axaml | 10 +- .../Views/ProcessQueueControl.axaml.cs | 4 +- .../Views/ProductsDisplay.axaml | 8 +- .../Views/ProductsDisplay.axaml.cs | 6 +- 147 files changed, 259 insertions(+), 269 deletions(-) rename Source/LibationAvalonia/{AvaloniaUI => }/App.axaml (66%) rename Source/LibationAvalonia/{AvaloniaUI => }/App.axaml.cs (90%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/1x1.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/DataGridTheme.xaml (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/LibationStyles.xaml (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/MBIcons/Asterisk.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/MBIcons/Exclamation.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/MBIcons/Question.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/MBIcons/error.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/SEGOEUI.TTF (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/WINGDING.TTF (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/cancel.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/completed.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/down.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/download-arrow.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/edit-tags-25x25.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/edit-tags-50x50.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/edit_25x25.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/edit_64x64.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/error.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/errored.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/first.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/glass-with-glow_16.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/img-coverart-prod-unavailable_300x300.jpg (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/img-coverart-prod-unavailable_500x500.jpg (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/img-coverart-prod-unavailable_80x80.jpg (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/import_16x16.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/last.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/libation.ico (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/liberate_green.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/liberate_green_pdf_no.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/liberate_green_pdf_yes.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/liberate_red.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/liberate_red_pdf_no.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/liberate_red_pdf_yes.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/liberate_yellow.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/liberate_yellow_pdf_no.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/liberate_yellow_pdf_yes.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/minus.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/plus.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/queued.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/Assets/up.png (100%) rename Source/LibationAvalonia/{AvaloniaUI => }/AvaloniaUtils.cs (95%) rename Source/LibationAvalonia/{AvaloniaUI => }/Controls/DataGridCheckBoxColumnExt.axaml (65%) rename Source/LibationAvalonia/{AvaloniaUI => }/Controls/DataGridCheckBoxColumnExt.axaml.cs (83%) rename Source/LibationAvalonia/{AvaloniaUI => }/Controls/DirectoryOrCustomSelectControl.axaml (87%) rename Source/LibationAvalonia/{AvaloniaUI => }/Controls/DirectoryOrCustomSelectControl.axaml.cs (99%) rename Source/LibationAvalonia/{AvaloniaUI => }/Controls/DirectorySelectControl.axaml (89%) rename Source/LibationAvalonia/{AvaloniaUI => }/Controls/DirectorySelectControl.axaml.cs (98%) rename Source/LibationAvalonia/{AvaloniaUI => }/Controls/GroupBox.axaml (91%) rename Source/LibationAvalonia/{AvaloniaUI => }/Controls/GroupBox.axaml.cs (94%) rename Source/LibationAvalonia/{AvaloniaUI => }/Controls/LinkLabel.axaml (88%) rename Source/LibationAvalonia/{AvaloniaUI => }/Controls/LinkLabel.axaml.cs (93%) rename Source/LibationAvalonia/{AvaloniaUI => }/Controls/WheelComboBox.axaml (78%) rename Source/LibationAvalonia/{AvaloniaUI => }/Controls/WheelComboBox.axaml.cs (93%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/AccountsDialog.axaml (96%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/AccountsDialog.axaml.cs (99%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/BookDetailsDialog.axaml (95%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/BookDetailsDialog.axaml.cs (98%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/DescriptionDisplayDialog.axaml (88%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/DescriptionDisplayDialog.axaml.cs (97%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/DialogWindow.cs (96%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/EditQuickFilters.axaml (95%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/EditQuickFilters.axaml.cs (98%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/EditReplacementChars.axaml (96%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/EditReplacementChars.axaml.cs (95%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/EditTemplateDialog.axaml (93%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/EditTemplateDialog.axaml.cs (99%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/ImageDisplayDialog.axaml (84%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/ImageDisplayDialog.axaml.cs (97%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/LibationFilesDialog.axaml (79%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/LibationFilesDialog.axaml.cs (93%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/LiberatedStatusBatchDialog.axaml (88%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/LiberatedStatusBatchDialog.axaml.cs (96%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/ApprovalNeededDialog.axaml (87%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/ApprovalNeededDialog.axaml.cs (91%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/AvaloniaLoginBase.cs (91%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/AvaloniaLoginCallback.cs (95%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/AvaloniaLoginChoiceEager.cs (95%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/CaptchaDialog.axaml (90%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/CaptchaDialog.axaml.cs (93%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/LoginCallbackDialog.axaml (90%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/LoginCallbackDialog.axaml.cs (95%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/LoginChoiceEagerDialog.axaml (88%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/LoginChoiceEagerDialog.axaml.cs (94%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/LoginExternalDialog.axaml (95%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/LoginExternalDialog.axaml.cs (96%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/MfaDialog.axaml (85%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/MfaDialog.axaml.cs (98%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/_2faCodeDialog.axaml (86%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/Login/_2faCodeDialog.axaml.cs (91%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/MessageBoxAlertAdminDialog.axaml (86%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/MessageBoxAlertAdminDialog.axaml.cs (97%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/MessageBoxWindow.axaml (86%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/MessageBoxWindow.axaml.cs (95%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/ScanAccountsDialog.axaml (94%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/ScanAccountsDialog.axaml.cs (97%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/SearchSyntaxDialog.axaml (93%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/SearchSyntaxDialog.axaml.cs (95%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/SettingsDialog.axaml (98%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/SettingsDialog.axaml.cs (99%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/TagsBatchDialog.axaml (89%) rename Source/LibationAvalonia/{AvaloniaUI/Views => }/Dialogs/TagsBatchDialog.axaml.cs (90%) rename Source/LibationAvalonia/{AvaloniaUI/FormSaveExtension2.cs => FormSaveExtension.cs} (94%) rename Source/LibationAvalonia/{AvaloniaUI => }/LogMe.cs (97%) rename Source/LibationAvalonia/{AvaloniaUI => }/MessageBox.cs (98%) create mode 100644 Source/LibationAvalonia/Properties/PublishProfiles/FolderProfile.pubxml rename Source/LibationAvalonia/{AvaloniaUI => }/ViewLocator.cs (85%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/BookTags.cs (79%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/Dialogs/MessageBoxViewModel.cs (97%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/GridEntry.cs (99%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/GridEntryCollection.cs (99%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/LiberateButtonStatus.cs (98%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/LibraryBookEntry.cs (99%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/MainWindowViewModel.cs (99%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/ProcessBookViewModel.cs (99%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/ProcessQueueViewModel.cs (99%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/ProductsDisplayViewModel.cs (97%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/QueryExtensions.cs (96%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/RowComparer.cs (98%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/SeriesEntry.cs (98%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/TrackedQueue[T].cs (99%) rename Source/LibationAvalonia/{AvaloniaUI => }/ViewModels/ViewModelBase.cs (77%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow.BackupCounts.axaml.cs (96%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow.Export.axaml.cs (97%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow.Filter.axaml.cs (88%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow.Liberate.axaml.cs (98%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs (97%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow.QuickFilters.axaml.cs (97%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs (98%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow.ScanAuto.axaml.cs (98%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow.ScanManual.axaml.cs (98%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow.ScanNotification.axaml.cs (92%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow.Settings.axaml.cs (94%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow.VisibleBooks.axaml.cs (98%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow._NoUI.axaml.cs (94%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow.axaml (95%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/MainWindow/MainWindow.axaml.cs (95%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/ProcessBookControl.axaml (79%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/ProcessBookControl.axaml.cs (95%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/ProcessQueueControl.axaml (94%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/ProcessQueueControl.axaml.cs (97%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/ProductsDisplay.axaml (96%) rename Source/LibationAvalonia/{AvaloniaUI => }/Views/ProductsDisplay.axaml.cs (98%) diff --git a/Source/AaxDecrypter/AaxDecrypter.csproj b/Source/AaxDecrypter/AaxDecrypter.csproj index f385aa37..2d0b5b39 100644 --- a/Source/AaxDecrypter/AaxDecrypter.csproj +++ b/Source/AaxDecrypter/AaxDecrypter.csproj @@ -16,7 +16,6 @@ - diff --git a/Source/LibationAvalonia/AvaloniaUI/App.axaml b/Source/LibationAvalonia/App.axaml similarity index 66% rename from Source/LibationAvalonia/AvaloniaUI/App.axaml rename to Source/LibationAvalonia/App.axaml index 75ff7054..cbfd5ab2 100644 --- a/Source/LibationAvalonia/AvaloniaUI/App.axaml +++ b/Source/LibationAvalonia/App.axaml @@ -1,7 +1,7 @@  + xmlns:local="using:LibationAvalonia" + x:Class="LibationAvalonia.App"> @@ -11,7 +11,7 @@ - - + + \ No newline at end of file diff --git a/Source/LibationAvalonia/AvaloniaUI/App.axaml.cs b/Source/LibationAvalonia/App.axaml.cs similarity index 90% rename from Source/LibationAvalonia/AvaloniaUI/App.axaml.cs rename to Source/LibationAvalonia/App.axaml.cs index 978c33c4..a064ac39 100644 --- a/Source/LibationAvalonia/AvaloniaUI/App.axaml.cs +++ b/Source/LibationAvalonia/App.axaml.cs @@ -3,14 +3,15 @@ using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; using Avalonia.Media; using LibationFileManager; -using LibationAvalonia.AvaloniaUI.Views; +using LibationAvalonia.Views; using System; using Avalonia.Platform; -namespace LibationAvalonia.AvaloniaUI +namespace LibationAvalonia { public class App : Application { + public static readonly PlatformID PlatformID = Environment.OSVersion.Platform; public static IBrush ProcessQueueBookFailedBrush { get; private set; } public static IBrush ProcessQueueBookCompletedBrush { get; private set; } public static IBrush ProcessQueueBookCancelledBrush { get; private set; } @@ -19,10 +20,11 @@ namespace LibationAvalonia.AvaloniaUI public static IAssetLoader AssetLoader { get; private set; } - public static readonly Uri AssetUriBase = new Uri("avares://Libation/AvaloniaUI/Assets/"); + public static readonly Uri AssetUriBase = new Uri("avares://Libation/Assets/"); public static System.IO.Stream OpenAsset(string assetRelativePath) => AssetLoader.Open(new Uri(AssetUriBase, assetRelativePath)); + public override void Initialize() { AvaloniaXamlLoader.Load(this); @@ -33,7 +35,7 @@ namespace LibationAvalonia.AvaloniaUI { LoadStyles(); - var SEGOEUI = new Typeface(new FontFamily(new Uri("avares://Libation/AvaloniaUI/Assets/WINGDING.TTF"), "SEGOEUI_Local")); + var SEGOEUI = new Typeface(new FontFamily(new Uri("avares://Libation/Assets/WINGDING.TTF"), "SEGOEUI_Local")); var gtf = FontManager.Current.GetOrAddGlyphTypeface(SEGOEUI); diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/1x1.png b/Source/LibationAvalonia/Assets/1x1.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/1x1.png rename to Source/LibationAvalonia/Assets/1x1.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/DataGridTheme.xaml b/Source/LibationAvalonia/Assets/DataGridTheme.xaml similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/DataGridTheme.xaml rename to Source/LibationAvalonia/Assets/DataGridTheme.xaml diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/LibationStyles.xaml b/Source/LibationAvalonia/Assets/LibationStyles.xaml similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/LibationStyles.xaml rename to Source/LibationAvalonia/Assets/LibationStyles.xaml diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/Asterisk.png b/Source/LibationAvalonia/Assets/MBIcons/Asterisk.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/Asterisk.png rename to Source/LibationAvalonia/Assets/MBIcons/Asterisk.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/Exclamation.png b/Source/LibationAvalonia/Assets/MBIcons/Exclamation.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/Exclamation.png rename to Source/LibationAvalonia/Assets/MBIcons/Exclamation.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/Question.png b/Source/LibationAvalonia/Assets/MBIcons/Question.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/Question.png rename to Source/LibationAvalonia/Assets/MBIcons/Question.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/error.png b/Source/LibationAvalonia/Assets/MBIcons/error.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/error.png rename to Source/LibationAvalonia/Assets/MBIcons/error.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/SEGOEUI.TTF b/Source/LibationAvalonia/Assets/SEGOEUI.TTF similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/SEGOEUI.TTF rename to Source/LibationAvalonia/Assets/SEGOEUI.TTF diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/WINGDING.TTF b/Source/LibationAvalonia/Assets/WINGDING.TTF similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/WINGDING.TTF rename to Source/LibationAvalonia/Assets/WINGDING.TTF diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/cancel.png b/Source/LibationAvalonia/Assets/cancel.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/cancel.png rename to Source/LibationAvalonia/Assets/cancel.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/completed.png b/Source/LibationAvalonia/Assets/completed.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/completed.png rename to Source/LibationAvalonia/Assets/completed.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/down.png b/Source/LibationAvalonia/Assets/down.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/down.png rename to Source/LibationAvalonia/Assets/down.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/download-arrow.png b/Source/LibationAvalonia/Assets/download-arrow.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/download-arrow.png rename to Source/LibationAvalonia/Assets/download-arrow.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/edit-tags-25x25.png b/Source/LibationAvalonia/Assets/edit-tags-25x25.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/edit-tags-25x25.png rename to Source/LibationAvalonia/Assets/edit-tags-25x25.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/edit-tags-50x50.png b/Source/LibationAvalonia/Assets/edit-tags-50x50.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/edit-tags-50x50.png rename to Source/LibationAvalonia/Assets/edit-tags-50x50.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/edit_25x25.png b/Source/LibationAvalonia/Assets/edit_25x25.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/edit_25x25.png rename to Source/LibationAvalonia/Assets/edit_25x25.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/edit_64x64.png b/Source/LibationAvalonia/Assets/edit_64x64.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/edit_64x64.png rename to Source/LibationAvalonia/Assets/edit_64x64.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/error.png b/Source/LibationAvalonia/Assets/error.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/error.png rename to Source/LibationAvalonia/Assets/error.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/errored.png b/Source/LibationAvalonia/Assets/errored.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/errored.png rename to Source/LibationAvalonia/Assets/errored.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/first.png b/Source/LibationAvalonia/Assets/first.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/first.png rename to Source/LibationAvalonia/Assets/first.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/glass-with-glow_16.png b/Source/LibationAvalonia/Assets/glass-with-glow_16.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/glass-with-glow_16.png rename to Source/LibationAvalonia/Assets/glass-with-glow_16.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/img-coverart-prod-unavailable_300x300.jpg b/Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_300x300.jpg similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/img-coverart-prod-unavailable_300x300.jpg rename to Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_300x300.jpg diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/img-coverart-prod-unavailable_500x500.jpg b/Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_500x500.jpg similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/img-coverart-prod-unavailable_500x500.jpg rename to Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_500x500.jpg diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/img-coverart-prod-unavailable_80x80.jpg b/Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_80x80.jpg similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/img-coverart-prod-unavailable_80x80.jpg rename to Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_80x80.jpg diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/import_16x16.png b/Source/LibationAvalonia/Assets/import_16x16.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/import_16x16.png rename to Source/LibationAvalonia/Assets/import_16x16.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/last.png b/Source/LibationAvalonia/Assets/last.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/last.png rename to Source/LibationAvalonia/Assets/last.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/libation.ico b/Source/LibationAvalonia/Assets/libation.ico similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/libation.ico rename to Source/LibationAvalonia/Assets/libation.ico diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_green.png b/Source/LibationAvalonia/Assets/liberate_green.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_green.png rename to Source/LibationAvalonia/Assets/liberate_green.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_green_pdf_no.png b/Source/LibationAvalonia/Assets/liberate_green_pdf_no.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_green_pdf_no.png rename to Source/LibationAvalonia/Assets/liberate_green_pdf_no.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_green_pdf_yes.png b/Source/LibationAvalonia/Assets/liberate_green_pdf_yes.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_green_pdf_yes.png rename to Source/LibationAvalonia/Assets/liberate_green_pdf_yes.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_red.png b/Source/LibationAvalonia/Assets/liberate_red.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_red.png rename to Source/LibationAvalonia/Assets/liberate_red.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_red_pdf_no.png b/Source/LibationAvalonia/Assets/liberate_red_pdf_no.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_red_pdf_no.png rename to Source/LibationAvalonia/Assets/liberate_red_pdf_no.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_red_pdf_yes.png b/Source/LibationAvalonia/Assets/liberate_red_pdf_yes.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_red_pdf_yes.png rename to Source/LibationAvalonia/Assets/liberate_red_pdf_yes.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_yellow.png b/Source/LibationAvalonia/Assets/liberate_yellow.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_yellow.png rename to Source/LibationAvalonia/Assets/liberate_yellow.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_yellow_pdf_no.png b/Source/LibationAvalonia/Assets/liberate_yellow_pdf_no.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_yellow_pdf_no.png rename to Source/LibationAvalonia/Assets/liberate_yellow_pdf_no.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_yellow_pdf_yes.png b/Source/LibationAvalonia/Assets/liberate_yellow_pdf_yes.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_yellow_pdf_yes.png rename to Source/LibationAvalonia/Assets/liberate_yellow_pdf_yes.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/minus.png b/Source/LibationAvalonia/Assets/minus.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/minus.png rename to Source/LibationAvalonia/Assets/minus.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/plus.png b/Source/LibationAvalonia/Assets/plus.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/plus.png rename to Source/LibationAvalonia/Assets/plus.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/queued.png b/Source/LibationAvalonia/Assets/queued.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/queued.png rename to Source/LibationAvalonia/Assets/queued.png diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/up.png b/Source/LibationAvalonia/Assets/up.png similarity index 100% rename from Source/LibationAvalonia/AvaloniaUI/Assets/up.png rename to Source/LibationAvalonia/Assets/up.png diff --git a/Source/LibationAvalonia/AvaloniaUI/AvaloniaUtils.cs b/Source/LibationAvalonia/AvaloniaUtils.cs similarity index 95% rename from Source/LibationAvalonia/AvaloniaUI/AvaloniaUtils.cs rename to Source/LibationAvalonia/AvaloniaUtils.cs index 2117f8bb..7ade8b9a 100644 --- a/Source/LibationAvalonia/AvaloniaUI/AvaloniaUtils.cs +++ b/Source/LibationAvalonia/AvaloniaUtils.cs @@ -3,7 +3,7 @@ using System; using System.Threading; using System.Threading.Tasks; -namespace LibationAvalonia.AvaloniaUI +namespace LibationAvalonia { internal static class AvaloniaUtils { diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/DataGridCheckBoxColumnExt.axaml b/Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml similarity index 65% rename from Source/LibationAvalonia/AvaloniaUI/Controls/DataGridCheckBoxColumnExt.axaml rename to Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml index b5eb1864..d51e730d 100644 --- a/Source/LibationAvalonia/AvaloniaUI/Controls/DataGridCheckBoxColumnExt.axaml +++ b/Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml @@ -1,5 +1,5 @@ + x:Class="LibationAvalonia.Controls.DataGridCheckBoxColumnExt"> diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/DataGridCheckBoxColumnExt.axaml.cs b/Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml.cs similarity index 83% rename from Source/LibationAvalonia/AvaloniaUI/Controls/DataGridCheckBoxColumnExt.axaml.cs rename to Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml.cs index cb94668f..2c686498 100644 --- a/Source/LibationAvalonia/AvaloniaUI/Controls/DataGridCheckBoxColumnExt.axaml.cs +++ b/Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml.cs @@ -1,8 +1,8 @@ using Avalonia.Controls; -using LibationAvalonia.AvaloniaUI.ViewModels; +using LibationAvalonia.ViewModels; using System; -namespace LibationAvalonia.AvaloniaUI.Controls +namespace LibationAvalonia.Controls { public partial class DataGridCheckBoxColumnExt : DataGridCheckBoxColumn { diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/DirectoryOrCustomSelectControl.axaml b/Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml similarity index 87% rename from Source/LibationAvalonia/AvaloniaUI/Controls/DirectoryOrCustomSelectControl.axaml rename to Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml index 5eefc960..f10b1767 100644 --- a/Source/LibationAvalonia/AvaloniaUI/Controls/DirectoryOrCustomSelectControl.axaml +++ b/Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml @@ -2,9 +2,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="clr-namespace:LibationAvalonia.AvaloniaUI.Controls" + xmlns:controls="clr-namespace:LibationAvalonia.Controls" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="LibationAvalonia.AvaloniaUI.Controls.DirectoryOrCustomSelectControl"> + x:Class="LibationAvalonia.Controls.DirectoryOrCustomSelectControl"> + x:Class="LibationAvalonia.Controls.DirectorySelectControl"> diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/DirectorySelectControl.axaml.cs b/Source/LibationAvalonia/Controls/DirectorySelectControl.axaml.cs similarity index 98% rename from Source/LibationAvalonia/AvaloniaUI/Controls/DirectorySelectControl.axaml.cs rename to Source/LibationAvalonia/Controls/DirectorySelectControl.axaml.cs index 165733bd..f9dae279 100644 --- a/Source/LibationAvalonia/AvaloniaUI/Controls/DirectorySelectControl.axaml.cs +++ b/Source/LibationAvalonia/Controls/DirectorySelectControl.axaml.cs @@ -11,7 +11,7 @@ using Avalonia.Data; using System.IO; using System.Reactive.Subjects; -namespace LibationAvalonia.AvaloniaUI.Controls +namespace LibationAvalonia.Controls { public class KnownDirectoryConverter : IValueConverter { diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/GroupBox.axaml b/Source/LibationAvalonia/Controls/GroupBox.axaml similarity index 91% rename from Source/LibationAvalonia/AvaloniaUI/Controls/GroupBox.axaml rename to Source/LibationAvalonia/Controls/GroupBox.axaml index 316b227e..f8c2b755 100644 --- a/Source/LibationAvalonia/AvaloniaUI/Controls/GroupBox.axaml +++ b/Source/LibationAvalonia/Controls/GroupBox.axaml @@ -2,9 +2,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="clr-namespace:LibationAvalonia.AvaloniaUI.Controls" + xmlns:controls="clr-namespace:LibationAvalonia.Controls" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="LibationAvalonia.AvaloniaUI.Controls.GroupBox"> + x:Class="LibationAvalonia.Controls.GroupBox"> diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/GroupBox.axaml.cs b/Source/LibationAvalonia/Controls/GroupBox.axaml.cs similarity index 94% rename from Source/LibationAvalonia/AvaloniaUI/Controls/GroupBox.axaml.cs rename to Source/LibationAvalonia/Controls/GroupBox.axaml.cs index b55aea47..41bf2e2f 100644 --- a/Source/LibationAvalonia/AvaloniaUI/Controls/GroupBox.axaml.cs +++ b/Source/LibationAvalonia/Controls/GroupBox.axaml.cs @@ -2,7 +2,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace LibationAvalonia.AvaloniaUI.Controls +namespace LibationAvalonia.Controls { public partial class GroupBox : ContentControl { diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/LinkLabel.axaml b/Source/LibationAvalonia/Controls/LinkLabel.axaml similarity index 88% rename from Source/LibationAvalonia/AvaloniaUI/Controls/LinkLabel.axaml rename to Source/LibationAvalonia/Controls/LinkLabel.axaml index 07f61366..e1043dfc 100644 --- a/Source/LibationAvalonia/AvaloniaUI/Controls/LinkLabel.axaml +++ b/Source/LibationAvalonia/Controls/LinkLabel.axaml @@ -3,7 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="LibationAvalonia.AvaloniaUI.Controls.LinkLabel"> + x:Class="LibationAvalonia.Controls.LinkLabel">