WinGui:

- Fix some tooltips in the options and make the "use m4v" tooltip clearer.
- Fix an error in the activity log window where an error message would repeat every few seconds if a log file wasn't found.
- Fix main window display on High Dpi Panels.

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

diff --git a/win/C#/Controls/AudioPanel.Designer.cs b/win/C#/Controls/AudioPanel.Designer.cs
index 46a5c29..8d2006b 100644 (file)
--- a/win/C#/Controls/AudioPanel.Designer.cs
+++ b/win/C#/Controls/AudioPanel.Designer.cs
@@ -399,7 +399,7 @@ namespace Handbrake.Controls
             // \r
             // AudioPanel\r
             // \r
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;\r
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;\r
             this.BackColor = System.Drawing.Color.Transparent;\r
             this.Controls.Add(this.label68);\r
             this.Controls.Add(this.btn_addAudioTrack);\r

diff --git a/win/C#/Controls/Filters.Designer.cs b/win/C#/Controls/Filters.Designer.cs
index d6bd830..cc2346a 100644 (file)
--- a/win/C#/Controls/Filters.Designer.cs
+++ b/win/C#/Controls/Filters.Designer.cs
@@ -300,7 +300,7 @@
             // \r
             // Filters\r
             // \r
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;\r
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;\r
             this.BackColor = System.Drawing.Color.Transparent;\r
             this.Controls.Add(this.tableLayoutPanel1);\r
             this.Controls.Add(this.label68);\r

diff --git a/win/C#/Controls/PictureSettings.Designer.cs b/win/C#/Controls/PictureSettings.Designer.cs
index f39e1e3..853d619 100644 (file)
--- a/win/C#/Controls/PictureSettings.Designer.cs
+++ b/win/C#/Controls/PictureSettings.Designer.cs
@@ -645,8 +645,7 @@ namespace Handbrake.Controls
             // \r
             // PictureSettings\r
             // \r
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;\r
             this.BackColor = System.Drawing.Color.Transparent;\r
             this.Controls.Add(this.tableLayoutPanel3);\r
             this.Controls.Add(this.tableLayoutPanel2);\r

diff --git a/win/C#/Controls/Subtitles.Designer.cs b/win/C#/Controls/Subtitles.Designer.cs
index 6be9312..e6584f5 100644 (file)
--- a/win/C#/Controls/Subtitles.Designer.cs
+++ b/win/C#/Controls/Subtitles.Designer.cs
@@ -490,7 +490,7 @@
             // \r
             // Subtitles\r
             // \r
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;\r
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;\r
             this.BackColor = System.Drawing.Color.Transparent;\r
             this.Controls.Add(this.btn_srtAdd);\r
             this.Controls.Add(this.btn_RemoveSubTrack);\r

diff --git a/win/C#/Controls/x264Panel.Designer.cs b/win/C#/Controls/x264Panel.Designer.cs
index 664586e..206a0b6 100644 (file)
--- a/win/C#/Controls/x264Panel.Designer.cs
+++ b/win/C#/Controls/x264Panel.Designer.cs
@@ -678,7 +678,7 @@ namespace Handbrake.Controls
             // \r
             // x264Panel\r
             // \r
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;\r
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;\r
             this.BackColor = System.Drawing.Color.Transparent;\r
             this.Controls.Add(this.slider_psytrellis);\r
             this.Controls.Add(this.lbl_psytrellis);\r

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index 86ed53d..8b2135d 100644 (file)
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -24,6 +24,7 @@ namespace Handbrake
         private int _position;  // Position in the arraylist reached by the current log output in the rtf box.\r
         private readonly frmMain _mainWin;\r
         private Boolean _lastUpdate;\r
