]> granicus.if.org Git - handbrake/commitdiff
WinGui:
authorsr55 <sr55.hb@outlook.com>
Tue, 4 Sep 2007 19:40:09 +0000 (19:40 +0000)
committersr55 <sr55.hb@outlook.com>
Tue, 4 Sep 2007 19:40:09 +0000 (19:40 +0000)
- Removed update checker window
- Removed debug window (was never implemented)
- Update checking item in file menu now displays a pop-up message box instead.
- Update checker code changed so it is re-usable.
- Top half of the GUI design changed to closer match the MacGui:
- Chapter Selection boxes now change colour to light coral should the range be invalid. This replaces the text warning.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@920 b64f7644-9d1e-0410-96f1-a4d463321fa5

win/C#/HandBrakeCS.csproj
win/C#/frmMain.Designer.cs
win/C#/frmMain.cs

index 4a7145eb9940cc726d2aebad560048afe247fd9c..f9db9f8a619f8c1422e6004b81211f9d1035e60c 100644 (file)
     <Compile Include="frmAbout.Designer.cs">\r
       <DependentUpon>frmAbout.cs</DependentUpon>\r
     </Compile>\r
-    <Compile Include="frmDebug.cs">\r
-      <SubType>Form</SubType>\r
-    </Compile>\r
-    <Compile Include="frmDebug.Designer.cs">\r
-      <DependentUpon>frmDebug.cs</DependentUpon>\r
-    </Compile>\r
     <Compile Include="frmDvdInfo.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
       <SubType>Designer</SubType>\r
       <DependentUpon>frmAbout.cs</DependentUpon>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="frmDebug.resx">\r
-      <SubType>Designer</SubType>\r
-      <DependentUpon>frmDebug.cs</DependentUpon>\r
-    </EmbeddedResource>\r
     <EmbeddedResource Include="frmDvdInfo.resx">\r
       <SubType>Designer</SubType>\r
       <DependentUpon>frmDvdInfo.cs</DependentUpon>\r
       <SubType>Designer</SubType>\r
       <DependentUpon>frmSplashScreen.cs</DependentUpon>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="frmUpdate.resx">\r
-      <SubType>Designer</SubType>\r
-      <DependentUpon>frmUpdate.cs</DependentUpon>\r
-    </EmbeddedResource>\r
     <Compile Include="Properties\Resources.Designer.cs">\r
       <AutoGen>True</AutoGen>\r
       <DependentUpon>Resources.resx</DependentUpon>\r
     <Compile Include="frmSplashScreen.Designer.cs">\r
       <DependentUpon>frmSplashScreen.cs</DependentUpon>\r
     </Compile>\r
-    <Compile Include="frmUpdate.cs">\r
-      <SubType>Form</SubType>\r
-    </Compile>\r
-    <Compile Include="frmUpdate.Designer.cs">\r
-      <DependentUpon>frmUpdate.cs</DependentUpon>\r
-    </Compile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Content Include="handbrakepineapple.ico" />\r
index 386b1ab5f7d06f4d6198a77ddbec87f41b62a3a4..8e8dd099ee1ea5b2d61f1fc020263400039ec497 100644 (file)
@@ -48,6 +48,16 @@ namespace Handbrake
             this.drp_audioCodec = new System.Windows.Forms.ComboBox();\r
             this.CheckCRF = new System.Windows.Forms.CheckBox();\r
             this.drp_subtitle = new System.Windows.Forms.ComboBox();\r
+            this.QueryEditorText = new System.Windows.Forms.RichTextBox();\r
+            this.rtf_h264advanced = new System.Windows.Forms.RichTextBox();\r
+            this.drp_audioBitrate = new System.Windows.Forms.ComboBox();\r
+            this.drp_audioSampleRate = new System.Windows.Forms.ComboBox();\r
+            this.check_largeFile = new System.Windows.Forms.CheckBox();\r
+            this.check_turbo = new System.Windows.Forms.CheckBox();\r
+            this.drp_videoFramerate = new System.Windows.Forms.ComboBox();\r
+            this.slider_videoQuality = new System.Windows.Forms.TrackBar();\r
+            this.text_filesize = new System.Windows.Forms.TextBox();\r
+            this.text_bitrate = new System.Windows.Forms.TextBox();\r
             this.drp_deInterlace_option = new System.Windows.Forms.ComboBox();\r
             this.drp_deNoise = new System.Windows.Forms.ComboBox();\r
             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();\r
@@ -98,20 +108,19 @@ namespace Handbrake
             this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();\r
             this.frmMainMenu = new System.Windows.Forms.MenuStrip();\r
             this.GroupBox1 = new System.Windows.Forms.GroupBox();\r
-            this.lbl_chptWarn = new System.Windows.Forms.Label();\r
             this.Label13 = new System.Windows.Forms.Label();\r
             this.RadioDVD = new System.Windows.Forms.RadioButton();\r
             this.Label17 = new System.Windows.Forms.Label();\r
             this.Label9 = new System.Windows.Forms.Label();\r
             this.Label10 = new System.Windows.Forms.Label();\r
-            this.GroupBox4 = new System.Windows.Forms.GroupBox();\r
+            this.groupBox_output = new System.Windows.Forms.GroupBox();\r
             this.Label56 = new System.Windows.Forms.Label();\r
             this.lbl_Aspect = new System.Windows.Forms.Label();\r
             this.Label91 = new System.Windows.Forms.Label();\r
             this.Label55 = new System.Windows.Forms.Label();\r
-            this.Label3 = new System.Windows.Forms.Label();\r
             this.Label47 = new System.Windows.Forms.Label();\r
             this.Label12 = new System.Windows.Forms.Label();\r
+            this.Label3 = new System.Windows.Forms.Label();\r
             this.lbl_update = new System.Windows.Forms.Label();\r
             this.btn_queue = new System.Windows.Forms.Button();\r
             this.btn_encode = new System.Windows.Forms.Button();\r
@@ -123,27 +132,23 @@ namespace Handbrake
             this.Label39 = new System.Windows.Forms.Label();\r
             this.btn_ClearQuery = new System.Windows.Forms.Button();\r
             this.GenerateQuery = new System.Windows.Forms.Button();\r
-            this.QueryEditorText = new System.Windows.Forms.RichTextBox();\r
             this.h264Tab = new System.Windows.Forms.TabPage();\r
             this.Label43 = new System.Windows.Forms.Label();\r
             this.label_h264 = new System.Windows.Forms.LinkLabel();\r
             this.Label95 = new System.Windows.Forms.Label();\r
             this.btn_h264Clear = new System.Windows.Forms.Button();\r
             this.Label90 = new System.Windows.Forms.Label();\r
-            this.rtf_h264advanced = new System.Windows.Forms.RichTextBox();\r
             this.Label92 = new System.Windows.Forms.Label();\r
             this.TabPage2 = new System.Windows.Forms.TabPage();\r
             this.Label29 = new System.Windows.Forms.Label();\r
             this.drp_audioMixDown = new System.Windows.Forms.ComboBox();\r
             this.drp_audioChannels = new System.Windows.Forms.ComboBox();\r
