From 71978a1c4fdf60a967dfd46f69dcce0388686ea7 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sun, 15 Jul 2007 22:19:17 +0000 Subject: [PATCH] WinGui: - Fixed Queue not encoding the full list - Fixed Subtitle dropdown not having a "None" Option - Fixed Audio dropdown not having an "Automatic" option - Fixed Destination browse not showing files - Added Alert when queue has finished. git-svn-id: svn://localhost/HandBrake/trunk@693 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/frmMain.Designer.cs | 26 +++++++++++++------------- win/C#/frmMain.cs | 4 ++++ win/C#/frmQueue.cs | 13 +++++++++---- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index 31933559..59c864c2 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -76,6 +76,7 @@ namespace Handbrake this.mnu_about = new System.Windows.Forms.ToolStripMenuItem(); this.frmMainMenu = new System.Windows.Forms.MenuStrip(); this.GroupBox1 = new System.Windows.Forms.GroupBox(); + this.lbl_chptWarn = new System.Windows.Forms.Label(); this.Label13 = new System.Windows.Forms.Label(); this.RadioDVD = new System.Windows.Forms.RadioButton(); this.btn_Browse = new System.Windows.Forms.Button(); @@ -169,7 +170,6 @@ namespace Handbrake this.btn_queue = new System.Windows.Forms.Button(); this.btn_encode = new System.Windows.Forms.Button(); this.Version = new System.Windows.Forms.Label(); - this.lbl_chptWarn = new System.Windows.Forms.Label(); Label38 = new System.Windows.Forms.Label(); this.frmMainMenu.SuspendLayout(); this.GroupBox1.SuspendLayout(); @@ -196,7 +196,7 @@ namespace Handbrake // DVD_Save // this.DVD_Save.DefaultExt = "mp4"; - this.DVD_Save.Filter = "mp4|*.mp4 |m4v|*.m4v |avi|*.avi |ogm|*.ogm |mkv|*.mkv"; + this.DVD_Save.Filter = ".mp4|*.mp4| .m4v|*.m4v |.avi|*.avi |.ogm|*.ogm |.mkv|*.mkv"; // // File_Save // @@ -571,6 +571,16 @@ namespace Handbrake this.GroupBox1.TabStop = false; this.GroupBox1.Text = "Source"; // + // lbl_chptWarn + // + this.lbl_chptWarn.AutoSize = true; + this.lbl_chptWarn.Location = new System.Drawing.Point(287, 85); + this.lbl_chptWarn.Name = "lbl_chptWarn"; + this.lbl_chptWarn.Size = new System.Drawing.Size(77, 13); + this.lbl_chptWarn.TabIndex = 43; + this.lbl_chptWarn.Text = "{Warning}"; + this.lbl_chptWarn.Visible = false; + // // Label13 // this.Label13.AutoSize = true; @@ -1701,16 +1711,6 @@ namespace Handbrake this.Version.TabIndex = 415; this.Version.Text = "Version 2.3"; // - // lbl_chptWarn - // - this.lbl_chptWarn.AutoSize = true; - this.lbl_chptWarn.Location = new System.Drawing.Point(287, 85); - this.lbl_chptWarn.Name = "lbl_chptWarn"; - this.lbl_chptWarn.Size = new System.Drawing.Size(77, 13); - this.lbl_chptWarn.TabIndex = 43; - this.lbl_chptWarn.Text = "{Warning}"; - this.lbl_chptWarn.Visible = false; - // // frmMain // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1754,7 +1754,6 @@ namespace Handbrake #endregion - private System.Windows.Forms.SaveFileDialog DVD_Save; internal System.Windows.Forms.SaveFileDialog File_Save; internal System.Windows.Forms.ToolTip ToolTip; internal System.Windows.Forms.FolderBrowserDialog DVD_Open; @@ -1893,6 +1892,7 @@ namespace Handbrake internal System.Windows.Forms.Button btn_encode; internal System.Windows.Forms.Label Version; private System.Windows.Forms.Label lbl_chptWarn; + internal System.Windows.Forms.SaveFileDialog DVD_Save; } } \ No newline at end of file diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index c3ccc3ec..5361a348 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -1011,6 +1011,7 @@ namespace Handbrake } drp_audioChannels.Items.Clear(); + drp_subtitle.Items.Add("Automatic"); drp_audioChannels.Items.AddRange(selectedTitle.AudioTracks.ToArray()); if (drp_audioChannels.Items.Count > 0) { @@ -1018,6 +1019,7 @@ namespace Handbrake } drp_subtitle.Items.Clear(); + drp_subtitle.Items.Add("None"); drp_subtitle.Items.AddRange(selectedTitle.Subtitles.ToArray()); if (drp_subtitle.Items.Count > 0) { @@ -1328,6 +1330,8 @@ namespace Handbrake return querySource+ queryDestination+ queryPictureSettings+ queryVideoSettings+ h264Settings+ queryAudioSettings+ queryAdvancedSettings+ verbose; } + + // This is the END of the road ------------------------------------------------------------------------------ } } \ No newline at end of file diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs index 67251ccf..09b3f19c 100644 --- a/win/C#/frmQueue.cs +++ b/win/C#/frmQueue.cs @@ -73,10 +73,10 @@ namespace Handbrake private void startProc(object state) { - // Reminder: There is still a bug here where the loop suddenly halts for no good reson. UpdateUIelements runs, then the loop finishes several items early. - for (int i = 0; i < list_queue.Items.Count; i++) + int initialListCount = list_queue.Items.Count; + for (int i = 0; i < initialListCount; i++) { - string query = list_queue.Items[0] as string; + string query = list_queue.Items[0].ToString(); Process hbProc = new Process(); hbProc.StartInfo.FileName = "hbcli.exe"; hbProc.StartInfo.Arguments = query; @@ -110,7 +110,7 @@ namespace Handbrake hbProc.WaitForExit(); hbProc.Close(); hbProc.Dispose(); - + updateUIElements(); } @@ -127,6 +127,11 @@ namespace Handbrake progressBar.PerformStep(); lbl_progressValue.Text = string.Format("{0} %", progressBar.Value); progressBar.Update(); + + if (progressBar.Value == 100) + { + MessageBox.Show("Encode Queue Completed!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk); + } } } } \ No newline at end of file -- 2.11.0