From 367f6d93696a060340fae00b0a5db53b4e66322d Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 16 Apr 2020 20:40:25 +0100 Subject: [PATCH] Adjust namespaces. --- Aaru.Gui/App.xaml.cs | 4 +- Aaru.Gui/Models/DeviceModel.cs | 2 +- Aaru.Gui/Models/FileSystemModel.cs | 2 +- Aaru.Gui/Models/ImageModel.cs | 4 +- Aaru.Gui/Models/MediaModel.cs | 2 +- Aaru.Gui/Models/PartitionModel.cs | 2 +- .../Dialogs/AboutDialogViewModel.cs | 4 +- .../Dialogs/ConsoleWindowViewModel.cs | 6 +- .../Dialogs/EncodingsDialogViewModel.cs | 4 +- .../Dialogs/LicenseDialogViewModel.cs | 4 +- .../Dialogs/PluginsDialogViewModel.cs | 4 +- .../Dialogs/SettingsDialogViewModel.cs | 4 +- .../Dialogs/StatisticsDialogViewModel.cs | 4 +- .../ViewModels/Panels/DeviceInfoViewModel.cs | 5 +- .../ViewModels/Panels/FileSystemViewModel.cs | 2 +- .../ViewModels/Panels/ImageInfoViewModel.cs | 8 +- .../ViewModels/Panels/MediaInfoViewModel.cs | 8 +- .../ViewModels/Panels/PartitionViewModel.cs | 2 +- .../Panels/SubdirectoryViewModel.cs | 2 +- Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs | 2 +- .../ViewModels/Tabs/BlurayInfoViewModel.cs | 2 +- .../Tabs/CompactDiscInfoViewModel.cs | 24 +++--- Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs | 2 +- .../Tabs/DvdWritableInfoViewModel.cs | 2 +- .../ViewModels/Tabs/PcmciaInfoViewModel.cs | 6 +- Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs | 2 +- .../ViewModels/Tabs/SdMmcInfoViewModel.cs | 2 +- Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs | 4 +- .../Windows/DecodeMediaTagsViewModel.cs | 2 +- .../Windows/ImageChecksumViewModel.cs | 2 +- .../Windows/ImageConvertViewModel.cs | 81 +++++++++---------- .../Windows/ImageEntropyViewModel.cs | 2 +- .../Windows/ImageSidecarViewModel.cs | 2 +- .../Windows/ImageVerifyViewModel.cs | 15 ++-- .../ViewModels/Windows/MainWindowViewModel.cs | 9 ++- .../ViewModels/Windows/MediaDumpViewModel.cs | 2 +- .../ViewModels/Windows/MediaScanViewModel.cs | 2 +- .../Windows/SplashWindowViewModel.cs | 6 +- .../ViewModels/Windows/ViewSectorViewModel.cs | 2 +- Aaru.Gui/Views/Dialogs/AboutDialog.xaml | 8 +- Aaru.Gui/Views/Dialogs/AboutDialog.xaml.cs | 2 +- Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml | 8 +- Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml.cs | 2 +- Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml | 8 +- .../Views/Dialogs/EncodingsDialog.xaml.cs | 2 +- Aaru.Gui/Views/Dialogs/LicenseDialog.xaml | 8 +- Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs | 2 +- Aaru.Gui/Views/Dialogs/PluginsDialog.xaml | 8 +- Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs | 2 +- Aaru.Gui/Views/Dialogs/SettingsDialog.xaml | 8 +- Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs | 2 +- Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml | 8 +- .../Views/Dialogs/StatisticsDialog.xaml.cs | 2 +- Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml | 6 +- Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml.cs | 2 +- Aaru.Gui/Views/Panels/FileSystemPanel.xaml | 6 +- Aaru.Gui/Views/Panels/FileSystemPanel.xaml.cs | 2 +- Aaru.Gui/Views/Panels/ImageInfoPanel.xaml | 6 +- Aaru.Gui/Views/Panels/ImageInfoPanel.xaml.cs | 2 +- Aaru.Gui/Views/Panels/MediaInfoPanel.xaml | 6 +- Aaru.Gui/Views/Panels/MediaInfoPanel.xaml.cs | 2 +- Aaru.Gui/Views/Panels/PartitionPanel.xaml | 6 +- Aaru.Gui/Views/Panels/PartitionPanel.xaml.cs | 2 +- Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml | 7 +- .../Views/Panels/SubdirectoryPanel.xaml.cs | 2 +- Aaru.Gui/Views/Tabs/AtaInfoTab.xaml | 6 +- Aaru.Gui/Views/Tabs/AtaInfoTab.xaml.cs | 2 +- Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml | 6 +- Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml.cs | 2 +- Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml | 6 +- .../Views/Tabs/CompactDiscInfoTab.xaml.cs | 2 +- Aaru.Gui/Views/Tabs/DvdInfoTab.xaml | 6 +- Aaru.Gui/Views/Tabs/DvdInfoTab.xaml.cs | 2 +- Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml | 6 +- .../Views/Tabs/DvdWritableInfoTab.xaml.cs | 2 +- Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml | 6 +- Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml.cs | 2 +- Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml | 6 +- Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml.cs | 2 +- Aaru.Gui/Views/Tabs/SdMmcInfo.xaml | 6 +- Aaru.Gui/Views/Tabs/SdMmcInfo.xaml.cs | 2 +- Aaru.Gui/Views/Tabs/XboxInfoTab.xaml | 71 ++++++++-------- Aaru.Gui/Views/Tabs/XboxInfoTab.xaml.cs | 2 +- .../Views/Windows/DecodeMediaTagsWindow.xaml | 8 +- .../Windows/DecodeMediaTagsWindow.xaml.cs | 2 +- .../Views/Windows/ImageChecksumWindow.xaml | 8 +- .../Views/Windows/ImageChecksumWindow.xaml.cs | 4 +- .../Views/Windows/ImageConvertWindow.xaml | 8 +- .../Views/Windows/ImageConvertWindow.xaml.cs | 4 +- .../Views/Windows/ImageEntropyWindow.xaml | 8 +- .../Views/Windows/ImageEntropyWindow.xaml.cs | 4 +- .../Views/Windows/ImageSidecarWindow.xaml | 8 +- .../Views/Windows/ImageSidecarWindow.xaml.cs | 2 +- Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml | 8 +- .../Views/Windows/ImageVerifyWindow.xaml.cs | 4 +- Aaru.Gui/Views/Windows/MainWindow.xaml | 8 +- Aaru.Gui/Views/Windows/MainWindow.xaml.cs | 4 +- Aaru.Gui/Views/Windows/MediaDumpWindow.xaml | 8 +- .../Views/Windows/MediaDumpWindow.xaml.cs | 4 +- Aaru.Gui/Views/Windows/MediaScanWindow.xaml | 8 +- .../Views/Windows/MediaScanWindow.xaml.cs | 4 +- Aaru.Gui/Views/Windows/SplashWindow.xaml | 11 ++- Aaru.Gui/Views/Windows/SplashWindow.xaml.cs | 4 +- Aaru.Gui/Views/Windows/ViewSectorWindow.xaml | 8 +- .../Views/Windows/ViewSectorWindow.xaml.cs | 2 +- 105 files changed, 320 insertions(+), 309 deletions(-) diff --git a/Aaru.Gui/App.xaml.cs b/Aaru.Gui/App.xaml.cs index cd8dd1b2d..582073237 100644 --- a/Aaru.Gui/App.xaml.cs +++ b/Aaru.Gui/App.xaml.cs @@ -1,6 +1,6 @@ using System; -using Aaru.Gui.ViewModels; -using Aaru.Gui.Views; +using Aaru.Gui.ViewModels.Windows; +using Aaru.Gui.Views.Windows; using Avalonia; using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; diff --git a/Aaru.Gui/Models/DeviceModel.cs b/Aaru.Gui/Models/DeviceModel.cs index 677dda815..f2a2ecdfd 100644 --- a/Aaru.Gui/Models/DeviceModel.cs +++ b/Aaru.Gui/Models/DeviceModel.cs @@ -1,5 +1,5 @@ using System.Collections.ObjectModel; -using Aaru.Gui.ViewModels; +using Aaru.Gui.ViewModels.Panels; using Avalonia.Media.Imaging; namespace Aaru.Gui.Models diff --git a/Aaru.Gui/Models/FileSystemModel.cs b/Aaru.Gui/Models/FileSystemModel.cs index f85758c3f..45c97fd54 100644 --- a/Aaru.Gui/Models/FileSystemModel.cs +++ b/Aaru.Gui/Models/FileSystemModel.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; using Aaru.CommonTypes.Interfaces; -using Aaru.Gui.ViewModels; +using Aaru.Gui.ViewModels.Panels; namespace Aaru.Gui.Models { diff --git a/Aaru.Gui/Models/ImageModel.cs b/Aaru.Gui/Models/ImageModel.cs index 31959c836..e97225dc7 100644 --- a/Aaru.Gui/Models/ImageModel.cs +++ b/Aaru.Gui/Models/ImageModel.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; using Aaru.CommonTypes.Interfaces; -using Aaru.Gui.ViewModels; +using Aaru.Gui.ViewModels.Panels; using Avalonia.Media.Imaging; namespace Aaru.Gui.Models @@ -15,6 +15,6 @@ namespace Aaru.Gui.Models public ObservableCollection PartitionSchemesOrFileSystems { get; } public IMediaImage Image { get; set; } public ImageInfoViewModel ViewModel { get; set; } - public IFilter Filter { get; set; } + public IFilter Filter { get; set; } } } \ No newline at end of file diff --git a/Aaru.Gui/Models/MediaModel.cs b/Aaru.Gui/Models/MediaModel.cs index 1c979b401..f16245dc3 100644 --- a/Aaru.Gui/Models/MediaModel.cs +++ b/Aaru.Gui/Models/MediaModel.cs @@ -1,4 +1,4 @@ -using Aaru.Gui.ViewModels; +using Aaru.Gui.ViewModels.Panels; using Avalonia.Media.Imaging; namespace Aaru.Gui.Models diff --git a/Aaru.Gui/Models/PartitionModel.cs b/Aaru.Gui/Models/PartitionModel.cs index d849b9c20..df01781b4 100644 --- a/Aaru.Gui/Models/PartitionModel.cs +++ b/Aaru.Gui/Models/PartitionModel.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; using Aaru.CommonTypes; -using Aaru.Gui.ViewModels; +using Aaru.Gui.ViewModels.Panels; using Avalonia.Media.Imaging; namespace Aaru.Gui.Models diff --git a/Aaru.Gui/ViewModels/Dialogs/AboutDialogViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/AboutDialogViewModel.cs index 0a59e9e84..7ddc7d6b0 100644 --- a/Aaru.Gui/ViewModels/Dialogs/AboutDialogViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/AboutDialogViewModel.cs @@ -6,11 +6,11 @@ using System.Reactive; using System.Reflection; using System.Threading.Tasks; using Aaru.Gui.Models; -using Aaru.Gui.Views; +using Aaru.Gui.Views.Dialogs; using Microsoft.DotNet.PlatformAbstractions; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Dialogs { public class AboutDialogViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Dialogs/ConsoleWindowViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/ConsoleWindowViewModel.cs index ae793a0f7..adbf2d8b3 100644 --- a/Aaru.Gui/ViewModels/Dialogs/ConsoleWindowViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/ConsoleWindowViewModel.cs @@ -6,18 +6,18 @@ using System.Reactive; using System.Reflection; using Aaru.CommonTypes.Interop; using Aaru.Console; -using Aaru.Gui.Views; +using Aaru.Gui.Views.Dialogs; using Avalonia.Controls; using ReactiveUI; using PlatformID = Aaru.CommonTypes.Interop.PlatformID; using Version = Aaru.CommonTypes.Interop.Version; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Dialogs { public class ConsoleWindowViewModel : ViewModelBase { - bool _debugChecked; readonly ConsoleWindow _view; + bool _debugChecked; public ConsoleWindowViewModel(ConsoleWindow view) { diff --git a/Aaru.Gui/ViewModels/Dialogs/EncodingsDialogViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/EncodingsDialogViewModel.cs index cc8f59ad0..a87882b9d 100644 --- a/Aaru.Gui/ViewModels/Dialogs/EncodingsDialogViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/EncodingsDialogViewModel.cs @@ -5,10 +5,10 @@ using System.Reactive; using System.Text; using System.Threading.Tasks; using Aaru.Gui.Models; -using Aaru.Gui.Views; +using Aaru.Gui.Views.Dialogs; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Dialogs { public class EncodingsDialogViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Dialogs/LicenseDialogViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/LicenseDialogViewModel.cs index b16375687..c3876d605 100644 --- a/Aaru.Gui/ViewModels/Dialogs/LicenseDialogViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/LicenseDialogViewModel.cs @@ -1,10 +1,10 @@ using System.IO; using System.Reactive; using System.Reflection; -using Aaru.Gui.Views; +using Aaru.Gui.Views.Dialogs; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Dialogs { public class LicenseDialogViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Dialogs/PluginsDialogViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/PluginsDialogViewModel.cs index add9b9d48..05ae564fb 100644 --- a/Aaru.Gui/ViewModels/Dialogs/PluginsDialogViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/PluginsDialogViewModel.cs @@ -4,11 +4,11 @@ using System.Reflection; using Aaru.CommonTypes.Interfaces; using Aaru.Core; using Aaru.Gui.Models; -using Aaru.Gui.Views; +using Aaru.Gui.Views.Dialogs; using Aaru.Partitions; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Dialogs { public class PluginsDialogViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Dialogs/SettingsDialogViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/SettingsDialogViewModel.cs index b53f65292..141ec5874 100644 --- a/Aaru.Gui/ViewModels/Dialogs/SettingsDialogViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/SettingsDialogViewModel.cs @@ -1,9 +1,9 @@ using System.Reactive; -using Aaru.Gui.Views; +using Aaru.Gui.Views.Dialogs; using Aaru.Settings; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Dialogs { public class SettingsDialogViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Dialogs/StatisticsDialogViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/StatisticsDialogViewModel.cs index 245334311..c5e8b09a6 100644 --- a/Aaru.Gui/ViewModels/Dialogs/StatisticsDialogViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/StatisticsDialogViewModel.cs @@ -4,10 +4,10 @@ using System.Reactive; using Aaru.Database; using Aaru.Database.Models; using Aaru.Gui.Models; -using Aaru.Gui.Views; +using Aaru.Gui.Views.Dialogs; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Dialogs { public class StatisticsDialogViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs index 36a5cd602..ac2822af0 100644 --- a/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs @@ -4,12 +4,13 @@ using System.IO; using System.Reactive; using Aaru.Decoders.SCSI.SSC; using Aaru.Devices; -using Aaru.Gui.Tabs; +using Aaru.Gui.ViewModels.Tabs; +using Aaru.Gui.Views.Tabs; using Avalonia.Controls; using ReactiveUI; using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Panels { public class DeviceInfoViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs b/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs index 9d5d7003d..e11fd91c4 100644 --- a/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs @@ -1,6 +1,6 @@ using Schemas; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Panels { public class FileSystemViewModel { diff --git a/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs index 6f194c6c8..0ca6c079d 100644 --- a/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs @@ -12,8 +12,10 @@ using Aaru.Decoders.DVD; using Aaru.Decoders.SCSI; using Aaru.Decoders.Xbox; using Aaru.Gui.Models; -using Aaru.Gui.Tabs; -using Aaru.Gui.Views; +using Aaru.Gui.ViewModels.Tabs; +using Aaru.Gui.ViewModels.Windows; +using Aaru.Gui.Views.Tabs; +using Aaru.Gui.Views.Windows; using Avalonia; using Avalonia.Controls; using Avalonia.Media.Imaging; @@ -23,7 +25,7 @@ using Schemas; using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry; using Session = Aaru.CommonTypes.Structs.Session; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Panels { public class ImageInfoViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs index c23316a2c..6358567ac 100644 --- a/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs @@ -4,8 +4,10 @@ using System.IO; using System.Reactive; using System.Text; using Aaru.Core.Media.Info; -using Aaru.Gui.Tabs; -using Aaru.Gui.Views; +using Aaru.Gui.ViewModels.Tabs; +using Aaru.Gui.ViewModels.Windows; +using Aaru.Gui.Views.Tabs; +using Aaru.Gui.Views.Windows; using Avalonia; using Avalonia.Controls; using Avalonia.Media.Imaging; @@ -14,7 +16,7 @@ using MessageBox.Avalonia; using MessageBox.Avalonia.Enums; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Panels { public class MediaInfoViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs b/Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs index 032c8495d..a462af727 100644 --- a/Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs @@ -1,6 +1,6 @@ using Aaru.CommonTypes; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Panels { public class PartitionViewModel { diff --git a/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs b/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs index 5da889f95..4b28d4298 100644 --- a/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs @@ -15,7 +15,7 @@ using MessageBox.Avalonia.Enums; using ReactiveUI; using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Panels { public class SubdirectoryViewModel { diff --git a/Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs index d72bad669..4e060ea28 100644 --- a/Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs @@ -5,7 +5,7 @@ using Aaru.Decoders.ATA; using Avalonia.Controls; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Tabs { public class AtaInfoViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs index 373e64f6f..4c2ce8834 100644 --- a/Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs @@ -6,7 +6,7 @@ using Aaru.Decoders.SCSI.MMC; using Avalonia.Controls; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Tabs { public class BlurayInfoViewModel { diff --git a/Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs index bc4c2e360..4822f5bbf 100644 --- a/Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs @@ -8,11 +8,10 @@ using Aaru.Gui.Models; using Avalonia.Controls; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Tabs { public class CompactDiscInfoViewModel : ViewModelBase { - readonly Window _view; readonly byte[] _atipData; readonly byte[] _cdTextLeadInData; readonly byte[] _compactDiscInformationData; @@ -20,6 +19,7 @@ namespace Aaru.Gui.ViewModels readonly byte[] _rawTocData; readonly byte[] _sessionData; readonly byte[] _tocData; + readonly Window _view; public CompactDiscInfoViewModel(byte[] toc, byte[] atip, byte[] compactDiscInformation, byte[] session, byte[] rawToc, byte[] pma, byte[] cdTextLeadIn, TOC.CDTOC? decodedToc, @@ -35,15 +35,15 @@ namespace Aaru.Gui.ViewModels _rawTocData = rawToc; _pmaData = pma; _cdTextLeadInData = cdTextLeadIn; - _view = view; - IsrcList = new ObservableCollection(); - SaveCdInformationCommand = ReactiveCommand.Create(ExecuteSaveCdInformationCommand); - SaveCdTocCommand = ReactiveCommand.Create(ExecuteSaveCdTocCommand); - SaveCdFullTocCommand = ReactiveCommand.Create(ExecuteSaveCdFullTocCommand); - SaveCdSessionCommand = ReactiveCommand.Create(ExecuteSaveCdSessionCommand); - SaveCdTextCommand = ReactiveCommand.Create(ExecuteSaveCdTextCommand); - SaveCdAtipCommand = ReactiveCommand.Create(ExecuteSaveCdAtipCommand); - SaveCdPmaCommand = ReactiveCommand.Create(ExecuteSaveCdPmaCommand); + _view = view; + IsrcList = new ObservableCollection(); + SaveCdInformationCommand = ReactiveCommand.Create(ExecuteSaveCdInformationCommand); + SaveCdTocCommand = ReactiveCommand.Create(ExecuteSaveCdTocCommand); + SaveCdFullTocCommand = ReactiveCommand.Create(ExecuteSaveCdFullTocCommand); + SaveCdSessionCommand = ReactiveCommand.Create(ExecuteSaveCdSessionCommand); + SaveCdTextCommand = ReactiveCommand.Create(ExecuteSaveCdTextCommand); + SaveCdAtipCommand = ReactiveCommand.Create(ExecuteSaveCdAtipCommand); + SaveCdPmaCommand = ReactiveCommand.Create(ExecuteSaveCdPmaCommand); if(decodedCompactDiscInformation.HasValue) CdInformationText = DiscInformation.Prettify000b(decodedCompactDiscInformation); @@ -77,7 +77,7 @@ namespace Aaru.Gui.ViewModels } MiscellaneousVisible = McnText != null || isrcs?.Count > 0 || pma != null; - CdPmaVisible = pma != null; + CdPmaVisible = pma != null; } public string CdInformationText { get; } diff --git a/Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs index 04e3aa33f..c8743a209 100644 --- a/Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs @@ -6,7 +6,7 @@ using Aaru.Decoders.DVD; using Avalonia.Controls; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Tabs { public class DvdInfoViewModel { diff --git a/Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs index d52cbf084..1063711b2 100644 --- a/Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs @@ -6,7 +6,7 @@ using Aaru.Decoders.DVD; using Avalonia.Controls; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Tabs { public class DvdWritableInfoViewModel { diff --git a/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs index 9cda13ad9..e4e617f3b 100644 --- a/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs @@ -8,14 +8,14 @@ using Aaru.Gui.Models; using Avalonia.Controls; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Tabs { public class PcmciaInfoViewModel : ViewModelBase { - string _pcmciaCisText; - PcmciaCisModel _selectedCis; readonly Window _view; readonly byte[] cis; + string _pcmciaCisText; + PcmciaCisModel _selectedCis; internal PcmciaInfoViewModel(byte[] pcmciaCis, Window view) { diff --git a/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs index 59ef77008..e728a98e0 100644 --- a/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs @@ -12,7 +12,7 @@ using Avalonia.Controls; using ReactiveUI; using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Tabs { public class ScsiInfoViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs index 501050190..044be42de 100644 --- a/Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs @@ -1,6 +1,6 @@ using Aaru.CommonTypes.Enums; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Tabs { public class SdMmcInfoViewModel { diff --git a/Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs index be4b5194b..50b47426a 100644 --- a/Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs @@ -6,12 +6,12 @@ using Aaru.Decoders.Xbox; using Avalonia.Controls; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Tabs { public class XboxInfoViewModel { - Window _view; readonly byte[] xboxSecuritySector; + Window _view; public XboxInfoViewModel(XgdInfo xgdInfo, byte[] dmi, byte[] securitySector, SS.SecuritySector? decodedSecuritySector, Window view) diff --git a/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs b/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs index 380e83e2f..17177fee3 100644 --- a/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs @@ -19,7 +19,7 @@ using DMI = Aaru.Decoders.Xbox.DMI; using Inquiry = Aaru.Decoders.SCSI.Inquiry; using Spare = Aaru.Decoders.DVD.Spare; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Windows { public class DecodeMediaTagsViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs index 1f7d71ec3..5b610cff1 100644 --- a/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs @@ -12,7 +12,7 @@ using Avalonia.Threading; using ReactiveUI; using Schemas; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Windows { public class ImageChecksumViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs index e8fc5dc6c..2f32aede6 100644 --- a/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs @@ -23,10 +23,11 @@ using Schemas; using ImageInfo = Aaru.CommonTypes.Structs.ImageInfo; using Version = Aaru.CommonTypes.Interop.Version; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Windows { public class ImageConvertViewModel : ViewModelBase { + readonly Window _view; readonly IMediaImage inputFormat; bool _cicmXmlFromImageVisible; string _cicmXmlText; @@ -50,46 +51,44 @@ namespace Aaru.Gui.ViewModels bool _driveSerialNumberVisible; bool _forceChecked; - bool _formatReadOnly; - double _lastMediaSequenceValue; - bool _lastMediaSequenceVisible; - string _mediaBarcodeText; - bool _mediaBarcodeVisible; - string _mediaManufacturerText; - bool _mediaManufacturerVisible; - string _mediaModelText; - bool _mediaModelVisible; - string _mediaPartNumberText; - bool _mediaPartNumberVisible; - double _mediaSequenceValue; - bool _mediaSequenceVisible; - string _mediaSerialNumberText; - bool _mediaSerialNumberVisible; - string _mediaTitleText; - bool _mediaTitleVisible; - bool _optionsVisible; - bool _progress1Visible; - bool _progress2Indeterminate; - double _progress2MaxValue; - string _progress2Text; - double _progress2Value; - bool _progress2Visible; - bool _progressIndeterminate; - double _progressMaxValue; - string _progressText; - double _progressValue; - bool _progressVisible; - bool _resumeFileFromImageVisible; - string _resumeFileText; - double _sectorsValue; - ImagePluginModel _selectedPlugin; - string _sourceText; - bool _startVisible; - bool _stopEnabled; - bool _stopVisible; - string _title; - - readonly Window _view; + bool _formatReadOnly; + double _lastMediaSequenceValue; + bool _lastMediaSequenceVisible; + string _mediaBarcodeText; + bool _mediaBarcodeVisible; + string _mediaManufacturerText; + bool _mediaManufacturerVisible; + string _mediaModelText; + bool _mediaModelVisible; + string _mediaPartNumberText; + bool _mediaPartNumberVisible; + double _mediaSequenceValue; + bool _mediaSequenceVisible; + string _mediaSerialNumberText; + bool _mediaSerialNumberVisible; + string _mediaTitleText; + bool _mediaTitleVisible; + bool _optionsVisible; + bool _progress1Visible; + bool _progress2Indeterminate; + double _progress2MaxValue; + string _progress2Text; + double _progress2Value; + bool _progress2Visible; + bool _progressIndeterminate; + double _progressMaxValue; + string _progressText; + double _progressValue; + bool _progressVisible; + bool _resumeFileFromImageVisible; + string _resumeFileText; + double _sectorsValue; + ImagePluginModel _selectedPlugin; + string _sourceText; + bool _startVisible; + bool _stopEnabled; + bool _stopVisible; + string _title; bool cancel; CICMMetadataType cicmMetadata; List dumpHardware; diff --git a/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs index 7ae83dc3c..61702f019 100644 --- a/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs @@ -11,7 +11,7 @@ using Avalonia.Controls; using Avalonia.Threading; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Windows { public class ImageEntropyViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs index 53c23a38c..3b8a67027 100644 --- a/Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs @@ -13,7 +13,7 @@ using Avalonia.Threading; using ReactiveUI; using Schemas; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Windows { public class ImageSidecarViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs index e6c5def45..f37150940 100644 --- a/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs @@ -12,11 +12,12 @@ using Avalonia.Controls; using Avalonia.Threading; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Windows { public class ImageVerifyViewModel : ViewModelBase { readonly IMediaImage _inputFormat; + readonly Window _view; bool _cancel; bool _closeVisible; string _imageResultText; @@ -54,7 +55,6 @@ namespace Aaru.Gui.ViewModels bool _verifySectorsChecked; bool _verifySectorsEnabled; bool _verifySectorsVisible; - readonly Window _view; public ImageVerifyViewModel(IMediaImage inputFormat, Window view) { @@ -305,8 +305,7 @@ namespace Aaru.Gui.ViewModels ProgressVisible = true; Progress2Visible = false; - VerifySectorsVisible = _inputFormat is IOpticalMediaImage || - _inputFormat is IVerifiableSectorsImage; + VerifySectorsVisible = _inputFormat is IOpticalMediaImage || _inputFormat is IVerifiableSectorsImage; // TODO: Do not offer the option to use this form if the image does not support any kind of verification new Thread(DoWork).Start(); @@ -314,9 +313,9 @@ namespace Aaru.Gui.ViewModels async void DoWork() { - bool formatHasTracks; - var inputOptical = _inputFormat as IOpticalMediaImage; - var verifiableSectorsImage = _inputFormat as IVerifiableSectorsImage; + bool formatHasTracks; + var inputOptical = _inputFormat as IOpticalMediaImage; + var verifiableSectorsImage = _inputFormat as IVerifiableSectorsImage; try { @@ -427,7 +426,7 @@ namespace Aaru.Gui.ViewModels if(formatHasTracks) { - ulong currentSectorAll = 0; + ulong currentSectorAll = 0; startCheck = DateTime.UtcNow; diff --git a/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs b/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs index d96cc9dd4..901ee19d4 100644 --- a/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs @@ -17,8 +17,11 @@ using Aaru.Core.Media.Info; using Aaru.Database; using Aaru.Devices; using Aaru.Gui.Models; -using Aaru.Gui.Panels; -using Aaru.Gui.Views; +using Aaru.Gui.ViewModels.Dialogs; +using Aaru.Gui.ViewModels.Panels; +using Aaru.Gui.Views.Dialogs; +using Aaru.Gui.Views.Panels; +using Aaru.Gui.Views.Windows; using Avalonia; using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; @@ -30,7 +33,7 @@ using ReactiveUI; using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; using PlatformID = Aaru.CommonTypes.Interop.PlatformID; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Windows { public class MainWindowViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs b/Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs index 0ef52fab3..9de62aa35 100644 --- a/Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs @@ -27,7 +27,7 @@ using Schemas; using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; using MediaType = Aaru.CommonTypes.MediaType; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Windows { public class MediaDumpViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs b/Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs index fc81a9cd8..a920f26ab 100644 --- a/Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs @@ -11,7 +11,7 @@ using MessageBox.Avalonia.Enums; using ReactiveUI; using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Windows { public class MediaScanViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs b/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs index 6e1e4c983..63ace03de 100644 --- a/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs @@ -6,13 +6,15 @@ using System.Threading.Tasks; using Aaru.Console; using Aaru.Core; using Aaru.Database; -using Aaru.Gui.Views; +using Aaru.Gui.ViewModels.Dialogs; +using Aaru.Gui.Views.Dialogs; +using Aaru.Gui.Views.Windows; using Aaru.Settings; using Avalonia.Threading; using Microsoft.EntityFrameworkCore; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Windows { public class SplashWindowViewModel : ViewModelBase { diff --git a/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs b/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs index f44d78379..4f52c9a9c 100644 --- a/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs @@ -1,7 +1,7 @@ using Aaru.CommonTypes.Interfaces; using ReactiveUI; -namespace Aaru.Gui.ViewModels +namespace Aaru.Gui.ViewModels.Windows { public class ViewSectorViewModel : ViewModelBase { diff --git a/Aaru.Gui/Views/Dialogs/AboutDialog.xaml b/Aaru.Gui/Views/Dialogs/AboutDialog.xaml index ae22a703f..f956151e9 100644 --- a/Aaru.Gui/Views/Dialogs/AboutDialog.xaml +++ b/Aaru.Gui/Views/Dialogs/AboutDialog.xaml @@ -1,11 +1,11 @@  - + diff --git a/Aaru.Gui/Views/Dialogs/AboutDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/AboutDialog.xaml.cs index 047da45cf..205be5aee 100644 --- a/Aaru.Gui/Views/Dialogs/AboutDialog.xaml.cs +++ b/Aaru.Gui/Views/Dialogs/AboutDialog.xaml.cs @@ -2,7 +2,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Dialogs { public class AboutDialog : Window { diff --git a/Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml b/Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml index 93d4b0384..31b7f0293 100644 --- a/Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml +++ b/Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml @@ -1,11 +1,11 @@  - + diff --git a/Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml.cs index 52cc96a1f..4b1769496 100644 --- a/Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml.cs +++ b/Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml.cs @@ -3,7 +3,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Dialogs { public class ConsoleWindow : Window { diff --git a/Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml b/Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml index be10fc5ce..ac32e69b9 100644 --- a/Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml +++ b/Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml @@ -32,13 +32,13 @@ // ****************************************************************************/ --> - + diff --git a/Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml.cs index 15010ce91..b4f590b92 100644 --- a/Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml.cs +++ b/Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml.cs @@ -2,7 +2,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Dialogs { public class EncodingsDialog : Window { diff --git a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml index 37192b0fe..d5921b3ec 100644 --- a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml +++ b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml @@ -1,11 +1,11 @@  - + diff --git a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs index bf2f6e5a1..b217f4635 100644 --- a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs +++ b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs @@ -2,7 +2,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Dialogs { public class LicenseDialog : Window { diff --git a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml index f2b62f22d..7af700fda 100644 --- a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml +++ b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml @@ -32,13 +32,13 @@ // ****************************************************************************/ --> - + diff --git a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs index dc604af0d..32c34189b 100644 --- a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs +++ b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs @@ -2,7 +2,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Dialogs { public class PluginsDialog : Window { diff --git a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml index d4b356809..a8edcc792 100644 --- a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml +++ b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml @@ -1,11 +1,11 @@  - + diff --git a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs index f1fc3f3ca..215350264 100644 --- a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs +++ b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs @@ -2,7 +2,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Dialogs { public class SettingsDialog : Window { diff --git a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml index 9954c9d20..01ef97f80 100644 --- a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml +++ b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml @@ -1,11 +1,11 @@  - + diff --git a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs index d5036eddf..bb34cd11b 100644 --- a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs +++ b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs @@ -2,7 +2,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Dialogs { public class StatisticsDialog : Window { diff --git a/Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml b/Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml index 3129415d3..bca34bd25 100644 --- a/Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml +++ b/Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml @@ -1,10 +1,10 @@  + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.DeviceInfoPanel"> - + diff --git a/Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml.cs b/Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml.cs index 13a15ff9a..e9365e5d2 100644 --- a/Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml.cs +++ b/Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Panels +namespace Aaru.Gui.Views.Panels { public class DeviceInfoPanel : UserControl { diff --git a/Aaru.Gui/Views/Panels/FileSystemPanel.xaml b/Aaru.Gui/Views/Panels/FileSystemPanel.xaml index 3d5a6631d..397e035e7 100644 --- a/Aaru.Gui/Views/Panels/FileSystemPanel.xaml +++ b/Aaru.Gui/Views/Panels/FileSystemPanel.xaml @@ -1,10 +1,10 @@  + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.FileSystemPanel"> - + diff --git a/Aaru.Gui/Views/Panels/FileSystemPanel.xaml.cs b/Aaru.Gui/Views/Panels/FileSystemPanel.xaml.cs index a760eb8dc..a0f5906b4 100644 --- a/Aaru.Gui/Views/Panels/FileSystemPanel.xaml.cs +++ b/Aaru.Gui/Views/Panels/FileSystemPanel.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Panels +namespace Aaru.Gui.Views.Panels { public class FileSystemPanel : UserControl { diff --git a/Aaru.Gui/Views/Panels/ImageInfoPanel.xaml b/Aaru.Gui/Views/Panels/ImageInfoPanel.xaml index cf3f1b593..37d5db196 100644 --- a/Aaru.Gui/Views/Panels/ImageInfoPanel.xaml +++ b/Aaru.Gui/Views/Panels/ImageInfoPanel.xaml @@ -1,10 +1,10 @@  + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.ImageInfoPanel"> - + + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.MediaInfoPanel"> - + diff --git a/Aaru.Gui/Views/Panels/MediaInfoPanel.xaml.cs b/Aaru.Gui/Views/Panels/MediaInfoPanel.xaml.cs index 383eda1d0..f9af32eaf 100644 --- a/Aaru.Gui/Views/Panels/MediaInfoPanel.xaml.cs +++ b/Aaru.Gui/Views/Panels/MediaInfoPanel.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Panels +namespace Aaru.Gui.Views.Panels { public class MediaInfoPanel : UserControl { diff --git a/Aaru.Gui/Views/Panels/PartitionPanel.xaml b/Aaru.Gui/Views/Panels/PartitionPanel.xaml index 95e6e83e2..0fd618413 100644 --- a/Aaru.Gui/Views/Panels/PartitionPanel.xaml +++ b/Aaru.Gui/Views/Panels/PartitionPanel.xaml @@ -1,10 +1,10 @@  + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.PartitionPanel"> - + diff --git a/Aaru.Gui/Views/Panels/PartitionPanel.xaml.cs b/Aaru.Gui/Views/Panels/PartitionPanel.xaml.cs index f6ebb82d1..90c0da73a 100644 --- a/Aaru.Gui/Views/Panels/PartitionPanel.xaml.cs +++ b/Aaru.Gui/Views/Panels/PartitionPanel.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Panels +namespace Aaru.Gui.Views.Panels { public class PartitionPanel : UserControl { diff --git a/Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml b/Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml index 26264a097..586d74b3e 100644 --- a/Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml +++ b/Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml @@ -1,10 +1,11 @@  + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" + x:Class="Aaru.Gui.Views.Panels.SubdirectoryPanel"> - + diff --git a/Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml.cs b/Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml.cs index 5c71f18fe..8cb4f1281 100644 --- a/Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml.cs +++ b/Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Panels +namespace Aaru.Gui.Views.Panels { public class SubdirectoryPanel : UserControl { diff --git a/Aaru.Gui/Views/Tabs/AtaInfoTab.xaml b/Aaru.Gui/Views/Tabs/AtaInfoTab.xaml index 53263fb66..1980abb64 100644 --- a/Aaru.Gui/Views/Tabs/AtaInfoTab.xaml +++ b/Aaru.Gui/Views/Tabs/AtaInfoTab.xaml @@ -1,10 +1,10 @@  + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.AtaInfoTab"> - + diff --git a/Aaru.Gui/Views/Tabs/AtaInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/AtaInfoTab.xaml.cs index cb66fdde3..dcc69aad7 100644 --- a/Aaru.Gui/Views/Tabs/AtaInfoTab.xaml.cs +++ b/Aaru.Gui/Views/Tabs/AtaInfoTab.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Tabs +namespace Aaru.Gui.Views.Tabs { public class AtaInfoTab : UserControl { diff --git a/Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml b/Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml index ab5cd584d..18dc83f24 100644 --- a/Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml +++ b/Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml @@ -1,10 +1,10 @@  + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.BlurayInfoTab"> - + diff --git a/Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml.cs index 9dad6b857..a59b8adae 100644 --- a/Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml.cs +++ b/Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Tabs +namespace Aaru.Gui.Views.Tabs { public class BlurayInfoTab : UserControl { diff --git a/Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml b/Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml index 1b1ed2d69..0ea27e068 100644 --- a/Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml +++ b/Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml @@ -1,10 +1,10 @@  + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.CompactDiscInfoTab"> - + diff --git a/Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml.cs index 346110016..82961ab43 100644 --- a/Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml.cs +++ b/Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Tabs +namespace Aaru.Gui.Views.Tabs { public class CompactDiscInfoTab : UserControl { diff --git a/Aaru.Gui/Views/Tabs/DvdInfoTab.xaml b/Aaru.Gui/Views/Tabs/DvdInfoTab.xaml index 9abf94966..33af98668 100644 --- a/Aaru.Gui/Views/Tabs/DvdInfoTab.xaml +++ b/Aaru.Gui/Views/Tabs/DvdInfoTab.xaml @@ -1,10 +1,10 @@  + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.DvdInfoTab"> - + diff --git a/Aaru.Gui/Views/Tabs/DvdInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/DvdInfoTab.xaml.cs index f23a54183..189e7a5e1 100644 --- a/Aaru.Gui/Views/Tabs/DvdInfoTab.xaml.cs +++ b/Aaru.Gui/Views/Tabs/DvdInfoTab.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Tabs +namespace Aaru.Gui.Views.Tabs { public class DvdInfoTab : UserControl { diff --git a/Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml b/Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml index cc92a90c1..0550bd93e 100644 --- a/Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml +++ b/Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml @@ -1,10 +1,10 @@  + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.DvdWritableInfoTab"> - + diff --git a/Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml.cs index daae7d9e7..5d58b4551 100644 --- a/Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml.cs +++ b/Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Tabs +namespace Aaru.Gui.Views.Tabs { public class DvdWritableInfoTab : UserControl { diff --git a/Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml b/Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml index 6ad46f31d..aa1b46cda 100644 --- a/Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml +++ b/Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml @@ -1,10 +1,10 @@  + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.PcmciaInfoTab"> - + diff --git a/Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml.cs index f7716118e..3ab844e14 100644 --- a/Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml.cs +++ b/Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Tabs +namespace Aaru.Gui.Views.Tabs { public class PcmciaInfoTab : UserControl { diff --git a/Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml b/Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml index b999e247e..c26a908b9 100644 --- a/Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml +++ b/Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml @@ -1,10 +1,10 @@  + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.ScsiInfoTab"> - + diff --git a/Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml.cs index 642a1841a..813b9ed7e 100644 --- a/Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml.cs +++ b/Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Tabs +namespace Aaru.Gui.Views.Tabs { public class ScsiInfoTab : UserControl { diff --git a/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml index 9401cce2d..cf24c8e33 100644 --- a/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml +++ b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml @@ -1,10 +1,10 @@  + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.SdMmcInfoTab"> - + diff --git a/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml.cs b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml.cs index 69c03c103..78d841f58 100644 --- a/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml.cs +++ b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Tabs +namespace Aaru.Gui.Views.Tabs { public class SdMmcInfoTab : UserControl { diff --git a/Aaru.Gui/Views/Tabs/XboxInfoTab.xaml b/Aaru.Gui/Views/Tabs/XboxInfoTab.xaml index 15a938552..6cfec1492 100644 --- a/Aaru.Gui/Views/Tabs/XboxInfoTab.xaml +++ b/Aaru.Gui/Views/Tabs/XboxInfoTab.xaml @@ -1,44 +1,47 @@  + xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.XboxInfoTab"> - + - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Aaru.Gui/Views/Tabs/XboxInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/XboxInfoTab.xaml.cs index 262a9cf8e..484b0c1e9 100644 --- a/Aaru.Gui/Views/Tabs/XboxInfoTab.xaml.cs +++ b/Aaru.Gui/Views/Tabs/XboxInfoTab.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Tabs +namespace Aaru.Gui.Views.Tabs { public class XboxInfoTab : UserControl { diff --git a/Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml b/Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml index 02fd99b90..8abb6e1ef 100644 --- a/Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml +++ b/Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml @@ -1,11 +1,11 @@  - + diff --git a/Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml.cs b/Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml.cs index 18a4787a1..078cfabac 100644 --- a/Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml.cs +++ b/Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml.cs @@ -2,7 +2,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Windows { public class DecodeMediaTagsWindow : Window { diff --git a/Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml b/Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml index 212457fa9..f44a659a7 100644 --- a/Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml +++ b/Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml @@ -1,11 +1,11 @@  - + diff --git a/Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml.cs b/Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml.cs index db0d64528..599907aa9 100644 --- a/Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml.cs +++ b/Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml.cs @@ -1,10 +1,10 @@ using System.ComponentModel; -using Aaru.Gui.ViewModels; +using Aaru.Gui.ViewModels.Windows; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Windows { public class ImageChecksumWindow : Window { diff --git a/Aaru.Gui/Views/Windows/ImageConvertWindow.xaml b/Aaru.Gui/Views/Windows/ImageConvertWindow.xaml index 6b58058de..41ff2deb4 100644 --- a/Aaru.Gui/Views/Windows/ImageConvertWindow.xaml +++ b/Aaru.Gui/Views/Windows/ImageConvertWindow.xaml @@ -1,11 +1,11 @@  - + diff --git a/Aaru.Gui/Views/Windows/ImageConvertWindow.xaml.cs b/Aaru.Gui/Views/Windows/ImageConvertWindow.xaml.cs index 74907012b..99a7dea31 100644 --- a/Aaru.Gui/Views/Windows/ImageConvertWindow.xaml.cs +++ b/Aaru.Gui/Views/Windows/ImageConvertWindow.xaml.cs @@ -1,10 +1,10 @@ using System.ComponentModel; -using Aaru.Gui.ViewModels; +using Aaru.Gui.ViewModels.Windows; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Windows { public class ImageConvertWindow : Window { diff --git a/Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml b/Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml index c61c33d1a..5358e65e1 100644 --- a/Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml +++ b/Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml @@ -1,11 +1,11 @@  - + diff --git a/Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml.cs b/Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml.cs index 4191d2628..cc6af5599 100644 --- a/Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml.cs +++ b/Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml.cs @@ -1,10 +1,10 @@ using System.ComponentModel; -using Aaru.Gui.ViewModels; +using Aaru.Gui.ViewModels.Windows; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Windows { public class ImageEntropyWindow : Window { diff --git a/Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml b/Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml index d38fb37f6..fa17caa75 100644 --- a/Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml +++ b/Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml @@ -32,13 +32,13 @@ // ****************************************************************************/ --> - + diff --git a/Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml.cs b/Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml.cs index 3e7001572..68f1cc526 100644 --- a/Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml.cs +++ b/Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml.cs @@ -2,7 +2,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Windows { public class ImageSidecarWindow : Window { diff --git a/Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml b/Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml index 6256f21fd..d0a8bd8c6 100644 --- a/Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml +++ b/Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml @@ -1,11 +1,11 @@  - + diff --git a/Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml.cs b/Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml.cs index 9697496bd..461e491a5 100644 --- a/Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml.cs +++ b/Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml.cs @@ -1,10 +1,10 @@ using System.ComponentModel; -using Aaru.Gui.ViewModels; +using Aaru.Gui.ViewModels.Windows; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Windows { public class ImageVerifyWindow : Window { diff --git a/Aaru.Gui/Views/Windows/MainWindow.xaml b/Aaru.Gui/Views/Windows/MainWindow.xaml index 23f692756..f731bffa0 100644 --- a/Aaru.Gui/Views/Windows/MainWindow.xaml +++ b/Aaru.Gui/Views/Windows/MainWindow.xaml @@ -1,11 +1,11 @@  + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800" + d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.MainWindow" Icon="/Assets/aaru-logo.png" Title="Aaru.Gui"> - + diff --git a/Aaru.Gui/Views/Windows/MainWindow.xaml.cs b/Aaru.Gui/Views/Windows/MainWindow.xaml.cs index 75dd4bf9a..cbd09fc74 100644 --- a/Aaru.Gui/Views/Windows/MainWindow.xaml.cs +++ b/Aaru.Gui/Views/Windows/MainWindow.xaml.cs @@ -1,10 +1,10 @@ using System; -using Aaru.Gui.ViewModels; +using Aaru.Gui.ViewModels.Windows; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Windows { public class MainWindow : Window { diff --git a/Aaru.Gui/Views/Windows/MediaDumpWindow.xaml b/Aaru.Gui/Views/Windows/MediaDumpWindow.xaml index a0c5fa9dc..6ea0b7a1d 100644 --- a/Aaru.Gui/Views/Windows/MediaDumpWindow.xaml +++ b/Aaru.Gui/Views/Windows/MediaDumpWindow.xaml @@ -1,11 +1,11 @@  - + diff --git a/Aaru.Gui/Views/Windows/MediaDumpWindow.xaml.cs b/Aaru.Gui/Views/Windows/MediaDumpWindow.xaml.cs index 0a3a694ea..afce7fb3e 100644 --- a/Aaru.Gui/Views/Windows/MediaDumpWindow.xaml.cs +++ b/Aaru.Gui/Views/Windows/MediaDumpWindow.xaml.cs @@ -1,10 +1,10 @@ using System.ComponentModel; -using Aaru.Gui.ViewModels; +using Aaru.Gui.ViewModels.Windows; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Windows { public class MediaDumpWindow : Window { diff --git a/Aaru.Gui/Views/Windows/MediaScanWindow.xaml b/Aaru.Gui/Views/Windows/MediaScanWindow.xaml index b1cc39d38..8af79d212 100644 --- a/Aaru.Gui/Views/Windows/MediaScanWindow.xaml +++ b/Aaru.Gui/Views/Windows/MediaScanWindow.xaml @@ -1,11 +1,11 @@  - + diff --git a/Aaru.Gui/Views/Windows/MediaScanWindow.xaml.cs b/Aaru.Gui/Views/Windows/MediaScanWindow.xaml.cs index c321b14c9..2444d3d91 100644 --- a/Aaru.Gui/Views/Windows/MediaScanWindow.xaml.cs +++ b/Aaru.Gui/Views/Windows/MediaScanWindow.xaml.cs @@ -1,10 +1,10 @@ using System.ComponentModel; -using Aaru.Gui.ViewModels; +using Aaru.Gui.ViewModels.Windows; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Windows { public class MediaScanWindow : Window { diff --git a/Aaru.Gui/Views/Windows/SplashWindow.xaml b/Aaru.Gui/Views/Windows/SplashWindow.xaml index 9bd7502c0..92fa006ad 100644 --- a/Aaru.Gui/Views/Windows/SplashWindow.xaml +++ b/Aaru.Gui/Views/Windows/SplashWindow.xaml @@ -1,18 +1,17 @@  - + - + diff --git a/Aaru.Gui/Views/Windows/SplashWindow.xaml.cs b/Aaru.Gui/Views/Windows/SplashWindow.xaml.cs index 696f9dd90..74e2f9e39 100644 --- a/Aaru.Gui/Views/Windows/SplashWindow.xaml.cs +++ b/Aaru.Gui/Views/Windows/SplashWindow.xaml.cs @@ -1,10 +1,10 @@ using System; -using Aaru.Gui.ViewModels; +using Aaru.Gui.ViewModels.Windows; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Windows { public class SplashWindow : Window { diff --git a/Aaru.Gui/Views/Windows/ViewSectorWindow.xaml b/Aaru.Gui/Views/Windows/ViewSectorWindow.xaml index affc4ed39..db0824852 100644 --- a/Aaru.Gui/Views/Windows/ViewSectorWindow.xaml +++ b/Aaru.Gui/Views/Windows/ViewSectorWindow.xaml @@ -32,13 +32,13 @@ // ****************************************************************************/ --> - + diff --git a/Aaru.Gui/Views/Windows/ViewSectorWindow.xaml.cs b/Aaru.Gui/Views/Windows/ViewSectorWindow.xaml.cs index 86c397244..b046a722a 100644 --- a/Aaru.Gui/Views/Windows/ViewSectorWindow.xaml.cs +++ b/Aaru.Gui/Views/Windows/ViewSectorWindow.xaml.cs @@ -2,7 +2,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aaru.Gui.Views +namespace Aaru.Gui.Views.Windows { public class ViewSectorWindow : Window {