diff options
| author | sr55 <[email protected]> | 2009-11-25 12:51:48 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2009-11-25 12:51:48 +0000 |
| commit | 17cd34a5dc137cf05265af9f7dcdff38a3624b0d (patch) | |
| tree | 7d489475f53c942a83af545523b5c6e96cdf2662 | |
| parent | c60fe691e3abd0f1c721bb746c60d122fa656efd (diff) | |
WinGui:
- Preview Window: Handle the lack of QuickTime in a more user friendly fashion.
- Switch default .NET to 3.5
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2974 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | win/C#/HandBrakeCS.csproj | 38 | ||||
| -rw-r--r-- | win/C#/Properties/AssemblyInfo.cs | 4 | ||||
| -rw-r--r-- | win/C#/frmPreview.cs | 9 |
3 files changed, 31 insertions, 20 deletions
diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj index 4c3a4f8c1..a67a4eacd 100644 --- a/win/C#/HandBrakeCS.csproj +++ b/win/C#/HandBrakeCS.csproj @@ -18,9 +18,11 @@ <UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<SignManifests>false</SignManifests>
+ <TargetFrameworkSubset>
+ </TargetFrameworkSubset>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -35,8 +37,6 @@ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
- <TargetFrameworkSubset>
- </TargetFrameworkSubset>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -103,7 +103,16 @@ <HintPath>libraries\Growl.CoreLibrary.dll</HintPath>
<Private>True</Private>
</Reference>
+ <Reference Include="PresentationCore">
+ <RequiredTargetFramework>3.0</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="PresentationFramework">
+ <RequiredTargetFramework>3.0</RequiredTargetFramework>
+ </Reference>
<Reference Include="System" />
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Design" />
@@ -111,8 +120,12 @@ <Reference Include="System.Messaging" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.XML" />
- <Reference Include="UIAutomationProvider, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
- <Reference Include="WindowsBase, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+ <Reference Include="UIAutomationProvider, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <RequiredTargetFramework>3.0</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="WindowsBase, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <RequiredTargetFramework>3.0</RequiredTargetFramework>
+ </Reference>
<Reference Include="WindowsFormsIntegration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
</ItemGroup>
<ItemGroup>
@@ -128,6 +141,11 @@ <Compile Include="Controls\Filters.Designer.cs">
<DependentUpon>Filters.cs</DependentUpon>
</Compile>
+ <Compile Include="Controls\NewTrackSlider.cs">
+ </Compile>
+ <Compile Include="Controls\NewTrackSlider.Designer.cs">
+ <DependentUpon>NewTrackSlider.cs</DependentUpon>
+ </Compile>
<Compile Include="Controls\PictureSettings.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -340,11 +358,6 @@ <None Include="Resources\General Preferences.png" />
</ItemGroup>
<ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
<Visible>False</Visible>
<ProductName>.NET Framework 2.0 %28x86%29</ProductName>
@@ -360,11 +373,6 @@ <ProductName>.NET Framework 3.5</ProductName>
<Install>true</Install>
</BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs index f8eba521b..cc93c31eb 100644 --- a/win/C#/Properties/AssemblyInfo.cs +++ b/win/C#/Properties/AssemblyInfo.cs @@ -36,6 +36,6 @@ using System.Resources; // Build Number
// Revision
//
-[assembly: AssemblyVersion("0.9.4.0")]
-[assembly: AssemblyFileVersion("0.9.4.0")]
+[assembly: AssemblyVersion("0.9.4.5")]
+[assembly: AssemblyFileVersion("0.9.4.5")]
[assembly: NeutralResourcesLanguageAttribute("")]
diff --git a/win/C#/frmPreview.cs b/win/C#/frmPreview.cs index 59e6c2520..078a15e4d 100644 --- a/win/C#/frmPreview.cs +++ b/win/C#/frmPreview.cs @@ -28,10 +28,8 @@ namespace Handbrake {
InitializeComponent();
}
- catch (Exception exc)
+ catch (Exception)
{
- 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);
- btn_playQT.Enabled = false;
noQT = true;
}
this.mainWindow = mw;
@@ -64,6 +62,11 @@ namespace Handbrake }
private void btn_playQT_Click(object sender, EventArgs e)
{
+ if (noQT)
+ {
+ MessageBox.Show(this, "It would appear QuickTime 7 is not installed or not accessible. Please (re)install QuickTime.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ return;
+ }
if (mainWindow.text_destination.Text.Contains(".mkv"))
{
MessageBox.Show(this,
|