From 185f8fb7ab41305c080cb45053bce1b302554a7e Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Wed, 19 Nov 2025 23:05:55 +0000
Subject: [PATCH] [GUI] Reorganize media scan window.

---
 Aaru.Gui/Views/Windows/MediaScan.xaml | 87 ++++++++++++++++-----------
 Aaru.Localization/UI.Designer.cs      | 12 ++++
 Aaru.Localization/UI.es.resx          |  6 ++
 Aaru.Localization/UI.resx             |  6 ++
 4 files changed, 76 insertions(+), 35 deletions(-)

diff --git a/Aaru.Gui/Views/Windows/MediaScan.xaml b/Aaru.Gui/Views/Windows/MediaScan.xaml
index 63104d449..00266ff12 100644
--- a/Aaru.Gui/Views/Windows/MediaScan.xaml
+++ b/Aaru.Gui/Views/Windows/MediaScan.xaml
@@ -37,46 +37,57 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows"
         xmlns:localization="clr-namespace:Aaru.Localization;assembly=Aaru.Localization"
+        xmlns:controls="clr-namespace:Aaru.Gui.Controls"
         mc:Ignorable="d"
         d:DesignWidth="800"
         d:DesignHeight="450"
         x:Class="Aaru.Gui.Views.Windows.MediaScan"
         Icon="/Assets/aaru-logo.png"
         x:DataType="windows:MediaScanViewModel"
-        Title="{Binding Title}">
+        Width="900"
+        Height="580"
+        Title="{Binding Title, Mode=OneWay}">
     <Design.DataContext>
         <windows:MediaScanViewModel />
     </Design.DataContext>
-    <StackPanel Orientation="Vertical">
-        <TabControl IsVisible="{Binding ResultsVisible}">
+    <Grid RowDefinitions="*, Auto, Auto"
+          Margin="12"
+          RowSpacing="8">
+        <TabControl Grid.Row="0"
+                    IsVisible="{Binding ResultsVisible, Mode=OneWay}">
             <TabItem>
                 <TabItem.Header>
-                    <TextBlock Text="Log" />
+                    <TextBlock Text="{x:Static localization:UI.Title_Log}" />
                 </TabItem.Header>
-                <StackPanel Orientation="Vertical">
-                    <TextBlock Text="{Binding A}" /> <TextBlock Text="{Binding B}" /> <TextBlock Text="{Binding C}" />
-                    <TextBlock Text="{Binding D}" /> <TextBlock Text="{Binding E}" /> <TextBlock Text="{Binding F}" />
-                    <TextBlock Text="{Binding UnreadableSectors}"
-                               IsVisible="{Binding !!UnreadableSectors}" />
-                    <TextBlock Text="{Binding TotalTime}"
-                               IsVisible="{Binding !!TotalTime}" />
-                    <TextBlock Text="{Binding AvgSpeed}"
-                               IsVisible="{Binding !!AvgSpeed}" />
-                    <TextBlock Text="{Binding MaxSpeed}"
-                               IsVisible="{Binding !!MaxSpeed}" />
-                    <TextBlock Text="{Binding MinSpeed}"
-                               IsVisible="{Binding !!MinSpeed}" />
+                <StackPanel Orientation="Vertical"
+                            Margin="8">
+                    <controls:SpectreTextBlock Text="{Binding A, Mode=OneWay}" />
+                    <controls:SpectreTextBlock Text="{Binding B, Mode=OneWay}" />
+                    <controls:SpectreTextBlock Text="{Binding C, Mode=OneWay}" />
+                    <controls:SpectreTextBlock Text="{Binding D, Mode=OneWay}" />
+                    <controls:SpectreTextBlock Text="{Binding E, Mode=OneWay}" />
+                    <controls:SpectreTextBlock Text="{Binding F, Mode=OneWay}" />
+                    <controls:SpectreTextBlock Text="{Binding UnreadableSectors, Mode=OneWay}"
+                                               IsVisible="{Binding !!UnreadableSectors, Mode=OneWay}" />
+                    <controls:SpectreTextBlock Text="{Binding TotalTime, Mode=OneWay}"
+                                               IsVisible="{Binding !!TotalTime, Mode=OneWay}" />
+                    <controls:SpectreTextBlock Text="{Binding AvgSpeed, Mode=OneWay}"
+                                               IsVisible="{Binding !!AvgSpeed, Mode=OneWay}" />
+                    <controls:SpectreTextBlock Text="{Binding MaxSpeed, Mode=OneWay}"
+                                               IsVisible="{Binding !!MaxSpeed, Mode=OneWay}" />
+                    <controls:SpectreTextBlock Text="{Binding MinSpeed, Mode=OneWay}"
+                                               IsVisible="{Binding !!MinSpeed, Mode=OneWay}" />
                 </StackPanel>
             </TabItem>
             <TabItem>
                 <TabItem.Header>
-                    <TextBlock Text="Graph" />
+                    <TextBlock Text="{x:Static localization:UI.Title_Block_map}" />
                 </TabItem.Header>
                 <!--                <controls:BlockMap Width="750" Height="400" Blocks="{Binding Blocks}" ItemsSource="{Binding BlockMapList}" /> -->
             </TabItem>
             <TabItem>
                 <TabItem.Header>