-            this.drp_audioBitrate = new System.Windows.Forms.ComboBox();\r
             this.Label14 = new System.Windows.Forms.Label();\r
             this.Label5 = new System.Windows.Forms.Label();\r
             this.Label35 = new System.Windows.Forms.Label();\r
             this.Label16 = new System.Windows.Forms.Label();\r
             this.Label32 = new System.Windows.Forms.Label();\r
             this.Label18 = new System.Windows.Forms.Label();\r
-            this.drp_audioSampleRate = new System.Windows.Forms.ComboBox();\r
             this.TabPage3 = new System.Windows.Forms.TabPage();\r
             this.label24 = new System.Windows.Forms.Label();\r
             this.label11 = new System.Windows.Forms.Label();\r
@@ -151,19 +156,13 @@ namespace Handbrake
             this.check_detelecine = new System.Windows.Forms.CheckBox();\r
             this.label4 = new System.Windows.Forms.Label();\r
             this.Label37 = new System.Windows.Forms.Label();\r
-            this.check_largeFile = new System.Windows.Forms.CheckBox();\r
-            this.check_turbo = new System.Windows.Forms.CheckBox();\r
             this.Label23 = new System.Windows.Forms.Label();\r
             this.Label22 = new System.Windows.Forms.Label();\r
             this.Label2 = new System.Windows.Forms.Label();\r
             this.SliderValue = new System.Windows.Forms.Label();\r
-            this.drp_videoFramerate = new System.Windows.Forms.ComboBox();\r
             this.check_2PassEncode = new System.Windows.Forms.CheckBox();\r
-            this.slider_videoQuality = new System.Windows.Forms.TrackBar();\r
-            this.text_filesize = new System.Windows.Forms.TextBox();\r
             this.Label46 = new System.Windows.Forms.Label();\r
             this.Label40 = new System.Windows.Forms.Label();\r
-            this.text_bitrate = new System.Windows.Forms.TextBox();\r
             this.Label42 = new System.Windows.Forms.Label();\r
             this.TabPage1 = new System.Windows.Forms.TabPage();\r
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
@@ -187,17 +186,19 @@ namespace Handbrake
             this.text_right = new System.Windows.Forms.TextBox();\r
             this.text_left = new System.Windows.Forms.TextBox();\r
             this.advancedOptions = new System.Windows.Forms.TabControl();\r
+            this.groupBox_dest = new System.Windows.Forms.GroupBox();\r
             Label38 = new System.Windows.Forms.Label();\r
+            ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
             this.frmMainMenu.SuspendLayout();\r
             this.GroupBox1.SuspendLayout();\r
-            this.GroupBox4.SuspendLayout();\r
+            this.groupBox_output.SuspendLayout();\r
             this.TabPage6.SuspendLayout();\r
             this.h264Tab.SuspendLayout();\r
             this.TabPage2.SuspendLayout();\r
             this.TabPage3.SuspendLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
             this.TabPage1.SuspendLayout();\r
             this.advancedOptions.SuspendLayout();\r
+            this.groupBox_dest.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // Label38\r
@@ -229,7 +230,7 @@ namespace Handbrake
             this.drop_chapterFinish.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.drop_chapterFinish.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drop_chapterFinish.FormattingEnabled = true;\r
-            this.drop_chapterFinish.Location = new System.Drawing.Point(212, 81);\r
+            this.drop_chapterFinish.Location = new System.Drawing.Point(434, 58);\r
             this.drop_chapterFinish.Name = "drop_chapterFinish";\r
             this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21);\r
             this.drop_chapterFinish.TabIndex = 41;\r
@@ -243,7 +244,7 @@ namespace Handbrake
             this.drop_chapterStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.drop_chapterStart.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drop_chapterStart.FormattingEnabled = true;\r
-            this.drop_chapterStart.Location = new System.Drawing.Point(99, 81);\r
+            this.drop_chapterStart.Location = new System.Drawing.Point(321, 58);\r
             this.drop_chapterStart.Name = "drop_chapterStart";\r
             this.drop_chapterStart.Size = new System.Drawing.Size(69, 21);\r
             this.drop_chapterStart.TabIndex = 40;\r
@@ -259,7 +260,7 @@ namespace Handbrake
             this.drp_dvdtitle.FormattingEnabled = true;\r
             this.drp_dvdtitle.Items.AddRange(new object[] {\r
             "Automatic"});\r
-            this.drp_dvdtitle.Location = new System.Drawing.Point(99, 50);\r
+            this.drp_dvdtitle.Location = new System.Drawing.Point(99, 55);\r
             this.drp_dvdtitle.Name = "drp_dvdtitle";\r
             this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);\r
             this.drp_dvdtitle.TabIndex = 39;\r
@@ -295,7 +296,7 @@ namespace Handbrake
             // \r
             this.text_destination.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_destination.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_destination.Location = new System.Drawing.Point(99, 21);\r
+            this.text_destination.Location = new System.Drawing.Point(99, 19);\r
             this.text_destination.Name = "text_destination";\r
             this.text_destination.Size = new System.Drawing.Size(294, 21);\r
             this.text_destination.TabIndex = 4;\r
@@ -321,7 +322,7 @@ namespace Handbrake
             this.text_height.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_height.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.text_height.ForeColor = System.Drawing.SystemColors.InfoText;\r
-            this.text_height.Location = new System.Drawing.Point(191, 87);\r
+            this.text_height.Location = new System.Drawing.Point(196, 58);\r
             this.text_height.Name = "text_height";\r
             this.text_height.Size = new System.Drawing.Size(64, 21);\r
             this.text_height.TabIndex = 8;\r
@@ -332,7 +333,7 @@ namespace Handbrake
             // \r
             this.text_width.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_width.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_width.Location = new System.Drawing.Point(99, 87);\r
+            this.text_width.Location = new System.Drawing.Point(104, 58);\r
             this.text_width.Name = "text_width";\r
             this.text_width.Size = new System.Drawing.Size(64, 21);\r
             this.text_width.TabIndex = 7;\r
@@ -345,7 +346,7 @@ namespace Handbrake
             this.btn_destBrowse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_destBrowse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_destBrowse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_destBrowse.Location = new System.Drawing.Point(399, 21);\r
+            this.btn_destBrowse.Location = new System.Drawing.Point(399, 18);\r
             this.btn_destBrowse.Name = "btn_destBrowse";\r
             this.btn_destBrowse.Size = new System.Drawing.Size(83, 22);\r
             this.btn_destBrowse.TabIndex = 4;\r
@@ -365,7 +366,7 @@ namespace Handbrake
             "H.264",\r
             "H.264 (iPod)",\r
             "H.264 Baseline 1.3"});\r
