aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix class names.

Browse Source
This commit is contained in:
Natalia Portillo
2020-04-16 21:29:40 +01:00
parent 367f6d9369
commit fd670972e1
76 changed files with 450 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
.idea/.idea.Aaru/.idea/contentModel.xml generated
View File

@@ -1250,13 +1250,13 @@
<e p="ViewLocator.cs" t="Include" /> <e p="ViewLocator.cs" t="Include" />
<e p="ViewModels" t="Include"> <e p="ViewModels" t="Include">
<e p="Dialogs" t="Include"> <e p="Dialogs" t="Include">
<e p="AboutDialogViewModel.cs" t="Include" /> <e p="AboutViewModel.cs" t="Include" />
<e p="ConsoleWindowViewModel.cs" t="Include" /> <e p="ConsoleViewModel.cs" t="Include" />
<e p="EncodingsDialogViewModel.cs" t="Include" /> <e p="EncodingsViewModel.cs" t="Include" />
<e p="LicenseDialogViewModel.cs" t="Include" /> <e p="LicenseViewModel.cs" t="Include" />
<e p="PluginsDialogViewModel.cs" t="Include" /> <e p="PluginsViewModel.cs" t="Include" />
<e p="SettingsDialogViewModel.cs" t="Include" /> <e p="SettingsViewModel.cs" t="Include" />
<e p="StatisticsDialogViewModel.cs" t="Include" /> <e p="StatisticsViewModel.cs" t="Include" />
</e> </e>
<e p="Panels" t="Include"> <e p="Panels" t="Include">
<e p="DeviceInfoViewModel.cs" t="Include" /> <e p="DeviceInfoViewModel.cs" t="Include" />
@@ -1294,12 +1294,12 @@
</e> </e>
<e p="Views" t="Include"> <e p="Views" t="Include">
<e p="Dialogs" t="Include"> <e p="Dialogs" t="Include">
<e p="AboutDialog.xaml" t="Include" /> <e p="About.xaml" t="Include" />
<e p="AboutDialog.xaml.cs" t="Include" /> <e p="About.xaml.cs" t="Include" />
<e p="ConsoleDialog.xaml" t="Include" /> <e p="Console.xaml" t="Include" />
<e p="ConsoleDialog.xaml.cs" t="Include" /> <e p="Console.xaml.cs" t="Include" />
<e p="EncodingsDialog.xaml" t="Include" /> <e p="Encodings.xaml" t="Include" />
<e p="EncodingsDialog.xaml.cs" t="Include" /> <e p="Encodings.xaml.cs" t="Include" />
<e p="LicenseDialog.xaml" t="Include" /> <e p="LicenseDialog.xaml" t="Include" />
<e p="LicenseDialog.xaml.cs" t="Include" /> <e p="LicenseDialog.xaml.cs" t="Include" />
<e p="PluginsDialog.xaml" t="Include" /> <e p="PluginsDialog.xaml" t="Include" />
@@ -1310,62 +1310,62 @@
<e p="StatisticsDialog.xaml.cs" t="Include" /> <e p="StatisticsDialog.xaml.cs" t="Include" />
</e> </e>
<e p="Panels" t="Include"> <e p="Panels" t="Include">
<e p="DeviceInfoPanel.xaml" t="Include" /> <e p="DeviceInfo.xaml" t="Include" />
<e p="DeviceInfoPanel.xaml.cs" t="Include" /> <e p="DeviceInfo.xaml.cs" t="Include" />
<e p="FileSystemPanel.xaml" t="Include" /> <e p="FileSystem.xaml" t="Include" />
<e p="FileSystemPanel.xaml.cs" t="Include" /> <e p="FileSystem.xaml.cs" t="Include" />
<e p="ImageInfoPanel.xaml" t="Include" /> <e p="ImageInfo.xaml" t="Include" />
<e p="ImageInfoPanel.xaml.cs" t="Include" /> <e p="ImageInfo.xaml.cs" t="Include" />
<e p="MediaInfoPanel.xaml" t="Include" /> <e p="MediaInfo.xaml" t="Include" />
<e p="MediaInfoPanel.xaml.cs" t="Include" /> <e p="MediaInfo.xaml.cs" t="Include" />
<e p="PartitionPanel.xaml" t="Include" /> <e p="Partition.xaml" t="Include" />
<e p="PartitionPanel.xaml.cs" t="Include" /> <e p="Partition.xaml.cs" t="Include" />
<e p="SubdirectoryPanel.xaml" t="Include" /> <e p="Subdirectory.xaml" t="Include" />
<e p="SubdirectoryPanel.xaml.cs" t="Include" /> <e p="Subdirectory.xaml.cs" t="Include" />
</e> </e>
<e p="Tabs" t="Include"> <e p="Tabs" t="Include">
<e p="AtaInfoTab.xaml" t="Include" /> <e p="AtaInfo.xaml" t="Include" />
<e p="AtaInfoTab.xaml.cs" t="Include" /> <e p="AtaInfo.xaml.cs" t="Include" />
<e p="BlurayInfoTab.xaml" t="Include" /> <e p="BlurayInfo.xaml" t="Include" />
<e p="BlurayInfoTab.xaml.cs" t="Include" /> <e p="BlurayInfo.xaml.cs" t="Include" />
<e p="CompactDiscInfoTab.xaml" t="Include" /> <e p="CompactDiscInfo.xaml" t="Include" />
<e p="CompactDiscInfoTab.xaml.cs" t="Include" /> <e p="CompactDiscInfo.xaml.cs" t="Include" />
<e p="DvdInfoTab.xaml" t="Include" /> <e p="DvdInfo.xaml" t="Include" />
<e p="DvdInfoTab.xaml.cs" t="Include" /> <e p="DvdInfo.xaml.cs" t="Include" />
<e p="DvdWritableInfoTab.xaml" t="Include" /> <e p="DvdWritableInfo.xaml" t="Include" />
<e p="DvdWritableInfoTab.xaml.cs" t="Include" /> <e p="DvdWritableInfo.xaml.cs" t="Include" />
<e p="PcmciaInfoTab.xaml" t="Include" /> <e p="PcmciaInfo.xaml" t="Include" />
<e p="PcmciaInfoTab.xaml.cs" t="Include" /> <e p="PcmciaInfo.xaml.cs" t="Include" />
<e p="ScsiInfoTab.xaml" t="Include" /> <e p="ScsiInfo.xaml" t="Include" />
<e p="ScsiInfoTab.xaml.cs" t="Include" /> <e p="ScsiInfo.xaml.cs" t="Include" />
<e p="SdMmcInfo.xaml" t="Include" /> <e p="SdMmcInfo.xaml" t="Include" />
<e p="SdMmcInfo.xaml.cs" t="Include" /> <e p="SdMmcInfo.xaml.cs" t="Include" />
<e p="XboxInfoTab.xaml" t="Include" /> <e p="XboxInfo.xaml" t="Include" />
<e p="XboxInfoTab.xaml.cs" t="Include" /> <e p="XboxInfo.xaml.cs" t="Include" />
</e> </e>
<e p="Windows" t="Include"> <e p="Windows" t="Include">
<e p="DecodeMediaTagsWindow.xaml" t="Include" /> <e p="DecodeMediaTags.xaml" t="Include" />
<e p="DecodeMediaTagsWindow.xaml.cs" t="Include" /> <e p="DecodeMediaTags.xaml.cs" t="Include" />
<e p="ImageChecksumWindow.xaml" t="Include" /> <e p="ImageChecksum.xaml" t="Include" />
<e p="ImageChecksumWindow.xaml.cs" t="Include" /> <e p="ImageChecksum.xaml.cs" t="Include" />
<e p="ImageConvertWindow.xaml" t="Include" /> <e p="ImageConvert.xaml" t="Include" />
<e p="ImageConvertWindow.xaml.cs" t="Include" /> <e p="ImageConvert.xaml.cs" t="Include" />
<e p="ImageEntropyWindow.xaml" t="Include" /> <e p="ImageEntropy.xaml" t="Include" />
<e p="ImageEntropyWindow.xaml.cs" t="Include" /> <e p="ImageEntropy.xaml.cs" t="Include" />
<e p="ImageSidecarWindow.xaml" t="Include" /> <e p="ImageSidecar.xaml" t="Include" />
<e p="ImageSidecarWindow.xaml.cs" t="Include" /> <e p="ImageSidecar.xaml.cs" t="Include" />
<e p="ImageVerifyWindow.xaml" t="Include" /> <e p="ImageVerify.xaml" t="Include" />
<e p="ImageVerifyWindow.xaml.cs" t="Include" /> <e p="ImageVerify.xaml.cs" t="Include" />
<e p="MainWindow.xaml" t="Include" /> <e p="MainWindow.xaml" t="Include" />
<e p="MainWindow.xaml.cs" t="Include" /> <e p="MainWindow.xaml.cs" t="Include" />
<e p="MediaDumpWindow.xaml" t="Include" /> <e p="MediaDump.xaml" t="Include" />
<e p="MediaDumpWindow.xaml.cs" t="Include" /> <e p="MediaDump.xaml.cs" t="Include" />
<e p="MediaScanWindow.xaml" t="Include" /> <e p="MediaScan.xaml" t="Include" />
<e p="MediaScanWindow.xaml.cs" t="Include" /> <e p="MediaScan.xaml.cs" t="Include" />
<e p="SplashWindow.xaml" t="Include" /> <e p="SplashWindow.xaml" t="Include" />
<e p="SplashWindow.xaml.cs" t="Include" /> <e p="SplashWindow.xaml.cs" t="Include" />
<e p="ViewSectorWindow.xaml" t="Include" /> <e p="ViewSector.xaml" t="Include" />
<e p="ViewSectorWindow.xaml.cs" t="Include" /> <e p="ViewSector.xaml.cs" t="Include" />
</e> </e>
</e> </e>
<e p="bin" t="ExcludeRecursive" /> <e p="bin" t="ExcludeRecursive" />

78
Aaru.Gui/Aaru.Gui.csproj
View File

