WinGui:

- Preview Window: Handle the lack of QuickTime in a more user friendly fashion.
- Switch default .NET to 3.5

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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 4c3a4f8..a67a4ea 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -18,9 +18,11 @@
     <UpgradeBackupLocation>\r
     </UpgradeBackupLocation>\r
     <OldToolsVersion>2.0</OldToolsVersion>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
     <IsWebBootstrapper>false</IsWebBootstrapper>\r
     <SignManifests>false</SignManifests>\r
+    <TargetFrameworkSubset>\r
+    </TargetFrameworkSubset>\r
     <PublishUrl>publish\</PublishUrl>\r
     <Install>true</Install>\r
     <InstallFrom>Disk</InstallFrom>\r
@@ -35,8 +37,6 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
     <UseApplicationTrust>false</UseApplicationTrust>\r
     <BootstrapperEnabled>true</BootstrapperEnabled>\r
-    <TargetFrameworkSubset>\r
-    </TargetFrameworkSubset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
@@ -103,7 +103,16 @@
       <HintPath>libraries\Growl.CoreLibrary.dll</HintPath>\r
       <Private>True</Private>\r
     </Reference>\r
+    <Reference Include="PresentationCore">\r
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>\r
+    </Reference>\r
+    <Reference Include="PresentationFramework">\r
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>\r
+    </Reference>\r
     <Reference Include="System" />\r
+    <Reference Include="System.Core">\r
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
+    </Reference>\r
     <Reference Include="System.Data" />\r
     <Reference Include="System.Deployment" />\r
     <Reference Include="System.Design" />\r
@@ -111,8 +120,12 @@
     <Reference Include="System.Messaging" />\r
     <Reference Include="System.Windows.Forms" />\r
     <Reference Include="System.XML" />\r
-    <Reference Include="UIAutomationProvider, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />\r
-    <Reference Include="WindowsBase, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />\r
+    <Reference Include="UIAutomationProvider, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">\r
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>\r
+    </Reference>\r
+    <Reference Include="WindowsBase, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">\r
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>\r
+    </Reference>\r
     <Reference Include="WindowsFormsIntegration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -128,6 +141,11 @@
     <Compile Include="Controls\Filters.Designer.cs">\r
       <DependentUpon>Filters.cs</DependentUpon>\r
     </Compile>\r
+    <Compile Include="Controls\NewTrackSlider.cs">\r
+    </Compile>\r
+    <Compile Include="Controls\NewTrackSlider.Designer.cs">\r
+      <DependentUpon>NewTrackSlider.cs</DependentUpon>\r
+    </Compile>\r
     <Compile Include="Controls\PictureSettings.cs">\r
       <SubType>UserControl</SubType>\r
     </Compile>\r
@@ -340,11 +358,6 @@
     <None Include="Resources\General Preferences.png" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework Client Profile</ProductName>\r
-      <Install>false</Install>\r
-    </BootstrapperPackage>\r
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">\r
       <Visible>False</Visible>\r
       <ProductName>.NET Framework 2.0 %28x86%29</ProductName>\r
@@ -360,11 +373,6 @@
       <ProductName>.NET Framework 3.5</ProductName>\r
       <Install>true</Install>\r
     </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
-      <Install>false</Install>\r
-    </BootstrapperPackage>\r
     <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">\r
       <Visible>False</Visible>\r
       <ProductName>Windows Installer 3.1</ProductName>\r

diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs
index f8eba52..cc93c31 100644 (file)
--- a/win/C#/Properties/AssemblyInfo.cs
+++ b/win/C#/Properties/AssemblyInfo.cs
@@ -36,6 +36,6 @@ using System.Resources;
 //      Build Number\r
 //      Revision\r
 //\r
-[assembly: AssemblyVersion("0.9.4.0")]\r
-[assembly: AssemblyFileVersion("0.9.4.0")]\r
+[assembly: AssemblyVersion("0.9.4.5")]\r
+[assembly: AssemblyFileVersion("0.9.4.5")]\r
 [assembly: NeutralResourcesLanguageAttribute("")]\r

diff --git a/win/C#/frmPreview.cs b/win/C#/frmPreview.cs
index 59e6c25..078a15e 100644 (file)
--- a/win/C#/frmPreview.cs
+++ b/win/C#/frmPreview.cs
@@ -28,10 +28,8 @@ namespace Handbrake
             {\r
                 InitializeComponent();\r
             }\r
-            catch (Exception exc)\r
+            catch (Exception)\r
             {\r
-                MessageBox.Show(mw, "It would appear QuickTime 7 is not installed or not accessible. QuickTime preview functionality will be disabled! \n\n Debug Info:\n" + exc, "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
-                btn_playQT.Enabled = false;\r
                 noQT = true;\r
             }\r
             this.mainWindow = mw;\r
@@ -64,6 +62,11 @@ namespace Handbrake
         }\r
         private void btn_playQT_Click(object sender, EventArgs e)\r
         {\r
+            if (noQT)\r
+            {\r
+                MessageBox.Show(this, "It would appear QuickTime 7 is not installed or not accessible. Please (re)install QuickTime.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+                return;\r
+            }\r
             if (mainWindow.text_destination.Text.Contains(".mkv"))\r
             {\r
                 MessageBox.Show(this,\r