From 0580ae3259179dd298e4fc49bf17846f4f8dda7d Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sun, 21 Dec 2008 17:08:55 +0000
Subject: [PATCH] WinGui: - Removed Experimental folder from project - Typo in
 Download window fixed.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2041 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 win/C#/HandBrakeCS.csproj |  27 --------
 win/C#/frmDownload.cs     |   2 +-
 win/C#/frmMain.cs         | 127 ++++++++++++++++++--------------------
 3 files changed, 61 insertions(+), 95 deletions(-)

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index ab257abea..9398afcbc 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -142,12 +142,6 @@
     <Compile Include="frmOptions.Designer.cs">
       <DependentUpon>frmOptions.cs</DependentUpon>
     </Compile>
-    <Compile Include="Experimental\frmPreviewAX.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Experimental\frmPreviewAX.Designer.cs">
-      <DependentUpon>frmPreviewAX.cs</DependentUpon>
-    </Compile>
     <Compile Include="frmQueue.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -205,9 +199,6 @@
       <SubType>Designer</SubType>
       <DependentUpon>frmOptions.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Experimental\frmPreviewAX.resx">
-      <DependentUpon>frmPreviewAX.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmQueue.resx">
       <SubType>Designer</SubType>
       <DependentUpon>frmQueue.cs</DependentUpon>