-            this.drp_videoEncoder.Location = new System.Drawing.Point(99, 54);\r
+            this.drp_videoEncoder.Location = new System.Drawing.Point(104, 25);\r
             this.drp_videoEncoder.Name = "drp_videoEncoder";\r
             this.drp_videoEncoder.Size = new System.Drawing.Size(156, 21);\r
             this.drp_videoEncoder.TabIndex = 5;\r
@@ -383,7 +384,7 @@ namespace Handbrake
             "MP3",\r
             "Vorbis",\r
             "AC3"});\r
-            this.drp_audioCodec.Location = new System.Drawing.Point(371, 53);\r
+            this.drp_audioCodec.Location = new System.Drawing.Point(376, 24);\r
             this.drp_audioCodec.Name = "drp_audioCodec";\r
             this.drp_audioCodec.Size = new System.Drawing.Size(111, 21);\r
             this.drp_audioCodec.TabIndex = 6;\r
@@ -416,6 +417,147 @@ namespace Handbrake
             this.drp_subtitle.Text = "None";\r
             this.ToolTip.SetToolTip(this.drp_subtitle, "Select the subtitle language you require from this dropdown.");\r
             // \r
+            // QueryEditorText\r
+            // \r
+            this.QueryEditorText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.QueryEditorText.Location = new System.Drawing.Point(16, 114);\r
+            this.QueryEditorText.Name = "QueryEditorText";\r
+            this.QueryEditorText.Size = new System.Drawing.Size(605, 104);\r
+            this.QueryEditorText.TabIndex = 41;\r
+            this.QueryEditorText.Text = "";\r
+            this.ToolTip.SetToolTip(this.QueryEditorText, "Manually add or edit a query generated by the GUI.");\r
+            // \r
+            // rtf_h264advanced\r
+            // \r
+            this.rtf_h264advanced.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.rtf_h264advanced.Location = new System.Drawing.Point(16, 79);\r
+            this.rtf_h264advanced.Name = "rtf_h264advanced";\r
+            this.rtf_h264advanced.Size = new System.Drawing.Size(605, 96);\r
+            this.rtf_h264advanced.TabIndex = 41;\r
+            this.rtf_h264advanced.Text = "";\r
+            this.ToolTip.SetToolTip(this.rtf_h264advanced, "H.264 advanced options can be added here. See link below for details.");\r
+            // \r
+            // drp_audioBitrate\r
+            // \r
+            this.drp_audioBitrate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_audioBitrate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audioBitrate.FormattingEnabled = true;\r
+            this.drp_audioBitrate.Items.AddRange(new object[] {\r
+            "32",\r
+            "40",\r
+            "48",\r
+            "56",\r
+            "64",\r
+            "80",\r
+            "86",\r
+            "112",\r
+            "128",\r
+            "160"});\r
+            this.drp_audioBitrate.Location = new System.Drawing.Point(157, 37);\r
+            this.drp_audioBitrate.Name = "drp_audioBitrate";\r
+            this.drp_audioBitrate.Size = new System.Drawing.Size(101, 21);\r
+            this.drp_audioBitrate.TabIndex = 40;\r
+            this.drp_audioBitrate.Text = "128";\r
+            this.ToolTip.SetToolTip(this.drp_audioBitrate, "Set the Audio Bit-Rate");\r
+            // \r
+            // drp_audioSampleRate\r
+            // \r
+            this.drp_audioSampleRate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_audioSampleRate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audioSampleRate.FormattingEnabled = true;\r
+            this.drp_audioSampleRate.Items.AddRange(new object[] {\r
+            "48",\r
+            "44.1",\r
+            "32",\r
+            "24",\r
+            "22.05"});\r
+            this.drp_audioSampleRate.Location = new System.Drawing.Point(157, 67);\r
+            this.drp_audioSampleRate.Name = "drp_audioSampleRate";\r
+            this.drp_audioSampleRate.Size = new System.Drawing.Size(101, 21);\r
+            this.drp_audioSampleRate.TabIndex = 23;\r
+            this.drp_audioSampleRate.Text = "44.1";\r
+            this.ToolTip.SetToolTip(this.drp_audioSampleRate, "Set the Audio Sample Rate");\r
+            // \r
+            // check_largeFile\r
+            // \r
+            this.check_largeFile.AutoSize = true;\r
+            this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_largeFile.Location = new System.Drawing.Point(363, 84);\r
+            this.check_largeFile.Name = "check_largeFile";\r
+            this.check_largeFile.Size = new System.Drawing.Size(172, 17);\r
+            this.check_largeFile.TabIndex = 51;\r
+            this.check_largeFile.Text = "Larger mp4 Files (> 4GB)";\r
+            this.ToolTip.SetToolTip(this.check_largeFile, "Allows creation of mp4 files greater than 4GB.");\r
+            this.check_largeFile.UseVisualStyleBackColor = true;\r
+            this.check_largeFile.Click += new System.EventHandler(this.check_largeFile_CheckedChanged);\r
+            // \r
+            // check_turbo\r
+            // \r
+            this.check_turbo.AutoSize = true;\r
+            this.check_turbo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_turbo.Location = new System.Drawing.Point(363, 61);\r
+            this.check_turbo.Name = "check_turbo";\r
+            this.check_turbo.Size = new System.Drawing.Size(110, 17);\r
+            this.check_turbo.TabIndex = 50;\r
+            this.check_turbo.Text = "Turbo 1st Pass";\r
+            this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");\r
+            this.check_turbo.UseVisualStyleBackColor = true;\r
+            // \r
+            // drp_videoFramerate\r
+            // \r
+            this.drp_videoFramerate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_videoFramerate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_videoFramerate.FormattingEnabled = true;\r
+            this.drp_videoFramerate.Items.AddRange(new object[] {\r
+            "Automatic",\r
+            "5",\r
+            "10",\r
+            "12",\r
+            "15",\r
+            "23.976",\r
+            "24",\r
+            "25",\r
+            "29.97"});\r
+            this.drp_videoFramerate.Location = new System.Drawing.Point(155, 179);\r
+            this.drp_videoFramerate.Name = "drp_videoFramerate";\r
+            this.drp_videoFramerate.Size = new System.Drawing.Size(112, 21);\r
+            this.drp_videoFramerate.TabIndex = 21;\r
+            this.drp_videoFramerate.Text = "Automatic";\r
+            this.ToolTip.SetToolTip(this.drp_videoFramerate, "Can be left to automcatic in most cases.");\r
+            // \r
+            // slider_videoQuality\r
+            // \r
+            this.slider_videoQuality.Location = new System.Drawing.Point(144, 90);\r
+            this.slider_videoQuality.Maximum = 100;\r
+            this.slider_videoQuality.Name = "slider_videoQuality";\r
+            this.slider_videoQuality.Size = new System.Drawing.Size(167, 42);\r
+            this.slider_videoQuality.TabIndex = 6;\r
+            this.slider_videoQuality.TickFrequency = 17;\r
+            this.ToolTip.SetToolTip(this.slider_videoQuality, "Set the quality level of the video. (Around 70% is fine for most)");\r
+            this.slider_videoQuality.Scroll += new System.EventHandler(this.slider_videoQuality_Scroll);\r
+            // \r
+            // text_filesize\r
+            // \r
+            this.text_filesize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.text_filesize.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.text_filesize.Location = new System.Drawing.Point(155, 63);\r
+            this.text_filesize.Name = "text_filesize";\r
+            this.text_filesize.Size = new System.Drawing.Size(156, 21);\r
+            this.text_filesize.TabIndex = 16;\r
+            this.ToolTip.SetToolTip(this.text_filesize, "Set the file size you wish the encoded file to be.");\r
+            this.text_filesize.TextChanged += new System.EventHandler(this.text_filesize_TextChanged);\r
+            // \r
+            // text_bitrate\r
+            // \r
+            this.text_bitrate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.text_bitrate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.text_bitrate.Location = new System.Drawing.Point(155, 36);\r
+            this.text_bitrate.Name = "text_bitrate";\r
+            this.text_bitrate.Size = new System.Drawing.Size(156, 21);\r
+            this.text_bitrate.TabIndex = 15;\r
+            this.ToolTip.SetToolTip(this.text_bitrate, "Set the bitrate of the video");\r
+            this.text_bitrate.TextChanged += new System.EventHandler(this.text_bitrate_TextChanged);\r
+            // \r
             // drp_deInterlace_option\r
             // \r
             this.drp_deInterlace_option.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