-                    <TextBlock Text="Chart" />
+                    <TextBlock Text="{x:Static localization:UI.Title_Chart}" />
                 </TabItem.Header>
                 <!-- TODO: Abandoned project need to find replacement
                 <avalonia:Plot Height="300" PlotMargins="50 0 0 0" PlotAreaBorderColor="#999999"
@@ -97,30 +108,36 @@
                 -->
             </TabItem>
         </TabControl>
-        <StackPanel Orientation="Vertical"
-                    IsVisible="{Binding ProgressVisible}">
+        <StackPanel Grid.Row="1"
+                    Orientation="Vertical"
+                    IsVisible="{Binding ProgressVisible, Mode=OneWay}"
+                    Spacing="8">
             <StackPanel Orientation="Vertical"
-                        IsVisible="{Binding Progress1Visible}">
-                <TextBlock Text="{Binding ProgressText}" />
-                <ProgressBar Maximum="{Binding ProgressMaxValue}"
-                             IsIndeterminate="{Binding ProgressIndeterminate}"
-                             Value="{Binding ProgressValue}" />
+                        IsVisible="{Binding Progress1Visible, Mode=OneWay}"
+                        Spacing="8">
+                <controls:SpectreTextBlock Text="{Binding ProgressText, Mode=OneWay}" />
+                <ProgressBar Maximum="{Binding ProgressMaxValue, Mode=OneWay}"
+                             IsIndeterminate="{Binding ProgressIndeterminate, Mode=OneWay}"
+                             Value="{Binding ProgressValue, Mode=OneWay}" />
             </StackPanel>
         </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <Button Command="{Binding StartCommand}"
-                    IsVisible="{Binding StartVisible}">
+        <StackPanel Grid.Row="2"
+                    Orientation="Horizontal"
+                    Spacing="8"
+                    HorizontalAlignment="Right">
+            <Button Command="{Binding StartCommand, Mode=OneWay}"
+                    IsVisible="{Binding StartVisible, Mode=OneWay}">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Start}" />
             </Button>
-            <Button Command="{Binding CloseCommand}"
-                    IsVisible="{Binding CloseVisible}">
+            <Button Command="{Binding CloseCommand, Mode=OneWay}"
+                    IsVisible="{Binding CloseVisible, Mode=OneWay}">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Close}" />
             </Button>
-            <Button Command="{Binding StopCommand}"
-                    IsVisible="{Binding StopVisible}"
-                    IsEnabled="{Binding StopEnabled}">
+            <Button Command="{Binding StopCommand, Mode=OneWay}"
+                    IsVisible="{Binding StopVisible, Mode=OneWay}"
+                    IsEnabled="{Binding StopEnabled, Mode=OneWay}">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Stop}" />
             </Button>
         </StackPanel>
-    </StackPanel>
+    </Grid>
 </Window>
\ No newline at end of file
diff --git a/Aaru.Localization/UI.Designer.cs b/Aaru.Localization/UI.Designer.cs
index 2999357a0..71a59c81a 100644
--- a/Aaru.Localization/UI.Designer.cs
+++ b/Aaru.Localization/UI.Designer.cs
@@ -6555,5 +6555,17 @@ namespace Aaru.Localization {
                 return ResourceManager.GetString("Querying_media_information", resourceCulture);
             }
         }
+        
+        public static string Title_Block_map {
+            get {
+                return ResourceManager.GetString("Title_Block_map", resourceCulture);
+            }
+        }
+        
+        public static string Title_Chart {
+            get {
+                return ResourceManager.GetString("Title_Chart", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Aaru.Localization/UI.es.resx b/Aaru.Localization/UI.es.resx
index 04f9506aa..5a5b5d4cc 100644
--- a/Aaru.Localization/UI.es.resx
+++ b/Aaru.Localization/UI.es.resx
@@ -3278,4 +3278,10 @@ Probadores:
     <data name="Querying_media_information" xml:space="preserve">
         <value>[slateblue1]Obteniendo información del medio...[/]</value>
     </data>
+    <data name="Title_Block_map" xml:space="preserve">
+        <value>Mapa</value>
+    </data>
+    <data name="Title_Chart" xml:space="preserve">
+        <value>Gráfica</value>
+    </data>
 </root>
\ No newline at end of file
diff --git a/Aaru.Localization/UI.resx b/Aaru.Localization/UI.resx
index 3d4656d11..460a2f795 100644
--- a/Aaru.Localization/UI.resx
+++ b/Aaru.Localization/UI.resx
@@ -3353,4 +3353,10 @@ Do you want to continue?</value>
     <data name="Querying_media_information" xml:space="preserve">
         <value>[slateblue1]Querying media information...[/]</value>
     </data>
+    <data name="Title_Block_map" xml:space="preserve">
+        <value>Block map</value>
+    </data>
+    <data name="Title_Chart" xml:space="preserve">
+        <value>Chart</value>
+    </data>
 </root>
\ No newline at end of file