X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FHandBrakeCS.csproj;h=78cbc1d59f682e7343a5d84eccc814c70b8248c7;hb=e90e235b2d4a2f50fc986e0f849b0fcfdaba3471;hp=73667f78e523ba6c4ddbc317263d789b8d2ff970;hpb=29b7457875260be8d2faddf683e27871187002db;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 73667f78..78cbc1d5 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,13 +37,11 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -51,6 +51,7 @@
     <NoStdLib>false</NoStdLib>
     <DocumentationFile>
     </DocumentationFile>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>
@@ -67,7 +68,7 @@
     <NoStdLib>false</NoStdLib>
     <DebugSymbols>true</DebugSymbols>
     <FileAlignment>512</FileAlignment>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -77,12 +78,14 @@
     <PlatformTarget>x86</PlatformTarget>
     <OutputPath>bin\x86\Release\</OutputPath>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <Optimize>true</Optimize>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Build|AnyCPU' ">
     <OutputPath>bin\Build\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Build|x86' ">
@@ -90,7 +93,26 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>libraries\Growl.Connector.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Growl.CoreLibrary, Version=2.0.0.0, Culture=neutral, PublicKeyToken=13e59d82e007b064, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <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" />
@@ -98,20 +120,51 @@
     <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" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Controls\AudioPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\AudioPanel.Designer.cs">
+      <DependentUpon>AudioPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\Filters.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\Filters.Designer.cs">
+      <DependentUpon>Filters.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\PictureSettings.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\PictureSettings.designer.cs">
+      <DependentUpon>PictureSettings.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\Subtitles.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\Subtitles.Designer.cs">
+      <DependentUpon>Subtitles.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\x264Panel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\x264Panel.Designer.cs">
+      <DependentUpon>x264Panel.cs</DependentUpon>
+    </Compile>
     <Compile Include="frmPreview.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="frmPreview.Designer.cs">
       <DependentUpon>frmPreview.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmActivityWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmActivityWindow.Designer.cs">
-      <DependentUpon>frmActivityWindow.cs</DependentUpon>
-    </Compile>
     <Compile Include="frmAbout.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -130,24 +183,12 @@
     <Compile Include="frmDownload.Designer.cs">
       <DependentUpon>frmDownload.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmGenPreview.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmGenPreview.Designer.cs">
-      <DependentUpon>frmGenPreview.cs</DependentUpon>
-    </Compile>
     <Compile Include="frmMain.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="frmMain.Designer.cs">
       <DependentUpon>frmMain.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmMainBasic.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmMainBasic.Designer.cs">
-      <DependentUpon>frmMainBasic.cs</DependentUpon>
-    </Compile>
     <Compile Include="frmOptions.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -166,16 +207,26 @@
     <Compile Include="frmUpdater.designer.cs">
       <DependentUpon>frmUpdater.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmMain\PresetLoader.cs" />
-    <Compile Include="frmMain\QueryGenerator.cs" />
+    <Compile Include="Functions\GrowlCommunicator.cs" />
+    <Compile Include="Functions\PresetLoader.cs" />
+    <Compile Include="Functions\QueryGenerator.cs" />
     <Compile Include="Functions\Main.cs" />
+    <Compile Include="Functions\Scan.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="Presets\Export.cs" />
+    <Compile Include="Presets\Import.cs" />
     <Compile Include="Presets\preset.cs" />
     <Compile Include="Presets\PresetsHandler.cs" />
-    <Compile Include="Queue\QueueHandler.cs" />
+    <Compile Include="EncodeQueue\EncodeAndQueueHandler.cs" />
     <Compile Include="Functions\AppcastReader.cs" />
-    <Compile Include="Functions\Encode.cs" />
     <Compile Include="Functions\QueryParser.cs" />
-    <Compile Include="frmMain\x264Panel.cs" />
     <Compile Include="Parsing\AudioTrack.cs" />
     <Compile Include="Parsing\Chapter.cs" />
     <Compile Include="Parsing\DVD.cs" />
@@ -184,12 +235,28 @@
     <Compile Include="Parsing\Title.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="frmPreview.resx">
-      <DependentUpon>frmPreview.cs</DependentUpon>
+    <EmbeddedResource Include="Controls\AudioPanel.resx">
+      <DependentUpon>AudioPanel.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmActivityWindow.resx">
-      <DependentUpon>frmActivityWindow.cs</DependentUpon>
+    <EmbeddedResource Include="Controls\Filters.resx">
+      <DependentUpon>Filters.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\PictureSettings.resx">
+      <DependentUpon>PictureSettings.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\Subtitles.resx">
+      <DependentUpon>Subtitles.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\x264Panel.resx">
+      <DependentUpon>x264Panel.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmPreview.resx">
+      <DependentUpon>frmPreview.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmAbout.resx">
@@ -204,18 +271,10 @@
       <SubType>Designer</SubType>
       <DependentUpon>frmDownload.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmGenPreview.resx">
-      <DependentUpon>frmGenPreview.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmMain.resx">
       <SubType>Designer</SubType>
       <DependentUpon>frmMain.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmMainBasic.resx">
-      <DependentUpon>frmMainBasic.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmOptions.resx">
       <SubType>Designer</SubType>
       <DependentUpon>frmOptions.cs</DependentUpon>
@@ -228,15 +287,15 @@
       <DependentUpon>frmUpdater.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmActivityWindow.resx">
+      <DependentUpon>frmActivityWindow.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmReadDVD.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>frmReadDVD.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmSplashScreen.resx">
       <SubType>Designer</SubType>
       <DependentUpon>frmSplashScreen.cs</DependentUpon>
@@ -256,27 +315,23 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="frmReadDVD.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmReadDVD.Designer.cs">
-      <DependentUpon>frmReadDVD.cs</DependentUpon>
-    </Compile>
     <Compile Include="frmSplashScreen.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="frmSplashScreen.Designer.cs">
       <DependentUpon>frmSplashScreen.cs</DependentUpon>
     </Compile>
-    <Compile Include="Queue\QueueItem.cs" />
+    <Compile Include="EncodeQueue\Job.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Changelog.html" />
     <Content Include="handbrakepineapple.ico" />
     <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" />
     <Content Include="Resources\copy.png" />
     <Content Include="Resources\disc_small.png" />
     <None Include="Resources\hb32.png" />
@@ -288,6 +343,7 @@
     <None Include="Resources\Pause.png" />
     <None Include="Resources\Play.png" />
     <None Include="Resources\picture.png" />
+    <None Include="Resources\Play_small.png" />
     <Content Include="Resources\Pref_Small.png" />
     <Content Include="Resources\Queue.png" />
     <Content Include="Resources\Queue_Small.png" />
@@ -299,11 +355,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>
@@ -319,11 +370,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>
@@ -364,9 +410,6 @@
       <Isolated>False</Isolated>
     </COMReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Experimental\" />
-  </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.