From d44b6d1909b11d272fbb660760066cda8ed72f4c Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Mon, 27 Oct 2025 13:16:42 +0000
Subject: [PATCH] [GUI] Redesign and reorganize ImageSidecar window.

---
 Aaru.Gui/Views/Windows/ImageSidecar.xaml | 75 ++++++++++++------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/Aaru.Gui/Views/Windows/ImageSidecar.xaml b/Aaru.Gui/Views/Windows/ImageSidecar.xaml
index d5efecb50..7a74effdd 100644
--- a/Aaru.Gui/Views/Windows/ImageSidecar.xaml
+++ b/Aaru.Gui/Views/Windows/ImageSidecar.xaml
@@ -37,61 +37,62 @@
         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"
-        Width="480"
+        Width="640"
         Height="320"
         x:Class="Aaru.Gui.Views.Windows.ImageSidecar"
         Icon="/Assets/aaru-logo.png"
         CanResize="False"
-        Title="{Binding Title}">
+        Title="Image sidecar creation">
     <Design.DataContext>
         <windows:ImageSidecarViewModel />
     </Design.DataContext>
-    <StackPanel Orientation="Vertical">
-        <TextBlock Text="{x:Static localization:UI.Title_Destination_file}" />
-        <StackPanel Orientation="Horizontal">
-            <TextBox Text="{Binding DestinationText}"
+    <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="12" RowSpacing="8">
+        <TextBlock Grid.Row="0" FontWeight="Bold" Text="{x:Static localization:UI.Title_Destination_file}" />
+        <Grid Grid.Row="1" ColumnDefinitions="*,Auto" ColumnSpacing="8">
+            <TextBox Grid.Column="0" Text="{Binding DestinationText, Mode=OneWay}"
                      IsReadOnly="True" />
-            <Button Command="{Binding DestinationCommand}"
-                    IsEnabled="{Binding DestinationEnabled}">
+            <Button Grid.Column="1" Command="{Binding DestinationCommand, Mode=OneWay}"
+                    IsEnabled="{Binding DestinationEnabled, Mode=OneWay}">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Choose}" />
             </Button>
-        </StackPanel>
-        <StackPanel Orientation="Vertical"
-                    IsVisible="{Binding ProgressVisible}">
-            <TextBlock Text="{Binding StatusText}"
-                       IsVisible="{Binding StatusVisible}" />
-            <StackPanel Orientation="Vertical"
-                        IsVisible="{Binding Progress1Visible}">
-                <TextBlock Text="{Binding ProgressText}" />
-                <ProgressBar Maximum="{Binding ProgressMaxValue}"
-                             Value="{Binding ProgressValue}"
-                             IsIndeterminate="{Binding ProgressIndeterminate}" />
-            </StackPanel>
-            <StackPanel Orientation="Vertical"
-                        IsVisible="{Binding Progress2Visible}">
-                <TextBlock Text="{Binding Progress2Text}" />
-                <ProgressBar Maximum="{Binding Progress2MaxValue}"
-                             Value="{Binding Progress2Value}"
-                             IsIndeterminate="{Binding Progress2Indeterminate}" />
-            </StackPanel>
-        </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <Button Command="{Binding StartCommand}"
-                    IsVisible="{Binding StartVisible}">
+        </Grid>
+        <Grid Grid.Row="2" RowDefinitions="Auto,Auto,Auto" RowSpacing="8"
+                    IsVisible="{Binding ProgressVisible, Mode=OneWay}">
+            <controls:SpectreTextBlock Grid.Row="0" FontWeight="Bold" Text="{Binding StatusText, Mode=OneWay}"
+                                       IsVisible="{Binding StatusVisible, Mode=OneWay}" />
+            <Grid Grid.Row="1" RowDefinitions="Auto,Auto" RowSpacing="8"
+                        IsVisible="{Binding Progress1Visible, Mode=OneWay}">
+                <controls:SpectreTextBlock Grid.Row="0" Text="{Binding ProgressText, Mode=OneWay}" />
+                <ProgressBar Grid.Row="1" Maximum="{Binding ProgressMaxValue, Mode=OneWay}"
+                             Value="{Binding ProgressValue, Mode=OneWay}"
+                             IsIndeterminate="{Binding ProgressIndeterminate, Mode=OneWay}" />
+            </Grid>
+            <Grid Grid.Row="2" RowDefinitions="Auto,Auto" RowSpacing="8"
+                        IsVisible="{Binding Progress2Visible, Mode=OneWay}">
+                <controls:SpectreTextBlock Grid.Row="0" Text="{Binding Progress2Text, Mode=OneWay}" />
+                <ProgressBar Grid.Row="1" Maximum="{Binding Progress2MaxValue, Mode=OneWay}"
+                             Value="{Binding Progress2Value, Mode=OneWay}"
+                             IsIndeterminate="{Binding Progress2Indeterminate, Mode=OneWay}" />
+            </Grid>
+        </Grid>
+        <StackPanel Grid.Row="3" Orientation="Horizontal" Spacing="8" VerticalAlignment="Bottom" 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}"
-                    IsEnabled="{Binding StopEnabled}"
-                    IsVisible="{Binding StopVisible}">
+            <Button Command="{Binding StopCommand, Mode=OneWay}"
+                    IsEnabled="{Binding StopEnabled, Mode=OneWay}"
+                    IsVisible="{Binding StopVisible, Mode=OneWay}">
                 <TextBlock Text="{x:Static localization:UI.ButtonLabel_Stop}" />
             </Button>
         </StackPanel>
-    </StackPanel>
+    </Grid>
 </Window>
\ No newline at end of file