WinGui:

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

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

diff --git a/win/C#/Functions/AppcastReader.cs b/win/C#/Functions/AppcastReader.cs
index dfe96eb..e14d2c1 100644 (file)
--- a/win/C#/Functions/AppcastReader.cs
+++ b/win/C#/Functions/AppcastReader.cs
@@ -58,7 +58,6 @@ namespace Handbrake.Functions
                 unstable_file = nodeItem["windows"].InnerText;\r
             }\r
 \r
-\r
             // Set the global version information\r
             if (stable_build >= unstable_build)\r
             {\r

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 759a58d..ae53f46 100644 (file)
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -779,7 +779,6 @@ namespace Handbrake.Functions
         /// </summary>\r
         /// <param name="input">A ClI Query</param>\r
         /// <returns>A Parsed Query</returns>\r
- \r
         public static QueryParser Parse(String input)\r
         {\r
             QueryParser thisQuery = new QueryParser();\r

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 50511e3..73667f7 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -100,6 +100,12 @@
     <Reference Include="System.XML" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <Compile Include="frmPreview.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="frmPreview.Designer.cs">\r
+      <DependentUpon>frmPreview.cs</DependentUpon>\r
+    </Compile>\r
     <Compile Include="frmActivityWindow.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
@@ -136,6 +142,12 @@
     <Compile Include="frmMain.Designer.cs">\r
       <DependentUpon>frmMain.cs</DependentUpon>\r
     </Compile>\r
+    <Compile Include="frmMainBasic.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="frmMainBasic.Designer.cs">\r
+      <DependentUpon>frmMainBasic.cs</DependentUpon>\r
+    </Compile>\r
     <Compile Include="frmOptions.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
@@ -172,6 +184,10 @@
     <Compile Include="Parsing\Title.cs" />\r
     <Compile Include="Program.cs" />\r
     <Compile Include="Properties\AssemblyInfo.cs" />\r
+    <EmbeddedResource Include="frmPreview.resx">\r
+      <DependentUpon>frmPreview.cs</DependentUpon>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
     <EmbeddedResource Include="frmActivityWindow.resx">\r
       <DependentUpon>frmActivityWindow.cs</DependentUpon>\r
       <SubType>Designer</SubType>\r
@@ -196,6 +212,10 @@
       <SubType>Designer</SubType>\r
       <DependentUpon>frmMain.cs</DependentUpon>\r
     </EmbeddedResource>\r
+    <EmbeddedResource Include="frmMainBasic.resx">\r
+      <DependentUpon>frmMainBasic.cs</DependentUpon>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
     <EmbeddedResource Include="frmOptions.resx">\r
       <SubType>Designer</SubType>\r
       <DependentUpon>frmOptions.cs</DependentUpon>\r
@@ -310,6 +330,43 @@
       <Install>true</Install>\r
     </BootstrapperPackage>\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <COMReference Include="AxQTOControlLib">\r
+      <Guid>{7B92F833-027D-402B-BFF9-A67697366F4E}</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="QTOControlLib">\r
+      <Guid>{7B92F833-027D-402B-BFF9-A67697366F4E}</Guid>\r
+      <VersionMajor>1</VersionMajor>\r
+      <VersionMinor>0</VersionMinor>\r
+      <Lcid>0</Lcid>\r
+      <WrapperTool>tlbimp</WrapperTool>\r
+      <Isolated>False</Isolated>\r
+    </COMReference>\r
+    <COMReference Include="QTOLibrary">\r
+      <Guid>{29866AED-1E14-417D-BA0F-1A2BE6F5A19E}</Guid>\r
+      <VersionMajor>1</VersionMajor>\r
+      <VersionMinor>0</VersionMinor>\r
+      <Lcid>0</Lcid>\r
+      <WrapperTool>tlbimp</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
+  <ItemGroup>\r
+    <Folder Include="Experimental\" />\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#/frmMain.cs b/win/C#/frmMain.cs
index 6f93416..7fcd2fb 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -208,7 +208,7 @@ namespace Handbrake
         }\r
         private void mnu_options_Click(object sender, EventArgs e)\r
         {\r
-            Form Options = new frmOptions(this);\r
+            Form Options = new frmOptions();\r
             Options.ShowDialog();\r
         }\r
         #endregion\r

diff --git a/win/C#/frmMain/PresetLoader.cs b/win/C#/frmMain/PresetLoader.cs
index b21b355..3a574b9 100644 (file)
--- a/win/C#/frmMain/PresetLoader.cs
+++ b/win/C#/frmMain/PresetLoader.cs
@@ -99,7 +99,6 @@ namespace Handbrake
                     mainWindow.text_bottom.Value = bottom;\r
                     mainWindow.text_left.Value = left;\r
                     mainWindow.text_right.Value = right;\r
-                    \r
                 }\r
 \r
                 if (presetQuery.Width != 0)\r

