WinGui: The preferences UI for "Pause on low disk space" was bad with the checkbox being separated from the size limit. Wording / layout for this now matches MacGui.

4 files changed, 18 insertions, 20 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index b29ec5229..892c484be 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -2761,7 +2761,7 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Low diskspace warning level (GB):.
+        ///   Looks up a localized string similar to Pause queue if disk space is lower than:.
         /// </summary>
         public static string Options_LowDiskspaceSize {
             get {
@@ -2770,6 +2770,15 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to GB.
+        /// </summary>
+        public static string Options_LowDiskspaceSizeGB {
+            get {
+                return ResourceManager.GetString("Options_LowDiskspaceSizeGB", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Minimize to system tray (Requires Restart).
         /// </summary>
         public static string Options_MinimiseTray {
@@ -2842,15 +2851,6 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Pause queue if disk space is low before starting a job..
-        /// </summary>
-        public static string Options_PauseQueueOnLowDiskSpace {
-            get {
-                return ResourceManager.GetString("Options_PauseQueueOnLowDiskSpace", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Prevent the system from sleeping while encoding.
         /// </summary>
         public static string Options_PreventSleep {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 172b478bf..c850971d0 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -1241,7 +1241,7 @@ Would you like to overwrite it?</value>
     <value>Log Path:</value>

   </data>

   <data name="Options_LowDiskspaceSize" xml:space="preserve">

-    <value>Low diskspace warning level (GB):</value>

+    <value>Pause queue if disk space is lower than:</value>

   </data>

   <data name="Options_MinimiseTray" xml:space="preserve">

     <value>Minimize to system tray (Requires Restart)</value>

@@ -1264,9 +1264,6 @@ Would you like to overwrite it?</value>
   <data name="Options_PathToVLC" xml:space="preserve">

     <value>Path to VLC Player</value>

   </data>

-  <data name="Options_PauseQueueOnLowDiskSpace" xml:space="preserve">

-    <value>Pause queue if disk space is low before starting a job.</value>

-  </data>

   <data name="Options_PreventSleep" xml:space="preserve">

     <value>Prevent the system from sleeping while encoding</value>

   </data>

@@ -2020,4 +2017,7 @@ Where supported, any user presets will have been imported.</value>
   <data name="QueueView_NotAvailable" xml:space="preserve">

     <value>Not Available</value>

   </data>

+  <data name="Options_LowDiskspaceSizeGB" xml:space="preserve">

+    <value>GB</value>

+  </data>

 </root>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index fc042d9f3..ce1db7a3b 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -343,7 +343,6 @@
                 <StackPanel  Name="Advanced" Orientation="Vertical" Margin="10,5,0,0"

                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Advanced}}">

 

-

                     <TextBlock Text="{x:Static Properties:Resources.Options_Advanced}" FontSize="20" FontFamily="Segoe UI Light"  />

 

                     <StackPanel Orientation="Vertical" Margin="0,10,0,10">

@@ -352,12 +351,11 @@
 

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

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

-                            <CheckBox Content="{x:Static Properties:Resources.Options_PauseQueueOnLowDiskSpace}" 

-                                      IsChecked="{Binding PauseOnLowDiskspace}" />

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

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

-                                <TextBlock Text="{x:Static Properties:Resources.Options_LowDiskspaceSize}" VerticalAlignment="Center"  Width="250" />

-                                <TextBox x:Name="PauseOnLowDiskspaceLEvel" Text="{Binding PauseOnLowDiskspaceLevel, Converter={StaticResource fileSizeConverter}, UpdateSourceTrigger=PropertyChanged}"  Width="120"/>

+                                <CheckBox Content="{x:Static Properties:Resources.Options_LowDiskspaceSize}" IsChecked="{Binding PauseOnLowDiskspace}" Width="255" />

+                                <TextBox x:Name="PauseOnLowDiskspaceLevel" Text="{Binding PauseOnLowDiskspaceLevel, Converter={StaticResource fileSizeConverter}, UpdateSourceTrigger=PropertyChanged}"  Width="120"/>

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

                             </StackPanel>

                             <StackPanel Orientation="Horizontal" Margin="0,10,0,0">

                                 <TextBlock Text="{x:Static Properties:Resources.Options_PreviewScanCount}" VerticalAlignment="Center" Width="250" />

diff --git a/win/CS/HandBrakeWPF/defaultsettings.xml b/win/CS/HandBrakeWPF/defaultsettings.xml
index 7f95105d9..91ecbb494 100644
--- a/win/CS/HandBrakeWPF/defaultsettings.xml
+++ b/win/CS/HandBrakeWPF/defaultsettings.xml
@@ -397,7 +397,7 @@
       <string>PauseOnLowDiskspace</string>

     </key>

     <value>

-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>

+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>

     </value>

   </item>

   <item>