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

Adjust namespaces.

Browse Source
This commit is contained in:
Natalia Portillo
2020-04-16 20:40:25 +01:00
parent 10c1f7297f
commit 367f6d9369
105 changed files with 320 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aaru.Gui/App.xaml.cs
View File

@@ -1,6 +1,6 @@
using System; using System;
using Aaru.Gui.ViewModels; using Aaru.Gui.ViewModels.Windows;
using Aaru.Gui.Views; using Aaru.Gui.Views.Windows;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Controls.ApplicationLifetimes;

2
Aaru.Gui/Models/DeviceModel.cs
View File

@@ -1,5 +1,5 @@
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using Aaru.Gui.ViewModels; using Aaru.Gui.ViewModels.Panels;
using Avalonia.Media.Imaging; using Avalonia.Media.Imaging;
namespace Aaru.Gui.Models namespace Aaru.Gui.Models

2
Aaru.Gui/Models/FileSystemModel.cs
View File

@@ -1,6 +1,6 @@
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Interfaces;
using Aaru.Gui.ViewModels; using Aaru.Gui.ViewModels.Panels;
namespace Aaru.Gui.Models namespace Aaru.Gui.Models
{ {

4
Aaru.Gui/Models/ImageModel.cs
View File

@@ -1,6 +1,6 @@
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Interfaces;
using Aaru.Gui.ViewModels; using Aaru.Gui.ViewModels.Panels;
using Avalonia.Media.Imaging; using Avalonia.Media.Imaging;
namespace Aaru.Gui.Models namespace Aaru.Gui.Models
@@ -15,6 +15,6 @@ namespace Aaru.Gui.Models
public ObservableCollection<RootModel> PartitionSchemesOrFileSystems { get; } public ObservableCollection<RootModel> PartitionSchemesOrFileSystems { get; }
public IMediaImage Image { get; set; } public IMediaImage Image { get; set; }
public ImageInfoViewModel ViewModel { get; set; } public ImageInfoViewModel ViewModel { get; set; }
public IFilter Filter { get; set; } public IFilter Filter { get; set; }
} }
} }

2
Aaru.Gui/Models/MediaModel.cs
View File

@@ -1,4 +1,4 @@
using Aaru.Gui.ViewModels; using Aaru.Gui.ViewModels.Panels;
using Avalonia.Media.Imaging; using Avalonia.Media.Imaging;
namespace Aaru.Gui.Models namespace Aaru.Gui.Models

2
Aaru.Gui/Models/PartitionModel.cs
View File

@@ -1,6 +1,6 @@
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using Aaru.CommonTypes; using Aaru.CommonTypes;
using Aaru.Gui.ViewModels; using Aaru.Gui.ViewModels.Panels;
using Avalonia.Media.Imaging; using Avalonia.Media.Imaging;
namespace Aaru.Gui.Models namespace Aaru.Gui.Models

4
Aaru.Gui/ViewModels/Dialogs/AboutDialogViewModel.cs
View File

