WinGui:

- Minor label and tooltip changes in the options window.

git-svn-id: svn://localhost/HandBrake/trunk@3437 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 53d5ef9..2541def 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -890,7 +890,7 @@ namespace Handbrake
             this.drop_previewScanCount.Size = new System.Drawing.Size(85, 21);\r
             this.drop_previewScanCount.TabIndex = 95;\r
             this.ToolTip.SetToolTip(this.drop_previewScanCount, "Allows a greater number of preview frames to be selectable on the \"Preview\" windo" +\r
-                    "w.");\r
+                    "w.\r\n\r\nThis can in some cases improve the accuracy of the auto crop feature.");\r
             this.drop_previewScanCount.SelectedIndexChanged += new System.EventHandler(this.drop_previewScanCount_SelectedIndexChanged);\r
             // \r
             // label33\r
@@ -938,9 +938,9 @@ namespace Handbrake
             this.check_mainMinimize.BackColor = System.Drawing.Color.Transparent;\r
             this.check_mainMinimize.Location = new System.Drawing.Point(81, 14);\r
             this.check_mainMinimize.Name = "check_mainMinimize";\r
-            this.check_mainMinimize.Size = new System.Drawing.Size(138, 17);\r
+            this.check_mainMinimize.Size = new System.Drawing.Size(230, 17);\r
             this.check_mainMinimize.TabIndex = 82;\r
-            this.check_mainMinimize.Text = "Minimize to system tray";\r
+            this.check_mainMinimize.Text = "Minimize to system tray (Requires Restart)";\r
             this.ToolTip.SetToolTip(this.check_mainMinimize, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +\r
                     " icon has encode status notifications.\r\nNote: requires restart to take effect!\r\n" +\r
                     "");\r

diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx
index 02f2ee7..df466a4 100644 (file)
--- a/win/C#/frmOptions.resx
+++ b/win/C#/frmOptions.resx
@@ -120,6 +120,19 @@
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>132, 18</value>\r
   </metadata>\r
+  <data name="check_showCliForInGUIEncode.ToolTip" xml:space="preserve">\r
+    <value>Shows the CLI window when encoding.\r
+You may wish to enable this as you'll be able to cleanly exit the CLI using ctrl-c\r
+meaing you'll have playable files if you choose to end the encode early. \r
+\r
+When disabled, Presseting "Stop" on the main winow will render the encode unplayable.</value>\r
+  </data>\r
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>132, 18</value>\r
+  </metadata>\r
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>132, 18</value>\r
+  </metadata>\r
   <data name="check_m4v.ToolTip" xml:space="preserve">\r
     <value>Use .m4v instead of .mp4 for MP4 files\r
 \r
@@ -127,11 +140,6 @@ Chapter Markers, AC3 Audio and SRT Subtitles will require the m4v extension if y
 When this option is disabled, Chapter Markers, AC3 audio and SRT subtitiles will still automatically change the file extension to m4v.\r
 </value>\r
   </data>\r
-  <data name="check_showCliForInGUIEncode.ToolTip" xml:space="preserve">\r
-    <value>Shows the CLI window when "Encode In-Gui encode status" is enabled.\r
-You may wish to enable this as you'll be able to cleanly exit the CLI using ctrl-c\r
-meaing you'll have playable files if you choose to end the encode early.</value>\r
-  </data>\r
   <data name="check_disableResCalc.ToolTip" xml:space="preserve">\r
     <value>If the new Picture Settings panel is causing you problems, enable this option.\r
 It disables some of the resolution calcuation code for None and Custom modes.\r