WinGui:

- Removed some white space in a few files.
- Untied options window from frmMain.

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

8 files changed, 60 insertions, 22 deletions

diff --git a/win/C#/Functions/AppcastReader.cs b/win/C#/Functions/AppcastReader.cs
index dfe96eb74..e14d2c1a7 100644
--- a/win/C#/Functions/AppcastReader.cs
+++ b/win/C#/Functions/AppcastReader.cs
@@ -58,7 +58,6 @@ namespace Handbrake.Functions
                 unstable_file = nodeItem["windows"].InnerText;

             }

 

-

             // Set the global version information

             if (stable_build >= unstable_build)

             {

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 759a58da1..ae53f467b 100644
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -779,7 +779,6 @@ namespace Handbrake.Functions
         /// </summary>

         /// <param name="input">A ClI Query</param>

         /// <returns>A Parsed Query</returns>

- 

         public static QueryParser Parse(String input)

         {

             QueryParser thisQuery = new QueryParser();

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 50511e35f..73667f78e 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -100,6 +100,12 @@
     <Reference Include="System.XML" />

   </ItemGroup>

   <ItemGroup>

+    <Compile Include="frmPreview.cs">

+      <SubType>Form</SubType>

+    </Compile>

+    <Compile Include="frmPreview.Designer.cs">

+      <DependentUpon>frmPreview.cs</DependentUpon>

+    </Compile>

     <Compile Include="frmActivityWindow.cs">

       <SubType>Form</SubType>

     </Compile>

@@ -136,6 +142,12 @@
     <Compile Include="frmMain.Designer.cs">

       <DependentUpon>frmMain.cs</DependentUpon>

     </Compile>

+    <Compile Include="frmMainBasic.cs">

+      <SubType>Form</SubType>

+    </Compile>

+    <Compile Include="frmMainBasic.Designer.cs">

+      <DependentUpon>frmMainBasic.cs</DependentUpon>

+    </Compile>

     <Compile Include="frmOptions.cs">

       <SubType>Form</SubType>

     </Compile>

@@ -172,6 +184,10 @@
     <Compile Include="Parsing\Title.cs" />

     <Compile Include="Program.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />

+    <EmbeddedResource Include="frmPreview.resx">

+      <DependentUpon>frmPreview.cs</DependentUpon>

+      <SubType>Designer</SubType>

+    </EmbeddedResource>

     <EmbeddedResource Include="frmActivityWindow.resx">

       <DependentUpon>frmActivityWindow.cs</DependentUpon>

       <SubType>Designer</SubType>

@@ -196,6 +212,10 @@
       <SubType>Designer</SubType>

       <DependentUpon>frmMain.cs</DependentUpon>

     </EmbeddedResource>

+    <EmbeddedResource Include="frmMainBasic.resx">

+      <DependentUpon>frmMainBasic.cs</DependentUpon>

+      <SubType>Designer</SubType>

+    </EmbeddedResource>

     <EmbeddedResource Include="frmOptions.resx">

       <SubType>Designer</SubType>

       <DependentUpon>frmOptions.cs</DependentUpon>

@@ -310,6 +330,43 @@
       <Install>true</Install>

     </BootstrapperPackage>

   </ItemGroup>

+  <ItemGroup>

+    <COMReference Include="AxQTOControlLib">

+      <Guid>{7B92F833-027D-402B-BFF9-A67697366F4E}</Guid>

+      <VersionMajor>1</VersionMajor>

+      <VersionMinor>0</VersionMinor>

+      <Lcid>0</Lcid>

+      <WrapperTool>aximp</WrapperTool>

+      <Isolated>False</Isolated>

+    </COMReference>

+    <COMReference Include="QTOControlLib">

+      <Guid>{7B92F833-027D-402B-BFF9-A67697366F4E}</Guid>

+      <VersionMajor>1</VersionMajor>

+      <VersionMinor>0</VersionMinor>

+      <Lcid>0</Lcid>

+      <WrapperTool>tlbimp</WrapperTool>

+      <Isolated>False</Isolated>

+    </COMReference>

+    <COMReference Include="QTOLibrary">

+      <Guid>{29866AED-1E14-417D-BA0F-1A2BE6F5A19E}</Guid>

+      <VersionMajor>1</VersionMajor>

+      <VersionMinor>0</VersionMinor>

+      <Lcid>0</Lcid>

+      <WrapperTool>tlbimp</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>

+  <ItemGroup>

+    <Folder Include="Experimental\" />

+  </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#/frmMain.cs b/win/C#/frmMain.cs
index 6f9341641..7fcd2fb32 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -208,7 +208,7 @@ namespace Handbrake
         }

         private void mnu_options_Click(object sender, EventArgs e)

         {

-            Form Options = new frmOptions(this);

+            Form Options = new frmOptions();

             Options.ShowDialog();

         }

         #endregion

diff --git a/win/C#/frmMain/PresetLoader.cs b/win/C#/frmMain/PresetLoader.cs
index b21b3556a..3a574b98f 100644
--- a/win/C#/frmMain/PresetLoader.cs
+++ b/win/C#/frmMain/PresetLoader.cs
@@ -99,7 +99,6 @@ namespace Handbrake
                     mainWindow.text_bottom.Value = bottom;

                     mainWindow.text_left.Value = left;

                     mainWindow.text_right.Value = right;

-                    

                 }

 

                 if (presetQuery.Width != 0)

