[GUI] Use compiled bindings.

2025-12-16 11:14:25 +00:00 · 2025-11-19 05:26:14 +00:00
parent 98345425f8
commit 363cdbdd37
38 changed files with 53 additions and 12 deletions
--- a/Aaru.Gui/Aaru.Gui.csproj
+++ b/Aaru.Gui/Aaru.Gui.csproj
@@ -5,6 +5,7 @@
    <Title>Aaru Data Preservation Suite</Title>
    <NoWarn>CS0649,CS0169</NoWarn>
    <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
    <NoWarn>CS1591;CS1574</NoWarn>
--- a/Aaru.Gui/Models/SubdirectoryModel.cs
+++ b/Aaru.Gui/Models/SubdirectoryModel.cs
@@ -32,6 +32,7 @@

 using System.Collections.ObjectModel;
 using Aaru.CommonTypes.Interfaces;
+using Avalonia.Media;
 using Avalonia.Media.Imaging;

 namespace Aaru.Gui.Models;
--- a/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs
@@ -199,6 +199,8 @@ public sealed partial class DeviceInfoViewModel : ViewModelBase
    [ObservableProperty]
    bool _removable;
    [ObservableProperty]
+    bool _removableChecked;
+    [ObservableProperty]
    string _revision;
    [ObservableProperty]
    bool _saveUsbDescriptorsEnabled;
@@ -213,6 +215,8 @@ public sealed partial class DeviceInfoViewModel : ViewModelBase
    [ObservableProperty]
    SdMmcInfo _sdMmcInfo;
    [ObservableProperty]
+    string _sdMmcText;
+    [ObservableProperty]
    string _secureDigital;
    [ObservableProperty]
    string _serial;
--- a/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
+++ b/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
@@ -116,11 +116,11 @@ public sealed class SubdirectoryViewModel
                Name = dirent,
                Stat = stat,
                Color =
-                    new SolidColorBrush(Color.Parse(DirColorsParser.Instance.ExtensionColors
-                                                                   .TryGetValue(Path.GetExtension(dirent),
-                                                                                    out string hex)
-                                                        ? hex
-                                                        : DirColorsParser.Instance.NormalColor))
+                    new SolidColorBrush(Avalonia.Media.Color.Parse(DirColorsParser.Instance.ExtensionColors
+                                                                      .TryGetValue(Path.GetExtension(dirent),
+                                                                           out string hex)
+                                                                       ? hex
+                                                                       : DirColorsParser.Instance.NormalColor))
            });
        }

@@ -130,6 +130,7 @@ public sealed class SubdirectoryViewModel
    public ObservableCollection<FileModel> Entries             { get; }
    public List<FileModel>                 SelectedEntries     { get; }
    public ICommand                        ExtractFilesCommand { get; }