@@ -317,24 +308,6 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="AxAXVLC">
-      <Guid>{DF2BBE39-40A8-433B-A279-073F48DA94B6}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>aximp</WrapperTool>
-      <Isolated>False</Isolated>
-    </COMReference>
-    <COMReference Include="stdole">
-      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>2</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-    </COMReference>
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/win/C#/frmDownload.cs b/win/C#/frmDownload.cs
index 8fe53ba4f..459348dcb 100644
--- a/win/C#/frmDownload.cs
+++ b/win/C#/frmDownload.cs
@@ -92,7 +92,7 @@ namespace Handbrake
             }
             catch (Exception exc)
             {
-                MessageBox.Show("Integer Convertion Error On Download \n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show("Integer Conversion Error On Download \n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 6f971eb99..b7a169703 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -47,80 +47,73 @@ namespace Handbrake
 
         public frmMain()
         {
-            try
-            {
-                // Load the splash screen in this thread
-                Form splash = new frmSplashScreen();
-                splash.Show();
-
-                //Create a label that can be updated from the parent thread.
-                Label lblStatus = new Label();
-                lblStatus.Size = new Size(250, 20);
-                lblStatus.Location = new Point(10, 280);
-                splash.Controls.Add(lblStatus);
-                InitializeComponent();
-
-                // Update the users config file with the CLI version data.
-                lblStatus.Text = "Setting Version Data ...";
+            // Load the splash screen in this thread
+            Form splash = new frmSplashScreen();
+            splash.Show();
+
+            //Create a label that can be updated from the parent thread.
+            Label lblStatus = new Label();
+            lblStatus.Size = new Size(250, 20);
+            lblStatus.Location = new Point(10, 280);
+            splash.Controls.Add(lblStatus);
+            InitializeComponent();
+
+            // Update the users config file with the CLI version data.
+            lblStatus.Text = "Setting Version Data ...";
+            Application.DoEvents();
+            ArrayList x = hb_common_func.getCliVersionData();
+            Properties.Settings.Default.hb_build = int.Parse(x[1].ToString());
+            Properties.Settings.Default.hb_version = x[0].ToString();
+
+            // show the form, but leave disabled until preloading is complete then show the main form
+            this.Enabled = false;
+            this.Show();
+            Application.DoEvents(); // Forces frmMain to draw
+
+            // update the status
+            if (Properties.Settings.Default.updateStatus == "Checked")
+            {
+                lblStatus.Text = "Checking for updates ...";
                 Application.DoEvents();
-                ArrayList x = hb_common_func.getCliVersionData();
-                Properties.Settings.Default.hb_build = int.Parse(x[1].ToString());
-                Properties.Settings.Default.hb_version = x[0].ToString();
-
-                // show the form, but leave disabled until preloading is complete then show the main form
-                this.Enabled = false;
-                this.Show();
-                Application.DoEvents(); // Forces frmMain to draw
-
-                // update the status
-                if (Properties.Settings.Default.updateStatus == "Checked")
-                {
-                    lblStatus.Text = "Checking for updates ...";
-                    Application.DoEvents();
-                    Thread updateCheckThread = new Thread(startupUpdateCheck);
-                    updateCheckThread.Start();
-                }
+                Thread updateCheckThread = new Thread(startupUpdateCheck);
+                updateCheckThread.Start();
+            }
 
-                // Setup the GUI components
-                lblStatus.Text = "Setting up the GUI ...";
-                Application.DoEvents();
-                x264PanelFunctions.reset2Defaults(this); // Initialize all the x264 widgets to their default values
-                loadPresetPanel();                       // Load the Preset Panel
-                treeView_presets.ExpandAll();
-                lbl_encode.Text = "";
-                queueWindow = new frmQueue(this);        // Prepare the Queue
+            // Setup the GUI components
+            lblStatus.Text = "Setting up the GUI ...";
+            Application.DoEvents();
+            x264PanelFunctions.reset2Defaults(this); // Initialize all the x264 widgets to their default values
+            loadPresetPanel();                       // Load the Preset Panel
+            treeView_presets.ExpandAll();
+            lbl_encode.Text = "";
+            queueWindow = new frmQueue(this);        // Prepare the Queue
 
-                // Load the user's default settings or Normal Preset
-                if (Properties.Settings.Default.defaultSettings == "Checked" && Properties.Settings.Default.defaultUserSettings != "")
-                {
-                    Functions.QueryParser presetQuery = Functions.QueryParser.Parse(Properties.Settings.Default.defaultUserSettings);
-                    presetLoader.presetLoader(this, presetQuery, "User Defaults ");
-                }
-                else
-                    loadNormalPreset();
+            // Load the user's default settings or Normal Preset
+            if (Properties.Settings.Default.defaultSettings == "Checked" && Properties.Settings.Default.defaultUserSettings != "")
+            {
+                Functions.QueryParser presetQuery = Functions.QueryParser.Parse(Properties.Settings.Default.defaultUserSettings);
+                presetLoader.presetLoader(this, presetQuery, "User Defaults ");
+            }
+            else
+                loadNormalPreset();
 
-                // Enabled GUI tooltip's if Required
-                if (Properties.Settings.Default.tooltipEnable == "Checked")
-                    ToolTip.Active = true;
+            // Enabled GUI tooltip's if Required
+            if (Properties.Settings.Default.tooltipEnable == "Checked")
+                ToolTip.Active = true;
 
-                //Finished Loading
-                lblStatus.Text = "Loading Complete!";
-                Application.DoEvents();
-                splash.Close();
-                splash.Dispose();
-                this.Enabled = true;
+            //Finished Loading
+            lblStatus.Text = "Loading Complete!";
+            Application.DoEvents();
+            splash.Close();
+            splash.Dispose();
+            this.Enabled = true;
 
-                // Event Handlers
-                if (Properties.Settings.Default.MainWindowMinimize == "Checked")
-                    this.Resize += new EventHandler(frmMain_Resize);
+            // Event Handlers
+            if (Properties.Settings.Default.MainWindowMinimize == "Checked")
+                this.Resize += new EventHandler(frmMain_Resize);
 
-                // Queue Recovery
-                queueRecovery();
-            }
-            catch (Exception e)
-            {
-                MessageBox.Show("Error at startup: \n\n" + e);
-            }
+            // Queue Recovery
+            queueRecovery();
         }
 
         // Startup Functions
-- 
2.40.0