WinGui: Some minor further work to the dark theme.

diff --git a/win/CS/HandBrakeWPF/Views/ErrorView.xaml b/win/CS/HandBrakeWPF/Views/ErrorView.xaml
index fb6f1ac7a983ac16cbbeaaa724a12593f51062f8..02f6d4a84aeef6b4e4805d6c5d9fc37507ba0429 100644 (file)
--- 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"\r
         xmlns:cal="http://www.caliburnproject.org"\r
         xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"\r
+        xmlns:converters="clr-namespace:HandBrakeWPF.Converters"\r
         Title="{Binding Title}"\r
         Width="680"\r
         Height="380"\r
@@ -11,6 +12,11 @@
         FontSize="11"\r
         TextOptions.TextFormattingMode="Display"\r
         WindowStartupLocation="CenterOwner">\r
+\r
+    <Window.Resources>\r
+        <converters:ThemeImageConverter x:Key="themeConverter" />\r
+    </Window.Resources>\r
+\r
     <Grid>\r
         <Grid.RowDefinitions>\r
             <RowDefinition Height="Auto" />\r
@@ -82,7 +88,7 @@
                            Width="16"\r
                            Height="16"\r
                            Margin="0,0,5,0"\r
-                           Source="Images/copy.png" />\r
+                           Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Copy.png'}" />\r
                     <TextBlock Grid.Column="1" Text="{x:Static Properties:Resources.Generic_CopyToClipboard}" />\r
                 </Grid>\r
             </Button>\r

diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml b/win/CS/HandBrakeWPF/Views/LogView.xaml
index 73170f5419b2878400a4e2f032c348c5bdbde5c8..69a2e77e85227d73a38782d9f73b9d8337f58d0f 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/LogView.xaml
+++ b/win/CS/HandBrakeWPF/Views/LogView.xaml
@@ -53,12 +53,12 @@
                     <ContextMenu>\r
                         <MenuItem Header="{x:Static Properties:Resources.LogView_CopyClipboard}" cal:Message.Attach="[Event Click] = [Action CopyLog]" >\r
                             <MenuItem.Icon>\r
-                                <Image Width="16" Source="Images/copy.png" />\r
+                                <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='../Views/Images/Copy.png'}" />\r
                             </MenuItem.Icon>\r
                         </MenuItem>\r
                         <MenuItem Header="{x:Static Properties:Resources.LogView_OpenLogDir}" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]">\r
                             <MenuItem.Icon>\r
-                                <Image Width="16" Source="Images/folder.png" />\r
+                                <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='../Views/Images/Folder.png'}" />\r
                             </MenuItem.Icon>\r
                         </MenuItem>\r
                         <Separator />\r

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 6b96700d57df3a382053e669ee1dc6465d01a8d8..21d226deb5924ef8e444a30e6f766ad4a678671b 100644 (file)
--- 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"\r
                                                Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Refresh.png'}">\r
                                             </Image>\r
-                                            <TextBlock Text="{x:Static Properties:Resources.QueueView_Reset}" />\r
+                                            <TextBlock Text="{x:Static Properties:Resources.QueueView_Reset}" VerticalAlignment="Center" />\r
                                         </StackPanel>\r
 \r
                                     </Button.Content>\r
@@ -347,7 +347,7 @@
                                             <Image Width="20" Margin="0,0,5,0" Height="20" VerticalAlignment="Center"\r
                                                Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='New.png'}">\r
                                             </Image>\r
-                                            <TextBlock Text="{x:Static Properties:Resources.QueueView_Edit}" />\r
+                                            <TextBlock Text="{x:Static Properties:Resources.QueueView_Edit}" VerticalAlignment="Center" />\r
                                         </StackPanel>\r
                                     </Button.Content>\r
                                     <i:Interaction.Triggers>\r
@@ -471,10 +471,10 @@
                                 </Grid.ColumnDefinitions>\r
 \r
                                 <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_StartTime}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />\r
-                                <TextBlock Text="{Binding SelectedTask.Statistics.StartTime}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />\r
+                                <TextBlock Text="{Binding SelectedTask.Statistics.StartTimeDisplay}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />\r
 \r
                                 <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_EndTime}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />\r
-                                <TextBlock Text="{Binding SelectedTask.Statistics.EndTime}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />\r
+                                <TextBlock Text="{Binding SelectedTask.Statistics.EndTimeDisplay}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />\r
 \r
                                 <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_PausedDuration}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />\r
                                 <TextBlock Text="{Binding SelectedTask.Statistics.PausedDuration,StringFormat=hh\\:mm\\:ss}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1" />\r
@@ -500,12 +500,12 @@
                             <ContextMenu>\r
                                 <MenuItem Header="{x:Static Properties:Resources.LogView_CopyClipboard}" cal:Message.Attach="[Event Click] = [Action CopyLog]" >\r
                                     <MenuItem.Icon>\r
-                                        <Image Width="16" Source="Images/copy.png" />\r
+                                        <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Copy.png'}" />\r
                                     </MenuItem.Icon>\r
                                 </MenuItem>\r
                                 <MenuItem Header="{x:Static Properties:Resources.LogView_OpenLogDir}" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]">\r
                                     <MenuItem.Icon>\r
-                                        <Image Width="16" Source="Images/folder.png" />\r
+                                        <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Folder.png'}" />\r
                                     </MenuItem.Icon>\r
                                 </MenuItem>\r
                             </ContextMenu>\r