WinGui:

- Removed Experimental folder from project
- Typo in Download window fixed.

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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index ab257ab..9398afc 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -142,12 +142,6 @@
     <Compile Include="frmOptions.Designer.cs">\r
       <DependentUpon>frmOptions.cs</DependentUpon>\r
     </Compile>\r
-    <Compile Include="Experimental\frmPreviewAX.cs">\r
-      <SubType>Form</SubType>\r
-    </Compile>\r
-    <Compile Include="Experimental\frmPreviewAX.Designer.cs">\r
-      <DependentUpon>frmPreviewAX.cs</DependentUpon>\r
-    </Compile>\r
     <Compile Include="frmQueue.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
@@ -205,9 +199,6 @@
       <SubType>Designer</SubType>\r
       <DependentUpon>frmOptions.cs</DependentUpon>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="Experimental\frmPreviewAX.resx">\r
-      <DependentUpon>frmPreviewAX.cs</DependentUpon>\r
-    </EmbeddedResource>\r
     <EmbeddedResource Include="frmQueue.resx">\r
       <SubType>Designer</SubType>\r
       <DependentUpon>frmQueue.cs</DependentUpon>\r
@@ -317,24 +308,6 @@
       <Install>true</Install>\r
     </BootstrapperPackage>\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <COMReference Include="AxAXVLC">\r
-      <Guid>{DF2BBE39-40A8-433B-A279-073F48DA94B6}</Guid>\r
-      <VersionMajor>1</VersionMajor>\r
-      <VersionMinor>0</VersionMinor>\r
-      <Lcid>0</Lcid>\r
-      <WrapperTool>aximp</WrapperTool>\r
-      <Isolated>False</Isolated>\r
-    </COMReference>\r
-    <COMReference Include="stdole">\r
-      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>\r
-      <VersionMajor>2</VersionMajor>\r
-      <VersionMinor>0</VersionMinor>\r
-      <Lcid>0</Lcid>\r
-      <WrapperTool>primary</WrapperTool>\r
-      <Isolated>False</Isolated>\r
-    </COMReference>\r
-  </ItemGroup>\r
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r

