OSDN Git Service

WinGui:
authorsr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Sat, 20 Sep 2008 15:11:23 +0000 (15:11 +0000)
committersr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Sat, 20 Sep 2008 15:11:23 +0000 (15:11 +0000)
- User presets and built in presets are now show in seperate colours. User preset's are shown in black and built in are blue.
- Added cancel button to add preset.
- Removed File Menu > Import. This is not required. Users can import old .hb files as text into the query editor if need be.
- Adding a new user preset no longer stores Title and file input/output information. While these were never used, it's a waste of space storing them in the user presets file.
- Added a comfirm dialog for removing presets.

git-svn-id: svn://localhost/HandBrake/trunk@1735 b64f7644-9d1e-0410-96f1-a4d463321fa5

win/C#/Functions/Common.cs
win/C#/Functions/Presets.cs
win/C#/frmAddPreset.Designer.cs
win/C#/frmAddPreset.cs
win/C#/frmMain.Designer.cs
win/C#/frmMain.cs
win/C#/frmMain.resx

index 3fc0b35..b954a02 100644 (file)
@@ -431,7 +431,7 @@ namespace Handbrake.Functions
                 query += " -o " + '"' + mainWindow.text_destination.Text + '"';\r
             #endregion\r
 \r
-            query += generateTabbedComponentsQuery(mainWindow, mainWindow.text_source.Text);\r
+            query += generateTabbedComponentsQuery(mainWindow);\r
             return query;\r
         }\r
 \r
@@ -466,7 +466,7 @@ namespace Handbrake.Functions
 \r
             #endregion\r
 \r
-            query += generateTabbedComponentsQuery(mainWindow, mainWindow.text_source.Text);\r
+            query += generateTabbedComponentsQuery(mainWindow);\r
             return query;\r
         }\r
 \r
@@ -476,34 +476,28 @@ namespace Handbrake.Functions
         /// <param name="mainWindow"></param>\r
         /// <param name="source"></param>\r
         /// <returns></returns>\r
-        private string generateTabbedComponentsQuery(frmMain mainWindow, string source)\r
+        public string generateTabbedComponentsQuery(frmMain mainWindow)\r
         {\r
             string query = "";\r
 \r
+            // The Output Settings box above the tabbed section.\r
+            #region Output Settings Box\r
             query += " -f " + mainWindow.drop_format.Text.ToLower().Replace(" file", "");\r
 \r
+            // These are output settings features\r
+            if (mainWindow.check_largeFile.Checked)\r
+                query += " -4 ";\r
+\r
+            if (mainWindow.check_iPodAtom.Checked)\r
+                query += " -I ";\r
+\r
+            if (mainWindow.check_optimiseMP4.Checked)\r
+                query += " -O ";\r
+            #endregion\r
+\r
             // Picture Settings Tab\r
             #region Picture Settings Tab\r
 \r
-            switch (mainWindow.drp_videoEncoder.Text)\r
-            {\r
-                case "MPEG-4 (FFmpeg)":\r
-                    query += " -e ffmpeg";\r
-                    break;\r
-                case "MPEG-4 (XviD)":\r
-                    query += " -e xvid";\r
-                    break;\r
-                case "H.264 (x264)":\r
-                    query += " -e x264";\r
-                    break;\r
-                case "VP3 (Theora)":\r
-                    query += " -e theora";\r
-                    break;\r
-                default:\r
-                    query += " -e x264";\r
-                    break;\r
-            }\r
-\r
             if (mainWindow.text_width.Text != "")\r
                 query += " -w " + mainWindow.text_width.Text;\r
 \r
@@ -560,9 +554,6 @@ namespace Handbrake.Functions
                     query += " --decomb ";\r
             }\r
 \r
-            if (mainWindow.check_grayscale.Checked)\r
-                query += " -g ";\r
-\r
             if (mainWindow.drp_anamorphic.SelectedIndex == 1)\r
                 query += " -p ";\r
             else if (mainWindow.drp_anamorphic.SelectedIndex == 2)\r
@@ -580,15 +571,28 @@ namespace Handbrake.Functions
 \r
             // Video Settings Tab\r
             #region Video Settings Tab\r