@@ -839,7 +981,6 @@ namespace Handbrake
             // GroupBox1\r
             // \r
             this.GroupBox1.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.GroupBox1.Controls.Add(this.lbl_chptWarn);\r
             this.GroupBox1.Controls.Add(this.Label13);\r
             this.GroupBox1.Controls.Add(this.drop_chapterFinish);\r
             this.GroupBox1.Controls.Add(this.drop_chapterStart);\r
@@ -855,26 +996,16 @@ namespace Handbrake
             this.GroupBox1.ForeColor = System.Drawing.Color.Black;\r
             this.GroupBox1.Location = new System.Drawing.Point(14, 35);\r
             this.GroupBox1.Name = "GroupBox1";\r
-            this.GroupBox1.Size = new System.Drawing.Size(647, 116);\r
+            this.GroupBox1.Size = new System.Drawing.Size(647, 98);\r
             this.GroupBox1.TabIndex = 408;\r
             this.GroupBox1.TabStop = false;\r
             this.GroupBox1.Text = "Source";\r
             // \r
-            // lbl_chptWarn\r
-            // \r
-            this.lbl_chptWarn.AutoSize = true;\r
-            this.lbl_chptWarn.Location = new System.Drawing.Point(287, 85);\r
-            this.lbl_chptWarn.Name = "lbl_chptWarn";\r
-            this.lbl_chptWarn.Size = new System.Drawing.Size(77, 13);\r
-            this.lbl_chptWarn.TabIndex = 43;\r
-            this.lbl_chptWarn.Text = "{Warning}";\r
-            this.lbl_chptWarn.Visible = false;\r
-            // \r
             // Label13\r
             // \r
             this.Label13.AutoSize = true;\r
             this.Label13.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label13.Location = new System.Drawing.Point(178, 85);\r
+            this.Label13.Location = new System.Drawing.Point(400, 62);\r
             this.Label13.Name = "Label13";\r
             this.Label13.Size = new System.Drawing.Size(21, 13);\r
             this.Label13.TabIndex = 42;\r
@@ -909,7 +1040,7 @@ namespace Handbrake
             this.Label9.AutoSize = true;\r
             this.Label9.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label9.ForeColor = System.Drawing.Color.Black;\r
-            this.Label9.Location = new System.Drawing.Point(12, 84);\r
+            this.Label9.Location = new System.Drawing.Point(234, 61);\r
             this.Label9.Name = "Label9";\r
             this.Label9.Size = new System.Drawing.Size(64, 13);\r
             this.Label9.TabIndex = 12;\r
@@ -920,43 +1051,40 @@ namespace Handbrake
             this.Label10.AutoSize = true;\r
             this.Label10.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label10.ForeColor = System.Drawing.Color.Black;\r
-            this.Label10.Location = new System.Drawing.Point(12, 56);\r
+            this.Label10.Location = new System.Drawing.Point(12, 61);\r
             this.Label10.Name = "Label10";\r
             this.Label10.Size = new System.Drawing.Size(36, 13);\r
             this.Label10.TabIndex = 11;\r
             this.Label10.Text = "Title:";\r
             // \r
-            // GroupBox4\r
-            // \r
-            this.GroupBox4.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.GroupBox4.Controls.Add(this.Label56);\r
-            this.GroupBox4.Controls.Add(this.lbl_Aspect);\r
-            this.GroupBox4.Controls.Add(this.Label91);\r
-            this.GroupBox4.Controls.Add(this.text_height);\r
-            this.GroupBox4.Controls.Add(this.Label55);\r
-            this.GroupBox4.Controls.Add(this.text_width);\r
-            this.GroupBox4.Controls.Add(this.btn_destBrowse);\r
-            this.GroupBox4.Controls.Add(this.Label3);\r
-            this.GroupBox4.Controls.Add(this.drp_videoEncoder);\r
-            this.GroupBox4.Controls.Add(this.Label47);\r
-            this.GroupBox4.Controls.Add(this.text_destination);\r
-            this.GroupBox4.Controls.Add(this.drp_audioCodec);\r
-            this.GroupBox4.Controls.Add(this.Label12);\r
-            this.GroupBox4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.GroupBox4.ForeColor = System.Drawing.Color.Black;\r
-            this.GroupBox4.Location = new System.Drawing.Point(14, 157);\r
-            this.GroupBox4.Name = "GroupBox4";\r
-            this.GroupBox4.Size = new System.Drawing.Size(647, 126);\r
-            this.GroupBox4.TabIndex = 409;\r
-            this.GroupBox4.TabStop = false;\r
-            this.GroupBox4.Text = "Destination";\r
+            // groupBox_output\r
+            // \r
+            this.groupBox_output.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.groupBox_output.Controls.Add(this.Label56);\r
+            this.groupBox_output.Controls.Add(this.lbl_Aspect);\r
+            this.groupBox_output.Controls.Add(this.Label91);\r
+            this.groupBox_output.Controls.Add(this.text_height);\r
+            this.groupBox_output.Controls.Add(this.Label55);\r
+            this.groupBox_output.Controls.Add(this.text_width);\r
+            this.groupBox_output.Controls.Add(this.drp_videoEncoder);\r
+            this.groupBox_output.Controls.Add(this.Label47);\r
+            this.groupBox_output.Controls.Add(this.drp_audioCodec);\r
+            this.groupBox_output.Controls.Add(this.Label12);\r
+            this.groupBox_output.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.groupBox_output.ForeColor = System.Drawing.Color.Black;\r
+            this.groupBox_output.Location = new System.Drawing.Point(14, 194);\r
+            this.groupBox_output.Name = "groupBox_output";\r
+            this.groupBox_output.Size = new System.Drawing.Size(647, 89);\r
+            this.groupBox_output.TabIndex = 409;\r
+            this.groupBox_output.TabStop = false;\r
+            this.groupBox_output.Text = "Output Settings (Preset: None)";\r
             // \r
             // Label56\r
             // \r
             this.Label56.AutoSize = true;\r
             this.Label56.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label56.ForeColor = System.Drawing.Color.Black;\r
