WinGui: Fix the mini status display controller.

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 84c370a370a5b505cb12d14eb770c4d896b87206..c30ec5f3a7eec71d4e00602e04817849661019b2 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -1172,6 +1172,17 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Encoding: Pass {0} of {1},  {2:00.00}%\r
+        ///FPS: {3:000.0},  Avg FPS: {4:000.0}\r
+        ///Time Remaining: {5},  Elapsed: {6:d\:hh\:mm\:ss}.\r
+        /// </summary>\r
+        public static string MiniViewModel_EncodeStatusChanged_StatusLabel {\r
+            get {\r
+                return ResourceManager.GetString("MiniViewModel_EncodeStatusChanged_StatusLabel", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to No Additional Information.\r
         /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 23b422da29655b1537d48e04e82ba275d9737cf8..c841deee1070101264c40b608fdc970006e6e214 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -864,4 +864,9 @@ Remaining Time: {4}</value>
   <data name="Queue_AlreadyEncodingSolution" xml:space="preserve">\r
     <value>Please stop the current encode. If the problem persists, please restart HandBrake.</value>\r
   </data>\r
+  <data name="MiniViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">\r
+    <value>Encoding: Pass {0} of {1},  {2:00.00}%\r
+FPS: {3:000.0},  Avg FPS: {4:000.0}\r
+Time Remaining: {5},  Elapsed: {6:d\:hh\:mm\:ss}</value>\r
+  </data>\r
 </root>
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/ViewModels/MiniViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MiniViewModel.cs
index 64809bbf469465db0583eedae2381853469646a3..3e5fb83c1e613f9bdbf11b229665743463c34fb6 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MiniViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MiniViewModel.cs
@@ -193,16 +193,17 @@ namespace HandBrakeWPF.ViewModels
         /// </param>\r
         private void EncodeService_EncodeStatusChanged(object sender, EncodeProgressEventArgs e)\r
         {\r
-            this.Task = queueProcessor.LastProcessedJob.ScannedSourcePath;\r
-\r
-            // {0:00.00}%   FPS: {1:000.0}   Avg FPS: {2:000.0}   Time Remaining: {3}   Elapsed: {4:hh\:mm\:ss}\r
-            this.Progress = string.Format(\r
-                Resources.MainViewModel_EncodeStatusChanged_StatusLabel, \r
-                e.PercentComplete, \r
-                e.CurrentFrameRate, \r
-                e.AverageFrameRate, \r
-                e.EstimatedTimeLeft, \r
-                e.ElapsedTime);\r
+            this.Task = this.queueProcessor.LastProcessedJob.ScannedSourcePath;\r
+\r
+            this.Progress =\r
+                string.Format(Resources.MiniViewModel_EncodeStatusChanged_StatusLabel,\r
+                    e.Task,\r
+                    e.TaskCount,\r
+                    e.PercentComplete,\r
+                    e.CurrentFrameRate,\r
+                    e.AverageFrameRate,\r
+                    e.EstimatedTimeLeft,\r
+                    e.ElapsedTime);\r
         }\r
     }\r
 }\r

diff --git a/win/CS/HandBrakeWPF/Views/MiniView.xaml b/win/CS/HandBrakeWPF/Views/MiniView.xaml
index a4abe239c5dae535d3cf9ae733b696e2ffeb70dd..a90c0c3f3458321f7d28ae63d8f3c0642728d95e 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MiniView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MiniView.xaml
@@ -6,9 +6,9 @@
         SnapsToDevicePixels="True"\r
         UseLayoutRounding="True"\r
         Width="300"\r
-        Height="175"\r
+        Height="200"\r
         MinWidth="300"\r
-        MinHeight="175"\r
+        MinHeight="200"\r
         TextOptions.TextFormattingMode="Display" ShowActivated="True" ShowInTaskbar="True"\r
         WindowStyle="ToolWindow"\r
         x:Name="miniView"\r
@@ -21,6 +21,7 @@
             <RowDefinition Height="Auto" />\r
             <RowDefinition Height="Auto" />\r
             <RowDefinition Height="Auto" />\r
+            <RowDefinition Height="*" />\r
             <RowDefinition Height="Auto" />\r
         </Grid.RowDefinitions>\r
         <TextBlock Text="Status" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="5,0,10,5" Grid.Row="0" />\r
@@ -29,6 +30,6 @@
         <TextBlock Text="{Binding Progress}" Grid.Row="2" Margin="10,0,0,5" TextWrapping="WrapWithOverflow" />\r
         <TextBlock Text="{Binding QueueStatus}" Grid.Row="3" Margin="10,0,0,0" TextWrapping="WrapWithOverflow" />\r
 \r
-        <Button Content="Close" cal:Message.Attach="[Event Click] = [Action Close]" Grid.Row="3" HorizontalAlignment="Right" Margin="0,5,5,0" Padding="8,2" />\r
+        <Button Content="Close" cal:Message.Attach="[Event Click] = [Action Close]" Grid.Row="5" HorizontalAlignment="Right" Margin="0,5,5,5" Padding="8,2" />\r
     </Grid>\r
 </Window>\r