X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FHandBrakeCS.csproj;h=4c3a4f8c1c079c158f880f8ca6b33c6000e4cabc;hb=e16dcaf99da57f9013549aeed6260d5095d17e5d;hp=d93d90a7a322f22bc6797ae20ea4bcf88598fa6b;hpb=f1f96b31f917f426112bd7d968dcb95c82592b6e;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index d93d90a7..4c3a4f8c 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -41,7 +41,7 @@
   <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,6 +93,16 @@
     <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="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
@@ -98,8 +111,41 @@
     <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="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>
@@ -130,24 +176,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,22 +200,18 @@
     <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\QueryParserTester.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Functions\QueryParserTester.Designer.cs">
-      <DependentUpon>QueryParserTester.cs</DependentUpon>
-    </Compile>
+    <Compile Include="Functions\UpdateCheckInformation.cs" />
+    <Compile Include="Functions\Win32.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" />
@@ -190,6 +220,26 @@
     <Compile Include="Parsing\Title.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Controls\AudioPanel.resx">
+      <DependentUpon>AudioPanel.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <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>
@@ -210,18 +260,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>
@@ -234,10 +276,6 @@
       <DependentUpon>frmUpdater.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Functions\QueryParserTester.resx">
-      <DependentUpon>QueryParserTester.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -268,15 +306,17 @@
     <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 +328,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" />