-            this.Label56.Location = new System.Drawing.Point(170, 90);\r
+            this.Label56.Location = new System.Drawing.Point(175, 61);\r
             this.Label56.Name = "Label56";\r
             this.Label56.Size = new System.Drawing.Size(15, 13);\r
             this.Label56.TabIndex = 38;\r
@@ -966,7 +1094,7 @@ namespace Handbrake
             // \r
             this.lbl_Aspect.AutoSize = true;\r
             this.lbl_Aspect.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_Aspect.Location = new System.Drawing.Point(369, 91);\r
+            this.lbl_Aspect.Location = new System.Drawing.Point(374, 62);\r
             this.lbl_Aspect.Name = "lbl_Aspect";\r
             this.lbl_Aspect.Size = new System.Drawing.Size(72, 12);\r
             this.lbl_Aspect.TabIndex = 41;\r
@@ -976,7 +1104,7 @@ namespace Handbrake
             // \r
             this.Label91.AutoSize = true;\r
             this.Label91.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label91.Location = new System.Drawing.Point(265, 91);\r
+            this.Label91.Location = new System.Drawing.Point(270, 62);\r
             this.Label91.Name = "Label91";\r
             this.Label91.Size = new System.Drawing.Size(87, 13);\r
             this.Label91.TabIndex = 40;\r
@@ -987,29 +1115,18 @@ namespace Handbrake
             this.Label55.AutoSize = true;\r
             this.Label55.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label55.ForeColor = System.Drawing.Color.Black;\r
-            this.Label55.Location = new System.Drawing.Point(12, 91);\r
+            this.Label55.Location = new System.Drawing.Point(17, 62);\r
             this.Label55.Name = "Label55";\r
             this.Label55.Size = new System.Drawing.Size(85, 13);\r
             this.Label55.TabIndex = 29;\r
             this.Label55.Text = "Width/Height:";\r
             // \r
-            // Label3\r
-            // \r
-            this.Label3.AutoSize = true;\r
-            this.Label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label3.ForeColor = System.Drawing.Color.Black;\r
-            this.Label3.Location = new System.Drawing.Point(12, 25);\r
-            this.Label3.Name = "Label3";\r
-            this.Label3.Size = new System.Drawing.Size(80, 13);\r
-            this.Label3.TabIndex = 3;\r
-            this.Label3.Text = "Destination: ";\r
-            // \r
             // Label47\r
             // \r
             this.Label47.AutoSize = true;\r
             this.Label47.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label47.ForeColor = System.Drawing.Color.Black;\r
-            this.Label47.Location = new System.Drawing.Point(12, 57);\r
+            this.Label47.Location = new System.Drawing.Point(17, 28);\r
             this.Label47.Name = "Label47";\r
             this.Label47.Size = new System.Drawing.Size(62, 13);\r
             this.Label47.TabIndex = 12;\r
@@ -1020,12 +1137,23 @@ namespace Handbrake
             this.Label12.AutoSize = true;\r
             this.Label12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label12.ForeColor = System.Drawing.Color.Black;\r
-            this.Label12.Location = new System.Drawing.Point(265, 57);\r
+            this.Label12.Location = new System.Drawing.Point(270, 28);\r
             this.Label12.Name = "Label12";\r
             this.Label12.Size = new System.Drawing.Size(94, 13);\r
             this.Label12.TabIndex = 20;\r
             this.Label12.Text = "Audio Encoder:";\r
             // \r
+            // Label3\r
+            // \r
+            this.Label3.AutoSize = true;\r
+            this.Label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label3.ForeColor = System.Drawing.Color.Black;\r
+            this.Label3.Location = new System.Drawing.Point(12, 23);\r
+            this.Label3.Name = "Label3";\r
+            this.Label3.Size = new System.Drawing.Size(80, 13);\r
+            this.Label3.TabIndex = 3;\r
+            this.Label3.Text = "Destination: ";\r
+            // \r
             // lbl_update\r
             // \r
             this.lbl_update.AutoSize = true;\r
@@ -1173,16 +1301,6 @@ namespace Handbrake
             this.GenerateQuery.UseVisualStyleBackColor = true;\r
             this.GenerateQuery.Click += new System.EventHandler(this.GenerateQuery_Click);\r
             // \r
-            // QueryEditorText\r
-            // \r
-            this.QueryEditorText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.QueryEditorText.Location = new System.Drawing.Point(16, 114);\r
-            this.QueryEditorText.Name = "QueryEditorText";\r
-            this.QueryEditorText.Size = new System.Drawing.Size(605, 104);\r
-            this.QueryEditorText.TabIndex = 41;\r
-            this.QueryEditorText.Text = "";\r
-            this.ToolTip.SetToolTip(this.QueryEditorText, "Manually add or edit a query generated by the GUI.");\r
-            // \r
             // h264Tab\r
             // \r
             this.h264Tab.BackColor = System.Drawing.SystemColors.ControlLight;\r
@@ -1253,16 +1371,6 @@ namespace Handbrake
             this.Label90.TabIndex = 42;\r
             this.Label90.Text = "Advanced H.264 Options";\r
             // \r
-            // rtf_h264advanced\r
-            // \r
-            this.rtf_h264advanced.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.rtf_h264advanced.Location = new System.Drawing.Point(16, 79);\r
-            this.rtf_h264advanced.Name = "rtf_h264advanced";\r
-            this.rtf_h264advanced.Size = new System.Drawing.Size(605, 96);\r
-            this.rtf_h264advanced.TabIndex = 41;\r
-            this.rtf_h264advanced.Text = "";\r
-            this.ToolTip.SetToolTip(this.rtf_h264advanced, "H.264 advanced options can be added here. See link below for details.");\r
-            // \r
             // Label92\r
             // \r
             this.Label92.AutoSize = true;\r
@@ -1333,29 +1441,6 @@ namespace Handbrake
             this.drp_audioChannels.TabIndex = 49;\r
             this.drp_audioChannels.Text = "Automatic";\r
             // \r