diff --git a/win/C#/frmDownload.cs b/win/C#/frmDownload.cs
index 8fe53ba..459348d 100644 (file)
--- a/win/C#/frmDownload.cs
+++ b/win/C#/frmDownload.cs
@@ -92,7 +92,7 @@ namespace Handbrake
             }\r
             catch (Exception exc)\r
             {\r
-                MessageBox.Show("Integer Convertion Error On Download \n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                MessageBox.Show("Integer Conversion Error On Download \n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
         }\r
 \r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 6f971eb..b7a1697 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -47,80 +47,73 @@ namespace Handbrake
 \r
         public frmMain()\r
         {\r
-            try\r
-            {\r
-                // Load the splash screen in this thread\r
-                Form splash = new frmSplashScreen();\r
-                splash.Show();\r
-\r
-                //Create a label that can be updated from the parent thread.\r
-                Label lblStatus = new Label();\r
-                lblStatus.Size = new Size(250, 20);\r
-                lblStatus.Location = new Point(10, 280);\r
-                splash.Controls.Add(lblStatus);\r
-                InitializeComponent();\r
-\r
-                // Update the users config file with the CLI version data.\r
-                lblStatus.Text = "Setting Version Data ...";\r
+            // Load the splash screen in this thread\r
+            Form splash = new frmSplashScreen();\r
+            splash.Show();\r
+\r
+            //Create a label that can be updated from the parent thread.\r
+            Label lblStatus = new Label();\r
+            lblStatus.Size = new Size(250, 20);\r
+            lblStatus.Location = new Point(10, 280);\r
+            splash.Controls.Add(lblStatus);\r
+            InitializeComponent();\r
+\r
+            // Update the users config file with the CLI version data.\r
+            lblStatus.Text = "Setting Version Data ...";\r
+            Application.DoEvents();\r
+            ArrayList x = hb_common_func.getCliVersionData();\r
+            Properties.Settings.Default.hb_build = int.Parse(x[1].ToString());\r
+            Properties.Settings.Default.hb_version = x[0].ToString();\r
+\r
+            // show the form, but leave disabled until preloading is complete then show the main form\r
+            this.Enabled = false;\r
+            this.Show();\r
+            Application.DoEvents(); // Forces frmMain to draw\r
+\r
+            // update the status\r
+            if (Properties.Settings.Default.updateStatus == "Checked")\r
+            {\r
+                lblStatus.Text = "Checking for updates ...";\r
                 Application.DoEvents();\r
-                ArrayList x = hb_common_func.getCliVersionData();\r
-                Properties.Settings.Default.hb_build = int.Parse(x[1].ToString());\r
-                Properties.Settings.Default.hb_version = x[0].ToString();\r
-\r
-                // show the form, but leave disabled until preloading is complete then show the main form\r
-                this.Enabled = false;\r
-                this.Show();\r
-                Application.DoEvents(); // Forces frmMain to draw\r
-\r
-                // update the status\r
-                if (Properties.Settings.Default.updateStatus == "Checked")\r
-                {\r
-                    lblStatus.Text = "Checking for updates ...";\r
-                    Application.DoEvents();\r
-                    Thread updateCheckThread = new Thread(startupUpdateCheck);\r
-                    updateCheckThread.Start();\r
-                }\r
+                Thread updateCheckThread = new Thread(startupUpdateCheck);\r
+                updateCheckThread.Start();\r
+            }\r
 \r
-                // Setup the GUI components\r
-                lblStatus.Text = "Setting up the GUI ...";\r
-                Application.DoEvents();\r
-                x264PanelFunctions.reset2Defaults(this); // Initialize all the x264 widgets to their default values\r
-                loadPresetPanel();                       // Load the Preset Panel\r
-                treeView_presets.ExpandAll();\r
-                lbl_encode.Text = "";\r
-                queueWindow = new frmQueue(this);        // Prepare the Queue\r
+            // Setup the GUI components\r
+            lblStatus.Text = "Setting up the GUI ...";\r
+            Application.DoEvents();\r
+            x264PanelFunctions.reset2Defaults(this); // Initialize all the x264 widgets to their default values\r
+            loadPresetPanel();                       // Load the Preset Panel\r
+            treeView_presets.ExpandAll();\r
+            lbl_encode.Text = "";\r
+            queueWindow = new frmQueue(this);        // Prepare the Queue\r
 \r
-                // Load the user's default settings or Normal Preset\r
-                if (Properties.Settings.Default.defaultSettings == "Checked" && Properties.Settings.Default.defaultUserSettings != "")\r
-                {\r
-                    Functions.QueryParser presetQuery = Functions.QueryParser.Parse(Properties.Settings.Default.defaultUserSettings);\r
-                    presetLoader.presetLoader(this, presetQuery, "User Defaults ");\r
-                }\r
-                else\r
-                    loadNormalPreset();\r
+            // Load the user's default settings or Normal Preset\r
+            if (Properties.Settings.Default.defaultSettings == "Checked" && Properties.Settings.Default.defaultUserSettings != "")\r
+            {\r
+                Functions.QueryParser presetQuery = Functions.QueryParser.Parse(Properties.Settings.Default.defaultUserSettings);\r
+                presetLoader.presetLoader(this, presetQuery, "User Defaults ");\r
+            }\r
+            else\r
+                loadNormalPreset();\r
 \r
-                // Enabled GUI tooltip's if Required\r
-                if (Properties.Settings.Default.tooltipEnable == "Checked")\r
-                    ToolTip.Active = true;\r
+            // Enabled GUI tooltip's if Required\r
+            if (Properties.Settings.Default.tooltipEnable == "Checked")\r
+                ToolTip.Active = true;\r
 \r
-                //Finished Loading\r
-                lblStatus.Text = "Loading Complete!";\r
-                Application.DoEvents();\r
-                splash.Close();\r
-                splash.Dispose();\r
-                this.Enabled = true;\r
+            //Finished Loading\r
+            lblStatus.Text = "Loading Complete!";\r
+            Application.DoEvents();\r
+            splash.Close();\r
+            splash.Dispose();\r
+            this.Enabled = true;\r
 \r
-                // Event Handlers\r
-                if (Properties.Settings.Default.MainWindowMinimize == "Checked")\r
-                    this.Resize += new EventHandler(frmMain_Resize);\r
+            // Event Handlers\r
+            if (Properties.Settings.Default.MainWindowMinimize == "Checked")\r
+                this.Resize += new EventHandler(frmMain_Resize);\r
 \r
-                // Queue Recovery\r
-                queueRecovery();\r
-            }\r
-            catch (Exception e)\r
-            {\r
-                MessageBox.Show("Error at startup: \n\n" + e);\r
-            }\r
+            // Queue Recovery\r
+            queueRecovery();\r
         }\r
 \r
         // Startup Functions\r