-            // These are output settings features\r
-            if (mainWindow.check_largeFile.Checked)\r
-                query += " -4 ";\r
 \r
-            if (mainWindow.check_iPodAtom.Checked)\r
-                query += " -I ";\r
+            switch (mainWindow.drp_videoEncoder.Text)\r
+            {\r
+                case "MPEG-4 (FFmpeg)":\r
+                    query += " -e ffmpeg";\r
+                    break;\r
+                case "MPEG-4 (XviD)":\r
+                    query += " -e xvid";\r
+                    break;\r
+                case "H.264 (x264)":\r
+                    query += " -e x264";\r
+                    break;\r
+                case "VP3 (Theora)":\r
+                    query += " -e theora";\r
+                    break;\r
+                default:\r
+                    query += " -e x264";\r
+                    break;\r
+            }\r
 \r
-            if (mainWindow.check_optimiseMP4.Checked)\r
-                query += " -O ";\r
+            if (mainWindow.check_grayscale.Checked)\r
+                query += " -g ";\r
 \r
             // Video Settings\r
             if (mainWindow.text_bitrate.Text != "")\r
@@ -608,17 +612,15 @@ namespace Handbrake.Functions
             if (mainWindow.check_2PassEncode.Checked)\r
                 query += " -2 ";\r
 \r
+            if (mainWindow.check_turbo.Checked)\r
+                query += " -T ";\r
+\r
             if (mainWindow.drp_videoFramerate.Text != "Same as source")\r
             {\r
                 if (!mainWindow.check_vfr.Checked)\r
                     query += " -r " + mainWindow.drp_videoFramerate.Text;\r
             }\r
 \r
-            if (mainWindow.check_turbo.Checked)\r
-                query += " -T ";\r
-\r
-\r
-\r
             switch (mainWindow.drp_deNoise.Text)\r
             {\r
                 case "None":\r
@@ -673,7 +675,6 @@ namespace Handbrake.Functions
             string Mixdown4 = mainWindow.drp_audmix_4.Text;\r
             string drc4 = mainWindow.trackBar4.Value.ToString();\r
 \r
-\r
             //\r
             // Audio Track Selections\r
             //\r
@@ -859,7 +860,7 @@ namespace Handbrake.Functions
             // Attach Source name and dvd title to the start of the chapters.csv filename.\r
             // This is for the queue. It allows different chapter name files for each title.\r
             string source_name = mainWindow.text_source.Text;\r
-            string[] sourceName = source.Split('\\');\r
+            string[] sourceName = source_name.Split('\\');\r
             source_name = sourceName[sourceName.Length - 1];\r
             source_name = source_name.Replace("\"", "");\r
 \r
index 9c23aef..353846b 100644 (file)
@@ -87,11 +87,10 @@ namespace Handbrake.Functions
         }\r
 \r
         /// <summary>\r
-        /// Get an Arraylist of all the preset names.\r
-        /// Includes both built in and user presets.\r
+        /// Get a List of all the built in preset names.\r
         /// </summary>\r
-        /// <returns>Arraylist of preset names</returns>\r
-        public List<string> getPresetNames()\r
+        /// <returns>List<String> of preset names</returns>\r
+        public List<string> getBuildInPresetNames()\r
         {\r
             List<string> names = new List<string>();\r
 \r
@@ -104,6 +103,16 @@ namespace Handbrake.Functions
                 names.Add(presetName[0]);\r
 \r
             }\r