@@ -334,6 +334,84 @@
<AvaloniaResource Update="Views\ConsoleDialog.xaml"> <AvaloniaResource Update="Views\ConsoleDialog.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</AvaloniaResource> </AvaloniaResource>
<Compile Update="Views\Dialogs\About.xaml.cs">
<DependentUpon>About.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Dialogs\Console.xaml.cs">
<DependentUpon>Console.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Dialogs\Encodings.xaml.cs">
<DependentUpon>Encodings.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Panels\DeviceInfo.xaml.cs">
<DependentUpon>DeviceInfo.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Panels\FileSystem.xaml.cs">
<DependentUpon>FileSystem.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Panels\ImageInfo.xaml.cs">
<DependentUpon>ImageInfo.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Panels\MediaInfo.xaml.cs">
<DependentUpon>MediaInfo.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Panels\Partition.xaml.cs">
<DependentUpon>Partition.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Panels\Subdirectory.xaml.cs">
<DependentUpon>Subdirectory.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Tabs\AtaInfo.xaml.cs">
<DependentUpon>AtaInfo.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Tabs\BlurayInfo.xaml.cs">
<DependentUpon>BlurayInfo.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Tabs\CompactDiscInfo.xaml.cs">
<DependentUpon>CompactDiscInfo.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Tabs\DvdInfo.xaml.cs">
<DependentUpon>DvdInfo.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Tabs\DvdWritableInfo.xaml.cs">
<DependentUpon>DvdWritableInfo.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Tabs\PcmciaInfo.xaml.cs">
<DependentUpon>PcmciaInfo.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Tabs\ScsiInfo.xaml.cs">
<DependentUpon>ScsiInfo.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Tabs\XboxInfo.xaml.cs">
<DependentUpon>XboxInfo.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Windows\DecodeMediaTags.xaml.cs">
<DependentUpon>DecodeMediaTags.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Windows\ImageChecksum.xaml.cs">
<DependentUpon>ImageChecksum.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Windows\ImageConvert.xaml.cs">
<DependentUpon>ImageConvert.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Windows\ImageEntropy.xaml.cs">
<DependentUpon>ImageEntropy.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Windows\ImageSidecar.xaml.cs">
<DependentUpon>ImageSidecar.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Windows\ImageVerify.xaml.cs">
<DependentUpon>ImageVerify.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Windows\MediaDump.xaml.cs">
<DependentUpon>MediaDump.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Windows\MediaScan.xaml.cs">
<DependentUpon>MediaScan.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Windows\ViewSector.xaml.cs">
<DependentUpon>ViewSector.xaml</DependentUpon>
</Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<UpToDateCheckInput Remove="Views\MainWindow.xaml" /> <UpToDateCheckInput Remove="Views\MainWindow.xaml" />

8
Aaru.Gui/ViewModels/Dialogs/AboutDialogViewModel.cs → Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs
View File

