]> granicus.if.org Git - handbrake/commitdiff
WinGui:
authorsr55 <sr55.hb@outlook.com>
Fri, 26 Oct 2007 21:38:04 +0000 (21:38 +0000)
committersr55 <sr55.hb@outlook.com>
Fri, 26 Oct 2007 21:38:04 +0000 (21:38 +0000)
- Reversed the functionality of the show/hide presets button. By default presets always show now.
- Re-added file open / save options and removed presets open/save buttons. Was confusing users.
- Added the ability to modify items on the queue.
- All Presets Updated.
- Queue Threading changed in an attempt to avoid Windows loosing track of it.

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

win/C#/Properties/Settings.Designer.cs
win/C#/Properties/Settings.settings
win/C#/app.config
win/C#/frmMain.Designer.cs
win/C#/frmMain.cs
win/C#/frmMain.resx
win/C#/frmOptions.Designer.cs
win/C#/frmOptions.cs
win/C#/frmQueue.Designer.cs
win/C#/frmQueue.cs

index 041e88149f6ce0a164757ade64d9a893f00ef0ae..7238dc836dfc00deaf9c2aa336152705f69e48f8 100644 (file)
@@ -73,7 +73,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("Checked")]\r
         public string defaultSettings {\r
             get {\r
                 return ((string)(this["defaultSettings"]));\r
@@ -589,12 +589,12 @@ namespace Handbrake.Properties {
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
         [global::System.Configuration.DefaultSettingValueAttribute("")]\r
-        public string showPresets {\r
+        public string hidePresets {\r
             get {\r
-                return ((string)(this["showPresets"]));\r
+                return ((string)(this["hidePresets"]));\r
             }\r
             set {\r
-                this["showPresets"] = value;\r
+                this["hidePresets"] = value;\r
             }\r
         }\r
         \r
index a92bc7c7372c8a3e495e38e8e01056d89fec7ebe..5063e11010c596a7492b8dd0e644732a5b478365 100644 (file)
@@ -15,7 +15,7 @@
       <Value Profile="(Default)">Automatic</Value>\r
     </Setting>\r
     <Setting Name="defaultSettings" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
+      <Value Profile="(Default)">Checked</Value>\r
     </Setting>\r
     <Setting Name="updateStatus" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">Checked</Value>\r
     <Setting Name="BuiltInPresets" Type="System.Collections.Specialized.StringCollection" Scope="User">\r
       <Value Profile="(Default)" />\r
     </Setting>\r
-    <Setting Name="showPresets" Type="System.String" Scope="User">\r
+    <Setting Name="hidePresets" Type="System.String" Scope="User">\r
       <Value Profile="(Default)" />\r
     </Setting>\r
     <Setting Name="selectedPreset" Type="System.String" Scope="User">\r
index 36011680b79ce0dc207deb8f2fad9836fbe5c58b..bfb9526eecc25aac6800819753a6a646945fd9a9 100644 (file)
@@ -20,7 +20,7 @@
                 <value>Automatic</value>\r
             </setting>\r
             <setting name="defaultSettings" serializeAs="String">\r
-                <value />\r
+                <value>Checked</value>\r
             </setting>\r
             <setting name="updateStatus" serializeAs="String">\r
                 <value>Checked</value>\r
             <setting name="CompletionOption" serializeAs="String">\r
                 <value>Do Nothing</value>\r
             </setting>\r
-            <setting name="showPresets" serializeAs="String">\r
+            <setting name="hidePresets" serializeAs="String">\r
                 <value />\r
             </setting>\r
             <setting name="selectedPreset" serializeAs="String">\r
index dba694bc772f552442fda225735d6de425735b41..d91d8fd3691a62bc8866c207001c34f4ed0cfe00 100644 (file)
@@ -61,13 +61,14 @@ namespace Handbrake
             this.btn_presets = new System.Windows.Forms.Button();\r
             this.btn_setDefault = new System.Windows.Forms.Button();\r
             this.ListBox_Presets = new System.Windows.Forms.ListBox();\r
-            this.btn_removePreset = new System.Windows.Forms.Button();\r
-            this.btn_addPreset = new System.Windows.Forms.Button();\r
             this.button1 = new System.Windows.Forms.Button();\r
             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();\r
             this.File_Open = new System.Windows.Forms.OpenFileDialog();\r
             this.ISO_Open = new System.Windows.Forms.OpenFileDialog();\r
             this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_open = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_save = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_exit = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_open3 = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -182,7 +183,6 @@ namespace Handbrake
             this.label25 = new System.Windows.Forms.Label();\r
             this.groupBox_dest = new System.Windows.Forms.GroupBox();\r
             this.groupBox2 = new System.Windows.Forms.GroupBox();\r
-            this.groupBox3 = 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
@@ -197,7 +197,6 @@ namespace Handbrake
             this.tabPage4.SuspendLayout();\r
             this.groupBox_dest.SuspendLayout();\r
             this.groupBox2.SuspendLayout();\r
-            this.groupBox3.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // Label38\r
@@ -212,7 +211,6 @@ namespace Handbrake
             // \r
             // DVD_Save\r
             // \r
-            this.DVD_Save.DefaultExt = "mp4";\r
             this.DVD_Save.Filter = "mp4|*.mp4|m4v|*.m4v|avi|*.avi|ogm|*.ogm|mkv|*.mkv";\r
             // \r
             // File_Save\r
@@ -571,6 +569,7 @@ namespace Handbrake
             this.btn_presets.Text = "Show Presets";\r
             this.ToolTip.SetToolTip(this.btn_presets, "Show or Hide the preset section");\r
             this.btn_presets.UseVisualStyleBackColor = true;\r
+            this.btn_presets.Visible = false;\r
             this.btn_presets.Click += new System.EventHandler(this.btn_presets_Click);\r
             // \r
             // btn_setDefault\r
@@ -580,7 +579,7 @@ namespace Handbrake
             this.btn_setDefault.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_setDefault.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_setDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_setDefault.Location = new System.Drawing.Point(110, 23);\r
+            this.btn_setDefault.Location = new System.Drawing.Point(113, 447);\r
             this.btn_setDefault.Name = "btn_setDefault";\r
             this.btn_setDefault.Size = new System.Drawing.Size(72, 22);\r
             this.btn_setDefault.TabIndex = 107;\r
@@ -615,45 +614,11 @@ namespace Handbrake
             "Television"});\r
             this.ListBox_Presets.Location = new System.Drawing.Point(11, 21);\r
             this.ListBox_Presets.Name = "ListBox_Presets";\r
-            this.ListBox_Presets.Size = new System.Drawing.Size(174, 368);\r
+            this.ListBox_Presets.Size = new System.Drawing.Size(174, 420);\r
             this.ListBox_Presets.TabIndex = 104;\r
             this.ToolTip.SetToolTip(this.ListBox_Presets, "To load a preset, simply click the preset you desire.");\r
             this.ListBox_Presets.SelectedIndexChanged += new System.EventHandler(this.ListBox_Presets_SelectedIndexChanged);\r
             // \r
-            // btn_removePreset\r
-            // \r
-            this.btn_removePreset.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.btn_removePreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_removePreset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_removePreset.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_removePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_removePreset.Location = new System.Drawing.Point(59, 23);\r
-            this.btn_removePreset.Name = "btn_removePreset";\r
-            this.btn_removePreset.Size = new System.Drawing.Size(45, 22);\r
-            this.btn_removePreset.TabIndex = 106;\r
-            this.btn_removePreset.TabStop = false;\r
-            this.btn_removePreset.Text = "Save";\r
-            this.ToolTip.SetToolTip(this.btn_removePreset, "Save the current settings as a preset.");\r
-            this.btn_removePreset.UseVisualStyleBackColor = false;\r
-            this.btn_removePreset.Click += new System.EventHandler(this.btn_removePreset_Click);\r
-            // \r
-            // btn_addPreset\r
-            // \r
-            this.btn_addPreset.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_addPreset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_addPreset.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_addPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_addPreset.Location = new System.Drawing.Point(8, 23);\r
-            this.btn_addPreset.Name = "btn_addPreset";\r
-            this.btn_addPreset.Size = new System.Drawing.Size(45, 22);\r
-            this.btn_addPreset.TabIndex = 105;\r
-            this.btn_addPreset.TabStop = false;\r
-            this.btn_addPreset.Text = "Open";\r
-            this.ToolTip.SetToolTip(this.btn_addPreset, "Open a preset which you have saved.");\r
-            this.btn_addPreset.UseVisualStyleBackColor = false;\r
-            this.btn_addPreset.Click += new System.EventHandler(this.btn_addPreset_Click);\r
-            // \r
             // button1\r
             // \r
             this.button1.BackColor = System.Drawing.SystemColors.ControlLight;\r
@@ -664,7 +629,7 @@ namespace Handbrake
             this.button1.Location = new System.Drawing.Point(16, 78);\r
             this.button1.Name = "button1";\r
             this.button1.Size = new System.Drawing.Size(114, 22);\r
-            this.button1.TabIndex = 109;\r
+            this.button1.TabIndex = 112;\r
             this.button1.TabStop = false;\r
             this.button1.Text = "Test Query Parser";\r
             this.ToolTip.SetToolTip(this.button1, "Open a preset which you have saved.");\r
@@ -674,7 +639,6 @@ namespace Handbrake
             // DVD_Open\r
             // \r
             this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drvie.";\r
-            this.DVD_Open.ShowNewFolderButton = false;\r
             // \r
             // File_Open\r
             // \r
@@ -685,20 +649,49 @@ namespace Handbrake
             // \r
             this.ISO_Open.DefaultExt = "ISO";\r
             this.ISO_Open.Filter = "All Supported Files|*.iso;*.mpg;*.m2t;*.vob;*.ts;*.mpeg;";\r
+            this.ISO_Open.RestoreDirectory = true;\r
             this.ISO_Open.SupportMultiDottedExtensions = true;\r
             // \r
             // FileToolStripMenuItem\r
             // \r
             this.FileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.mnu_open,\r
+            this.mnu_save,\r
+            this.toolStripSeparator2,\r
             this.mnu_exit});\r
             this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";\r
             this.FileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);\r
             this.FileToolStripMenuItem.Text = "&File";\r
             // \r