+            return names;\r
+        }\r
+\r
+        /// <summary>\r
+        /// Get a List of all the User preset names.\r
+        /// </summary>\r
+        /// <returns>List<String> of preset names</returns>\r
+        public List<string> getUserPresetNames()\r
+        {\r
+            List<string> names = new List<string>();\r
 \r
             // User Presets\r
             foreach (string item in user_presets)\r
index 00f33ba..3db705c 100644 (file)
@@ -38,6 +38,7 @@ namespace Handbrake
             this.lbl_name = new System.Windows.Forms.Label();\r
             this.txt_preset_name = new System.Windows.Forms.TextBox();\r
             this.btn_add = new System.Windows.Forms.Button();\r
+            this.btn_cancel = new System.Windows.Forms.Button();\r
             this.SuspendLayout();\r
             // \r
             // lbl_name\r
@@ -65,7 +66,7 @@ namespace Handbrake
             this.btn_add.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_add.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_add.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_add.Location = new System.Drawing.Point(284, 42);\r
+            this.btn_add.Location = new System.Drawing.Point(284, 44);\r
             this.btn_add.Name = "btn_add";\r
             this.btn_add.Size = new System.Drawing.Size(66, 22);\r
             this.btn_add.TabIndex = 0;\r
@@ -74,11 +75,27 @@ namespace Handbrake
             this.btn_add.UseVisualStyleBackColor = false;\r
             this.btn_add.Click += new System.EventHandler(this.btn_add_Click);\r
             // \r
+            // btn_cancel\r
+            // \r
+            this.btn_cancel.BackColor = System.Drawing.SystemColors.Control;\r
+            this.btn_cancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;\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(212, 44);\r
+            this.btn_cancel.Name = "btn_cancel";\r
+            this.btn_cancel.Size = new System.Drawing.Size(66, 22);\r
+            this.btn_cancel.TabIndex = 3;\r
+            this.btn_cancel.TabStop = false;\r
+            this.btn_cancel.Text = "Cancel";\r
+            this.btn_cancel.UseVisualStyleBackColor = false;\r
+            this.btn_cancel.Click += new System.EventHandler(this.btn_cancel_Click);\r
+            // \r
             // frmAddPreset\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.ClientSize = new System.Drawing.Size(362, 76);\r
+            this.Controls.Add(this.btn_cancel);\r
             this.Controls.Add(this.btn_add);\r
             this.Controls.Add(this.txt_preset_name);\r
             this.Controls.Add(this.lbl_name);\r
@@ -102,5 +119,6 @@ namespace Handbrake
         private System.Windows.Forms.Label lbl_name;\r
         private System.Windows.Forms.TextBox txt_preset_name;\r
         internal System.Windows.Forms.Button btn_add;\r
+        internal System.Windows.Forms.Button btn_cancel;\r
     }\r
 }
\ No newline at end of file
index 1a18c0a..44e9910 100644 (file)
@@ -30,7 +30,7 @@ namespace Handbrake
 \r
         private void btn_add_Click(object sender, EventArgs e)\r
         {\r
-            String query = hb_common_func.GenerateTheQuery(frmMainWindow);\r
+            String query = hb_common_func.generateTabbedComponentsQuery(frmMainWindow);\r
 \r
             if (presetCode.addPreset(txt_preset_name.Text.Trim(), query) == true)\r
             {\r
@@ -39,5 +39,10 @@ namespace Handbrake
             }\r
         }\r
 \r
+        private void btn_cancel_Click(object sender, EventArgs e)\r
+        {\r
+            this.Close();\r
+        }\r
+\r
     }\r
 }
\ No newline at end of file
index 5aa4796..acd734f 100644 (file)
@@ -91,8 +91,6 @@ namespace Handbrake
             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.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
@@ -1023,32 +1021,15 @@ namespace Handbrake
             // FileToolStripMenuItem\r
             // \r
             this.FileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_open,\r
-            this.toolStripSeparator2,\r
             this.mnu_exit});\r
             this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";\r
             this.FileToolStripMenuItem.Size = new System.Drawing.Size(38, 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(210, 22);\r
-            this.mnu_open.Text = "&Import Preset";\r
-            this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click);\r
-            // \r
-            // toolStripSeparator2\r
-            // \r
-            this.toolStripSeparator2.Name = "toolStripSeparator2";\r
-            this.toolStripSeparator2.Size = new System.Drawing.Size(207, 6);\r
-            // \r
             // mnu_exit\r
             // \r
             this.mnu_exit.Name = "mnu_exit";\r
-            this.mnu_exit.Size = new System.Drawing.Size(210, 22);\r
+            this.mnu_exit.Size = new System.Drawing.Size(152, 22);\r
             this.mnu_exit.Text = "E&xit";\r
             this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);\r
             // \r
