<UpgradeBackupLocation>\r
</UpgradeBackupLocation>\r
<OldToolsVersion>3.5</OldToolsVersion>\r
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
<IsWebBootstrapper>false</IsWebBootstrapper>\r
<SignManifests>false</SignManifests>\r
<PublishUrl>publish\</PublishUrl>\r
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
<UseApplicationTrust>false</UseApplicationTrust>\r
<BootstrapperEnabled>true</BootstrapperEnabled>\r
+ <TargetFrameworkProfile>Client</TargetFrameworkProfile>\r
</PropertyGroup>\r
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
<DebugSymbols>true</DebugSymbols>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|AnyCPU'">\r
<OutputPath>bin\NightlyBuild\</OutputPath>\r
- <Optimize>false</Optimize>\r
+ <Optimize>true</Optimize>\r
<DefineConstants>DEBUG;TRACE</DefineConstants>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|x86'">\r
<Optimize>true</Optimize>\r
</PropertyGroup>\r
<ItemGroup>\r
+ <Reference Include="AxInterop.QTOControlLib">\r
+ <HintPath>libraries\AxInterop.QTOControlLib.dll</HintPath>\r
+ </Reference>\r
+ <Reference Include="DevExpress.Data.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />\r
+ <Reference Include="DevExpress.Utils.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />\r
+ <Reference Include="DevExpress.XtraBars.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />\r
+ <Reference Include="DevExpress.XtraEditors.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />\r
<Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">\r
<SpecificVersion>False</SpecificVersion>\r
<HintPath>libraries\Growl.Connector.dll</HintPath>\r
</Reference>\r
<Reference Include="System.Data" />\r
<Reference Include="System.Deployment" />\r
- <Reference Include="System.Design" />\r
<Reference Include="System.Drawing" />\r
<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
- <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
+ <Reference Include="WindowsBase" />\r
</ItemGroup>\r
<ItemGroup>\r
<Compile Include="Controls\AudioPanel.cs">\r
<Compile Include="Controls\x264Panel.Designer.cs">\r
<DependentUpon>x264Panel.cs</DependentUpon>\r
</Compile>\r
- <Compile Include="frmExceptionWindow.cs">\r
- <SubType>Form</SubType>\r
- </Compile>\r
- <Compile Include="frmExceptionWindow.Designer.cs">\r
- <DependentUpon>frmExceptionWindow.cs</DependentUpon>\r
- </Compile>\r
+ <Compile Include="Functions\ToolStripRenderOverride.cs" />\r
<Compile Include="Model\ActivityLogMode.cs" />\r
+ <Compile Include="Model\QueryPictureSettingsMode.cs" />\r
+ <Compile Include="Model\QueryEncodeMode.cs" />\r
<Compile Include="Properties\AssemblyInfo.cs" />\r
- <Compile Include="Services\Encode.cs" />\r
<Compile Include="frmPreview.cs">\r
<SubType>Form</SubType>\r
</Compile>\r
<Compile Include="frmAddPreset.Designer.cs">\r
<DependentUpon>frmAddPreset.cs</DependentUpon>\r
</Compile>\r
- <Compile Include="frmDownload.cs">\r
- <SubType>Form</SubType>\r
- </Compile>\r
- <Compile Include="frmDownload.Designer.cs">\r
- <DependentUpon>frmDownload.cs</DependentUpon>\r
- </Compile>\r
<Compile Include="frmMain.cs">\r
<SubType>Form</SubType>\r
</Compile>\r
<Compile Include="frmQueue.Designer.cs">\r
<DependentUpon>frmQueue.cs</DependentUpon>\r
</Compile>\r
- <Compile Include="frmUpdater.cs">\r
- <SubType>Form</SubType>\r
- </Compile>\r
- <Compile Include="frmUpdater.designer.cs">\r
- <DependentUpon>frmUpdater.cs</DependentUpon>\r
- </Compile>\r
- <Compile Include="Functions\GrowlCommunicator.cs" />\r
<Compile Include="Functions\PresetLoader.cs" />\r
<Compile Include="Functions\QueryGenerator.cs" />\r
<Compile Include="Functions\Main.cs" />\r
- <Compile Include="Services\Scan.cs" />\r
- <Compile Include="Functions\System.cs" />\r
- <Compile Include="Functions\UpdateCheckInformation.cs" />\r
- <Compile Include="Functions\Win32.cs" />\r
<Compile Include="frmActivityWindow.cs">\r
<SubType>Form</SubType>\r
</Compile>\r
<Compile Include="frmActivityWindow.Designer.cs">\r
<DependentUpon>frmActivityWindow.cs</DependentUpon>\r
</Compile>\r
- <Compile Include="Model\AudioTrack.cs" />\r
- <Compile Include="Model\DriveInformation.cs" />\r
<Compile Include="Model\SourceType.cs" />\r
- <Compile Include="Model\Subtitle.cs" />\r
- <Compile Include="Presets\PlistPresetHandler.cs" />\r
- <Compile Include="Presets\Preset.cs" />\r
- <Compile Include="Presets\PresetsHandler.cs" />\r
- <Compile Include="Services\Queue.cs" />\r
- <Compile Include="Functions\AppcastReader.cs" />\r
- <Compile Include="Functions\QueryParser.cs" />\r
- <Compile Include="Parsing\AudioTrack.cs" />\r
- <Compile Include="Parsing\Chapter.cs" />\r
- <Compile Include="Parsing\DVD.cs" />\r
- <Compile Include="Parsing\Parser.cs" />\r
- <Compile Include="Parsing\Subtitle.cs" />\r
- <Compile Include="Parsing\Title.cs" />\r
<Compile Include="Program.cs" />\r
+ <Compile Include="ToolWindows\BatchAdd.cs">\r
+ <SubType>Form</SubType>\r
+ </Compile>\r
+ <Compile Include="ToolWindows\BatchAdd.Designer.cs">\r
+ <DependentUpon>BatchAdd.cs</DependentUpon>\r
+ </Compile>\r
+ <Compile Include="ToolWindows\PreviewOverlay.cs">\r
+ <SubType>Form</SubType>\r
+ </Compile>\r
+ <Compile Include="ToolWindows\PreviewOverlay.Designer.cs">\r
+ <DependentUpon>PreviewOverlay.cs</DependentUpon>\r
+ </Compile>\r
+ <Compile Include="ToolWindows\TitleSpecificScan.cs">\r
+ <SubType>Form</SubType>\r
+ </Compile>\r
+ <Compile Include="ToolWindows\TitleSpecificScan.Designer.cs">\r
+ <DependentUpon>TitleSpecificScan.cs</DependentUpon>\r
+ </Compile>\r
<EmbeddedResource Include="Controls\AudioPanel.resx">\r
<DependentUpon>AudioPanel.cs</DependentUpon>\r
<SubType>Designer</SubType>\r
<DependentUpon>x264Panel.cs</DependentUpon>\r
<SubType>Designer</SubType>\r
</EmbeddedResource>\r
- <EmbeddedResource Include="frmExceptionWindow.resx">\r
- <DependentUpon>frmExceptionWindow.cs</DependentUpon>\r
- <SubType>Designer</SubType>\r
- </EmbeddedResource>\r
<EmbeddedResource Include="frmPreview.resx">\r
<DependentUpon>frmPreview.cs</DependentUpon>\r
<SubType>Designer</SubType>\r
<DependentUpon>frmAddPreset.cs</DependentUpon>\r
<SubType>Designer</SubType>\r
</EmbeddedResource>\r
- <EmbeddedResource Include="frmDownload.resx">\r
- <SubType>Designer</SubType>\r
- <DependentUpon>frmDownload.cs</DependentUpon>\r
- </EmbeddedResource>\r
<EmbeddedResource Include="frmMain.resx">\r
<SubType>Designer</SubType>\r
<DependentUpon>frmMain.cs</DependentUpon>\r
<SubType>Designer</SubType>\r
<DependentUpon>frmQueue.cs</DependentUpon>\r
</EmbeddedResource>\r
- <EmbeddedResource Include="frmUpdater.resx">\r
- <DependentUpon>frmUpdater.cs</DependentUpon>\r
- <SubType>Designer</SubType>\r
- </EmbeddedResource>\r
<EmbeddedResource Include="frmActivityWindow.resx">\r
<DependentUpon>frmActivityWindow.cs</DependentUpon>\r
<SubType>Designer</SubType>\r
<LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
<SubType>Designer</SubType>\r
</EmbeddedResource>\r
- <EmbeddedResource Include="frmSplashScreen.resx">\r
- <SubType>Designer</SubType>\r
- <DependentUpon>frmSplashScreen.cs</DependentUpon>\r
- </EmbeddedResource>\r
<Compile Include="Properties\Resources.Designer.cs">\r
<AutoGen>True</AutoGen>\r
<DependentUpon>Resources.resx</DependentUpon>\r
<DesignTime>True</DesignTime>\r
</Compile>\r
+ <EmbeddedResource Include="ToolWindows\BatchAdd.resx">\r
+ <DependentUpon>BatchAdd.cs</DependentUpon>\r
+ </EmbeddedResource>\r
+ <EmbeddedResource Include="ToolWindows\PreviewOverlay.resx">\r
+ <DependentUpon>PreviewOverlay.cs</DependentUpon>\r
+ </EmbeddedResource>\r
+ <EmbeddedResource Include="ToolWindows\TitleSpecificScan.resx">\r
+ <DependentUpon>TitleSpecificScan.cs</DependentUpon>\r
+ </EmbeddedResource>\r
<None Include="app.config" />\r
<None Include="Installer\MakeNightly.nsi.tmpl" />\r
<None Include="Installer\MakeNightly.nsi" />\r
<DependentUpon>Settings.settings</DependentUpon>\r
<DesignTimeSharedInput>True</DesignTimeSharedInput>\r
</Compile>\r
- <Compile Include="frmSplashScreen.cs">\r
- <SubType>Form</SubType>\r
- </Compile>\r
- <Compile Include="frmSplashScreen.Designer.cs">\r
- <DependentUpon>frmSplashScreen.cs</DependentUpon>\r
- </Compile>\r
- <Compile Include="Model\Job.cs" />\r
</ItemGroup>\r
<ItemGroup>\r
<Content Include="handbrakepineapple.ico" />\r
+ <None Include="Properties\AssemblyInfo.cs.tmpl" />\r
<None Include="Resources\logo64.png" />\r
<None Include="Resources\logo128.png" />\r
<None Include="Resources\ActivityWindow.png" />\r
<None Include="Resources\AddToQueue.png" />\r
<Content Include="Resources\ActivityWindow_small.png" />\r
<None Include="Resources\AddToQueue_small.png" />\r
+ <None Include="Resources\Add16.png" />\r
<Content Include="Resources\copy.png" />\r
<Content Include="Resources\disc_small.png" />\r
<None Include="Resources\hb32.png" />\r
<None Include="Resources\folder.png" />\r
<None Include="Resources\download.png" />\r
<None Include="Resources\ErrorX.png" />\r
+ <None Include="Resources\Help32.png" />\r
+ <None Include="Resources\Help24.png" />\r
+ <None Include="Resources\Options24.png" />\r
<Content Include="Resources\Output_Small.png" />\r
<None Include="Resources\Pause.png" />\r
<None Include="Resources\Play.png" />\r
<Content Include="Resources\window.png" />\r
<None Include="Resources\save.png" />\r
<None Include="Resources\stop.png" />\r
- <None Include="Resources\SplashScreen.jpg" />\r
<None Include="Resources\Movies.png" />\r
<None Include="Resources\General Preferences.png" />\r
</ItemGroup>\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
<Isolated>False</Isolated>\r
</COMReference>\r
</ItemGroup>\r
+ <ItemGroup>\r
+ <ProjectReference Include="HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj">\r
+ <Project>{087A2BA8-BAC2-4577-A46F-07FF9D420016}</Project>\r
+ <Name>HandBrake.ApplicationServices</Name>\r
+ </ProjectReference>\r
+ <ProjectReference Include="HandBrake.Framework\HandBrake.Framework.csproj">\r
+ <Project>{49AD42C1-BF9B-4D78-A644-020878FAADE6}</Project>\r
+ <Name>HandBrake.Framework</Name>\r
+ </ProjectReference>\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
<Target Name="AfterBuild">\r
</Target>\r
-->\r
- <Import Project="$(ProgramFiles)\MSBuild\Microsoft\StyleCop\v4.3\Microsoft.StyleCop.targets" />\r
+ <Import Project="$(ProgramFiles)\MSBuild\Microsoft\StyleCop\v4.4\Microsoft.StyleCop.targets" />\r
<PropertyGroup Condition=" '$(Configuration)' == 'Install' ">\r
<PostBuildEvent>\r
- cd ../../\r
- copy Installer\Installer.nsi bin\Install /Y\r
- copy handbrakepineapple.ico bin\Install /Y\r
- xcopy doc bin\Install\doc /I /Y\r
- cd bin\Install\r
makensis Installer.nsi\r
</PostBuildEvent>\r
</PropertyGroup>\r