-            // drp_audioBitrate\r
-            // \r
-            this.drp_audioBitrate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_audioBitrate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_audioBitrate.FormattingEnabled = true;\r
-            this.drp_audioBitrate.Items.AddRange(new object[] {\r
-            "32",\r
-            "40",\r
-            "48",\r
-            "56",\r
-            "64",\r
-            "80",\r
-            "86",\r
-            "112",\r
-            "128",\r
-            "160"});\r
-            this.drp_audioBitrate.Location = new System.Drawing.Point(157, 37);\r
-            this.drp_audioBitrate.Name = "drp_audioBitrate";\r
-            this.drp_audioBitrate.Size = new System.Drawing.Size(101, 21);\r
-            this.drp_audioBitrate.TabIndex = 40;\r
-            this.drp_audioBitrate.Text = "128";\r
-            this.ToolTip.SetToolTip(this.drp_audioBitrate, "Set the Audio Bit-Rate");\r
-            // \r
             // Label14\r
             // \r
             this.Label14.AutoSize = true;\r
@@ -1414,24 +1499,6 @@ namespace Handbrake
             this.Label18.TabIndex = 23;\r
             this.Label18.Text = "Sample Rate (kHz):";\r
             // \r
-            // drp_audioSampleRate\r
-            // \r
-            this.drp_audioSampleRate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_audioSampleRate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_audioSampleRate.FormattingEnabled = true;\r
-            this.drp_audioSampleRate.Items.AddRange(new object[] {\r
-            "48",\r
-            "44.1",\r
-            "32",\r
-            "24",\r
-            "22.05"});\r
-            this.drp_audioSampleRate.Location = new System.Drawing.Point(157, 67);\r
-            this.drp_audioSampleRate.Name = "drp_audioSampleRate";\r
-            this.drp_audioSampleRate.Size = new System.Drawing.Size(101, 21);\r
-            this.drp_audioSampleRate.TabIndex = 23;\r
-            this.drp_audioSampleRate.Text = "44.1";\r
-            this.ToolTip.SetToolTip(this.drp_audioSampleRate, "Set the Audio Sample Rate");\r
-            // \r
             // TabPage3\r
             // \r
             this.TabPage3.BackColor = System.Drawing.SystemColors.ControlLight;\r
@@ -1528,31 +1595,6 @@ namespace Handbrake
             this.Label37.TabIndex = 52;\r
             this.Label37.Text = "Warning: Breaks iPod, @TV, PS3 compatibility.";\r
             // \r
-            // check_largeFile\r
-            // \r
-            this.check_largeFile.AutoSize = true;\r
-            this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_largeFile.Location = new System.Drawing.Point(363, 84);\r
-            this.check_largeFile.Name = "check_largeFile";\r
-            this.check_largeFile.Size = new System.Drawing.Size(172, 17);\r
-            this.check_largeFile.TabIndex = 51;\r
-            this.check_largeFile.Text = "Larger mp4 Files (> 4GB)";\r
-            this.ToolTip.SetToolTip(this.check_largeFile, "Allows creation of mp4 files greater than 4GB.");\r
-            this.check_largeFile.UseVisualStyleBackColor = true;\r
-            this.check_largeFile.Click += new System.EventHandler(this.check_largeFile_CheckedChanged);\r
-            // \r
-            // check_turbo\r
-            // \r
-            this.check_turbo.AutoSize = true;\r
-            this.check_turbo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_turbo.Location = new System.Drawing.Point(363, 61);\r
-            this.check_turbo.Name = "check_turbo";\r
-            this.check_turbo.Size = new System.Drawing.Size(110, 17);\r
-            this.check_turbo.TabIndex = 50;\r
-            this.check_turbo.Text = "Turbo 1st Pass";\r
-            this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");\r
-            this.check_turbo.UseVisualStyleBackColor = true;\r
-            // \r
             // Label23\r
             // \r
             this.Label23.AutoSize = true;\r
@@ -1593,28 +1635,6 @@ namespace Handbrake
             this.SliderValue.TabIndex = 32;\r
             this.SliderValue.Text = "0%";\r
             // \r
-            // drp_videoFramerate\r
-            // \r
-            this.drp_videoFramerate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_videoFramerate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_videoFramerate.FormattingEnabled = true;\r
-            this.drp_videoFramerate.Items.AddRange(new object[] {\r
-            "Automatic",\r
-            "5",\r
-            "10",\r
-            "12",\r
-            "15",\r
-            "23.976",\r
-            "24",\r
-            "25",\r
-            "29.97"});\r
-            this.drp_videoFramerate.Location = new System.Drawing.Point(155, 179);\r
-            this.drp_videoFramerate.Name = "drp_videoFramerate";\r
-            this.drp_videoFramerate.Size = new System.Drawing.Size(112, 21);\r
-            this.drp_videoFramerate.TabIndex = 21;\r
-            this.drp_videoFramerate.Text = "Automatic";\r
-            this.ToolTip.SetToolTip(this.drp_videoFramerate, "Can be left to automcatic in most cases.");\r
-            // \r
             // check_2PassEncode\r
             // \r
             this.check_2PassEncode.AutoSize = true;\r
@@ -1626,28 +1646,6 @@ namespace Handbrake
             this.check_2PassEncode.Text = "2-Pass Encoding";\r
             this.check_2PassEncode.UseVisualStyleBackColor = true;\r
             // \r
-            // slider_videoQuality\r
-            // \r
-            this.slider_videoQuality.Location = new System.Drawing.Point(144, 90);\r
-            this.slider_videoQuality.Maximum = 100;\r
-            this.slider_videoQuality.Name = "slider_videoQuality";\r
-            this.slider_videoQuality.Size = new System.Drawing.Size(167, 42);\r
-            this.slider_videoQuality.TabIndex = 6;\r
-            this.slider_videoQuality.TickFrequency = 17;\r
-            this.ToolTip.SetToolTip(this.slider_videoQuality, "Set the quality level of the video. (Around 70% is fine for most)");\r
-            this.slider_videoQuality.Scroll += new System.EventHandler(this.slider_videoQuality_Scroll);\r
-            // \r
-            // text_filesize\r
-            // \r
-            this.text_filesize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.text_filesize.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_filesize.Location = new System.Drawing.Point(155, 63);\r
-            this.text_filesize.Name = "text_filesize";\r
-            this.text_filesize.Size = new System.Drawing.Size(156, 21);\r
-            this.text_filesize.TabIndex = 16;\r
-            this.ToolTip.SetToolTip(this.text_filesize, "Set the file size you wish the encoded file to be.");\r
-            this.text_filesize.TextChanged += new System.EventHandler(this.text_filesize_TextChanged);\r
-            // \r
             // Label46\r
             // \r
             this.Label46.AutoSize = true;\r
@@ -1668,17 +1666,6 @@ namespace Handbrake
             this.Label40.TabIndex = 27;\r
             this.Label40.Text = "Constant Quality:";\r
             // \r