+            // mnu_open\r
+            // \r
+            this.mnu_open.Image = ((System.Drawing.Image)(resources.GetObject("mnu_open.Image")));\r
+            this.mnu_open.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.mnu_open.Name = "mnu_open";\r
+            this.mnu_open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));\r
+            this.mnu_open.Size = new System.Drawing.Size(185, 22);\r
+            this.mnu_open.Text = "&Open Preset";\r
+            this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click);\r
+            // \r
+            // mnu_save\r
+            // \r
+            this.mnu_save.Image = ((System.Drawing.Image)(resources.GetObject("mnu_save.Image")));\r
+            this.mnu_save.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.mnu_save.Name = "mnu_save";\r
+            this.mnu_save.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));\r
+            this.mnu_save.Size = new System.Drawing.Size(185, 22);\r
+            this.mnu_save.Text = "&Save Preset";\r
+            this.mnu_save.Click += new System.EventHandler(this.mnu_save_Click);\r
+            // \r
+            // toolStripSeparator2\r
+            // \r
+            this.toolStripSeparator2.Name = "toolStripSeparator2";\r
+            this.toolStripSeparator2.Size = new System.Drawing.Size(182, 6);\r
+            // \r
             // mnu_exit\r
             // \r
             this.mnu_exit.Name = "mnu_exit";\r
-            this.mnu_exit.Size = new System.Drawing.Size(152, 22);\r
+            this.mnu_exit.Size = new System.Drawing.Size(185, 22);\r
             this.mnu_exit.Text = "E&xit";\r
             this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);\r
             // \r
@@ -996,7 +989,7 @@ namespace Handbrake
             this.groupBox_output.ForeColor = System.Drawing.Color.Black;\r
             this.groupBox_output.Location = new System.Drawing.Point(14, 185);\r
             this.groupBox_output.Name = "groupBox_output";\r
-            this.groupBox_output.Size = new System.Drawing.Size(647, 82);\r
+            this.groupBox_output.Size = new System.Drawing.Size(647, 85);\r
             this.groupBox_output.TabIndex = 16;\r
             this.groupBox_output.TabStop = false;\r
             this.groupBox_output.Text = "Output Settings (Preset: None)";\r
@@ -1081,7 +1074,7 @@ namespace Handbrake
             this.lbl_update.AutoSize = true;\r
             this.lbl_update.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.lbl_update.ForeColor = System.Drawing.Color.Black;\r
-            this.lbl_update.Location = new System.Drawing.Point(108, 540);\r
+            this.lbl_update.Location = new System.Drawing.Point(108, 543);\r
             this.lbl_update.Name = "lbl_update";\r
             this.lbl_update.Size = new System.Drawing.Size(193, 13);\r
             this.lbl_update.TabIndex = 98;\r
@@ -1095,7 +1088,7 @@ namespace Handbrake
             this.btn_queue.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_queue.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_queue.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_queue.Location = new System.Drawing.Point(414, 535);\r
+            this.btn_queue.Location = new System.Drawing.Point(414, 538);\r
             this.btn_queue.Name = "btn_queue";\r
             this.btn_queue.Size = new System.Drawing.Size(115, 22);\r
             this.btn_queue.TabIndex = 100;\r
@@ -1111,7 +1104,7 @@ namespace Handbrake
             this.btn_encode.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_encode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_encode.Location = new System.Drawing.Point(535, 535);\r
+            this.btn_encode.Location = new System.Drawing.Point(535, 538);\r
             this.btn_encode.Name = "btn_encode";\r
             this.btn_encode.Size = new System.Drawing.Size(124, 22);\r
             this.btn_encode.TabIndex = 101;\r
@@ -1124,7 +1117,7 @@ namespace Handbrake
             // \r
             this.Version.BackColor = System.Drawing.Color.Transparent;\r
             this.Version.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Version.Location = new System.Drawing.Point(11, 540);\r
+            this.Version.Location = new System.Drawing.Point(11, 543);\r
             this.Version.Name = "Version";\r
             this.Version.Size = new System.Drawing.Size(105, 20);\r
             this.Version.TabIndex = 97;\r
@@ -1134,7 +1127,7 @@ namespace Handbrake
             // \r
             this.lbl_encode.AutoSize = true;\r
             this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_encode.Location = new System.Drawing.Point(11, 520);\r
+            this.lbl_encode.Location = new System.Drawing.Point(11, 523);\r
             this.lbl_encode.Name = "lbl_encode";\r
             this.lbl_encode.Size = new System.Drawing.Size(129, 13);\r
             this.lbl_encode.TabIndex = 96;\r
@@ -1149,7 +1142,7 @@ namespace Handbrake
             this.btn_eCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_eCancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_eCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_eCancel.Location = new System.Drawing.Point(343, 535);\r
+            this.btn_eCancel.Location = new System.Drawing.Point(343, 538);\r
             this.btn_eCancel.Name = "btn_eCancel";\r
             this.btn_eCancel.Size = new System.Drawing.Size(65, 22);\r
             this.btn_eCancel.TabIndex = 99;\r
@@ -1172,9 +1165,10 @@ namespace Handbrake
             this.TabPage6.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage6.Name = "TabPage6";\r
             this.TabPage6.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage6.Size = new System.Drawing.Size(639, 211);\r
+            this.TabPage6.Size = new System.Drawing.Size(639, 215);\r
             this.TabPage6.TabIndex = 6;\r
             this.TabPage6.Text = "Query Editor";\r
+            this.TabPage6.UseVisualStyleBackColor = true;\r
             // \r
             // btn_copy\r
             // \r
@@ -1259,9 +1253,10 @@ namespace Handbrake
             this.h264Tab.Location = new System.Drawing.Point(4, 22);\r
             this.h264Tab.Name = "h264Tab";\r
             this.h264Tab.Padding = new System.Windows.Forms.Padding(3);\r
-            this.h264Tab.Size = new System.Drawing.Size(639, 211);\r
+            this.h264Tab.Size = new System.Drawing.Size(639, 215);\r
             this.h264Tab.TabIndex = 5;\r
             this.h264Tab.Text = "H.264";\r
+            this.h264Tab.UseVisualStyleBackColor = true;\r
             // \r
             // Label43\r
             // \r
@@ -1347,9 +1342,10 @@ namespace Handbrake
             this.TabPage2.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage2.Name = "TabPage2";\r
             this.TabPage2.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage2.Size = new System.Drawing.Size(639, 211);\r
