WinGui: Add a Reorder icon to the Audio/Subtitle Records. Re-arrange the buttons to be more consistent with the MacGui bringing the selection behaviour button closer to the left side. Fix Localisation Issue on the Add Subtitle button. HandBrake#2553

Author: sr55

win/CS/HandBrakeWPF/HandBrakeWPF.csproj

@@ -36,6 +36,8 @@
 
   <ItemGroup>
     <None Remove="handbrakepineapple.ico" />
+    <None Remove="Views\Images\Dark\Reorder.png" />
+    <None Remove="Views\Images\Light\Reorder.png" />
   </ItemGroup>
 
   <ItemGroup>
@@ -78,6 +80,7 @@
     <Resource Include="Views\Images\Dark\Queue.png" />
     <Resource Include="Views\Images\Dark\Refresh.png" />
     <Resource Include="Views\Images\Dark\Remove.png" />
+    <Resource Include="Views\Images\Dark\Reorder.png" />
     <Resource Include="Views\Images\Dark\Settings.png" />
     <Resource Include="Views\Images\Dark\Source.png" />
     <Resource Include="Views\Images\Disc.png" />
@@ -100,6 +103,7 @@
     <Resource Include="Views\Images\Light\Queue.png" />
     <Resource Include="Views\Images\Light\Refresh.png" />
     <Resource Include="Views\Images\Light\Remove.png" />
+    <Resource Include="Views\Images\Light\Reorder.png" />
     <Resource Include="Views\Images\Light\Settings.png" />
     <Resource Include="Views\Images\Light\Source.png" />
     <Resource Include="Views\Images\logo128.png" />

win/CS/HandBrakeWPF/Properties/Resources.Designer.cs

@@ -2195,4 +2195,7 @@ Where supported, any user presets will have been imported.</value>
   <data name="Options_PauseOnLowBattery" xml:space="preserve">
     <value>Pause any running jobs when the battery gets low.</value>
   </data>
+  <data name="SubtitleView_AddRemainingCC" xml:space="preserve">
+    <value>Add All Remaining Closed Captions</value>
+  </data>
 </root>

win/CS/HandBrakeWPF/Properties/Resources.resx

@@ -23,6 +23,7 @@
         <Audio:AudioRateTypeConverter x:Key="audioRateTypeConverter" />
         <Audio:AudioMixdownConverter x:Key="audioMixdownConverter" />
         <Audio:AudioMixdownListConverter x:Key="audioMixdownListConverter" />
+        <Conveters:ThemeImageConverter x:Key="themeConverter" />
     </UserControl.Resources>
 
     <Grid>
@@ -56,8 +57,8 @@
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
 
@@ -83,20 +84,22 @@
                     </Button.ContextMenu>
                 </Button>
 
+    
                 <Button MinWidth="65" Grid.Column="1"
-                    Margin="0,0,10,0"
-                    cal:Message.Attach="[Event Click] = [Action Clear]"
-                    Content="{x:Static Properties:Resources.Generic_Clear}" />
-
-                <Button MinWidth="65" Grid.Column="3"
-                    Margin="0,0,10,0"
+                    Margin="10,0,5,0"
                     cal:Message.Attach="[Event Click] = [Action ShowAudioDefaults]"
                     Content="{Binding SwitchDisplayTitle}" />
 
-                <Button MinWidth="65" Grid.Column="4"
+                <Button MinWidth="65" Grid.Column="2"
                     cal:Message.Attach="[Event Click] = [Action ReloadDefaults]"
                     Content="{x:Static Properties:Resources.Shared_ReloadDefaults}" />
 
+                <Button MinWidth="65" Grid.Column="4"
+                        Margin="0,0,0,0"
+                        cal:Message.Attach="[Event Click] = [Action Clear]"
+                        Content="{x:Static Properties:Resources.Generic_Clear}" />
+
+
 
             </Grid>
         </Grid>
@@ -163,6 +166,8 @@
                                 <RowDefinition Height="28" />
                             </Grid.RowDefinitions>
 
+                            <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Reorder.png'}" />
+
                             <!--  Row 1  -->
                             <ComboBox Grid.Column="1" Height="22" Width="130" Margin="5,0,5,0" HorizontalAlignment="Stretch"
                                       ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