@@ -6,11 +6,11 @@ using System.Reactive;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using Aaru.Gui.Models; using Aaru.Gui.Models;
using Aaru.Gui.Views; using Aaru.Gui.Views.Dialogs;
using Microsoft.DotNet.PlatformAbstractions; using Microsoft.DotNet.PlatformAbstractions;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Dialogs
{ {
public class AboutDialogViewModel : ViewModelBase public class AboutDialogViewModel : ViewModelBase
{ {

6
Aaru.Gui/ViewModels/Dialogs/ConsoleWindowViewModel.cs
View File

@@ -6,18 +6,18 @@ 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; 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;
using Version = Aaru.CommonTypes.Interop.Version; using Version = Aaru.CommonTypes.Interop.Version;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Dialogs
{ {
public class ConsoleWindowViewModel : ViewModelBase public class ConsoleWindowViewModel : ViewModelBase
{ {
bool _debugChecked;
readonly ConsoleWindow _view; readonly ConsoleWindow _view;
bool _debugChecked;
public ConsoleWindowViewModel(ConsoleWindow view) public ConsoleWindowViewModel(ConsoleWindow view)
{ {

4
Aaru.Gui/ViewModels/Dialogs/EncodingsDialogViewModel.cs
View File

@@ -5,10 +5,10 @@ using System.Reactive;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Aaru.Gui.Models; using Aaru.Gui.Models;
using Aaru.Gui.Views; using Aaru.Gui.Views.Dialogs;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Dialogs
{ {
public class EncodingsDialogViewModel : ViewModelBase public class EncodingsDialogViewModel : ViewModelBase
{ {

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

@@ -1,10 +1,10 @@
using System.IO; using System.IO;
using System.Reactive; using System.Reactive;
using System.Reflection; using System.Reflection;
using Aaru.Gui.Views; using Aaru.Gui.Views.Dialogs;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Dialogs
{ {
public class LicenseDialogViewModel : ViewModelBase public class LicenseDialogViewModel : ViewModelBase
{ {

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

@@ -4,11 +4,11 @@ using System.Reflection;
using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Interfaces;
using Aaru.Core; using Aaru.Core;
using Aaru.Gui.Models; using Aaru.Gui.Models;
using Aaru.Gui.Views; using Aaru.Gui.Views.Dialogs;
using Aaru.Partitions; using Aaru.Partitions;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Dialogs
{ {
public class PluginsDialogViewModel : ViewModelBase public class PluginsDialogViewModel : ViewModelBase
{ {

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

@@ -1,9 +1,9 @@
using System.Reactive; using System.Reactive;
using Aaru.Gui.Views; using Aaru.Gui.Views.Dialogs;
using Aaru.Settings; using Aaru.Settings;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Dialogs
{ {
public class SettingsDialogViewModel : ViewModelBase public class SettingsDialogViewModel : ViewModelBase
{ {

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

@@ -4,10 +4,10 @@ using System.Reactive;
using Aaru.Database; using Aaru.Database;
using Aaru.Database.Models; using Aaru.Database.Models;
using Aaru.Gui.Models; using Aaru.Gui.Models;
using Aaru.Gui.Views; using Aaru.Gui.Views.Dialogs;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Dialogs
{ {
public class StatisticsDialogViewModel : ViewModelBase public class StatisticsDialogViewModel : ViewModelBase
{ {

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

@@ -4,12 +4,13 @@ using System.IO;
using System.Reactive; using System.Reactive;
using Aaru.Decoders.SCSI.SSC; using Aaru.Decoders.SCSI.SSC;
using Aaru.Devices; using Aaru.Devices;
using Aaru.Gui.Tabs; using Aaru.Gui.ViewModels.Tabs;
using Aaru.Gui.Views.Tabs;
using Avalonia.Controls; using Avalonia.Controls;
using ReactiveUI; using ReactiveUI;
using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Panels
{ {
public class DeviceInfoViewModel : ViewModelBase public class DeviceInfoViewModel : ViewModelBase
{ {

2
Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs
View File

@@ -1,6 +1,6 @@
using Schemas; using Schemas;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Panels
{ {
public class FileSystemViewModel public class FileSystemViewModel
{ {

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

@@ -12,8 +12,10 @@ using Aaru.Decoders.DVD;
using Aaru.Decoders.SCSI; using Aaru.Decoders.SCSI;
using Aaru.Decoders.Xbox; using Aaru.Decoders.Xbox;
using Aaru.Gui.Models; using Aaru.Gui.Models;
using Aaru.Gui.Tabs; using Aaru.Gui.ViewModels.Tabs;
using Aaru.Gui.Views; using Aaru.Gui.ViewModels.Windows;
using Aaru.Gui.Views.Tabs;
using Aaru.Gui.Views.Windows;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Media.Imaging; using Avalonia.Media.Imaging;
@@ -23,7 +25,7 @@ using Schemas;
using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry; using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
using Session = Aaru.CommonTypes.Structs.Session; using Session = Aaru.CommonTypes.Structs.Session;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Panels
{ {
public class ImageInfoViewModel : ViewModelBase public class ImageInfoViewModel : ViewModelBase
{ {

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

@@ -4,8 +4,10 @@ using System.IO;
using System.Reactive; using System.Reactive;
using System.Text; using System.Text;
using Aaru.Core.Media.Info; using Aaru.Core.Media.Info;
using Aaru.Gui.Tabs; using Aaru.Gui.ViewModels.Tabs;
using Aaru.Gui.Views; using Aaru.Gui.ViewModels.Windows;
using Aaru.Gui.Views.Tabs;
using Aaru.Gui.Views.Windows;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Media.Imaging; using Avalonia.Media.Imaging;
@@ -14,7 +16,7 @@ using MessageBox.Avalonia;
using MessageBox.Avalonia.Enums; using MessageBox.Avalonia.Enums;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Panels
{ {
public class MediaInfoViewModel : ViewModelBase public class MediaInfoViewModel : ViewModelBase
{ {

2
Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs
View File

@@ -1,6 +1,6 @@
using Aaru.CommonTypes; using Aaru.CommonTypes;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Panels
{ {
public class PartitionViewModel public class PartitionViewModel
{ {

2
Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
View File

@@ -15,7 +15,7 @@ using MessageBox.Avalonia.Enums;
using ReactiveUI; using ReactiveUI;
using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes; using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Panels
{ {
public class SubdirectoryViewModel public class SubdirectoryViewModel
{ {

2
Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs
View File

@@ -5,7 +5,7 @@ using Aaru.Decoders.ATA;
using Avalonia.Controls; using Avalonia.Controls;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Tabs
{ {
public class AtaInfoViewModel : ViewModelBase public class AtaInfoViewModel : ViewModelBase
{ {

2
Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs
View File

@@ -6,7 +6,7 @@ using Aaru.Decoders.SCSI.MMC;
using Avalonia.Controls; using Avalonia.Controls;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Tabs
{ {
public class BlurayInfoViewModel public class BlurayInfoViewModel
{ {

24
Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs
View File

@@ -8,11 +8,10 @@ using Aaru.Gui.Models;
using Avalonia.Controls; using Avalonia.Controls;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Tabs
{ {
public class CompactDiscInfoViewModel : ViewModelBase public class CompactDiscInfoViewModel : ViewModelBase
{ {
readonly Window _view;
readonly byte[] _atipData; readonly byte[] _atipData;
readonly byte[] _cdTextLeadInData; readonly byte[] _cdTextLeadInData;
readonly byte[] _compactDiscInformationData; readonly byte[] _compactDiscInformationData;
@@ -20,6 +19,7 @@ namespace Aaru.Gui.ViewModels
readonly byte[] _rawTocData; readonly byte[] _rawTocData;
readonly byte[] _sessionData; readonly byte[] _sessionData;
readonly byte[] _tocData; readonly byte[] _tocData;
readonly Window _view;
public CompactDiscInfoViewModel(byte[] toc, byte[] atip, byte[] compactDiscInformation, byte[] session, public CompactDiscInfoViewModel(byte[] toc, byte[] atip, byte[] compactDiscInformation, byte[] session,
byte[] rawToc, byte[] pma, byte[] cdTextLeadIn, TOC.CDTOC? decodedToc, byte[] rawToc, byte[] pma, byte[] cdTextLeadIn, TOC.CDTOC? decodedToc,
@@ -35,15 +35,15 @@ namespace Aaru.Gui.ViewModels
_rawTocData = rawToc; _rawTocData = rawToc;
_pmaData = pma; _pmaData = pma;
_cdTextLeadInData = cdTextLeadIn; _cdTextLeadInData = cdTextLeadIn;
_view = view; _view = view;
IsrcList = new ObservableCollection<IsrcModel>(); IsrcList = new ObservableCollection<IsrcModel>();
SaveCdInformationCommand = ReactiveCommand.Create(ExecuteSaveCdInformationCommand); SaveCdInformationCommand = ReactiveCommand.Create(ExecuteSaveCdInformationCommand);
SaveCdTocCommand = ReactiveCommand.Create(ExecuteSaveCdTocCommand); SaveCdTocCommand = ReactiveCommand.Create(ExecuteSaveCdTocCommand);
SaveCdFullTocCommand = ReactiveCommand.Create(ExecuteSaveCdFullTocCommand); SaveCdFullTocCommand = ReactiveCommand.Create(ExecuteSaveCdFullTocCommand);
SaveCdSessionCommand = ReactiveCommand.Create(ExecuteSaveCdSessionCommand); SaveCdSessionCommand = ReactiveCommand.Create(ExecuteSaveCdSessionCommand);
SaveCdTextCommand = ReactiveCommand.Create(ExecuteSaveCdTextCommand); SaveCdTextCommand = ReactiveCommand.Create(ExecuteSaveCdTextCommand);
SaveCdAtipCommand = ReactiveCommand.Create(ExecuteSaveCdAtipCommand); SaveCdAtipCommand = ReactiveCommand.Create(ExecuteSaveCdAtipCommand);
SaveCdPmaCommand = ReactiveCommand.Create(ExecuteSaveCdPmaCommand); SaveCdPmaCommand = ReactiveCommand.Create(ExecuteSaveCdPmaCommand);
if(decodedCompactDiscInformation.HasValue) if(decodedCompactDiscInformation.HasValue)
CdInformationText = DiscInformation.Prettify000b(decodedCompactDiscInformation); CdInformationText = DiscInformation.Prettify000b(decodedCompactDiscInformation);
@@ -77,7 +77,7 @@ namespace Aaru.Gui.ViewModels
} }
MiscellaneousVisible = McnText != null || isrcs?.Count > 0 || pma != null; MiscellaneousVisible = McnText != null || isrcs?.Count > 0 || pma != null;
CdPmaVisible = pma != null; CdPmaVisible = pma != null;
} }
public string CdInformationText { get; } public string CdInformationText { get; }

2
Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs
View File

@@ -6,7 +6,7 @@ using Aaru.Decoders.DVD;
using Avalonia.Controls; using Avalonia.Controls;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Tabs
{ {
public class DvdInfoViewModel public class DvdInfoViewModel
{ {

2
Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs
View File

@@ -6,7 +6,7 @@ using Aaru.Decoders.DVD;
using Avalonia.Controls; using Avalonia.Controls;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Tabs
{ {
public class DvdWritableInfoViewModel public class DvdWritableInfoViewModel
{ {

6
Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs
View File

@@ -8,14 +8,14 @@ using Aaru.Gui.Models;
using Avalonia.Controls; using Avalonia.Controls;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Tabs
{ {
public class PcmciaInfoViewModel : ViewModelBase public class PcmciaInfoViewModel : ViewModelBase
{ {
string _pcmciaCisText;
PcmciaCisModel _selectedCis;
readonly Window _view; readonly Window _view;
readonly byte[] cis; readonly byte[] cis;
string _pcmciaCisText;
PcmciaCisModel _selectedCis;
internal PcmciaInfoViewModel(byte[] pcmciaCis, Window view) internal PcmciaInfoViewModel(byte[] pcmciaCis, Window view)
{ {

2
Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs
View File

@@ -12,7 +12,7 @@ using Avalonia.Controls;
using ReactiveUI; using ReactiveUI;
using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry; using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Tabs
{ {
public class ScsiInfoViewModel : ViewModelBase public class ScsiInfoViewModel : ViewModelBase
{ {

2
Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs
View File

@@ -1,6 +1,6 @@
using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Enums;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Tabs
{ {
public class SdMmcInfoViewModel public class SdMmcInfoViewModel
{ {

4
Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs
View File

@@ -6,12 +6,12 @@ using Aaru.Decoders.Xbox;
using Avalonia.Controls; using Avalonia.Controls;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Tabs
{ {
public class XboxInfoViewModel public class XboxInfoViewModel
{ {
Window _view;
readonly byte[] xboxSecuritySector; readonly byte[] xboxSecuritySector;
Window _view;
public XboxInfoViewModel(XgdInfo xgdInfo, byte[] dmi, byte[] securitySector, public XboxInfoViewModel(XgdInfo xgdInfo, byte[] dmi, byte[] securitySector,
SS.SecuritySector? decodedSecuritySector, Window view) SS.SecuritySector? decodedSecuritySector, Window view)

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

@@ -19,7 +19,7 @@ using DMI = Aaru.Decoders.Xbox.DMI;
using Inquiry = Aaru.Decoders.SCSI.Inquiry; using Inquiry = Aaru.Decoders.SCSI.Inquiry;
using Spare = Aaru.Decoders.DVD.Spare; using Spare = Aaru.Decoders.DVD.Spare;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Windows
{ {
public class DecodeMediaTagsViewModel : ViewModelBase public class DecodeMediaTagsViewModel : ViewModelBase
{ {

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

@@ -12,7 +12,7 @@ using Avalonia.Threading;
using ReactiveUI; using ReactiveUI;
using Schemas; using Schemas;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Windows
{ {
public class ImageChecksumViewModel : ViewModelBase public class ImageChecksumViewModel : ViewModelBase
{ {

81
Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs
View File

@@ -23,10 +23,11 @@ using Schemas;
using ImageInfo = Aaru.CommonTypes.Structs.ImageInfo; using ImageInfo = Aaru.CommonTypes.Structs.ImageInfo;
using Version = Aaru.CommonTypes.Interop.Version; using Version = Aaru.CommonTypes.Interop.Version;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Windows
{ {
public class ImageConvertViewModel : ViewModelBase public class ImageConvertViewModel : ViewModelBase
{ {
readonly Window _view;
readonly IMediaImage inputFormat; readonly IMediaImage inputFormat;
bool _cicmXmlFromImageVisible; bool _cicmXmlFromImageVisible;
string _cicmXmlText; string _cicmXmlText;
@@ -50,46 +51,44 @@ namespace Aaru.Gui.ViewModels
bool _driveSerialNumberVisible; bool _driveSerialNumberVisible;
bool _forceChecked; bool _forceChecked;
bool _formatReadOnly; bool _formatReadOnly;
double _lastMediaSequenceValue; double _lastMediaSequenceValue;
bool _lastMediaSequenceVisible; bool _lastMediaSequenceVisible;
string _mediaBarcodeText; string _mediaBarcodeText;
bool _mediaBarcodeVisible; bool _mediaBarcodeVisible;
string _mediaManufacturerText; string _mediaManufacturerText;
bool _mediaManufacturerVisible; bool _mediaManufacturerVisible;
string _mediaModelText; string _mediaModelText;
bool _mediaModelVisible; bool _mediaModelVisible;
string _mediaPartNumberText; string _mediaPartNumberText;
bool _mediaPartNumberVisible; bool _mediaPartNumberVisible;
double _mediaSequenceValue; double _mediaSequenceValue;
bool _mediaSequenceVisible; bool _mediaSequenceVisible;
string _mediaSerialNumberText; string _mediaSerialNumberText;
bool _mediaSerialNumberVisible; bool _mediaSerialNumberVisible;
string _mediaTitleText; string _mediaTitleText;
bool _mediaTitleVisible; bool _mediaTitleVisible;
bool _optionsVisible; bool _optionsVisible;
bool _progress1Visible; bool _progress1Visible;
bool _progress2Indeterminate; bool _progress2Indeterminate;
double _progress2MaxValue; double _progress2MaxValue;
string _progress2Text; string _progress2Text;
double _progress2Value; double _progress2Value;
bool _progress2Visible; bool _progress2Visible;
bool _progressIndeterminate; bool _progressIndeterminate;
double _progressMaxValue; double _progressMaxValue;
string _progressText; string _progressText;
double _progressValue; double _progressValue;
bool _progressVisible; bool _progressVisible;
bool _resumeFileFromImageVisible; bool _resumeFileFromImageVisible;
string _resumeFileText; string _resumeFileText;
double _sectorsValue; double _sectorsValue;
ImagePluginModel _selectedPlugin; ImagePluginModel _selectedPlugin;
string _sourceText; string _sourceText;
bool _startVisible; bool _startVisible;
bool _stopEnabled; bool _stopEnabled;
bool _stopVisible; bool _stopVisible;
string _title; string _title;
readonly Window _view;
bool cancel; bool cancel;
CICMMetadataType cicmMetadata; CICMMetadataType cicmMetadata;
List<DumpHardwareType> dumpHardware; List<DumpHardwareType> dumpHardware;

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

@@ -11,7 +11,7 @@ using Avalonia.Controls;
using Avalonia.Threading; using Avalonia.Threading;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Windows
{ {
public class ImageEntropyViewModel : ViewModelBase public class ImageEntropyViewModel : ViewModelBase
{ {

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

@@ -13,7 +13,7 @@ using Avalonia.Threading;
using ReactiveUI; using ReactiveUI;
using Schemas; using Schemas;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Windows
{ {
public class ImageSidecarViewModel : ViewModelBase public class ImageSidecarViewModel : ViewModelBase
{ {

15
Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs
View File

@@ -12,11 +12,12 @@ using Avalonia.Controls;
using Avalonia.Threading; using Avalonia.Threading;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Windows
{ {
public class ImageVerifyViewModel : ViewModelBase public class ImageVerifyViewModel : ViewModelBase
{ {
readonly IMediaImage _inputFormat; readonly IMediaImage _inputFormat;
readonly Window _view;
bool _cancel; bool _cancel;
bool _closeVisible; bool _closeVisible;
string _imageResultText; string _imageResultText;
@@ -54,7 +55,6 @@ namespace Aaru.Gui.ViewModels
bool _verifySectorsChecked; bool _verifySectorsChecked;
bool _verifySectorsEnabled; bool _verifySectorsEnabled;
bool _verifySectorsVisible; bool _verifySectorsVisible;
readonly Window _view;
public ImageVerifyViewModel(IMediaImage inputFormat, Window view) public ImageVerifyViewModel(IMediaImage inputFormat, Window view)
{ {
@@ -305,8 +305,7 @@ namespace Aaru.Gui.ViewModels
ProgressVisible = true; ProgressVisible = true;
Progress2Visible = false; Progress2Visible = false;
VerifySectorsVisible = _inputFormat is IOpticalMediaImage || VerifySectorsVisible = _inputFormat is IOpticalMediaImage || _inputFormat is IVerifiableSectorsImage;
_inputFormat is IVerifiableSectorsImage;
// TODO: Do not offer the option to use this form if the image does not support any kind of verification // TODO: Do not offer the option to use this form if the image does not support any kind of verification
new Thread(DoWork).Start(); new Thread(DoWork).Start();
@@ -314,9 +313,9 @@ namespace Aaru.Gui.ViewModels
async void DoWork() async void DoWork()
{ {
bool formatHasTracks; bool formatHasTracks;
var inputOptical = _inputFormat as IOpticalMediaImage; var inputOptical = _inputFormat as IOpticalMediaImage;
var verifiableSectorsImage = _inputFormat as IVerifiableSectorsImage; var verifiableSectorsImage = _inputFormat as IVerifiableSectorsImage;
try try
{ {
@@ -427,7 +426,7 @@ namespace Aaru.Gui.ViewModels
if(formatHasTracks) if(formatHasTracks)
{ {
ulong currentSectorAll = 0; ulong currentSectorAll = 0;
startCheck = DateTime.UtcNow; startCheck = DateTime.UtcNow;

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

@@ -17,8 +17,11 @@ using Aaru.Core.Media.Info;
using Aaru.Database; using Aaru.Database;
using Aaru.Devices; using Aaru.Devices;
using Aaru.Gui.Models; using Aaru.Gui.Models;
using Aaru.Gui.Panels; using Aaru.Gui.ViewModels.Dialogs;
using Aaru.Gui.Views; using Aaru.Gui.ViewModels.Panels;
using Aaru.Gui.Views.Dialogs;
using Aaru.Gui.Views.Panels;
using Aaru.Gui.Views.Windows;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Controls.ApplicationLifetimes;
@@ -30,7 +33,7 @@ using ReactiveUI;
using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
using PlatformID = Aaru.CommonTypes.Interop.PlatformID; using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Windows
{ {
public class MainWindowViewModel : ViewModelBase public class MainWindowViewModel : ViewModelBase
{ {

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

@@ -27,7 +27,7 @@ using Schemas;
using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
using MediaType = Aaru.CommonTypes.MediaType; using MediaType = Aaru.CommonTypes.MediaType;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Windows
{ {
public class MediaDumpViewModel : ViewModelBase public class MediaDumpViewModel : ViewModelBase
{ {

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

@@ -11,7 +11,7 @@ using MessageBox.Avalonia.Enums;
using ReactiveUI; using ReactiveUI;
using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Windows
{ {
public class MediaScanViewModel : ViewModelBase public class MediaScanViewModel : ViewModelBase
{ {

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

@@ -6,13 +6,15 @@ using System.Threading.Tasks;
using Aaru.Console; using Aaru.Console;
using Aaru.Core; using Aaru.Core;
using Aaru.Database; 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 Aaru.Settings;
using Avalonia.Threading; using Avalonia.Threading;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Windows
{ {
public class SplashWindowViewModel : ViewModelBase public class SplashWindowViewModel : ViewModelBase
{ {

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

@@ -1,7 +1,7 @@
using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Interfaces;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels namespace Aaru.Gui.ViewModels.Windows
{ {
public class ViewSectorViewModel : ViewModelBase public class ViewSectorViewModel : ViewModelBase
{ {

8
Aaru.Gui/Views/Dialogs/AboutDialog.xaml
View File

@@ -1,11 +1,11 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.AboutDialog" 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"
Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}"> Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<vm:AboutDialogViewModel /> <dialogs:AboutDialogViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid>

2
Aaru.Gui/Views/Dialogs/AboutDialog.xaml.cs
View File

@@ -2,7 +2,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Dialogs
{ {
public class AboutDialog : Window public class AboutDialog : Window
{ {

8
Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml
View File

@@ -1,11 +1,11 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" Width="600" Height="450" x:Class="Aaru.Gui.Views.ConsoleWindow" 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"
Icon="/Assets/aaru-logo.png" Title="{Binding Title}"> Icon="/Assets/aaru-logo.png" Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<vm:ConsoleWindowViewModel /> <dialogs:ConsoleWindowViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid>

2
Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml.cs
View File

@@ -3,7 +3,7 @@ using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Dialogs
{ {
public class ConsoleWindow : Window public class ConsoleWindow : Window
{ {

8
Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml
View File

@@ -32,13 +32,13 @@
// ****************************************************************************/ // ****************************************************************************/
--> -->
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.EncodingsDialog" 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"
Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}"> Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<vm:EncodingsDialogViewModel /> <dialogs:EncodingsDialogViewModel />
</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/EncodingsDialog.xaml.cs
View File

@@ -2,7 +2,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Dialogs
{ {
public class EncodingsDialog : Window public class EncodingsDialog : Window
{ {

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

@@ -1,11 +1,11 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.LicenseDialog" 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.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>
<vm:LicenseDialogViewModel /> <dialogs:LicenseDialogViewModel />
</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/LicenseDialog.xaml.cs
View File

@@ -2,7 +2,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Dialogs
{ {
public class LicenseDialog : Window public class LicenseDialog : Window
{ {

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

@@ -32,13 +32,13 @@
// ****************************************************************************/ // ****************************************************************************/
--> -->
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" Width="600" Height="450" x:Class="Aaru.Gui.Views.PluginsDialog" 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.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>
<vm:PluginsDialogViewModel /> <dialogs:PluginsDialogViewModel />
</Design.DataContext> </Design.DataContext>
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<Grid.RowDefinitions> <Grid.RowDefinitions>

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

@@ -2,7 +2,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Dialogs
{ {
public class PluginsDialog : Window public class PluginsDialog : Window
{ {

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

@@ -1,11 +1,11 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" Width="675" Height="432" x:Class="Aaru.Gui.Views.SettingsDialog" xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800"
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>
<vm:SettingsDialogViewModel /> <dialogs:SettingsDialogViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid>

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

@@ -2,7 +2,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Dialogs
{ {
public class SettingsDialog : Window public class SettingsDialog : Window
{ {

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

@@ -1,11 +1,11 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" Width="550" Height="320" x:Class="Aaru.Gui.Views.StatisticsDialog" xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800"
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>
<vm:StatisticsDialogViewModel /> <dialogs:StatisticsDialogViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid>

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

@@ -2,7 +2,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Dialogs
{ {
public class StatisticsDialog : Window public class StatisticsDialog : Window
{ {

6
Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml
View File

@@ -1,10 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels"
x:Class="Aaru.Gui.Panels.DeviceInfoPanel"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.DeviceInfoPanel">
<Design.DataContext> <Design.DataContext>
<vm:DeviceInfoViewModel /> <panels:DeviceInfoViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock Text="Device information" /> <TextBlock Text="Device information" />

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

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Panels namespace Aaru.Gui.Views.Panels
{ {
public class DeviceInfoPanel : UserControl public class DeviceInfoPanel : UserControl
{ {

6
Aaru.Gui/Views/Panels/FileSystemPanel.xaml
View File

@@ -1,10 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels"
x:Class="Aaru.Gui.Panels.FileSystemPanel"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.FileSystemPanel">
<Design.DataContext> <Design.DataContext>
<vm:FileSystemViewModel /> <panels:FileSystemViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel> <StackPanel>
<TextBlock Text="{Binding TypeText}" /> <TextBlock Text="{Binding TypeText}" />

2
Aaru.Gui/Views/Panels/FileSystemPanel.xaml.cs
View File

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Panels namespace Aaru.Gui.Views.Panels
{ {
public class FileSystemPanel : UserControl public class FileSystemPanel : UserControl
{ {

6
Aaru.Gui/Views/Panels/ImageInfoPanel.xaml
View File

@@ -1,10 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels"
x:Class="Aaru.Gui.Panels.ImageInfoPanel"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.ImageInfoPanel">
<Design.DataContext> <Design.DataContext>
<vm:ImageInfoViewModel /> <panels:ImageInfoViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel> <StackPanel>
<Image Width="128" Height="128" HorizontalAlignment="Center" VerticalAlignment="Center" <Image Width="128" Height="128" HorizontalAlignment="Center" VerticalAlignment="Center"

2
Aaru.Gui/Views/Panels/ImageInfoPanel.xaml.cs
View File

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Panels namespace Aaru.Gui.Views.Panels
{ {
public class ImageInfoPanel : UserControl public class ImageInfoPanel : UserControl
{ {

6
Aaru.Gui/Views/Panels/MediaInfoPanel.xaml
View File

@@ -1,10 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels"
x:Class="Aaru.Gui.Panels.MediaInfoPanel"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.MediaInfoPanel">
<Design.DataContext> <Design.DataContext>
<vm:MediaInfoViewModel /> <panels:MediaInfoViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock HorizontalAlignment="Center" Text="Media information" /> <TextBlock HorizontalAlignment="Center" Text="Media information" />

2
Aaru.Gui/Views/Panels/MediaInfoPanel.xaml.cs
View File

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Panels namespace Aaru.Gui.Views.Panels
{ {
public class MediaInfoPanel : UserControl public class MediaInfoPanel : UserControl
{ {

6
Aaru.Gui/Views/Panels/PartitionPanel.xaml
View File

@@ -1,10 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels"
x:Class="Aaru.Gui.Panels.PartitionPanel"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.PartitionPanel">
<Design.DataContext> <Design.DataContext>
<vm:PartitionViewModel /> <panels:PartitionViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel> <StackPanel>
<TextBlock Text="{Binding NameText}" /> <TextBlock Text="{Binding TypeText}" /> <TextBlock Text="{Binding NameText}" /> <TextBlock Text="{Binding TypeText}" />

2
Aaru.Gui/Views/Panels/PartitionPanel.xaml.cs
View File

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Panels namespace Aaru.Gui.Views.Panels
{ {
public class PartitionPanel : UserControl public class PartitionPanel : UserControl
{ {

7
Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml
View File

@@ -1,10 +1,11 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels"
x:Class="Aaru.Gui.Panels.SubdirectoryPanel"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Aaru.Gui.Views.Panels.SubdirectoryPanel">
<Design.DataContext> <Design.DataContext>
<vm:SubdirectoryViewModel /> <panels:SubdirectoryViewModel />
</Design.DataContext> </Design.DataContext>
<DataGrid Items="{Binding Entries}" IsReadOnly="True" SelectionMode="Extended"> <!-- TODO: SelectedItems="{Binding SelectedEntries}" --> <DataGrid Items="{Binding Entries}" IsReadOnly="True" SelectionMode="Extended"> <!-- TODO: SelectedItems="{Binding SelectedEntries}" -->
<DataGrid.ContextMenu> <DataGrid.ContextMenu>

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

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Panels namespace Aaru.Gui.Views.Panels
{ {
public class SubdirectoryPanel : UserControl public class SubdirectoryPanel : UserControl
{ {

6
Aaru.Gui/Views/Tabs/AtaInfoTab.xaml
View File

@@ -1,10 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
x:Class="Aaru.Gui.Tabs.AtaInfoTab"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.AtaInfoTab">
<Design.DataContext> <Design.DataContext>
<vm:AtaInfoViewModel /> <tabs:AtaInfoViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel> <StackPanel>
<TextBlock Text="{Binding AtaOrAtapiText}" /> <TextBlock Text="{Binding AtaOrAtapiText}" />

2
Aaru.Gui/Views/Tabs/AtaInfoTab.xaml.cs
View File

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class AtaInfoTab : UserControl public class AtaInfoTab : UserControl
{ {

6
Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml
View File

@@ -1,10 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
x:Class="Aaru.Gui.Tabs.BlurayInfoTab"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.BlurayInfoTab">
<Design.DataContext> <Design.DataContext>
<vm:BlurayInfoViewModel /> <tabs:BlurayInfoViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel> <StackPanel>
<StackPanel IsVisible="{Binding !!BlurayDiscInformationText}"> <StackPanel IsVisible="{Binding !!BlurayDiscInformationText}">

2
Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml.cs
View File

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class BlurayInfoTab : UserControl public class BlurayInfoTab : UserControl
{ {

6
Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml
View File

@@ -1,10 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
x:Class="Aaru.Gui.Tabs.CompactDiscInfoTab"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.CompactDiscInfoTab">
<Design.DataContext> <Design.DataContext>
<vm:CompactDiscInfoViewModel /> <tabs:CompactDiscInfoViewModel />
</Design.DataContext> </Design.DataContext>
<TabControl> <TabControl>
<TabItem IsVisible="{Binding !!CdInformationText}"> <TabItem IsVisible="{Binding !!CdInformationText}">

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

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class CompactDiscInfoTab : UserControl public class CompactDiscInfoTab : UserControl
{ {

6
Aaru.Gui/Views/Tabs/DvdInfoTab.xaml
View File

@@ -1,10 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
x:Class="Aaru.Gui.Tabs.DvdInfoTab"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.DvdInfoTab">
<Design.DataContext> <Design.DataContext>
<vm:DvdInfoViewModel /> <tabs:DvdInfoViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel> <StackPanel>
<TextBlock IsVisible="{Binding !!DvdPfiText}" Text="Physical Format Information" /> <TextBlock IsVisible="{Binding !!DvdPfiText}" Text="Physical Format Information" />

2
Aaru.Gui/Views/Tabs/DvdInfoTab.xaml.cs
View File

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class DvdInfoTab : UserControl public class DvdInfoTab : UserControl
{ {

6
Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml
View File

@@ -1,10 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
x:Class="Aaru.Gui.Tabs.DvdWritableInfoTab"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.DvdWritableInfoTab">
<Design.DataContext> <Design.DataContext>
<vm:DvdWritableInfoViewModel /> <tabs:DvdWritableInfoViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel> <StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">

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

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class DvdWritableInfoTab : UserControl public class DvdWritableInfoTab : UserControl
{ {

6
Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml
View File

@@ -1,10 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
x:Class="Aaru.Gui.Tabs.PcmciaInfoTab"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.PcmciaInfoTab">
<Design.DataContext> <Design.DataContext>
<vm:PcmciaInfoViewModel /> <tabs:PcmciaInfoViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel> <StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">

2
Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml.cs
View File

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class PcmciaInfoTab : UserControl public class PcmciaInfoTab : UserControl
{ {

6
Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml
View File

@@ -1,10 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
x:Class="Aaru.Gui.Tabs.ScsiInfoTab"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.ScsiInfoTab">
<Design.DataContext> <Design.DataContext>
<vm:ScsiInfoViewModel /> <tabs:ScsiInfoViewModel />
</Design.DataContext> </Design.DataContext>
<TabControl> <TabControl>
<TabItem IsVisible="{Binding !!InquiryData}"> <TabItem IsVisible="{Binding !!InquiryData}">

2
Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml.cs
View File

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class ScsiInfoTab : UserControl public class ScsiInfoTab : UserControl
{ {

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

@@ -1,10 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
x:Class="Aaru.Gui.Tabs.SdMmcInfoTab"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.SdMmcInfoTab">
<Design.DataContext> <Design.DataContext>
<vm:SdMmcInfoViewModel /> <tabs:SdMmcInfoViewModel />
</Design.DataContext> </Design.DataContext>
<TabControl> <TabControl>
<TabItem IsVisible="{Binding !!CidText}"> <TabItem IsVisible="{Binding !!CidText}">

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

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class SdMmcInfoTab : UserControl public class SdMmcInfoTab : UserControl
{ {

71
Aaru.Gui/Views/Tabs/XboxInfoTab.xaml
View File

@@ -1,44 +1,47 @@
<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
x:Class="Aaru.Gui.Tabs.XboxInfoTab"> mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.XboxInfoTab">
<Design.DataContext> <Design.DataContext>
<vm:XboxInfoViewModel /> <tabs:XboxInfoViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel> <StackPanel>
<StackPanel IsVisible="{Binding XboxInformationVisible}"> <StackPanel IsVisible="{Binding XboxInformationVisible}">
<StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxL0VideoText}"> <StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxL0VideoText}">
<TextBlock Text="Video layer 0 size" /> <TextBox IsReadOnly="True" Text="{Binding XboxL0VideoText}" /> <TextBlock Text="Video layer 0 size" /> <TextBox IsReadOnly="True" Text="{Binding XboxL0VideoText}" />
</StackPanel>
<StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxL1VideoText}">
<TextBlock Text="Video layer 0 size" /> <TextBox IsReadOnly="True" Text="{Binding XboxL1VideoText}" />
</StackPanel>
<StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxMiddleZoneText}">
<TextBlock Text="Video layer 0 size" />
<TextBox IsReadOnly="True" Text="{Binding XboxMiddleZoneText}" />
</StackPanel>
<StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxGameSizeText}">
<TextBlock Text="Video layer 0 size" /> <TextBox IsReadOnly="True" Text="{Binding XboxGameSizeText}" />
</StackPanel>
<StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxTotalSizeText}">
<TextBlock Text="Video layer 0 size" />
<TextBox IsReadOnly="True" Text="{Binding XboxTotalSizeText}" />
</StackPanel>
<StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxRealBreakText}">
<TextBlock Text="Video layer 0 size" />
<TextBox IsReadOnly="True" Text="{Binding XboxRealBreakText}" />
</StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxL1VideoText}"> <StackPanel>
<TextBlock Text="Video layer 0 size" /> <TextBox IsReadOnly="True" Text="{Binding XboxL1VideoText}" /> <StackPanel IsVisible="{Binding !!XboxDmiText}">
<TextBlock Text="Disc Manufacturing Information" />
<TextBox IsReadOnly="True" Text="{Binding XboxDmiText}" />
</StackPanel>
<StackPanel IsVisible="{Binding !!XboxSsText}">
<TextBlock Text="Security Sector" /> <TextBox IsReadOnly="True" Text="{Binding XboxSsText}" />
</StackPanel>
<Button HorizontalAlignment="Right" IsVisible="{Binding SaveXboxSsVisible}"
Command="{Binding SaveXboxSsCommand}">
<TextBlock Text="Save Xbox Security Sector" />
</Button>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxMiddleZoneText}">
<TextBlock Text="Video layer 0 size" /> <TextBox IsReadOnly="True" Text="{Binding XboxMiddleZoneText}" />
</StackPanel>
<StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxGameSizeText}">
<TextBlock Text="Video layer 0 size" /> <TextBox IsReadOnly="True" Text="{Binding XboxGameSizeText}" />
</StackPanel>
<StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxTotalSizeText}">
<TextBlock Text="Video layer 0 size" /> <TextBox IsReadOnly="True" Text="{Binding XboxTotalSizeText}" />
</StackPanel>
<StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxRealBreakText}">
<TextBlock Text="Video layer 0 size" /> <TextBox IsReadOnly="True" Text="{Binding XboxRealBreakText}" />
</StackPanel>
</StackPanel>
<StackPanel>
<StackPanel IsVisible="{Binding !!XboxDmiText}">
<TextBlock Text="Disc Manufacturing Information" />
<TextBox IsReadOnly="True" Text="{Binding XboxDmiText}" />
</StackPanel>
<StackPanel IsVisible="{Binding !!XboxSsText}">
<TextBlock Text="Security Sector" /> <TextBox IsReadOnly="True" Text="{Binding XboxSsText}" />
</StackPanel>
<Button HorizontalAlignment="Right" IsVisible="{Binding SaveXboxSsVisible}"
Command="{Binding SaveXboxSsCommand}">
<TextBlock Text="Save Xbox Security Sector" />
</Button>
</StackPanel>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

2
Aaru.Gui/Views/Tabs/XboxInfoTab.xaml.cs
View File

@@ -1,7 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Tabs namespace Aaru.Gui.Views.Tabs
{ {
public class XboxInfoTab : UserControl public class XboxInfoTab : UserControl
{ {

8
Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml
View File

@@ -1,11 +1,11 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.DecodeMediaTagsWindow" 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"
Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}"> Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<vm:DecodeMediaTagsViewModel /> <windows:DecodeMediaTagsViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">

2
Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml.cs
View File

@@ -2,7 +2,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Windows
{ {
public class DecodeMediaTagsWindow : Window public class DecodeMediaTagsWindow : Window
{ {

8
Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml
View File

@@ -1,11 +1,11 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" x:Class="Aaru.Gui.Views.ImageChecksumWindow" Icon="/Assets/aaru-logo.png" 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"
Title="{Binding Title}"> Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<vm:ImageChecksumViewModel /> <windows:ImageChecksumViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">

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

@@ -1,10 +1,10 @@
using System.ComponentModel; using System.ComponentModel;
using Aaru.Gui.ViewModels; using Aaru.Gui.ViewModels.Windows;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Windows
{ {
public class ImageChecksumWindow : Window public class ImageChecksumWindow : Window
{ {

8
Aaru.Gui/Views/Windows/ImageConvertWindow.xaml
View File

@@ -1,11 +1,11 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" x:Class="Aaru.Gui.Views.ImageConvertWindow" Icon="/Assets/aaru-logo.png" 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"
Title="{Binding Title}"> Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<vm:ImageConvertViewModel /> <windows:ImageConvertViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock Text="Source image" /> <TextBox Text="{Binding SourceText}" IsReadOnly="True" /> <TextBlock Text="Source image" /> <TextBox Text="{Binding SourceText}" IsReadOnly="True" />

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

@@ -1,10 +1,10 @@
using System.ComponentModel; using System.ComponentModel;
using Aaru.Gui.ViewModels; using Aaru.Gui.ViewModels.Windows;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Windows
{ {
public class ImageConvertWindow : Window public class ImageConvertWindow : Window
{ {

8
Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml
View File

@@ -1,11 +1,11 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" x:Class="Aaru.Gui.Views.ImageEntropyWindow" Icon="/Assets/aaru-logo.png" 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"
Title="{Binding Title}"> Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<vm:ImageEntropyViewModel /> <windows:ImageEntropyViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<StackPanel IsVisible="{Binding OptionsVisible}" Orientation="Vertical"> <StackPanel IsVisible="{Binding OptionsVisible}" Orientation="Vertical">

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

@@ -1,10 +1,10 @@
using System.ComponentModel; using System.ComponentModel;
using Aaru.Gui.ViewModels; using Aaru.Gui.ViewModels.Windows;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Windows
{ {
public class ImageEntropyWindow : Window public class ImageEntropyWindow : Window
{ {

8
Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml
View File

@@ -32,13 +32,13 @@
// ****************************************************************************/ // ****************************************************************************/
--> -->
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.ImageSidecarWindow" 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"
Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}"> Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<vm:ImageSidecarViewModel /> <windows:ImageSidecarViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock Text="Destination file" /> <TextBlock Text="Destination file" />

2
Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml.cs
View File

@@ -2,7 +2,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Windows
{ {
public class ImageSidecarWindow : Window public class ImageSidecarWindow : Window
{ {

8
Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml
View File

@@ -1,11 +1,11 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" x:Class="Aaru.Gui.Views.ImageVerifyWindow" Icon="/Assets/aaru-logo.png" 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"
Title="{Binding Title}"> Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<vm:ImageVerifyViewModel /> <windows:ImageVerifyViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<StackPanel Orientation="Vertical" IsVisible="{Binding OptionsVisible}"> <StackPanel Orientation="Vertical" IsVisible="{Binding OptionsVisible}">

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

@@ -1,10 +1,10 @@
using System.ComponentModel; using System.ComponentModel;
using Aaru.Gui.ViewModels; using Aaru.Gui.ViewModels.Windows;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Windows
{ {
public class ImageVerifyWindow : Window public class ImageVerifyWindow : Window
{ {

8
Aaru.Gui/Views/Windows/MainWindow.xaml
View File

@@ -1,11 +1,11 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:models="clr-namespace:Aaru.Gui.Models;assembly=Aaru.Gui" xmlns:models="clr-namespace:Aaru.Gui.Models;assembly=Aaru.Gui"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" x:Class="Aaru.Gui.Views.MainWindow" Icon="/Assets/aaru-logo.png" Title="Aaru.Gui"> 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">
<Design.DataContext> <Design.DataContext>
<vm:MainWindowViewModel /> <windows:MainWindowViewModel />
</Design.DataContext> </Design.DataContext>
<DockPanel> <DockPanel>
<Menu DockPanel.Dock="Top"> <Menu DockPanel.Dock="Top">

4
Aaru.Gui/Views/Windows/MainWindow.xaml.cs
View File

@@ -1,10 +1,10 @@
using System; using System;
using Aaru.Gui.ViewModels; using Aaru.Gui.ViewModels.Windows;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Windows
{ {
public class MainWindow : Window public class MainWindow : Window
{ {

8
Aaru.Gui/Views/Windows/MediaDumpWindow.xaml
View File

@@ -1,11 +1,11 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" x:Class="Aaru.Gui.Views.MediaDumpWindow" Icon="/Assets/aaru-logo.png" 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"
Title="{Binding Title}"> Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<vm:MediaDumpViewModel /> <windows:MediaDumpViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<StackPanel Orientation="Vertical" IsVisible="{Binding OptionsVisible}"> <StackPanel Orientation="Vertical" IsVisible="{Binding OptionsVisible}">

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

@@ -1,10 +1,10 @@
using System.ComponentModel; using System.ComponentModel;
using Aaru.Gui.ViewModels; using Aaru.Gui.ViewModels.Windows;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace Aaru.Gui.Views namespace Aaru.Gui.Views.Windows
{ {
public class MediaDumpWindow : Window public class MediaDumpWindow : Window
{ {

8
Aaru.Gui/Views/Windows/MediaScanWindow.xaml
View File

@@ -1,11 +1,11 @@
<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
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" mc:Ignorable="d" d:DesignWidth="800" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" x:Class="Aaru.Gui.Views.MediaScanWindow" Icon="/Assets/aaru-logo.png" 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"
Title="{Binding Title}"> Title="{Binding Title}">
<Design.DataContext> <Design.DataContext>
<vm:MediaScanViewModel /> <windows:MediaScanViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TabControl IsVisible="{Binding ResultsVisible}"> <TabControl IsVisible="{Binding ResultsVisible}">

Some files were not shown because too many files have changed in this diff Show More