-            // text_bitrate\r
-            // \r
-            this.text_bitrate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.text_bitrate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_bitrate.Location = new System.Drawing.Point(155, 36);\r
-            this.text_bitrate.Name = "text_bitrate";\r
-            this.text_bitrate.Size = new System.Drawing.Size(156, 21);\r
-            this.text_bitrate.TabIndex = 15;\r
-            this.ToolTip.SetToolTip(this.text_bitrate, "Set the bitrate of the video");\r
-            this.text_bitrate.TextChanged += new System.EventHandler(this.text_bitrate_TextChanged);\r
-            // \r
             // Label42\r
             // \r
             this.Label42.AutoSize = true;\r
@@ -1945,12 +1932,26 @@ namespace Handbrake
             this.advancedOptions.TabIndex = 411;\r
             this.advancedOptions.TabStop = false;\r
             // \r
+            // groupBox_dest\r
+            // \r
+            this.groupBox_dest.Controls.Add(this.Label3);\r
+            this.groupBox_dest.Controls.Add(this.text_destination);\r
+            this.groupBox_dest.Controls.Add(this.btn_destBrowse);\r
+            this.groupBox_dest.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.groupBox_dest.Location = new System.Drawing.Point(14, 138);\r
+            this.groupBox_dest.Name = "groupBox_dest";\r
+            this.groupBox_dest.Size = new System.Drawing.Size(646, 50);\r
+            this.groupBox_dest.TabIndex = 420;\r
+            this.groupBox_dest.TabStop = false;\r
+            this.groupBox_dest.Text = "Destination";\r
+            // \r
             // frmMain\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.ClientSize = new System.Drawing.Size(676, 621);\r
+            this.Controls.Add(this.groupBox_dest);\r
             this.Controls.Add(this.btn_eCancel);\r
             this.Controls.Add(this.lbl_encode);\r
             this.Controls.Add(this.lbl_update);\r
@@ -1958,7 +1959,7 @@ namespace Handbrake
             this.Controls.Add(this.btn_encode);\r
             this.Controls.Add(this.Version);\r
             this.Controls.Add(this.advancedOptions);\r
-            this.Controls.Add(this.GroupBox4);\r
+            this.Controls.Add(this.groupBox_output);\r
             this.Controls.Add(this.GroupBox1);\r
             this.Controls.Add(this.frmMainMenu);\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
@@ -1967,12 +1968,13 @@ namespace Handbrake
             this.Name = "frmMain";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
             this.Text = "Handbrake";\r
+            ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).EndInit();\r
             this.frmMainMenu.ResumeLayout(false);\r
             this.frmMainMenu.PerformLayout();\r
             this.GroupBox1.ResumeLayout(false);\r
             this.GroupBox1.PerformLayout();\r
-            this.GroupBox4.ResumeLayout(false);\r
-            this.GroupBox4.PerformLayout();\r
+            this.groupBox_output.ResumeLayout(false);\r
+            this.groupBox_output.PerformLayout();\r
             this.TabPage6.ResumeLayout(false);\r
             this.TabPage6.PerformLayout();\r
             this.h264Tab.ResumeLayout(false);\r
@@ -1981,10 +1983,11 @@ namespace Handbrake
             this.TabPage2.PerformLayout();\r
             this.TabPage3.ResumeLayout(false);\r
             this.TabPage3.PerformLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).EndInit();\r
             this.TabPage1.ResumeLayout(false);\r
             this.TabPage1.PerformLayout();\r
             this.advancedOptions.ResumeLayout(false);\r
+            this.groupBox_dest.ResumeLayout(false);\r
+            this.groupBox_dest.PerformLayout();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -2036,7 +2039,7 @@ namespace Handbrake
         internal System.Windows.Forms.TextBox text_source;\r
         internal System.Windows.Forms.Label Label9;\r
         internal System.Windows.Forms.Label Label10;\r
-        internal System.Windows.Forms.GroupBox GroupBox4;\r
+        internal System.Windows.Forms.GroupBox groupBox_output;\r
         internal System.Windows.Forms.Label Label56;\r
         internal System.Windows.Forms.Label lbl_Aspect;\r
         internal System.Windows.Forms.Label Label91;\r
@@ -2054,7 +2057,6 @@ namespace Handbrake
         internal System.Windows.Forms.Button btn_queue;\r
         internal System.Windows.Forms.Button btn_encode;\r
         internal System.Windows.Forms.Label Version;\r
-        private System.Windows.Forms.Label lbl_chptWarn;\r
         internal System.Windows.Forms.SaveFileDialog DVD_Save;\r
         private System.Windows.Forms.Label lbl_encode;\r
         internal System.Windows.Forms.Button btn_eCancel;\r
@@ -2148,6 +2150,7 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_DSQ;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_ipodLow;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_ps3;\r
+        private System.Windows.Forms.GroupBox groupBox_dest;\r
 \r
     }\r
 }
\ No newline at end of file
index 15f7e81e642a81ec0cf1315b9c8b6a63b1a89df4..7833bcc10340a96ab1fed6b09ec69701f24597c9 100644 (file)
@@ -162,27 +162,30 @@ namespace Handbrake
             }\r
         }\r
 \r
-        private void updateCheck()\r
+        private int updateCheck()\r
         {\r
-            if (Properties.Settings.Default.updateStatus == "Checked")\r
+            try\r
             {\r
-                try\r
-                {\r
-                    String updateFile = Properties.Settings.Default.updateFile;\r
-                    WebClient client = new WebClient();\r
-                    String data = client.DownloadString(updateFile);\r
-                    String[] versionData = data.Split('\n');\r
+                String updateFile = Properties.Settings.Default.updateFile;\r
+                WebClient client = new WebClient();\r
+                String data = client.DownloadString(updateFile);\r
+                String[] versionData = data.Split('\n');\r
 \r
-                    if ((versionData[0] != Properties.Settings.Default.GuiVersion) || (versionData[1] != Properties.Settings.Default.CliVersion))\r
-                    {\r
-                        lbl_update.Visible = true;\r
-                    }\r
+                if ((versionData[0] != Properties.Settings.Default.GuiVersion) || (versionData[1] != Properties.Settings.Default.CliVersion))\r
+                {\r
+                    lbl_update.Visible = true;\r
+                    return 1;\r
                 }\r
-                catch (Exception)\r
+                else\r
                 {\r
-                    // Silently ignore the error\r
+                    return 0;\r
                 }\r
             }\r
+            catch (Exception)\r
+            {\r
+                // Silently ignore the error\r
+                return 0;\r
+            }\r
         }\r
 \r
         private void quickStart()\r
@@ -371,8 +374,15 @@ namespace Handbrake
 \r
         private void mnu_update_Click(object sender, EventArgs e)\r
         {\r
-            Form Update = new frmUpdate();\r
-            Update.ShowDialog();\r
+            int update = updateCheck();\r
+            if (update == 1)\r
+            {\r
+                MessageBox.Show("There is a new update available. Please visit http://handbrake.m0k.org for details!", "Update Check", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
+            }\r
+            else\r
+            {\r
+                MessageBox.Show("There are no new updates at this time.", "Update Check", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
+            }\r
         }\r
 \r
         private void mnu_exit_Click(object sender, EventArgs e)\r
@@ -451,6 +461,8 @@ namespace Handbrake
             destination = destination.Replace(".m4v", ".mkv");\r
             destination = destination.Replace(".ogm", ".mkv");\r
             text_destination.Text = destination;\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: Animation)";\r
         }\r
 \r
         private void mnu_appleTv_Click(object sender, EventArgs e)\r
@@ -472,6 +484,8 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Unchecked;\r
             drp_audioCodec.Text = "AAC";\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: Apple TV)";\r
         }\r
 \r
         private void mnu_bedlam_Click(object sender, EventArgs e)\r