+            this.TabPage2.Size = new System.Drawing.Size(639, 215);\r
             this.TabPage2.TabIndex = 3;\r
             this.TabPage2.Text = "Audio && Subtitles";\r
+            this.TabPage2.UseVisualStyleBackColor = true;\r
             // \r
             // Label19\r
             // \r
@@ -1502,9 +1498,10 @@ namespace Handbrake
             this.TabPage3.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage3.Name = "TabPage3";\r
             this.TabPage3.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage3.Size = new System.Drawing.Size(639, 211);\r
+            this.TabPage3.Size = new System.Drawing.Size(639, 215);\r
             this.TabPage3.TabIndex = 2;\r
             this.TabPage3.Text = "Video Settings";\r
+            this.TabPage3.UseVisualStyleBackColor = true;\r
             // \r
             // check_grayscale\r
             // \r
@@ -1629,9 +1626,10 @@ namespace Handbrake
             this.TabPage1.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage1.Name = "TabPage1";\r
             this.TabPage1.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage1.Size = new System.Drawing.Size(639, 211);\r
+            this.TabPage1.Size = new System.Drawing.Size(639, 215);\r
             this.TabPage1.TabIndex = 0;\r
             this.TabPage1.Text = "Picture Settings";\r
+            this.TabPage1.UseVisualStyleBackColor = true;\r
             // \r
             // lbl_anamorphicError\r
             // \r
@@ -1912,7 +1910,7 @@ namespace Handbrake
             this.advancedOptions.Location = new System.Drawing.Point(14, 276);\r
             this.advancedOptions.Name = "advancedOptions";\r
             this.advancedOptions.SelectedIndex = 0;\r
-            this.advancedOptions.Size = new System.Drawing.Size(647, 237);\r
+            this.advancedOptions.Size = new System.Drawing.Size(647, 241);\r
             this.advancedOptions.TabIndex = 27;\r
             this.advancedOptions.TabStop = false;\r
             // \r
@@ -1924,9 +1922,10 @@ namespace Handbrake
             this.tabPage4.Controls.Add(this.button1);\r
             this.tabPage4.Location = new System.Drawing.Point(4, 22);\r
             this.tabPage4.Name = "tabPage4";\r
-            this.tabPage4.Size = new System.Drawing.Size(639, 211);\r
+            this.tabPage4.Size = new System.Drawing.Size(639, 215);\r
             this.tabPage4.TabIndex = 7;\r
             this.tabPage4.Text = "Development";\r
+            this.tabPage4.UseVisualStyleBackColor = true;\r
             // \r
             // label26\r
             // \r
@@ -1935,7 +1934,7 @@ namespace Handbrake
             this.label26.Location = new System.Drawing.Point(13, 35);\r
             this.label26.Name = "label26";\r
             this.label26.Size = new System.Drawing.Size(372, 26);\r
-            this.label26.TabIndex = 130;\r
+            this.label26.TabIndex = 111;\r
             this.label26.Text = "This tab is used for testing of new features. You can ignore this.\r\nIt will not b" +\r
                 "e a user visible tab on release.";\r
             // \r
@@ -1965,37 +1964,23 @@ namespace Handbrake
             // \r
             // groupBox2\r
             // \r
+            this.groupBox2.Controls.Add(this.btn_setDefault);\r
             this.groupBox2.Controls.Add(this.ListBox_Presets);\r
             this.groupBox2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.groupBox2.ForeColor = System.Drawing.Color.Black;\r
             this.groupBox2.Location = new System.Drawing.Point(674, 35);\r
             this.groupBox2.Name = "groupBox2";\r
-            this.groupBox2.Size = new System.Drawing.Size(193, 404);\r
+            this.groupBox2.Size = new System.Drawing.Size(193, 482);\r
             this.groupBox2.TabIndex = 103;\r
             this.groupBox2.TabStop = false;\r
             this.groupBox2.Text = "Presets";\r
             // \r
-            // groupBox3\r
-            // \r
-            this.groupBox3.Controls.Add(this.btn_removePreset);\r
-            this.groupBox3.Controls.Add(this.btn_setDefault);\r
-            this.groupBox3.Controls.Add(this.btn_addPreset);\r
-            this.groupBox3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.groupBox3.ForeColor = System.Drawing.Color.Black;\r
-            this.groupBox3.Location = new System.Drawing.Point(674, 448);\r
-            this.groupBox3.Name = "groupBox3";\r
-            this.groupBox3.Size = new System.Drawing.Size(193, 61);\r
-            this.groupBox3.TabIndex = 108;\r
-            this.groupBox3.TabStop = false;\r
-            this.groupBox3.Text = "Preset Functions";\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(873, 564);\r
-            this.Controls.Add(this.groupBox3);\r
+            this.ClientSize = new System.Drawing.Size(873, 568);\r
             this.Controls.Add(this.btn_presets);\r
             this.Controls.Add(this.groupBox2);\r
             this.Controls.Add(this.groupBox_dest);\r
@@ -2037,7 +2022,6 @@ namespace Handbrake
             this.groupBox_dest.ResumeLayout(false);\r
             this.groupBox_dest.PerformLayout();\r
             this.groupBox2.ResumeLayout(false);\r
-            this.groupBox3.ResumeLayout(false);\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -2047,8 +2031,6 @@ namespace Handbrake
 \r
         internal System.Windows.Forms.SaveFileDialog File_Save;\r
         internal System.Windows.Forms.ToolTip ToolTip;\r
-        internal System.Windows.Forms.OpenFileDialog File_Open;\r
-        internal System.Windows.Forms.OpenFileDialog ISO_Open;\r
         internal System.Windows.Forms.ToolStripMenuItem FileToolStripMenuItem;\r
         internal System.Windows.Forms.ToolStripMenuItem mnu_open3;\r
         internal System.Windows.Forms.ToolStripMenuItem mnu_exit;\r
@@ -2100,7 +2082,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
-        internal System.Windows.Forms.SaveFileDialog DVD_Save;\r
         private System.Windows.Forms.Label lbl_encode;\r
         internal System.Windows.Forms.Button btn_eCancel;\r
         internal System.Windows.Forms.TabPage TabPage6;\r
@@ -2163,7 +2144,6 @@ namespace Handbrake
         internal System.Windows.Forms.TextBox text_left;\r
         internal System.Windows.Forms.TabControl advancedOptions;\r
         internal System.Windows.Forms.Label Label46;\r
-        internal System.Windows.Forms.FolderBrowserDialog DVD_Open;\r
         private System.Windows.Forms.GroupBox groupBox_dest;\r
         internal System.Windows.Forms.ComboBox drp_subtitle;\r
         internal System.Windows.Forms.Label Label19;\r
@@ -2180,8 +2160,6 @@ namespace Handbrake
         private System.Windows.Forms.Label label23;\r
         internal System.Windows.Forms.Button btn_copy;\r
         private System.Windows.Forms.GroupBox groupBox2;\r
-        internal System.Windows.Forms.Button btn_removePreset;\r
-        internal System.Windows.Forms.Button btn_addPreset;\r
         private System.Windows.Forms.ListBox ListBox_Presets;\r
         internal System.Windows.Forms.Button btn_presets;\r
         internal System.Windows.Forms.Button btn_setDefault;\r
@@ -2189,7 +2167,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_SelectDefault;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_UpdateCheck;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;\r
-        private System.Windows.Forms.GroupBox groupBox3;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_quickStart;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;\r
         internal System.Windows.Forms.Button button1;\r
@@ -2197,6 +2174,13 @@ namespace Handbrake
         private System.Windows.Forms.TabPage tabPage4;\r
         internal System.Windows.Forms.Label label26;\r
         internal System.Windows.Forms.Label label25;\r
+        private System.Windows.Forms.SaveFileDialog DVD_Save;\r
+        private System.Windows.Forms.OpenFileDialog File_Open;\r
+        private System.Windows.Forms.OpenFileDialog ISO_Open;\r
+        private System.Windows.Forms.FolderBrowserDialog DVD_Open;\r
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_open;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_save;\r
 \r
     }\r
 }
\ No newline at end of file
index ecfc2680b03ab647aadd77649dc6ac61e695f108..b7aab968a193f07d2dc94f34acceba3d68dc70f5 100644 (file)
@@ -54,10 +54,8 @@ namespace Handbrake
             // Enable or disable tooltips\r
             tooltip();\r
 \r