@@ -3310,8 +3291,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;\r
         private System.Windows.Forms.SaveFileDialog DVD_Save;\r
         private System.Windows.Forms.OpenFileDialog File_Open;\r
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;\r
-        private System.Windows.Forms.ToolStripMenuItem mnu_open;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;\r
         internal System.Windows.Forms.CheckBox check_vfr;\r
         internal System.Windows.Forms.CheckBox check_iPodAtom;\r
index 349ba98..092e9b7 100644 (file)
@@ -192,36 +192,6 @@ namespace Handbrake
         // The Applications Main Menu *****************************************\r
 \r
         #region File Menu\r
-        private void mnu_open_Click(object sender, EventArgs e)\r
-        {\r
-            string filename;\r
-            File_Open.ShowDialog();\r
-            filename = File_Open.FileName;\r
-\r
-            if (filename != "")\r
-            {\r
-                try\r
-                {\r
-                    // Create StreamReader & open file\r
-                    StreamReader line = new StreamReader(filename);\r
-\r
-                    // Send the query from the file to the Query Parser class then load the preset\r
-                    Functions.QueryParser presetQuery = Functions.QueryParser.Parse(line.ReadLine());\r
-                    hb_common_func.presetLoader(this, presetQuery, filename);\r
-\r
-                    // Close the stream\r
-                    line.Close();\r
-\r
-                    Form preset = new frmAddPreset(this, presetHandler);\r
-                    preset.ShowDialog();\r
-\r
-                }\r
-                catch (Exception exc)\r
-                {\r
-                    MessageBox.Show("Unable to load profile. \n\n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
-                }\r
-            }\r
-        }\r
         private void mnu_exit_Click(object sender, EventArgs e)\r
         {\r
             Application.Exit();\r
@@ -1362,10 +1332,14 @@ namespace Handbrake
         }\r
         private void btn_removePreset_Click(object sender, EventArgs e)\r
         {\r
-            if (treeView_presets.SelectedNode != null)\r
-                presetHandler.remove(treeView_presets.SelectedNode.Text);\r
-            // Now reload the preset panel\r
-            loadPresetPanel();\r
+            DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
+            if (result == DialogResult.Yes)\r
+            {\r
+                if (treeView_presets.SelectedNode != null)\r
+                    presetHandler.remove(treeView_presets.SelectedNode.Text);\r
+                // Now reload the preset panel\r
+                loadPresetPanel();\r
+            }\r
         }\r
         private void btn_setDefault_Click(object sender, EventArgs e)\r
         {\r
@@ -1770,13 +1744,22 @@ namespace Handbrake
 \r
             treeView_presets.Nodes.Clear();\r
             List<string> presetNameList = new List<string>();\r
-            presetNameList = presetHandler.getPresetNames();\r
+            TreeNode preset_treeview = new TreeNode();          \r
+\r
+            presetNameList = presetHandler.getBuildInPresetNames();\r
+            foreach (string preset in presetNameList)\r
+            {\r
+                preset_treeview = new TreeNode(preset);\r
+\r
+                // Now Fill Out List View with Items\r
+                treeView_presets.Nodes.Add(preset_treeview);\r
+            }\r
 \r
-            // Adds a new preset name to the preset list.\r
-            TreeNode preset_treeview = new TreeNode();\r
+            presetNameList = presetHandler.getUserPresetNames();\r
             foreach (string preset in presetNameList)\r
             {\r
                 preset_treeview = new TreeNode(preset);\r
+                preset_treeview.ForeColor = Color.Black;\r
 \r
                 // Now Fill Out List View with Items\r
                 treeView_presets.Nodes.Add(preset_treeview);\r
index 1b5323e..a016a18 100644 (file)
@@ -164,30 +164,13 @@ Note: Do not change any of the chapter numbers!</value>
   <metadata name="ISO_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>329, 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
   <metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>106, 15</value>\r
   </metadata>\r
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>731, 18</value>\r
   </metadata>\r
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
   <data name="btn_dvd_source.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r