WinGui:

- File extension changes for the presets done.
- Fixed a few bugs where checkbox's were not being linked with their code.

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

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 16e8c45..4016dde 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -89,8 +89,8 @@ namespace Handbrake
             this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.OnlineDocumentationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_wiki = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_onlineDocs = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_faq = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_onlineDocs = new System.Windows.Forms.ToolStripMenuItem();\r
             this.WebsiteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_homepage = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_forum = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -770,6 +770,13 @@ namespace Handbrake
             this.mnu_wiki.Text = "Wiki / User Guides";\r
             this.mnu_wiki.Click += new System.EventHandler(this.mnu_wiki_Click);\r
             // \r
+            // mnu_faq\r
+            // \r
+            this.mnu_faq.Name = "mnu_faq";\r
+            this.mnu_faq.Size = new System.Drawing.Size(195, 22);\r
+            this.mnu_faq.Text = "FAQ";\r
+            this.mnu_faq.Click += new System.EventHandler(this.mnu_faq_Click);\r
+            // \r
             // mnu_onlineDocs\r
             // \r
             this.mnu_onlineDocs.Name = "mnu_onlineDocs";\r
@@ -777,13 +784,6 @@ namespace Handbrake
             this.mnu_onlineDocs.Text = "Full Documentation List";\r
             this.mnu_onlineDocs.Click += new System.EventHandler(this.mnu_onlineDocs_Click);\r
             // \r
-            // mnu_faq\r
-            // \r
-            this.mnu_faq.Name = "mnu_faq";\r
-            this.mnu_faq.Size = new System.Drawing.Size(157, 22);\r
-            this.mnu_faq.Text = "FAQ";\r
-            this.mnu_faq.Click += new System.EventHandler(this.mnu_faq_Click);\r
-            // \r
             // WebsiteToolStripMenuItem\r
             // \r
             this.WebsiteToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
@@ -1722,6 +1722,7 @@ namespace Handbrake
             this.Check_ChapterMarkers.TabIndex = 50;\r
             this.Check_ChapterMarkers.Text = "Chapter Markers";\r
             this.Check_ChapterMarkers.UseVisualStyleBackColor = true;\r
+            this.Check_ChapterMarkers.CheckedChanged += new System.EventHandler(this.Check_ChapterMarkers_CheckedChanged);\r
             // \r
             // CheckPixelRatio\r
             // \r
@@ -1733,6 +1734,7 @@ namespace Handbrake
             this.CheckPixelRatio.TabIndex = 49;\r
             this.CheckPixelRatio.Text = "Anamorphic PAR";\r
             this.CheckPixelRatio.UseVisualStyleBackColor = true;\r
+            this.CheckPixelRatio.CheckedChanged += new System.EventHandler(this.CheckPixelRatio_CheckedChanged);\r
             // \r
             // check_grayscale\r
             // \r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index def400c..e24bb22 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -417,7 +417,6 @@ namespace Handbrake
 \r
         private void mnu_animation_Click(object sender, EventArgs e)\r
         {\r
-            // NEEDS MKV\r
             CheckPixelRatio.CheckState = CheckState.Checked;\r
             text_width.Text = "";\r
             text_height.Text = "";\r
@@ -435,6 +434,14 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Checked;\r
             drp_audioCodec.Text = "AAC";\r
+\r
+            // Set file extension to MKV\r
+            string destination = text_destination.Text;\r
+            destination = destination.Replace(".mp4", ".mkv");\r
+            destination = destination.Replace(".avi", ".mkv");\r
+            destination = destination.Replace(".m4v", ".mkv");\r
+            destination = destination.Replace(".ogm", ".mkv");\r
+            text_destination.Text = destination;\r
         }\r
 \r
         private void mnu_appleTv_Click(object sender, EventArgs e)\r
@@ -460,7 +467,6 @@ namespace Handbrake
 \r
         private void mnu_bedlam_Click(object sender, EventArgs e)\r
         {\r
-            // NEEDS MKV\r
             CheckPixelRatio.CheckState = CheckState.Checked;\r
             text_width.Text = "";\r
             text_height.Text = "";\r
@@ -478,6 +484,14 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Checked;\r
             drp_audioCodec.Text = "AC3";\r
+\r
+            // Set file extension to MKV\r
+            string destination = text_destination.Text;\r
+            destination = destination.Replace(".mp4", ".mkv");\r
+            destination = destination.Replace(".avi", ".mkv");\r
+            destination = destination.Replace(".m4v", ".mkv");\r
+            destination = destination.Replace(".ogm", ".mkv");\r
+            text_destination.Text = destination;\r
         }\r
 \r
         private void mnu_blind_Click(object sender, EventArgs e)\r
