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://svn.handbrake.fr/HandBrake/trunk@819 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 62 insertions, 15 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 16e8c45bc..4016ddeca 100644
--- 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();

             this.OnlineDocumentationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

             this.mnu_wiki = new System.Windows.Forms.ToolStripMenuItem();

-            this.mnu_onlineDocs = new System.Windows.Forms.ToolStripMenuItem();

             this.mnu_faq = new System.Windows.Forms.ToolStripMenuItem();

+            this.mnu_onlineDocs = new System.Windows.Forms.ToolStripMenuItem();

             this.WebsiteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

             this.mnu_homepage = new System.Windows.Forms.ToolStripMenuItem();

             this.mnu_forum = new System.Windows.Forms.ToolStripMenuItem();

@@ -770,6 +770,13 @@ namespace Handbrake
             this.mnu_wiki.Text = "Wiki / User Guides";

             this.mnu_wiki.Click += new System.EventHandler(this.mnu_wiki_Click);

             // 

+            // mnu_faq

+            // 

+            this.mnu_faq.Name = "mnu_faq";

+            this.mnu_faq.Size = new System.Drawing.Size(195, 22);

+            this.mnu_faq.Text = "FAQ";

+            this.mnu_faq.Click += new System.EventHandler(this.mnu_faq_Click);

+            // 

             // mnu_onlineDocs

             // 

             this.mnu_onlineDocs.Name = "mnu_onlineDocs";

@@ -777,13 +784,6 @@ namespace Handbrake
             this.mnu_onlineDocs.Text = "Full Documentation List";

             this.mnu_onlineDocs.Click += new System.EventHandler(this.mnu_onlineDocs_Click);

             // 

-            // mnu_faq

-            // 

-            this.mnu_faq.Name = "mnu_faq";

-            this.mnu_faq.Size = new System.Drawing.Size(157, 22);

-            this.mnu_faq.Text = "FAQ";

-            this.mnu_faq.Click += new System.EventHandler(this.mnu_faq_Click);

-            // 

             // WebsiteToolStripMenuItem

             // 

             this.WebsiteToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

@@ -1722,6 +1722,7 @@ namespace Handbrake
             this.Check_ChapterMarkers.TabIndex = 50;

             this.Check_ChapterMarkers.Text = "Chapter Markers";

             this.Check_ChapterMarkers.UseVisualStyleBackColor = true;

+            this.Check_ChapterMarkers.CheckedChanged += new System.EventHandler(this.Check_ChapterMarkers_CheckedChanged);

             // 

             // CheckPixelRatio

             // 

@@ -1733,6 +1734,7 @@ namespace Handbrake
             this.CheckPixelRatio.TabIndex = 49;

             this.CheckPixelRatio.Text = "Anamorphic PAR";

             this.CheckPixelRatio.UseVisualStyleBackColor = true;

+            this.CheckPixelRatio.CheckedChanged += new System.EventHandler(this.CheckPixelRatio_CheckedChanged);

             // 

             // check_grayscale

             // 

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index def400cd5..e24bb223b 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -417,7 +417,6 @@ namespace Handbrake
 

         private void mnu_animation_Click(object sender, EventArgs e)

         {

-            // NEEDS MKV

             CheckPixelRatio.CheckState = CheckState.Checked;

             text_width.Text = "";

             text_height.Text = "";

@@ -435,6 +434,14 @@ namespace Handbrake
             drp_crop.Text = "No Crop";

             check_turbo.CheckState = CheckState.Checked;

             drp_audioCodec.Text = "AAC";

+

+            // Set file extension to MKV

+            string destination = text_destination.Text;

+            destination = destination.Replace(".mp4", ".mkv");

+            destination = destination.Replace(".avi", ".mkv");

+            destination = destination.Replace(".m4v", ".mkv");

+            destination = destination.Replace(".ogm", ".mkv");

+            text_destination.Text = destination;

         }

 

         private void mnu_appleTv_Click(object sender, EventArgs e)

