From 44fe349bb08b7127766a6612832a0ceb3ae0ac25 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 21 Jul 2007 15:49:36 +0000 Subject: WinGui: - Updated some tooltips for the main items on frmMain - Created a Debug window. - Added comments relating to a cross-thread bug with frmDvdInfo - A few other code small code tweaks git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@721 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/HandBrakeCS.csproj | 10 +++++++++ win/C#/frmDvdInfo.Designer.cs | 3 ++- win/C#/frmMain.Designer.cs | 17 +++++++++++---- win/C#/frmMain.cs | 17 +++++++++++++-- win/C#/frmOptions.Designer.cs | 1 + win/C#/frmSplashScreen.Designer.cs | 44 +++++++++++++++++++------------------- win/C#/frmSplashScreen.cs | 4 ++-- win/C#/frmUpdate.Designer.cs | 3 ++- 8 files changed, 67 insertions(+), 32 deletions(-) diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj index c9b1bac81..829bad5d0 100644 --- a/win/C#/HandBrakeCS.csproj +++ b/win/C#/HandBrakeCS.csproj @@ -47,6 +47,12 @@ frmAbout.cs + + Form + + + frmDebug.cs + Form @@ -78,6 +84,10 @@ Designer frmAbout.cs + + Designer + frmDebug.cs + Designer frmDvdInfo.cs diff --git a/win/C#/frmDvdInfo.Designer.cs b/win/C#/frmDvdInfo.Designer.cs index 7760fc834..6a3e690ae 100644 --- a/win/C#/frmDvdInfo.Designer.cs +++ b/win/C#/frmDvdInfo.Designer.cs @@ -76,7 +76,7 @@ namespace Handbrake this.AcceptButton = this.btn_close; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(545, 486); + this.ClientSize = new System.Drawing.Size(547, 495); this.Controls.Add(this.Label2); this.Controls.Add(this.rtf_dvdInfo); this.Controls.Add(this.btn_close); @@ -84,6 +84,7 @@ namespace Handbrake this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MaximumSize = new System.Drawing.Size(553, 520); + this.MinimizeBox = false; this.MinimumSize = new System.Drawing.Size(553, 520); this.Name = "frmDvdInfo"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index c3aad5529..3f4e8a669 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -214,7 +214,8 @@ namespace Handbrake this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21); this.drop_chapterFinish.TabIndex = 41; this.drop_chapterFinish.Text = "Auto"; - this.ToolTip.SetToolTip(this.drop_chapterFinish, "Encode chapters to this number"); + this.ToolTip.SetToolTip(this.drop_chapterFinish, "Step 3 - Select the chapter range you would like to enocde. (default: All Chapter" + + "s)"); this.drop_chapterFinish.SelectedIndexChanged += new System.EventHandler(this.drop_chapterFinish_SelectedIndexChanged); // // drop_chapterStart @@ -227,7 +228,8 @@ namespace Handbrake this.drop_chapterStart.Size = new System.Drawing.Size(69, 21); this.drop_chapterStart.TabIndex = 40; this.drop_chapterStart.Text = "Auto"; - this.ToolTip.SetToolTip(this.drop_chapterStart, "Encode chatpers from this number."); + this.ToolTip.SetToolTip(this.drop_chapterStart, "Step 3 - Select the chapter range you would like to enocde. (default: All Chapter" + + "s)"); this.drop_chapterStart.SelectedIndexChanged += new System.EventHandler(this.drop_chapterStart_SelectedIndexChanged); // // drp_dvdtitle @@ -242,7 +244,7 @@ namespace Handbrake this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21); this.drp_dvdtitle.TabIndex = 39; this.drp_dvdtitle.Text = "Automatic"; - this.ToolTip.SetToolTip(this.drp_dvdtitle, "The title number you wish to encode."); + this.ToolTip.SetToolTip(this.drp_dvdtitle, "Step 2 - Select the title number you wish to encode."); this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged); this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click); // @@ -277,7 +279,7 @@ namespace Handbrake this.text_destination.Name = "text_destination"; this.text_destination.Size = new System.Drawing.Size(262, 21); this.text_destination.TabIndex = 4; - this.ToolTip.SetToolTip(this.text_destination, "Where you wish to save your output file."); + this.ToolTip.SetToolTip(this.text_destination, "Location where the enoceded file will be saved."); // // drp_subtitle // @@ -616,6 +618,7 @@ namespace Handbrake this.btn_Browse.Size = new System.Drawing.Size(78, 22); this.btn_Browse.TabIndex = 2; this.btn_Browse.Text = "Browse"; + this.ToolTip.SetToolTip(this.btn_Browse, "Step 1 - Select a Source. This can be either a DVD or ts/mpg/iso file"); this.btn_Browse.UseVisualStyleBackColor = true; this.btn_Browse.Click += new System.EventHandler(this.btn_Browse_Click); // @@ -717,6 +720,7 @@ namespace Handbrake this.text_height.Name = "text_height"; this.text_height.Size = new System.Drawing.Size(64, 21); this.text_height.TabIndex = 8; + this.ToolTip.SetToolTip(this.text_height, "Video Resolution (Height)"); this.text_height.TextChanged += new System.EventHandler(this.text_height_TextChanged); // // Label55 @@ -738,6 +742,7 @@ namespace Handbrake this.text_width.Name = "text_width"; this.text_width.Size = new System.Drawing.Size(64, 21); this.text_width.TabIndex = 7; + this.ToolTip.SetToolTip(this.text_width, "Video Resolution (Width)"); this.text_width.TextChanged += new System.EventHandler(this.text_width_TextChanged); // // btn_destBrowse @@ -751,6 +756,7 @@ namespace Handbrake this.btn_destBrowse.Size = new System.Drawing.Size(83, 22); this.btn_destBrowse.TabIndex = 4; this.btn_destBrowse.Text = "Browse"; + this.ToolTip.SetToolTip(this.btn_destBrowse, "Step 4 - Select a location to save your encoded file."); this.btn_destBrowse.UseVisualStyleBackColor = true; this.btn_destBrowse.Click += new System.EventHandler(this.btn_destBrowse_Click); // @@ -781,6 +787,7 @@ namespace Handbrake this.drp_videoEncoder.Size = new System.Drawing.Size(156, 21); this.drp_videoEncoder.TabIndex = 5; this.drp_videoEncoder.Text = "H.264"; + this.ToolTip.SetToolTip(this.drp_videoEncoder, "Step 5 - Select a video encoder"); this.drp_videoEncoder.SelectedIndexChanged += new System.EventHandler(this.drp_videoEncoder_SelectedIndexChanged); // // Label47 @@ -809,6 +816,7 @@ namespace Handbrake this.drp_audioCodec.Size = new System.Drawing.Size(111, 21); this.drp_audioCodec.TabIndex = 6; this.drp_audioCodec.Text = "AAC"; + this.ToolTip.SetToolTip(this.drp_audioCodec, "Step 6 - Select an audio encoder."); this.drp_audioCodec.SelectedIndexChanged += new System.EventHandler(this.drp_audioCodec_SelectedIndexChanged); // // Label12 @@ -1742,6 +1750,7 @@ namespace Handbrake this.MinimumSize = new System.Drawing.Size(683, 648); this.Name = "frmMain"; this.Text = "Handbrake"; + this.Load += new System.EventHandler(this.frmMain_Load); this.frmMainMenu.ResumeLayout(false); this.frmMainMenu.PerformLayout(); this.GroupBox1.ResumeLayout(false); diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 0983635de..96f90a660 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -20,8 +20,7 @@ namespace Handbrake // -------------------------------------------------------------- // Some windows that require only 1 instance. // -------------------------------------------------------------- - private frmDvdInfo dvdInfoWindow = new frmDvdInfo(); - private frmQueue queueWindow = new frmQueue(); + private frmQueue queueWindow = new frmQueue(); // -------------------------------------------------------------- // Stuff that needs doing on startup. @@ -30,6 +29,7 @@ namespace Handbrake // -------------------------------------------------------------- public frmMain() { + InitializeComponent(); // Set the Version number lable to the corect version. @@ -333,9 +333,17 @@ namespace Handbrake showQueue(); } + private frmDvdInfo dvdInfoWindow = new frmDvdInfo(); private void mnu_viewDVDdata_Click(object sender, EventArgs e) { dvdInfoWindow.Show(); + + // BUG ******************************************************* + // Cross-thread operation not valid: Control 'rtf_dvdInfo' accessed from a thread other than the thread it was created on. + // This happens when the DVD is scanned and this item is then selected. + // If this item is selected so a blank copy of the window appears, then a DVD is scanned, there is no cross-thread issue. + // *********************************************************** + } private void mnu_options_Click(object sender, EventArgs e) @@ -1356,6 +1364,11 @@ namespace Handbrake return querySource+ queryDestination+ queryPictureSettings+ queryVideoSettings+ h264Settings+ queryAudioSettings+ queryAdvancedSettings+ verbose; } + private void frmMain_Load(object sender, EventArgs e) + { + + } + // This is the END of the road ------------------------------------------------------------------------------ } } \ No newline at end of file diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs index c0513d469..67daeb967 100644 --- a/win/C#/frmOptions.Designer.cs +++ b/win/C#/frmOptions.Designer.cs @@ -257,6 +257,7 @@ namespace Handbrake this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; + this.MinimizeBox = false; this.Name = "frmOptions"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Options"; diff --git a/win/C#/frmSplashScreen.Designer.cs b/win/C#/frmSplashScreen.Designer.cs index 75c53b535..9201edd87 100644 --- a/win/C#/frmSplashScreen.Designer.cs +++ b/win/C#/frmSplashScreen.Designer.cs @@ -32,8 +32,8 @@ namespace Handbrake this.productName = new System.Windows.Forms.Label(); this.cliVersion = new System.Windows.Forms.Label(); this.guiVerison = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.lbl_cli = new System.Windows.Forms.Label(); + this.lbl_gui = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.SuspendLayout(); @@ -68,25 +68,25 @@ namespace Handbrake this.guiVerison.TabIndex = 2; this.guiVerison.Text = "Version:"; // - // label2 + // lbl_cli // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(331, 197); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(88, 13); - this.label2.TabIndex = 4; - this.label2.Text = "{CLI Version}"; + this.lbl_cli.AutoSize = true; + this.lbl_cli.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbl_cli.Location = new System.Drawing.Point(331, 197); + this.lbl_cli.Name = "lbl_cli"; + this.lbl_cli.Size = new System.Drawing.Size(88, 13); + this.lbl_cli.TabIndex = 4; + this.lbl_cli.Text = "{CLI Version}"; // - // label3 + // lbl_gui // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(331, 170); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(90, 13); - this.label3.TabIndex = 5; - this.label3.Text = "{GUI Version}"; + this.lbl_gui.AutoSize = true; + this.lbl_gui.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbl_gui.Location = new System.Drawing.Point(331, 170); + this.lbl_gui.Name = "lbl_gui"; + this.lbl_gui.Size = new System.Drawing.Size(90, 13); + this.lbl_gui.TabIndex = 5; + this.lbl_gui.Text = "{GUI Version}"; // // label1 // @@ -119,8 +119,8 @@ namespace Handbrake this.ControlBox = false; this.Controls.Add(this.label4); this.Controls.Add(this.label1); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); + this.Controls.Add(this.lbl_gui); + this.Controls.Add(this.lbl_cli); this.Controls.Add(this.guiVerison); this.Controls.Add(this.cliVersion); this.Controls.Add(this.productName); @@ -139,8 +139,8 @@ namespace Handbrake private System.Windows.Forms.Label productName; private System.Windows.Forms.Label cliVersion; private System.Windows.Forms.Label guiVerison; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label lbl_cli; + private System.Windows.Forms.Label lbl_gui; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label4; } diff --git a/win/C#/frmSplashScreen.cs b/win/C#/frmSplashScreen.cs index 65ca835b2..d45d0ca26 100644 --- a/win/C#/frmSplashScreen.cs +++ b/win/C#/frmSplashScreen.cs @@ -14,8 +14,8 @@ namespace Handbrake public frmSplashScreen() { InitializeComponent(); + lbl_cli.Text = Properties.Settings.Default.CliVersion; + lbl_gui.Text = Properties.Settings.Default.GuiVersion; } - - } } \ No newline at end of file diff --git a/win/C#/frmUpdate.Designer.cs b/win/C#/frmUpdate.Designer.cs index 3dc89ff5b..33efdb7af 100644 --- a/win/C#/frmUpdate.Designer.cs +++ b/win/C#/frmUpdate.Designer.cs @@ -206,7 +206,7 @@ namespace Handbrake // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(498, 132); + this.ClientSize = new System.Drawing.Size(498, 139); this.Controls.Add(this.cliVersion); this.Controls.Add(this.lbl_cliVersion); this.Controls.Add(this.Label6); @@ -225,6 +225,7 @@ namespace Handbrake this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MaximumSize = new System.Drawing.Size(504, 164); + this.MinimizeBox = false; this.MinimumSize = new System.Drawing.Size(504, 164); this.Name = "frmUpdate"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; -- cgit v1.2.3