WinGui: Few minor features + Early access to a new "Dark" theme. It's not yet complete but will give a general idea of the look and feel! (Can be toggled on in preferences)

4 files changed, 13 insertions, 22 deletions

diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index ecb53ae4d..c51ce368b 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -143,13 +143,6 @@
                             <ColumnDefinition Width="Auto" />

                         </Grid.ColumnDefinitions>

 

-                        <!--  Marker  -->

-                        <Image Grid.Column="0" Grid.Row="0"

-                               Width="20"

-                               Height="20"

-                               Margin="5,0,5,0"

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

-

                         <!--  Settings  -->

                         <Grid Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch" Margin="0,5,0,5">

                             <Grid.ColumnDefinitions>

@@ -248,7 +241,7 @@
 

                         <!-- Hidden Row -->

                         <Grid Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" Visibility="{Binding IsChecked, ElementName=advancedOptionsToggle, Converter={StaticResource boolToVisConverter}}">

-                            <StackPanel Orientation="Horizontal" Margin="0,5,0,5" >

+                            <StackPanel Orientation="Horizontal" Margin="8,5,0,5" >

 

                                 <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Samplerate}"

                                        Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />

@@ -272,7 +265,7 @@
                                                     Visibility="{Binding IsPassthru, Converter={StaticResource boolToHiddenVisConverter}, ConverterParameter=true}"/>

 

                                 <TextBlock Text="{x:Static Properties:Resources.AudioView_TrackName}" VerticalAlignment="Center" FontWeight="Bold" Margin="5,0,5,0" />

-                                <TextBox Text="{Binding TrackName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="138" Height="22" />

+                                <TextBox Text="{Binding TrackName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="175" Height="22" />

 

                             </StackPanel>

                         </Grid>

diff --git a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
index f916ff503..e74a896dc 100644
--- a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
@@ -32,10 +32,13 @@
                   VerticalAlignment="Stretch"  AutoGenerateColumns="False"

                   CanUserSortColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False"

                   CanUserAddRows="False" CanUserDeleteRows="False" HeadersVisibility="Column"

-                  HorizontalGridLinesBrush="#FFABADB3" VerticalGridLinesBrush="#FFABADB3">

+                  HorizontalGridLinesBrush="#FFABADB3" VerticalGridLinesBrush="#FFABADB3"

+                  Background="Transparent" SelectionMode="Single">

             <DataGrid.CellStyle>

                 <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">

                     <Setter Property="MinHeight" Value="22" />

+                    <Setter Property="BorderThickness" Value="0" />

+                    <Setter Property="VerticalContentAlignment" Value="Center" />

                 </Style>

             </DataGrid.CellStyle>

             <DataGrid.ContextMenu>

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 244929800..9a72fdf51 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -115,7 +115,8 @@
                             <ComboBox DisplayMemberPath="Name" ItemsSource="{Binding InterfaceLanguages}" SelectedItem="{Binding SelectedLanguage}" Margin="5,0,0,0" HorizontalAlignment="Left" Width="150" />

                         </StackPanel>

 

-                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">

+                        <StackPanel Orientation="Vertical" Margin="20,5,0,0">

+                            <CheckBox Content="{x:Static Properties:Resources.Options_DarkTheme}" IsChecked="{Binding UseDarkTheme}" />

                             <CheckBox Content="{x:Static Properties:Resources.Options_MinimiseTray}" IsChecked="{Binding MinimiseToTray}" />

                             <CheckBox Content="{x:Static Properties:Resources.Options_ClearCompleted}" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />

                             <CheckBox Content="{x:Static Properties:Resources.OptionsView_ShowStatusInTitleBar}" IsChecked="{Binding ShowStatusInTitleBar}" />

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index f7ed98288..1270cb258 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -143,13 +143,6 @@
                             <ColumnDefinition Width="Auto" />

                         </Grid.ColumnDefinitions>

 

-                        <!--  Marker  -->

-                        <Image Grid.Column="0"

-                               Width="20"

-                               Height="20"

-                               Margin="5,0,5,0"

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

-

                         <!--  Standard Subtitle Settings  -->

                         <Grid Grid.Column="1" HorizontalAlignment="Stretch" Margin="0,8,0,8"

                               Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=true}">

@@ -226,7 +219,7 @@
                             </Grid.RowDefinitions>

 

                             <!--  Row 1  -->

-                            <TextBlock Grid.Column="0" VerticalAlignment="Center" FontWeight="Bold" Text="Source" />

+                            <TextBlock Grid.Column="0" VerticalAlignment="Center" FontWeight="Bold" Text="Source" Margin="10,0,0,0" />

                             <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding SrtFileName}" Margin="5,0,5,0" Width="75" TextWrapping="NoWrap" TextTrimming="WordEllipsis"

                                        Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=false}" />

 

@@ -243,8 +236,9 @@
                             <TextBlock Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="Offset (ms)" />

                             <controls:NumberBox Grid.Column="7" Width="58" Height="24" Margin="5,0,5,0" Minimum="-9000000" Maximum="900000" 

                                                 IsEnabled="{Binding IsSrtSubtitle}" Number="{Binding SrtOffset, Mode=TwoWay}" />

-             

-                            <CheckBox Grid.Column="8" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Burned}" IsEnabled="{Binding CanBeBurned}" Content="Burn In" FontWeight="Bold">

+

+                            <CheckBox Grid.Column="8" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Burned}" IsEnabled="{Binding CanBeBurned}" Content="Burn In" FontWeight="Bold" 

+                                      VerticalContentAlignment="Center">

                                 <i:Interaction.Triggers>

                                     <i:EventTrigger EventName="Click">

                                         <cal:ActionMessage MethodName="SetBurnedToFalseForAllExcept">

@@ -254,7 +248,7 @@
                                 </i:Interaction.Triggers>

                             </CheckBox>

 

-                            <CheckBox Grid.Column="9" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}" Content="Default" FontWeight="Bold"

+                            <CheckBox Grid.Column="9" Margin="0,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}" Content="Default" FontWeight="Bold" VerticalContentAlignment="Center"

                                       IsEnabled="{Binding DataContext.IsBurnableOnly, Converter={StaticResource booleanConverter}, ConverterParameter=true, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}">

                                 <i:Interaction.Triggers>

                                     <i:EventTrigger EventName="Click">