@@ -545,7 +559,6 @@ namespace Handbrake
 \r
         private void mnu_CQR_Click(object sender, EventArgs e)\r
         {\r
-            // NEEDS MKV\r
             CheckPixelRatio.CheckState = CheckState.Checked;\r
             text_width.Text = "";\r
             text_height.Text = "";\r
@@ -557,17 +570,24 @@ namespace Handbrake
             drp_audioBitrate.Text = "160";\r
             Check_ChapterMarkers.CheckState = CheckState.Checked;\r
             drp_audioSampleRate.Text = "48";\r
-            rtf_h264advanced.Text = "ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:subme=6:trellis=1:analyse=all:8x8dct:me=umh ";\r
+            rtf_h264advanced.Text = "ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:subme=6:trellis=1:analyse=all:8x8dct:me=umh";\r
             drp_deInterlace_option.Text = "None";\r
             check_2PassEncode.CheckState = CheckState.Unchecked;\r
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Unchecked;\r
             drp_audioCodec.Text = "AC3";\r
+\r
+            // Set file extension to MKV\r
+            string destination = text_destination.Text;\r
+            destination = destination.Replace(".mp4", ".mkv");\r
+            destination = destination.Replace(".avi", ".mkv");\r
+            destination = destination.Replace(".m4v", ".mkv");\r
+            destination = destination.Replace(".ogm", ".mkv");\r
+            text_destination.Text = destination;\r
         }\r
 \r
         private void mnu_DSQ_Click(object sender, EventArgs e)\r
         {\r
-            // Needs MKV\r
             CheckPixelRatio.CheckState = CheckState.Checked;\r
             text_width.Text = "";\r
             text_height.Text = "";\r
@@ -585,11 +605,18 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Checked;\r
             drp_audioCodec.Text = "AC3";\r
+\r
+            // Set file extension to MKV\r
+            string destination = text_destination.Text;\r
+            destination = destination.Replace(".mp4", ".mkv");\r
+            destination = destination.Replace(".avi", ".mkv");\r
+            destination = destination.Replace(".m4v", ".mkv");\r
+            destination = destination.Replace(".ogm", ".mkv");\r
+            text_destination.Text = destination;\r
         }\r
 \r
         private void mnu_film_Click(object sender, EventArgs e)\r
         {\r
-            // Needs MKV\r
             CheckPixelRatio.CheckState = CheckState.Checked;\r
             text_width.Text = "";\r
             text_height.Text = "";\r
@@ -607,6 +634,14 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Checked;\r
             drp_audioCodec.Text = "AC3";\r
+\r
+            // Set file extension to MKV\r
+            string destination = text_destination.Text;\r
+            destination = destination.Replace(".mp4", ".mkv");\r
+            destination = destination.Replace(".avi", ".mkv");\r
+            destination = destination.Replace(".m4v", ".mkv");\r
+            destination = destination.Replace(".ogm", ".mkv");\r
+            text_destination.Text = destination;\r
         }\r
 \r
         private void mnu_iphone_Click(object sender, EventArgs e)\r
@@ -758,7 +793,6 @@ namespace Handbrake
 \r
         private void mnu_television_Click(object sender, EventArgs e)\r
         {\r
-            // NEEDS MKV\r
             CheckPixelRatio.CheckState = CheckState.Unchecked;\r
             text_width.Text = "";\r
             text_height.Text = "";\r
@@ -776,6 +810,15 @@ namespace Handbrake
             drp_crop.Text = "No Crop";\r
             check_turbo.CheckState = CheckState.Checked;\r
             drp_audioCodec.Text = "AAC";\r
+\r
+            // Set file extension to MKV\r
+            string destination = text_destination.Text;\r
+            destination = destination.Replace(".mp4", ".mkv");\r
+            destination = destination.Replace(".avi", ".mkv");\r
+            destination = destination.Replace(".m4v", ".mkv");\r
+            destination = destination.Replace(".ogm", ".mkv");\r
+            text_destination.Text = destination;\r
+            \r
         }\r
 \r
 \r
@@ -1833,6 +1876,8 @@ namespace Handbrake
         }\r
 \r
         #endregion\r
+\r
+\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file