{\r
this.components = new System.ComponentModel.Container();\r
this.drp_subtitleTracks = new System.Windows.Forms.ComboBox();\r
- this.AudioTrackGroup = new System.Windows.Forms.GroupBox();\r
+ this.SubTitlesGroup = new System.Windows.Forms.GroupBox();\r
this.label1 = new System.Windows.Forms.Label();\r
this.check_default = new System.Windows.Forms.CheckBox();\r
this.check_burned = new System.Windows.Forms.CheckBox();\r
this.forced = new System.Windows.Forms.ColumnHeader();\r
this.burned = new System.Windows.Forms.ColumnHeader();\r
this.defaultTrack = new System.Windows.Forms.ColumnHeader();\r
+ this.type = new System.Windows.Forms.ColumnHeader();\r
+ this.srtOffset = new System.Windows.Forms.ColumnHeader();\r
this.subMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
this.mnu_moveup = new System.Windows.Forms.ToolStripMenuItem();\r
this.mnu_movedown = new System.Windows.Forms.ToolStripMenuItem();\r
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();\r
this.mnu_remove = new System.Windows.Forms.ToolStripMenuItem();\r
this.label68 = new System.Windows.Forms.Label();\r
- this.AudioTrackGroup.SuspendLayout();\r
+ this.tabControl1 = new System.Windows.Forms.TabControl();\r
+ this.tabPage1 = new System.Windows.Forms.TabPage();\r
+ this.tabPage2 = new System.Windows.Forms.TabPage();\r
+ this.SRTGroup = new System.Windows.Forms.GroupBox();\r
+ this.srt_offset = new System.Windows.Forms.NumericUpDown();\r
+ this.label5 = new System.Windows.Forms.Label();\r
+ this.srt_browse = new System.Windows.Forms.Button();\r
+ this.label4 = new System.Windows.Forms.Label();\r
+ this.label3 = new System.Windows.Forms.Label();\r
+ this.srt_charcode = new System.Windows.Forms.ComboBox();\r
+ this.label2 = new System.Windows.Forms.Label();\r
+ this.srt_lang = new System.Windows.Forms.ComboBox();\r
+ this.btn_srtAdd = new System.Windows.Forms.Button();\r
+ this.openFileDialog = new System.Windows.Forms.OpenFileDialog();\r
+ this.SubTitlesGroup.SuspendLayout();\r
this.subMenu.SuspendLayout();\r
+ this.tabControl1.SuspendLayout();\r
+ this.tabPage1.SuspendLayout();\r
+ this.tabPage2.SuspendLayout();\r
+ this.SRTGroup.SuspendLayout();\r
+ ((System.ComponentModel.ISupportInitialize)(this.srt_offset)).BeginInit();\r
this.SuspendLayout();\r
// \r
// drp_subtitleTracks\r
this.drp_subtitleTracks.TabIndex = 50;\r
this.drp_subtitleTracks.SelectedIndexChanged += new System.EventHandler(this.drp_subtitleTracks_SelectedIndexChanged);\r
// \r
- // AudioTrackGroup\r
- // \r
- this.AudioTrackGroup.BackColor = System.Drawing.Color.Transparent;\r
- this.AudioTrackGroup.Controls.Add(this.label1);\r
- this.AudioTrackGroup.Controls.Add(this.check_default);\r
- this.AudioTrackGroup.Controls.Add(this.check_burned);\r
- this.AudioTrackGroup.Controls.Add(this.check_forced);\r
- this.AudioTrackGroup.Controls.Add(this.drp_subtitleTracks);\r
- this.AudioTrackGroup.ForeColor = System.Drawing.Color.Black;\r
- this.AudioTrackGroup.Location = new System.Drawing.Point(16, 32);\r
- this.AudioTrackGroup.Name = "AudioTrackGroup";\r
- this.AudioTrackGroup.Size = new System.Drawing.Size(689, 50);\r
- this.AudioTrackGroup.TabIndex = 71;\r
- this.AudioTrackGroup.TabStop = false;\r
- this.AudioTrackGroup.Text = "Selected Track: New Track";\r
+ // SubTitlesGroup\r
+ // \r
+ this.SubTitlesGroup.BackColor = System.Drawing.Color.Transparent;\r
+ this.SubTitlesGroup.Controls.Add(this.label1);\r
+ this.SubTitlesGroup.Controls.Add(this.check_default);\r
+ this.SubTitlesGroup.Controls.Add(this.check_burned);\r
+ this.SubTitlesGroup.Controls.Add(this.check_forced);\r
+ this.SubTitlesGroup.Controls.Add(this.drp_subtitleTracks);\r
+ this.SubTitlesGroup.ForeColor = System.Drawing.Color.Black;\r
+ this.SubTitlesGroup.Location = new System.Drawing.Point(6, 6);\r
+ this.SubTitlesGroup.Name = "SubTitlesGroup";\r
+ this.SubTitlesGroup.Size = new System.Drawing.Size(669, 50);\r
+ this.SubTitlesGroup.TabIndex = 71;\r
+ this.SubTitlesGroup.TabStop = false;\r
+ this.SubTitlesGroup.Text = "Selected Track: New Track";\r
// \r
// label1\r
// \r
this.btn_RemoveSubTrack.BackColor = System.Drawing.Color.Transparent;\r
this.btn_RemoveSubTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
this.btn_RemoveSubTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
- this.btn_RemoveSubTrack.Location = new System.Drawing.Point(133, 274);\r
+ this.btn_RemoveSubTrack.Location = new System.Drawing.Point(263, 274);\r
this.btn_RemoveSubTrack.Name = "btn_RemoveSubTrack";\r
this.btn_RemoveSubTrack.Size = new System.Drawing.Size(111, 23);\r
this.btn_RemoveSubTrack.TabIndex = 69;\r
this.col_Source,\r
this.forced,\r
this.burned,\r
- this.defaultTrack});\r
+ this.defaultTrack,\r
+ this.type,\r
+ this.srtOffset});\r
this.lv_subList.ContextMenuStrip = this.subMenu;\r
this.lv_subList.FullRowSelect = true;\r
this.lv_subList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;\r
this.lv_subList.HideSelection = false;\r
this.lv_subList.LabelWrap = false;\r
- this.lv_subList.Location = new System.Drawing.Point(17, 88);\r
+ this.lv_subList.Location = new System.Drawing.Point(17, 137);\r
this.lv_subList.MultiSelect = false;\r
this.lv_subList.Name = "lv_subList";\r
- this.lv_subList.Size = new System.Drawing.Size(688, 180);\r
+ this.lv_subList.Size = new System.Drawing.Size(688, 131);\r
this.lv_subList.TabIndex = 70;\r
this.lv_subList.UseCompatibleStateImageBehavior = false;\r
this.lv_subList.View = System.Windows.Forms.View.Details;\r
// id\r
// \r
this.id.Text = "Track ID";\r
- this.id.Width = 70;\r
+ this.id.Width = 65;\r
// \r
// col_Source\r
// \r
this.col_Source.Text = "Track";\r
- this.col_Source.Width = 250;\r
+ this.col_Source.Width = 150;\r
// \r
// forced\r
// \r
this.defaultTrack.Text = "Default";\r
this.defaultTrack.Width = 100;\r
// \r
+ // type\r
+ // \r
+ this.type.Text = "Type";\r
+ this.type.Width = 110;\r
+ // \r
+ // srtOffset\r
+ // \r
+ this.srtOffset.Text = "Srt Offset";\r
+ this.srtOffset.Width = 70;\r
+ // \r
// subMenu\r
// \r
this.subMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
this.label68.TabIndex = 67;\r
this.label68.Text = "Subtitles";\r
// \r
+ // tabControl1\r
+ // \r
+ this.tabControl1.Controls.Add(this.tabPage1);\r
+ this.tabControl1.Controls.Add(this.tabPage2);\r
+ this.tabControl1.Location = new System.Drawing.Point(16, 39);\r
+ this.tabControl1.Name = "tabControl1";\r
+ this.tabControl1.SelectedIndex = 0;\r
+ this.tabControl1.Size = new System.Drawing.Size(689, 92);\r
+ this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;\r
+ this.tabControl1.TabIndex = 72;\r
+ // \r
+ // tabPage1\r
+ // \r
+ this.tabPage1.Controls.Add(this.SubTitlesGroup);\r
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);\r
+ this.tabPage1.Name = "tabPage1";\r
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);\r
+ this.tabPage1.Size = new System.Drawing.Size(681, 66);\r
+ this.tabPage1.TabIndex = 0;\r
+ this.tabPage1.Text = "Subtitles";\r
+ this.tabPage1.UseVisualStyleBackColor = true;\r
+ // \r
+ // tabPage2\r
+ // \r
+ this.tabPage2.Controls.Add(this.SRTGroup);\r
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);\r
+ this.tabPage2.Name = "tabPage2";\r
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);\r
+ this.tabPage2.Size = new System.Drawing.Size(681, 66);\r
+ this.tabPage2.TabIndex = 1;\r
+ this.tabPage2.Text = "External SRT";\r
+ this.tabPage2.UseVisualStyleBackColor = true;\r
+ // \r
+ // SRTGroup\r
+ // \r
+ this.SRTGroup.BackColor = System.Drawing.Color.Transparent;\r
+ this.SRTGroup.Controls.Add(this.srt_offset);\r
+ this.SRTGroup.Controls.Add(this.label5);\r
+ this.SRTGroup.Controls.Add(this.srt_browse);\r
+ this.SRTGroup.Controls.Add(this.label4);\r
+ this.SRTGroup.Controls.Add(this.label3);\r
+ this.SRTGroup.Controls.Add(this.srt_charcode);\r
+ this.SRTGroup.Controls.Add(this.label2);\r
+ this.SRTGroup.Controls.Add(this.srt_lang);\r
+ this.SRTGroup.ForeColor = System.Drawing.Color.Black;\r
+ this.SRTGroup.Location = new System.Drawing.Point(6, 6);\r
+ this.SRTGroup.Name = "SRTGroup";\r
+ this.SRTGroup.Size = new System.Drawing.Size(669, 50);\r
+ this.SRTGroup.TabIndex = 72;\r
+ this.SRTGroup.TabStop = false;\r
+ this.SRTGroup.Text = "Selected Track: New Track";\r
+ // \r
+ // srt_offset\r
+ // \r
+ this.srt_offset.Location = new System.Drawing.Point(402, 20);\r
+ this.srt_offset.Name = "srt_offset";\r
+ this.srt_offset.Size = new System.Drawing.Size(58, 21);\r
+ this.srt_offset.TabIndex = 79;\r
+ this.srt_offset.ValueChanged += new System.EventHandler(this.srt_offset_ValueChanged);\r
+ // \r
+ // label5\r
+ // \r
+ this.label5.AutoSize = true;\r
+ this.label5.Location = new System.Drawing.Point(486, 23);\r
+ this.label5.Name = "label5";\r
+ this.label5.Size = new System.Drawing.Size(27, 13);\r
+ this.label5.TabIndex = 78;\r
+ this.label5.Text = "File:";\r
+ // \r
+ // srt_browse\r
+ // \r
+ this.srt_browse.BackColor = System.Drawing.Color.Transparent;\r
+ this.srt_browse.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.srt_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+ this.srt_browse.Location = new System.Drawing.Point(519, 18);\r
+ this.srt_browse.Name = "srt_browse";\r
+ this.srt_browse.Size = new System.Drawing.Size(111, 23);\r
+ this.srt_browse.TabIndex = 77;\r
+ this.srt_browse.Text = "Browse";\r
+ this.srt_browse.UseVisualStyleBackColor = false;\r
+ this.srt_browse.Click += new System.EventHandler(this.srt_browse_Click);\r
+ // \r
+ // label4\r
+ // \r
+ this.label4.AutoSize = true;\r
+ this.label4.Location = new System.Drawing.Point(354, 23);\r
+ this.label4.Name = "label4";\r
+ this.label4.Size = new System.Drawing.Size(42, 13);\r
+ this.label4.TabIndex = 76;\r
+ this.label4.Text = "Offset:";\r
+ // \r
+ // label3\r
+ // \r
+ this.label3.AutoSize = true;\r
+ this.label3.Location = new System.Drawing.Point(202, 23);\r
+ this.label3.Name = "label3";\r
+ this.label3.Size = new System.Drawing.Size(62, 13);\r
+ this.label3.TabIndex = 74;\r
+ this.label3.Text = "Char Code:";\r
+ // \r
+ // srt_charcode\r
+ // \r
+ this.srt_charcode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+ this.srt_charcode.FormattingEnabled = true;\r
+ this.srt_charcode.Items.AddRange(new object[] {\r
+ "ANSI_X3.4-1968",\r
+ "ANSI_X3.4-1986",\r
+ "ANSI_X3.4",\r
+ "ANSI_X3.110-1983",\r
+ "ANSI_X3.110",\r
+ "ASCII",\r
+ "ECMA-114",\r
+ "ECMA-118",\r
+ "ECMA-128",\r
+ "ECMA-CYRILLIC",\r
+ "IEC_P27-1",\r
+ "ISO-8859-1",\r
+ "ISO-8859-2",\r
+ "ISO-8859-3",\r
+ "ISO-8859-4",\r
+ "ISO-8859-5",\r
+ "ISO-8859-6",\r
+ "ISO-8859-7",\r
+ "ISO-8859-8",\r
+ "ISO-8859-9",\r
+ "ISO-8859-9E",\r
+ "ISO-8859-10",\r
+ "ISO-8859-11",\r
+ "ISO-8859-13",\r
+ "ISO-8859-14",\r
+ "ISO-8859-15",\r
+ "ISO-8859-16",\r
+ "UTF-7",\r
+ "UTF-8",\r
+ "UTF-16",\r
+ "UTF-32"});\r
+ this.srt_charcode.Location = new System.Drawing.Point(270, 20);\r
+ this.srt_charcode.Name = "srt_charcode";\r
+ this.srt_charcode.Size = new System.Drawing.Size(78, 21);\r
+ this.srt_charcode.TabIndex = 73;\r
+ this.srt_charcode.SelectedIndexChanged += new System.EventHandler(this.srt_charcode_SelectedIndexChanged);\r
+ // \r
+ // label2\r
+ // \r
+ this.label2.AutoSize = true;\r
+ this.label2.Location = new System.Drawing.Point(6, 23);\r
+ this.label2.Name = "label2";\r
+ this.label2.Size = new System.Drawing.Size(58, 13);\r
+ this.label2.TabIndex = 72;\r
+ this.label2.Text = "Language:";\r
+ // \r
+ // srt_lang\r
+ // \r
+ this.srt_lang.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+ this.srt_lang.FormattingEnabled = true;\r
+ this.srt_lang.Location = new System.Drawing.Point(70, 20);\r
+ this.srt_lang.Name = "srt_lang";\r
+ this.srt_lang.Size = new System.Drawing.Size(126, 21);\r
+ this.srt_lang.TabIndex = 50;\r
+ this.srt_lang.SelectedIndexChanged += new System.EventHandler(this.srt_lang_SelectedIndexChanged);\r
+ // \r
+ // btn_srtAdd\r
+ // \r
+ this.btn_srtAdd.BackColor = System.Drawing.Color.Transparent;\r
+ this.btn_srtAdd.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.btn_srtAdd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+ this.btn_srtAdd.Location = new System.Drawing.Point(133, 274);\r
+ this.btn_srtAdd.Name = "btn_srtAdd";\r
+ this.btn_srtAdd.Size = new System.Drawing.Size(124, 23);\r
+ this.btn_srtAdd.TabIndex = 73;\r
+ this.btn_srtAdd.Text = "Add External SRT";\r
+ this.btn_srtAdd.UseVisualStyleBackColor = false;\r
+ this.btn_srtAdd.Click += new System.EventHandler(this.btn_srtAdd_Click);\r
+ // \r
+ // openFileDialog\r
+ // \r
+ this.openFileDialog.DefaultExt = "srt";\r
+ this.openFileDialog.Filter = "SRT Files |*.srt";\r
+ // \r
// Subtitles\r
// \r
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;\r
this.BackColor = System.Drawing.Color.Transparent;\r
- this.Controls.Add(this.AudioTrackGroup);\r
+ this.Controls.Add(this.btn_srtAdd);\r
+ this.Controls.Add(this.tabControl1);\r
this.Controls.Add(this.btn_RemoveSubTrack);\r
this.Controls.Add(this.lv_subList);\r
this.Controls.Add(this.label68);\r
this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
this.Name = "Subtitles";\r
this.Size = new System.Drawing.Size(719, 300);\r
- this.AudioTrackGroup.ResumeLayout(false);\r
- this.AudioTrackGroup.PerformLayout();\r
+ this.SubTitlesGroup.ResumeLayout(false);\r
+ this.SubTitlesGroup.PerformLayout();\r
this.subMenu.ResumeLayout(false);\r
+ this.tabControl1.ResumeLayout(false);\r
+ this.tabPage1.ResumeLayout(false);\r
+ this.tabPage2.ResumeLayout(false);\r
+ this.SRTGroup.ResumeLayout(false);\r
+ this.SRTGroup.PerformLayout();\r
+ ((System.ComponentModel.ISupportInitialize)(this.srt_offset)).EndInit();\r
this.ResumeLayout(false);\r
this.PerformLayout();\r
\r
#endregion\r
\r
internal System.Windows.Forms.ComboBox drp_subtitleTracks;\r
- private System.Windows.Forms.GroupBox AudioTrackGroup;\r
+ private System.Windows.Forms.GroupBox SubTitlesGroup;\r
private System.Windows.Forms.Button btn_RemoveSubTrack;\r
private System.Windows.Forms.Button btn_addSubTrack;\r
internal System.Windows.Forms.ListView lv_subList;\r
private System.Windows.Forms.ToolStripMenuItem mnu_movedown;\r
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;\r
private System.Windows.Forms.ToolStripMenuItem mnu_remove;\r
+ internal System.Windows.Forms.TabControl tabControl1;\r
+ private System.Windows.Forms.TabPage tabPage1;\r
+ private System.Windows.Forms.TabPage tabPage2;\r
+ private System.Windows.Forms.Button btn_srtAdd;\r
+ private System.Windows.Forms.ColumnHeader type;\r
+ private System.Windows.Forms.ColumnHeader srtOffset;\r
+ private System.Windows.Forms.GroupBox SRTGroup;\r
+ private System.Windows.Forms.Label label5;\r
+ private System.Windows.Forms.Button srt_browse;\r
+ private System.Windows.Forms.Label label4;\r
+ private System.Windows.Forms.Label label3;\r
+ internal System.Windows.Forms.ComboBox srt_charcode;\r
+ private System.Windows.Forms.Label label2;\r
+ internal System.Windows.Forms.ComboBox srt_lang;\r
+ private System.Windows.Forms.NumericUpDown srt_offset;\r
+ private System.Windows.Forms.OpenFileDialog openFileDialog;\r
}\r
}\r
using System;\r
+using System.Collections.Generic;\r
using System.Windows.Forms;\r
+using Handbrake.Functions;\r
+using System.IO;\r
\r
namespace Handbrake.Controls\r
{\r
public partial class Subtitles : UserControl\r
{\r
\r
+ IDictionary<string, string> LangMap = new Dictionary<string, string>();\r
+\r
public Subtitles()\r
{\r
InitializeComponent();\r
\r
+ LangMap = Main.mapLanguages();\r
+ foreach (string key in LangMap.Keys)\r
+ srt_lang.Items.Add(key);\r
+\r
+ srt_charcode.SelectedIndex = 28;\r
+ srt_lang.SelectedIndex = 40;\r
}\r
\r
private int fileContainer;\r
}\r
\r
Boolean addTrack = true;\r
- if (fileContainer == 0 || fileContainer == 1)\r
+ if (fileContainer == 0)\r
{\r
burnedVal = "Yes"; // MP4 must have bitmap subs burned in.\r
\r
// Make sure we only have 1 bitmap track.\r
- if (drp_subtitleTracks.SelectedItem.ToString().Contains("Bitmap"))\r
- foreach (ListViewItem item in lv_subList.Items)\r
- {\r
- if (item.SubItems[1].Text.Contains("Bitmap"))\r
+ if (drp_subtitleTracks.SelectedItem != null)\r
+ {\r
+ if (drp_subtitleTracks.SelectedItem.ToString().Contains("Bitmap"))\r
+ foreach (ListViewItem item in lv_subList.Items)\r
{\r
- MessageBox.Show(this,\r
- "More than one vobsub is not supported in mp4... Your first vobsub track will now be used.",\r
- "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
- addTrack = false;\r
+ if (item.SubItems[1].Text.Contains("Bitmap"))\r
+ {\r
+ MessageBox.Show(this,\r
+ "More than one vobsub is not supported in mp4... Your first vobsub track will now be used.",\r
+ "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+ addTrack = false;\r
+ }\r
}\r
- }\r
+ }\r
+ else\r
+ addTrack = false;\r
+\r
}\r
\r
// Add the track if allowed.\r
lv_subList.Items.Add(newTrack);\r
}\r
}\r
+ private void btn_srtAdd_Click(object sender, EventArgs e)\r
+ {\r
+ ListViewItem newTrack = new ListViewItem(getNewID().ToString());\r
+\r
+ newTrack.SubItems.Add(srt_lang.SelectedItem + ", (" + srt_charcode.SelectedItem + ")");\r
+ newTrack.SubItems.Add("No");\r
+ newTrack.SubItems.Add("No");\r
+ newTrack.SubItems.Add("No");\r
+ if (openFileDialog.FileName != null)\r
+ newTrack.SubItems.Add(openFileDialog.FileName);\r
+ else\r
+ newTrack.SubItems.Add("None");\r
+\r
+ newTrack.SubItems.Add(srt_offset.Value.ToString());\r
+\r
+ lv_subList.Items.Add(newTrack);\r
+ }\r
private void btn_RemoveSubTrack_Click(object sender, EventArgs e)\r
{\r
removeTrack();\r
// Set the dropdown controls based on the selected item in the List.\r
if (lv_subList.Items.Count != 0 && lv_subList.SelectedIndices.Count != 0)\r
{\r
- // Reset the checkboxes\r
- check_forced.CheckState = CheckState.Unchecked;\r
- check_burned.CheckState = CheckState.Unchecked;\r
- check_default.CheckState = CheckState.Unchecked;\r
-\r
- // Setup the controls\r
- int c = 0;\r
- foreach (var item in drp_subtitleTracks.Items)\r
+ if (lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems.Count != 5) // We have an SRT\r
{\r
- if (item.ToString() == lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[1].Text)\r
- drp_subtitleTracks.SelectedIndex = c;\r
- c++;\r
- }\r
- drp_subtitleTracks.SelectedItem = lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[1];\r
+ string[] trackData = lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[1].Text.Split(',');\r
+ string charCode = trackData[1].Replace("(", "").Replace(")", "");\r
+ srt_lang.SelectedItem = trackData[0];\r
+ srt_charcode.SelectedItem = charCode.Trim();\r
\r
- if (lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[2].Text == "Yes")\r
- check_forced.CheckState = CheckState.Checked;\r
+ int offsetVal;\r
+ int.TryParse(lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[6].Text, out offsetVal);\r
+ srt_offset.Value = offsetVal;\r
\r
- if (lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[3].Text == "Yes")\r
- check_burned.CheckState = CheckState.Checked;\r
+ SRTGroup.Text = "Selected Track: " + lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[0].Text;\r
+ SubTitlesGroup.Text = "Selected Track: None";\r
+ }\r
+ else // We have Bitmap/CC\r
+ {\r
+ // Setup the controls\r
+ int c = 0;\r
+ foreach (var item in drp_subtitleTracks.Items)\r
+ {\r
+ if (item.ToString() == lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[1].Text)\r
+ drp_subtitleTracks.SelectedIndex = c;\r
+ c++;\r
+ }\r
+ drp_subtitleTracks.SelectedItem = lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[1];\r
\r
- if (lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[4].Text == "Yes")\r
- check_default.CheckState = CheckState.Checked;\r
+ check_forced.CheckState = lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[2].Text == "Yes" ? CheckState.Checked : CheckState.Unchecked;\r
+ check_burned.CheckState = lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[3].Text == "Yes" ? CheckState.Checked : CheckState.Unchecked; \r
+ check_default.CheckState = lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[4].Text == "Yes" ? CheckState.Checked : CheckState.Unchecked;\r
\r
- AudioTrackGroup.Text = "Selected Track: " + lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[0].Text;\r
+ SubTitlesGroup.Text = "Selected Track: " + lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[0].Text;\r
+ SRTGroup.Text = "Selected Track: None";\r
+ }\r
}\r
else\r
- AudioTrackGroup.Text = "Selected Track: None (Click \"Add Track\" to add)";\r
+ {\r
+ SubTitlesGroup.Text = "Selected Track: None (Click \"Add Track\" to add)";\r
+ SRTGroup.Text = "Selected Track: None (Click \"Add External SRT\" to add) ";\r
+ }\r
}\r
\r
+ // Bitmap / CC Controls\r
private void drp_subtitleTracks_SelectedIndexChanged(object sender, EventArgs e)\r
{\r
// Update an item in the list if required.\r
lv_subList.Select();\r
}\r
}\r
- \r
+\r
+ // SRT Controls\r
+ private void srt_offset_ValueChanged(object sender, EventArgs e)\r
+ {\r
+ // Update an item in the list if required.\r
+ if (lv_subList.Items.Count != 0 && lv_subList.SelectedIndices.Count != 0)\r
+ {\r
+ lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[6].Text = srt_offset.Value.ToString();\r
+ lv_subList.Select();\r
+ }\r
+ }\r
+ private void srt_charcode_SelectedIndexChanged(object sender, EventArgs e)\r
+ {\r
+ // Update an item in the list if required.\r
+ if (lv_subList.Items.Count != 0 && lv_subList.SelectedIndices.Count != 0)\r
+ {\r
+ string[] trackData = lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[1].Text.Split(',');\r
+\r
+ lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[1].Text = trackData[0].Trim() + ", (" + srt_charcode.SelectedItem + ")";\r
+ lv_subList.Select();\r
+ }\r
+ }\r
+ private void srt_lang_SelectedIndexChanged(object sender, EventArgs e)\r
+ {\r
+ // Update an item in the list if required.\r
+ if (lv_subList.Items.Count != 0 && lv_subList.SelectedIndices.Count != 0)\r
+ {\r
+ string[] trackData = lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[1].Text.Split(',');\r
+ string charCode = trackData[1].Replace("(", "").Replace(")", "").Trim();\r
+\r
+ lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[1].Text = srt_lang.SelectedItem + ", (" + charCode + ")";\r
+ lv_subList.Select();\r
+ }\r
+ }\r
+ private void srt_browse_Click(object sender, EventArgs e)\r
+ {\r
+ openFileDialog.ShowDialog();\r
+ }\r
+\r
// Right Click Menu\r
private void mnu_moveup_Click(object sender, EventArgs e)\r
{\r
i++;\r
}\r
}\r
+\r
}\r
}\r
<metadata name="subMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
<value>17, 17</value>\r
</metadata>\r
+ <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+ <value>113, 17</value>\r
+ </metadata>\r
</root>
\ No newline at end of file
public bool CompletedSynchronously { get { throw new NotImplementedException(); } }\r
public bool IsCompleted { get { throw new NotImplementedException(); } }\r
}\r
+\r
+ /// <summary>\r
+ /// Map languages and their iso639_2 value into a IDictionary\r
+ /// </summary>\r
+ /// <returns></returns>\r
+ public static IDictionary<string, string> mapLanguages()\r
+ {\r
+ IDictionary<string, string> languageMap = new Dictionary<string, string>\r
+ {\r
+ {"Any", "und"},\r
+ {"Afar", "aar"},\r
+ {"Abkhazian", "abk"},\r
+ {"Afrikaans", "afr"},\r
+ {"Akan", "aka"},\r
+ {"Albanian", "sqi"},\r
+ {"Amharic", "amh"},\r
+ {"Arabic", "ara"},\r
+ {"Aragonese", "arg"},\r
+ {"Armenian", "hye"},\r
+ {"Assamese", "asm"},\r
+ {"Avaric", "ava"},\r
+ {"Avestan", "ave"},\r
+ {"Aymara", "aym"},\r
+ {"Azerbaijani", "aze"},\r
+ {"Bashkir", "bak"},\r
+ {"Bambara", "bam"},\r
+ {"Basque", "eus"},\r
+ {"Belarusian", "bel"},\r
+ {"Bengali", "ben"},\r
+ {"Bihari", "bih"},\r
+ {"Bislama", "bis"},\r
+ {"Bosnian", "bos"},\r
+ {"Breton", "bre"},\r
+ {"Bulgarian", "bul"},\r
+ {"Burmese", "mya"},\r
+ {"Catalan", "cat"},\r
+ {"Chamorro", "cha"},\r
+ {"Chechen", "che"},\r
+ {"Chinese", "zho"},\r
+ {"Church Slavic", "chu"},\r
+ {"Chuvash", "chv"},\r
+ {"Cornish", "cor"},\r
+ {"Corsican", "cos"},\r
+ {"Cree", "cre"},\r
+ {"Czech", "ces"},\r
+ {"Danish", "dan"},\r
+ {"Divehi", "div"},\r
+ {"Dutch", "nld"},\r
+ {"Dzongkha", "dzo"},\r
+ {"English", "eng"},\r
+ {"Esperanto", "epo"},\r
+ {"Estonian", "est"},\r
+ {"Ewe", "ewe"},\r
+ {"Faroese", "fao"},\r
+ {"Fijian", "fij"},\r
+ {"Finnish", "fin"},\r
+ {"French", "fra"},\r
+ {"Western Frisian", "fry"},\r
+ {"Fulah", "ful"},\r
+ {"Georgian", "kat"},\r
+ {"German", "deu"},\r
+ {"Gaelic (Scots)", "gla"},\r
+ {"Irish", "gle"},\r
+ {"Galician", "glg"},\r
+ {"Manx", "glv"},\r
+ {"Greek Modern", "ell"},\r
+ {"Guarani", "grn"},\r
+ {"Gujarati", "guj"},\r
+ {"Haitian", "hat"},\r
+ {"Hausa", "hau"},\r
+ {"Hebrew", "heb"},\r
+ {"Herero", "her"},\r
+ {"Hindi", "hin"},\r
+ {"Hiri Motu", "hmo"},\r
+ {"Hungarian", "hun"},\r
+ {"Igbo", "ibo"},\r
+ {"Icelandic", "isl"},\r
+ {"Ido", "ido"},\r
+ {"Sichuan Yi", "iii"},\r
+ {"Inuktitut", "iku"},\r
+ {"Interlingue", "ile"},\r
+ {"Interlingua", "ina"},\r
+ {"Indonesian", "ind"},\r
+ {"Inupiaq", "ipk"},\r
+ {"Italian", "ita"},\r
+ {"Javanese", "jav"},\r
+ {"Japanese", "jpn"},\r
+ {"Kalaallisut", "kal"},\r
+ {"Kannada", "kan"},\r
+ {"Kashmiri", "kas"},\r
+ {"Kanuri", "kau"},\r
+ {"Kazakh", "kaz"},\r
+ {"Central Khmer", "khm"},\r
+ {"Kikuyu", "kik"},\r
+ {"Kinyarwanda", "kin"},\r
+ {"Kirghiz", "kir"},\r
+ {"Komi", "kom"},\r
+ {"Kongo", "kon"},\r
+ {"Korean", "kor"},\r
+ {"Kuanyama", "kua"},\r
+ {"Kurdish", "kur"},\r
+ {"Lao", "lao"},\r
+ {"Latin", "lat"},\r
+ {"Latvian", "lav"},\r
+ {"Limburgan", "lim"},\r
+ {"Lingala", "lin"},\r
+ {"Lithuanian", "lit"},\r
+ {"Luxembourgish", "ltz"},\r
+ {"Luba-Katanga", "lub"},\r
+ {"Ganda", "lug"},\r
+ {"Macedonian", "mkd"},\r
+ {"Marshallese", "mah"},\r
+ {"Malayalam", "mal"},\r
+ {"Maori", "mri"},\r
+ {"Marathi", "mar"},\r
+ {"Malay", "msa"},\r
+ {"Malagasy", "mlg"},\r
+ {"Maltese", "mlt"},\r
+ {"Moldavian", "mol"},\r
+ {"Mongolian", "mon"},\r
+ {"Nauru", "nau"},\r
+ {"Navajo", "nav"},\r
+ {"Ndebele, South", "nbl"},\r
+ {"Ndebele, North", "nde"},\r
+ {"Ndonga", "ndo"},\r
+ {"Nepali", "nep"},\r
+ {"Norwegian Nynorsk", "nno"},\r
+ {"Norwegian Bokmål", "nob"},\r
+ {"Norwegian", "nor"},\r
+ {"Chichewa; Nyanja", "nya"},\r
+ {"Occitan", "oci"},\r
+ {"Ojibwa", "oji"},\r
+ {"Oriya", "ori"},\r
+ {"Oromo", "orm"},\r
+ {"Ossetian", "oss"},\r
+ {"Panjabi", "pan"},\r
+ {"Persian", "fas"},\r
+ {"Pali", "pli"},\r
+ {"Polish", "pol"},\r
+ {"Portuguese", "por"},\r
+ {"Pushto", "pus"},\r
+ {"Quechua", "que"},\r
+ {"Romansh", "roh"},\r
+ {"Romanian", "ron"},\r
+ {"Rundi", "run"},\r
+ {"Russian", "rus"},\r
+ {"Sango", "sag"},\r
+ {"Sanskrit", "san"},\r
+ {"Serbian", "srp"},\r
+ {"Croatian", "hrv"},\r
+ {"Sinhala", "sin"},\r
+ {"Slovak", "slk"},\r
+ {"Slovenian", "slv"},\r
+ {"Northern Sami", "sme"},\r
+ {"Samoan", "smo"},\r
+ {"Shona", "sna"},\r
+ {"Sindhi", "snd"},\r
+ {"Somali", "som"},\r
+ {"Sotho Southern", "sot"},\r
+ {"Spanish", "spa"},\r
+ {"Sardinian", "srd"},\r
+ {"Swati", "ssw"},\r
+ {"Sundanese", "sun"},\r
+ {"Swahili", "swa"},\r
+ {"Swedish", "swe"},\r
+ {"Tahitian", "tah"},\r
+ {"Tamil", "tam"},\r
+ {"Tatar", "tat"},\r
+ {"Telugu", "tel"},\r
+ {"Tajik", "tgk"},\r
+ {"Tagalog", "tgl"},\r
+ {"Thai", "tha"},\r
+ {"Tibetan", "bod"},\r
+ {"Tigrinya", "tir"},\r
+ {"Tonga", "ton"},\r
+ {"Tswana", "tsn"},\r
+ {"Tsonga", "tso"},\r
+ {"Turkmen", "tuk"},\r
+ {"Turkish", "tur"},\r
+ {"Twi", "twi"},\r
+ {"Uighur", "uig"},\r
+ {"Ukrainian", "ukr"},\r
+ {"Urdu", "urd"},\r
+ {"Uzbek", "uzb"},\r
+ {"Venda", "ven"},\r
+ {"Vietnamese", "vie"},\r
+ {"Volapük", "vol"},\r
+ {"Welsh", "cym"},\r
+ {"Walloon", "wln"},\r
+ {"Wolof", "wol"},\r
+ {"Xhosa", "xho"},\r
+ {"Yiddish", "yid"},\r
+ {"Yoruba", "yor"},\r
+ {"Zhuang", "zha"},\r
+ {"Zulu", "zul"}\r
+ };\r
+ return languageMap;\r
+ }\r
+\r
}\r
}\r
#endregion\r
\r
#region Filters\r
- query += mainWindow.Filters.getCLIQuery; \r
+ query += mainWindow.Filters.getCLIQuery;\r
#endregion\r
\r
#region Video Settings Tab\r
#endregion\r
\r
#region Subtitles Tab\r
-\r
if (mainWindow.Subtitles.lv_subList.Items.Count != 0) // If we have subtitle tracks\r
{\r
- // Find --subtitle <string>\r
- query += " --subtitle ";\r
- String subtitleTracks = "";\r
- String itemToAdd;\r
- foreach (ListViewItem item in mainWindow.Subtitles.lv_subList.Items)\r
- {\r
- if (item.SubItems[1].Text.Contains("Foreign Audio Search"))\r
- itemToAdd = "scan";\r
- else\r
- {\r
- string[] tempSub = item.SubItems[1].Text.Split(' ');\r
- itemToAdd = tempSub[0];\r
- }\r
+ IDictionary<string, string> langMap = Main.mapLanguages();\r
\r
- subtitleTracks += subtitleTracks == "" ? itemToAdd : "," + itemToAdd;\r
- }\r
- query += subtitleTracks;\r
+ // BitMap and CC's\r
+ string subtitleTracks = String.Empty;\r
+ string subtitleForced = String.Empty;\r
+ string subtitleBurn = String.Empty;\r
+ string subtitleDefault = String.Empty;\r
\r
+ // SRT\r
+ string srtFile = String.Empty; \r
+ string srtCodeset = String.Empty;\r
+ string srtOffset = String.Empty; \r
+ string srtLang = String.Empty; \r
\r
- // Find --subtitle-forced\r
- String forcedTrack = "";\r
foreach (ListViewItem item in mainWindow.Subtitles.lv_subList.Items)\r
{\r
- itemToAdd = "";\r
- string[] tempSub = item.SubItems[1].Text.Split(' ');\r
- string trackID = tempSub[0];\r
-\r
- if (item.SubItems[2].Text == "Yes")\r
- itemToAdd = trackID;\r
-\r
- if (itemToAdd != "")\r
- forcedTrack += forcedTrack == "" ? itemToAdd : "," + itemToAdd;\r
- }\r
- if (forcedTrack != "")\r
- query += " --subtitle-forced " + forcedTrack;\r
-\r
+ string itemToAdd, trackID;\r
\r
- // Find --subtitle-burn and --subtitle-default\r
- String burned = "";\r
- String defaultTrack = "";\r
- foreach (ListViewItem item in mainWindow.Subtitles.lv_subList.Items)\r
- {\r
- string[] tempSub = item.SubItems[1].Text.Split(' ');\r
- string trackID = tempSub[0];\r
+ if (item.SubItems.Count != 5) // We have an SRT file\r
+ {\r
+ string[] trackData = item.SubItems[1].Text.Split(',');\r
+ if (trackData != null)\r
+ {\r
+ string charCode = trackData[1].Replace("(", "").Replace(")", "").Trim();\r
+ string realLangCode = langMap[trackData[0].Trim()];\r
\r
- if (trackID.Trim() == "Foreign")\r
- trackID = "scan";\r
+ srtLang += srtLang == "" ? realLangCode : "," + realLangCode;\r
+ srtCodeset += srtCodeset == "" ? charCode : "," + charCode;\r
+ }\r
\r
- if (item.SubItems[3].Text == "Yes") // Burned\r
- burned = trackID;\r
+ itemToAdd = item.SubItems[5].Text;\r
+ srtFile += srtFile == "" ? itemToAdd : "," + itemToAdd;\r
\r
- if (item.SubItems[4].Text == "Yes") // Burned\r
- defaultTrack = trackID;\r
+ itemToAdd = item.SubItems[6].Text;\r
+ srtOffset += srtOffset == "" ? itemToAdd : "," + itemToAdd;\r
+ }\r
+ else // We have Bitmap or CC\r
+ {\r
+ string[] tempSub;\r
+ \r
+ // Find --subtitle <string>\r
+ if (item.SubItems[1].Text.Contains("Foreign Audio Search"))\r
+ itemToAdd = "scan";\r
+ else\r
+ {\r
+ tempSub = item.SubItems[1].Text.Split(' ');\r
+ itemToAdd = tempSub[0];\r
+ }\r
+\r
+ subtitleTracks += subtitleTracks == "" ? itemToAdd : "," + itemToAdd;\r
+\r
+ // Find --subtitle-forced\r
+ itemToAdd = "";\r
+ tempSub = item.SubItems[1].Text.Split(' ');\r
+ trackID = tempSub[0];\r
+\r
+ if (item.SubItems[2].Text == "Yes")\r
+ itemToAdd = trackID;\r
+\r
+ if (itemToAdd != "")\r
+ subtitleForced += subtitleForced == "" ? itemToAdd : "," + itemToAdd;\r
+\r
+ // Find --subtitle-burn and --subtitle-default\r
+ tempSub = item.SubItems[1].Text.Split(' ');\r
+ trackID = tempSub[0];\r
+\r
+ if (trackID.Trim() == "Foreign")\r
+ trackID = "scan";\r
+\r
+ if (item.SubItems[3].Text == "Yes") // burn\r
+ subtitleBurn = trackID;\r
+\r
+ if (item.SubItems[4].Text == "Yes") // default\r
+ subtitleDefault = trackID;\r
+ }\r
+ }\r
\r
+ // Build The CLI Subtitles Query\r
+ if (subtitleTracks != "")\r
+ {\r
+ query += " --subtitle " + subtitleTracks;\r
+\r
+ if (subtitleForced != "")\r
+ query += " --subtitle-forced " + subtitleForced;\r
+ if (subtitleBurn != "")\r
+ query += " --subtitle-burn " + subtitleBurn;\r
+ if (subtitleDefault != "")\r
+ query += " --subtitle-default " + subtitleDefault;\r
}\r
- if (burned != "")\r
- query += " --subtitle-burn " + burned;\r
\r
- if (defaultTrack != "")\r
- query += " --subtitle-default " + defaultTrack;\r
+ if (srtFile != "") // SRTs\r
+ {\r
+ query += " --srt-file " + srtFile;\r
+\r
+ if (srtCodeset != "")\r
+ query += " --srt-codeset " + srtCodeset;\r
+ if (srtOffset != "")\r
+ query += " --srt-offset " + srtOffset;\r
+ if (srtLang != "")\r
+ query += " --srt-lang " + srtLang;\r
+ }\r
\r
}\r
-\r
#endregion\r
\r
#region Chapter Markers\r
private void InitializeComponent()\r
{\r
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmAbout));\r
- this.Label4 = new System.Windows.Forms.Label();\r
- this.btn_close = new System.Windows.Forms.Button();\r
- this.Version = new System.Windows.Forms.Label();\r
this.Label3 = new System.Windows.Forms.Label();\r
+ this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();\r
+ this.label1 = new System.Windows.Forms.Label();\r
+ this.lbl_HBBuild = new System.Windows.Forms.Label();\r
this.PictureBox1 = new System.Windows.Forms.PictureBox();\r
- this.label5 = new System.Windows.Forms.Label();\r
- this.lbl_build = new System.Windows.Forms.Label();\r
- this.groupBox1 = new System.Windows.Forms.GroupBox();\r
+ this.tableLayoutPanel1.SuspendLayout();\r
((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();\r
this.SuspendLayout();\r
// \r
- // Label4\r
- // \r
- this.Label4.AutoSize = true;\r
- this.Label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
- this.Label4.Location = new System.Drawing.Point(168, 58);\r
- this.Label4.Name = "Label4";\r
- this.Label4.Size = new System.Drawing.Size(346, 26);\r
- this.Label4.TabIndex = 28;\r
- this.Label4.Text = "HandBrake is a GPL-licensed, multiplatform, multithreaded \r\nvideo transcoder. ";\r
- // \r
- // btn_close\r
- // \r
- this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
- this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
- this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
- this.btn_close.Location = new System.Drawing.Point(402, 114);\r
- this.btn_close.Name = "btn_close";\r
- this.btn_close.Size = new System.Drawing.Size(115, 22);\r
- this.btn_close.TabIndex = 27;\r
- this.btn_close.Text = "Close";\r
- this.btn_close.UseVisualStyleBackColor = true;\r
- this.btn_close.Click += new System.EventHandler(this.btn_close_Click);\r
- // \r
- // Version\r
- // \r
- this.Version.AutoSize = true;\r
- this.Version.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
- this.Version.Location = new System.Drawing.Point(266, 13);\r
- this.Version.Name = "Version";\r
- this.Version.Size = new System.Drawing.Size(72, 13);\r
- this.Version.TabIndex = 26;\r
- this.Version.Text = "{Version}";\r
- // \r
// Label3\r
// \r
this.Label3.AutoSize = true;\r
- this.Label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
- this.Label3.Location = new System.Drawing.Point(168, 13);\r
+ this.Label3.Dock = System.Windows.Forms.DockStyle.Bottom;\r
+ this.Label3.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.Label3.Location = new System.Drawing.Point(3, 23);\r
this.Label3.Name = "Label3";\r
- this.Label3.Size = new System.Drawing.Size(78, 13);\r
+ this.Label3.Size = new System.Drawing.Size(325, 18);\r
this.Label3.TabIndex = 25;\r
this.Label3.Text = "HandBrake";\r
+ this.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
+ // \r
+ // tableLayoutPanel1\r
+ // \r
+ this.tableLayoutPanel1.ColumnCount = 1;\r
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));\r
+ this.tableLayoutPanel1.Controls.Add(this.label1, 0, 2);\r
+ this.tableLayoutPanel1.Controls.Add(this.lbl_HBBuild, 0, 1);\r
+ this.tableLayoutPanel1.Controls.Add(this.Label3, 0, 0);\r
+ this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;\r
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 83);\r
+ this.tableLayoutPanel1.Name = "tableLayoutPanel1";\r
+ this.tableLayoutPanel1.RowCount = 4;\r
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 69.44444F));\r
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30.55556F));\r
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(331, 100);\r
+ this.tableLayoutPanel1.TabIndex = 32;\r
+ // \r
+ // label1\r
+ // \r
+ this.label1.AutoSize = true;\r
+ this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;\r
+ this.label1.Location = new System.Drawing.Point(3, 66);\r
+ this.label1.Name = "label1";\r
+ this.label1.Size = new System.Drawing.Size(325, 13);\r
+ this.label1.TabIndex = 33;\r
+ this.label1.Text = "(C) 2003-2009, HandBrake Developers";\r
+ this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
+ // \r
+ // lbl_HBBuild\r
+ // \r
+ this.lbl_HBBuild.AutoSize = true;\r
+ this.lbl_HBBuild.Dock = System.Windows.Forms.DockStyle.Bottom;\r
+ this.lbl_HBBuild.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.lbl_HBBuild.Location = new System.Drawing.Point(3, 46);\r
+ this.lbl_HBBuild.Name = "lbl_HBBuild";\r
+ this.lbl_HBBuild.Size = new System.Drawing.Size(325, 13);\r
+ this.lbl_HBBuild.TabIndex = 32;\r
+ this.lbl_HBBuild.Text = "{Version}";\r
+ this.lbl_HBBuild.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
// \r
// PictureBox1\r
// \r
+ this.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;\r
this.PictureBox1.Image = global::Handbrake.Properties.Resources.logo128;\r
this.PictureBox1.InitialImage = null;\r
- this.PictureBox1.Location = new System.Drawing.Point(8, 8);\r
+ this.PictureBox1.Location = new System.Drawing.Point(120, 12);\r
this.PictureBox1.Name = "PictureBox1";\r
- this.PictureBox1.Size = new System.Drawing.Size(153, 132);\r
- this.PictureBox1.TabIndex = 23;\r
+ this.PictureBox1.Size = new System.Drawing.Size(84, 84);\r
+ this.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;\r
+ this.PictureBox1.TabIndex = 33;\r
this.PictureBox1.TabStop = false;\r
// \r
- // label5\r
- // \r
- this.label5.AutoSize = true;\r
- this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
- this.label5.Location = new System.Drawing.Point(168, 30);\r
- this.label5.Name = "label5";\r
- this.label5.Size = new System.Drawing.Size(40, 13);\r
- this.label5.TabIndex = 29;\r
- this.label5.Text = "Build:";\r
- // \r
- // lbl_build\r
- // \r
- this.lbl_build.AutoSize = true;\r
- this.lbl_build.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
- this.lbl_build.Location = new System.Drawing.Point(266, 30);\r
- this.lbl_build.Name = "lbl_build";\r
- this.lbl_build.Size = new System.Drawing.Size(64, 13);\r
- this.lbl_build.TabIndex = 30;\r
- this.lbl_build.Text = "{Version}";\r
- // \r
- // groupBox1\r
- // \r
- this.groupBox1.Location = new System.Drawing.Point(171, 45);\r
- this.groupBox1.Name = "groupBox1";\r
- this.groupBox1.Size = new System.Drawing.Size(346, 10);\r
- this.groupBox1.TabIndex = 31;\r
- this.groupBox1.TabStop = false;\r
- // \r
// frmAbout\r
// \r
- this.AcceptButton = this.btn_close;\r
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);\r
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
- this.ClientSize = new System.Drawing.Size(530, 148);\r
- this.Controls.Add(this.groupBox1);\r
- this.Controls.Add(this.lbl_build);\r
- this.Controls.Add(this.label5);\r
- this.Controls.Add(this.Label4);\r
- this.Controls.Add(this.btn_close);\r
- this.Controls.Add(this.Version);\r
- this.Controls.Add(this.Label3);\r
+ this.ClientSize = new System.Drawing.Size(331, 183);\r
this.Controls.Add(this.PictureBox1);\r
+ this.Controls.Add(this.tableLayoutPanel1);\r
this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
this.Name = "frmAbout";\r
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
this.Text = "About HandBrake";\r
+ this.tableLayoutPanel1.ResumeLayout(false);\r
+ this.tableLayoutPanel1.PerformLayout();\r
((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();\r
this.ResumeLayout(false);\r
- this.PerformLayout();\r
\r
}\r
\r
#endregion\r
\r
- internal System.Windows.Forms.Label Label4;\r
- internal System.Windows.Forms.Button btn_close;\r
- internal System.Windows.Forms.Label Version;\r
internal System.Windows.Forms.Label Label3;\r
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;\r
+ internal System.Windows.Forms.Label label1;\r
+ internal System.Windows.Forms.Label lbl_HBBuild;\r
internal System.Windows.Forms.PictureBox PictureBox1;\r
- internal System.Windows.Forms.Label label5;\r
- internal System.Windows.Forms.Label lbl_build;\r
- private System.Windows.Forms.GroupBox groupBox1;\r
}\r
}
\ No newline at end of file
public frmAbout()\r
{\r
InitializeComponent();\r
- Version.Text = Properties.Settings.Default.hb_version;\r
- lbl_build.Text = Properties.Settings.Default.hb_build.ToString();\r
+ lbl_HBBuild.Text = Properties.Settings.Default.hb_version + " " + Properties.Settings.Default.hb_build;\r
}\r
\r
private void btn_close_Click(object sender, EventArgs e)\r
{\r
this.Close();\r
}\r
+\r
+ \r
}\r
}
\ No newline at end of file
this.Label47 = new System.Windows.Forms.Label();\r
this.Label3 = new System.Windows.Forms.Label();\r
this.tab_audio = new System.Windows.Forms.TabPage();\r
+ this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);\r
this.tab_video = new System.Windows.Forms.TabPage();\r
this.radio_cq = new System.Windows.Forms.RadioButton();\r
this.SliderValue = new System.Windows.Forms.Label();\r
this.Label46 = new System.Windows.Forms.Label();\r
this.tab_picture = new System.Windows.Forms.TabPage();\r
+ this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
this.tabs_panel = new System.Windows.Forms.TabControl();\r
this.tab_filters = new System.Windows.Forms.TabPage();\r
+ this.Filters = new Handbrake.Controls.Filters();\r
this.tab_subtitles = new System.Windows.Forms.TabPage();\r
+ this.Subtitles = new Handbrake.Controls.Subtitles();\r
this.tab_chapters = new System.Windows.Forms.TabPage();\r
this.label31 = new System.Windows.Forms.Label();\r
this.tab_advanced = new System.Windows.Forms.TabPage();\r
+ this.x264Panel = new Handbrake.Controls.x264Panel();\r
this.tab_query = new System.Windows.Forms.TabPage();\r
this.btn_clear = new System.Windows.Forms.Button();\r
this.label34 = new System.Windows.Forms.Label();\r
this.labelSource = new System.Windows.Forms.Label();\r
this.labelStaticDestination = new System.Windows.Forms.Label();\r
this.labelPreset = new System.Windows.Forms.Label();\r
- this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
- this.Filters = new Handbrake.Controls.Filters();\r
- this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
- this.Subtitles = new Handbrake.Controls.Subtitles();\r
- this.x264Panel = new Handbrake.Controls.x264Panel();\r
notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
notifyIconMenu.SuspendLayout();\r
((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
this.tab_audio.Text = "Audio";\r
this.tab_audio.UseVisualStyleBackColor = true;\r
// \r
+ // AudioSettings\r
+ // \r
+ this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
+ this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
+ this.AudioSettings.Name = "AudioSettings";\r
+ this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
+ this.AudioSettings.TabIndex = 0;\r
+ // \r
// AudioMenuRowHeightHack\r
// \r
this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;\r
this.tab_picture.Text = "Picture Settings";\r
this.tab_picture.UseVisualStyleBackColor = true;\r
// \r
+ // PictureSettings\r
+ // \r
+ this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
+ this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F);\r
+ this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
+ this.PictureSettings.Name = "PictureSettings";\r
+ this.PictureSettings.Size = new System.Drawing.Size(713, 310);\r
+ this.PictureSettings.TabIndex = 0;\r
+ // \r
// Check_ChapterMarkers\r
// \r
this.Check_ChapterMarkers.AutoSize = true;\r
this.tab_filters.Text = "Video Filters";\r
this.tab_filters.UseVisualStyleBackColor = true;\r
// \r
+ // Filters\r
+ // \r
+ this.Filters.BackColor = System.Drawing.Color.Transparent;\r
+ this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.Filters.Location = new System.Drawing.Point(0, 0);\r
+ this.Filters.Name = "Filters";\r
+ this.Filters.Size = new System.Drawing.Size(713, 310);\r
+ this.Filters.TabIndex = 0;\r
+ // \r
// tab_subtitles\r
// \r
this.tab_subtitles.Controls.Add(this.Subtitles);\r
this.tab_subtitles.Text = "Subtitles";\r
this.tab_subtitles.UseVisualStyleBackColor = true;\r
// \r
+ // Subtitles\r
+ // \r
+ this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
+ this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
+ this.Subtitles.Name = "Subtitles";\r
+ this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
+ this.Subtitles.TabIndex = 0;\r
+ // \r
// tab_chapters\r
// \r
this.tab_chapters.BackColor = System.Drawing.Color.Transparent;\r
this.tab_advanced.Text = "Advanced";\r
this.tab_advanced.UseVisualStyleBackColor = true;\r
// \r
+ // x264Panel\r
+ // \r
+ this.x264Panel.BackColor = System.Drawing.Color.Transparent;\r
+ this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
+ this.x264Panel.Name = "x264Panel";\r
+ this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
+ this.x264Panel.TabIndex = 0;\r
+ this.x264Panel.x264Query = "";\r
+ // \r
// tab_query\r
// \r
this.tab_query.Controls.Add(this.btn_clear);\r
// \r
// tb_preview\r
// \r
- this.tb_preview.Image = global::Handbrake.Properties.Resources.picture;\r
+ this.tb_preview.Image = global::Handbrake.Properties.Resources.window;\r
this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta;\r
this.tb_preview.Name = "tb_preview";\r
this.labelPreset.TabIndex = 54;\r
this.labelPreset.Text = "Output Settings (Preset: None)";\r
// \r
- // PictureSettings\r
- // \r
- this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
- this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F);\r
- this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
- this.PictureSettings.Name = "PictureSettings";\r
- this.PictureSettings.Size = new System.Drawing.Size(713, 310);\r
- this.PictureSettings.TabIndex = 0;\r
- // \r
- // Filters\r
- // \r
- this.Filters.BackColor = System.Drawing.Color.Transparent;\r
- this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
- this.Filters.Location = new System.Drawing.Point(0, 0);\r
- this.Filters.Name = "Filters";\r
- this.Filters.Size = new System.Drawing.Size(713, 310);\r
- this.Filters.TabIndex = 0;\r
- // \r
- // AudioSettings\r
- // \r
- this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
- this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
- this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
- this.AudioSettings.Name = "AudioSettings";\r
- this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
- this.AudioSettings.TabIndex = 0;\r
- // \r
- // Subtitles\r
- // \r
- this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
- this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
- this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
- this.Subtitles.Name = "Subtitles";\r
- this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
- this.Subtitles.TabIndex = 0;\r
- // \r
- // x264Panel\r
- // \r
- this.x264Panel.BackColor = System.Drawing.Color.Transparent;\r
- this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
- this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
- this.x264Panel.Name = "x264Panel";\r
- this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
- this.x264Panel.TabIndex = 0;\r
- this.x264Panel.x264Query = "";\r
- // \r
// frmMain\r
// \r
this.AllowDrop = true;\r
OSDN Git Service