@@ -460,7 +467,6 @@ namespace Handbrake
 

         private void mnu_bedlam_Click(object sender, EventArgs e)

         {

-            // NEEDS MKV

             CheckPixelRatio.CheckState = CheckState.Checked;

             text_width.Text = "";

             text_height.Text = "";

@@ -478,6 +484,14 @@ namespace Handbrake
             drp_crop.Text = "No Crop";

             check_turbo.CheckState = CheckState.Checked;

             drp_audioCodec.Text = "AC3";

+

+            // Set file extension to MKV

+            string destination = text_destination.Text;

+            destination = destination.Replace(".mp4", ".mkv");

+            destination = destination.Replace(".avi", ".mkv");

+            destination = destination.Replace(".m4v", ".mkv");

+            destination = destination.Replace(".ogm", ".mkv");

+            text_destination.Text = destination;

         }

 

         private void mnu_blind_Click(object sender, EventArgs e)

@@ -545,7 +559,6 @@ namespace Handbrake
 

         private void mnu_CQR_Click(object sender, EventArgs e)

         {

-            // NEEDS MKV

             CheckPixelRatio.CheckState = CheckState.Checked;

             text_width.Text = "";

             text_height.Text = "";

@@ -557,17 +570,24 @@ namespace Handbrake
             drp_audioBitrate.Text = "160";

             Check_ChapterMarkers.CheckState = CheckState.Checked;

             drp_audioSampleRate.Text = "48";

-            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 ";

+            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";

             drp_deInterlace_option.Text = "None";

             check_2PassEncode.CheckState = CheckState.Unchecked;

             drp_crop.Text = "No Crop";

             check_turbo.CheckState = CheckState.Unchecked;

             drp_audioCodec.Text = "AC3";

+

+            // Set file extension to MKV

+            string destination = text_destination.Text;

+            destination = destination.Replace(".mp4", ".mkv");

+            destination = destination.Replace(".avi", ".mkv");

+            destination = destination.Replace(".m4v", ".mkv");

+            destination = destination.Replace(".ogm", ".mkv");

+            text_destination.Text = destination;

         }

 

         private void mnu_DSQ_Click(object sender, EventArgs e)

         {

-            // Needs MKV

             CheckPixelRatio.CheckState = CheckState.Checked;

             text_width.Text = "";

             text_height.Text = "";

@@ -585,11 +605,18 @@ namespace Handbrake
             drp_crop.Text = "No Crop";

             check_turbo.CheckState = CheckState.Checked;

             drp_audioCodec.Text = "AC3";

+

+            // Set file extension to MKV

+            string destination = text_destination.Text;

+            destination = destination.Replace(".mp4", ".mkv");

+            destination = destination.Replace(".avi", ".mkv");

+            destination = destination.Replace(".m4v", ".mkv");

+            destination = destination.Replace(".ogm", ".mkv");

+            text_destination.Text = destination;

         }

 

         private void mnu_film_Click(object sender, EventArgs e)

         {

-            // Needs MKV

             CheckPixelRatio.CheckState = CheckState.Checked;

             text_width.Text = "";

             text_height.Text = "";

@@ -607,6 +634,14 @@ namespace Handbrake
             drp_crop.Text = "No Crop";

             check_turbo.CheckState = CheckState.Checked;

             drp_audioCodec.Text = "AC3";

+

+            // Set file extension to MKV

+            string destination = text_destination.Text;

+            destination = destination.Replace(".mp4", ".mkv");

+            destination = destination.Replace(".avi", ".mkv");

+            destination = destination.Replace(".m4v", ".mkv");

+            destination = destination.Replace(".ogm", ".mkv");

+            text_destination.Text = destination;

         }

 

         private void mnu_iphone_Click(object sender, EventArgs e)

@@ -758,7 +793,6 @@ namespace Handbrake
 

         private void mnu_television_Click(object sender, EventArgs e)

         {

-            // NEEDS MKV

             CheckPixelRatio.CheckState = CheckState.Unchecked;

             text_width.Text = "";

             text_height.Text = "";

@@ -776,6 +810,15 @@ namespace Handbrake
             drp_crop.Text = "No Crop";

             check_turbo.CheckState = CheckState.Checked;

             drp_audioCodec.Text = "AAC";

+

+            // Set file extension to MKV

+            string destination = text_destination.Text;

+            destination = destination.Replace(".mp4", ".mkv");

+            destination = destination.Replace(".avi", ".mkv");

+            destination = destination.Replace(".m4v", ".mkv");

+            destination = destination.Replace(".ogm", ".mkv");

+            text_destination.Text = destination;

+            

         }

 

 

@@ -1833,6 +1876,8 @@ namespace Handbrake
         }

 

         #endregion

+

+

         // This is the END of the road ------------------------------------------------------------------------------

     }

 }
\ No newline at end of file