WinGui:

- Removed checkbox for deinterlace option.
- Updated Save/Open Profiles and Load default settings.

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

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 14139d6dc1c6cb643e87d135fb4306605de7afa6..cffc8d3a4f394fc969d371745b52283aea0fb87b 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -134,9 +134,10 @@ namespace Handbrake
             this.Label18 = new System.Windows.Forms.Label();\r
             this.drp_audioSampleRate = new System.Windows.Forms.ComboBox();\r
             this.TabPage3 = new System.Windows.Forms.TabPage();\r
-            this.check_deTelecine = new System.Windows.Forms.CheckBox();\r
-            this.check_deNoise = new System.Windows.Forms.CheckBox();\r
-            this.check_deBlock = new System.Windows.Forms.CheckBox();\r
+            this.label25 = new System.Windows.Forms.Label();\r
+            this.label24 = new System.Windows.Forms.Label();\r
+            this.label11 = new System.Windows.Forms.Label();\r
+            this.label4 = new System.Windows.Forms.Label();\r
             this.Label37 = new System.Windows.Forms.Label();\r
             this.check_largeFile = new System.Windows.Forms.CheckBox();\r
             this.check_turbo = new System.Windows.Forms.CheckBox();\r
@@ -153,7 +154,6 @@ namespace Handbrake
             this.text_bitrate = new System.Windows.Forms.TextBox();\r
             this.Label42 = new System.Windows.Forms.Label();\r
             this.TabPage1 = new System.Windows.Forms.TabPage();\r
-            this.check_DeInterlace = new System.Windows.Forms.CheckBox();\r
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
             this.CheckPixelRatio = new System.Windows.Forms.CheckBox();\r
             this.check_grayscale = new System.Windows.Forms.CheckBox();\r
@@ -397,7 +397,7 @@ namespace Handbrake
             "Normal (-d)",\r
             "yadif(-d=\"1\")",\r
             "yadif+mcdeint(-d=\"1:-1:1\")"});\r
-            this.drp_deBlock.Location = new System.Drawing.Point(472, 126);\r
+            this.drp_deBlock.Location = new System.Drawing.Point(470, 151);\r
             this.drp_deBlock.Name = "drp_deBlock";\r
             this.drp_deBlock.Size = new System.Drawing.Size(147, 21);\r
             this.drp_deBlock.TabIndex = 61;\r
@@ -413,7 +413,7 @@ namespace Handbrake
             "Normal (-d)",\r
             "yadif(-d=\"1\")",\r
             "yadif+mcdeint(-d=\"1:-1:1\")"});\r
-            this.drp_DeNoise.Location = new System.Drawing.Point(472, 153);\r
+            this.drp_DeNoise.Location = new System.Drawing.Point(470, 178);\r
             this.drp_DeNoise.Name = "drp_DeNoise";\r
             this.drp_DeNoise.Size = new System.Drawing.Size(147, 21);\r
             this.drp_DeNoise.TabIndex = 64;\r
@@ -429,7 +429,7 @@ namespace Handbrake
             "Normal (-d)",\r
             "yadif(-d=\"1\")",\r
             "yadif+mcdeint(-d=\"1:-1:1\")"});\r
-            this.drp_deTelecine.Location = new System.Drawing.Point(472, 180);\r
+            this.drp_deTelecine.Location = new System.Drawing.Point(470, 205);\r
             this.drp_deTelecine.Name = "drp_deTelecine";\r
             this.drp_deTelecine.Size = new System.Drawing.Size(147, 21);\r
             this.drp_deTelecine.TabIndex = 65;\r
@@ -454,15 +454,16 @@ namespace Handbrake
             this.drp_deInterlace_option.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_deInterlace_option.FormattingEnabled = true;\r
             this.drp_deInterlace_option.Items.AddRange(new object[] {\r
-            "Default",\r
-            "yadif",\r
-            "yadif + mcdeint",\r
-            "yadif + mcdeint (Slow)"});\r
-            this.drp_deInterlace_option.Location = new System.Drawing.Point(447, 194);\r
+            "None",\r
+            "Origional ( Fast )",\r
+            "yadif ( Slow )",\r
+            "yadif + mcdeint ( Slower )",\r
+            "yadif + mcdeint  ( Slowest )"});\r
+            this.drp_deInterlace_option.Location = new System.Drawing.Point(470, 124);\r
             this.drp_deInterlace_option.Name = "drp_deInterlace_option";\r
             this.drp_deInterlace_option.Size = new System.Drawing.Size(147, 21);\r
