From c7e794144f5e696afa7235ffd85f76ff57f092f7 Mon Sep 17 00:00:00 2001 From: sr55 Date: Fri, 30 Jan 2009 21:04:41 +0000 Subject: git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2109 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/frmMain.Designer.cs | 38 +++++++++++++++++++------------------- win/C#/frmMain.cs | 12 +++++++++--- win/C#/frmMain.resx | 12 ++++++------ 3 files changed, 34 insertions(+), 28 deletions(-) (limited to 'win') diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index a45aea778..d290de5c0 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -38,7 +38,7 @@ namespace Handbrake System.Windows.Forms.Label Label38; System.Windows.Forms.ContextMenuStrip notifyIconMenu; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.btn_restore = new System.Windows.Forms.ToolStripMenuItem(); this.DVD_Save = new System.Windows.Forms.SaveFileDialog(); this.File_Save = new System.Windows.Forms.SaveFileDialog(); @@ -65,6 +65,8 @@ namespace Handbrake this.check_optimiseMP4 = new System.Windows.Forms.CheckBox(); this.check_iPodAtom = new System.Windows.Forms.CheckBox(); this.data_chpt = new System.Windows.Forms.DataGridView(); + this.number = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.btn_addPreset = new System.Windows.Forms.Button(); this.btn_removePreset = new System.Windows.Forms.Button(); this.drp_audenc_1 = new System.Windows.Forms.ComboBox(); @@ -251,8 +253,6 @@ namespace Handbrake this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components); this.StatusStrip = new System.Windows.Forms.StatusStrip(); this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel(); - this.number = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.name = new System.Windows.Forms.DataGridViewTextBoxColumn(); Label38 = new System.Windows.Forms.Label(); notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components); notifyIconMenu.SuspendLayout(); @@ -646,6 +646,22 @@ namespace Handbrake this.data_chpt.TabIndex = 3; this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip")); // + // number + // + dataGridViewCellStyle3.Format = "N0"; + dataGridViewCellStyle3.NullValue = null; + this.number.DefaultCellStyle = dataGridViewCellStyle3; + this.number.HeaderText = "Chapter Number"; + this.number.MaxInputLength = 3; + this.number.Name = "number"; + this.number.Width = 165; + // + // name + // + this.name.HeaderText = "Chapter Name"; + this.name.Name = "name"; + this.name.Width = 460; + // // btn_addPreset // this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black; @@ -2916,22 +2932,6 @@ namespace Handbrake this.lbl_encode.Size = new System.Drawing.Size(31, 17); this.lbl_encode.Text = "{0}"; // - // number - // - dataGridViewCellStyle2.Format = "N0"; - dataGridViewCellStyle2.NullValue = null; - this.number.DefaultCellStyle = dataGridViewCellStyle2; - this.number.HeaderText = "Chapter Number"; - this.number.MaxInputLength = 3; - this.number.Name = "number"; - this.number.Width = 165; - // - // name - // - this.name.HeaderText = "Chapter Name"; - this.name.Name = "name"; - this.name.Width = 460; - // // frmMain // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 44c7ac291..21c655d7f 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -668,10 +668,16 @@ namespace Handbrake } private void btn_ActivityWindow_Click(object sender, EventArgs e) { - String file = lastAction == "scan" ? "dvdinfo.dat" : "hb_encode_log.dat"; + try + { + String file = lastAction == "scan" ? "dvdinfo.dat" : "hb_encode_log.dat"; - frmActivityWindow ActivityWindow = new frmActivityWindow(file, encodeHandler); - ActivityWindow.Show(); + frmActivityWindow ActivityWindow = new frmActivityWindow(file, encodeHandler); + ActivityWindow.Show(); + } catch (Exception ex) + { + MessageBox.Show(ex.ToString()); + } } #endregion diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx index 397e41ca7..0039ebd87 100644 --- a/win/C#/frmMain.resx +++ b/win/C#/frmMain.resx @@ -155,6 +155,12 @@ Make sure you have selected a "Title" from the "Source" box above otherwise the list will not be populated with the correct amount of chapters. Note: Do not change any of the chapter numbers! + + True + + + True + CABAC, or context adaptive binary arithmetic coding, is used by x264 to reduce the bitrate needed for a given quality by 15%. This makes it very cool and very useful, and it should be left on whenever possible. However, it is incompatible with the iPod 5.5G, and makes the AppleTV struggle. @@ -669,12 +675,6 @@ If you're going to choose between spatial and temporal, spatial is usually bette 1113, 15 - - True - - - True - 56 -- cgit v1.2.3