diff --git a/win/C#/frmMain/x264Panel.cs b/win/C#/frmMain/x264Panel.cs
index a4cb7ec..e3a52fd 100644 (file)
--- a/win/C#/frmMain/x264Panel.cs
+++ b/win/C#/frmMain/x264Panel.cs
@@ -554,7 +554,6 @@ namespace Handbrake
                             else\r
                                 thisOpt = "";\r
                         }\r
-\r
                     }\r
                 }\r
 \r
@@ -760,7 +759,6 @@ namespace Handbrake
                 mainWindow.check_weightedBFrames.Visible = true;\r
                 mainWindow.drop_directPrediction.Visible = true;\r
                 mainWindow.lbl_direct_prediction.Visible = true;\r
-                \r
             }\r
             else\r
             {\r
@@ -800,9 +798,7 @@ namespace Handbrake
                     mainWindow.check_mixedReferences.CheckState = CheckState.Unchecked;\r
             }\r
             else\r
-            {\r
                 mainWindow.check_mixedReferences.Visible = true;\r
-            }\r
         }\r
 \r
     }\r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 695f2c3..5dd7247 100644 (file)
--- 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);\r
             this.check_tooltip.TabIndex = 70;\r
             this.check_tooltip.Text = "Enable GUI tooltips";\r
-            this.ToolTip.SetToolTip(this.check_tooltip, "Enable the built in tooltips for gui controls.");\r
+            this.ToolTip.SetToolTip(this.check_tooltip, "Enable the built in tooltips for gui controls. (Requires Restart)");\r
             this.check_tooltip.UseVisualStyleBackColor = false;\r
             this.check_tooltip.CheckedChanged += new System.EventHandler(this.check_tooltip_CheckedChanged);\r
             // \r

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index e31e41a..ff2fab0 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -16,14 +16,12 @@ namespace Handbrake
 {\r
     public partial class frmOptions : Form\r
     {\r
-        private frmMain mainWindow;\r
         /// <summary>\r
         /// When the form loads, Initialise all the setting components with their correct values\r
         /// </summary>\r
-        public frmOptions(frmMain window)\r
+        public frmOptions()\r
         {\r
             InitializeComponent();\r
-            mainWindow = window;\r
 \r
             // #############################\r
             // General\r
@@ -136,16 +134,6 @@ namespace Handbrake
         private void check_tooltip_CheckedChanged(object sender, EventArgs e)\r
         {\r
             Properties.Settings.Default.tooltipEnable = check_tooltip.CheckState.ToString();\r
-            if (check_tooltip.Checked)\r
-            {\r
-                ToolTip.Active = true;\r
-                mainWindow.ToolTip.Active = true;\r
-            }\r
-            else\r
-            {\r
-                ToolTip.Active = false;\r
-                mainWindow.ToolTip.Active = false;\r
-            }\r
         }\r
         private void drp_completeOption_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r