+        private Boolean fileNotFoundQuickFix;\r
 \r
         public frmActivityWindow(string file, EncodeAndQueueHandler eh, frmMain mw)\r
         {\r
@@ -175,7 +176,13 @@ namespace Handbrake
                 if (File.Exists(logFile))\r
                     File.Copy(logFile, logFile2);\r
                 else\r
+                {\r
+                    if (fileNotFoundQuickFix)\r
+                        return "";\r
+                    fileNotFoundQuickFix = true;\r
                     return "\n\n\nERROR: The log file could not be found. \nMaybe you cleared your system's tempory folder or maybe you just havn't run an encode yet. \nTried to find the log file in: " + logFile;\r
+                }\r
+                   \r
 \r
                 // Open the copied log file for reading\r
                 StreamReader sr = new StreamReader(logFile2);\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 0fba4d2..62a2d57 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -1643,8 +1643,8 @@ namespace Handbrake
             // frmMain\r
             // \r
             this.AllowDrop = true;\r
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);\r
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;\r
             this.AutoScroll = true;\r
             this.ClientSize = new System.Drawing.Size(1000, 582);\r
             this.Controls.Add(this.tableLayoutPanel3);\r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 6c9a454..e91a028 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -74,7 +74,6 @@ namespace Handbrake
             this.label9 = new System.Windows.Forms.Label();\r
             this.btn_saveLog = new System.Windows.Forms.Button();\r
             this.check_logsInSpecifiedLocation = new System.Windows.Forms.CheckBox();\r
-            this.label14 = new System.Windows.Forms.Label();\r
             this.Label11 = new System.Windows.Forms.Label();\r
             this.check_saveLogWithVideo = new System.Windows.Forms.CheckBox();\r
             this.Label4 = new System.Windows.Forms.Label();\r
@@ -85,6 +84,7 @@ namespace Handbrake
             this.drp_processors = new System.Windows.Forms.ComboBox();\r
             this.btn_viewLogs = new System.Windows.Forms.Button();\r
             this.btn_clearLogs = new System.Windows.Forms.Button();\r
+            this.label14 = new System.Windows.Forms.Label();\r
             this.tab_advanced = new System.Windows.Forms.TabPage();\r
             this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();\r
             this.check_promptOnUnmatchingQueries = new System.Windows.Forms.CheckBox();\r
@@ -237,7 +237,8 @@ namespace Handbrake
             this.check_growlEncode.Size = new System.Drawing.Size(171, 17);\r
             this.check_growlEncode.TabIndex = 99;\r
             this.check_growlEncode.Text = "Growl after Encode Completes";\r
-            this.ToolTip.SetToolTip(this.check_growlEncode, "Growl for Windows");\r
+            this.ToolTip.SetToolTip(this.check_growlEncode, "If you have \"Growl for Windows\" installed, you can use this feature to see growl " +\r
+                    "alerts on your desktop.");\r
             this.check_growlEncode.UseVisualStyleBackColor = false;\r
             this.check_growlEncode.CheckedChanged += new System.EventHandler(this.check_growlEncode_CheckedChanged);\r
             // \r
@@ -251,7 +252,8 @@ namespace Handbrake
             this.check_GrowlQueue.Size = new System.Drawing.Size(168, 17);\r
             this.check_GrowlQueue.TabIndex = 98;\r
             this.check_GrowlQueue.Text = "Growl after Queue Completes";\r
-            this.ToolTip.SetToolTip(this.check_GrowlQueue, "Growl for Windows");\r
+            this.ToolTip.SetToolTip(this.check_GrowlQueue, "If you have \"Growl for Windows\" installed, you can use this feature to see growl " +\r
+                    "alerts on your desktop.");\r
             this.check_GrowlQueue.UseVisualStyleBackColor = false;\r
             this.check_GrowlQueue.CheckedChanged += new System.EventHandler(this.check_GrowlQueue_CheckedChanged);\r
             // \r
@@ -261,10 +263,11 @@ namespace Handbrake
             this.check_m4v.AutoSize = true;\r
             this.check_m4v.Location = new System.Drawing.Point(108, 279);\r
             this.check_m4v.Name = "check_m4v";\r
-            this.check_m4v.Size = new System.Drawing.Size(283, 17);\r
+            this.check_m4v.Size = new System.Drawing.Size(423, 17);\r
             this.check_m4v.TabIndex = 82;\r