-            // Hide the presets part of the window\r
-            this.Width = 590;\r
-\r
-            showPresets();\r
+            // Hide the preset bar should the user have the option enabled.\r
+            hidePresetBar();\r
 \r
             /*\r
              * This code can be used for storing preset and preset name information in future versions.\r
@@ -226,12 +224,12 @@ namespace Handbrake
             }\r
         }\r
 \r
-        private void showPresets()\r
+        private void hidePresetBar()\r
         {\r
-            if (Properties.Settings.Default.showPresets == "Checked")\r
+            if (Properties.Settings.Default.hidePresets == "Checked")\r
             {\r
-                btn_presets.Visible = false;\r
-                this.Width = 881;\r
+                btn_presets.Visible = true;\r
+                this.Width = 591;\r
             }\r
 \r
         }\r
@@ -244,6 +242,169 @@ namespace Handbrake
 \r
         #region File Menu\r
 \r
+\r
+\r
+        private void mnu_open_Click(object sender, EventArgs e)\r
+        {\r
+            string filename;\r
+            File_Open.ShowDialog();\r
+            filename = File_Open.FileName;\r
+            if (filename != "")\r
+            {\r
+                try\r
+                {\r
+                    // Create StreamReader & open file\r
+                    StreamReader line = new StreamReader(filename);\r
+                    string temporyLine; // Used for reading the line into a varible before processing on the checkState items below.\r
+\r
+                    // Read in the data and set the correct GUI component with the setting.\r
+                    text_source.Text = line.ReadLine();\r
+                    drp_dvdtitle.Text = line.ReadLine();\r
+                    drop_chapterStart.Text = line.ReadLine();\r
+                    drop_chapterFinish.Text = line.ReadLine();\r
+                    text_destination.Text = line.ReadLine();\r
+                    drp_videoEncoder.Text = line.ReadLine();\r
+                    drp_audioCodec.Text = line.ReadLine();\r
+                    text_width.Text = line.ReadLine();\r
+                    text_height.Text = line.ReadLine();\r
+                    text_top.Text = line.ReadLine();\r
+                    text_bottom.Text = line.ReadLine();\r
+                    text_left.Text = line.ReadLine();\r
+                    text_right.Text = line.ReadLine();\r
+                    drp_subtitle.Text = line.ReadLine();\r
+                    text_bitrate.Text = line.ReadLine();\r
+                    text_filesize.Text = line.ReadLine();\r
+                    slider_videoQuality.Value = int.Parse(line.ReadLine());\r
+\r
+                    temporyLine = line.ReadLine();\r
+                    if (temporyLine == "Checked")\r
+                    {\r
+                        check_2PassEncode.CheckState = CheckState.Checked;\r
+                    }\r
+\r
+                    drp_deInterlace_option.Text = line.ReadLine();\r
+\r
+                    temporyLine = line.ReadLine();\r
+                    if (temporyLine == "Checked")\r
+                    {\r
+                        check_grayscale.CheckState = CheckState.Checked;\r
+                    }\r
+\r
+                    drp_videoFramerate.Text = line.ReadLine();\r
+\r
+                    temporyLine = line.ReadLine();\r
+                    if (temporyLine == "Checked")\r
+                    {\r
+                        Check_ChapterMarkers.CheckState = CheckState.Checked;\r
+                    }\r
+\r
+                    temporyLine = line.ReadLine();\r
+                    if (temporyLine == "Checked")\r
+                    {\r
+                        CheckPixelRatio.CheckState = CheckState.Checked;\r
+                    }\r
+\r
+                    temporyLine = line.ReadLine();\r
+                    if (temporyLine == "Checked")\r
+                    {\r
+                        check_turbo.CheckState = CheckState.Checked;\r
+                    }\r
+\r
+                    temporyLine = line.ReadLine();\r
+                    if (temporyLine == "Checked")\r
+                    {\r
+                        check_largeFile.CheckState = CheckState.Checked;\r
+                    }\r
+\r
+                    drp_audioBitrate.Text = line.ReadLine();\r
+                    drp_audioSampleRate.Text = line.ReadLine();\r
+                    drp_audioChannels.Text = line.ReadLine();\r
+                    drp_audioMixDown.Text = line.ReadLine();\r
+\r
+                    // Advanced H264 Options\r
+                    temporyLine = line.ReadLine();\r
+                    if (temporyLine == "Checked")\r
+                    {\r
+                        CheckCRF.CheckState = CheckState.Checked;\r
+                    }\r
+                    rtf_h264advanced.Text = line.ReadLine();\r
+\r
+                    // Close the stream\r
+                    line.Close();\r
+\r
+\r
+                    // Fix for SliderValue not appearing when Opening saved file\r
+                    SliderValue.Text = slider_videoQuality.Value + "%";\r
+\r
+                }\r
+                catch (Exception)\r
+                {\r
+                    MessageBox.Show("Unable to load profile.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+                }\r
+            }\r
+        }\r
+\r
+        private void mnu_save_Click(object sender, EventArgs e)\r
+        {\r
+            string filename;\r
+            File_Save.ShowDialog();\r
+            filename = File_Save.FileName;\r
+            if (filename != "")\r
+            {\r
+                try\r
+                {\r
+                    // Create a StreamWriter and open the file\r
+                    StreamWriter line = new StreamWriter(filename);\r
+\r
+                    //Source\r
+                    line.WriteLine(text_source.Text);\r
+                    line.WriteLine(drp_dvdtitle.Text);\r
+                    line.WriteLine(drop_chapterStart.Text);\r
+                    line.WriteLine(drop_chapterFinish.Text);\r
+                    //Destination\r
+                    line.WriteLine(text_destination.Text);\r
+                    line.WriteLine(drp_videoEncoder.Text);\r
+                    line.WriteLine(drp_audioCodec.Text);\r
+                    line.WriteLine(text_width.Text);\r
+                    line.WriteLine(text_height.Text);\r
+                    //Picture Settings Tab\r
+                    line.WriteLine(text_top.Text);\r
+                    line.WriteLine(text_bottom.Text);\r
+                    line.WriteLine(text_left.Text);\r
+                    line.WriteLine(text_right.Text);\r
+                    line.WriteLine(drp_subtitle.Text);\r
+                    //Video Settings Tab\r
+                    line.WriteLine(text_bitrate.Text);\r
+                    line.WriteLine(text_filesize.Text);\r
+                    line.WriteLine(slider_videoQuality.Value.ToString());\r
+                    line.WriteLine(check_2PassEncode.CheckState.ToString());\r
+                    line.WriteLine(drp_deInterlace_option.Text);\r
+                    line.WriteLine(check_grayscale.CheckState.ToString());\r
+                    line.WriteLine(drp_videoFramerate.Text);\r
+                    line.WriteLine(Check_ChapterMarkers.CheckState.ToString());\r
+                    line.WriteLine(CheckPixelRatio.CheckState.ToString());\r
+                    line.WriteLine(check_turbo.CheckState.ToString());\r
+                    line.WriteLine(check_largeFile.CheckState.ToString());\r
+                    //Audio Settings Tab\r
+                    line.WriteLine(drp_audioBitrate.Text);\r
+                    line.WriteLine(drp_audioSampleRate.Text);\r
+                    line.WriteLine(drp_audioChannels.Text);\r
+                    line.WriteLine(drp_audioMixDown.Text);\r
+                    //H264 Tab\r
+                    line.WriteLine(CheckCRF.CheckState.ToString());\r
+                    line.WriteLine(rtf_h264advanced.Text);\r
+                    // close the stream\r
+                    line.Close();\r
+                    MessageBox.Show("Your profile has been sucessfully saved.", "Status", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
+                }\r
+                catch (Exception)\r
+                {\r
+                    MessageBox.Show("Unable to write to the file. Please make sure the location has the correct permissions for file writing.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+                }\r
+\r
+            }\r
+        }\r
+\r
         private void mnu_exit_Click(object sender, EventArgs e)\r
         {\r
             Application.Exit();\r
@@ -381,7 +542,8 @@ namespace Handbrake
         {\r
             String filename = ""; \r
                    text_source.Text = "";\r
-            frmDvdInfo dvdInfoWindow = new frmDvdInfo();                \r
+            frmDvdInfo dvdInfoWindow = new frmDvdInfo();\r
+        \r
                    if (RadioDVD.Checked) \r
                    { \r
                        DVD_Open.ShowDialog(); \r
@@ -456,6 +618,7 @@ namespace Handbrake
 \r
         private void btn_queue_Click(object sender, EventArgs e)\r
         {\r
+          \r
             if (text_source.Text == "" || text_source.Text == "Click 'Browse' to continue" || text_destination.Text == "")\r
                 MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             else\r
@@ -473,7 +636,7 @@ namespace Handbrake
                 queueWindow.Show();\r
             } \r
         }\r
-\r
\r
         private void btn_copy_Click(object sender, EventArgs e)\r
         {\r
             if (QueryEditorText.Text != "")\r
@@ -514,167 +677,6 @@ namespace Handbrake
 \r
         }\r
 \r
-        private void btn_addPreset_Click(object sender, EventArgs e)\r
-        {\r
-            string filename;\r
-            File_Open.ShowDialog();\r
-            filename = File_Open.FileName;\r
-            if (filename != "")\r
-            {\r
-                try\r
-                {\r
-                    // Create StreamReader & open file\r
-                    StreamReader line = new StreamReader(filename);\r
-                    string temporyLine; // Used for reading the line into a varible before processing on the checkState items below.\r
-\r
-                    // Read in the data and set the correct GUI component with the setting.\r
-                    text_source.Text = line.ReadLine();\r
-                    drp_dvdtitle.Text = line.ReadLine();\r
-                    drop_chapterStart.Text = line.ReadLine();\r
-                    drop_chapterFinish.Text = line.ReadLine();\r
-                    text_destination.Text = line.ReadLine();\r
-                    drp_videoEncoder.Text = line.ReadLine();\r
-                    drp_audioCodec.Text = line.ReadLine();\r
-                    text_width.Text = line.ReadLine();\r
-                    text_height.Text = line.ReadLine();\r
-                    text_top.Text = line.ReadLine();\r
-                    text_bottom.Text = line.ReadLine();\r
-                    text_left.Text = line.ReadLine();\r
-                    text_right.Text = line.ReadLine();\r
-                    drp_subtitle.Text = line.ReadLine();\r
-                    text_bitrate.Text = line.ReadLine();\r
-                    text_filesize.Text = line.ReadLine();\r
-                    slider_videoQuality.Value = int.Parse(line.ReadLine());\r
-\r
-                    temporyLine = line.ReadLine();\r
-                    if (temporyLine == "Checked")\r
-                    {\r
-                        check_2PassEncode.CheckState = CheckState.Checked;\r
-                    }\r
-\r
-                    drp_deInterlace_option.Text = line.ReadLine();\r
-\r
-                    temporyLine = line.ReadLine();\r
-                    if (temporyLine == "Checked")\r
-                    {\r
-                        check_grayscale.CheckState = CheckState.Checked;\r
-                    }\r
-\r
-                    drp_videoFramerate.Text = line.ReadLine();\r
-\r
-                    temporyLine = line.ReadLine();\r
-                    if (temporyLine == "Checked")\r
-                    {\r
-                        Check_ChapterMarkers.CheckState = CheckState.Checked;\r
-                    }\r
-\r
-                    temporyLine = line.ReadLine();\r
-                    if (temporyLine == "Checked")\r
-                    {\r
-                        CheckPixelRatio.CheckState = CheckState.Checked;\r
-                    }\r
-\r
-                    temporyLine = line.ReadLine();\r
-                    if (temporyLine == "Checked")\r
-                    {\r
-                        check_turbo.CheckState = CheckState.Checked;\r
-                    }\r
-\r
-                    temporyLine = line.ReadLine();\r
-                    if (temporyLine == "Checked")\r
-                    {\r
-                        check_largeFile.CheckState = CheckState.Checked;\r
-                    }\r
-\r
-                    drp_audioBitrate.Text = line.ReadLine();\r
-                    drp_audioSampleRate.Text = line.ReadLine();\r
-                    drp_audioChannels.Text = line.ReadLine();\r
-                    drp_audioMixDown.Text = line.ReadLine();\r
-\r
-                    // Advanced H264 Options\r
-                    temporyLine = line.ReadLine();\r
-                    if (temporyLine == "Checked")\r
-                    {\r
-                        CheckCRF.CheckState = CheckState.Checked;\r
-                    }\r
-                    rtf_h264advanced.Text = line.ReadLine();\r
-\r
-                    // Close the stream\r
-                    line.Close();\r
-\r
-\r
-                    // Fix for SliderValue not appearing when Opening saved file\r
-                    SliderValue.Text = slider_videoQuality.Value + "%";\r
-\r
-                }\r
-                catch (Exception)\r
-                {\r
-                    MessageBox.Show("Unable to load profile.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
-                }\r
-            }\r
-        }\r
-\r
-        private void btn_removePreset_Click(object sender, EventArgs e)\r
-        {\r
-            string filename;\r
-            File_Save.ShowDialog();\r
-            filename = File_Save.FileName;\r
-            if (filename != "")\r
-            {\r
-                try\r
-                {\r
-                    // Create a StreamWriter and open the file\r
-                    StreamWriter line = new StreamWriter(filename);\r
-\r
-                    //Source\r
-                    line.WriteLine(text_source.Text);\r
-                    line.WriteLine(drp_dvdtitle.Text);\r
-                    line.WriteLine(drop_chapterStart.Text);\r
-                    line.WriteLine(drop_chapterFinish.Text);\r
-                    //Destination\r
-                    line.WriteLine(text_destination.Text);\r
-                    line.WriteLine(drp_videoEncoder.Text);\r
-                    line.WriteLine(drp_audioCodec.Text);\r
-                    line.WriteLine(text_width.Text);\r
-                    line.WriteLine(text_height.Text);\r
-                    //Picture Settings Tab\r
-                    line.WriteLine(text_top.Text);\r
-                    line.WriteLine(text_bottom.Text);\r
-                    line.WriteLine(text_left.Text);\r
-                    line.WriteLine(text_right.Text);\r
-                    line.WriteLine(drp_subtitle.Text);\r
-                    //Video Settings Tab\r
-                    line.WriteLine(text_bitrate.Text);\r
-                    line.WriteLine(text_filesize.Text);\r
-                    line.WriteLine(slider_videoQuality.Value.ToString());\r
-                    line.WriteLine(check_2PassEncode.CheckState.ToString());\r
-                    line.WriteLine(drp_deInterlace_option.Text);\r
-                    line.WriteLine(check_grayscale.CheckState.ToString());\r
-                    line.WriteLine(drp_videoFramerate.Text);\r
-                    line.WriteLine(Check_ChapterMarkers.CheckState.ToString());\r
-                    line.WriteLine(CheckPixelRatio.CheckState.ToString());\r
-                    line.WriteLine(check_turbo.CheckState.ToString());\r
-                    line.WriteLine(check_largeFile.CheckState.ToString());\r
-                    //Audio Settings Tab\r
-                    line.WriteLine(drp_audioBitrate.Text);\r
-                    line.WriteLine(drp_audioSampleRate.Text);\r
-                    line.WriteLine(drp_audioChannels.Text);\r
-                    line.WriteLine(drp_audioMixDown.Text);\r
-                    //H264 Tab\r
-                    line.WriteLine(CheckCRF.CheckState.ToString());\r
-                    line.WriteLine(rtf_h264advanced.Text);\r
-                    // close the stream\r
-                    line.Close();\r
-                    MessageBox.Show("Your profile has been sucessfully saved.", "Status", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
-                }\r
-                catch (Exception)\r
-                {\r
-                    MessageBox.Show("Unable to write to the file. Please make sure the location has the correct permissions for file writing.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
-                }\r
-\r
-            }\r
-        }\r
-\r
         private void btn_setDefault_Click(object sender, EventArgs e)\r
         {\r
             //Source\r
@@ -731,6 +733,7 @@ namespace Handbrake
         // Preset Seleciton\r
         private void ListBox_Presets_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
+            \r
             string selectedPreset = null;\r
             if (ListBox_Presets.SelectedItem != null)\r
             {\r
@@ -743,59 +746,78 @@ namespace Handbrake
 \r
             switch (selectedPreset)\r
             {\r
+                //(anamorphic, width, height, vencoder, bitrate, filesize, quality, qpercent, audioBit, chpt, audioSample, h264, deinterlace, twopass, crop, turbo, audioCodec, preset\r
+\r
                 case "Animation":\r
                     setGuiSetttings(CheckState.Checked, "", "", "H.264", "1000", "", 0, "0%", "160", CheckState.Checked, "48", "ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2", "Origional (Fast)", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Apple Animation)");\r
                     setMkv();\r
                     break;\r
+\r
                 case "AppleTV":\r
-                    setGuiSetttings(CheckState.Checked, "", "", "H.264", "2500", "", 0, "0%", "160", CheckState.Checked, "48", "bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=2", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: Apple TV)");\r
+                    setGuiSetttings(CheckState.Checked, "", "", "H.264", "2500", "", 0, "0%", "160", CheckState.Checked, "48", "bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=2:cabac=0", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: Apple TV)");\r
                     break;\r
+                \r
                 case "Bedlam":\r
-                    setGuiSetttings(CheckState.Checked, "", "", "H.264", "1800", "", 0, "0%", "160", CheckState.Checked, "48", "ref=16:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:me-range=64:analyse=all:8x8dct:trellis=2:no-fast-pskip:no-dct-decimate:filter=-2,-1", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Bedlam)");\r
+                    setGuiSetttings(CheckState.Checked, "", "", "H.264", "1800", "", 0, "0%", "160", CheckState.Checked, "48", "ref=16:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:me-range=64:analyse=all:8x8dct:trellis=2:no-fast-pskip:no-dct-decimate:filter=-2,-1", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AC3", "Output Settings (Preset: Bedlam)");\r
                     setMkv();\r
                     break;\r
+\r
                 case "Blind":\r
-                    setGuiSetttings(CheckState.Unchecked, "512", "", "H.264", "512", "", 0, "0%", "128", CheckState.Checked, "48", "", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: Blind)");\r
+                    setGuiSetttings(CheckState.Unchecked, "512", "", "Mpeg 4", "512", "", 0, "0%", "128", CheckState.Checked, "48", "", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: Blind)");\r
                     break;\r
+\r
                 case "Broke":\r
                     setGuiSetttings(CheckState.Unchecked, "640", "", "H.264", "", "695", 0, "0%", "128", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:b-pyramid::direct=auto:me=umh:subme=6:trellis=1:analyse=all:8x8dct:no-fast-pskip", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Broke)");\r
                     break;\r
+\r
                 case "Classic":\r
-                    setGuiSetttings(CheckState.Unchecked, "", "", "H.264", "1000", "", 0, "0%", "160", CheckState.Unchecked, "48", "", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: Classic)");\r
+                    setGuiSetttings(CheckState.Unchecked, "", "", "Mpeg 4", "1000", "", 0, "0%", "160", CheckState.Unchecked, "48", "", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: Classic)");\r
                     break;\r
+\r
                 case "Constant Quality Rate":\r
                     setGuiSetttings(CheckState.Checked, "", "", "H.264", "", "", 64, "64%", "160", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:subme=6:trellis=1:analyse=all:8x8dct:me=umh", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AC3", "Output Settings (Preset: CQR)");\r
                     setMkv();\r
                     break;\r
+\r
                 case "Deux Six Quatre":\r
                     setGuiSetttings(CheckState.Checked, "", "", "H.264", "1600", "", 0, "0%", "160", CheckState.Checked, "48", "ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AC3", "Output Settings (Preset: DSQ)");\r
                     setMkv();\r
                     break;\r
+\r
                 case "Film":\r
                     setGuiSetttings(CheckState.Checked, "", "", "H.264", "2000", "", 0, "0%", "160", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=6:analyse=all:8x8dct:trellis=1:no-fast-pskip", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AC3", "Output Settings (Preset: Film)");\r
                     setMkv();\r
                     break;\r
+\r
                 case "iPhone / iPod Touch":\r
                     setGuiSetttings(CheckState.Unchecked, "480", "", "H.264 (iPod)", "960", "", 0, "0%", "128", CheckState.Checked, "48", "cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: iPhone)");\r
                     break;\r
+\r
                 case "iPod High-Rez":\r
                     setGuiSetttings(CheckState.Unchecked, "640", "", "H.264 (iPod)", "1500", "", 0, "0%", "160", CheckState.Checked, "48", "keyint=300:keyint-min=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: iPod High Rez)");\r
                     break;\r
+\r
                 case "iPod Low-Rez":\r
                     setGuiSetttings(CheckState.Unchecked, "320", "", "H.264 (iPod)", "700", "", 0, "0%", "160", CheckState.Checked, "48", "keyint=300:keyint-min=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: iPod Low Rez)");\r
                     break;\r
+                \r
                 case "Normal":\r
                     setGuiSetttings(CheckState.Checked, "", "", "H.264", "1500", "", 0, "0%", "160", CheckState.Checked, "48", "ref=2:bframes=2:subme=5:me=umh", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Normal)");\r
                     break;\r
+               \r
                 case "PS3":\r
                     setGuiSetttings(CheckState.Checked, "", "", "H.264", "2500", "", 0, "0%", "160", CheckState.Checked, "48", "level=41:subme=5:me=umh", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: PS3)");\r
                     break;\r
+                \r
                 case "PSP":\r
-                    setGuiSetttings(CheckState.Unchecked, "368", "208", "Mpeg 4", "1024", "", 0, "0%", "160", CheckState.Unchecked, "48", "", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: PSP)");\r
+                    setGuiSetttings(CheckState.Unchecked, "368", "208", "Mpeg 4", "1024", "", 0, "0%", "160", CheckState.Checked, "48", "", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: PSP)");\r
                     break;\r
+               \r
                 case "QuickTime":\r
-                    setGuiSetttings(CheckState.Checked, "", "", "H.264", "2000", "", 0, "0%", "160", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct-auto:me=umh:subme=5:analyse=all:8x8dct:trellis=1:no-fast-pskip", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Quicktime)");\r
+                    setGuiSetttings(CheckState.Checked, "", "", "H.264", "2000", "", 0, "0%", "160", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:subme=5:analyse=all:8x8dct:trellis=1:no-fast-pskip", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Quicktime)");\r
                     break;\r
+\r
+                \r
                 case "Television":\r
                     setGuiSetttings(CheckState.Unchecked, "", "", "H.264", "1300", "", 0, "0%", "160", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:subme=6:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip", "Origional (Fast)", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Television)");\r
                     setMkv();\r
@@ -1815,6 +1837,9 @@ namespace Handbrake
             MessageBox.Show(thisQuery.DeTelecine.ToString());\r
         }\r
 \r
\r
+\r
+\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }\r
index 85613869166836050b0bffe9112ec81c46d64de8..f8feed8cd38de2621841355a85c8c358862425f6 100644 (file)
   <metadata name="ISO_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>432, 15</value>\r
   </metadata>\r
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
+  <data name="mnu_open.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+    <value>\r
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I\r
+        k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC\r
+        TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p\r
+        AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0\r
+        BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr\r
+        UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG\r
+        CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5\r
+        F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS\r
+        rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt\r
+        NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp\r
+        59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W\r
+        AAAAAElFTkSuQmCC\r
+</value>\r
+  </data>\r
+  <data name="mnu_save.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+    <value>\r
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAixJREFUOE+tk91L\r
+        k3EUx/cvdN9N0EW3NTWGa7EaPOUcyqphWBG9PZEv5dJlmqhYmUYtXyBb4dJJy+kknFT4BqZIjaFMJUsz\r
+        V7TEoabYRDD49ju/6Pm1Mi+iH5zLz+c855zvo1L9j/fsaRRUvvZltHmX8Ni9gMaGCO47ZlBb8wn22yHc\r
+        KJ9CackECgteIy93FBfOB6H0JrC3B6ipXsVGb2V1Dca0XhxOe8JLEXhbF7mgsuLLX3mCIwsr2G1+DrVa\r
+        huWQRwjcj+a5oLTk87qCn/D78CLiTD4UXJ7GAXOTEDjrZ7ngku3dH4Jf4ZHJCLZJXlhzxpGa4hSCurth\r
+        LsjOGo0R/A4PBsPYrHdDlgMwmRxCUF31kQvkMwFFsB7c4/+ATYkNOHL0BZKSaoXgZuU0urvATgkcP/kK\r
+        lmMDfNu0MJqZPps6/4D7cNDSCUmyC8HVskl0+MAyADS5vrG7f0X59Tm+VFoYzZyZEVTg5NR2GAwVQnCl\r
+        cByeZuChc40FJwpjek5MmU/YkH6uiHdOTmHwfg/0+jIhsOWNMRiouhPlnUnAQoI4rYSht7MYm5qDnHsN\r
+        e41tHNbucUGnKxICiqXjHpTPJgHBZ/Nv4U1oHqGZJVwstiNe72JwI+J3PYA2MV8IMjOG2dzLfOatBg+2\r
+        7JDQ0tEPX9cguvv8GHg5hH0mC9S6eiQweLumDhqNVQgo06dP9fN4UsIoJHRnOhVtmxZGM1NXKoJ3JmTH\r
+        Cv71r/4OTrQ4xWMwWlcAAAAASUVORK5CYII=\r
+</value>\r
+  </data>\r
   <metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>94, 17</value>\r
   </metadata>\r
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>56</value>\r
   </metadata>\r
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA\r
index 460a775709f149fcd6d72caf32f6753b0264df01..df13a4ac58e8aa5f634c19edde0999f70133800c 100644 (file)
@@ -92,9 +92,9 @@ namespace Handbrake
             this.check_showPreset.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.check_showPreset.Location = new System.Drawing.Point(15, 94);\r
             this.check_showPreset.Name = "check_showPreset";\r
-            this.check_showPreset.Size = new System.Drawing.Size(362, 17);\r
+            this.check_showPreset.Size = new System.Drawing.Size(115, 17);\r
             this.check_showPreset.TabIndex = 50;\r
-            this.check_showPreset.Text = "Always Show Presets (Hide\'s the Show/Hide preset button)";\r
+            this.check_showPreset.Text = "Hide Preset Bar";\r
             this.check_showPreset.UseVisualStyleBackColor = true;\r
             this.check_showPreset.CheckedChanged += new System.EventHandler(this.check_showPreset_CheckedChanged);\r
             // \r
index fe54d22a50c13b4f58295608644f0007def0537b..5451d6f9bca090dcf5d15904bc73df90ed21ae8e 100644 (file)
@@ -44,7 +44,7 @@ namespace Handbrake
                 check_tooltip.CheckState = CheckState.Checked;\r
             }\r
 \r
-            if (Properties.Settings.Default.showPresets == "Checked")\r
+            if (Properties.Settings.Default.hidePresets == "Checked")\r
             {\r
                 check_showPreset.CheckState = CheckState.Checked;\r
             }\r
@@ -98,7 +98,7 @@ namespace Handbrake
 \r
         private void check_showPreset_CheckedChanged(object sender, EventArgs e)\r
         {\r
-            Properties.Settings.Default.showPresets = check_showPreset.CheckState.ToString();\r
+            Properties.Settings.Default.hidePresets = check_showPreset.CheckState.ToString();\r
         }  \r
  \r
 \r
index 1c809e18e458d11b6d5665f80eb279b6c2dc0246..7a26c87753ac068d70929eb8e94aeb11fdaecaca 100644 (file)
@@ -45,7 +45,12 @@ namespace Handbrake
             this.btn_cancel = new System.Windows.Forms.Button();\r
             this.lbl_status = new System.Windows.Forms.Label();\r
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);\r
+            this.text_edit = new System.Windows.Forms.TextBox();\r
+            this.label4 = new System.Windows.Forms.Label();\r
+            this.btn_updateQuery = new System.Windows.Forms.Button();\r
+            this.groupBox1 = new System.Windows.Forms.GroupBox();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();\r
+            this.groupBox1.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // btn_down\r
@@ -55,7 +60,7 @@ namespace Handbrake
             this.btn_down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_down.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_down.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_down.Location = new System.Drawing.Point(650, 144);\r
+            this.btn_down.Location = new System.Drawing.Point(656, 91);\r
             this.btn_down.Name = "btn_down";\r
             this.btn_down.Size = new System.Drawing.Size(64, 22);\r
             this.btn_down.TabIndex = 33;\r
@@ -71,7 +76,7 @@ namespace Handbrake
             this.btn_up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_up.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_up.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_up.Location = new System.Drawing.Point(649, 116);\r
+            this.btn_up.Location = new System.Drawing.Point(655, 63);\r
             this.btn_up.Name = "btn_up";\r
             this.btn_up.Size = new System.Drawing.Size(64, 22);\r
             this.btn_up.TabIndex = 32;\r
@@ -87,7 +92,7 @@ namespace Handbrake
             this.btn_delete.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_delete.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_delete.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_delete.Location = new System.Drawing.Point(650, 190);\r
+            this.btn_delete.Location = new System.Drawing.Point(656, 137);\r
             this.btn_delete.Name = "btn_delete";\r
             this.btn_delete.Size = new System.Drawing.Size(64, 22);\r
             this.btn_delete.TabIndex = 31;\r
@@ -103,7 +108,7 @@ namespace Handbrake
             this.btn_q_encoder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_q_encoder.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_q_encoder.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_q_encoder.Location = new System.Drawing.Point(13, 302);\r
+            this.btn_q_encoder.Location = new System.Drawing.Point(10, 366);\r
             this.btn_q_encoder.Name = "btn_q_encoder";\r
             this.btn_q_encoder.Size = new System.Drawing.Size(124, 22);\r
             this.btn_q_encoder.TabIndex = 29;\r
@@ -115,12 +120,13 @@ namespace Handbrake
             // list_queue\r
             // \r
             this.list_queue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.list_queue.FormattingEnabled = true;\r
+            this.list_queue.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.list_queue.HorizontalScrollbar = true;\r
-            this.list_queue.Location = new System.Drawing.Point(13, 72);\r
+            this.list_queue.Location = new System.Drawing.Point(19, 19);\r
             this.list_queue.Name = "list_queue";\r
             this.list_queue.Size = new System.Drawing.Size(630, 184);\r
             this.list_queue.TabIndex = 28;\r
+            this.list_queue.SelectedIndexChanged += new System.EventHandler(this.list_queue_SelectedIndexChanged);\r
             // \r
             // btn_Close\r
             // \r
@@ -129,7 +135,7 @@ namespace Handbrake
             this.btn_Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_Close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_Close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_Close.Location = new System.Drawing.Point(606, 305);\r
+            this.btn_Close.Location = new System.Drawing.Point(639, 366);\r
             this.btn_Close.Name = "btn_Close";\r
             this.btn_Close.Size = new System.Drawing.Size(108, 22);\r
             this.btn_Close.TabIndex = 27;\r
@@ -141,16 +147,16 @@ namespace Handbrake
             // progressBar\r
             // \r
             this.progressBar.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.progressBar.Location = new System.Drawing.Point(67, 264);\r
+            this.progressBar.Location = new System.Drawing.Point(64, 328);\r
             this.progressBar.Name = "progressBar";\r
-            this.progressBar.Size = new System.Drawing.Size(576, 23);\r
+            this.progressBar.Size = new System.Drawing.Size(653, 23);\r
             this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous;\r
             this.progressBar.TabIndex = 34;\r
             // \r
             // label2\r
             // \r
             this.label2.AutoSize = true;\r
-            this.label2.Location = new System.Drawing.Point(10, 270);\r
+            this.label2.Location = new System.Drawing.Point(7, 334);\r
             this.label2.Name = "label2";\r
             this.label2.Size = new System.Drawing.Size(51, 13);\r
             this.label2.TabIndex = 35;\r
@@ -159,7 +165,7 @@ namespace Handbrake
             // lbl_progressValue\r
             // \r
             this.lbl_progressValue.AutoSize = true;\r
-            this.lbl_progressValue.Location = new System.Drawing.Point(646, 270);\r
+            this.lbl_progressValue.Location = new System.Drawing.Point(723, 332);\r
             this.lbl_progressValue.Name = "lbl_progressValue";\r
             this.lbl_progressValue.Size = new System.Drawing.Size(24, 13);\r
             this.lbl_progressValue.TabIndex = 36;\r
@@ -200,7 +206,7 @@ namespace Handbrake
             this.btn_cancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_cancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_cancel.Location = new System.Drawing.Point(143, 302);\r
+            this.btn_cancel.Location = new System.Drawing.Point(140, 366);\r
             this.btn_cancel.Name = "btn_cancel";\r
             this.btn_cancel.Size = new System.Drawing.Size(91, 22);\r
             this.btn_cancel.TabIndex = 41;\r
@@ -216,19 +222,73 @@ namespace Handbrake
             // \r
             this.lbl_status.AutoSize = true;\r
             this.lbl_status.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_status.Location = new System.Drawing.Point(260, 268);\r
+            this.lbl_status.Location = new System.Drawing.Point(314, 332);\r
             this.lbl_status.Name = "lbl_status";\r
             this.lbl_status.Size = new System.Drawing.Size(176, 13);\r
             this.lbl_status.TabIndex = 42;\r
             this.lbl_status.Text = "Encode Queue Completed!";\r
             this.lbl_status.Visible = false;\r
             // \r
+            // text_edit\r
+            // \r
+            this.text_edit.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.text_edit.Location = new System.Drawing.Point(119, 209);\r
+            this.text_edit.Name = "text_edit";\r
+            this.text_edit.Size = new System.Drawing.Size(530, 21);\r
+            this.text_edit.TabIndex = 43;\r
+            this.toolTip1.SetToolTip(this.text_edit, "Avoid using this feature when the encoder is about to start a new task. You may o" +\r
+                    "verwrite the wrong job");\r
+            // \r
+            // label4\r
+            // \r
+            this.label4.AutoSize = true;\r
+            this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label4.Location = new System.Drawing.Point(16, 211);\r
+            this.label4.Name = "label4";\r
+            this.label4.Size = new System.Drawing.Size(97, 13);\r
+            this.label4.TabIndex = 45;\r
+            this.label4.Text = "Modify Query:";\r
+            // \r
+            // btn_updateQuery\r
+            // \r
+            this.btn_updateQuery.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.btn_updateQuery.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_updateQuery.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btn_updateQuery.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_updateQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_updateQuery.Location = new System.Drawing.Point(655, 207);\r
+            this.btn_updateQuery.Name = "btn_updateQuery";\r
+            this.btn_updateQuery.Size = new System.Drawing.Size(64, 23);\r
+            this.btn_updateQuery.TabIndex = 46;\r
+            this.btn_updateQuery.TabStop = false;\r
+            this.btn_updateQuery.Text = "Update";\r
+            this.btn_updateQuery.UseVisualStyleBackColor = false;\r
+            this.btn_updateQuery.Click += new System.EventHandler(this.btn_updateQuery_Click);\r
+            // \r
+            // groupBox1\r
+            // \r
+            this.groupBox1.Controls.Add(this.list_queue);\r
+            this.groupBox1.Controls.Add(this.btn_updateQuery);\r
+            this.groupBox1.Controls.Add(this.btn_delete);\r
+            this.groupBox1.Controls.Add(this.label4);\r
+            this.groupBox1.Controls.Add(this.btn_up);\r
+            this.groupBox1.Controls.Add(this.text_edit);\r
+            this.groupBox1.Controls.Add(this.btn_down);\r
+            this.groupBox1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.groupBox1.Location = new System.Drawing.Point(12, 73);\r
+            this.groupBox1.Name = "groupBox1";\r
+            this.groupBox1.Size = new System.Drawing.Size(735, 249);\r
+            this.groupBox1.TabIndex = 47;\r
+            this.groupBox1.TabStop = false;\r
+            this.groupBox1.Text = "Queued Management";\r
+            // \r
             // frmQueue\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(723, 332);\r
+            this.ClientSize = new System.Drawing.Size(761, 396);\r
+            this.Controls.Add(this.groupBox1);\r
             this.Controls.Add(this.lbl_status);\r
             this.Controls.Add(this.btn_cancel);\r
             this.Controls.Add(this.label1);\r
@@ -237,11 +297,7 @@ namespace Handbrake
             this.Controls.Add(this.lbl_progressValue);\r
             this.Controls.Add(this.label2);\r
             this.Controls.Add(this.progressBar);\r
-            this.Controls.Add(this.btn_down);\r
-            this.Controls.Add(this.btn_up);\r
-            this.Controls.Add(this.btn_delete);\r
             this.Controls.Add(this.btn_q_encoder);\r
-            this.Controls.Add(this.list_queue);\r
             this.Controls.Add(this.btn_Close);\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
@@ -249,6 +305,8 @@ namespace Handbrake
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
             this.Text = "Encode Queue";\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();\r
+            this.groupBox1.ResumeLayout(false);\r
+            this.groupBox1.PerformLayout();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -260,7 +318,6 @@ namespace Handbrake
         internal System.Windows.Forms.Button btn_up;\r
         internal System.Windows.Forms.Button btn_delete;\r
         internal System.Windows.Forms.Button btn_q_encoder;\r
-        internal System.Windows.Forms.ListBox list_queue;\r
         internal System.Windows.Forms.Button btn_Close;\r
         private System.Windows.Forms.ProgressBar progressBar;\r
         private System.Windows.Forms.Label label2;\r
@@ -271,5 +328,10 @@ namespace Handbrake
         internal System.Windows.Forms.Button btn_cancel;\r
         private System.Windows.Forms.Label lbl_status;\r
         private System.Windows.Forms.ToolTip toolTip1;\r
+        public System.Windows.Forms.ListBox list_queue;\r
+        private System.Windows.Forms.TextBox text_edit;\r
+        private System.Windows.Forms.Label label4;\r
+        internal System.Windows.Forms.Button btn_updateQuery;\r
+        private System.Windows.Forms.GroupBox groupBox1;\r
     }\r
 }
\ No newline at end of file
index bec77f402cda2d97bcb5e0375e0335942ea93d00..d6b5026436342eefb3039d787bf93ca14599caa6 100644 (file)
@@ -40,8 +40,11 @@ namespace Handbrake
                     lbl_progressValue.Text = "0 %";\r
                     progressBar.Step = 100 / list_queue.Items.Count;\r
                     progressBar.Update();\r
-                    ThreadPool.QueueUserWorkItem(startProc);\r
-                }\r
+                    //ThreadPool.QueueUserWorkItem(startProc);\r
+                    // Testing a new way of launching a thread. Hopefully will fix a random freeze up of the main thread.\r
+                    Thread test = new Thread(startProc);\r
+                    test.Start();\r
+                 }\r
             }\r
             catch (Exception exc)\r
             {\r
@@ -70,7 +73,7 @@ namespace Handbrake
                     string query = list_queue.Items[0].ToString();\r
                     \r
                     updateUIElements();\r
-                        \r
+                   \r
                     Functions.CLI process = new Functions.CLI();\r
                     Process hbProc = process.runCli(this, query, false, false, false, false);\r
 \r
@@ -156,11 +159,13 @@ namespace Handbrake
                 {\r
                     lbl_status.Visible = true;\r
                     lbl_status.Text = "Encode Queue Cancelled!";\r
+                    text_edit.Text = "";\r
                 }\r
                 else\r
                 {\r
                     lbl_status.Visible = true;\r
                     lbl_status.Text = "Encode Queue Completed!";\r
+                    text_edit.Text = "";\r
                 }\r
                 btn_cancel.Visible = false;\r
 \r
@@ -217,6 +222,34 @@ namespace Handbrake
         }\r
         #endregion\r
 \r
+        #region Queue Item Modification\r
+\r
+        int listCount = 0;\r
+\r
+        private void btn_updateQuery_Click(object sender, EventArgs e)\r
+        {\r
+            if (text_edit.Text != "")\r
+            {\r
+                if (list_queue.Items.Count != listCount)\r
+                {\r
+                    MessageBox.Show("Unable to modify the selected item. The number of items on the list has changed.  \nPlease avoid modifying an item when a new encode is about to start!", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+                }\r
+                else\r
+                {\r
+                    if (list_queue.SelectedItem != null)\r
+                        list_queue.Items[list_queue.SelectedIndex] = text_edit.Text;\r
+                }\r
+            }\r
+        }\r
+\r
+        private void list_queue_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            if (list_queue.SelectedItem != null)\r
+                text_edit.Text = list_queue.SelectedItem.ToString();\r
+\r
+            listCount = list_queue.Items.Count;\r
+        }\r
+        #endregion\r
 \r
         private void btn_Close_Click(object sender, EventArgs e)\r
         {\r
@@ -230,6 +263,11 @@ namespace Handbrake
             base.OnClosing(e);\r
         }\r
 \r
+     \r
+        \r
+\r
+\r
+\r
 \r
 \r
     }\r