X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=win%2FC%23%2FfrmMain.Designer.cs;h=a5a33516bcf2b7bf30bd576196ca11b6605fc489;hb=01adcc9f552746e1c6b4503c78d4c27891d68f68;hp=106aaa039090da20ff46b793cb6d447c0e04de89;hpb=3d5bff38e19f7e6176ecf9d2243b207f54c7f2e2;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index 106aaa03..a5a33516 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -1,8 +1,7 @@ /* frmMain.Designer.cs - - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ + This file is part of the HandBrake source code. + Homepage: . + It may be used under the terms of the GNU General Public License. */ using System; using System.Windows.Forms; @@ -40,7 +39,7 @@ namespace Handbrake this.components = new System.ComponentModel.Container(); System.Windows.Forms.ContextMenuStrip notifyIconMenu; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.btn_restore = new System.Windows.Forms.ToolStripMenuItem(); this.DVD_Save = new System.Windows.Forms.SaveFileDialog(); this.ToolTip = new System.Windows.Forms.ToolTip(this.components); @@ -50,9 +49,7 @@ namespace Handbrake this.check_turbo = new System.Windows.Forms.CheckBox(); this.drp_videoFramerate = new System.Windows.Forms.ComboBox(); this.slider_videoQuality = new System.Windows.Forms.TrackBar(); - this.text_filesize = new System.Windows.Forms.TextBox(); this.text_bitrate = new System.Windows.Forms.TextBox(); - this.btn_setDefault = new System.Windows.Forms.Button(); this.check_optimiseMP4 = new System.Windows.Forms.CheckBox(); this.check_iPodAtom = new System.Windows.Forms.CheckBox(); this.data_chpt = new System.Windows.Forms.DataGridView(); @@ -60,15 +57,25 @@ namespace Handbrake this.name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.mnu_resetChapters = new System.Windows.Forms.ToolStripMenuItem(); - this.btn_addPreset = new System.Windows.Forms.Button(); - this.btn_removePreset = new System.Windows.Forms.Button(); + this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem(); this.drop_format = new System.Windows.Forms.ComboBox(); this.drop_chapterFinish = new System.Windows.Forms.ComboBox(); this.drop_chapterStart = new System.Windows.Forms.ComboBox(); this.drop_angle = new System.Windows.Forms.ComboBox(); this.drp_dvdtitle = new System.Windows.Forms.ComboBox(); this.btn_importChapters = new System.Windows.Forms.Button(); + this.btn_export = new System.Windows.Forms.Button(); this.drop_mode = new System.Windows.Forms.ComboBox(); + this.btn_generate_Query = new System.Windows.Forms.Button(); + this.treeView_presets = new System.Windows.Forms.TreeView(); + this.presets_menu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.pmnu_expandAll = new System.Windows.Forms.ToolStripMenuItem(); + this.pmnu_collapse = new System.Windows.Forms.ToolStripMenuItem(); + this.sep1 = new System.Windows.Forms.ToolStripSeparator(); + this.pmnu_import = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.pmnu_saveChanges = new System.Windows.Forms.ToolStripMenuItem(); + this.pmnu_delete = new System.Windows.Forms.ToolStripMenuItem(); this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog(); this.File_Open = new System.Windows.Forms.OpenFileDialog(); this.ISO_Open = new System.Windows.Forms.OpenFileDialog(); @@ -81,20 +88,6 @@ namespace Handbrake this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem(); this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.mnu_options = new System.Windows.Forms.ToolStripMenuItem(); - this.PresetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mnu_presetReset = new System.Windows.Forms.ToolStripMenuItem(); - this.mnu_delete_preset = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); - this.btn_new_preset = new System.Windows.Forms.ToolStripMenuItem(); - this.mnu_importMacPreset = new System.Windows.Forms.ToolStripMenuItem(); - this.mnu_SelectDefault = new System.Windows.Forms.ToolStripMenuItem(); - this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mnu_user_guide = new System.Windows.Forms.ToolStripMenuItem(); - this.mnu_handbrake_home = new System.Windows.Forms.ToolStripMenuItem(); - this.ToolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.mnu_UpdateCheck = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); - this.mnu_about = new System.Windows.Forms.ToolStripMenuItem(); this.frmMainMenu = new System.Windows.Forms.MenuStrip(); this.label5 = new System.Windows.Forms.Label(); this.Label47 = new System.Windows.Forms.Label(); @@ -103,14 +96,15 @@ namespace Handbrake this.AudioSettings = new Handbrake.Controls.AudioPanel(); this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components); this.tab_video = new System.Windows.Forms.TabPage(); + this.lbl_rfwarn = new System.Windows.Forms.Label(); + this.checkMaximumFramerate = new System.Windows.Forms.CheckBox(); this.radio_cq = new System.Windows.Forms.RadioButton(); this.radio_avgBitrate = new System.Windows.Forms.RadioButton(); - this.radio_targetFilesize = new System.Windows.Forms.RadioButton(); this.label25 = new System.Windows.Forms.Label(); this.check_2PassEncode = new System.Windows.Forms.CheckBox(); this.Label2 = new System.Windows.Forms.Label(); this.lbl_SliderValue = new System.Windows.Forms.Label(); - this.Label46 = new System.Windows.Forms.Label(); + this.lbl_framerate = new System.Windows.Forms.Label(); this.tab_picture = new System.Windows.Forms.TabPage(); this.PictureSettings = new Handbrake.Controls.PictureSettings(); this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox(); @@ -126,26 +120,27 @@ namespace Handbrake this.tab_query = new System.Windows.Forms.TabPage(); this.btn_clear = new System.Windows.Forms.Button(); this.label34 = new System.Windows.Forms.Label(); - this.btn_generate_Query = new System.Windows.Forms.Button(); this.label33 = new System.Windows.Forms.Label(); this.rtf_query = new System.Windows.Forms.RichTextBox(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.treeView_presets = new System.Windows.Forms.TreeView(); - this.presets_menu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.pmnu_expandAll = new System.Windows.Forms.ToolStripMenuItem(); - this.pmnu_collapse = new System.Windows.Forms.ToolStripMenuItem(); - this.sep1 = new System.Windows.Forms.ToolStripSeparator(); - this.pmnu_import = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.pmnu_saveChanges = new System.Windows.Forms.ToolStripMenuItem(); - this.pmnu_delete = new System.Windows.Forms.ToolStripMenuItem(); + this.presetsToolStrip = new System.Windows.Forms.ToolStrip(); + this.BtnAddPreset = new System.Windows.Forms.ToolStripButton(); + this.BtnRemovePreset = new System.Windows.Forms.ToolStripButton(); + this.toolStripDropDownButton2 = new System.Windows.Forms.ToolStripDropDownButton(); + this.MnuSetDefaultPreset = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.MnuImportPreset = new System.Windows.Forms.ToolStripMenuItem(); + this.MnuExportPreset = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.MnuResetBuiltInPresets = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.btn_source = new System.Windows.Forms.ToolStripDropDownButton(); - this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem(); this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem(); + this.btnTitleSpecific = new System.Windows.Forms.ToolStripMenuItem(); + this.FileTitleSpecificScan = new System.Windows.Forms.ToolStripMenuItem(); + this.FolderTitleSpecificScan = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.mnu_dvd_drive = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); this.btn_start = new System.Windows.Forms.ToolStripButton(); this.btn_add2Queue = new System.Windows.Forms.ToolStripButton(); @@ -153,8 +148,16 @@ namespace Handbrake this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.tb_preview = new System.Windows.Forms.ToolStripButton(); this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton(); + this.MnuUserGuide = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); + this.MnuCheckForUpdates = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); + this.MnuAboutHandBrake = new System.Windows.Forms.ToolStripMenuItem(); this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components); this.StatusStrip = new System.Windows.Forms.StatusStrip(); + this.ProgressBarStatus = new System.Windows.Forms.ToolStripProgressBar(); this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel(); this.lbl_updateCheck = new System.Windows.Forms.ToolStripStatusLabel(); this.hbproc = new System.Diagnostics.Process(); @@ -172,7 +175,7 @@ namespace Handbrake this.labelPreset = new System.Windows.Forms.Label(); this.labelSource = new System.Windows.Forms.Label(); this.labelStaticSource = new System.Windows.Forms.Label(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.SourceLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); this.openPreset = new System.Windows.Forms.OpenFileDialog(); this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog(); notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -180,6 +183,7 @@ namespace Handbrake ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).BeginInit(); this.ChaptersMenu.SuspendLayout(); + this.presets_menu.SuspendLayout(); this.frmMainMenu.SuspendLayout(); this.tab_audio.SuspendLayout(); this.tab_video.SuspendLayout(); @@ -191,16 +195,17 @@ namespace Handbrake this.tab_advanced.SuspendLayout(); this.tab_query.SuspendLayout(); this.groupBox2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); - this.presets_menu.SuspendLayout(); + this.presetsToolStrip.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.StatusStrip.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); - this.flowLayoutPanel1.SuspendLayout(); + this.SourceLayoutPanel.SuspendLayout(); this.SuspendLayout(); // // notifyIconMenu @@ -213,6 +218,7 @@ namespace Handbrake // // btn_restore // + this.btn_restore.Image = global::Handbrake.Properties.Resources.Restore; this.btn_restore.Name = "btn_restore"; this.btn_restore.Size = new System.Drawing.Size(113, 22); this.btn_restore.Text = "Restore"; @@ -252,7 +258,7 @@ namespace Handbrake this.drp_videoEncoder.Location = new System.Drawing.Point(125, 35); this.drp_videoEncoder.Name = "drp_videoEncoder"; this.drp_videoEncoder.Size = new System.Drawing.Size(126, 21); - this.drp_videoEncoder.TabIndex = 1; + this.drp_videoEncoder.TabIndex = 6; this.ToolTip.SetToolTip(this.drp_videoEncoder, "Select a video encoder"); this.drp_videoEncoder.SelectedIndexChanged += new System.EventHandler(this.drp_videoEncoder_SelectedIndexChanged); // @@ -264,7 +270,7 @@ namespace Handbrake this.check_largeFile.Location = new System.Drawing.Point(179, 5); this.check_largeFile.Name = "check_largeFile"; this.check_largeFile.Size = new System.Drawing.Size(91, 17); - this.check_largeFile.TabIndex = 4; + this.check_largeFile.TabIndex = 2; this.check_largeFile.Text = "Large file size"; this.ToolTip.SetToolTip(this.check_largeFile, "Caution: This option will likely break device compatibility with all but the Appl" + "eTV Take 2.\r\nChecking this box enables a 64bit mp4 file which can be over 4GB."); @@ -275,10 +281,10 @@ namespace Handbrake this.check_turbo.AutoSize = true; this.check_turbo.BackColor = System.Drawing.Color.Transparent; this.check_turbo.Enabled = false; - this.check_turbo.Location = new System.Drawing.Point(146, 123); + this.check_turbo.Location = new System.Drawing.Point(146, 143); this.check_turbo.Name = "check_turbo"; this.check_turbo.Size = new System.Drawing.Size(99, 17); - this.check_turbo.TabIndex = 7; + this.check_turbo.TabIndex = 9; this.check_turbo.Text = "Turbo first Pass"; this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster."); this.check_turbo.UseVisualStyleBackColor = false; @@ -297,60 +303,35 @@ namespace Handbrake "24", "25", "29.97"}); - this.drp_videoFramerate.Location = new System.Drawing.Point(125, 68); + this.drp_videoFramerate.Location = new System.Drawing.Point(125, 62); this.drp_videoFramerate.Name = "drp_videoFramerate"; - this.drp_videoFramerate.Size = new System.Drawing.Size(126, 21); + this.drp_videoFramerate.Size = new System.Drawing.Size(125, 21); this.drp_videoFramerate.TabIndex = 2; this.ToolTip.SetToolTip(this.drp_videoFramerate, "Can be left to \"Same as source\" in most cases."); + this.drp_videoFramerate.SelectedIndexChanged += new System.EventHandler(this.drp_videoFramerate_SelectedIndexChanged); // // slider_videoQuality // this.slider_videoQuality.BackColor = System.Drawing.SystemColors.Window; this.slider_videoQuality.Enabled = false; - this.slider_videoQuality.Location = new System.Drawing.Point(347, 120); + this.slider_videoQuality.Location = new System.Drawing.Point(376, 90); this.slider_videoQuality.Margin = new System.Windows.Forms.Padding(0); this.slider_videoQuality.Maximum = 100; this.slider_videoQuality.Name = "slider_videoQuality"; this.slider_videoQuality.Size = new System.Drawing.Size(322, 45); - this.slider_videoQuality.TabIndex = 14; + this.slider_videoQuality.TabIndex = 13; this.slider_videoQuality.TickFrequency = 17; - this.ToolTip.SetToolTip(this.slider_videoQuality, "Set the quality level of the video. Typical sane values are between 59~63%. \r\n>70" + - "% will likely result in the output file being larger than the input file."); + this.ToolTip.SetToolTip(this.slider_videoQuality, "Set the quality level of the video. "); this.slider_videoQuality.ValueChanged += new System.EventHandler(this.slider_videoQuality_Scroll); // - // text_filesize - // - this.text_filesize.Enabled = false; - this.text_filesize.Location = new System.Drawing.Point(482, 36); - this.text_filesize.Name = "text_filesize"; - this.text_filesize.Size = new System.Drawing.Size(81, 21); - this.text_filesize.TabIndex = 12; - this.ToolTip.SetToolTip(this.text_filesize, "Set the file size you wish the encoded file to be."); - // // text_bitrate // - this.text_bitrate.Location = new System.Drawing.Point(482, 63); + this.text_bitrate.Location = new System.Drawing.Point(511, 33); this.text_bitrate.Name = "text_bitrate"; this.text_bitrate.Size = new System.Drawing.Size(81, 21); - this.text_bitrate.TabIndex = 10; + this.text_bitrate.TabIndex = 14; this.ToolTip.SetToolTip(this.text_bitrate, "Set the bitrate of the video"); // - // btn_setDefault - // - this.btn_setDefault.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_setDefault.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_setDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_setDefault.Location = new System.Drawing.Point(135, 8); - this.btn_setDefault.Name = "btn_setDefault"; - this.btn_setDefault.Size = new System.Drawing.Size(101, 22); - this.btn_setDefault.TabIndex = 1; - this.btn_setDefault.TabStop = false; - this.btn_setDefault.Text = "Set Default"; - this.ToolTip.SetToolTip(this.btn_setDefault, "Set current settings as program defaults.\r\nRequires option to be enabled in Tools" + - " > Options"); - this.btn_setDefault.UseVisualStyleBackColor = true; - this.btn_setDefault.Click += new System.EventHandler(this.btn_setDefault_Click); - // // check_optimiseMP4 // this.check_optimiseMP4.Anchor = System.Windows.Forms.AnchorStyles.Left; @@ -359,7 +340,7 @@ namespace Handbrake this.check_optimiseMP4.Location = new System.Drawing.Point(276, 5); this.check_optimiseMP4.Name = "check_optimiseMP4"; this.check_optimiseMP4.Size = new System.Drawing.Size(96, 17); - this.check_optimiseMP4.TabIndex = 25; + this.check_optimiseMP4.TabIndex = 3; this.check_optimiseMP4.Text = "Web optimized"; this.ToolTip.SetToolTip(this.check_optimiseMP4, "MP4 files can be optimized for progressive downloads over the Web,\r\nbut note that" + " QuickTime can only read the files as long as the file extension is .mp4\r\nCan on" + @@ -374,7 +355,7 @@ namespace Handbrake this.check_iPodAtom.Location = new System.Drawing.Point(378, 5); this.check_iPodAtom.Name = "check_iPodAtom"; this.check_iPodAtom.Size = new System.Drawing.Size(102, 17); - this.check_iPodAtom.TabIndex = 26; + this.check_iPodAtom.TabIndex = 4; this.check_iPodAtom.Text = "iPod 5G support"; this.ToolTip.SetToolTip(this.check_iPodAtom, "Support for legacy 5th Generation iPods.\r\nEncodes will not sync if this option is" + " not enabled for H.264 encodes."); @@ -385,7 +366,9 @@ namespace Handbrake this.data_chpt.AllowUserToAddRows = false; this.data_chpt.AllowUserToDeleteRows = false; this.data_chpt.AllowUserToResizeRows = false; - this.data_chpt.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.data_chpt.BackgroundColor = System.Drawing.Color.White; + this.data_chpt.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None; + this.data_chpt.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.data_chpt.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.number, this.name}); @@ -400,27 +383,30 @@ namespace Handbrake // // number // - dataGridViewCellStyle1.Format = "N0"; - dataGridViewCellStyle1.NullValue = null; - this.number.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle2.Format = "N0"; + dataGridViewCellStyle2.NullValue = null; + this.number.DefaultCellStyle = dataGridViewCellStyle2; this.number.Frozen = true; this.number.HeaderText = "Chapter Number"; this.number.MaxInputLength = 3; this.number.Name = "number"; this.number.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.number.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.number.Width = 165; // // name // + this.name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.name.HeaderText = "Chapter Name"; this.name.Name = "name"; - this.name.Width = 480; + this.name.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; // // ChaptersMenu // this.ChaptersMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnu_resetChapters}); this.ChaptersMenu.Name = "presets_menu"; + this.ChaptersMenu.OwnerItem = this.btn_file_source; this.ChaptersMenu.Size = new System.Drawing.Size(188, 26); this.ChaptersMenu.Text = ";"; // @@ -431,35 +417,14 @@ namespace Handbrake this.mnu_resetChapters.Text = "Reset Chapter Names"; this.mnu_resetChapters.Click += new System.EventHandler(this.mnu_resetChapters_Click); // - // btn_addPreset - // - this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_addPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_addPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_addPreset.Location = new System.Drawing.Point(3, 8); - this.btn_addPreset.Name = "btn_addPreset"; - this.btn_addPreset.Size = new System.Drawing.Size(49, 22); - this.btn_addPreset.TabIndex = 3; - this.btn_addPreset.TabStop = false; - this.btn_addPreset.Text = "Add"; - this.ToolTip.SetToolTip(this.btn_addPreset, "Add a preset to the preset panel"); - this.btn_addPreset.UseVisualStyleBackColor = true; - this.btn_addPreset.Click += new System.EventHandler(this.btn_addPreset_Click); - // - // btn_removePreset - // - this.btn_removePreset.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_removePreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_removePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_removePreset.Location = new System.Drawing.Point(58, 8); - this.btn_removePreset.Name = "btn_removePreset"; - this.btn_removePreset.Size = new System.Drawing.Size(71, 22); - this.btn_removePreset.TabIndex = 4; - this.btn_removePreset.TabStop = false; - this.btn_removePreset.Text = "Remove"; - this.ToolTip.SetToolTip(this.btn_removePreset, "Remove a preset from the panel above."); - this.btn_removePreset.UseVisualStyleBackColor = true; - this.btn_removePreset.Click += new System.EventHandler(this.btn_removePreset_Click); + // btn_file_source + // + this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small; + this.btn_file_source.Name = "btn_file_source"; + this.btn_file_source.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); + this.btn_file_source.Size = new System.Drawing.Size(182, 22); + this.btn_file_source.Text = "Video File"; + this.btn_file_source.Click += new System.EventHandler(this.BtnFileScanClicked); // // drop_format // @@ -471,8 +436,8 @@ namespace Handbrake this.drop_format.Location = new System.Drawing.Point(67, 3); this.drop_format.Name = "drop_format"; this.drop_format.Size = new System.Drawing.Size(106, 21); - this.drop_format.TabIndex = 28; - this.ToolTip.SetToolTip(this.drop_format, "Select the file container format."); + this.drop_format.TabIndex = 1; + this.ToolTip.SetToolTip(this.drop_format, "Select the file container format.\r\nHandBrake supports MKV and MP4(M4v)"); this.drop_format.SelectedIndexChanged += new System.EventHandler(this.drop_format_SelectedIndexChanged); // // drop_chapterFinish @@ -482,7 +447,7 @@ namespace Handbrake this.drop_chapterFinish.Location = new System.Drawing.Point(509, 3); this.drop_chapterFinish.Name = "drop_chapterFinish"; this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21); - this.drop_chapterFinish.TabIndex = 10; + this.drop_chapterFinish.TabIndex = 7; this.ToolTip.SetToolTip(this.drop_chapterFinish, "Select the chapter range you would like to enocde. (default: All Chapters)"); this.drop_chapterFinish.SelectedIndexChanged += new System.EventHandler(this.chapersChanged); // @@ -493,7 +458,7 @@ namespace Handbrake this.drop_chapterStart.Location = new System.Drawing.Point(383, 3); this.drop_chapterStart.Name = "drop_chapterStart"; this.drop_chapterStart.Size = new System.Drawing.Size(69, 21); - this.drop_chapterStart.TabIndex = 9; + this.drop_chapterStart.TabIndex = 5; this.ToolTip.SetToolTip(this.drop_chapterStart, "Select the chapter range you would like to enocde. (default: All Chapters)"); this.drop_chapterStart.SelectedIndexChanged += new System.EventHandler(this.chapersChanged); // @@ -504,7 +469,7 @@ namespace Handbrake this.drop_angle.Location = new System.Drawing.Point(209, 3); this.drop_angle.Name = "drop_angle"; this.drop_angle.Size = new System.Drawing.Size(45, 21); - this.drop_angle.TabIndex = 45; + this.drop_angle.TabIndex = 3; this.ToolTip.SetToolTip(this.drop_angle, "Select the chapter range you would like to enocde. (default: All Chapters)"); // // drp_dvdtitle @@ -516,9 +481,10 @@ namespace Handbrake this.drp_dvdtitle.Location = new System.Drawing.Point(40, 3); this.drp_dvdtitle.Name = "drp_dvdtitle"; this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21); - this.drp_dvdtitle.TabIndex = 7; - this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\nThe longest title is selected by default af" + - "ter you have scanned a source."); + this.drp_dvdtitle.TabIndex = 1; + this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\n\r\nWhen a DVD is in use, HandBrake will try " + + "to determine the \"Main Feature\" title automatically.\r\nPlease note, this is not a" + + "lways accurate and should be checked."); this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged); this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click); // @@ -527,15 +493,29 @@ namespace Handbrake this.btn_importChapters.AutoSize = true; this.btn_importChapters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_importChapters.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_importChapters.Location = new System.Drawing.Point(625, 26); + this.btn_importChapters.Location = new System.Drawing.Point(544, 28); this.btn_importChapters.Name = "btn_importChapters"; this.btn_importChapters.Size = new System.Drawing.Size(75, 23); - this.btn_importChapters.TabIndex = 14; + this.btn_importChapters.TabIndex = 1; this.btn_importChapters.Text = "Import"; this.ToolTip.SetToolTip(this.btn_importChapters, resources.GetString("btn_importChapters.ToolTip")); this.btn_importChapters.UseVisualStyleBackColor = true; this.btn_importChapters.Click += new System.EventHandler(this.btn_importChapters_Click); // + // btn_export + // + this.btn_export.AutoSize = true; + this.btn_export.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_export.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.btn_export.Location = new System.Drawing.Point(625, 28); + this.btn_export.Name = "btn_export"; + this.btn_export.Size = new System.Drawing.Size(75, 23); + this.btn_export.TabIndex = 0; + this.btn_export.Text = "Export"; + this.ToolTip.SetToolTip(this.btn_export, resources.GetString("btn_export.ToolTip")); + this.btn_export.UseVisualStyleBackColor = true; + this.btn_export.Click += new System.EventHandler(this.btn_export_Click); + // // drop_mode // this.drop_mode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -547,9 +527,105 @@ namespace Handbrake this.drop_mode.Location = new System.Drawing.Point(295, 3); this.drop_mode.Name = "drop_mode"; this.drop_mode.Size = new System.Drawing.Size(77, 21); - this.drop_mode.TabIndex = 46; + this.drop_mode.TabIndex = 4; + this.ToolTip.SetToolTip(this.drop_mode, resources.GetString("drop_mode.ToolTip")); this.drop_mode.SelectedIndexChanged += new System.EventHandler(this.drop_mode_SelectedIndexChanged); // + // btn_generate_Query + // + this.btn_generate_Query.FlatAppearance.BorderColor = System.Drawing.Color.Black; + this.btn_generate_Query.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_generate_Query.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.btn_generate_Query.Location = new System.Drawing.Point(16, 104); + this.btn_generate_Query.Name = "btn_generate_Query"; + this.btn_generate_Query.Size = new System.Drawing.Size(126, 22); + this.btn_generate_Query.TabIndex = 2; + this.btn_generate_Query.Text = "Generate Query"; + this.ToolTip.SetToolTip(this.btn_generate_Query, "This will allow you to override the generated query.\r\nNote, The query in the box " + + "below will always override any automatically generated query, even if you change" + + " title or source."); + this.btn_generate_Query.UseVisualStyleBackColor = true; + this.btn_generate_Query.Click += new System.EventHandler(this.btn_generate_Query_Click); + // + // treeView_presets + // + this.treeView_presets.ContextMenuStrip = this.presets_menu; + this.treeView_presets.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.treeView_presets.ForeColor = System.Drawing.Color.DarkBlue; + this.treeView_presets.FullRowSelect = true; + this.treeView_presets.HideSelection = false; + this.treeView_presets.ItemHeight = 21; + this.treeView_presets.Location = new System.Drawing.Point(0, 0); + this.treeView_presets.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0); + this.treeView_presets.Name = "treeView_presets"; + this.treeView_presets.ShowLines = false; + this.treeView_presets.Size = new System.Drawing.Size(240, 424); + this.treeView_presets.TabIndex = 0; + this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect); + this.treeView_presets.KeyUp += new System.Windows.Forms.KeyEventHandler(this.treeView_presets_deleteKey); + this.treeView_presets.MouseMove += new System.Windows.Forms.MouseEventHandler(this.TreeViewPresetsMouseMove); + this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp); + // + // presets_menu + // + this.presets_menu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.pmnu_expandAll, + this.pmnu_collapse, + this.sep1, + this.pmnu_import, + this.toolStripSeparator2, + this.pmnu_saveChanges, + this.pmnu_delete}); + this.presets_menu.Name = "presets_menu"; + this.presets_menu.Size = new System.Drawing.Size(148, 126); + this.presets_menu.Text = ";"; + this.presets_menu.Opening += new System.ComponentModel.CancelEventHandler(this.presets_menu_Opening); + // + // pmnu_expandAll + // + this.pmnu_expandAll.Name = "pmnu_expandAll"; + this.pmnu_expandAll.Size = new System.Drawing.Size(147, 22); + this.pmnu_expandAll.Text = "Expand All"; + this.pmnu_expandAll.Click += new System.EventHandler(this.pmnu_expandAll_Click); + // + // pmnu_collapse + // + this.pmnu_collapse.Name = "pmnu_collapse"; + this.pmnu_collapse.Size = new System.Drawing.Size(147, 22); + this.pmnu_collapse.Text = "Collapse All"; + this.pmnu_collapse.Click += new System.EventHandler(this.pmnu_collapse_Click); + // + // sep1 + // + this.sep1.Name = "sep1"; + this.sep1.Size = new System.Drawing.Size(144, 6); + // + // pmnu_import + // + this.pmnu_import.Name = "pmnu_import"; + this.pmnu_import.Size = new System.Drawing.Size(147, 22); + this.pmnu_import.Text = "Import"; + this.pmnu_import.Click += new System.EventHandler(this.pmnu_import_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(144, 6); + // + // pmnu_saveChanges + // + this.pmnu_saveChanges.Name = "pmnu_saveChanges"; + this.pmnu_saveChanges.Size = new System.Drawing.Size(147, 22); + this.pmnu_saveChanges.Text = "Save Changes"; + this.pmnu_saveChanges.Click += new System.EventHandler(this.pmnu_saveChanges_Click); + // + // pmnu_delete + // + this.pmnu_delete.Name = "pmnu_delete"; + this.pmnu_delete.Size = new System.Drawing.Size(147, 22); + this.pmnu_delete.Text = "Delete"; + this.pmnu_delete.Click += new System.EventHandler(this.pmnu_delete_click); + // // DVD_Open // this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drive."; @@ -638,127 +714,17 @@ namespace Handbrake this.mnu_options.Text = "Options"; this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click); // - // PresetsToolStripMenuItem - // - this.PresetsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mnu_presetReset, - this.mnu_delete_preset, - this.toolStripSeparator7, - this.btn_new_preset, - this.mnu_importMacPreset, - this.mnu_SelectDefault}); - this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem"; - this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(56, 20); - this.PresetsToolStripMenuItem.Text = "&Presets"; - // - // mnu_presetReset - // - this.mnu_presetReset.Name = "mnu_presetReset"; - this.mnu_presetReset.Size = new System.Drawing.Size(194, 22); - this.mnu_presetReset.Text = "Update Built-in Presets"; - this.mnu_presetReset.ToolTipText = "Resets all presets."; - this.mnu_presetReset.Click += new System.EventHandler(this.mnu_presetReset_Click); - // - // mnu_delete_preset - // - this.mnu_delete_preset.Name = "mnu_delete_preset"; - this.mnu_delete_preset.Size = new System.Drawing.Size(194, 22); - this.mnu_delete_preset.Text = "Delete Built-in Presets"; - this.mnu_delete_preset.Click += new System.EventHandler(this.mnu_delete_preset_Click); - // - // toolStripSeparator7 - // - this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(191, 6); - // - // btn_new_preset - // - this.btn_new_preset.Name = "btn_new_preset"; - this.btn_new_preset.Size = new System.Drawing.Size(194, 22); - this.btn_new_preset.Text = "New Preset"; - this.btn_new_preset.Click += new System.EventHandler(this.btn_new_preset_Click); - // - // mnu_importMacPreset - // - this.mnu_importMacPreset.Name = "mnu_importMacPreset"; - this.mnu_importMacPreset.Size = new System.Drawing.Size(194, 22); - this.mnu_importMacPreset.Text = "Import"; - this.mnu_importMacPreset.Click += new System.EventHandler(this.mnu_importMacPreset_Click); - // - // mnu_SelectDefault - // - this.mnu_SelectDefault.Name = "mnu_SelectDefault"; - this.mnu_SelectDefault.Size = new System.Drawing.Size(194, 22); - this.mnu_SelectDefault.Text = "Select Default Preset"; - this.mnu_SelectDefault.ToolTipText = "Select HandBrake\'s default preset"; - this.mnu_SelectDefault.Click += new System.EventHandler(this.mnu_SelectDefault_Click); - // - // HelpToolStripMenuItem - // - this.HelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mnu_user_guide, - this.mnu_handbrake_home, - this.ToolStripSeparator3, - this.mnu_UpdateCheck, - this.toolStripSeparator6, - this.mnu_about}); - this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem"; - this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); - this.HelpToolStripMenuItem.Text = "&Help"; - // - // mnu_user_guide - // - this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16; - this.mnu_user_guide.Name = "mnu_user_guide"; - this.mnu_user_guide.Size = new System.Drawing.Size(194, 22); - this.mnu_user_guide.Text = "HandBrake User Guide"; - this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click); - // - // mnu_handbrake_home - // - this.mnu_handbrake_home.Image = global::Handbrake.Properties.Resources.info16; - this.mnu_handbrake_home.Name = "mnu_handbrake_home"; - this.mnu_handbrake_home.Size = new System.Drawing.Size(194, 22); - this.mnu_handbrake_home.Text = "HandBrake Homepage"; - this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click); - // - // ToolStripSeparator3 - // - this.ToolStripSeparator3.Name = "ToolStripSeparator3"; - this.ToolStripSeparator3.Size = new System.Drawing.Size(191, 6); - // - // mnu_UpdateCheck - // - this.mnu_UpdateCheck.Name = "mnu_UpdateCheck"; - this.mnu_UpdateCheck.Size = new System.Drawing.Size(194, 22); - this.mnu_UpdateCheck.Text = "Check for Updates"; - this.mnu_UpdateCheck.Click += new System.EventHandler(this.mnu_UpdateCheck_Click); - // - // toolStripSeparator6 - // - this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(191, 6); - // - // mnu_about - // - this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16; - this.mnu_about.Name = "mnu_about"; - this.mnu_about.Size = new System.Drawing.Size(194, 22); - this.mnu_about.Text = "About..."; - this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click); - // // frmMainMenu // this.frmMainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileToolStripMenuItem, - this.ToolsToolStripMenuItem, - this.PresetsToolStripMenuItem, - this.HelpToolStripMenuItem}); + this.ToolsToolStripMenuItem}); this.frmMainMenu.Location = new System.Drawing.Point(0, 0); this.frmMainMenu.Name = "frmMainMenu"; this.frmMainMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; this.frmMainMenu.Size = new System.Drawing.Size(1002, 24); this.frmMainMenu.TabIndex = 0; + this.frmMainMenu.TabStop = true; this.frmMainMenu.Text = "MenuStrip"; // // label5 @@ -769,7 +735,7 @@ namespace Handbrake this.label5.Location = new System.Drawing.Point(3, 7); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(58, 13); - this.label5.TabIndex = 27; + this.label5.TabIndex = 0; this.label5.Text = "Container:"; // // Label47 @@ -780,7 +746,7 @@ namespace Handbrake this.Label47.Location = new System.Drawing.Point(13, 39); this.Label47.Name = "Label47"; this.Label47.Size = new System.Drawing.Size(70, 13); - this.Label47.TabIndex = 0; + this.Label47.TabIndex = 7; this.Label47.Text = "Video Codec:"; // // Label3 @@ -824,21 +790,21 @@ namespace Handbrake // tab_video // this.tab_video.BackColor = System.Drawing.Color.Transparent; + this.tab_video.Controls.Add(this.lbl_rfwarn); + this.tab_video.Controls.Add(this.checkMaximumFramerate); + this.tab_video.Controls.Add(this.drp_videoFramerate); this.tab_video.Controls.Add(this.radio_cq); this.tab_video.Controls.Add(this.radio_avgBitrate); - this.tab_video.Controls.Add(this.radio_targetFilesize); this.tab_video.Controls.Add(this.drp_videoEncoder); this.tab_video.Controls.Add(this.Label47); this.tab_video.Controls.Add(this.label25); this.tab_video.Controls.Add(this.check_turbo); this.tab_video.Controls.Add(this.check_2PassEncode); this.tab_video.Controls.Add(this.Label2); - this.tab_video.Controls.Add(this.text_filesize); this.tab_video.Controls.Add(this.slider_videoQuality); this.tab_video.Controls.Add(this.text_bitrate); this.tab_video.Controls.Add(this.lbl_SliderValue); - this.tab_video.Controls.Add(this.Label46); - this.tab_video.Controls.Add(this.drp_videoFramerate); + this.tab_video.Controls.Add(this.lbl_framerate); this.tab_video.Location = new System.Drawing.Point(4, 22); this.tab_video.Name = "tab_video"; this.tab_video.Padding = new System.Windows.Forms.Padding(3); @@ -847,14 +813,38 @@ namespace Handbrake this.tab_video.Text = "Video"; this.tab_video.UseVisualStyleBackColor = true; // + // lbl_rfwarn + // + this.lbl_rfwarn.AutoSize = true; + this.lbl_rfwarn.BackColor = System.Drawing.Color.Transparent; + this.lbl_rfwarn.ForeColor = System.Drawing.Color.Red; + this.lbl_rfwarn.Location = new System.Drawing.Point(385, 135); + this.lbl_rfwarn.Name = "lbl_rfwarn"; + this.lbl_rfwarn.Size = new System.Drawing.Size(321, 39); + this.lbl_rfwarn.TabIndex = 0; + this.lbl_rfwarn.Text = "RF:0 is x264\'s lossless mode.\r\nThis will result in a very large output which may " + + "not be compatible\r\nwith your playback software."; + this.lbl_rfwarn.Visible = false; + // + // checkMaximumFramerate + // + this.checkMaximumFramerate.AutoSize = true; + this.checkMaximumFramerate.BackColor = System.Drawing.Color.Transparent; + this.checkMaximumFramerate.Location = new System.Drawing.Point(125, 89); + this.checkMaximumFramerate.Name = "checkMaximumFramerate"; + this.checkMaximumFramerate.Size = new System.Drawing.Size(131, 17); + this.checkMaximumFramerate.TabIndex = 1; + this.checkMaximumFramerate.Text = "Peak Framerate (VFR)"; + this.checkMaximumFramerate.UseVisualStyleBackColor = false; + // // radio_cq // this.radio_cq.AutoSize = true; this.radio_cq.BackColor = System.Drawing.Color.Transparent; - this.radio_cq.Location = new System.Drawing.Point(336, 97); + this.radio_cq.Location = new System.Drawing.Point(365, 67); this.radio_cq.Name = "radio_cq"; this.radio_cq.Size = new System.Drawing.Size(105, 17); - this.radio_cq.TabIndex = 18; + this.radio_cq.TabIndex = 3; this.radio_cq.Text = "Constant Quality:"; this.radio_cq.UseVisualStyleBackColor = false; this.radio_cq.CheckedChanged += new System.EventHandler(this.radio_cq_CheckedChanged); @@ -864,27 +854,15 @@ namespace Handbrake this.radio_avgBitrate.AutoSize = true; this.radio_avgBitrate.BackColor = System.Drawing.Color.Transparent; this.radio_avgBitrate.Checked = true; - this.radio_avgBitrate.Location = new System.Drawing.Point(336, 64); + this.radio_avgBitrate.Location = new System.Drawing.Point(365, 34); this.radio_avgBitrate.Name = "radio_avgBitrate"; this.radio_avgBitrate.Size = new System.Drawing.Size(112, 17); - this.radio_avgBitrate.TabIndex = 17; + this.radio_avgBitrate.TabIndex = 4; this.radio_avgBitrate.TabStop = true; this.radio_avgBitrate.Text = "Avg Bitrate (kbps):"; this.radio_avgBitrate.UseVisualStyleBackColor = false; this.radio_avgBitrate.CheckedChanged += new System.EventHandler(this.radio_avgBitrate_CheckedChanged); // - // radio_targetFilesize - // - this.radio_targetFilesize.AutoSize = true; - this.radio_targetFilesize.BackColor = System.Drawing.Color.Transparent; - this.radio_targetFilesize.Location = new System.Drawing.Point(336, 37); - this.radio_targetFilesize.Name = "radio_targetFilesize"; - this.radio_targetFilesize.Size = new System.Drawing.Size(107, 17); - this.radio_targetFilesize.TabIndex = 16; - this.radio_targetFilesize.Text = "Target Size (MB):"; - this.radio_targetFilesize.UseVisualStyleBackColor = false; - this.radio_targetFilesize.CheckedChanged += new System.EventHandler(this.radio_targetFilesize_CheckedChanged); - // // label25 // this.label25.AutoSize = true; @@ -893,17 +871,17 @@ namespace Handbrake this.label25.Location = new System.Drawing.Point(13, 13); this.label25.Name = "label25"; this.label25.Size = new System.Drawing.Size(38, 13); - this.label25.TabIndex = 0; + this.label25.TabIndex = 8; this.label25.Text = "Video"; // // check_2PassEncode // this.check_2PassEncode.AutoSize = true; this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent; - this.check_2PassEncode.Location = new System.Drawing.Point(125, 100); + this.check_2PassEncode.Location = new System.Drawing.Point(125, 120); this.check_2PassEncode.Name = "check_2PassEncode"; this.check_2PassEncode.Size = new System.Drawing.Size(106, 17); - this.check_2PassEncode.TabIndex = 6; + this.check_2PassEncode.TabIndex = 10; this.check_2PassEncode.Text = "2-Pass Encoding"; this.check_2PassEncode.UseVisualStyleBackColor = false; this.check_2PassEncode.CheckedChanged += new System.EventHandler(this.check_2PassEncode_CheckedChanged); @@ -913,10 +891,10 @@ namespace Handbrake this.Label2.AutoSize = true; this.Label2.BackColor = System.Drawing.Color.Transparent; this.Label2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label2.Location = new System.Drawing.Point(334, 13); + this.Label2.Location = new System.Drawing.Point(363, 13); this.Label2.Name = "Label2"; this.Label2.Size = new System.Drawing.Size(47, 13); - this.Label2.TabIndex = 8; + this.Label2.TabIndex = 11; this.Label2.Text = "Quality"; // // lbl_SliderValue @@ -924,21 +902,21 @@ namespace Handbrake this.lbl_SliderValue.AutoSize = true; this.lbl_SliderValue.BackColor = System.Drawing.Color.Transparent; this.lbl_SliderValue.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_SliderValue.Location = new System.Drawing.Point(480, 100); + this.lbl_SliderValue.Location = new System.Drawing.Point(509, 70); this.lbl_SliderValue.Name = "lbl_SliderValue"; this.lbl_SliderValue.Size = new System.Drawing.Size(21, 13); this.lbl_SliderValue.TabIndex = 15; this.lbl_SliderValue.Text = "RF"; // - // Label46 + // lbl_framerate // - this.Label46.AutoSize = true; - this.Label46.BackColor = System.Drawing.Color.Transparent; - this.Label46.Location = new System.Drawing.Point(13, 71); - this.Label46.Name = "Label46"; - this.Label46.Size = new System.Drawing.Size(90, 13); - this.Label46.TabIndex = 1; - this.Label46.Text = "Framerate (FPS):"; + this.lbl_framerate.AutoSize = true; + this.lbl_framerate.BackColor = System.Drawing.Color.Transparent; + this.lbl_framerate.Location = new System.Drawing.Point(13, 65); + this.lbl_framerate.Name = "lbl_framerate"; + this.lbl_framerate.Size = new System.Drawing.Size(90, 13); + this.lbl_framerate.TabIndex = 16; + this.lbl_framerate.Text = "Framerate (FPS):"; // // tab_picture // @@ -971,7 +949,7 @@ namespace Handbrake this.Check_ChapterMarkers.Location = new System.Drawing.Point(16, 32); this.Check_ChapterMarkers.Name = "Check_ChapterMarkers"; this.Check_ChapterMarkers.Size = new System.Drawing.Size(136, 17); - this.Check_ChapterMarkers.TabIndex = 1; + this.Check_ChapterMarkers.TabIndex = 4; this.Check_ChapterMarkers.Text = "Create chapter markers"; this.Check_ChapterMarkers.UseVisualStyleBackColor = false; this.Check_ChapterMarkers.CheckedChanged += new System.EventHandler(this.Check_ChapterMarkers_CheckedChanged); @@ -990,8 +968,7 @@ namespace Handbrake this.tabs_panel.Name = "tabs_panel"; this.tabs_panel.SelectedIndex = 0; this.tabs_panel.Size = new System.Drawing.Size(732, 334); - this.tabs_panel.TabIndex = 5; - this.tabs_panel.TabStop = false; + this.tabs_panel.TabIndex = 6; // // tab_filters // @@ -999,7 +976,7 @@ namespace Handbrake this.tab_filters.Location = new System.Drawing.Point(4, 22); this.tab_filters.Name = "tab_filters"; this.tab_filters.Size = new System.Drawing.Size(724, 308); - this.tab_filters.TabIndex = 9; + this.tab_filters.TabIndex = 1; this.tab_filters.Text = "Video Filters"; this.tab_filters.UseVisualStyleBackColor = true; // @@ -1019,7 +996,7 @@ namespace Handbrake this.tab_subtitles.Name = "tab_subtitles"; this.tab_subtitles.Padding = new System.Windows.Forms.Padding(3); this.tab_subtitles.Size = new System.Drawing.Size(724, 308); - this.tab_subtitles.TabIndex = 10; + this.tab_subtitles.TabIndex = 4; this.tab_subtitles.Text = "Subtitles"; this.tab_subtitles.UseVisualStyleBackColor = true; // @@ -1035,6 +1012,7 @@ namespace Handbrake // tab_chapters // this.tab_chapters.BackColor = System.Drawing.Color.Transparent; + this.tab_chapters.Controls.Add(this.btn_export); this.tab_chapters.Controls.Add(this.btn_importChapters); this.tab_chapters.Controls.Add(this.label31); this.tab_chapters.Controls.Add(this.data_chpt); @@ -1042,7 +1020,7 @@ namespace Handbrake this.tab_chapters.Location = new System.Drawing.Point(4, 22); this.tab_chapters.Name = "tab_chapters"; this.tab_chapters.Size = new System.Drawing.Size(724, 308); - this.tab_chapters.TabIndex = 6; + this.tab_chapters.TabIndex = 5; this.tab_chapters.Text = "Chapters"; this.tab_chapters.UseVisualStyleBackColor = true; // @@ -1054,7 +1032,7 @@ namespace Handbrake this.label31.Location = new System.Drawing.Point(13, 13); this.label31.Name = "label31"; this.label31.Size = new System.Drawing.Size(102, 13); - this.label31.TabIndex = 0; + this.label31.TabIndex = 2; this.label31.Text = "Chapter Markers"; // // tab_advanced @@ -1065,7 +1043,7 @@ namespace Handbrake this.tab_advanced.Name = "tab_advanced"; this.tab_advanced.Padding = new System.Windows.Forms.Padding(3); this.tab_advanced.Size = new System.Drawing.Size(724, 308); - this.tab_advanced.TabIndex = 8; + this.tab_advanced.TabIndex = 6; this.tab_advanced.Text = "Advanced"; this.tab_advanced.UseVisualStyleBackColor = true; // @@ -1077,7 +1055,7 @@ namespace Handbrake this.x264Panel.Name = "x264Panel"; this.x264Panel.Size = new System.Drawing.Size(720, 306); this.x264Panel.TabIndex = 0; - this.x264Panel.X264Query = " -x -x -x -x "; + this.x264Panel.X264Query = ""; // // tab_query // @@ -1098,10 +1076,10 @@ namespace Handbrake this.btn_clear.FlatAppearance.BorderColor = System.Drawing.Color.Black; this.btn_clear.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_clear.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_clear.Location = new System.Drawing.Point(634, 75); + this.btn_clear.Location = new System.Drawing.Point(634, 104); this.btn_clear.Name = "btn_clear"; this.btn_clear.Size = new System.Drawing.Size(75, 22); - this.btn_clear.TabIndex = 4; + this.btn_clear.TabIndex = 0; this.btn_clear.Text = "Clear"; this.btn_clear.UseVisualStyleBackColor = true; this.btn_clear.Click += new System.EventHandler(this.btn_clear_Click); @@ -1109,25 +1087,11 @@ namespace Handbrake // label34 // this.label34.AutoSize = true; - this.label34.Location = new System.Drawing.Point(13, 36); + this.label34.Location = new System.Drawing.Point(13, 35); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(367, 26); + this.label34.Size = new System.Drawing.Size(631, 52); this.label34.TabIndex = 1; - this.label34.Text = "Here you can alter the query generated by this program.\r\nDon\'t forget to re-gener" + - "ate this query should you change any GUI options."; - // - // btn_generate_Query - // - this.btn_generate_Query.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_generate_Query.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_generate_Query.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_generate_Query.Location = new System.Drawing.Point(16, 75); - this.btn_generate_Query.Name = "btn_generate_Query"; - this.btn_generate_Query.Size = new System.Drawing.Size(126, 22); - this.btn_generate_Query.TabIndex = 2; - this.btn_generate_Query.Text = "Generate Query"; - this.btn_generate_Query.UseVisualStyleBackColor = true; - this.btn_generate_Query.Click += new System.EventHandler(this.btn_generate_Query_Click); + this.label34.Text = resources.GetString("label34.Text"); // // label33 // @@ -1137,16 +1101,16 @@ namespace Handbrake this.label33.Location = new System.Drawing.Point(13, 13); this.label33.Name = "label33"; this.label33.Size = new System.Drawing.Size(77, 13); - this.label33.TabIndex = 0; + this.label33.TabIndex = 3; this.label33.Text = "Query Editor"; // // rtf_query // this.rtf_query.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.rtf_query.Location = new System.Drawing.Point(16, 103); + this.rtf_query.Location = new System.Drawing.Point(16, 132); this.rtf_query.Name = "rtf_query"; - this.rtf_query.Size = new System.Drawing.Size(693, 190); - this.rtf_query.TabIndex = 5; + this.rtf_query.Size = new System.Drawing.Size(693, 161); + this.rtf_query.TabIndex = 4; this.rtf_query.Text = ""; // // groupBox2 @@ -1156,7 +1120,7 @@ namespace Handbrake this.groupBox2.Location = new System.Drawing.Point(750, 70); this.groupBox2.Name = "groupBox2"; this.groupBox2.Size = new System.Drawing.Size(246, 482); - this.groupBox2.TabIndex = 6; + this.groupBox2.TabIndex = 4; this.groupBox2.TabStop = false; this.groupBox2.Text = "Presets"; // @@ -1173,90 +1137,113 @@ namespace Handbrake // // splitContainer1.Panel2 // - this.splitContainer1.Panel2.Controls.Add(this.btn_addPreset); - this.splitContainer1.Panel2.Controls.Add(this.btn_removePreset); - this.splitContainer1.Panel2.Controls.Add(this.btn_setDefault); + this.splitContainer1.Panel2.Controls.Add(this.presetsToolStrip); this.splitContainer1.Size = new System.Drawing.Size(240, 462); this.splitContainer1.SplitterDistance = 424; - this.splitContainer1.TabIndex = 1; - // - // treeView_presets - // - this.treeView_presets.ContextMenuStrip = this.presets_menu; - this.treeView_presets.Dock = System.Windows.Forms.DockStyle.Fill; - this.treeView_presets.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.treeView_presets.ForeColor = System.Drawing.Color.DarkBlue; - this.treeView_presets.FullRowSelect = true; - this.treeView_presets.HideSelection = false; - this.treeView_presets.ItemHeight = 21; - this.treeView_presets.Location = new System.Drawing.Point(0, 0); - this.treeView_presets.Name = "treeView_presets"; - this.treeView_presets.ShowLines = false; - this.treeView_presets.Size = new System.Drawing.Size(240, 424); - this.treeView_presets.TabIndex = 0; - this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect); - this.treeView_presets.KeyUp += new System.Windows.Forms.KeyEventHandler(this.treeView_presets_deleteKey); - this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp); - // - // presets_menu - // - this.presets_menu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.pmnu_expandAll, - this.pmnu_collapse, - this.sep1, - this.pmnu_import, - this.toolStripSeparator2, - this.pmnu_saveChanges, - this.pmnu_delete}); - this.presets_menu.Name = "presets_menu"; - this.presets_menu.Size = new System.Drawing.Size(148, 126); - this.presets_menu.Text = ";"; - this.presets_menu.Opening += new System.ComponentModel.CancelEventHandler(this.presets_menu_Opening); - // - // pmnu_expandAll + this.splitContainer1.TabIndex = 0; + // + // presetsToolStrip + // + this.presetsToolStrip.CanOverflow = false; + this.presetsToolStrip.Dock = System.Windows.Forms.DockStyle.Fill; + this.presetsToolStrip.GripMargin = new System.Windows.Forms.Padding(0); + this.presetsToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.presetsToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.BtnAddPreset, + this.BtnRemovePreset, + this.toolStripDropDownButton2}); + this.presetsToolStrip.Location = new System.Drawing.Point(0, 0); + this.presetsToolStrip.Name = "presetsToolStrip"; + this.presetsToolStrip.Padding = new System.Windows.Forms.Padding(0); + this.presetsToolStrip.Size = new System.Drawing.Size(240, 34); + this.presetsToolStrip.TabIndex = 2; + this.presetsToolStrip.Text = "toolStrip2"; + // + // BtnAddPreset + // + this.BtnAddPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.BtnAddPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.BtnAddPreset.Image = global::Handbrake.Properties.Resources.Add16; + this.BtnAddPreset.ImageTransparentColor = System.Drawing.Color.Magenta; + this.BtnAddPreset.Name = "BtnAddPreset"; + this.BtnAddPreset.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never; + this.BtnAddPreset.Padding = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.BtnAddPreset.Size = new System.Drawing.Size(65, 31); + this.BtnAddPreset.Text = "Add"; + this.BtnAddPreset.Click += new System.EventHandler(this.BtnAddPreset_Click); + // + // BtnRemovePreset + // + this.BtnRemovePreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.BtnRemovePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.BtnRemovePreset.Image = global::Handbrake.Properties.Resources.Close; + this.BtnRemovePreset.ImageTransparentColor = System.Drawing.Color.Magenta; + this.BtnRemovePreset.Name = "BtnRemovePreset"; + this.BtnRemovePreset.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never; + this.BtnRemovePreset.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0); + this.BtnRemovePreset.Size = new System.Drawing.Size(82, 31); + this.BtnRemovePreset.Text = "Remove"; + this.BtnRemovePreset.Click += new System.EventHandler(this.BtnRemovePreset_Click); + // + // toolStripDropDownButton2 + // + this.toolStripDropDownButton2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.MnuSetDefaultPreset, + this.toolStripSeparator3, + this.MnuImportPreset, + this.MnuExportPreset, + this.toolStripSeparator6, + this.MnuResetBuiltInPresets}); + this.toolStripDropDownButton2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.toolStripDropDownButton2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.toolStripDropDownButton2.Image = global::Handbrake.Properties.Resources.Options24; + this.toolStripDropDownButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripDropDownButton2.Name = "toolStripDropDownButton2"; + this.toolStripDropDownButton2.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never; + this.toolStripDropDownButton2.Size = new System.Drawing.Size(79, 31); + this.toolStripDropDownButton2.Text = "Options"; // - this.pmnu_expandAll.Name = "pmnu_expandAll"; - this.pmnu_expandAll.Size = new System.Drawing.Size(147, 22); - this.pmnu_expandAll.Text = "Expand All"; - this.pmnu_expandAll.Click += new System.EventHandler(this.pmnu_expandAll_Click); + // MnuSetDefaultPreset // - // pmnu_collapse + this.MnuSetDefaultPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.MnuSetDefaultPreset.Name = "MnuSetDefaultPreset"; + this.MnuSetDefaultPreset.Size = new System.Drawing.Size(178, 22); + this.MnuSetDefaultPreset.Text = "Set Default"; + this.MnuSetDefaultPreset.Click += new System.EventHandler(this.MnuSetDefaultPreset_Click); // - this.pmnu_collapse.Name = "pmnu_collapse"; - this.pmnu_collapse.Size = new System.Drawing.Size(147, 22); - this.pmnu_collapse.Text = "Collapse All"; - this.pmnu_collapse.Click += new System.EventHandler(this.pmnu_collapse_Click); - // - // sep1 + // toolStripSeparator3 // - this.sep1.Name = "sep1"; - this.sep1.Size = new System.Drawing.Size(144, 6); + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(175, 6); // - // pmnu_import + // MnuImportPreset // - this.pmnu_import.Name = "pmnu_import"; - this.pmnu_import.Size = new System.Drawing.Size(147, 22); - this.pmnu_import.Text = "Import"; - this.pmnu_import.Click += new System.EventHandler(this.pmnu_import_Click); + this.MnuImportPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.MnuImportPreset.Name = "MnuImportPreset"; + this.MnuImportPreset.Size = new System.Drawing.Size(178, 22); + this.MnuImportPreset.Text = "Import"; + this.MnuImportPreset.Click += new System.EventHandler(this.MnuImportPreset_Click); // - // toolStripSeparator2 + // MnuExportPreset // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(144, 6); + this.MnuExportPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.MnuExportPreset.Name = "MnuExportPreset"; + this.MnuExportPreset.Size = new System.Drawing.Size(178, 22); + this.MnuExportPreset.Text = "Export"; + this.MnuExportPreset.Click += new System.EventHandler(this.MnuExportPreset_Click); // - // pmnu_saveChanges + // toolStripSeparator6 // - this.pmnu_saveChanges.Name = "pmnu_saveChanges"; - this.pmnu_saveChanges.Size = new System.Drawing.Size(147, 22); - this.pmnu_saveChanges.Text = "Save Changes"; - this.pmnu_saveChanges.Click += new System.EventHandler(this.pmnu_saveChanges_Click); + this.toolStripSeparator6.Name = "toolStripSeparator6"; + this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6); // - // pmnu_delete + // MnuResetBuiltInPresets // - this.pmnu_delete.Name = "pmnu_delete"; - this.pmnu_delete.Size = new System.Drawing.Size(147, 22); - this.pmnu_delete.Text = "Delete"; - this.pmnu_delete.Click += new System.EventHandler(this.pmnu_delete_click); + this.MnuResetBuiltInPresets.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.MnuResetBuiltInPresets.Name = "MnuResetBuiltInPresets"; + this.MnuResetBuiltInPresets.Size = new System.Drawing.Size(178, 22); + this.MnuResetBuiltInPresets.Text = "Reset Built-In Presets"; + this.MnuResetBuiltInPresets.Click += new System.EventHandler(this.MnuResetBuiltInPresets_Click); // // toolStrip1 // @@ -1269,12 +1256,15 @@ namespace Handbrake this.btn_showQueue, this.toolStripSeparator4, this.tb_preview, - this.btn_ActivityWindow}); + this.btn_ActivityWindow, + this.toolStripSeparator8, + this.toolStripDropDownButton1}); this.toolStrip1.Location = new System.Drawing.Point(0, 24); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; this.toolStrip1.Size = new System.Drawing.Size(1002, 39); this.toolStrip1.TabIndex = 1; + this.toolStrip1.TabStop = true; this.toolStrip1.Text = "toolStrip1"; // // btn_source @@ -1282,8 +1272,8 @@ namespace Handbrake this.btn_source.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.btn_file_source, this.btn_dvd_source, - this.toolStripSeparator1, - this.mnu_dvd_drive}); + this.btnTitleSpecific, + this.toolStripSeparator1}); this.btn_source.Image = global::Handbrake.Properties.Resources.Movies; this.btn_source.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.btn_source.ImageTransparentColor = System.Drawing.Color.Magenta; @@ -1293,39 +1283,46 @@ namespace Handbrake this.btn_source.ToolTipText = "Open a new source file or folder."; this.btn_source.Click += new System.EventHandler(this.btn_source_Click); // - // btn_file_source - // - this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small; - this.btn_file_source.Name = "btn_file_source"; - this.btn_file_source.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.btn_file_source.Size = new System.Drawing.Size(189, 22); - this.btn_file_source.Text = "Video File"; - this.btn_file_source.Click += new System.EventHandler(this.btn_file_source_Click); - // // btn_dvd_source // - this.btn_dvd_source.Image = ((System.Drawing.Image)(resources.GetObject("btn_dvd_source.Image"))); + this.btn_dvd_source.Image = global::Handbrake.Properties.Resources.folder; this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta; this.btn_dvd_source.Name = "btn_dvd_source"; this.btn_dvd_source.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.O))); - this.btn_dvd_source.Size = new System.Drawing.Size(189, 22); + this.btn_dvd_source.Size = new System.Drawing.Size(182, 22); this.btn_dvd_source.Text = "Folder"; - this.btn_dvd_source.Click += new System.EventHandler(this.btn_dvd_source_Click); + this.btn_dvd_source.Click += new System.EventHandler(this.BtnFolderScanClicked); // - // toolStripSeparator1 + // btnTitleSpecific // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(186, 6); + this.btnTitleSpecific.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.FileTitleSpecificScan, + this.FolderTitleSpecificScan}); + this.btnTitleSpecific.Name = "btnTitleSpecific"; + this.btnTitleSpecific.Size = new System.Drawing.Size(182, 22); + this.btnTitleSpecific.Text = "Title Specific Scan"; + // + // FileTitleSpecificScan + // + this.FileTitleSpecificScan.Image = global::Handbrake.Properties.Resources.Movies_Small; + this.FileTitleSpecificScan.Name = "FileTitleSpecificScan"; + this.FileTitleSpecificScan.Size = new System.Drawing.Size(125, 22); + this.FileTitleSpecificScan.Text = "Video File"; + this.FileTitleSpecificScan.Click += new System.EventHandler(this.VideoTitleSpecificScanClick); + // + // FolderTitleSpecificScan // - // mnu_dvd_drive + this.FolderTitleSpecificScan.Image = global::Handbrake.Properties.Resources.folder; + this.FolderTitleSpecificScan.Name = "FolderTitleSpecificScan"; + this.FolderTitleSpecificScan.Size = new System.Drawing.Size(125, 22); + this.FolderTitleSpecificScan.Text = "Folder"; + this.FolderTitleSpecificScan.Click += new System.EventHandler(this.FolderTitleSpecificScanClick); // - this.mnu_dvd_drive.Image = global::Handbrake.Properties.Resources.disc_small; - this.mnu_dvd_drive.Name = "mnu_dvd_drive"; - this.mnu_dvd_drive.Size = new System.Drawing.Size(189, 22); - this.mnu_dvd_drive.Text = "[No DVD Drive Ready]"; - this.mnu_dvd_drive.Visible = false; - this.mnu_dvd_drive.Click += new System.EventHandler(this.mnu_dvd_drive_Click); + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(179, 6); // // toolStripSeparator10 // @@ -1392,6 +1389,63 @@ namespace Handbrake "ently running encode."; this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click); // + // toolStripSeparator8 + // + this.toolStripSeparator8.Name = "toolStripSeparator8"; + this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39); + // + // toolStripDropDownButton1 + // + this.toolStripDropDownButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripDropDownButton1.AutoSize = false; + this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.MnuUserGuide, + this.toolStripSeparator9, + this.MnuCheckForUpdates, + this.toolStripSeparator11, + this.MnuAboutHandBrake}); + this.toolStripDropDownButton1.Image = global::Handbrake.Properties.Resources.Help24; + this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; + this.toolStripDropDownButton1.Size = new System.Drawing.Size(69, 36); + this.toolStripDropDownButton1.Text = "Help"; + // + // MnuUserGuide + // + this.MnuUserGuide.Image = global::Handbrake.Properties.Resources.info16; + this.MnuUserGuide.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.MnuUserGuide.Name = "MnuUserGuide"; + this.MnuUserGuide.Size = new System.Drawing.Size(192, 24); + this.MnuUserGuide.Text = "HandBrake User Guide"; + this.MnuUserGuide.Click += new System.EventHandler(this.MnuUserGuide_Click); + // + // toolStripSeparator9 + // + this.toolStripSeparator9.Name = "toolStripSeparator9"; + this.toolStripSeparator9.Size = new System.Drawing.Size(189, 6); + // + // MnuCheckForUpdates + // + this.MnuCheckForUpdates.Name = "MnuCheckForUpdates"; + this.MnuCheckForUpdates.Size = new System.Drawing.Size(192, 24); + this.MnuCheckForUpdates.Text = "Check for Updates"; + this.MnuCheckForUpdates.Click += new System.EventHandler(this.MnuCheckForUpdates_Click); + // + // toolStripSeparator11 + // + this.toolStripSeparator11.Name = "toolStripSeparator11"; + this.toolStripSeparator11.Size = new System.Drawing.Size(189, 6); + // + // MnuAboutHandBrake + // + this.MnuAboutHandBrake.Image = global::Handbrake.Properties.Resources.hb16; + this.MnuAboutHandBrake.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.MnuAboutHandBrake.Name = "MnuAboutHandBrake"; + this.MnuAboutHandBrake.Size = new System.Drawing.Size(192, 24); + this.MnuAboutHandBrake.Text = "About HandBrake"; + this.MnuAboutHandBrake.Click += new System.EventHandler(this.MnuAboutHandBrake_Click); + // // notifyIcon // this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info; @@ -1405,15 +1459,24 @@ namespace Handbrake // StatusStrip // this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ProgressBarStatus, this.lbl_encode, this.lbl_updateCheck}); this.StatusStrip.Location = new System.Drawing.Point(0, 561); this.StatusStrip.Name = "StatusStrip"; + this.StatusStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; this.StatusStrip.Size = new System.Drawing.Size(1002, 22); this.StatusStrip.SizingGrip = false; this.StatusStrip.TabIndex = 7; this.StatusStrip.Text = "statusStrip1"; // + // ProgressBarStatus + // + this.ProgressBarStatus.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.ProgressBarStatus.Name = "ProgressBarStatus"; + this.ProgressBarStatus.Size = new System.Drawing.Size(100, 16); + this.ProgressBarStatus.Visible = false; + // // lbl_encode // this.lbl_encode.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -1462,7 +1525,7 @@ namespace Handbrake this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29F)); this.tableLayoutPanel2.Size = new System.Drawing.Size(723, 29); - this.tableLayoutPanel2.TabIndex = 50; + this.tableLayoutPanel2.TabIndex = 3; // // btn_destBrowse // @@ -1472,7 +1535,7 @@ namespace Handbrake this.btn_destBrowse.Location = new System.Drawing.Point(645, 3); this.btn_destBrowse.Name = "btn_destBrowse"; this.btn_destBrowse.Size = new System.Drawing.Size(75, 23); - this.btn_destBrowse.TabIndex = 13; + this.btn_destBrowse.TabIndex = 2; this.btn_destBrowse.Text = "Browse"; this.btn_destBrowse.UseVisualStyleBackColor = true; this.btn_destBrowse.Click += new System.EventHandler(this.btn_destBrowse_Click); @@ -1496,7 +1559,7 @@ namespace Handbrake this.tableLayoutPanel3.RowCount = 1; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel3.Size = new System.Drawing.Size(723, 27); - this.tableLayoutPanel3.TabIndex = 51; + this.tableLayoutPanel3.TabIndex = 5; // // tableLayoutPanel1 // @@ -1529,7 +1592,7 @@ namespace Handbrake this.tableLayoutPanel1.RowCount = 1; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.Size = new System.Drawing.Size(723, 27); - this.tableLayoutPanel1.TabIndex = 49; + this.tableLayoutPanel1.TabIndex = 2; // // Label10 // @@ -1539,7 +1602,7 @@ namespace Handbrake this.Label10.Location = new System.Drawing.Point(3, 7); this.Label10.Name = "Label10"; this.Label10.Size = new System.Drawing.Size(31, 13); - this.Label10.TabIndex = 6; + this.Label10.TabIndex = 0; this.Label10.Text = "Title:"; // // lbl_angle @@ -1550,7 +1613,7 @@ namespace Handbrake this.lbl_angle.Location = new System.Drawing.Point(165, 7); this.lbl_angle.Name = "lbl_angle"; this.lbl_angle.Size = new System.Drawing.Size(38, 13); - this.lbl_angle.TabIndex = 44; + this.lbl_angle.TabIndex = 2; this.lbl_angle.Text = "Angle:"; // // Label13 @@ -1560,7 +1623,7 @@ namespace Handbrake this.Label13.Location = new System.Drawing.Point(458, 7); this.Label13.Name = "Label13"; this.Label13.Size = new System.Drawing.Size(45, 13); - this.Label13.TabIndex = 10; + this.Label13.TabIndex = 6; this.Label13.Text = "through"; // // label_duration @@ -1571,7 +1634,7 @@ namespace Handbrake this.label_duration.Location = new System.Drawing.Point(584, 7); this.label_duration.Name = "label_duration"; this.label_duration.Size = new System.Drawing.Size(52, 13); - this.label_duration.TabIndex = 42; + this.label_duration.TabIndex = 8; this.label_duration.Text = "Duration:"; // // lbl_duration @@ -1582,7 +1645,7 @@ namespace Handbrake this.lbl_duration.Location = new System.Drawing.Point(642, 7); this.lbl_duration.Name = "lbl_duration"; this.lbl_duration.Size = new System.Drawing.Size(39, 13); - this.lbl_duration.TabIndex = 43; + this.lbl_duration.TabIndex = 9; this.lbl_duration.Text = "--:--:--"; // // labelStaticDestination @@ -1592,7 +1655,7 @@ namespace Handbrake this.labelStaticDestination.Location = new System.Drawing.Point(9, 116); this.labelStaticDestination.Name = "labelStaticDestination"; this.labelStaticDestination.Size = new System.Drawing.Size(75, 13); - this.labelStaticDestination.TabIndex = 53; + this.labelStaticDestination.TabIndex = 3; this.labelStaticDestination.Text = "Destination:"; // // labelPreset @@ -1602,7 +1665,7 @@ namespace Handbrake this.labelPreset.Location = new System.Drawing.Point(9, 164); this.labelPreset.Name = "labelPreset"; this.labelPreset.Size = new System.Drawing.Size(180, 13); - this.labelPreset.TabIndex = 54; + this.labelPreset.TabIndex = 5; this.labelPreset.Text = "Output Settings (Preset: None)"; // // labelSource @@ -1611,7 +1674,7 @@ namespace Handbrake this.labelSource.Location = new System.Drawing.Point(55, 0); this.labelSource.Name = "labelSource"; this.labelSource.Size = new System.Drawing.Size(137, 13); - this.labelSource.TabIndex = 52; + this.labelSource.TabIndex = 1; this.labelSource.Text = "Select \"Source\" to continue"; // // labelStaticSource @@ -1622,20 +1685,20 @@ namespace Handbrake this.labelStaticSource.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); this.labelStaticSource.Name = "labelStaticSource"; this.labelStaticSource.Size = new System.Drawing.Size(49, 13); - this.labelStaticSource.TabIndex = 51; + this.labelStaticSource.TabIndex = 0; this.labelStaticSource.Text = "Source:"; // - // flowLayoutPanel1 + // SourceLayoutPanel // - this.flowLayoutPanel1.AutoSize = true; - this.flowLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.flowLayoutPanel1.Controls.Add(this.labelStaticSource); - this.flowLayoutPanel1.Controls.Add(this.labelSource); - this.flowLayoutPanel1.Location = new System.Drawing.Point(9, 70); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(195, 13); - this.flowLayoutPanel1.TabIndex = 55; + this.SourceLayoutPanel.AutoSize = true; + this.SourceLayoutPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.SourceLayoutPanel.Controls.Add(this.labelStaticSource); + this.SourceLayoutPanel.Controls.Add(this.labelSource); + this.SourceLayoutPanel.Location = new System.Drawing.Point(9, 70); + this.SourceLayoutPanel.Margin = new System.Windows.Forms.Padding(0); + this.SourceLayoutPanel.Name = "SourceLayoutPanel"; + this.SourceLayoutPanel.Size = new System.Drawing.Size(195, 13); + this.SourceLayoutPanel.TabIndex = 2; // // openPreset // @@ -1655,7 +1718,7 @@ namespace Handbrake this.ClientSize = new System.Drawing.Size(1002, 583); this.Controls.Add(this.tableLayoutPanel3); this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.flowLayoutPanel1); + this.Controls.Add(this.SourceLayoutPanel); this.Controls.Add(this.frmMainMenu); this.Controls.Add(this.tableLayoutPanel2); this.Controls.Add(this.labelPreset); @@ -1676,6 +1739,7 @@ namespace Handbrake ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).EndInit(); this.ChaptersMenu.ResumeLayout(false); + this.presets_menu.ResumeLayout(false); this.frmMainMenu.ResumeLayout(false); this.frmMainMenu.PerformLayout(); this.tab_audio.ResumeLayout(false); @@ -1693,8 +1757,11 @@ namespace Handbrake this.groupBox2.ResumeLayout(false); this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.Panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); - this.presets_menu.ResumeLayout(false); + this.presetsToolStrip.ResumeLayout(false); + this.presetsToolStrip.PerformLayout(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.StatusStrip.ResumeLayout(false); @@ -1705,8 +1772,8 @@ namespace Handbrake this.tableLayoutPanel3.PerformLayout(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); - this.flowLayoutPanel1.ResumeLayout(false); - this.flowLayoutPanel1.PerformLayout(); + this.SourceLayoutPanel.ResumeLayout(false); + this.SourceLayoutPanel.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -1722,11 +1789,6 @@ namespace Handbrake internal System.Windows.Forms.ToolStripMenuItem mnu_encode; internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator5; internal System.Windows.Forms.ToolStripMenuItem mnu_options; - internal System.Windows.Forms.ToolStripMenuItem PresetsToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem mnu_presetReset; - internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem; - internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator3; - internal System.Windows.Forms.ToolStripMenuItem mnu_about; internal System.Windows.Forms.MenuStrip frmMainMenu; internal System.Windows.Forms.Label Label3; internal System.Windows.Forms.ComboBox drp_videoEncoder; @@ -1741,20 +1803,14 @@ namespace Handbrake internal System.Windows.Forms.ComboBox drp_videoFramerate; internal System.Windows.Forms.CheckBox check_2PassEncode; internal System.Windows.Forms.TrackBar slider_videoQuality; - internal System.Windows.Forms.TextBox text_filesize; internal System.Windows.Forms.TextBox text_bitrate; internal System.Windows.Forms.TabPage tab_picture; internal System.Windows.Forms.CheckBox Check_ChapterMarkers; internal System.Windows.Forms.TabControl tabs_panel; - internal System.Windows.Forms.Label Label46; + internal System.Windows.Forms.Label lbl_framerate; private System.Windows.Forms.GroupBox groupBox2; - internal System.Windows.Forms.Button btn_setDefault; - private System.Windows.Forms.ToolStripMenuItem mnu_SelectDefault; - private System.Windows.Forms.ToolStripMenuItem mnu_UpdateCheck; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; private System.Windows.Forms.SaveFileDialog DVD_Save; private System.Windows.Forms.OpenFileDialog File_Open; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator7; internal System.Windows.Forms.CheckBox check_iPodAtom; private System.Windows.Forms.TabPage tab_chapters; internal System.Windows.Forms.Label label31; @@ -1771,9 +1827,6 @@ namespace Handbrake private System.Windows.Forms.ToolStripButton btn_showQueue; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripButton btn_ActivityWindow; - private System.Windows.Forms.ToolStripMenuItem mnu_handbrake_home; - internal System.Windows.Forms.Button btn_removePreset; - internal System.Windows.Forms.Button btn_addPreset; internal System.Windows.Forms.Label label25; internal System.Windows.Forms.TabPage tab_advanced; internal System.Windows.Forms.TreeView treeView_presets; @@ -1782,9 +1835,6 @@ namespace Handbrake private System.Windows.Forms.ToolStripMenuItem btn_restore; private System.Windows.Forms.ToolStripSeparator toolStripSeparator10; private System.Windows.Forms.ToolStripMenuItem btn_file_source; - private System.Windows.Forms.ToolStripMenuItem mnu_delete_preset; - private System.Windows.Forms.ToolStripMenuItem btn_new_preset; - private System.Windows.Forms.ToolStripMenuItem mnu_user_guide; private System.Windows.Forms.ToolStripDropDownButton btn_source; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripMenuItem btn_dvd_source; @@ -1795,7 +1845,6 @@ namespace Handbrake private System.Windows.Forms.ToolStripStatusLabel lbl_encode; internal System.Windows.Forms.OpenFileDialog ISO_Open; internal System.Windows.Forms.FolderBrowserDialog DVD_Open; - internal System.Windows.Forms.ToolStripMenuItem mnu_dvd_drive; private System.Windows.Forms.ContextMenuStrip presets_menu; private System.Windows.Forms.ToolStripMenuItem pmnu_expandAll; private System.Windows.Forms.ToolStripMenuItem pmnu_collapse; @@ -1808,11 +1857,8 @@ namespace Handbrake private System.Windows.Forms.TabPage tab_filters; internal System.Windows.Forms.RadioButton radio_cq; internal System.Windows.Forms.RadioButton radio_avgBitrate; - internal System.Windows.Forms.RadioButton radio_targetFilesize; internal Handbrake.Controls.x264Panel x264Panel; private System.Windows.Forms.ToolStripButton tb_preview; - private System.Windows.Forms.DataGridViewTextBoxColumn number; - private System.Windows.Forms.DataGridViewTextBoxColumn name; private System.Diagnostics.Process hbproc; private TabPage tab_subtitles; internal Handbrake.Controls.AudioPanel AudioSettings; @@ -1838,8 +1884,7 @@ namespace Handbrake internal ComboBox drp_dvdtitle; internal Label Label10; private Label labelStaticSource; - private FlowLayoutPanel flowLayoutPanel1; - private ToolStripMenuItem mnu_importMacPreset; + private FlowLayoutPanel SourceLayoutPanel; private OpenFileDialog openPreset; private Button btn_importChapters; private OpenFileDialog File_ChapterImport; @@ -1848,5 +1893,31 @@ namespace Handbrake private ToolStripMenuItem pmnu_import; private ToolStripSeparator toolStripSeparator2; internal ComboBox drop_mode; + private Button btn_export; + private DataGridViewTextBoxColumn number; + private DataGridViewTextBoxColumn name; + private ToolStripProgressBar ProgressBarStatus; + internal CheckBox checkMaximumFramerate; + private ToolStripMenuItem btnTitleSpecific; + private ToolStripMenuItem FileTitleSpecificScan; + private ToolStripMenuItem FolderTitleSpecificScan; + internal Label lbl_rfwarn; + private ToolStripSeparator toolStripSeparator8; + private ToolStripDropDownButton toolStripDropDownButton1; + private ToolStripMenuItem MnuUserGuide; + private ToolStripSeparator toolStripSeparator9; + private ToolStripMenuItem MnuCheckForUpdates; + private ToolStripSeparator toolStripSeparator11; + private ToolStripMenuItem MnuAboutHandBrake; + private ToolStrip presetsToolStrip; + private ToolStripButton BtnAddPreset; + private ToolStripButton BtnRemovePreset; + private ToolStripDropDownButton toolStripDropDownButton2; + private ToolStripMenuItem MnuSetDefaultPreset; + private ToolStripSeparator toolStripSeparator3; + private ToolStripMenuItem MnuImportPreset; + private ToolStripMenuItem MnuExportPreset; + private ToolStripSeparator toolStripSeparator6; + private ToolStripMenuItem MnuResetBuiltInPresets; } } \ No newline at end of file