@@ -207,7 +212,7 @@
 
 
                             <ToggleButton Name="advancedOptionsToggle" VerticalAlignment="Center" Grid.Column="8" Grid.Row="0" Grid.ColumnSpan="2" Margin="5,0,0,0"
-                                           Padding="3,0" Height="22" HorizontalAlignment="Left" >
+                                           Padding="3,0" Height="22" HorizontalAlignment="Left" Background="Transparent" >
                                 <ToggleButton.Style>
                                     <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
                                         <Setter Property="Content" Value="Show"/>

win/CS/HandBrakeWPF/Views/AudioView.xaml

@@ -20,6 +20,7 @@
         <Converters:BooleanToVisibilityConverter x:Key="booleanToVisConverter" />
         <Converters:BooleanConverter x:Key="booleanConverter" />
         <subtitles:CanBurnSubtitleConverter x:Key="canBurnSubtitleConverter" />
+        <Converters:ThemeImageConverter x:Key="themeConverter" />
 
         <Style x:Key="LongToolTip" TargetType="TextBlock">
             <Setter Property="Width" Value="400" />
@@ -56,8 +57,8 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
 
@@ -77,30 +78,29 @@
                 <Button.ContextMenu>
                     <ContextMenu x:Name="MainContextMenu" PlacementRectangle="{Binding RelativeSource={RelativeSource Self}}">
                         <MenuItem Header="{x:Static Properties:Resources.Shared_AddNewTrack}" cal:Message.Attach="[Event Click] = [Action Add]" />
-                        <MenuItem Header="Add All Remaining Tracks" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />
-                        <MenuItem Header="Add All Remaining Closed Captions" cal:Message.Attach="[Event Click] = [Action AddAllClosedCaptions]" />
-                        <MenuItem Header="Add All Remaining Selected Languages" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />
+                        <MenuItem Header="{x:Static Properties:Resources.Shared_AddAllRemaining}" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />
+                        <MenuItem Header="{x:Static Properties:Resources.SubtitleView_AddRemainingCC}" cal:Message.Attach="[Event Click] = [Action AddAllClosedCaptions]" />
+                        <MenuItem Header="{x:Static Properties:Resources.Shared_AddAllForSelected}" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />
+                        <Separator/>
+                        <MenuItem Header="{x:Static Properties:Resources.SubtitlesView_ImportSubtitle}" cal:Message.Attach="[Event Click] = [Action Import]" />
                     </ContextMenu>
                 </Button.ContextMenu>
             </Button>
 
-            <Button MinWidth="75" Grid.Column="1"
-                    cal:Message.Attach="[Event Click] = [Action Import]"
-                    Content="{x:Static Properties:Resources.SubtitlesView_ImportSubtitle}"
-                    Margin="0,0,10,0"/>
-            <Button MinWidth="65" Grid.Column="2"
-                    Margin="0,0,10,0"
-                    cal:Message.Attach="[Event Click] = [Action Clear]"
-                    Content="{x:Static Properties:Resources.Generic_Clear}" />
 
-            <Button MinWidth="65" Grid.Column="4"
-                    Margin="0,0,10,0"
+            <Button MinWidth="65" Grid.Column="2"
+                    Margin="10,0,5,0"
                     cal:Message.Attach="[Event Click] = [Action ShowSubtitleDefaultsPanel]"
                     Content="{Binding SwitchDisplayTitle}" />
 
-            <Button MinWidth="65" Grid.Column="5"
+            <Button MinWidth="65" Grid.Column="3"
                     cal:Message.Attach="[Event Click] = [Action ReloadDefaults]"
                     Content="{x:Static Properties:Resources.Shared_ReloadDefaults}" />
+
+            <Button MinWidth="65" Grid.Column="5"
+                    Margin="0,0,0,0"
+                    cal:Message.Attach="[Event Click] = [Action Clear]"
+                    Content="{x:Static Properties:Resources.Generic_Clear}" />
         </Grid>
 
 
@@ -162,6 +162,8 @@
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
 
+                            <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Reorder.png'}" />
+
                             <ComboBox Grid.Column="1" Height="22" Width="235" Margin="5,0,5,0" HorizontalAlignment="Stretch"
                                       ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
                                       SelectedItem="{Binding SourceTrack}" />