From b33262144205a4bd058d92a78fe48b8055b1de27 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sun, 13 Sep 2009 22:13:53 +0000 Subject: 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://svn.handbrake.fr/HandBrake/trunk@2819 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/Controls/AudioPanel.Designer.cs | 2 +- win/C#/Controls/Filters.Designer.cs | 2 +- win/C#/Controls/PictureSettings.Designer.cs | 3 +-- win/C#/Controls/Subtitles.Designer.cs | 2 +- win/C#/Controls/x264Panel.Designer.cs | 2 +- win/C#/frmActivityWindow.cs | 7 +++++ win/C#/frmMain.Designer.cs | 4 +-- win/C#/frmOptions.Designer.cs | 41 ++++++++++++++++------------- win/C#/frmOptions.resx | 10 ++++--- 9 files changed, 44 insertions(+), 29 deletions(-) (limited to 'win/C#') diff --git a/win/C#/Controls/AudioPanel.Designer.cs b/win/C#/Controls/AudioPanel.Designer.cs index 46a5c2938..8d2006be8 100644 --- a/win/C#/Controls/AudioPanel.Designer.cs +++ b/win/C#/Controls/AudioPanel.Designer.cs @@ -399,7 +399,7 @@ namespace Handbrake.Controls // // AudioPanel // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.BackColor = System.Drawing.Color.Transparent; this.Controls.Add(this.label68); this.Controls.Add(this.btn_addAudioTrack); diff --git a/win/C#/Controls/Filters.Designer.cs b/win/C#/Controls/Filters.Designer.cs index d6bd830c7..cc2346ae8 100644 --- a/win/C#/Controls/Filters.Designer.cs +++ b/win/C#/Controls/Filters.Designer.cs @@ -300,7 +300,7 @@ // // Filters // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.BackColor = System.Drawing.Color.Transparent; this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.label68); diff --git a/win/C#/Controls/PictureSettings.Designer.cs b/win/C#/Controls/PictureSettings.Designer.cs index f39e1e3d8..853d61982 100644 --- a/win/C#/Controls/PictureSettings.Designer.cs +++ b/win/C#/Controls/PictureSettings.Designer.cs @@ -645,8 +645,7 @@ namespace Handbrake.Controls // // PictureSettings // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.BackColor = System.Drawing.Color.Transparent; this.Controls.Add(this.tableLayoutPanel3); this.Controls.Add(this.tableLayoutPanel2); diff --git a/win/C#/Controls/Subtitles.Designer.cs b/win/C#/Controls/Subtitles.Designer.cs index 6be93128b..e6584f5c0 100644 --- a/win/C#/Controls/Subtitles.Designer.cs +++ b/win/C#/Controls/Subtitles.Designer.cs @@ -490,7 +490,7 @@ // // Subtitles // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.BackColor = System.Drawing.Color.Transparent; this.Controls.Add(this.btn_srtAdd); this.Controls.Add(this.btn_RemoveSubTrack); diff --git a/win/C#/Controls/x264Panel.Designer.cs b/win/C#/Controls/x264Panel.Designer.cs index 664586ef5..206a0b6d8 100644 --- a/win/C#/Controls/x264Panel.Designer.cs +++ b/win/C#/Controls/x264Panel.Designer.cs @@ -678,7 +678,7 @@ namespace Handbrake.Controls // // x264Panel // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.BackColor = System.Drawing.Color.Transparent; this.Controls.Add(this.slider_psytrellis); this.Controls.Add(this.lbl_psytrellis); diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs index 86ed53d06..8b2135d0b 100644 --- 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. private readonly frmMain _mainWin; private Boolean _lastUpdate; + private Boolean fileNotFoundQuickFix; public frmActivityWindow(string file, EncodeAndQueueHandler eh, frmMain mw) { @@ -175,7 +176,13 @@ namespace Handbrake if (File.Exists(logFile)) File.Copy(logFile, logFile2); else + { + if (fileNotFoundQuickFix) + return ""; + fileNotFoundQuickFix = true; 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; + } + // Open the copied log file for reading StreamReader sr = new StreamReader(logFile2); diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index 0fba4d244..62a2d57f9 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -1643,8 +1643,8 @@ namespace Handbrake // frmMain // this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScroll = true; this.ClientSize = new System.Drawing.Size(1000, 582); this.Controls.Add(this.tableLayoutPanel3); diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs index 6c9a4548b..e91a0283d 100644 --- 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(); this.btn_saveLog = new System.Windows.Forms.Button(); this.check_logsInSpecifiedLocation = new System.Windows.Forms.CheckBox(); - this.label14 = new System.Windows.Forms.Label(); this.Label11 = new System.Windows.Forms.Label(); this.check_saveLogWithVideo = new System.Windows.Forms.CheckBox(); this.Label4 = new System.Windows.Forms.Label(); @@ -85,6 +84,7 @@ namespace Handbrake this.drp_processors = new System.Windows.Forms.ComboBox(); this.btn_viewLogs = new System.Windows.Forms.Button(); this.btn_clearLogs = new System.Windows.Forms.Button(); + this.label14 = new System.Windows.Forms.Label(); this.tab_advanced = new System.Windows.Forms.TabPage(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); this.check_promptOnUnmatchingQueries = new System.Windows.Forms.CheckBox(); @@ -237,7 +237,8 @@ namespace Handbrake this.check_growlEncode.Size = new System.Drawing.Size(171, 17); this.check_growlEncode.TabIndex = 99; this.check_growlEncode.Text = "Growl after Encode Completes"; - this.ToolTip.SetToolTip(this.check_growlEncode, "Growl for Windows"); + this.ToolTip.SetToolTip(this.check_growlEncode, "If you have \"Growl for Windows\" installed, you can use this feature to see growl " + + "alerts on your desktop."); this.check_growlEncode.UseVisualStyleBackColor = false; this.check_growlEncode.CheckedChanged += new System.EventHandler(this.check_growlEncode_CheckedChanged); // @@ -251,7 +252,8 @@ namespace Handbrake this.check_GrowlQueue.Size = new System.Drawing.Size(168, 17); this.check_GrowlQueue.TabIndex = 98; this.check_GrowlQueue.Text = "Growl after Queue Completes"; - this.ToolTip.SetToolTip(this.check_GrowlQueue, "Growl for Windows"); + this.ToolTip.SetToolTip(this.check_GrowlQueue, "If you have \"Growl for Windows\" installed, you can use this feature to see growl " + + "alerts on your desktop."); this.check_GrowlQueue.UseVisualStyleBackColor = false; this.check_GrowlQueue.CheckedChanged += new System.EventHandler(this.check_GrowlQueue_CheckedChanged); // @@ -261,10 +263,11 @@ namespace Handbrake this.check_m4v.AutoSize = true; this.check_m4v.Location = new System.Drawing.Point(108, 279); this.check_m4v.Name = "check_m4v"; - this.check_m4v.Size = new System.Drawing.Size(283, 17); + this.check_m4v.Size = new System.Drawing.Size(423, 17); this.check_m4v.TabIndex = 82; - this.check_m4v.Text = "Use iPod/iTunes friendly file extension (.m4v) for MP4"; - this.ToolTip.SetToolTip(this.check_m4v, "Use .m4v instead of .mp4 for MP4 files"); + this.check_m4v.Text = "Use iPod/iTunes friendly file extension (.m4v) for MP4 (See tooltip for more deta" + + "ils)"; + this.ToolTip.SetToolTip(this.check_m4v, resources.GetString("check_m4v.ToolTip")); this.check_m4v.UseVisualStyleBackColor = true; this.check_m4v.CheckedChanged += new System.EventHandler(this.check_m4v_CheckedChanged); // @@ -305,8 +308,7 @@ namespace Handbrake this.drop_updateCheckDays.Name = "drop_updateCheckDays"; this.drop_updateCheckDays.Size = new System.Drawing.Size(97, 21); this.drop_updateCheckDays.TabIndex = 97; - this.ToolTip.SetToolTip(this.drop_updateCheckDays, "The number of processor\'s / processor cores. Unless your having problems, leave o" + - "n Automatic."); + this.ToolTip.SetToolTip(this.drop_updateCheckDays, "Check for updates: Daily, Weekly or Monthly\r\nDefault: Weekly"); this.drop_updateCheckDays.SelectedIndexChanged += new System.EventHandler(this.drop_updateCheckDays_SelectedIndexChanged); // // check_autoNaming @@ -698,16 +700,6 @@ namespace Handbrake this.check_logsInSpecifiedLocation.UseVisualStyleBackColor = true; this.check_logsInSpecifiedLocation.CheckedChanged += new System.EventHandler(this.check_logsInSpecifiedLocation_CheckedChanged); // - // label14 - // - this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(65, 177); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(53, 13); - this.label14.TabIndex = 81; - this.label14.Text = "Log Path:"; - // // Label11 // this.Label11.Anchor = System.Windows.Forms.AnchorStyles.Left; @@ -855,6 +847,16 @@ namespace Handbrake this.btn_clearLogs.UseVisualStyleBackColor = true; this.btn_clearLogs.Click += new System.EventHandler(this.btn_clearLogs_Click); // + // label14 + // + this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(65, 177); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(53, 13); + this.label14.TabIndex = 81; + this.label14.Text = "Log Path:"; + // // tab_advanced // this.tab_advanced.Controls.Add(this.tableLayoutPanel4); @@ -1126,6 +1128,9 @@ namespace Handbrake // this.ToolTip.Active = false; this.ToolTip.AutomaticDelay = 1000; + this.ToolTip.AutoPopDelay = 15000; + this.ToolTip.InitialDelay = 1000; + this.ToolTip.ReshowDelay = 200; this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info; this.ToolTip.ToolTipTitle = "Tooltip"; // diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx index 380b38730..f16c6a9a2 100644 --- a/win/C#/frmOptions.resx +++ b/win/C#/frmOptions.resx @@ -120,9 +120,13 @@ 132, 18 - - 132, 18 - + + Use .m4v instead of .mp4 for MP4 files + +Chapter Markers, AC3 Audio and SRT Subtitles will require the m4v extension if you are using QuickTime for playback. +When this option is disabled, Chapter Markers, AC3 audio and SRT subtitiles will still automatically change the file extension to m4v. + + If the new Picture Settings panel is causing you problems, enable this option. It disables some of the resolution calcuation code for None and Custom modes. -- cgit v1.2.3