+    public IBrush                          Color               { get; }

    async Task ExtractFiles()
    {
--- a/Aaru.Gui/Views/Dialogs/About.xaml
+++ b/Aaru.Gui/Views/Dialogs/About.xaml
@@ -46,6 +46,7 @@
        x:Class="Aaru.Gui.Views.Dialogs.About"
        Icon="/Assets/aaru-logo.png"
        CanResize="False"
+        x:DataType="dialogs:AboutViewModel"
        Title="{x:Static localization:UI.Title_About_Aaru}">
    <Design.DataContext>
        <dialogs:AboutViewModel />
--- a/Aaru.Gui/Views/Dialogs/Console.xaml
+++ b/Aaru.Gui/Views/Dialogs/Console.xaml
@@ -45,6 +45,7 @@
        Height="450"
        x:Class="Aaru.Gui.Views.Dialogs.Console"
        Icon="/Assets/aaru-logo.png"
+        x:DataType="dialogs:ConsoleViewModel"
        Title="{x:Static localization:UI.Title_Console}">
    <Design.DataContext>
        <dialogs:ConsoleViewModel />
--- a/Aaru.Gui/Views/Dialogs/Encodings.xaml
+++ b/Aaru.Gui/Views/Dialogs/Encodings.xaml
@@ -46,6 +46,7 @@
        x:Class="Aaru.Gui.Views.Dialogs.Encodings"
        Icon="/Assets/aaru-logo.png"
        CanResize="False"
+        x:DataType="dialogs:EncodingsViewModel"
        Title="{x:Static localization:UI.Encodings}">
    <Design.DataContext>
        <dialogs:EncodingsViewModel />
--- a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml
+++ b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml
@@ -46,6 +46,7 @@
        x:Class="Aaru.Gui.Views.Dialogs.LicenseDialog"
        Icon="/Assets/aaru-logo.png"
        CanResize="False"
+        x:DataType="dialogs:LicenseViewModel"
        Title="{x:Static localization:UI.Title_Aaru_license}">
    <Design.DataContext>
        <dialogs:LicenseViewModel />
--- a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml
+++ b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml
@@ -45,6 +45,7 @@
        Height="600"
        x:Class="Aaru.Gui.Views.Dialogs.PluginsDialog"
        Icon="/Assets/aaru-logo.png"
+        x:DataType="dialogs:PluginsViewModel"
        Title="{x:Static localization:UI.Title_Plugins}">
    <Design.DataContext>
        <dialogs:PluginsViewModel />
--- a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml
+++ b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml
@@ -45,6 +45,7 @@
        x:Class="Aaru.Gui.Views.Dialogs.SettingsDialog"
        Icon="/Assets/aaru-logo.png"
        CanResize="False"
+        x:DataType="dialogs:SettingsViewModel"
        Title="{x:Static localization:UI.Title_Settings}">
    <Design.DataContext>
        <dialogs:SettingsViewModel />
--- a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml
+++ b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml
@@ -46,6 +46,7 @@
        x:Class="Aaru.Gui.Views.Dialogs.StatisticsDialog"
        Icon="/Assets/aaru-logo.png"
        CanResize="False"
+        x:DataType="dialogs:StatisticsViewModel"
        Title="{x:Static localization:UI.Title_Statistics}">
    <Design.DataContext>
        <dialogs:StatisticsViewModel />
--- a/Aaru.Gui/Views/Panels/DeviceInfo.xaml
+++ b/Aaru.Gui/Views/Panels/DeviceInfo.xaml
@@ -40,6 +40,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="panels:DeviceInfoViewModel"
             x:Class="Aaru.Gui.Views.Panels.DeviceInfo">
    <Design.DataContext>
        <panels:DeviceInfoViewModel />
--- a/Aaru.Gui/Views/Panels/FileSystem.xaml
+++ b/Aaru.Gui/Views/Panels/FileSystem.xaml
@@ -41,6 +41,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="panels:FileSystemViewModel"
             x:Class="Aaru.Gui.Views.Panels.FileSystem">
    <Design.DataContext>
        <panels:FileSystemViewModel />
--- a/Aaru.Gui/Views/Panels/ImageInfo.xaml
+++ b/Aaru.Gui/Views/Panels/ImageInfo.xaml
@@ -41,6 +41,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="panels:ImageInfoViewModel"
             x:Class="Aaru.Gui.Views.Panels.ImageInfo">
    <Design.DataContext>
        <panels:ImageInfoViewModel />
--- a/Aaru.Gui/Views/Panels/MediaInfo.xaml
+++ b/Aaru.Gui/Views/Panels/MediaInfo.xaml
@@ -40,6 +40,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="panels:MediaInfoViewModel"
             x:Class="Aaru.Gui.Views.Panels.MediaInfo">
    <Design.DataContext>
        <panels:MediaInfoViewModel />
--- a/Aaru.Gui/Views/Panels/Partition.xaml
+++ b/Aaru.Gui/Views/Panels/Partition.xaml
@@ -40,6 +40,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="panels:PartitionViewModel"
             x:Class="Aaru.Gui.Views.Panels.Partition">
    <Design.DataContext>
        <panels:PartitionViewModel />
--- a/Aaru.Gui/Views/Panels/Subdirectory.xaml
+++ b/Aaru.Gui/Views/Panels/Subdirectory.xaml
@@ -41,6 +41,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="panels:SubdirectoryViewModel"
             x:Class="Aaru.Gui.Views.Panels.Subdirectory">
    <Design.DataContext>
        <panels:SubdirectoryViewModel />
--- a/Aaru.Gui/Views/Tabs/AtaInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/AtaInfo.xaml
@@ -41,6 +41,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="tabs:AtaInfoViewModel"
             x:Class="Aaru.Gui.Views.Tabs.AtaInfo">
    <Design.DataContext>
        <tabs:AtaInfoViewModel />
--- a/Aaru.Gui/Views/Tabs/BlurayInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/BlurayInfo.xaml
@@ -41,6 +41,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="tabs:BlurayInfoViewModel"
             x:Class="Aaru.Gui.Views.Tabs.BlurayInfo">
    <Design.DataContext>
        <tabs:BlurayInfoViewModel />
--- a/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml
@@ -41,6 +41,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="tabs:CompactDiscInfoViewModel"
             x:Class="Aaru.Gui.Views.Tabs.CompactDiscInfo">
    <Design.DataContext>
        <tabs:CompactDiscInfoViewModel />
--- a/Aaru.Gui/Views/Tabs/DvdInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/DvdInfo.xaml
@@ -41,6 +41,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="tabs:DvdInfoViewModel"
             x:Class="Aaru.Gui.Views.Tabs.DvdInfo">
    <Design.DataContext>
        <tabs:DvdInfoViewModel />
--- a/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml
@@ -41,6 +41,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="tabs:DvdWritableInfoViewModel"
             x:Class="Aaru.Gui.Views.Tabs.DvdWritableInfo">
    <Design.DataContext>
        <tabs:DvdWritableInfoViewModel />
--- a/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml
@@ -41,6 +41,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="tabs:PcmciaInfoViewModel"
             x:Class="Aaru.Gui.Views.Tabs.PcmciaInfo">
    <Design.DataContext>
        <tabs:PcmciaInfoViewModel />
--- a/Aaru.Gui/Views/Tabs/ScsiInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/ScsiInfo.xaml
@@ -41,6 +41,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="tabs:ScsiInfoViewModel"
             x:Class="Aaru.Gui.Views.Tabs.ScsiInfo">
    <Design.DataContext>
        <tabs:ScsiInfoViewModel />
--- a/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml
@@ -41,6 +41,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="tabs:SdMmcInfoViewModel"
             x:Class="Aaru.Gui.Views.Tabs.SdMmcInfo">
    <Design.DataContext>
        <tabs:SdMmcInfoViewModel />
--- a/Aaru.Gui/Views/Tabs/XboxInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/XboxInfo.xaml
@@ -40,6 +40,7 @@
             mc:Ignorable="d"
             d:DesignWidth="800"
             d:DesignHeight="450"
+             x:DataType="tabs:XboxInfoViewModel"
             x:Class="Aaru.Gui.Views.Tabs.XboxInfo">
    <Design.DataContext>
        <tabs:XboxInfoViewModel />
--- a/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml
+++ b/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml
@@ -45,6 +45,7 @@
        Height="480"
        x:Class="Aaru.Gui.Views.Windows.DecodeMediaTags"
        Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:DecodeMediaTagsViewModel"
        Title="{x:Static localization:UI.Title_Decode_media_tags}">
    <Design.DataContext>
        <windows:DecodeMediaTagsViewModel />
--- a/Aaru.Gui/Views/Windows/IbgLogView.axaml
+++ b/Aaru.Gui/Views/Windows/IbgLogView.axaml
@@ -9,6 +9,7 @@
        d:DesignWidth="800"
        d:DesignHeight="450"
        x:Class="Aaru.Gui.Views.Windows.IbgLogView"
+        x:DataType="windows:IbgLogViewModel"
        Title="{x:Static localization:UI.Title_IMGBurn_log_viewer}">
    <Design.DataContext>
        <windows:IbgLogViewModel />
--- a/Aaru.Gui/Views/Windows/ImageChecksum.xaml
+++ b/Aaru.Gui/Views/Windows/ImageChecksum.xaml
@@ -45,6 +45,7 @@
        Height="600"
        x:Class="Aaru.Gui.Views.Windows.ImageChecksum"
        Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:ImageChecksumViewModel"
        Title="{x:Static localization:UI.Title_Checksum_image_contents}">
    <Design.DataContext>
        <windows:ImageChecksumViewModel />
--- a/Aaru.Gui/Views/Windows/ImageConvert.xaml
+++ b/Aaru.Gui/Views/Windows/ImageConvert.xaml
@@ -45,6 +45,7 @@
        Height="832"
        x:Class="Aaru.Gui.Views.Windows.ImageConvert"
        Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:ImageConvertViewModel"
        Title="{x:Static localization:UI.Title_Convert_image}">
    <Design.DataContext>
        <windows:ImageConvertViewModel />
--- a/Aaru.Gui/Views/Windows/ImageEntropy.xaml
+++ b/Aaru.Gui/Views/Windows/ImageEntropy.xaml
@@ -45,6 +45,7 @@
        Height="320"
        x:Class="Aaru.Gui.Views.Windows.ImageEntropy"
        Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:ImageEntropyViewModel"
        Title="{x:Static localization:UI.Title_Calculating_entropy}">
    <Design.DataContext>
        <windows:ImageEntropyViewModel />
--- a/Aaru.Gui/Views/Windows/ImageSidecar.xaml
+++ b/Aaru.Gui/Views/Windows/ImageSidecar.xaml
@@ -46,6 +46,7 @@
        x:Class="Aaru.Gui.Views.Windows.ImageSidecar"
        Icon="/Assets/aaru-logo.png"
        CanResize="False"
+        x:DataType="windows:ImageSidecarViewModel"
        Title="Image sidecar creation">
    <Design.DataContext>
        <windows:ImageSidecarViewModel />
--- a/Aaru.Gui/Views/Windows/ImageVerify.xaml
+++ b/Aaru.Gui/Views/Windows/ImageVerify.xaml
@@ -45,6 +45,7 @@
        Height="400"
        x:Class="Aaru.Gui.Views.Windows.ImageVerify"
        Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:ImageVerifyViewModel"
        Title="{x:Static localization:UI.Title_Verify_image}">
    <Design.DataContext>
        <windows:ImageVerifyViewModel />
--- a/Aaru.Gui/Views/Windows/MainWindow.axaml
+++ b/Aaru.Gui/Views/Windows/MainWindow.axaml
@@ -10,6 +10,7 @@
        d:DesignHeight="450"
        x:Class="Aaru.Gui.Views.Windows.MainWindow"
        Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:MainWindowViewModel"
        Title="{Binding Title, Mode=OneWay}">
    <Design.DataContext>
        <windows:MainWindowViewModel />
@@ -86,19 +87,19 @@
                            <StackPanel.ContextMenu>
                                <ContextMenu
                                    DataContext="{Binding Path=DataContext, RelativeSource={RelativeSource AncestorType=Window}, Mode=OneWay}">
-                                    <MenuItem Command="{Binding CalculateEntropyCommand, Mode=OneWay}"
+                                    <MenuItem Command="{Binding $parent[Window].DataContext.CalculateEntropyCommand, Mode=OneWay}"
                                              Header="{x:Static localization:UI.ButtonLabel_Calculate_entropy}" />
-                                    <MenuItem Command="{Binding VerifyImageCommand, Mode=OneWay}"
+                                    <MenuItem Command="{Binding $parent[Window].DataContext.VerifyImageCommand, Mode=OneWay}"
                                              Header="{x:Static localization:UI.ButtonLabel_Verify}" />
-                                    <MenuItem Command="{Binding ChecksumImageCommand, Mode=OneWay}"
+                                    <MenuItem Command="{Binding $parent[Window].DataContext.ChecksumImageCommand, Mode=OneWay}"
                                              Header="{x:Static localization:UI.ButtonLabel_Checksum}" />
-                                    <MenuItem Command="{Binding ConvertImageCommand, Mode=OneWay}"
+                                    <MenuItem Command="{Binding $parent[Window].DataContext.ConvertImageCommand, Mode=OneWay}"
                                              Header="{x:Static localization:UI.ButtonLabel_Convert_to}" />
-                                    <MenuItem Command="{Binding CreateSidecarCommand, Mode=OneWay}"
+                                    <MenuItem Command="{Binding $parent[Window].DataContext.CreateSidecarCommand, Mode=OneWay}"
                                              Header="{x:Static localization:UI.ButtonLabel_Create_Aaru_Metadata_sidecar}" />
-                                    <MenuItem Command="{Binding ViewImageSectorsCommand, Mode=OneWay}"
+                                    <MenuItem Command="{Binding $parent[Window].DataContext.ViewImageSectorsCommand, Mode=OneWay}"
                                              Header="{x:Static localization:UI.ButtonLabel_View_sectors}" />
-                                    <MenuItem Command="{Binding DecodeImageMediaTagsCommand, Mode=OneWay}"
+                                    <MenuItem Command="{Binding $parent[Window].DataContext.DecodeImageMediaTagsCommand, Mode=OneWay}"
                                              Header="{x:Static localization:UI.ButtonLabel_Decode_media_tags}" />
                                </ContextMenu>
                            </StackPanel.ContextMenu>
--- a/Aaru.Gui/Views/Windows/MediaDump.xaml
+++ b/Aaru.Gui/Views/Windows/MediaDump.xaml
@@ -42,6 +42,7 @@
        d:DesignHeight="450"
        x:Class="Aaru.Gui.Views.Windows.MediaDump"
        Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:MediaDumpViewModel"
        Title="{Binding Title}">
    <Design.DataContext>
        <windows:MediaDumpViewModel />
--- a/Aaru.Gui/Views/Windows/MediaScan.xaml
+++ b/Aaru.Gui/Views/Windows/MediaScan.xaml
@@ -42,6 +42,7 @@
        d:DesignHeight="450"
        x:Class="Aaru.Gui.Views.Windows.MediaScan"
        Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:MediaScanViewModel"
        Title="{Binding Title}">
    <Design.DataContext>
        <windows:MediaScanViewModel />
--- a/Aaru.Gui/Views/Windows/SplashWindow.xaml
+++ b/Aaru.Gui/Views/Windows/SplashWindow.xaml
@@ -42,6 +42,7 @@
        x:Class="Aaru.Gui.Views.Windows.SplashWindow"
        Icon="/Assets/aaru-logo.png"
        Title="Aaru"
+        x:DataType="windows:SplashWindowViewModel"
        SystemDecorations="BorderOnly">
    <Design.DataContext>
        <windows:SplashWindowViewModel />
--- a/Aaru.Gui/Views/Windows/ViewSector.xaml
+++ b/Aaru.Gui/Views/Windows/ViewSector.xaml
@@ -45,6 +45,7 @@
        Height="480"
        x:Class="Aaru.Gui.Views.Windows.ViewSector"
        Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:ViewSectorViewModel"
        Title="{x:Static localization:UI.Title_Sector_viewer}">
    <Design.DataContext>
        <windows:ViewSectorViewModel />