diff --git a/win/C#/frmMain/x264Panel.cs b/win/C#/frmMain/x264Panel.cs
index a4cb7ecbb..e3a52fd65 100644
--- a/win/C#/frmMain/x264Panel.cs
+++ b/win/C#/frmMain/x264Panel.cs
@@ -554,7 +554,6 @@ namespace Handbrake
                             else

                                 thisOpt = "";

                         }

-

                     }

                 }

 

@@ -760,7 +759,6 @@ namespace Handbrake
                 mainWindow.check_weightedBFrames.Visible = true;

                 mainWindow.drop_directPrediction.Visible = true;

                 mainWindow.lbl_direct_prediction.Visible = true;

-                

             }

             else

             {

@@ -800,9 +798,7 @@ namespace Handbrake
                     mainWindow.check_mixedReferences.CheckState = CheckState.Unchecked;

             }

             else

-            {

                 mainWindow.check_mixedReferences.Visible = true;

-            }

         }

 

     }

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 695f2c3b2..5dd7247d8 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -286,7 +286,7 @@ namespace Handbrake
             this.check_tooltip.Size = new System.Drawing.Size(135, 17);

             this.check_tooltip.TabIndex = 70;

             this.check_tooltip.Text = "Enable GUI tooltips";

-            this.ToolTip.SetToolTip(this.check_tooltip, "Enable the built in tooltips for gui controls.");

+            this.ToolTip.SetToolTip(this.check_tooltip, "Enable the built in tooltips for gui controls. (Requires Restart)");

             this.check_tooltip.UseVisualStyleBackColor = false;

             this.check_tooltip.CheckedChanged += new System.EventHandler(this.check_tooltip_CheckedChanged);

             // 

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index e31e41abf..ff2fab0f0 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -16,14 +16,12 @@ namespace Handbrake
 {

     public partial class frmOptions : Form

     {

-        private frmMain mainWindow;

         /// <summary>

         /// When the form loads, Initialise all the setting components with their correct values

         /// </summary>

-        public frmOptions(frmMain window)

+        public frmOptions()

         {

             InitializeComponent();

-            mainWindow = window;

 

             // #############################

             // General

@@ -136,16 +134,6 @@ namespace Handbrake
         private void check_tooltip_CheckedChanged(object sender, EventArgs e)

         {

             Properties.Settings.Default.tooltipEnable = check_tooltip.CheckState.ToString();

-            if (check_tooltip.Checked)

-            {

-                ToolTip.Active = true;

-                mainWindow.ToolTip.Active = true;

-            }

-            else

-            {

-                ToolTip.Active = false;

-                mainWindow.ToolTip.Active = false;

-            }

         }

         private void drp_completeOption_SelectedIndexChanged(object sender, EventArgs e)

         {