WinGui: Some minor further work to the dark theme.

3 files changed, 15 insertions, 9 deletions

diff --git a/win/CS/HandBrakeWPF/Views/ErrorView.xaml b/win/CS/HandBrakeWPF/Views/ErrorView.xaml
index fb6f1ac7a..02f6d4a84 100644
--- a/win/CS/HandBrakeWPF/Views/ErrorView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ErrorView.xaml
@@ -3,6 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

         xmlns:cal="http://www.caliburnproject.org"

         xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"

+        xmlns:converters="clr-namespace:HandBrakeWPF.Converters"

         Title="{Binding Title}"

         Width="680"

         Height="380"

@@ -11,6 +12,11 @@
         FontSize="11"

         TextOptions.TextFormattingMode="Display"

         WindowStartupLocation="CenterOwner">

+

+    <Window.Resources>

+        <converters:ThemeImageConverter x:Key="themeConverter" />

+    </Window.Resources>

+

     <Grid>

         <Grid.RowDefinitions>

             <RowDefinition Height="Auto" />

@@ -82,7 +88,7 @@
                            Width="16"

                            Height="16"

                            Margin="0,0,5,0"

-                           Source="Images/copy.png" />

+                           Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Copy.png'}" />

                     <TextBlock Grid.Column="1" Text="{x:Static Properties:Resources.Generic_CopyToClipboard}" />

                 </Grid>

             </Button>

diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml b/win/CS/HandBrakeWPF/Views/LogView.xaml
index 73170f541..69a2e77e8 100644
--- a/win/CS/HandBrakeWPF/Views/LogView.xaml
+++ b/win/CS/HandBrakeWPF/Views/LogView.xaml
@@ -53,12 +53,12 @@
                     <ContextMenu>

                         <MenuItem Header="{x:Static Properties:Resources.LogView_CopyClipboard}" cal:Message.Attach="[Event Click] = [Action CopyLog]" >

                             <MenuItem.Icon>

-                                <Image Width="16" Source="Images/copy.png" />

+                                <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='../Views/Images/Copy.png'}" />

                             </MenuItem.Icon>

                         </MenuItem>

                         <MenuItem Header="{x:Static Properties:Resources.LogView_OpenLogDir}" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]">

                             <MenuItem.Icon>

-                                <Image Width="16" Source="Images/folder.png" />

+                                <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='../Views/Images/Folder.png'}" />

                             </MenuItem.Icon>

                         </MenuItem>

                         <Separator />

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 6b96700d5..21d226deb 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -328,7 +328,7 @@
                                             <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0"

                                                Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Refresh.png'}">

                                             </Image>

-                                            <TextBlock Text="{x:Static Properties:Resources.QueueView_Reset}" />

+                                            <TextBlock Text="{x:Static Properties:Resources.QueueView_Reset}" VerticalAlignment="Center" />

                                         </StackPanel>

 

                                     </Button.Content>

@@ -347,7 +347,7 @@
                                             <Image Width="20" Margin="0,0,5,0" Height="20" VerticalAlignment="Center"

                                                Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='New.png'}">

                                             </Image>

-                                            <TextBlock Text="{x:Static Properties:Resources.QueueView_Edit}" />

+                                            <TextBlock Text="{x:Static Properties:Resources.QueueView_Edit}" VerticalAlignment="Center" />

                                         </StackPanel>

                                     </Button.Content>

                                     <i:Interaction.Triggers>

@@ -471,10 +471,10 @@
                                 </Grid.ColumnDefinitions>

 

                                 <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_StartTime}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />

-                                <TextBlock Text="{Binding SelectedTask.Statistics.StartTime}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />

+                                <TextBlock Text="{Binding SelectedTask.Statistics.StartTimeDisplay}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />

 

                                 <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_EndTime}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />

-                                <TextBlock Text="{Binding SelectedTask.Statistics.EndTime}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />

+                                <TextBlock Text="{Binding SelectedTask.Statistics.EndTimeDisplay}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />

 

                                 <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_PausedDuration}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />

                                 <TextBlock Text="{Binding SelectedTask.Statistics.PausedDuration,StringFormat=hh\\:mm\\:ss}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1" />

@@ -500,12 +500,12 @@
                             <ContextMenu>

                                 <MenuItem Header="{x:Static Properties:Resources.LogView_CopyClipboard}" cal:Message.Attach="[Event Click] = [Action CopyLog]" >

                                     <MenuItem.Icon>

-                                        <Image Width="16" Source="Images/copy.png" />

+                                        <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Copy.png'}" />

                                     </MenuItem.Icon>

                                 </MenuItem>

                                 <MenuItem Header="{x:Static Properties:Resources.LogView_OpenLogDir}" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]">

                                     <MenuItem.Icon>

-                                        <Image Width="16" Source="Images/folder.png" />

+                                        <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Folder.png'}" />

                                     </MenuItem.Icon>

                                 </MenuItem>

                             </ContextMenu>