-            this.check_m4v.Text = "Use iPod/iTunes friendly file extension (.m4v) for MP4";\r
-            this.ToolTip.SetToolTip(this.check_m4v, "Use .m4v instead of .mp4 for MP4 files");\r
+            this.check_m4v.Text = "Use iPod/iTunes friendly file extension (.m4v) for MP4 (See tooltip for more deta" +\r
+                "ils)";\r
+            this.ToolTip.SetToolTip(this.check_m4v, resources.GetString("check_m4v.ToolTip"));\r
             this.check_m4v.UseVisualStyleBackColor = true;\r
             this.check_m4v.CheckedChanged += new System.EventHandler(this.check_m4v_CheckedChanged);\r
             // \r
@@ -305,8 +308,7 @@ namespace Handbrake
             this.drop_updateCheckDays.Name = "drop_updateCheckDays";\r
             this.drop_updateCheckDays.Size = new System.Drawing.Size(97, 21);\r
             this.drop_updateCheckDays.TabIndex = 97;\r
-            this.ToolTip.SetToolTip(this.drop_updateCheckDays, "The number of processor\'s / processor cores. Unless your having problems, leave o" +\r
-                    "n Automatic.");\r
+            this.ToolTip.SetToolTip(this.drop_updateCheckDays, "Check for updates: Daily, Weekly or Monthly\r\nDefault: Weekly");\r
             this.drop_updateCheckDays.SelectedIndexChanged += new System.EventHandler(this.drop_updateCheckDays_SelectedIndexChanged);\r
             // \r
             // check_autoNaming\r
@@ -698,16 +700,6 @@ namespace Handbrake
             this.check_logsInSpecifiedLocation.UseVisualStyleBackColor = true;\r
             this.check_logsInSpecifiedLocation.CheckedChanged += new System.EventHandler(this.check_logsInSpecifiedLocation_CheckedChanged);\r
             // \r
-            // label14\r
-            // \r
-            this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.label14.AutoSize = true;\r
-            this.label14.Location = new System.Drawing.Point(65, 177);\r
-            this.label14.Name = "label14";\r
-            this.label14.Size = new System.Drawing.Size(53, 13);\r
-            this.label14.TabIndex = 81;\r
-            this.label14.Text = "Log Path:";\r
-            // \r
             // Label11\r
             // \r
             this.Label11.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
@@ -855,6 +847,16 @@ namespace Handbrake
             this.btn_clearLogs.UseVisualStyleBackColor = true;\r
             this.btn_clearLogs.Click += new System.EventHandler(this.btn_clearLogs_Click);\r
             // \r
+            // label14\r
+            // \r
+            this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.label14.AutoSize = true;\r
+            this.label14.Location = new System.Drawing.Point(65, 177);\r
+            this.label14.Name = "label14";\r
+            this.label14.Size = new System.Drawing.Size(53, 13);\r
+            this.label14.TabIndex = 81;\r
+            this.label14.Text = "Log Path:";\r
+            // \r
             // tab_advanced\r
             // \r
             this.tab_advanced.Controls.Add(this.tableLayoutPanel4);\r
@@ -1126,6 +1128,9 @@ namespace Handbrake
             // \r
             this.ToolTip.Active = false;\r
             this.ToolTip.AutomaticDelay = 1000;\r
+            this.ToolTip.AutoPopDelay = 15000;\r
+            this.ToolTip.InitialDelay = 1000;\r
+            this.ToolTip.ReshowDelay = 200;\r
             this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;\r
             this.ToolTip.ToolTipTitle = "Tooltip";\r
             // \r

diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx
index 380b387..f16c6a9 100644 (file)
--- a/win/C#/frmOptions.resx
+++ b/win/C#/frmOptions.resx
@@ -120,9 +120,13 @@
   <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
+Chapter Markers, AC3 Audio and SRT Subtitles will require the m4v extension if you are using QuickTime for playback.\r
+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_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