@@ -12,12 +12,12 @@ using ReactiveUI;
namespace Aaru.Gui.ViewModels.Dialogs namespace Aaru.Gui.ViewModels.Dialogs
{ {
public class AboutDialogViewModel : ViewModelBase public class AboutViewModel : ViewModelBase
{ {
readonly AboutDialog _view; readonly About _view;
string _versionText; string _versionText;
public AboutDialogViewModel(AboutDialog view) public AboutViewModel(About view)
{ {
_view = view; _view = view;
@@ -129,7 +129,7 @@ Logo and art:
void ExecuteLicenseCommand() void ExecuteLicenseCommand()
{ {
var dialog = new LicenseDialog(); var dialog = new LicenseDialog();
dialog.DataContext = new LicenseDialogViewModel(dialog); dialog.DataContext = new LicenseViewModel(dialog);
dialog.ShowDialog(_view); dialog.ShowDialog(_view);
} }

7
Aaru.Gui/ViewModels/Dialogs/ConsoleWindowViewModel.cs → Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs
View File

@@ -6,7 +6,6 @@ using System.Reactive;
using System.Reflection; using System.Reflection;
using Aaru.CommonTypes.Interop; using Aaru.CommonTypes.Interop;
using Aaru.Console; using Aaru.Console;
using Aaru.Gui.Views.Dialogs;
using Avalonia.Controls; using Avalonia.Controls;
using ReactiveUI; using ReactiveUI;
using PlatformID = Aaru.CommonTypes.Interop.PlatformID; using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
@@ -14,12 +13,12 @@ using Version = Aaru.CommonTypes.Interop.Version;
namespace Aaru.Gui.ViewModels.Dialogs namespace Aaru.Gui.ViewModels.Dialogs
{ {
public class ConsoleWindowViewModel : ViewModelBase public class ConsoleViewModel : ViewModelBase
{ {
readonly ConsoleWindow _view; readonly Views.Dialogs.Console _view;
bool _debugChecked; bool _debugChecked;
public ConsoleWindowViewModel(ConsoleWindow view) public ConsoleViewModel(Views.Dialogs.Console view)
{ {
_view = view; _view = view;
SaveCommand = ReactiveCommand.Create(ExecuteSaveCommand); SaveCommand = ReactiveCommand.Create(ExecuteSaveCommand);

6
Aaru.Gui/ViewModels/Dialogs/EncodingsDialogViewModel.cs → Aaru.Gui/ViewModels/Dialogs/EncodingsViewModel.cs
View File

@@ -10,11 +10,11 @@ using ReactiveUI;
namespace Aaru.Gui.ViewModels.Dialogs namespace Aaru.Gui.ViewModels.Dialogs
{ {
public class EncodingsDialogViewModel : ViewModelBase public class EncodingsViewModel : ViewModelBase
{ {
readonly EncodingsDialog _view; readonly Encodings _view;
public EncodingsDialogViewModel(EncodingsDialog view) public EncodingsViewModel(Encodings view)
{ {
_view = view; _view = view;
Encodings = new ObservableCollection<EncodingModel>(); Encodings = new ObservableCollection<EncodingModel>();

4
Aaru.Gui/ViewModels/Dialogs/LicenseDialogViewModel.cs → Aaru.Gui/ViewModels/Dialogs/LicenseViewModel.cs
View File

@@ -6,12 +6,12 @@ using ReactiveUI;
namespace Aaru.Gui.ViewModels.Dialogs namespace Aaru.Gui.ViewModels.Dialogs
{ {
public class LicenseDialogViewModel : ViewModelBase public class LicenseViewModel : ViewModelBase
{ {
readonly LicenseDialog _view; readonly LicenseDialog _view;
string _versionText; string _versionText;
public LicenseDialogViewModel(LicenseDialog view) public LicenseViewModel(LicenseDialog view)
{ {
_view = view; _view = view;
CloseCommand = ReactiveCommand.Create(ExecuteCloseCommand); CloseCommand = ReactiveCommand.Create(ExecuteCloseCommand);

4
Aaru.Gui/ViewModels/Dialogs/PluginsDialogViewModel.cs → Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs
View File

@@ -10,11 +10,11 @@ using ReactiveUI;
namespace Aaru.Gui.ViewModels.Dialogs namespace Aaru.Gui.ViewModels.Dialogs
{ {
public class PluginsDialogViewModel : ViewModelBase public class PluginsViewModel : ViewModelBase
{ {
readonly PluginsDialog _view; readonly PluginsDialog _view;
public PluginsDialogViewModel(PluginsDialog view) public PluginsViewModel(PluginsDialog view)
{ {
_view = view; _view = view;
Filters = new ObservableCollection<PluginModel>(); Filters = new ObservableCollection<PluginModel>();

4
Aaru.Gui/ViewModels/Dialogs/SettingsDialogViewModel.cs → Aaru.Gui/ViewModels/Dialogs/SettingsViewModel.cs
View File

@@ -5,7 +5,7 @@ using ReactiveUI;
namespace Aaru.Gui.ViewModels.Dialogs namespace Aaru.Gui.ViewModels.Dialogs
{ {
public class SettingsDialogViewModel : ViewModelBase public class SettingsViewModel : ViewModelBase
{ {
readonly SettingsDialog _view; readonly SettingsDialog _view;
bool _commandStatsChecked; bool _commandStatsChecked;
@@ -24,7 +24,7 @@ namespace Aaru.Gui.ViewModels.Dialogs
int _tabControlSelectedIndex; int _tabControlSelectedIndex;
bool _verifyStatsChecked; bool _verifyStatsChecked;
public SettingsDialogViewModel(SettingsDialog view, bool gdprChange) public SettingsViewModel(SettingsDialog view, bool gdprChange)
{ {
_view = view; _view = view;
GdprVisible = gdprChange; GdprVisible = gdprChange;

4
Aaru.Gui/ViewModels/Dialogs/StatisticsDialogViewModel.cs → Aaru.Gui/ViewModels/Dialogs/StatisticsViewModel.cs
View File

@@ -9,7 +9,7 @@ using ReactiveUI;
namespace Aaru.Gui.ViewModels.Dialogs namespace Aaru.Gui.ViewModels.Dialogs
{ {
public class StatisticsDialogViewModel : ViewModelBase public class StatisticsViewModel : ViewModelBase
{ {
readonly StatisticsDialog _view; readonly StatisticsDialog _view;
@@ -53,7 +53,7 @@ namespace Aaru.Gui.ViewModels.Dialogs
string _verifyText; string _verifyText;
bool _verifyVisible; bool _verifyVisible;
public StatisticsDialogViewModel(StatisticsDialog view) public StatisticsViewModel(StatisticsDialog view)
{ {
_view = view; _view = view;
Filters = new ObservableCollection<NameCountModel>(); Filters = new ObservableCollection<NameCountModel>();

24
Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs
View File

@@ -16,7 +16,7 @@ namespace Aaru.Gui.ViewModels.Panels
{ {
readonly Window _view; readonly Window _view;
readonly DeviceInfo devInfo; readonly DeviceInfo devInfo;
AtaInfoTab _ataInfo; AtaInfo _ataInfo;
string _blockLimits; string _blockLimits;
string _blockSizeGranularity; string _blockSizeGranularity;
string _cid; string _cid;
@@ -48,7 +48,7 @@ namespace Aaru.Gui.ViewModels.Panels
string _minBlockSize; string _minBlockSize;
string _model; string _model;
string _ocr; string _ocr;
PcmciaInfoTab _pcmciaInfo; PcmciaInfo _pcmciaInfo;
bool _plextorBitSetting; bool _plextorBitSetting;
bool _plextorBitSettingDl; bool _plextorBitSettingDl;
string _plextorCdReadTime; string _plextorCdReadTime;
@@ -91,10 +91,10 @@ namespace Aaru.Gui.ViewModels.Panels
string _revision; string _revision;
bool _saveUsbDescriptorsEnabled; bool _saveUsbDescriptorsEnabled;
string _scr; string _scr;
ScsiInfoTab _scsiInfo; ScsiInfo _scsiInfo;
string _scsiType; string _scsiType;
string _sdMm; string _sdMm;
SdMmcInfoTab _sdMmcInfo; SdMmcInfo _sdMmcInfo;
string _secureDigital; string _secureDigital;
string _serial; string _serial;
bool _ssc; bool _ssc;
@@ -145,7 +145,7 @@ namespace Aaru.Gui.ViewModels.Panels
if(devInfo.IsPcmcia) if(devInfo.IsPcmcia)
{ {
PcmciaInfo = new PcmciaInfoTab PcmciaInfo = new PcmciaInfo
{ {
DataContext = new PcmciaInfoViewModel(devInfo.Cis, _view) DataContext = new PcmciaInfoViewModel(devInfo.Cis, _view)
}; };
@@ -154,7 +154,7 @@ namespace Aaru.Gui.ViewModels.Panels
if(devInfo.AtaIdentify != null || if(devInfo.AtaIdentify != null ||
devInfo.AtapiIdentify != null) devInfo.AtapiIdentify != null)
{ {
AtaInfo = new AtaInfoTab AtaInfo = new AtaInfo
{ {
DataContext = DataContext =
new AtaInfoViewModel(devInfo.AtaIdentify, devInfo.AtapiIdentify, devInfo.AtaMcptError, _view) new AtaInfoViewModel(devInfo.AtaIdentify, devInfo.AtapiIdentify, devInfo.AtaMcptError, _view)
@@ -163,7 +163,7 @@ namespace Aaru.Gui.ViewModels.Panels
if(devInfo.ScsiInquiryData != null) if(devInfo.ScsiInquiryData != null)
{ {
ScsiInfo = new ScsiInfoTab ScsiInfo = new ScsiInfo
{ {
DataContext = new ScsiInfoViewModel(devInfo.ScsiInquiryData, devInfo.ScsiInquiry, DataContext = new ScsiInfoViewModel(devInfo.ScsiInquiryData, devInfo.ScsiInquiry,
devInfo.ScsiEvpdPages, devInfo.ScsiMode, devInfo.ScsiType, devInfo.ScsiEvpdPages, devInfo.ScsiMode, devInfo.ScsiType,
@@ -354,7 +354,7 @@ namespace Aaru.Gui.ViewModels.Panels
} }
} }
SdMmcInfo = new SdMmcInfoTab SdMmcInfo = new SdMmcInfo
{ {
DataContext = new SdMmcInfoViewModel(devInfo.Type, devInfo.CID, devInfo.CSD, devInfo.OCR, DataContext = new SdMmcInfoViewModel(devInfo.Type, devInfo.CID, devInfo.CSD, devInfo.OCR,
devInfo.ExtendedCSD, devInfo.SCR) devInfo.ExtendedCSD, devInfo.SCR)
@@ -873,25 +873,25 @@ namespace Aaru.Gui.ViewModels.Panels
set => this.RaiseAndSetIfChanged(ref _scr, value); set => this.RaiseAndSetIfChanged(ref _scr, value);
} }
public PcmciaInfoTab PcmciaInfo public PcmciaInfo PcmciaInfo
{ {
get => _pcmciaInfo; get => _pcmciaInfo;
set => this.RaiseAndSetIfChanged(ref _pcmciaInfo, value); set => this.RaiseAndSetIfChanged(ref _pcmciaInfo, value);
} }
public ScsiInfoTab ScsiInfo public ScsiInfo ScsiInfo
{ {
get => _scsiInfo; get => _scsiInfo;
set => this.RaiseAndSetIfChanged(ref _scsiInfo, value); set => this.RaiseAndSetIfChanged(ref _scsiInfo, value);
} }
public AtaInfoTab AtaInfo public AtaInfo AtaInfo
{ {
get => _ataInfo; get => _ataInfo;
set => this.RaiseAndSetIfChanged(ref _ataInfo, value); set => this.RaiseAndSetIfChanged(ref _ataInfo, value);
} }
public SdMmcInfoTab SdMmcInfo public SdMmcInfo SdMmcInfo
{ {
get => _sdMmcInfo; get => _sdMmcInfo;
set => this.RaiseAndSetIfChanged(ref _sdMmcInfo, value); set => this.RaiseAndSetIfChanged(ref _sdMmcInfo, value);

146
Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs
View File

@@ -33,13 +33,13 @@ namespace Aaru.Gui.ViewModels.Panels
readonly IMediaImage _imageFormat; readonly IMediaImage _imageFormat;
readonly string _imagePath; readonly string _imagePath;
readonly Window _view; readonly Window _view;
DecodeMediaTagsWindow _decodeMediaTagsWindow; DecodeMediaTags _decodeMediaTags;
ImageChecksumWindow _imageChecksumWindow; ImageChecksum _imageChecksum;
ImageConvertWindow _imageConvertWindow; ImageConvert _imageConvert;
ImageEntropyWindow _imageEntropyWindow; ImageEntropy _imageEntropy;
ImageSidecarWindow _imageSidecarWindow; ImageSidecar _imageSidecar;
ImageVerifyWindow _imageVerifyWindow; ImageVerify _imageVerify;
ViewSectorWindow _viewSectorWindow; ViewSector _viewSector;
public ImageInfoViewModel(string imagePath, IFilter filter, IMediaImage imageFormat, Window view) public ImageInfoViewModel(string imagePath, IFilter filter, IMediaImage imageFormat, Window view)
@@ -198,7 +198,7 @@ namespace Aaru.Gui.ViewModels.Panels
scsiMode = Modes.DecodeMode10(scsiModeSense10, scsiDeviceType); scsiMode = Modes.DecodeMode10(scsiModeSense10, scsiDeviceType);
} }
ScsiInfo = new ScsiInfoTab ScsiInfo = new ScsiInfo
{ {
DataContext = new ScsiInfoViewModel(scsiInquiryData, scsiInquiry, null, scsiMode, scsiDeviceType, DataContext = new ScsiInfoViewModel(scsiInquiryData, scsiInquiry, null, scsiMode, scsiDeviceType,
scsiModeSense6, scsiModeSense10, null, _view) scsiModeSense6, scsiModeSense10, null, _view)
@@ -215,7 +215,7 @@ namespace Aaru.Gui.ViewModels.Panels
imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.ATAPI_IDENTIFY)) imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.ATAPI_IDENTIFY))
atapiIdentify = imageFormat.ReadDiskTag(MediaTagType.ATAPI_IDENTIFY); atapiIdentify = imageFormat.ReadDiskTag(MediaTagType.ATAPI_IDENTIFY);
AtaInfo = new AtaInfoTab AtaInfo = new AtaInfo
{ {
DataContext = new AtaInfoViewModel(ataIdentify, atapiIdentify, null, _view) DataContext = new AtaInfoViewModel(ataIdentify, atapiIdentify, null, _view)
}; };
@@ -345,7 +345,7 @@ namespace Aaru.Gui.ViewModels.Panels
mediaCatalogueNumber = Encoding.UTF8.GetString(mcn); mediaCatalogueNumber = Encoding.UTF8.GetString(mcn);
} }
CompactDiscInfo = new CompactDiscInfoTab CompactDiscInfo = new CompactDiscInfo
{ {
DataContext = new CompactDiscInfoViewModel(toc, atip, null, null, fullToc, pma, cdtext, decodedToc, DataContext = new CompactDiscInfoViewModel(toc, atip, null, null, fullToc, pma, cdtext, decodedToc,
decodedAtip, null, decodedFullToc, decodedCdText, null, decodedAtip, null, decodedFullToc, decodedCdText, null,
@@ -382,7 +382,7 @@ namespace Aaru.Gui.ViewModels.Panels
imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.DVD_BCA)) imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.DVD_BCA))
dvdBca = imageFormat.ReadDiskTag(MediaTagType.DVD_BCA); dvdBca = imageFormat.ReadDiskTag(MediaTagType.DVD_BCA);
DvdInfo = new DvdInfoTab DvdInfo = new DvdInfo
{ {
DataContext = new DvdInfoViewModel(imageFormat.Info.MediaType, dvdPfi, dvdDmi, dvdCmi, DataContext = new DvdInfoViewModel(imageFormat.Info.MediaType, dvdPfi, dvdDmi, dvdCmi,
hddvdCopyrightInformation, dvdBca, null, decodedPfi, _view) hddvdCopyrightInformation, dvdBca, null, decodedPfi, _view)
@@ -459,7 +459,7 @@ namespace Aaru.Gui.ViewModels.Panels
imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.DCB)) imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.DCB))
dvdPlusDcb = imageFormat.ReadDiskTag(MediaTagType.DCB); dvdPlusDcb = imageFormat.ReadDiskTag(MediaTagType.DCB);
DvdWritableInfo = new DvdWritableInfoTab DvdWritableInfo = new DvdWritableInfo
{ {
DataContext = new DvdWritableInfoViewModel(imageFormat.Info.MediaType, dvdRamDds, dvdRamCartridgeStatus, DataContext = new DvdWritableInfoViewModel(imageFormat.Info.MediaType, dvdRamDds, dvdRamCartridgeStatus,
dvdRamSpareArea, lastBorderOutRmd, dvdPreRecordedInfo, dvdRamSpareArea, lastBorderOutRmd, dvdPreRecordedInfo,
@@ -506,7 +506,7 @@ namespace Aaru.Gui.ViewModels.Panels
imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.MMC_TrackResourcesInformation)) imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.MMC_TrackResourcesInformation))
bluraySpareAreaInformation = imageFormat.ReadDiskTag(MediaTagType.MMC_TrackResourcesInformation); bluraySpareAreaInformation = imageFormat.ReadDiskTag(MediaTagType.MMC_TrackResourcesInformation);
BlurayInfo = new BlurayInfoTab BlurayInfo = new BlurayInfo
{ {
DataContext = new BlurayInfoViewModel(blurayDiscInformation, blurayBurstCuttingArea, blurayDds, DataContext = new BlurayInfoViewModel(blurayDiscInformation, blurayBurstCuttingArea, blurayDds,
blurayCartridgeStatus, bluraySpareAreaInformation, blurayCartridgeStatus, bluraySpareAreaInformation,
@@ -528,7 +528,7 @@ namespace Aaru.Gui.ViewModels.Panels
decodedXboxSecuritySector = SS.Decode(xboxSecuritySector); decodedXboxSecuritySector = SS.Decode(xboxSecuritySector);
} }
XboxInfo = new XboxInfoTab XboxInfo = new XboxInfo
{ {
DataContext = new XboxInfoViewModel(null, xboxDmi, xboxSecuritySector, decodedXboxSecuritySector, _view) DataContext = new XboxInfoViewModel(null, xboxDmi, xboxSecuritySector, decodedXboxSecuritySector, _view)
}; };
@@ -539,7 +539,7 @@ namespace Aaru.Gui.ViewModels.Panels
imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.PCMCIA_CIS)) imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.PCMCIA_CIS))
pcmciaCis = imageFormat.ReadDiskTag(MediaTagType.PCMCIA_CIS); pcmciaCis = imageFormat.ReadDiskTag(MediaTagType.PCMCIA_CIS);
PcmciaInfo = new PcmciaInfoTab PcmciaInfo = new PcmciaInfo
{ {
DataContext = new PcmciaInfoViewModel(pcmciaCis, _view) DataContext = new PcmciaInfoViewModel(pcmciaCis, _view)
}; };
@@ -607,7 +607,7 @@ namespace Aaru.Gui.ViewModels.Panels
deviceType = DeviceType.MMC; deviceType = DeviceType.MMC;
} }
SdMmcInfo = new SdMmcInfoTab SdMmcInfo = new SdMmcInfo
{ {
DataContext = new SdMmcInfoViewModel(deviceType, cid, csd, ocr, extendedCsd, scr) DataContext = new SdMmcInfoViewModel(deviceType, cid, csd, ocr, extendedCsd, scr)
}; };
@@ -654,15 +654,15 @@ namespace Aaru.Gui.ViewModels.Panels
} }
} }
public ScsiInfoTab ScsiInfo { get; } public ScsiInfo ScsiInfo { get; }
public AtaInfoTab AtaInfo { get; } public AtaInfo AtaInfo { get; }
public CompactDiscInfoTab CompactDiscInfo { get; } public CompactDiscInfo CompactDiscInfo { get; }
public DvdInfoTab DvdInfo { get; } public DvdInfo DvdInfo { get; }
public DvdWritableInfoTab DvdWritableInfo { get; } public DvdWritableInfo DvdWritableInfo { get; }
public BlurayInfoTab BlurayInfo { get; } public BlurayInfo BlurayInfo { get; }
public XboxInfoTab XboxInfo { get; } public XboxInfo XboxInfo { get; }
public PcmciaInfoTab PcmciaInfo { get; } public PcmciaInfo PcmciaInfo { get; }
public SdMmcInfoTab SdMmcInfo { get; } public SdMmcInfo SdMmcInfo { get; }
public Bitmap MediaLogo { get; } public Bitmap MediaLogo { get; }
public string ImagePathText { get; } public string ImagePathText { get; }
public string FilterText { get; } public string FilterText { get; }
@@ -712,149 +712,149 @@ namespace Aaru.Gui.ViewModels.Panels
protected void ExecuteEntropyCommand() protected void ExecuteEntropyCommand()
{ {
if(_imageEntropyWindow != null) if(_imageEntropy != null)
{ {
_imageEntropyWindow.Show(); _imageEntropy.Show();
return; return;
} }
_imageEntropyWindow = new ImageEntropyWindow(); _imageEntropy = new ImageEntropy();
_imageEntropyWindow.DataContext = new ImageEntropyViewModel(_imageFormat, _imageEntropyWindow); _imageEntropy.DataContext = new ImageEntropyViewModel(_imageFormat, _imageEntropy);
_imageEntropyWindow.Closed += (sender, args) => _imageEntropy.Closed += (sender, args) =>
{ {
_imageEntropyWindow = null; _imageEntropy = null;
}; };
_imageEntropyWindow.Show(); _imageEntropy.Show();
} }
protected void ExecuteVerifyCommand() protected void ExecuteVerifyCommand()
{ {
if(_imageVerifyWindow != null) if(_imageVerify != null)
{ {
_imageVerifyWindow.Show(); _imageVerify.Show();
return; return;
} }
_imageVerifyWindow = new ImageVerifyWindow(); _imageVerify = new ImageVerify();
_imageVerifyWindow.DataContext = new ImageVerifyViewModel(_imageFormat, _imageVerifyWindow); _imageVerify.DataContext = new ImageVerifyViewModel(_imageFormat, _imageVerify);
_imageVerifyWindow.Closed += (sender, args) => _imageVerify.Closed += (sender, args) =>
{ {
_imageVerifyWindow = null; _imageVerify = null;
}; };
_imageVerifyWindow.Show(); _imageVerify.Show();
} }
protected void ExecuteChecksumCommand() protected void ExecuteChecksumCommand()
{ {
if(_imageChecksumWindow != null) if(_imageChecksum != null)
{ {
_imageChecksumWindow.Show(); _imageChecksum.Show();
return; return;
} }
_imageChecksumWindow = new ImageChecksumWindow(); _imageChecksum = new ImageChecksum();
_imageChecksumWindow.DataContext = new ImageChecksumViewModel(_imageFormat, _imageChecksumWindow); _imageChecksum.DataContext = new ImageChecksumViewModel(_imageFormat, _imageChecksum);
_imageChecksumWindow.Closed += (sender, args) => _imageChecksum.Closed += (sender, args) =>
{ {
_imageChecksumWindow = null; _imageChecksum = null;
}; };
_imageChecksumWindow.Show(); _imageChecksum.Show();
} }
protected void ExecuteConvertCommand() protected void ExecuteConvertCommand()
{ {
if(_imageConvertWindow != null) if(_imageConvert != null)
{ {
_imageConvertWindow.Show(); _imageConvert.Show();
return; return;
} }
_imageConvertWindow = new ImageConvertWindow(); _imageConvert = new ImageConvert();
_imageConvertWindow.DataContext = new ImageConvertViewModel(_imageFormat, _imagePath, _imageConvertWindow); _imageConvert.DataContext = new ImageConvertViewModel(_imageFormat, _imagePath, _imageConvert);
_imageConvertWindow.Closed += (sender, args) => _imageConvert.Closed += (sender, args) =>
{ {
_imageConvertWindow = null; _imageConvert = null;
}; };
_imageConvertWindow.Show(); _imageConvert.Show();
} }
protected void ExecuteCreateSidecarCommand() protected void ExecuteCreateSidecarCommand()
{ {
if(_imageSidecarWindow != null) if(_imageSidecar != null)
{ {
_imageSidecarWindow.Show(); _imageSidecar.Show();
return; return;
} }
_imageSidecarWindow = new ImageSidecarWindow(); _imageSidecar = new ImageSidecar();
// TODO: Pass thru chosen default encoding // TODO: Pass thru chosen default encoding
_imageSidecarWindow.DataContext = _imageSidecar.DataContext =
new ImageSidecarViewModel(_imageFormat, _imagePath, _filter.Id, null, _imageSidecarWindow); new ImageSidecarViewModel(_imageFormat, _imagePath, _filter.Id, null, _imageSidecar);
_imageSidecarWindow.Closed += (sender, args) => _imageSidecar.Closed += (sender, args) =>
{ {
_imageSidecarWindow = null; _imageSidecar = null;
}; };
_imageSidecarWindow.Show(); _imageSidecar.Show();
} }
protected void ExecuteViewSectorsCommand() protected void ExecuteViewSectorsCommand()
{ {
if(_viewSectorWindow != null) if(_viewSector != null)
{ {
_viewSectorWindow.Show(); _viewSector.Show();
return; return;
} }
_viewSectorWindow = new ViewSectorWindow _viewSector = new ViewSector
{ {
DataContext = new ViewSectorViewModel(_imageFormat) DataContext = new ViewSectorViewModel(_imageFormat)
}; };
_viewSectorWindow.Closed += (sender, args) => _viewSector.Closed += (sender, args) =>
{ {
_viewSectorWindow = null; _viewSector = null;
}; };
_viewSectorWindow.Show(); _viewSector.Show();
} }
protected void ExecuteDecodeMediaTagCommand() protected void ExecuteDecodeMediaTagCommand()
{ {
if(_decodeMediaTagsWindow != null) if(_decodeMediaTags != null)
{ {
_decodeMediaTagsWindow.Show(); _decodeMediaTags.Show();
return; return;
} }
_decodeMediaTagsWindow = new DecodeMediaTagsWindow _decodeMediaTags = new DecodeMediaTags
{ {
DataContext = new DecodeMediaTagsViewModel(_imageFormat) DataContext = new DecodeMediaTagsViewModel(_imageFormat)
}; };
_decodeMediaTagsWindow.Closed += (sender, args) => _decodeMediaTags.Closed += (sender, args) =>
{ {
_decodeMediaTagsWindow = null; _decodeMediaTags = null;
}; };
_decodeMediaTagsWindow.Show(); _decodeMediaTags.Show();
} }
} }
} }

36
Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs
View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Reactive; using System.Reactive;
using System.Text; using System.Text;
using Aaru.Core.Media.Info;
using Aaru.Gui.ViewModels.Tabs; using Aaru.Gui.ViewModels.Tabs;
using Aaru.Gui.ViewModels.Windows; using Aaru.Gui.ViewModels.Windows;
using Aaru.Gui.Views.Tabs; using Aaru.Gui.Views.Tabs;
@@ -15,6 +14,7 @@ using Avalonia.Platform;
using MessageBox.Avalonia; using MessageBox.Avalonia;
using MessageBox.Avalonia.Enums; using MessageBox.Avalonia.Enums;
using ReactiveUI; using ReactiveUI;
using ScsiInfo = Aaru.Core.Media.Info.ScsiInfo;
namespace Aaru.Gui.ViewModels.Panels namespace Aaru.Gui.ViewModels.Panels
{ {
@@ -23,11 +23,11 @@ namespace Aaru.Gui.ViewModels.Panels
readonly string _devicePath; readonly string _devicePath;
readonly ScsiInfo _scsiInfo; readonly ScsiInfo _scsiInfo;
readonly Window _view; readonly Window _view;
BlurayInfoTab _blurayInfo; BlurayInfo _blurayInfo;
CompactDiscInfoTab _compactDiscInfo; CompactDiscInfo _compactDiscInfo;
string _densitySupport; string _densitySupport;
DvdInfoTab _dvdInfo; DvdInfo _dvdInfo;
DvdWritableInfoTab _dvdWritableInfo; DvdWritableInfo _dvdWritableInfo;
string _generalVisible; string _generalVisible;
Bitmap _mediaLogo; Bitmap _mediaLogo;
string _mediaSerial; string _mediaSerial;
@@ -44,7 +44,7 @@ namespace Aaru.Gui.ViewModels.Panels
bool _saveRecognizedFormatLayersVisible; bool _saveRecognizedFormatLayersVisible;
bool _saveWriteProtectionStatusVisible; bool _saveWriteProtectionStatusVisible;
bool _sscVisible; bool _sscVisible;
XboxInfoTab _xboxInfo; XboxInfo _xboxInfo;
public MediaInfoViewModel(ScsiInfo scsiInfo, string devicePath, Window view) public MediaInfoViewModel(ScsiInfo scsiInfo, string devicePath, Window view)
{ {
@@ -106,7 +106,7 @@ namespace Aaru.Gui.ViewModels.Panels
SscVisible = SaveDensitySupportVisible || SaveMediumSupportVisible; SscVisible = SaveDensitySupportVisible || SaveMediumSupportVisible;
CompactDiscInfo = new CompactDiscInfoTab CompactDiscInfo = new CompactDiscInfo
{ {
DataContext = new CompactDiscInfoViewModel(scsiInfo.Toc, scsiInfo.Atip, scsiInfo.CompactDiscInformation, DataContext = new CompactDiscInfoViewModel(scsiInfo.Toc, scsiInfo.Atip, scsiInfo.CompactDiscInformation,
scsiInfo.Session, scsiInfo.RawToc, scsiInfo.Pma, scsiInfo.Session, scsiInfo.RawToc, scsiInfo.Pma,
@@ -117,20 +117,20 @@ namespace Aaru.Gui.ViewModels.Panels
scsiInfo.Isrcs, _view) scsiInfo.Isrcs, _view)
}; };
DvdInfo = new DvdInfoTab DvdInfo = new DvdInfo
{ {
DataContext = new DvdInfoViewModel(scsiInfo.MediaType, scsiInfo.DvdPfi, scsiInfo.DvdDmi, DataContext = new DvdInfoViewModel(scsiInfo.MediaType, scsiInfo.DvdPfi, scsiInfo.DvdDmi,
scsiInfo.DvdCmi, scsiInfo.HddvdCopyrightInformation, scsiInfo.DvdBca, scsiInfo.DvdCmi, scsiInfo.HddvdCopyrightInformation, scsiInfo.DvdBca,
scsiInfo.DvdAacs, scsiInfo.DecodedPfi, _view) scsiInfo.DvdAacs, scsiInfo.DecodedPfi, _view)
}; };
XboxInfo = new XboxInfoTab XboxInfo = new XboxInfo
{ {
DataContext = new XboxInfoViewModel(scsiInfo.XgdInfo, scsiInfo.DvdDmi, scsiInfo.XboxSecuritySector, DataContext = new XboxInfoViewModel(scsiInfo.XgdInfo, scsiInfo.DvdDmi, scsiInfo.XboxSecuritySector,
scsiInfo.DecodedXboxSecuritySector, _view) scsiInfo.DecodedXboxSecuritySector, _view)
}; };
DvdWritableInfo = new DvdWritableInfoTab DvdWritableInfo = new DvdWritableInfo
{ {
DataContext = new DvdWritableInfoViewModel(scsiInfo.MediaType, scsiInfo.DvdRamDds, DataContext = new DvdWritableInfoViewModel(scsiInfo.MediaType, scsiInfo.DvdRamDds,
scsiInfo.DvdRamCartridgeStatus, scsiInfo.DvdRamSpareArea, scsiInfo.DvdRamCartridgeStatus, scsiInfo.DvdRamSpareArea,
@@ -145,7 +145,7 @@ namespace Aaru.Gui.ViewModels.Panels
scsiInfo.DvdPlusDcb, _view) scsiInfo.DvdPlusDcb, _view)
}; };
BlurayInfo = new BlurayInfoTab BlurayInfo = new BlurayInfo
{ {
DataContext = new BlurayInfoViewModel(scsiInfo.BlurayDiscInformation, scsiInfo.BlurayBurstCuttingArea, DataContext = new BlurayInfoViewModel(scsiInfo.BlurayDiscInformation, scsiInfo.BlurayBurstCuttingArea,
scsiInfo.BlurayDds, scsiInfo.BlurayCartridgeStatus, scsiInfo.BlurayDds, scsiInfo.BlurayCartridgeStatus,
@@ -268,31 +268,31 @@ namespace Aaru.Gui.ViewModels.Panels
set => this.RaiseAndSetIfChanged(ref _saveMediumSupportVisible, value); set => this.RaiseAndSetIfChanged(ref _saveMediumSupportVisible, value);
} }
public CompactDiscInfoTab CompactDiscInfo public CompactDiscInfo CompactDiscInfo
{ {
get => _compactDiscInfo; get => _compactDiscInfo;
set => this.RaiseAndSetIfChanged(ref _compactDiscInfo, value); set => this.RaiseAndSetIfChanged(ref _compactDiscInfo, value);
} }
public DvdInfoTab DvdInfo public DvdInfo DvdInfo
{ {
get => _dvdInfo; get => _dvdInfo;
set => this.RaiseAndSetIfChanged(ref _dvdInfo, value); set => this.RaiseAndSetIfChanged(ref _dvdInfo, value);
} }
public DvdWritableInfoTab DvdWritableInfo public DvdWritableInfo DvdWritableInfo
{ {
get => _dvdWritableInfo; get => _dvdWritableInfo;
set => this.RaiseAndSetIfChanged(ref _dvdWritableInfo, value); set => this.RaiseAndSetIfChanged(ref _dvdWritableInfo, value);
} }
public XboxInfoTab XboxInfo public XboxInfo XboxInfo
{ {
get => _xboxInfo; get => _xboxInfo;
set => this.RaiseAndSetIfChanged(ref _xboxInfo, value); set => this.RaiseAndSetIfChanged(ref _xboxInfo, value);
} }
public BlurayInfoTab BlurayInfo public BlurayInfo BlurayInfo
{ {
get => _blurayInfo; get => _blurayInfo;
set => this.RaiseAndSetIfChanged(ref _blurayInfo, value); set => this.RaiseAndSetIfChanged(ref _blurayInfo, value);
@@ -361,7 +361,7 @@ namespace Aaru.Gui.ViewModels.Panels
return; return;
} }
var mediaDumpWindow = new MediaDumpWindow(); var mediaDumpWindow = new MediaDump();
mediaDumpWindow.DataContext = mediaDumpWindow.DataContext =
new MediaDumpViewModel(_devicePath, _scsiInfo.DeviceInfo, mediaDumpWindow, _scsiInfo); new MediaDumpViewModel(_devicePath, _scsiInfo.DeviceInfo, mediaDumpWindow, _scsiInfo);
@@ -393,7 +393,7 @@ namespace Aaru.Gui.ViewModels.Panels
return; return;
} }
var mediaScanWindow = new MediaScanWindow(); var mediaScanWindow = new MediaScan();
mediaScanWindow.DataContext = mediaScanWindow.DataContext =
new MediaScanViewModel(_devicePath, _scsiInfo.DeviceInfo, mediaScanWindow, _scsiInfo); new MediaScanViewModel(_devicePath, _scsiInfo.DeviceInfo, mediaScanWindow, _scsiInfo);

61
Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
View File

@@ -31,6 +31,8 @@ using MessageBox.Avalonia;
using MessageBox.Avalonia.Enums; using MessageBox.Avalonia.Enums;
using ReactiveUI; using ReactiveUI;
using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
using ImageInfo = Aaru.Gui.Views.Panels.ImageInfo;
using Partition = Aaru.Gui.Views.Panels.Partition;
using PlatformID = Aaru.CommonTypes.Interop.PlatformID; using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
namespace Aaru.Gui.ViewModels.Windows namespace Aaru.Gui.ViewModels.Windows
@@ -50,7 +52,7 @@ namespace Aaru.Gui.ViewModels.Windows
readonly Bitmap _usbIcon; readonly Bitmap _usbIcon;
readonly MainWindow _view; readonly MainWindow _view;
ConsoleWindow _consoleWindow; Views.Dialogs.Console _console;
object _contentPanel; object _contentPanel;
bool _devicesSupported; bool _devicesSupported;
object _treeViewSelectedItem; object _treeViewSelectedItem;
@@ -179,28 +181,28 @@ namespace Aaru.Gui.ViewModels.Windows
switch(value) switch(value)
{ {
case ImageModel imageModel: case ImageModel imageModel:
ContentPanel = new ImageInfoPanel ContentPanel = new ImageInfo
{ {
DataContext = imageModel.ViewModel DataContext = imageModel.ViewModel
}; };
break; break;
case PartitionModel partitionModel: case PartitionModel partitionModel:
ContentPanel = new PartitionPanel ContentPanel = new Partition
{ {
DataContext = partitionModel.ViewModel DataContext = partitionModel.ViewModel
}; };
break; break;
case FileSystemModel fileSystemModel: case FileSystemModel fileSystemModel:
ContentPanel = new FileSystemPanel ContentPanel = new FileSystem
{ {
DataContext = fileSystemModel.ViewModel DataContext = fileSystemModel.ViewModel
}; };
break; break;
case SubdirectoryModel subdirectoryModel: case SubdirectoryModel subdirectoryModel:
ContentPanel = new SubdirectoryPanel ContentPanel = new Subdirectory
{ {
DataContext = new SubdirectoryViewModel(subdirectoryModel, _view) DataContext = new SubdirectoryViewModel(subdirectoryModel, _view)
}; };
@@ -275,7 +277,7 @@ namespace Aaru.Gui.ViewModels.Windows
} }
} }
ContentPanel = new DeviceInfoPanel ContentPanel = new Views.Panels.DeviceInfo
{ {
DataContext = deviceModel.ViewModel DataContext = deviceModel.ViewModel
}; };
@@ -293,7 +295,7 @@ namespace Aaru.Gui.ViewModels.Windows
case MediaModel mediaModel: case MediaModel mediaModel:
{ {
if(mediaModel.ViewModel != null) if(mediaModel.ViewModel != null)
ContentPanel = new MediaInfoPanel ContentPanel = new MediaInfo
{ {
DataContext = mediaModel.ViewModel DataContext = mediaModel.ViewModel
}; };
@@ -309,7 +311,7 @@ namespace Aaru.Gui.ViewModels.Windows
if(!(TreeViewSelectedItem is ImageModel imageModel)) if(!(TreeViewSelectedItem is ImageModel imageModel))
return; return;
var imageEntropyWindow = new ImageEntropyWindow(); var imageEntropyWindow = new ImageEntropy();
imageEntropyWindow.DataContext = new ImageEntropyViewModel(imageModel.Image, imageEntropyWindow); imageEntropyWindow.DataContext = new ImageEntropyViewModel(imageModel.Image, imageEntropyWindow);
imageEntropyWindow.Closed += (sender, args) => imageEntropyWindow.Closed += (sender, args) =>
@@ -325,7 +327,7 @@ namespace Aaru.Gui.ViewModels.Windows
if(!(TreeViewSelectedItem is ImageModel imageModel)) if(!(TreeViewSelectedItem is ImageModel imageModel))
return; return;
var imageVerifyWindow = new ImageVerifyWindow(); var imageVerifyWindow = new ImageVerify();
imageVerifyWindow.DataContext = new ImageVerifyViewModel(imageModel.Image, imageVerifyWindow); imageVerifyWindow.DataContext = new ImageVerifyViewModel(imageModel.Image, imageVerifyWindow);
imageVerifyWindow.Closed += (sender, args) => imageVerifyWindow.Closed += (sender, args) =>
@@ -341,7 +343,7 @@ namespace Aaru.Gui.ViewModels.Windows
if(!(TreeViewSelectedItem is ImageModel imageModel)) if(!(TreeViewSelectedItem is ImageModel imageModel))
return; return;
var imageChecksumWindow = new ImageChecksumWindow(); var imageChecksumWindow = new ImageChecksum();
imageChecksumWindow.DataContext = new ImageChecksumViewModel(imageModel.Image, imageChecksumWindow); imageChecksumWindow.DataContext = new ImageChecksumViewModel(imageModel.Image, imageChecksumWindow);
imageChecksumWindow.Closed += (sender, args) => imageChecksumWindow.Closed += (sender, args) =>
@@ -357,7 +359,7 @@ namespace Aaru.Gui.ViewModels.Windows
if(!(TreeViewSelectedItem is ImageModel imageModel)) if(!(TreeViewSelectedItem is ImageModel imageModel))
return; return;
var imageConvertWindow = new ImageConvertWindow(); var imageConvertWindow = new ImageConvert();
imageConvertWindow.DataContext = imageConvertWindow.DataContext =
new ImageConvertViewModel(imageModel.Image, imageModel.Path, imageConvertWindow); new ImageConvertViewModel(imageModel.Image, imageModel.Path, imageConvertWindow);
@@ -375,7 +377,7 @@ namespace Aaru.Gui.ViewModels.Windows
if(!(TreeViewSelectedItem is ImageModel imageModel)) if(!(TreeViewSelectedItem is ImageModel imageModel))
return; return;
var imageSidecarWindow = new ImageSidecarWindow(); var imageSidecarWindow = new ImageSidecar();
// TODO: Pass thru chosen default encoding // TODO: Pass thru chosen default encoding
imageSidecarWindow.DataContext = imageSidecarWindow.DataContext =
@@ -390,7 +392,7 @@ namespace Aaru.Gui.ViewModels.Windows
if(!(TreeViewSelectedItem is ImageModel imageModel)) if(!(TreeViewSelectedItem is ImageModel imageModel))
return; return;
new ViewSectorWindow new ViewSector
{ {
DataContext = new ViewSectorViewModel(imageModel.Image) DataContext = new ViewSectorViewModel(imageModel.Image)
}.Show(); }.Show();
@@ -401,7 +403,7 @@ namespace Aaru.Gui.ViewModels.Windows
if(!(TreeViewSelectedItem is ImageModel imageModel)) if(!(TreeViewSelectedItem is ImageModel imageModel))
return; return;
new DecodeMediaTagsWindow new DecodeMediaTags
{ {
DataContext = new DecodeMediaTagsViewModel(imageModel.Image) DataContext = new DecodeMediaTagsViewModel(imageModel.Image)
}.Show(); }.Show();
@@ -409,22 +411,22 @@ namespace Aaru.Gui.ViewModels.Windows
internal void ExecuteAboutCommand() internal void ExecuteAboutCommand()
{ {
var dialog = new AboutDialog(); var dialog = new About();
dialog.DataContext = new AboutDialogViewModel(dialog); dialog.DataContext = new AboutViewModel(dialog);
dialog.ShowDialog(_view); dialog.ShowDialog(_view);
} }
void ExecuteEncodingsCommand() void ExecuteEncodingsCommand()
{ {
var dialog = new EncodingsDialog(); var dialog = new Encodings();
dialog.DataContext = new EncodingsDialogViewModel(dialog); dialog.DataContext = new EncodingsViewModel(dialog);
dialog.ShowDialog(_view); dialog.ShowDialog(_view);
} }
void ExecutePluginsCommand() void ExecutePluginsCommand()
{ {
var dialog = new PluginsDialog(); var dialog = new PluginsDialog();
dialog.DataContext = new PluginsDialogViewModel(dialog); dialog.DataContext = new PluginsViewModel(dialog);
dialog.ShowDialog(_view); dialog.ShowDialog(_view);
} }
@@ -446,14 +448,14 @@ namespace Aaru.Gui.ViewModels.Windows
} }
var dialog = new StatisticsDialog(); var dialog = new StatisticsDialog();
dialog.DataContext = new StatisticsDialogViewModel(dialog); dialog.DataContext = new StatisticsViewModel(dialog);
dialog.ShowDialog(_view); dialog.ShowDialog(_view);
} }
internal async void ExecuteSettingsCommand() internal async void ExecuteSettingsCommand()
{ {
var dialog = new SettingsDialog(); var dialog = new SettingsDialog();
dialog.DataContext = new SettingsDialogViewModel(dialog, false); dialog.DataContext = new SettingsViewModel(dialog, false);
await dialog.ShowDialog(_view); await dialog.ShowDialog(_view);
} }
@@ -462,13 +464,13 @@ namespace Aaru.Gui.ViewModels.Windows
void ExecuteConsoleCommand() void ExecuteConsoleCommand()
{ {
if(_consoleWindow is null) if(_console is null)
{ {
_consoleWindow = new ConsoleWindow(); _console = new Views.Dialogs.Console();
_consoleWindow.DataContext = new ConsoleWindowViewModel(_consoleWindow); _console.DataContext = new ConsoleViewModel(_console);
} }
_consoleWindow.Show(); _console.Show();
} }
async void ExecuteOpenCommand() async void ExecuteOpenCommand()
@@ -539,7 +541,7 @@ namespace Aaru.Gui.ViewModels.Windows
Filter = inputFilter Filter = inputFilter
}; };
List<Partition> partitions = Core.Partitions.GetAll(imageFormat); List<CommonTypes.Partition> partitions = Core.Partitions.GetAll(imageFormat);
Core.Partitions.AddSchemesToStats(partitions); Core.Partitions.AddSchemesToStats(partitions);
bool checkRaw = false; bool checkRaw = false;
@@ -565,8 +567,9 @@ namespace Aaru.Gui.ViewModels.Windows
Name = scheme Name = scheme
}; };
foreach(Partition partition in partitions. foreach(CommonTypes.Partition partition in partitions.
Where(p => p.Scheme == scheme).OrderBy(p => p.Start)) Where(p => p.Scheme == scheme).
OrderBy(p => p.Start))
{ {
var partitionModel = new PartitionModel var partitionModel = new PartitionModel
{ {
@@ -636,7 +639,7 @@ namespace Aaru.Gui.ViewModels.Windows
if(checkRaw) if(checkRaw)
{ {
var wholePart = new Partition var wholePart = new CommonTypes.Partition
{ {
Name = "Whole device", Length = imageFormat.Info.Sectors, Name = "Whole device", Length = imageFormat.Info.Sectors,
Size = imageFormat.Info.Sectors * imageFormat.Info.SectorSize Size = imageFormat.Info.Sectors * imageFormat.Info.SectorSize

2
Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs
View File

@@ -149,7 +149,7 @@ namespace Aaru.Gui.ViewModels.Windows
if(Settings.Settings.Current.GdprCompliance < DicSettings.GdprLevel) if(Settings.Settings.Current.GdprCompliance < DicSettings.GdprLevel)
{ {
var settingsDialog = new SettingsDialog(); var settingsDialog = new SettingsDialog();
var settingsDialogViewModel = new SettingsDialogViewModel(settingsDialog, true); var settingsDialogViewModel = new SettingsViewModel(settingsDialog, true);
settingsDialog.DataContext = settingsDialogViewModel; settingsDialog.DataContext = settingsDialogViewModel;
await settingsDialog.ShowDialog(_view); await settingsDialog.ShowDialog(_view);
} }

4
Aaru.Gui/Views/Dialogs/AboutDialog.xaml → Aaru.Gui/Views/Dialogs/About.xaml
View File

@@ -2,10 +2,10 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800" xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800"
d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Dialogs.AboutDialog" d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Dialogs.About"
Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}"> Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<dialogs:AboutDialogViewModel /> <dialogs:AboutViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid>

4
Aaru.Gui/Views/Dialogs/AboutDialog.xaml.cs → Aaru.Gui/Views/Dialogs/About.xaml.cs
View File

@@ -4,9 +4,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Dialogs namespace Aaru.Gui.Views.Dialogs
{ {
public class AboutDialog : Window public class About : Window
{ {
public AboutDialog() public About()
{ {
InitializeComponent(); InitializeComponent();
#if DEBUG #if DEBUG

4
Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml → Aaru.Gui/Views/Dialogs/Console.xaml
View File

@@ -2,10 +2,10 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800" xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800"
d:DesignHeight="450" Width="600" Height="450" x:Class="Aaru.Gui.Views.Dialogs.ConsoleWindow" d:DesignHeight="450" Width="600" Height="450" x:Class="Aaru.Gui.Views.Dialogs.Console"
Icon="/Assets/aaru-logo.png" Title="{Binding Title}"> Icon="/Assets/aaru-logo.png" Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<dialogs:ConsoleWindowViewModel /> <dialogs:ConsoleViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid>

4
Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml.cs → Aaru.Gui/Views/Dialogs/Console.xaml.cs
View File

@@ -5,9 +5,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Dialogs namespace Aaru.Gui.Views.Dialogs
{ {
public class ConsoleWindow : Window public class Console : Window
{ {
public ConsoleWindow() public Console()
{ {
InitializeComponent(); InitializeComponent();
#if DEBUG #if DEBUG

4
Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml → Aaru.Gui/Views/Dialogs/Encodings.xaml
View File

@@ -35,10 +35,10 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800" xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800"
d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Dialogs.EncodingsDialog" d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Dialogs.Encodings"
Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}"> Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<dialogs:EncodingsDialogViewModel /> <dialogs:EncodingsViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">

4
Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml.cs → Aaru.Gui/Views/Dialogs/Encodings.xaml.cs
View File

@@ -4,9 +4,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Dialogs namespace Aaru.Gui.Views.Dialogs
{ {
public class EncodingsDialog : Window public class Encodings : Window
{ {
public EncodingsDialog() public Encodings()
{ {
InitializeComponent(); InitializeComponent();
#if DEBUG #if DEBUG

2
Aaru.Gui/Views/Dialogs/LicenseDialog.xaml
View File

@@ -5,7 +5,7 @@
d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Dialogs.LicenseDialog" d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Dialogs.LicenseDialog"
Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}"> Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<dialogs:LicenseDialogViewModel /> <dialogs:LicenseViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">

2
Aaru.Gui/Views/Dialogs/PluginsDialog.xaml
View File

@@ -38,7 +38,7 @@
d:DesignHeight="450" Width="600" Height="450" x:Class="Aaru.Gui.Views.Dialogs.PluginsDialog" d:DesignHeight="450" Width="600" Height="450" x:Class="Aaru.Gui.Views.Dialogs.PluginsDialog"
Icon="/Assets/aaru-logo.png" Title="{Binding Title}" Padding="10"> Icon="/Assets/aaru-logo.png" Title="{Binding Title}" Padding="10">
<Design.DataContext> <Design.DataContext>
<dialogs:PluginsDialogViewModel /> <dialogs:PluginsViewModel />
</Design.DataContext> </Design.DataContext>
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<Grid.RowDefinitions> <Grid.RowDefinitions>

2
Aaru.Gui/Views/Dialogs/SettingsDialog.xaml
View File

@@ -5,7 +5,7 @@
d:DesignHeight="450" Width="675" Height="432" x:Class="Aaru.Gui.Views.Dialogs.SettingsDialog" d:DesignHeight="450" Width="675" Height="432" x:Class="Aaru.Gui.Views.Dialogs.SettingsDialog"
Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}"> Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<dialogs:SettingsDialogViewModel /> <dialogs:SettingsViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid>

2
Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml
View File

@@ -5,7 +5,7 @@
d:DesignHeight="450" Width="550" Height="320" x:Class="Aaru.Gui.Views.Dialogs.StatisticsDialog" d:DesignHeight="450" Width="550" Height="320" x:Class="Aaru.Gui.Views.Dialogs.StatisticsDialog"
Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}"> Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<dialogs:StatisticsDialogViewModel /> <dialogs:StatisticsViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid>

2
Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml → Aaru.Gui/Views/Panels/DeviceInfo.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" 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"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.DeviceInfo">
<Design.DataContext> <Design.DataContext>
<panels:DeviceInfoViewModel /> <panels:DeviceInfoViewModel />
</Design.DataContext> </Design.DataContext>

4
Aaru.Gui/Views/Panels/MediaInfoPanel.xaml.cs → Aaru.Gui/Views/Panels/DeviceInfo.xaml.cs
View File

@@ -3,9 +3,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Panels namespace Aaru.Gui.Views.Panels
{ {
public class MediaInfoPanel : UserControl public class DeviceInfo : UserControl
{ {
public MediaInfoPanel() => InitializeComponent(); public DeviceInfo() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this); void InitializeComponent() => AvaloniaXamlLoader.Load(this);
} }

12
Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml.cs
View File

@@ -1,12 +0,0 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Panels
{
public class DeviceInfoPanel : UserControl
{
public DeviceInfoPanel() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this);
}
}

2
Aaru.Gui/Views/Panels/FileSystemPanel.xaml → Aaru.Gui/Views/Panels/FileSystem.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" 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"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.FileSystem">
<Design.DataContext> <Design.DataContext>
<panels:FileSystemViewModel /> <panels:FileSystemViewModel />
</Design.DataContext> </Design.DataContext>

4
Aaru.Gui/Views/Panels/ImageInfoPanel.xaml.cs → Aaru.Gui/Views/Panels/FileSystem.xaml.cs
View File

@@ -3,9 +3,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Panels namespace Aaru.Gui.Views.Panels
{ {
public class ImageInfoPanel : UserControl public class FileSystem : UserControl
{ {
public ImageInfoPanel() => InitializeComponent(); public FileSystem() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this); void InitializeComponent() => AvaloniaXamlLoader.Load(this);
} }

2
Aaru.Gui/Views/Panels/ImageInfoPanel.xaml → Aaru.Gui/Views/Panels/ImageInfo.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" 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"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.ImageInfo">
<Design.DataContext> <Design.DataContext>
<panels:ImageInfoViewModel /> <panels:ImageInfoViewModel />
</Design.DataContext> </Design.DataContext>

4
Aaru.Gui/Views/Panels/PartitionPanel.xaml.cs → Aaru.Gui/Views/Panels/ImageInfo.xaml.cs
View File

@@ -3,9 +3,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Panels namespace Aaru.Gui.Views.Panels
{ {
public class PartitionPanel : UserControl public class ImageInfo : UserControl
{ {
public PartitionPanel() => InitializeComponent(); public ImageInfo() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this); void InitializeComponent() => AvaloniaXamlLoader.Load(this);
} }

2
Aaru.Gui/Views/Panels/MediaInfoPanel.xaml → Aaru.Gui/Views/Panels/MediaInfo.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" 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"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.MediaInfo">
<Design.DataContext> <Design.DataContext>
<panels:MediaInfoViewModel /> <panels:MediaInfoViewModel />
</Design.DataContext> </Design.DataContext>

4
Aaru.Gui/Views/Panels/FileSystemPanel.xaml.cs → Aaru.Gui/Views/Panels/MediaInfo.xaml.cs
View File

@@ -3,9 +3,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Panels namespace Aaru.Gui.Views.Panels
{ {
public class FileSystemPanel : UserControl public class MediaInfo : UserControl
{ {
public FileSystemPanel() => InitializeComponent(); public MediaInfo() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this); void InitializeComponent() => AvaloniaXamlLoader.Load(this);
} }

2
Aaru.Gui/Views/Panels/PartitionPanel.xaml → Aaru.Gui/Views/Panels/Partition.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" 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"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.Partition">
<Design.DataContext> <Design.DataContext>
<panels:PartitionViewModel /> <panels:PartitionViewModel />
</Design.DataContext> </Design.DataContext>

12
Aaru.Gui/Views/Panels/Partition.xaml.cs Normal file
View File

@@ -0,0 +1,12 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Panels
{
public class Partition : UserControl
{
public Partition() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this);
}
}

3
Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml → Aaru.Gui/Views/Panels/Subdirectory.xaml
View File

@@ -2,8 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.Subdirectory">
x:Class="Aaru.Gui.Views.Panels.SubdirectoryPanel">
<Design.DataContext> <Design.DataContext>
<panels:SubdirectoryViewModel /> <panels:SubdirectoryViewModel />
</Design.DataContext> </Design.DataContext>

12
Aaru.Gui/Views/Panels/Subdirectory.xaml.cs Normal file
View File

@@ -0,0 +1,12 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Panels
{
public class Subdirectory : UserControl
{
public Subdirectory() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this);
}
}

12
Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml.cs
View File

@@ -1,12 +0,0 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Panels
{
public class SubdirectoryPanel : UserControl
{
public SubdirectoryPanel() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this);
}
}

2
Aaru.Gui/Views/Tabs/AtaInfoTab.xaml → Aaru.Gui/Views/Tabs/AtaInfo.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" 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"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.AtaInfo">
<Design.DataContext> <Design.DataContext>
<tabs:AtaInfoViewModel /> <tabs:AtaInfoViewModel />
</Design.DataContext> </Design.DataContext>

4
Aaru.Gui/Views/Tabs/DvdInfoTab.xaml.cs → Aaru.Gui/Views/Tabs/AtaInfo.xaml.cs
View File

@@ -3,9 +3,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class DvdInfoTab : UserControl public class AtaInfo : UserControl
{ {
public DvdInfoTab() => InitializeComponent(); public AtaInfo() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this); void InitializeComponent() => AvaloniaXamlLoader.Load(this);
} }

2
Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml → Aaru.Gui/Views/Tabs/BlurayInfo.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" 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"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.BlurayInfo">
<Design.DataContext> <Design.DataContext>
<tabs:BlurayInfoViewModel /> <tabs:BlurayInfoViewModel />
</Design.DataContext> </Design.DataContext>

4
Aaru.Gui/Views/Tabs/AtaInfoTab.xaml.cs → Aaru.Gui/Views/Tabs/BlurayInfo.xaml.cs
View File

@@ -3,9 +3,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class AtaInfoTab : UserControl public class BlurayInfo : UserControl
{ {
public AtaInfoTab() => InitializeComponent(); public BlurayInfo() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this); void InitializeComponent() => AvaloniaXamlLoader.Load(this);
} }

2
Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml → Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" 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"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.CompactDiscInfo">
<Design.DataContext> <Design.DataContext>
<tabs:CompactDiscInfoViewModel /> <tabs:CompactDiscInfoViewModel />
</Design.DataContext> </Design.DataContext>

4
Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml.cs → Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml.cs
View File

@@ -3,9 +3,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class BlurayInfoTab : UserControl public class CompactDiscInfo : UserControl
{ {
public BlurayInfoTab() => InitializeComponent(); public CompactDiscInfo() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this); void InitializeComponent() => AvaloniaXamlLoader.Load(this);
} }

12
Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml.cs
View File

@@ -1,12 +0,0 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Tabs
{
public class CompactDiscInfoTab : UserControl
{
public CompactDiscInfoTab() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this);
}
}

2
Aaru.Gui/Views/Tabs/DvdInfoTab.xaml → Aaru.Gui/Views/Tabs/DvdInfo.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" 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"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.DvdInfo">
<Design.DataContext> <Design.DataContext>
<tabs:DvdInfoViewModel /> <tabs:DvdInfoViewModel />
</Design.DataContext> </Design.DataContext>

4
Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml.cs → Aaru.Gui/Views/Tabs/DvdInfo.xaml.cs
View File

@@ -3,9 +3,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class ScsiInfoTab : UserControl public class DvdInfo : UserControl
{ {
public ScsiInfoTab() => InitializeComponent(); public DvdInfo() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this); void InitializeComponent() => AvaloniaXamlLoader.Load(this);
} }

2
Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml → Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" 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"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.DvdWritableInfo">
<Design.DataContext> <Design.DataContext>
<tabs:DvdWritableInfoViewModel /> <tabs:DvdWritableInfoViewModel />
</Design.DataContext> </Design.DataContext>

4
Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml.cs → Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml.cs
View File

@@ -3,9 +3,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class PcmciaInfoTab : UserControl public class DvdWritableInfo : UserControl
{ {
public PcmciaInfoTab() => InitializeComponent(); public DvdWritableInfo() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this); void InitializeComponent() => AvaloniaXamlLoader.Load(this);
} }

12
Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml.cs
View File

@@ -1,12 +0,0 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Tabs
{
public class DvdWritableInfoTab : UserControl
{
public DvdWritableInfoTab() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this);
}
}

2
Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml → Aaru.Gui/Views/Tabs/PcmciaInfo.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" 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"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.PcmciaInfo">
<Design.DataContext> <Design.DataContext>
<tabs:PcmciaInfoViewModel /> <tabs:PcmciaInfoViewModel />
</Design.DataContext> </Design.DataContext>

4
Aaru.Gui/Views/Tabs/XboxInfoTab.xaml.cs → Aaru.Gui/Views/Tabs/PcmciaInfo.xaml.cs
View File

@@ -3,9 +3,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class XboxInfoTab : UserControl public class PcmciaInfo : UserControl
{ {
public XboxInfoTab() => InitializeComponent(); public PcmciaInfo() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this); void InitializeComponent() => AvaloniaXamlLoader.Load(this);
} }

2
Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml → Aaru.Gui/Views/Tabs/ScsiInfo.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" 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"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.ScsiInfo">
<Design.DataContext> <Design.DataContext>
<tabs:ScsiInfoViewModel /> <tabs:ScsiInfoViewModel />
</Design.DataContext> </Design.DataContext>

12
Aaru.Gui/Views/Tabs/ScsiInfo.xaml.cs Normal file
View File

@@ -0,0 +1,12 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Tabs
{
public class ScsiInfo : UserControl
{
public ScsiInfo() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this);
}
}

2
Aaru.Gui/Views/Tabs/SdMmcInfo.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" 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"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.SdMmcInfo">
<Design.DataContext> <Design.DataContext>
<tabs:SdMmcInfoViewModel /> <tabs:SdMmcInfoViewModel />
</Design.DataContext> </Design.DataContext>

4
Aaru.Gui/Views/Tabs/SdMmcInfo.xaml.cs
View File

@@ -3,9 +3,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class SdMmcInfoTab : UserControl public class SdMmcInfo : UserControl
{ {
public SdMmcInfoTab() => InitializeComponent(); public SdMmcInfo() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this); void InitializeComponent() => AvaloniaXamlLoader.Load(this);
} }

2
Aaru.Gui/Views/Tabs/XboxInfoTab.xaml → Aaru.Gui/Views/Tabs/XboxInfo.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs" 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"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.XboxInfo">
<Design.DataContext> <Design.DataContext>
<tabs:XboxInfoViewModel /> <tabs:XboxInfoViewModel />
</Design.DataContext> </Design.DataContext>

12
Aaru.Gui/Views/Tabs/XboxInfo.xaml.cs Normal file
View File

@@ -0,0 +1,12 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Tabs
{
public class XboxInfo : UserControl
{
public XboxInfo() => InitializeComponent();
void InitializeComponent() => AvaloniaXamlLoader.Load(this);
}
}

2
Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml → Aaru.Gui/Views/Windows/DecodeMediaTags.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Windows.DecodeMediaTagsWindow" d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Windows.DecodeMediaTags"
Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}"> Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<windows:DecodeMediaTagsViewModel /> <windows:DecodeMediaTagsViewModel />

4
Aaru.Gui/Views/Windows/ViewSectorWindow.xaml.cs → Aaru.Gui/Views/Windows/DecodeMediaTags.xaml.cs
View File

@@ -4,9 +4,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Windows namespace Aaru.Gui.Views.Windows
{ {
public class ViewSectorWindow : Window public class DecodeMediaTags : Window
{ {
public ViewSectorWindow() public DecodeMediaTags()
{ {
InitializeComponent(); InitializeComponent();
#if DEBUG #if DEBUG

2
Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml → Aaru.Gui/Views/Windows/ImageChecksum.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.ImageChecksumWindow" Icon="/Assets/aaru-logo.png" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.ImageChecksum" Icon="/Assets/aaru-logo.png"
Title="{Binding Title}"> Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<windows:ImageChecksumViewModel /> <windows:ImageChecksumViewModel />

4
Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml.cs → Aaru.Gui/Views/Windows/ImageChecksum.xaml.cs
View File

@@ -6,9 +6,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Windows namespace Aaru.Gui.Views.Windows
{ {
public class ImageChecksumWindow : Window public class ImageChecksum : Window
{ {
public ImageChecksumWindow() public ImageChecksum()
{ {
InitializeComponent(); InitializeComponent();
#if DEBUG #if DEBUG

2
Aaru.Gui/Views/Windows/ImageConvertWindow.xaml → Aaru.Gui/Views/Windows/ImageConvert.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.ImageConvertWindow" Icon="/Assets/aaru-logo.png" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.ImageConvert" Icon="/Assets/aaru-logo.png"
Title="{Binding Title}"> Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<windows:ImageConvertViewModel /> <windows:ImageConvertViewModel />

4
Aaru.Gui/Views/Windows/ImageConvertWindow.xaml.cs → Aaru.Gui/Views/Windows/ImageConvert.xaml.cs
View File

@@ -6,9 +6,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Windows namespace Aaru.Gui.Views.Windows
{ {
public class ImageConvertWindow : Window public class ImageConvert : Window
{ {
public ImageConvertWindow() public ImageConvert()
{ {
InitializeComponent(); InitializeComponent();
#if DEBUG #if DEBUG

2
Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml → Aaru.Gui/Views/Windows/ImageEntropy.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.ImageEntropyWindow" Icon="/Assets/aaru-logo.png" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.ImageEntropy" Icon="/Assets/aaru-logo.png"
Title="{Binding Title}"> Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<windows:ImageEntropyViewModel /> <windows:ImageEntropyViewModel />

4
Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml.cs → Aaru.Gui/Views/Windows/ImageEntropy.xaml.cs
View File

@@ -6,9 +6,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Windows namespace Aaru.Gui.Views.Windows
{ {
public class ImageEntropyWindow : Window public class ImageEntropy : Window
{ {
public ImageEntropyWindow() public ImageEntropy()
{ {
InitializeComponent(); InitializeComponent();
#if DEBUG #if DEBUG

2
Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml → Aaru.Gui/Views/Windows/ImageSidecar.xaml
View File

@@ -35,7 +35,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Windows.ImageSidecarWindow" d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Windows.ImageSidecar"
Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}"> Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<windows:ImageSidecarViewModel /> <windows:ImageSidecarViewModel />

4
Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml.cs → Aaru.Gui/Views/Windows/ImageSidecar.xaml.cs
View File

@@ -4,9 +4,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Windows namespace Aaru.Gui.Views.Windows
{ {
public class ImageSidecarWindow : Window public class ImageSidecar : Window
{ {
public ImageSidecarWindow() public ImageSidecar()
{ {
InitializeComponent(); InitializeComponent();
#if DEBUG #if DEBUG

2
Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml → Aaru.Gui/Views/Windows/ImageVerify.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.ImageVerifyWindow" Icon="/Assets/aaru-logo.png" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.ImageVerify" Icon="/Assets/aaru-logo.png"
Title="{Binding Title}"> Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<windows:ImageVerifyViewModel /> <windows:ImageVerifyViewModel />

4
Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml.cs → Aaru.Gui/Views/Windows/ImageVerify.xaml.cs
View File

@@ -6,9 +6,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Windows namespace Aaru.Gui.Views.Windows
{ {
public class ImageVerifyWindow : Window public class ImageVerify : Window
{ {
public ImageVerifyWindow() public ImageVerify()
{ {
InitializeComponent(); InitializeComponent();
#if DEBUG #if DEBUG

2
Aaru.Gui/Views/Windows/MediaDumpWindow.xaml → Aaru.Gui/Views/Windows/MediaDump.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.MediaDumpWindow" Icon="/Assets/aaru-logo.png" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.MediaDump" Icon="/Assets/aaru-logo.png"
Title="{Binding Title}"> Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<windows:MediaDumpViewModel /> <windows:MediaDumpViewModel />

4
Aaru.Gui/Views/Windows/MediaDumpWindow.xaml.cs → Aaru.Gui/Views/Windows/MediaDump.xaml.cs
View File

@@ -6,9 +6,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Windows namespace Aaru.Gui.Views.Windows
{ {
public class MediaDumpWindow : Window public class MediaDump : Window
{ {
public MediaDumpWindow() public MediaDump()
{ {
InitializeComponent(); InitializeComponent();
#if DEBUG #if DEBUG

2
Aaru.Gui/Views/Windows/MediaScanWindow.xaml → Aaru.Gui/Views/Windows/MediaScan.xaml
View File

@@ -2,7 +2,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.MediaScanWindow" Icon="/Assets/aaru-logo.png" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.MediaScan" Icon="/Assets/aaru-logo.png"
Title="{Binding Title}"> Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<windows:MediaScanViewModel /> <windows:MediaScanViewModel />

4
Aaru.Gui/Views/Windows/MediaScanWindow.xaml.cs → Aaru.Gui/Views/Windows/MediaScan.xaml.cs
View File

@@ -6,9 +6,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Windows namespace Aaru.Gui.Views.Windows
{ {
public class MediaScanWindow : Window public class MediaScan : Window
{ {
public MediaScanWindow() public MediaScan()
{ {
InitializeComponent(); InitializeComponent();
#if DEBUG #if DEBUG

2
Aaru.Gui/Views/Windows/ViewSectorWindow.xaml → Aaru.Gui/Views/Windows/ViewSector.xaml
View File

@@ -35,7 +35,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800" xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Windows.ViewSectorWindow" d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Windows.ViewSector"
Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}"> Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<windows:ViewSectorViewModel /> <windows:ViewSectorViewModel />

4
Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml.cs → Aaru.Gui/Views/Windows/ViewSector.xaml.cs
View File

@@ -4,9 +4,9 @@ using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views.Windows namespace Aaru.Gui.Views.Windows
{ {
public class DecodeMediaTagsWindow : Window public class ViewSector : Window
{ {
public DecodeMediaTagsWindow() public ViewSector()
{ {
InitializeComponent(); InitializeComponent();
#if DEBUG #if DEBUG