@@ -501,6 +515,8 @@ namespace Handbrake
             destination = destination.Replace(".m4v", ".mkv");\r
             destination = destination.Replace(".ogm", ".mkv");\r
             text_destination.Text = destination;\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: Bedlam)";\r
         }\r
 \r
         private void mnu_blind_Click(object sender, EventArgs e)\r
@@ -522,6 +538,8 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Unchecked;\r
             drp_audioCodec.Text = "AAC";\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: Blind)";\r
         }\r
 \r
         private void mnu_broke_Click(object sender, EventArgs e)\r
@@ -543,6 +561,8 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Checked;\r
             drp_audioCodec.Text = "AAC";\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: Broke)";\r
         }\r
 \r
         private void mnu_Classic_Click(object sender, EventArgs e)\r
@@ -564,6 +584,8 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Unchecked;\r
             drp_audioCodec.Text = "AAC";\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: Classic)";\r
         }\r
 \r
         private void mnu_CQR_Click(object sender, EventArgs e)\r
@@ -593,6 +615,8 @@ namespace Handbrake
             destination = destination.Replace(".m4v", ".mkv");\r
             destination = destination.Replace(".ogm", ".mkv");\r
             text_destination.Text = destination;\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: CQR)";\r
         }\r
 \r
         private void mnu_DSQ_Click(object sender, EventArgs e)\r
@@ -622,6 +646,8 @@ namespace Handbrake
             destination = destination.Replace(".m4v", ".mkv");\r
             destination = destination.Replace(".ogm", ".mkv");\r
             text_destination.Text = destination;\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: DSQ)";\r
         }\r
 \r
         private void mnu_film_Click(object sender, EventArgs e)\r
@@ -651,6 +677,8 @@ namespace Handbrake
             destination = destination.Replace(".m4v", ".mkv");\r
             destination = destination.Replace(".ogm", ".mkv");\r
             text_destination.Text = destination;\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: Film)";\r
         }\r
 \r
         private void mnu_iphone_Click(object sender, EventArgs e)\r
@@ -672,6 +700,8 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Unchecked;\r
             drp_audioCodec.Text = "AAC";\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: iPhone)";\r
         }\r
 \r
         private void mnu_ipod_Click(object sender, EventArgs e)\r
@@ -693,6 +723,8 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Unchecked;\r
             drp_audioCodec.Text = "AAC";\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: iPod High Rez)";\r
         }\r
 \r
         private void mnu_ipodLow_Click(object sender, EventArgs e)\r
@@ -714,6 +746,8 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Unchecked;\r
             drp_audioCodec.Text = "AAC";\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: iPod Low Rez)";\r
         }\r
 \r
         private void mnu_normal_Click(object sender, EventArgs e)\r
@@ -735,6 +769,8 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Checked;\r
             drp_audioCodec.Text = "AAC";\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: Normal)";\r
         }\r
 \r
         private void mnu_PS3_Click(object sender, EventArgs e)\r
@@ -756,6 +792,8 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Unchecked;\r
             drp_audioCodec.Text = "AAC";\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: PS3)";\r
         }\r
 \r
         private void mnu_psp_Click(object sender, EventArgs e)\r
@@ -777,6 +815,8 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Unchecked;\r
             drp_audioCodec.Text = "AAC";\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: PSP)";\r
         }\r
 \r
         private void mnu_qt_Click(object sender, EventArgs e)\r
@@ -798,6 +838,8 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Checked;\r
             drp_audioCodec.Text = "AAC";\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: Quicktime)";\r
         }\r
 \r
         private void mnu_television_Click(object sender, EventArgs e)\r
@@ -827,6 +869,8 @@ namespace Handbrake
             destination = destination.Replace(".m4v", ".mkv");\r
             destination = destination.Replace(".ogm", ".mkv");\r
             text_destination.Text = destination;\r
+\r
+            groupBox_output.Text = "Output Settings (Preset: Television)";\r
             \r
         }\r
 \r
@@ -1163,7 +1207,7 @@ namespace Handbrake
 \r
         private void drop_chapterStart_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            lbl_chptWarn.Visible = false;\r
+            drop_chapterStart.BackColor = Color.White;\r
             QueryEditorText.Text = "";\r
             if ((drop_chapterFinish.Text != "Auto") && (drop_chapterStart.Text != "Auto"))\r
             {\r
@@ -1174,14 +1218,12 @@ namespace Handbrake
 \r
                     if (chapterFinish < chapterStart)\r
                     {\r
-                        lbl_chptWarn.Visible = true;\r
-                        lbl_chptWarn.Text = "Invalid Chapter Range!";\r
+                        drop_chapterStart.BackColor = Color.LightCoral;\r
                     }\r
                 }\r
                 catch (Exception)\r
                 {\r
-                    lbl_chptWarn.Visible = true;\r
-                    lbl_chptWarn.Text = "Invalid Chapter Range!";\r
+                    drop_chapterStart.BackColor = Color.LightCoral;\r
                 }\r
             }\r
 \r
@@ -1190,7 +1232,7 @@ namespace Handbrake
 \r
         private void drop_chapterFinish_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            lbl_chptWarn.Visible = false;\r
+            drop_chapterFinish.BackColor = Color.White;\r
             QueryEditorText.Text = "";\r
             if ((drop_chapterFinish.Text != "Auto") && (drop_chapterStart.Text != "Auto"))\r
             {\r
@@ -1201,14 +1243,12 @@ namespace Handbrake
 \r
                     if (chapterFinish < chapterStart)\r
                     {\r
-                        lbl_chptWarn.Visible = true;\r
-                        lbl_chptWarn.Text = "Invalid Chapter Range!";\r
+                        drop_chapterFinish.BackColor = Color.LightCoral;\r
                     }\r
                 }\r
                 catch (Exception)\r
                 {\r
-                    lbl_chptWarn.Visible = true;\r
-                    lbl_chptWarn.Text = "Invalid Chapter Range!";\r
+                    drop_chapterFinish.BackColor = Color.LightCoral;\r
                 }\r
             }\r
         }\r
@@ -1945,6 +1985,7 @@ namespace Handbrake
         #endregion\r
 \r
 \r
+\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file