X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=win%2FC%23%2FHandBrakeCS.csproj;h=6229fc46a08ffe72ddbe69878af94f831379b08b;hb=01adcc9f552746e1c6b4503c78d4c27891d68f68;hp=7d72151dc2a66e3aff9793dd42dcc5ea50334023;hpb=32219d93ec8fcf0db6f7ca5d6045419882563951;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 7d72151d..6229fc46 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -19,7 +19,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <SignManifests>false</SignManifests>
     <PublishUrl>publish\</PublishUrl>
@@ -36,6 +36,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -135,7 +136,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|AnyCPU'">
     <OutputPath>bin\NightlyBuild\</OutputPath>
-    <Optimize>false</Optimize>
+    <Optimize>true</Optimize>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|x86'">
@@ -144,6 +145,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AxInterop.QTOControlLib">
+      <HintPath>libraries\AxInterop.QTOControlLib.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Data.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraEditors.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>libraries\Growl.Connector.dll</HintPath>
@@ -166,18 +174,11 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
-    <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
     <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">
-      <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" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controls\AudioPanel.cs">
@@ -210,17 +211,11 @@
     <Compile Include="Controls\x264Panel.Designer.cs">
       <DependentUpon>x264Panel.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmExceptionWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmExceptionWindow.Designer.cs">
-      <DependentUpon>frmExceptionWindow.cs</DependentUpon>
-    </Compile>
+    <Compile Include="Functions\ToolStripRenderOverride.cs" />
     <Compile Include="Model\ActivityLogMode.cs" />
-    <Compile Include="Model\Cropping.cs" />
-    <Compile Include="Model\SubtitleType.cs" />
+    <Compile Include="Model\QueryPictureSettingsMode.cs" />
+    <Compile Include="Model\QueryEncodeMode.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\Encode.cs" />
     <Compile Include="frmPreview.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -239,12 +234,6 @@
     <Compile Include="frmAddPreset.Designer.cs">
       <DependentUpon>frmAddPreset.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmDownload.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmDownload.Designer.cs">
-      <DependentUpon>frmDownload.cs</DependentUpon>
-    </Compile>
     <Compile Include="frmMain.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -263,43 +252,35 @@
     <Compile Include="frmQueue.Designer.cs">
       <DependentUpon>frmQueue.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmUpdater.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmUpdater.designer.cs">
-      <DependentUpon>frmUpdater.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Functions\GrowlCommunicator.cs" />
     <Compile Include="Functions\PresetLoader.cs" />
     <Compile Include="Functions\QueryGenerator.cs" />
     <Compile Include="Functions\Main.cs" />
-    <Compile Include="Services\Scan.cs" />
-    <Compile Include="Functions\System.cs" />
-    <Compile Include="Functions\UpdateCheckInformation.cs" />
-    <Compile Include="Functions\Win32.cs" />
     <Compile Include="frmActivityWindow.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="frmActivityWindow.Designer.cs">
       <DependentUpon>frmActivityWindow.cs</DependentUpon>
     </Compile>
-    <Compile Include="Model\AudioTrack.cs" />
-    <Compile Include="Model\DriveInformation.cs" />
     <Compile Include="Model\SourceType.cs" />
-    <Compile Include="Model\Subtitle.cs" />
-    <Compile Include="Presets\PlistPresetHandler.cs" />
-    <Compile Include="Presets\Preset.cs" />
-    <Compile Include="Presets\PresetsHandler.cs" />
-    <Compile Include="Services\Queue.cs" />
-    <Compile Include="Functions\AppcastReader.cs" />
-    <Compile Include="Functions\QueryParser.cs" />
-    <Compile Include="Parsing\AudioTrack.cs" />
-    <Compile Include="Parsing\Chapter.cs" />
-    <Compile Include="Parsing\DVD.cs" />
-    <Compile Include="Parsing\Parser.cs" />
-    <Compile Include="Parsing\Subtitle.cs" />
-    <Compile Include="Parsing\Title.cs" />
     <Compile Include="Program.cs" />
+    <Compile Include="ToolWindows\BatchAdd.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ToolWindows\BatchAdd.Designer.cs">
+      <DependentUpon>BatchAdd.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ToolWindows\PreviewOverlay.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ToolWindows\PreviewOverlay.Designer.cs">
+      <DependentUpon>PreviewOverlay.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ToolWindows\TitleSpecificScan.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ToolWindows\TitleSpecificScan.Designer.cs">
+      <DependentUpon>TitleSpecificScan.cs</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="Controls\AudioPanel.resx">
       <DependentUpon>AudioPanel.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -320,10 +301,6 @@
       <DependentUpon>x264Panel.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmExceptionWindow.resx">