-            this.drp_deInterlace_option.TabIndex = 55;\r
-            this.drp_deInterlace_option.Text = "Default";\r
+            this.drp_deInterlace_option.TabIndex = 67;\r
+            this.drp_deInterlace_option.Text = "None";\r
             this.ToolTip.SetToolTip(this.drp_deInterlace_option, "Select the subtitle language you require from this dropdown.");\r
             // \r
             // File_Open\r
@@ -1320,12 +1321,14 @@ namespace Handbrake
             // TabPage3\r
             // \r
             this.TabPage3.BackColor = System.Drawing.SystemColors.Control;\r
+            this.TabPage3.Controls.Add(this.label25);\r
+            this.TabPage3.Controls.Add(this.label24);\r
+            this.TabPage3.Controls.Add(this.label11);\r
+            this.TabPage3.Controls.Add(this.label4);\r
+            this.TabPage3.Controls.Add(this.drp_deInterlace_option);\r
             this.TabPage3.Controls.Add(this.drp_deTelecine);\r
             this.TabPage3.Controls.Add(this.drp_DeNoise);\r
-            this.TabPage3.Controls.Add(this.check_deTelecine);\r
-            this.TabPage3.Controls.Add(this.check_deNoise);\r
             this.TabPage3.Controls.Add(this.drp_deBlock);\r
-            this.TabPage3.Controls.Add(this.check_deBlock);\r
             this.TabPage3.Controls.Add(this.Label37);\r
             this.TabPage3.Controls.Add(this.check_largeFile);\r
             this.TabPage3.Controls.Add(this.check_turbo);\r
@@ -1351,38 +1354,45 @@ namespace Handbrake
             this.TabPage3.Text = "Video Settings";\r
             this.TabPage3.UseVisualStyleBackColor = true;\r
             // \r
-            // check_deTelecine\r
-            // \r
-            this.check_deTelecine.AutoSize = true;\r
-            this.check_deTelecine.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_deTelecine.Location = new System.Drawing.Point(368, 182);\r
-            this.check_deTelecine.Name = "check_deTelecine";\r
-            this.check_deTelecine.Size = new System.Drawing.Size(94, 17);\r
-            this.check_deTelecine.TabIndex = 63;\r
-            this.check_deTelecine.Text = "De-Telecine";\r
-            this.check_deTelecine.UseVisualStyleBackColor = true;\r
-            // \r
-            // check_deNoise\r
-            // \r
-            this.check_deNoise.AutoSize = true;\r
-            this.check_deNoise.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_deNoise.Location = new System.Drawing.Point(368, 155);\r
-            this.check_deNoise.Name = "check_deNoise";\r
-            this.check_deNoise.Size = new System.Drawing.Size(78, 17);\r
-            this.check_deNoise.TabIndex = 62;\r
-            this.check_deNoise.Text = "De-Noise";\r
-            this.check_deNoise.UseVisualStyleBackColor = true;\r
-            // \r
-            // check_deBlock\r
-            // \r
-            this.check_deBlock.AutoSize = true;\r
-            this.check_deBlock.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_deBlock.Location = new System.Drawing.Point(368, 128);\r
-            this.check_deBlock.Name = "check_deBlock";\r
-            this.check_deBlock.Size = new System.Drawing.Size(78, 17);\r
-            this.check_deBlock.TabIndex = 60;\r
-            this.check_deBlock.Text = "De-Block";\r
-            this.check_deBlock.UseVisualStyleBackColor = true;\r
+            // label25\r
+            // \r
+            this.label25.AutoSize = true;\r
+            this.label25.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label25.Location = new System.Drawing.Point(365, 208);\r
+            this.label25.Name = "label25";\r
+            this.label25.Size = new System.Drawing.Size(72, 13);\r
+            this.label25.TabIndex = 71;\r
+            this.label25.Text = "Detelecine:";\r
+            // \r
+            // label24\r
+            // \r
+            this.label24.AutoSize = true;\r
+            this.label24.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label24.Location = new System.Drawing.Point(365, 182);\r
+            this.label24.Name = "label24";\r
+            this.label24.Size = new System.Drawing.Size(58, 13);\r
+            this.label24.TabIndex = 70;\r
+            this.label24.Text = "Denoise:";\r
+            // \r
+            // label11\r
+            // \r
+            this.label11.AutoSize = true;\r
+            this.label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label11.Location = new System.Drawing.Point(365, 154);\r
+            this.label11.Name = "label11";\r
+            this.label11.Size = new System.Drawing.Size(58, 13);\r
+            this.label11.TabIndex = 69;\r
+            this.label11.Text = "Deblock:";\r
+            // \r
+            // label4\r
+            // \r
+            this.label4.AutoSize = true;\r
+            this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label4.Location = new System.Drawing.Point(365, 127);\r
+            this.label4.Name = "label4";\r
+            this.label4.Size = new System.Drawing.Size(77, 13);\r
+            this.label4.TabIndex = 68;\r
+            this.label4.Text = "Deinterlace:";\r
             // \r
             // Label37\r
             // \r
