]> granicus.if.org Git - handbrake/commitdiff
Adding some additional tooltips to the picture settings and video tabs.
authorScott <sr55.hb@outlook.com>
Sat, 3 Oct 2015 13:17:53 +0000 (14:17 +0100)
committerScott <sr55.hb@outlook.com>
Sat, 3 Oct 2015 13:17:53 +0000 (14:17 +0100)
win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
win/CS/HandBrakeWPF/Properties/Resources.resx
win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
win/CS/HandBrakeWPF/Views/VideoView.xaml

index 23cceef50d14b7d2d8bf64a1b32720faf66510d6..d245d5dc86e83aa3cd457a1a3f6050663ee08992 100644 (file)
@@ -1496,50 +1496,6 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Sets and ensures compliance with the specified H.264 Levels. This will override all other settings..\r
-        /// </summary>\r
-        public static string Video_EncoderLevel {\r
-            get {\r
-                return ResourceManager.GetString("Video_EncoderLevel", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Adjusts settings to trade off compression efficiency against encoding speed.\r
-        ///\r
-        ///This establishes your default settings. Tunes, profiles, levels and advanced options string will be applied to this.\r
-        ///\r
-        ///You should generally set this option to the slowest you can bear since slower settings will result in better quality or smaller files..\r
-        /// </summary>\r
-        public static string Video_EncoderPreset {\r
-            get {\r
-                return ResourceManager.GetString("Video_EncoderPreset", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Limit the profile of the output stream. This will override all other settings..\r
-        /// </summary>\r
-        public static string Video_EncoderProfile {\r
-            get {\r
-                return ResourceManager.GetString("Video_EncoderProfile", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Tune settings to optimise for common scenarios\r
-        ///\r
-        ///This can improve efficiency for particular source characteristics or set of characteristics of the output file.\r
-        ///\r
-        ///Changes will be applied after the preset but before all other parameters..\r
-        /// </summary>\r
-        public static string Video_EncoderTune {\r
-            get {\r
-                return ResourceManager.GetString("Video_EncoderTune", resourceCulture);\r
-            }\r
-        }\r
-        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Higher Quality |.\r
         /// </summary>\r
@@ -1590,22 +1546,6 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Set the desired quality factor. The encoder targets a certain quality. \r
-        ///The scale used by each video encoder is different.\r
-        ///\r
-        ///x264&apos;s scale is logarithmic and lower values correspond to higher quality. \r
-        ///So small changes in value will result in progressively larger increases or decreases in the resulting file size. \r
-        ///A value of 0 means lossless and will result in a file size that is larger than the original source, \r
-        ///unless the source was also lossless. \r
-        ///Suggested values are: 18 to 20 for standard definiti [rest of string was truncated]&quot;;.\r
-        /// </summary>\r
-        public static string Video_QualitySlider {\r
-            get {\r
-                return ResourceManager.GetString("Video_QualitySlider", resourceCulture);\r
-            }\r
-        }\r
-        \r
         /// <summary>\r
         ///   Looks up a localized string similar to QuickSync hardware not detected or enabled! \r
         ///\r
index 7915ff05192d4838a4f88a17ca083447cd9f8a1a..41a9e58aae32321a3f1e76e45d98d9ec98640b11 100644 (file)
@@ -241,40 +241,6 @@ may have problems with Weighted P-frame prediction: the Apple TV is completely i
     <value>Reduce decoder CPU usage.\r
 \r
 Set this if your device is struggling to play the output. (i.e. dropped frames)</value>\r
-  </data>\r
-  <data name="Video_EncoderLevel" xml:space="preserve">\r
-    <value>Sets and ensures compliance with the specified H.264 Levels. This will override all other settings.</value>\r
-  </data>\r
-  <data name="Video_EncoderPreset" xml:space="preserve">\r
-    <value>Adjusts settings to trade off compression efficiency against encoding speed.\r
-\r
-This establishes your default settings. Tunes, profiles, levels and advanced options string will be applied to this.\r
-\r
-You should generally set this option to the slowest you can bear since slower settings will result in better quality or smaller files.</value>\r
-  </data>\r
-  <data name="Video_EncoderProfile" xml:space="preserve">\r
-    <value>Limit the profile of the output stream. This will override all other settings.</value>\r
-  </data>\r
-  <data name="Video_EncoderTune" xml:space="preserve">\r
-    <value>Tune settings to optimise for common scenarios\r
-\r
-This can improve efficiency for particular source characteristics or set of characteristics of the output file.\r
-\r
-Changes will be applied after the preset but before all other parameters.</value>\r
-  </data>\r
-  <data name="Video_QualitySlider" xml:space="preserve">\r
-    <value>Set the desired quality factor. The encoder targets a certain quality. \r
-The scale used by each video encoder is different.\r
-\r
-x264's scale is logarithmic and lower values correspond to higher quality. \r
-So small changes in value will result in progressively larger increases or decreases in the resulting file size. \r
-A value of 0 means lossless and will result in a file size that is larger than the original source, \r
-unless the source was also lossless. \r
-Suggested values are: 18 to 20 for standard definition sources and 20 to 23 for high definition sources.\r
-\r
-x265 is a new encoder, so there are no recommended values yet. You'll have to experiment.\r
-\r
-FFMpeg's and Theora's scale is more linear. These encoders do not have a lossless mode.</value>\r
   </data>\r
   <data name="Video_LosslessWarning" xml:space="preserve">\r
     <value>Warning: RF 0 is Lossless!</value>\r
index c94852f1fbb2b926db897fe52a3b226bc23f4577..4839b7d425cec2b2ed07185a2ad22db195b5e323 100644 (file)
@@ -185,6 +185,70 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Automatically crop black borders around edges of the video..\r
+        /// </summary>\r
+        public static string PictureSettingsView_AutoCrop {\r
+            get {\r
+                return ResourceManager.GetString("PictureSettingsView_AutoCrop", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Crop the video from the bottom..\r
+        /// </summary>\r
+        public static string PictureSettingsView_CropBottom {\r
+            get {\r
+                return ResourceManager.GetString("PictureSettingsView_CropBottom", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Crop the video from the left side..\r
+        /// </summary>\r
+        public static string PictureSettingsView_CropLeft {\r
+            get {\r
+                return ResourceManager.GetString("PictureSettingsView_CropLeft", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Crop the video from the right side..\r
+        /// </summary>\r
+        public static string PictureSettingsView_CropRight {\r
+            get {\r
+                return ResourceManager.GetString("PictureSettingsView_CropRight", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Crop the video from the top..\r
+        /// </summary>\r
+        public static string PictureSettingsView_CropTop {\r
+            get {\r
+                return ResourceManager.GetString("PictureSettingsView_CropTop", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to This is the height that the video will be stored at.\r
+        ///The actual display dimensions will differ if the pixel aspect ratio is not 1:1..\r
+        /// </summary>\r
+        public static string PictureSettingsView_Height {\r
+            get {\r
+                return ResourceManager.GetString("PictureSettingsView_Height", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Manually crop the video..\r
+        /// </summary>\r
+        public static string PictureSettingsView_ManualCrop {\r
+            get {\r
+                return ResourceManager.GetString("PictureSettingsView_ManualCrop", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Align storage dimensions to multiples of this value.\r
         ///\r
@@ -208,6 +272,16 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to This is the width that the video will be stored at.\r
+        ///The actual display dimensions will differ if the pixel aspect ratio is not 1:1..\r
+        /// </summary>\r
+        public static string PictureSettingsView_Width {\r
+            get {\r
+                return ResourceManager.GetString("PictureSettingsView_Width", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Delete the job from the queue..\r
         /// </summary>\r
@@ -234,5 +308,187 @@ namespace HandBrakeWPF.Properties {
                 return ResourceManager.GetString("QueueView_SendJobBack", resourceCulture);\r
             }\r
         }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Use advanced options Tab for x264 settings..\r
+        /// </summary>\r
+        public static string Video_AdvancedOptions {\r
+            get {\r
+                return ResourceManager.GetString("Video_AdvancedOptions", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Set the average bitrate.\r
+        ///\r
+        ///The instantaneous bitrate can be much higher or lower at any point in time.\r
+        ///But the average over a long duration will be the value set here.  If you need\r
+        ///to limit instantaneous bitrate, look into x264&apos;s vbv-bufsize and vbv-maxrate settings..\r
+        /// </summary>\r
+        public static string Video_AvgBitrate {\r
+            get {\r
+                return ResourceManager.GetString("Video_AvgBitrate", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Enables constant framerate output..\r
+        /// </summary>\r
+        public static string Video_ConstantFramerate {\r
+            get {\r
+                return ResourceManager.GetString("Video_ConstantFramerate", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Available video encoders..\r
+        /// </summary>\r
+        public static string Video_Encoders {\r
+            get {\r
+                return ResourceManager.GetString("Video_Encoders", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Tune settings to optimize for common scenarios.\r
+        ///\r
+        ///This can improve effeciency for particular source characteristics or set\r
+        ///characteristics of the output file.  Changes will be applied after the\r
+        ///preset but before all other parameters..\r
+        /// </summary>\r
+        public static string Video_EncoderTune {\r
+            get {\r
+                return ResourceManager.GetString("Video_EncoderTune", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Additional encoder settings.\r
+        ///\r
+        ///Colon separated list of encoder options..\r
+        /// </summary>\r
+        public static string Video_ExtraOpts {\r
+            get {\r
+                return ResourceManager.GetString("Video_ExtraOpts", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Reduce decoder CPU usage.\r
+        ///\r
+        ///Set this if your device is struggling to play the output (dropped frames)..\r
+        /// </summary>\r
+        public static string Video_FastDecode {\r
+            get {\r
+                return ResourceManager.GetString("Video_FastDecode", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Output framerate.\r
+        ///\r
+        ///&apos;Same as source&apos; is recommended. If your source video has a variable framerate, &apos;Same as source&apos; will preserve it..\r
+        /// </summary>\r
+        public static string Video_Framerate {\r
+            get {\r
+                return ResourceManager.GetString("Video_Framerate", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Sets and ensures compliance with the specified level.\r
+        ///\r
+        ///Overrides all other settings..\r
+        /// </summary>\r
+        public static string Video_Level {\r
+            get {\r
+                return ResourceManager.GetString("Video_Level", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Enables variable framerate output with a peak rate determined by the framerate setting..\r
+        /// </summary>\r
+        public static string Video_PeakFramerate {\r
+            get {\r
+                return ResourceManager.GetString("Video_PeakFramerate", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Adjusts encoder settings to trade off compression efficiency against encoding speed.\r
+        ///\r
+        ///This establishes your default encoder settings.\r
+        ///Tunes, profiles, levels and advanced option string will be applied to this.\r
+        ///You should generally set this option to the slowest you can bear since slower\r
+        ///settings will result in better quality or smaller files..\r
+        /// </summary>\r
+        public static string Video_Presets {\r
+            get {\r
+                return ResourceManager.GetString("Video_Presets", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Sets and ensures compliance with the specified profile.\r
+        ///\r
+        ///Overrides all other settings..\r
+        /// </summary>\r
+        public static string Video_Profile {\r
+            get {\r
+                return ResourceManager.GetString("Video_Profile", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Set the desired quality factor.\r
+        ///The encoder targets a certain quality.\r
+        ///The scale used by each video encoder is different.\r
+        ///\r
+        ///x264&apos;s scale is logarithmic and lower values correspond to higher quality.\r
+        ///So small decreases in value will result in progressively larger increases\r
+        ///in the resulting file size.  A value of 0 means lossless and will result\r
+        ///in a file size that is larger than the original source, unless the source\r
+        ///was also lossless.\r
+        ///Suggested values are: 18 to 20 for standard definition sources an [rest of string was truncated]&quot;;.\r
+        /// </summary>\r
+        public static string Video_Quality {\r
+            get {\r
+                return ResourceManager.GetString("Video_Quality", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to During the 1st pass of a 2 pass encode, use settings that speed things along..\r
+        /// </summary>\r
+        public static string Video_TurboFirstPass {\r
+            get {\r
+                return ResourceManager.GetString("Video_TurboFirstPass", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Perform 2 Pass Encoding.\r
+        ///\r
+        ///The &apos;Bitrate&apos; option is prerequisite. During the 1st pass, statistics about\r
+        ///the video are collected.  Then in the second pass, those statistics are used\r
+        ///to make bitrate allocation decisions..\r
+        /// </summary>\r
+        public static string Video_TwoPass {\r
+            get {\r
+                return ResourceManager.GetString("Video_TwoPass", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Enables variable framerate output.\r
+        ///\r
+        ///VFR is not compatible with some players..\r
+        /// </summary>\r
+        public static string Video_VariableFramerate {\r
+            get {\r
+                return ResourceManager.GetString("Video_VariableFramerate", resourceCulture);\r
+            }\r
+        }\r
     }\r
 }\r
index f3a1ab415ea042b3e8403c1e9974288da69cc005..536409cae170c8650d4b5948c9ef5f52c0608698 100644 (file)
@@ -170,6 +170,28 @@ Loose  - Align dimensions to chosen 'Alignment' value
                original display aspect ratio\r
 Strict - Keep original source dimensions and pixel aspect ratio</value>\r
   </data>\r
+  <data name="PictureSettingsView_AutoCrop" xml:space="preserve">\r
+    <value>Automatically crop black borders around edges of the video.</value>\r
+  </data>\r
+  <data name="PictureSettingsView_CropBottom" xml:space="preserve">\r
+    <value>Crop the video from the bottom.</value>\r
+  </data>\r
+  <data name="PictureSettingsView_CropLeft" xml:space="preserve">\r
+    <value>Crop the video from the left side.</value>\r
+  </data>\r
+  <data name="PictureSettingsView_CropRight" xml:space="preserve">\r
+    <value>Crop the video from the right side.</value>\r
+  </data>\r
+  <data name="PictureSettingsView_CropTop" xml:space="preserve">\r
+    <value>Crop the video from the top.</value>\r
+  </data>\r
+  <data name="PictureSettingsView_Height" xml:space="preserve">\r
+    <value>This is the height that the video will be stored at.\r
+The actual display dimensions will differ if the pixel aspect ratio is not 1:1.</value>\r
+  </data>\r
+  <data name="PictureSettingsView_ManualCrop" xml:space="preserve">\r
+    <value>Manually crop the video.</value>\r
+  </data>\r
   <data name="PictureSettingsView_Modulus" xml:space="preserve">\r
     <value>Align storage dimensions to multiples of this value.\r
 \r
@@ -180,6 +202,10 @@ You should use 2 unless you experience compatibility issues.</value>
     <value>Pixel aspect defines the shape of the pixels.\r
 A 1:1 ratio defines a square pixel.  Other values define rectangular shapes.\r
 Players will scale the image in order to achieve the specified aspect.</value>\r
+  </data>\r
+  <data name="PictureSettingsView_Width" xml:space="preserve">\r
+    <value>This is the width that the video will be stored at.\r
+The actual display dimensions will differ if the pixel aspect ratio is not 1:1.</value>\r
   </data>\r
   <data name="QueueView_DeleteJob" xml:space="preserve">\r
     <value>Delete the job from the queue.</value>\r
@@ -190,4 +216,93 @@ Players will scale the image in order to achieve the specified aspect.</value>
   <data name="QueueView_SendJobBack" xml:space="preserve">\r
     <value>Send the job back to the main window for editing.</value>\r
   </data>\r
+  <data name="Video_AdvancedOptions" xml:space="preserve">\r
+    <value>Use advanced options Tab for x264 settings.</value>\r
+  </data>\r
+  <data name="Video_AvgBitrate" xml:space="preserve">\r
+    <value>Set the average bitrate.\r
+\r
+The instantaneous bitrate can be much higher or lower at any point in time.\r
+But the average over a long duration will be the value set here.  If you need\r
+to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings.</value>\r
+  </data>\r
+  <data name="Video_ConstantFramerate" xml:space="preserve">\r
+    <value>Enables constant framerate output.</value>\r
+  </data>\r
+  <data name="Video_Encoders" xml:space="preserve">\r
+    <value>Available video encoders.</value>\r
+  </data>\r
+  <data name="Video_EncoderTune" xml:space="preserve">\r
+    <value>Tune settings to optimize for common scenarios.\r
+\r
+This can improve effeciency for particular source characteristics or set\r
+characteristics of the output file.  Changes will be applied after the\r
+preset but before all other parameters.</value>\r
+  </data>\r
+  <data name="Video_ExtraOpts" xml:space="preserve">\r
+    <value>Additional encoder settings.\r
+\r
+Colon separated list of encoder options.</value>\r
+  </data>\r
+  <data name="Video_FastDecode" xml:space="preserve">\r
+    <value>Reduce decoder CPU usage.\r
+\r
+Set this if your device is struggling to play the output (dropped frames).</value>\r
+  </data>\r
+  <data name="Video_Framerate" xml:space="preserve">\r
+    <value>Output framerate.\r
+\r
+'Same as source' is recommended. If your source video has a variable framerate, 'Same as source' will preserve it.</value>\r
+  </data>\r
+  <data name="Video_Level" xml:space="preserve">\r
+    <value>Sets and ensures compliance with the specified level.\r
+\r
+Overrides all other settings.</value>\r
+  </data>\r
+  <data name="Video_PeakFramerate" xml:space="preserve">\r
+    <value>Enables variable framerate output with a peak rate determined by the framerate setting.</value>\r
+  </data>\r
+  <data name="Video_Presets" xml:space="preserve">\r
+    <value>Adjusts encoder settings to trade off compression efficiency against encoding speed.\r
+\r
+This establishes your default encoder settings.\r
+Tunes, profiles, levels and advanced option string will be applied to this.\r
+You should generally set this option to the slowest you can bear since slower\r
+settings will result in better quality or smaller files.</value>\r
+  </data>\r
+  <data name="Video_Profile" xml:space="preserve">\r
+    <value>Sets and ensures compliance with the specified profile.\r
+\r
+Overrides all other settings.</value>\r
+  </data>\r
+  <data name="Video_Quality" xml:space="preserve">\r
+    <value>Set the desired quality factor.\r
+The encoder targets a certain quality.\r
+The scale used by each video encoder is different.\r
+\r
+x264's scale is logarithmic and lower values correspond to higher quality.\r
+So small decreases in value will result in progressively larger increases\r
+in the resulting file size.  A value of 0 means lossless and will result\r
+in a file size that is larger than the original source, unless the source\r
+was also lossless.\r
+Suggested values are: 18 to 20 for standard definition sources and 20 to 23 for high definition sources.\r
+\r
+FFMpeg's and Theora's scale is more linear.\r
+These encoders do not have a lossless mode.</value>\r
+  </data>\r
+  <data name="Video_TurboFirstPass" xml:space="preserve">\r
+    <value>During the 1st pass of a 2 pass encode, use settings that speed things along.</value>\r
+  </data>\r
+  <data name="Video_TwoPass" xml:space="preserve">\r
+    <value>Perform 2 Pass Encoding.\r
+\r
+The 'Bitrate' option is prerequisite. During the 1st pass, statistics about\r
+the video are collected.  Then in the second pass, those statistics are used\r
+to make bitrate allocation decisions.</value>\r
+  </data>\r
+  <data name="Video_VariableFramerate" xml:space="preserve">\r
+    <value>Enables variable framerate output.\r
+\r
+VFR is not compatible with some players.</value>\r
+  </data>\r
 </root>
\ No newline at end of file
index be53554d93f94598988284670f84084bcd4e1423..eb9d9eee6dd662881e15d170a6fac2c0a0c426eb 100644 (file)
                     <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Width}" />\r
                     <controls:NumberBox Number="{Binding Width, Mode=TwoWay}" UpdateBindingOnTextChange="True" IsEnabled="{Binding WidthControlEnabled}" \r
                                         Modulus="{Binding SelectedModulus, Mode=OneWay}"\r
-                                             Minimum="0" Width="60"  />\r
+                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Width}"  Minimum="0" Width="60"  />\r
                     <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Height}" />\r
                     <controls:NumberBox Number="{Binding Height, Mode=TwoWay}" IsEnabled="{Binding HeightControlEnabled}" UpdateBindingOnTextChange="True" \r
                                         Modulus="{Binding SelectedModulus, Mode=OneWay}" \r
-                                             Minimum="0" Width="60"  />\r
+                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Height}" Minimum="0" Width="60"  />\r
                     <CheckBox Content="{x:Static Properties:ResourcesUI.PictureSettingsView_KeepAR}" IsChecked="{Binding MaintainAspectRatio}"\r
                           Visibility="{Binding ShowKeepAR, Converter={StaticResource boolToVisHiddenConverter}}" \r
                           VerticalAlignment="Center" Margin="5,0,0,0" />\r
             <!-- Crop Panel -->\r
             <StackPanel Name="CropPanel" Margin="15,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="0" Grid.RowSpan="2" Grid.Column="1">\r
                 <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Cropping}" FontWeight="Bold" />\r
-                <RadioButton Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Automatic}" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="10,0,0,0"/>\r
-                <RadioButton Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Custom}" IsChecked="{Binding IsCustomCrop}" Margin="10,5,0,0" />\r
+                <RadioButton Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Automatic}" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="10,0,0,0"\r
+                             ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_AutoCrop}"  />\r
+                <RadioButton Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Custom}" IsChecked="{Binding IsCustomCrop}" Margin="10,5,0,0"\r
+                             ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_ManualCrop}"  />\r
 \r
                 <Grid Margin="0,10,0,0">\r
                     <Grid.RowDefinitions>\r
                     <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Right}" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />\r
 \r
                     <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="1" Grid.Column="2"\r
-                                    Minimum="0" Modulus="2" Number="{Binding CropTop, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />\r
+                                    Minimum="0" Modulus="2" Number="{Binding CropTop, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"\r
+                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropTop}" />\r
 \r
                     <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="3" Grid.Column="2"\r
-                                    Minimum="0" Modulus="2" Number="{Binding CropBottom, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />\r
+                                    Minimum="0" Modulus="2" Number="{Binding CropBottom, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"\r
+                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropBottom}" />\r
 \r
                     <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="1"\r
-                                    Minimum="0" Modulus="2" Number="{Binding CropLeft, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />\r
+                                    Minimum="0" Modulus="2" Number="{Binding CropLeft, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"\r
+                                      ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropLeft}"  />\r
 \r
                     <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="3"\r
-                                    Minimum="0" Modulus="2" Number="{Binding CropRight, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />\r
+                                    Minimum="0" Modulus="2" Number="{Binding CropRight, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"\r
+                                        ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropRight}" />\r
 \r
                 </Grid>\r
 \r
index 878d8a17e541f1ee9b4a4b6ce0f5ba9db96eed91..76cd39c985386680b1bd9e587e2a076e920fbdde 100644 (file)
@@ -42,7 +42,7 @@
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10" >\r
                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_Codec}" Width="100" />\r
 \r
-                    <ComboBox Width="120">\r
+                    <ComboBox Width="120" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Encoders}" >\r
                         <ComboBox.SelectedItem>\r
                             <MultiBinding Converter="{StaticResource videoEncoderConverter}">\r
                                 <Binding Path="SelectedVideoEncoder" />\r
                 <StackPanel Orientation="Horizontal">\r
                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_Framerate}" VerticalAlignment="Top" Margin="0,5,0,0" Width="100"/>\r
                     <StackPanel Orientation="Vertical">\r
-                        <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}"  \r
+                        <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Framerate}"  \r
                                   Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />\r
                         <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_SameAsSource}"  VerticalAlignment="Center" Margin="0,5,0,0"\r
                                    Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>\r
 \r
                         <StackPanel Orientation="Vertical" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">\r
-                            <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_ConstantFramerate}" IsChecked="{Binding IsConstantFramerate}" Margin="0,5,0,0" />\r
+                            <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_ConstantFramerate}" IsChecked="{Binding IsConstantFramerate}" Margin="0,5,0,0"\r
+                                         ToolTip="{x:Static Properties:ResourcesTooltips.Video_ConstantFramerate}" />\r
                             <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_VariableFramerate}" IsChecked="{Binding IsVariableFramerate}" Margin="0,5,0,0" \r
-                                     Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />\r
+                                     Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_VariableFramerate}"  />\r
                             <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_PeakFramerate}" IsChecked="{Binding IsPeakFramerate}" Margin="0,5,0,0"\r
-                                     Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />\r
+                                     Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_PeakFramerate}"  />\r
                         </StackPanel>\r
                     </StackPanel>\r
                 </StackPanel>\r
@@ -82,7 +83,8 @@
                 <TextBlock Text="Quality" FontWeight="Bold" Margin="0,0,0,10"/>\r
 \r
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10" >\r
-                    <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_ConstantQuality}" IsChecked="{Binding IsConstantQuantity}"  Margin="0,0,10,0" />\r
+                    <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_ConstantQuality}" IsChecked="{Binding IsConstantQuantity}"  Margin="0,0,10,0"\r
+                                 ToolTip="{x:Static Properties:ResourcesTooltips.Video_Quality}" />\r
                     <TextBlock Text="{Binding DisplayRF}" MinWidth="30" />\r
                     <TextBlock Text="{Binding Rfqp}" FontWeight="Bold" Margin="5,0,0,0" />\r
 \r
@@ -92,7 +94,7 @@
 \r
                 <Slider Width="280" Value="{Binding RF, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left"  Maximum="{Binding QualityMax}" Minimum="{Binding QualityMin}"\r
                         IsEnabled="{Binding IsConstantQuantity}" Margin="20,0,0,10"\r
-                        ToolTip="{x:Static Properties:Resources.Video_QualitySlider}" Style="{StaticResource LongToolTipHolder}" \r
+                        ToolTip="{x:Static Properties:ResourcesTooltips.Video_Quality}" Style="{StaticResource LongToolTipHolder}" \r
                         IsSnapToTickEnabled="True" TickFrequency="1" TickPlacement="BottomRight" />\r
 \r
                 <Grid Margin="20,0,0,15" Width="280" HorizontalAlignment="Left">\r
                 </Grid>\r
 \r
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,6">\r
-                    <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_AverageBitrate}" IsChecked="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,10,0"/>\r
-                    <TextBox Width="75" Text="{Binding Task.VideoBitrate, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" />\r
+                    <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_AverageBitrate}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_AvgBitrate}" \r
+                                 IsChecked="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,10,0"/>\r
+                    <TextBox Width="75" Text="{Binding Task.VideoBitrate, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"\r
+                             ToolTip="{x:Static Properties:ResourcesTooltips.Video_AvgBitrate}" />\r
                 </StackPanel>\r
 \r
                 <StackPanel Orientation="Horizontal" Margin="30,0,0,0" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">\r
                     <CheckBox Content="{x:Static Properties:ResourcesUI.VideoView_2Pass}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"\r
-                              IsChecked="{Binding TwoPass}" Margin="0,0,10,0" />\r
+                              IsChecked="{Binding TwoPass}" Margin="0,0,10,0" ToolTip="{x:Static Properties:ResourcesTooltips.Video_TwoPass}"  />\r
                     <CheckBox Content="{x:Static Properties:ResourcesUI.VideoView_TurboFirstPass}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"\r
-                              IsChecked="{Binding TurboFirstPass}" Visibility="{Binding DisplayTurboFirstPass, Converter={StaticResource boolToVisConverter}}" />\r
+                              IsChecked="{Binding TurboFirstPass}" Visibility="{Binding DisplayTurboFirstPass, Converter={StaticResource boolToVisConverter}}"\r
+                              ToolTip="{x:Static Properties:ResourcesTooltips.Video_TurboFirstPass}" />\r
                 </StackPanel>\r
 \r
             </StackPanel>\r
                 <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_OptimiseVideo}" Margin="0,0,0,0" Grid.Row="0"  Grid.ColumnSpan="2" FontWeight="Bold" VerticalAlignment="Center" />\r
 \r
                 <CheckBox Content="{x:Static Properties:ResourcesUI.VideoView_UseAdvancedTab}" Grid.Row="1" IsChecked="{Binding UseAdvancedTab}" Margin="0,5,0,0"\r
-                          Visibility="{Binding ShowAdvancedTab, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />\r
+                          Visibility="{Binding ShowAdvancedTab, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}"\r
+                          ToolTip="{x:Static Properties:ResourcesTooltips.Video_AdvancedOptions}" />\r
 \r
                 <Grid Grid.Row="2" Margin="0,8,0,0" IsEnabled="{Binding UseAdvancedTab, Converter={StaticResource inverseConverter}}">\r
                     <Grid.RowDefinitions>\r
                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderPreset}" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}" />\r
                     <StackPanel Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Horizontal" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}">\r
                         <Slider Minimum="0" Maximum="{Binding VideoPresetMaxValue}" Width="150" Value="{Binding VideoPresetValue, Mode=Default, UpdateSourceTrigger=PropertyChanged}" \r
-                            IsSnapToTickEnabled="True" TickFrequency="1" TickPlacement="BottomRight" ToolTip="{x:Static Properties:Resources.Video_EncoderPreset}" \r
-                            Style="{StaticResource LongToolTipHolder}" />\r
+                            IsSnapToTickEnabled="True" TickFrequency="1" TickPlacement="BottomRight" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Presets}" \r
+                            Style="{StaticResource LongToolTipHolder}"  />\r
                         <TextBlock Text="{Binding VideoPreset.DisplayName}" Margin="5,0,0,0" />\r
                     </StackPanel>\r
 \r
                                Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"/>\r
                     <ComboBox Width="100" Grid.Row="2" Grid.Column="1" Margin="5,10,5,0" Height="22"\r
                               ItemsSource="{Binding VideoTunes}" DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoTune}"\r
-                              ToolTip="{x:Static Properties:Resources.Video_EncoderTune}" Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"\r
+                              ToolTip="{x:Static Properties:ResourcesTooltips.Video_EncoderTune}"  Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"\r
                               Style="{StaticResource LongToolTipHolder}" />\r
                     <CheckBox IsChecked="{Binding FastDecode}" Content="{x:Static Properties:ResourcesUI.VideoView_FastDecode}" Grid.Row="2" Grid.Column="2" Margin="10,10,10,0" VerticalAlignment="Center"\r
-                              ToolTip="{x:Static Properties:Resources.Video_x264FastDecode}" Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"/>\r
+                              ToolTip="{x:Static Properties:ResourcesTooltips.Video_FastDecode}"  Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"/>\r
 \r
           \r
                     <!-- Row 2-->\r
                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderProfile}" Grid.Row="3" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}"/>\r
                     <ComboBox Width="100" Grid.Row="3" Grid.Column="1" Margin="5,10,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}"\r
                           ItemsSource="{Binding VideoProfiles}" DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoProfile}"\r
-                          Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:Resources.Video_EncoderProfile}" />\r
+                          Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Profile}"  />\r
 \r
                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderLevel}" Grid.Row="3" Grid.Column="2" Margin="10,10,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}" />\r
                     <ComboBox Width="100" Grid.Row="3" Grid.Column="3" Margin="5,10,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}"\r
                           ItemsSource="{Binding VideoLevels}"  DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoLevel}"\r
-                          Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:Resources.Video_EncoderLevel}"/>\r
+                          Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Level}" />\r
 \r
                     <!-- Row 3 -->\r
                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_ExtraOptions}" Grid.Row="4" Grid.Column="0" Margin="0,5,0,0" VerticalAlignment="Center" HorizontalAlignment="Left" />\r