-      <DependentUpon>frmExceptionWindow.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmPreview.resx">
       <DependentUpon>frmPreview.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -336,10 +313,6 @@
       <DependentUpon>frmAddPreset.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmDownload.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>frmDownload.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmMain.resx">
       <SubType>Designer</SubType>
       <DependentUpon>frmMain.cs</DependentUpon>
@@ -352,10 +325,6 @@
       <SubType>Designer</SubType>
       <DependentUpon>frmQueue.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmUpdater.resx">
-      <DependentUpon>frmUpdater.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmActivityWindow.resx">
       <DependentUpon>frmActivityWindow.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -365,15 +334,20 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmSplashScreen.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>frmSplashScreen.cs</DependentUpon>
-    </EmbeddedResource>
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <EmbeddedResource Include="ToolWindows\BatchAdd.resx">
+      <DependentUpon>BatchAdd.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ToolWindows\PreviewOverlay.resx">
+      <DependentUpon>PreviewOverlay.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ToolWindows\TitleSpecificScan.resx">
+      <DependentUpon>TitleSpecificScan.cs</DependentUpon>
+    </EmbeddedResource>
     <None Include="app.config" />
     <None Include="Installer\MakeNightly.nsi.tmpl" />
     <None Include="Installer\MakeNightly.nsi" />
@@ -387,22 +361,17 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="frmSplashScreen.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmSplashScreen.Designer.cs">
-      <DependentUpon>frmSplashScreen.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Model\Job.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="handbrakepineapple.ico" />
+    <None Include="Properties\AssemblyInfo.cs.tmpl" />
     <None Include="Resources\logo64.png" />
     <None Include="Resources\logo128.png" />
     <None Include="Resources\ActivityWindow.png" />
     <None Include="Resources\AddToQueue.png" />
     <Content Include="Resources\ActivityWindow_small.png" />
     <None Include="Resources\AddToQueue_small.png" />
+    <None Include="Resources\Add16.png" />
     <Content Include="Resources\copy.png" />
     <Content Include="Resources\disc_small.png" />
     <None Include="Resources\hb32.png" />
@@ -412,6 +381,9 @@
     <None Include="Resources\folder.png" />
     <None Include="Resources\download.png" />
     <None Include="Resources\ErrorX.png" />
+    <None Include="Resources\Help32.png" />
+    <None Include="Resources\Help24.png" />
+    <None Include="Resources\Options24.png" />
     <Content Include="Resources\Output_Small.png" />
     <None Include="Resources\Pause.png" />
     <None Include="Resources\Play.png" />
@@ -423,7 +395,6 @@
     <Content Include="Resources\window.png" />
     <None Include="Resources\save.png" />
     <None Include="Resources\stop.png" />
-    <None Include="Resources\SplashScreen.jpg" />
     <None Include="Resources\Movies.png" />
     <None Include="Resources\General Preferences.png" />
   </ItemGroup>
@@ -460,14 +431,6 @@
     </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>
@@ -493,6 +456,16 @@
       <Isolated>False</Isolated>
     </COMReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj">
+      <Project>{087A2BA8-BAC2-4577-A46F-07FF9D420016}</Project>
+      <Name>HandBrake.ApplicationServices</Name>
+    </ProjectReference>
+    <ProjectReference Include="HandBrake.Framework\HandBrake.Framework.csproj">
+      <Project>{49AD42C1-BF9B-4D78-A644-020878FAADE6}</Project>
+      <Name>HandBrake.Framework</Name>
+    </ProjectReference>
+  </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.
@@ -501,14 +474,9 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <Import Project="$(ProgramFiles)\MSBuild\Microsoft\StyleCop\v4.3\Microsoft.StyleCop.targets" />
+  <Import Project="$(ProgramFiles)\MSBuild\Microsoft\StyleCop\v4.4\Microsoft.StyleCop.targets" />
   <PropertyGroup Condition=" '$(Configuration)' == 'Install' ">
     <PostBuildEvent>
-	cd ../../
-	copy Installer\Installer.nsi bin\Install /Y
-	copy handbrakepineapple.ico bin\Install /Y
-	xcopy doc bin\Install\doc /I /Y
-	cd bin\Install
 	makensis Installer.nsi
 	</PostBuildEvent>
   </PropertyGroup>