@@ -1552,8 +1562,6 @@ namespace Handbrake
             // TabPage1\r
             // \r
             this.TabPage1.BackColor = System.Drawing.SystemColors.Control;\r
-            this.TabPage1.Controls.Add(this.drp_deInterlace_option);\r
-            this.TabPage1.Controls.Add(this.check_DeInterlace);\r
             this.TabPage1.Controls.Add(this.Check_ChapterMarkers);\r
             this.TabPage1.Controls.Add(this.CheckPixelRatio);\r
             this.TabPage1.Controls.Add(this.check_grayscale);\r
@@ -1583,17 +1591,6 @@ namespace Handbrake
             this.TabPage1.Text = "Picture Settings";\r
             this.TabPage1.UseVisualStyleBackColor = true;\r
             // \r
-            // check_DeInterlace\r
-            // \r
-            this.check_DeInterlace.AutoSize = true;\r
-            this.check_DeInterlace.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_DeInterlace.Location = new System.Drawing.Point(317, 196);\r
-            this.check_DeInterlace.Name = "check_DeInterlace";\r
-            this.check_DeInterlace.Size = new System.Drawing.Size(93, 17);\r
-            this.check_DeInterlace.TabIndex = 54;\r
-            this.check_DeInterlace.Text = "DeInterlace";\r
-            this.check_DeInterlace.UseVisualStyleBackColor = true;\r
-            // \r
             // Check_ChapterMarkers\r
             // \r
             this.Check_ChapterMarkers.AutoSize = true;\r
@@ -1961,10 +1958,7 @@ namespace Handbrake
         internal System.Windows.Forms.TabPage TabPage3;\r
         internal System.Windows.Forms.ComboBox drp_deTelecine;\r
         internal System.Windows.Forms.ComboBox drp_DeNoise;\r
-        internal System.Windows.Forms.CheckBox check_deTelecine;\r
-        internal System.Windows.Forms.CheckBox check_deNoise;\r
         internal System.Windows.Forms.ComboBox drp_deBlock;\r
-        internal System.Windows.Forms.CheckBox check_deBlock;\r
         internal System.Windows.Forms.Label Label37;\r
         internal System.Windows.Forms.CheckBox check_largeFile;\r
         internal System.Windows.Forms.CheckBox check_turbo;\r
@@ -1977,13 +1971,10 @@ namespace Handbrake
         internal System.Windows.Forms.CheckBox check_2PassEncode;\r
         internal System.Windows.Forms.TrackBar slider_videoQuality;\r
         internal System.Windows.Forms.TextBox text_filesize;\r
-        internal System.Windows.Forms.Label Label46;\r
         internal System.Windows.Forms.Label Label40;\r
         internal System.Windows.Forms.TextBox text_bitrate;\r
         internal System.Windows.Forms.Label Label42;\r
         internal System.Windows.Forms.TabPage TabPage1;\r
-        internal System.Windows.Forms.ComboBox drp_deInterlace_option;\r
-        internal System.Windows.Forms.CheckBox check_DeInterlace;\r
         internal System.Windows.Forms.CheckBox Check_ChapterMarkers;\r
         internal System.Windows.Forms.CheckBox CheckPixelRatio;\r
         internal System.Windows.Forms.CheckBox check_grayscale;\r
@@ -2006,6 +1997,12 @@ namespace Handbrake
         internal System.Windows.Forms.TextBox text_right;\r
         internal System.Windows.Forms.TextBox text_left;\r
         internal System.Windows.Forms.TabControl advancedOptions;\r
