WinGui:

- Some improvements to error messages, about window, minor code style fixes.

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

diff --git a/win/C#/Presets/Import.cs b/win/C#/Presets/Import.cs
index 4d6b1b43a07f6f44ee3482ff9caaa367f7c9b389..03f192ea144cb120b0d50b5317d9aa3dc295b16c 100644 (file)
--- a/win/C#/Presets/Import.cs
+++ b/win/C#/Presets/Import.cs
@@ -11,25 +11,34 @@ namespace Handbrake.Presets
     {\r
         public QueryParser importMacPreset(string filename)\r
         {\r
-            if (!File.Exists(filename))\r
-                return null;\r
+            try\r
+            {\r
+                if (!File.Exists(filename))\r
+                    return null;\r
 \r
-            StreamReader sr = File.OpenText(filename);\r
-            string fromfile = string.Empty;\r
-            int fileChar;\r
-            while ((fileChar = sr.Read()) != -1)\r
-                fromfile += Convert.ToChar(fileChar);\r
+                StreamReader sr = File.OpenText(filename);\r
+                string fromfile = string.Empty;\r
+                int fileChar;\r
+                while ((fileChar = sr.Read()) != -1)\r
+                    fromfile += Convert.ToChar(fileChar);\r
 \r
-            XmlDocument doc = new XmlDocument();\r
-            doc.LoadXml(fromfile);\r
+                XmlDocument doc = new XmlDocument();\r
+                doc.LoadXml(fromfile);\r
 \r
-            XmlNode root = doc;\r
-            if (!root.HasChildNodes)\r
+                XmlNode root = doc;\r
+                if (!root.HasChildNodes)\r
+                {\r
+                    MessageBox.Show(\r
+                        "The Preset file you selected appears to be invlaid or from an older version of HandBrake", "Error",\r
+                        MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                    return null;\r
+                }\r
+            }\r
+            catch (Exception)\r
             {\r
                 MessageBox.Show(\r
-                    "The Preset file you selected appears to be invlaid or from an older version of HandBrake", "Error",\r
-                    MessageBoxButtons.OK, MessageBoxIcon.Error);\r
-                return null;\r
+                "The Preset file you selected appears to be invlaid or from an older version of HandBrake.\n\n Please note, if you are exporting from the MacGui you may need to rebuild your preset so that it uses the current preset plist format.\n The MacGui does not currently update user presets automatically.", "Error",\r
+                       MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
 \r
             // We'll query a query parser object and use it's public var structures to store all the data.\r
@@ -71,7 +80,7 @@ namespace Handbrake.Presets
                             break;\r
                     }\r
                 }\r
-               AudioInfo.Add(track);\r
+                AudioInfo.Add(track);\r
             }\r
             queryParsed.AudioInformation = AudioInfo;\r
 \r

diff --git a/win/C#/frmAbout.Designer.cs b/win/C#/frmAbout.Designer.cs
index 2b9c46faa9f050d203ec32a5b6d9133d3aacace8..05cdaeb11c75a99d2251c686d2e88d1c833f9004 100644 (file)
--- a/win/C#/frmAbout.Designer.cs
+++ b/win/C#/frmAbout.Designer.cs
@@ -40,6 +40,8 @@ namespace Handbrake
             this.lbl_HBBuild = new System.Windows.Forms.Label();\r
             this.PictureBox1 = new System.Windows.Forms.PictureBox();\r
             this.btn_close = new System.Windows.Forms.Button();\r
+            this.richTextBox1 = new System.Windows.Forms.RichTextBox();\r
+            this.label2 = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
@@ -93,7 +95,7 @@ namespace Handbrake
             // btn_close\r
             // \r
             this.btn_close.DialogResult = System.Windows.Forms.DialogResult.OK;\r
-            this.btn_close.Location = new System.Drawing.Point(274, 82);\r
+            this.btn_close.Location = new System.Drawing.Point(468, 279);\r
             this.btn_close.Name = "btn_close";\r
             this.btn_close.Size = new System.Drawing.Size(75, 23);\r
             this.btn_close.TabIndex = 35;\r
@@ -101,13 +103,34 @@ namespace Handbrake
             this.btn_close.UseVisualStyleBackColor = true;\r
             this.btn_close.Click += new System.EventHandler(this.btn_close_Click);\r
             // \r
+            // richTextBox1\r
+            // \r
+            this.richTextBox1.Location = new System.Drawing.Point(128, 111);\r
+            this.richTextBox1.Name = "richTextBox1";\r
+            this.richTextBox1.Size = new System.Drawing.Size(415, 162);\r
+            this.richTextBox1.TabIndex = 36;\r
+            this.richTextBox1.Text = resources.GetString("richTextBox1.Text");\r
+            // \r
+            // label2\r
+            // \r
+            this.label2.AutoSize = true;\r
+            this.label2.Location = new System.Drawing.Point(125, 92);\r
+            this.label2.Margin = new System.Windows.Forms.Padding(3);\r
+            this.label2.Name = "label2";\r
+            this.label2.Size = new System.Drawing.Size(46, 13);\r
+            this.label2.TabIndex = 37;\r
+            this.label2.Text = "License:";\r
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;\r
+            // \r
             // frmAbout\r
             // \r
             this.AcceptButton = this.btn_close;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;\r
             this.CancelButton = this.btn_close;\r
-            this.ClientSize = new System.Drawing.Size(363, 117);\r
+            this.ClientSize = new System.Drawing.Size(555, 314);\r
+            this.Controls.Add(this.label2);\r
+            this.Controls.Add(this.richTextBox1);\r
             this.Controls.Add(this.btn_close);\r
             this.Controls.Add(this.label1);\r
             this.Controls.Add(this.PictureBox1);\r
@@ -136,5 +159,7 @@ namespace Handbrake
         internal System.Windows.Forms.Label lbl_HBBuild;\r
         internal System.Windows.Forms.PictureBox PictureBox1;\r
         private System.Windows.Forms.Button btn_close;\r
+        private System.Windows.Forms.RichTextBox richTextBox1;\r
+        internal System.Windows.Forms.Label label2;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmAbout.resx b/win/C#/frmAbout.resx
index 37f92905aa75f4b64a504b27e90538792d5ec57a..796f0d5e9f82326c98a3e6d62cfd20adbca48ba4 100644 (file)
--- a/win/C#/frmAbout.resx
+++ b/win/C#/frmAbout.resx
@@ -117,6 +117,13 @@
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
+  <data name="richTextBox1.Text" xml:space="preserve">\r
+    <value>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</value>\r
+  </data>\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

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index 61d1b06ca64282592b5b0007447a6645dea58897..5f41c799bd50d4fcd7a31ef6d986c90bf888aa7a 100644 (file)
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -23,12 +23,12 @@ namespace Handbrake
         private static int _position;\r
         private static string _lastMode;\r
         private static string _currentMode;\r
-        private Thread monitor;\r
-        private Boolean kilLThread;\r
+        private Thread _monitor;\r
+        private Boolean _kilLThread;\r
 \r
         public frmActivityWindow(string mode)\r
         {\r
-            kilLThread = false;\r
+            _kilLThread = false;\r
             _position = 0;\r
             if (mode == "scan")\r
                 SetScanMode();\r
@@ -39,15 +39,15 @@ namespace Handbrake
         }\r
         private void NewActivityWindow_Load(object sender, EventArgs e)\r
         {\r
-            monitor = new Thread(LogMonitor);\r
+            _monitor = new Thread(LogMonitor);\r
             \r
             try\r
             {\r
-                monitor.Start();\r
+                _monitor.Start();\r
             }\r
             catch (Exception exc)\r
             {\r
-                MessageBox.Show(exc.ToString());\r
+                MessageBox.Show("Unable to monitor HandBrakes log files. Please report this error. If the problem presists, try rebooting your computer.\n\n Debug Informaton:\n" + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
         }\r
 \r
@@ -55,7 +55,7 @@ namespace Handbrake
         {\r
             while (true)\r
             {\r
-                if (!IsHandleCreated || kilLThread) // break out the thread if the window has been disposed.\r
+                if (!IsHandleCreated || _kilLThread) // break out the thread if the window has been disposed.\r
                     break;\r
 \r
                 // Perform a reset if require.\r
@@ -135,7 +135,7 @@ namespace Handbrake
             }\r
             catch (Exception exc)\r
             {\r
-                appendText.AppendFormat("\nERROR: The Log file could not be read. You may need to restart HandBrake! " + exc);\r
+                appendText.AppendFormat("\n The Log file could not be read. You may need to restart HandBrake! " + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
                 _position = 0;\r
                 ClearWindowText();\r
             }\r
@@ -161,7 +161,7 @@ namespace Handbrake
             }\r
             catch (Exception exc)\r
             {\r
-                MessageBox.Show("SetWindowText(): Exception: \n" + exc);\r
+                MessageBox.Show("Unless you are having problems, you can probably ignore this error. It would not hurt to report this error!\n\nSetWindowText(): Exception: \n" + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
             }\r
         }\r
         private void ClearWindowText()\r
@@ -181,7 +181,7 @@ namespace Handbrake
             }\r
             catch (Exception exc)\r
             {\r
-                MessageBox.Show("ClearWindowText(): Exception: \n" + exc);\r
+                MessageBox.Show("Unless you are having problems, you can probably ignore this error. It would not hurt to report this error!\n\nClearWindowText(): Exception: \n" + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
             }\r
         }\r
         private void PrintLogHeader()\r
@@ -212,7 +212,7 @@ namespace Handbrake
             }\r
             catch (Exception exc)\r
             {\r
-                MessageBox.Show("PrintLogHeader(): Exception: \n" + exc);\r
+                MessageBox.Show("Unless you are having problems, you can probably ignore this error. It would not hurt to report this error!\n\nPrintLogHeader(): Exception: \n" + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
             }\r
 \r
         }\r
@@ -318,9 +318,9 @@ namespace Handbrake
 \r
         protected override void OnClosing(CancelEventArgs e)\r
         {\r
-            kilLThread = true;\r
-            monitor.Interrupt();\r
-            monitor.Join();\r
+            _kilLThread = true;\r
+            _monitor.Interrupt();\r
+            _monitor.Join();\r
             e.Cancel = true;\r
             this.Dispose();\r
             base.OnClosing(e);\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 5133bcfe16d001b09414e90a173c8cd3cdbaf51e..57ba75590c7054fafff4331fcb1c37df5f126ce8 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -90,7 +90,6 @@ namespace Handbrake
             this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_user_guide = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_handbrake_home = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_handbrake_forums = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_UpdateCheck = new System.Windows.Forms.ToolStripMenuItem();\r
             this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();\r
@@ -100,8 +99,10 @@ namespace Handbrake
             this.Label47 = new System.Windows.Forms.Label();\r
             this.Label3 = new System.Windows.Forms.Label();\r
             this.tab_audio = new System.Windows.Forms.TabPage();\r
+            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);\r
             this.tab_video = new System.Windows.Forms.TabPage();\r
+            this.lbl_qualityValue = new System.Windows.Forms.Label();\r
             this.radio_cq = new System.Windows.Forms.RadioButton();\r
             this.radio_avgBitrate = new System.Windows.Forms.RadioButton();\r
             this.radio_targetFilesize = new System.Windows.Forms.RadioButton();\r
@@ -111,13 +112,17 @@ namespace Handbrake
             this.lbl_SliderValue = new System.Windows.Forms.Label();\r
             this.Label46 = new System.Windows.Forms.Label();\r
             this.tab_picture = new System.Windows.Forms.TabPage();\r
+            this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
             this.tabs_panel = new System.Windows.Forms.TabControl();\r
             this.tab_filters = new System.Windows.Forms.TabPage();\r
+            this.Filters = new Handbrake.Controls.Filters();\r
             this.tab_subtitles = new System.Windows.Forms.TabPage();\r
+            this.Subtitles = new Handbrake.Controls.Subtitles();\r
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
             this.label31 = new System.Windows.Forms.Label();\r
             this.tab_advanced = new System.Windows.Forms.TabPage();\r
+            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             this.tab_query = new System.Windows.Forms.TabPage();\r
             this.btn_clear = new System.Windows.Forms.Button();\r
             this.label34 = new System.Windows.Forms.Label();\r
@@ -171,12 +176,6 @@ namespace Handbrake
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();\r
             this.openPreset = new System.Windows.Forms.OpenFileDialog();\r
             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();\r
-            this.lbl_qualityValue = new System.Windows.Forms.Label();\r
-            this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
-            this.Filters = new Handbrake.Controls.Filters();\r
-            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
-            this.Subtitles = new Handbrake.Controls.Subtitles();\r
-            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -684,7 +683,6 @@ namespace Handbrake
             this.HelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.mnu_user_guide,\r
             this.mnu_handbrake_home,\r
-            this.mnu_handbrake_forums,\r
             this.ToolStripSeparator3,\r
             this.mnu_UpdateCheck,\r
             this.toolStripSeparator6,\r
@@ -709,13 +707,6 @@ namespace Handbrake
             this.mnu_handbrake_home.Text = "HandBrake Homepage";\r
             this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click);\r
             // \r
-            // mnu_handbrake_forums\r
-            // \r
-            this.mnu_handbrake_forums.Name = "mnu_handbrake_forums";\r
-            this.mnu_handbrake_forums.Size = new System.Drawing.Size(194, 22);\r
-            this.mnu_handbrake_forums.Text = "HandBrake Forums";\r
-            this.mnu_handbrake_forums.Click += new System.EventHandler(this.mnu_handbrake_forums_Click);\r
-            // \r
             // ToolStripSeparator3\r
             // \r
             this.ToolStripSeparator3.Name = "ToolStripSeparator3";\r
@@ -800,6 +791,15 @@ namespace Handbrake
             this.tab_audio.Text = "Audio";\r
             this.tab_audio.UseVisualStyleBackColor = true;\r
             // \r
+            // AudioSettings\r
+            // \r
+            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
+            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.AudioSettings.Name = "AudioSettings";\r
+            this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
+            this.AudioSettings.TabIndex = 0;\r
+            // \r
             // AudioMenuRowHeightHack\r
             // \r
             this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;\r
@@ -833,6 +833,16 @@ namespace Handbrake
             this.tab_video.Text = "Video";\r
             this.tab_video.UseVisualStyleBackColor = true;\r
             // \r
+            // lbl_qualityValue\r
+            // \r
+            this.lbl_qualityValue.AutoSize = true;\r
+            this.lbl_qualityValue.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_qualityValue.Location = new System.Drawing.Point(534, 100);\r
+            this.lbl_qualityValue.Name = "lbl_qualityValue";\r
+            this.lbl_qualityValue.Size = new System.Drawing.Size(24, 13);\r
+            this.lbl_qualityValue.TabIndex = 19;\r
+            this.lbl_qualityValue.Text = "0%";\r
+            // \r
             // radio_cq\r
             // \r
             this.radio_cq.AutoSize = true;\r
@@ -938,6 +948,16 @@ namespace Handbrake
             this.tab_picture.Text = "Picture";\r
             this.tab_picture.UseVisualStyleBackColor = true;\r
             // \r
+            // PictureSettings\r
+            // \r
+            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
+            this.PictureSettings.Enabled = false;\r
+            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.PictureSettings.Name = "PictureSettings";\r
+            this.PictureSettings.Size = new System.Drawing.Size(666, 279);\r
+            this.PictureSettings.TabIndex = 0;\r
+            // \r
             // Check_ChapterMarkers\r
             // \r
             this.Check_ChapterMarkers.AutoSize = true;\r
@@ -977,6 +997,15 @@ namespace Handbrake
             this.tab_filters.Text = "Video Filters";\r
             this.tab_filters.UseVisualStyleBackColor = true;\r
             // \r
+            // Filters\r
+            // \r
+            this.Filters.BackColor = System.Drawing.Color.Transparent;\r
+            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Filters.Location = new System.Drawing.Point(0, 0);\r
+            this.Filters.Name = "Filters";\r
+            this.Filters.Size = new System.Drawing.Size(713, 310);\r
+            this.Filters.TabIndex = 0;\r
+            // \r
             // tab_subtitles\r
             // \r
             this.tab_subtitles.Controls.Add(this.Subtitles);\r
@@ -988,6 +1017,15 @@ namespace Handbrake
             this.tab_subtitles.Text = "Subtitles";\r
             this.tab_subtitles.UseVisualStyleBackColor = true;\r
             // \r
+            // Subtitles\r
+            // \r
+            this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
+            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
+            this.Subtitles.Name = "Subtitles";\r
+            this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
+            this.Subtitles.TabIndex = 0;\r
+            // \r
             // tab_chapters\r
             // \r
             this.tab_chapters.BackColor = System.Drawing.Color.Transparent;\r
@@ -1025,6 +1063,16 @@ namespace Handbrake
             this.tab_advanced.Text = "Advanced";\r
             this.tab_advanced.UseVisualStyleBackColor = true;\r
             // \r
+            // x264Panel\r
+            // \r
+            this.x264Panel.BackColor = System.Drawing.Color.Transparent;\r
+            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
+            this.x264Panel.Name = "x264Panel";\r
+            this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
+            this.x264Panel.TabIndex = 0;\r
+            this.x264Panel.x264Query = "";\r
+            // \r
             // tab_query\r
             // \r
             this.tab_query.Controls.Add(this.btn_clear);\r
@@ -1598,63 +1646,6 @@ namespace Handbrake
             // \r
             this.File_ChapterImport.Filter = "CSV Files|*.csv";\r
             // \r
-            // lbl_qualityValue\r
-            // \r
-            this.lbl_qualityValue.AutoSize = true;\r
-            this.lbl_qualityValue.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_qualityValue.Location = new System.Drawing.Point(534, 100);\r
-            this.lbl_qualityValue.Name = "lbl_qualityValue";\r
-            this.lbl_qualityValue.Size = new System.Drawing.Size(24, 13);\r
-            this.lbl_qualityValue.TabIndex = 19;\r
-            this.lbl_qualityValue.Text = "0%";\r
-            // \r
-            // PictureSettings\r
-            // \r
-            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
-            this.PictureSettings.Enabled = false;\r
-            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.PictureSettings.Name = "PictureSettings";\r
-            this.PictureSettings.Size = new System.Drawing.Size(666, 279);\r
-            this.PictureSettings.TabIndex = 0;\r
-            // \r
-            // Filters\r
-            // \r
-            this.Filters.BackColor = System.Drawing.Color.Transparent;\r
-            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Filters.Location = new System.Drawing.Point(0, 0);\r
-            this.Filters.Name = "Filters";\r
-            this.Filters.Size = new System.Drawing.Size(713, 310);\r
-            this.Filters.TabIndex = 0;\r
-            // \r
-            // AudioSettings\r
-            // \r
-            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
-            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.AudioSettings.Name = "AudioSettings";\r
-            this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
-            this.AudioSettings.TabIndex = 0;\r
-            // \r
-            // Subtitles\r
-            // \r
-            this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
-            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
-            this.Subtitles.Name = "Subtitles";\r
-            this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
-            this.Subtitles.TabIndex = 0;\r
-            // \r
-            // x264Panel\r
-            // \r
-            this.x264Panel.BackColor = System.Drawing.Color.Transparent;\r
-            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
-            this.x264Panel.Name = "x264Panel";\r
-            this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
-            this.x264Panel.TabIndex = 0;\r
-            this.x264Panel.x264Query = "";\r
-            // \r
             // frmMain\r
             // \r
             this.AllowDrop = true;\r
@@ -1793,7 +1784,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem btn_file_source;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_delete_preset;\r
         private System.Windows.Forms.ToolStripMenuItem btn_new_preset;\r
-        private System.Windows.Forms.ToolStripMenuItem mnu_handbrake_forums;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_user_guide;\r
         private System.Windows.Forms.ToolStripDropDownButton btn_source;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index ecbd859961c22c4afe074fed6cc660846b1c75c1..cdd062bb5f652d6db71b1f71aa88dafab625925d 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -386,10 +386,6 @@ namespace Handbrake
         #endregion\r
 \r
         #region Help Menu\r
-        private void mnu_handbrake_forums_Click(object sender, EventArgs e)\r
-        {\r
-            Process.Start("http://forum.handbrake.fr/");\r
-        }\r
         private void mnu_user_guide_Click(object sender, EventArgs e)\r
         {\r
             Process.Start("http://trac.handbrake.fr/wiki/HandBrakeGuide");\r