+        internal System.Windows.Forms.ComboBox drp_deInterlace_option;\r
+        internal System.Windows.Forms.Label label24;\r
+        internal System.Windows.Forms.Label label11;\r
+        internal System.Windows.Forms.Label label4;\r
+        internal System.Windows.Forms.Label Label46;\r
+        internal System.Windows.Forms.Label label25;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index b01dc01be17268fa3adb059327b6b4385ede8ddb..7712f030ec390db016901f48424cc4171f056e28 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -95,10 +95,9 @@ namespace Handbrake
                     {\r
                         check_2PassEncode.CheckState = CheckState.Checked;\r
                     }\r
-                    if (Properties.Settings.Default.DeInterlace == "Checked")\r
-                    {\r
-                        check_DeInterlace.CheckState = CheckState.Checked;\r
-                    }\r
+  \r
+                    drp_deInterlace_option.Text = Properties.Settings.Default.DeInterlace;\r
+\r
                     if (Properties.Settings.Default.Grayscale == "Checked")\r
                     {\r
                         check_grayscale.CheckState = CheckState.Checked;\r
@@ -204,11 +203,7 @@ namespace Handbrake
                         check_2PassEncode.CheckState = CheckState.Checked;\r
                     }\r
 \r
-                    temporyLine = line.ReadLine();\r
-                    if (temporyLine == "Checked")\r
-                    {\r
-                        check_DeInterlace.CheckState = CheckState.Checked;\r
-                    }\r
+                    drp_deInterlace_option.Text = line.ReadLine();\r
 \r
                     temporyLine = line.ReadLine();\r
                     if (temporyLine == "Checked")\r
@@ -303,7 +298,7 @@ namespace Handbrake
                     line.WriteLine(text_filesize.Text);\r
                     line.WriteLine(slider_videoQuality.Value.ToString());\r
                     line.WriteLine(check_2PassEncode.CheckState.ToString());\r
-                    line.WriteLine(check_DeInterlace.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
@@ -487,7 +482,7 @@ namespace Handbrake
             Properties.Settings.Default.VideoFilesize = text_filesize.Text;\r
             Properties.Settings.Default.VideoQuality = slider_videoQuality.Value;\r
             Properties.Settings.Default.TwoPass = check_2PassEncode.CheckState.ToString();\r
-            Properties.Settings.Default.DeInterlace = check_DeInterlace.CheckState.ToString();\r
+            Properties.Settings.Default.DeInterlace = drp_deInterlace_option.Text;\r
             Properties.Settings.Default.Grayscale = check_grayscale.CheckState.ToString();\r
             Properties.Settings.Default.Framerate = drp_videoFramerate.Text;\r
             Properties.Settings.Default.PixelRatio = CheckPixelRatio.CheckState.ToString();\r
@@ -1304,26 +1299,26 @@ namespace Handbrake
                 subtitles = " -s "+ tempSub[0];\r
             }\r
 \r
-            if (check_DeInterlace.Checked)\r
-            {\r
-                switch (deInterlace_Option)\r
+            switch (deInterlace_Option)\r
                 {\r
-                    case "Default":\r
+                    case "None":\r
+                        deinterlace = "";\r
+                        break;\r
+                    case "Origional ( Fast )":\r
                         deinterlace = " --deinterlace";\r
                         break;\r
-                    case "yadif":\r
+                    case "yadif ( Slow )":\r
                         deinterlace = " --deinterlace=" + '"' + "1" + '"';\r
                         break;\r
-                    case "yadif + mcdeint":\r
+                    case "yadif + mcdeint ( Slower )":\r
                         deinterlace = " -d " + '"' + "1:-1:1" + '"';\r
                         break;\r
-                    case "yadif + mcdeint (Slow)":\r
+                    case "yadif + mcdeint  ( Slowest )":\r
                         deinterlace = " --deinterlace=" + '"' + "3:-1:2" + '"';\r
                         break;\r
                     default:\r
                         deinterlace = " --deinterlace=";\r
                         break;\r
-                }\r
             }\r
 \r
             if (check_grayscale.Checked)\r
@@ -1497,6 +1492,7 @@ namespace Handbrake
             return querySource+ queryDestination+ queryPictureSettings+ queryVideoSettings+ h264Settings+ queryAudioSettings+ queryAdvancedSettings+ verbose;\r
         }\r
 \r
+\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file