Updates for interop refactoring, didn't want to add an additional DLL

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1694 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-03-12 21:43:36 +00:00
commit fd4e8ea73a
6 changed files with 141 additions and 17 deletions

View file

@ -78,10 +78,6 @@
<None Include="Properties\AssemblyInfo.cs.template" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\GreenshotInterop\GreenshotInterop.csproj">
<Project>{ADD4E400-56E1-4E31-A5C2-070BEB238A0F}</Project>
<Name>GreenshotInterop</Name>
</ProjectReference>
<ProjectReference Include="..\GreenshotPlugin\GreenshotPlugin.csproj">
<Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project>
<Name>GreenshotPlugin</Name>

View file

@ -365,10 +365,6 @@
<Folder Include="Help" />
<Folder Include="Destinations" />
<Folder Include="Processors" />
<ProjectReference Include="..\GreenshotInterop\GreenshotInterop.csproj">
<Project>{ADD4E400-56E1-4E31-A5C2-070BEB238A0F}</Project>
<Name>GreenshotInterop</Name>
</ProjectReference>
<ProjectReference Include="..\GreenshotPlugin\GreenshotPlugin.csproj">
<Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project>
<Name>GreenshotPlugin</Name>

View file

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
# SharpDevelop 4.1.0.8000
# SharpDevelop 4.2.0.8528-beta
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotPlugin", "..\GreenshotPlugin\GreenshotPlugin.csproj", "{5B924697-4DCD-4F98-85F1-105CB84B7341}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot-OCR-Plugin", "..\Greenshot-OCR-Plugin\Greenshot-OCR-Plugin.csproj", "{C6988EE8-2FEE-4349-9F09-F9628A0D8965}"
@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotExternalCommandPlu
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginExample", "..\PluginExample\PluginExample.csproj", "{6BD38118-B27F-43A1-951C-FB6464D39260}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotNetworkImportPlugin", "..\GreenshotNetworkImportPlugin\GreenshotNetworkImportPlugin.csproj", "{0D0B7F80-5B8E-4829-8523-E1AC0551E836}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -103,5 +105,13 @@ Global
{6BD38118-B27F-43A1-951C-FB6464D39260}.Release|Any CPU.ActiveCfg = Release|x86
{6BD38118-B27F-43A1-951C-FB6464D39260}.Release|x86.Build.0 = Release|x86
{6BD38118-B27F-43A1-951C-FB6464D39260}.Release|x86.ActiveCfg = Release|x86
{0D0B7F80-5B8E-4829-8523-E1AC0551E836}.Debug|Any CPU.Build.0 = Debug|x86
{0D0B7F80-5B8E-4829-8523-E1AC0551E836}.Debug|Any CPU.ActiveCfg = Debug|x86
{0D0B7F80-5B8E-4829-8523-E1AC0551E836}.Debug|x86.Build.0 = Debug|x86
{0D0B7F80-5B8E-4829-8523-E1AC0551E836}.Debug|x86.ActiveCfg = Debug|x86
{0D0B7F80-5B8E-4829-8523-E1AC0551E836}.Release|Any CPU.Build.0 = Release|x86
{0D0B7F80-5B8E-4829-8523-E1AC0551E836}.Release|Any CPU.ActiveCfg = Release|x86
{0D0B7F80-5B8E-4829-8523-E1AC0551E836}.Release|x86.Build.0 = Release|x86
{0D0B7F80-5B8E-4829-8523-E1AC0551E836}.Release|x86.ActiveCfg = Release|x86
EndGlobalSection
EndGlobal

View file

@ -33,19 +33,23 @@ Source: ..\..\bin\Release\Languages\*ar-SY*; DestDir: {app}\Languages; Component
Source: ..\..\bin\Release\Languages\*cs-CZ*; DestDir: {app}\Languages; Components: languages\csCZ; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*el-GR*; DestDir: {app}\Languages; Components: languages\elGR; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*es-ES*; DestDir: {app}\Languages; Components: languages\esES; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*fa-IR*; DestDir: {app}\Languages; Components: languages\faIR; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*fi-FI*; DestDir: {app}\Languages; Components: languages\fiFI; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*fr-FR*; DestDir: {app}\Languages; Components: languages\frFR; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*he-IL*; DestDir: {app}\Languages; Components: languages\heIL; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*hu-HU*; DestDir: {app}\Languages; Components: languages\huHU; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*it-IT*; DestDir: {app}\Languages; Components: languages\itIT; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*ja-JP*; DestDir: {app}\Languages; Components: languages\jaJP; Flags: overwritereadonly ignoreversion replacesameversion;
;Source: ..\..\bin\Release\Languages\*ko-KR*; DestDir: {app}\Languages; Components: languages\koKR; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*lt-LT*; DestDir: {app}\Languages; Components: languages\ltLT; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*pl-PL*; DestDir: {app}\Languages; Components: languages\plPL; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*pt-BR*; DestDir: {app}\Languages; Components: languages\ptBR; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*pt-PT*; DestDir: {app}\Languages; Components: languages\ptPT; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*uk-UA*; DestDir: {app}\Languages; Components: languages\ukUA; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*ru-RU*; DestDir: {app}\Languages; Components: languages\ruRU; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*sv-SE*; DestDir: {app}\Languages; Components: languages\svSE; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*tr-TR*; DestDir: {app}\Languages; Components: languages\trTR; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*vi-VN*; DestDir: {app}\Languages; Components: languages\viVN; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*zh-CN*; DestDir: {app}\Languages; Components: languages\zhCN; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*zh-TW*; DestDir: {app}\Languages; Components: languages\zhTW; Flags: overwritereadonly ignoreversion replacesameversion;
@ -193,21 +197,26 @@ Name: "languages\arSY"; Description: "العربية"; Types: Full; Check: hasLa
Name: "languages\csCZ"; Description: "Ceština"; Types: Full; Check: hasLanguageGroup('1')
Name: "languages\elGR"; Description: "ελληνικά"; Types: Full; Check: hasLanguageGroup('4')
Name: "languages\esES"; Description: "Español"; Types: Full; Check: hasLanguageGroup('1')
Name: "languages\faIR"; Description: "پارسی"; Types: Full; Check: hasLanguageGroup('d')
Name: "languages\fiFI"; Description: "Suomi"; Types: Full; Check: hasLanguageGroup('1')
Name: "languages\frFR"; Description: "Français"; Types: Full; Check: hasLanguageGroup('1')
Name: "languages\heIL"; Description: "עִבְרִית"; Types: Full; Check: hasLanguageGroup('c')
Name: "languages\huHU"; Description: "Magyar"; Types: Full; Check: hasLanguageGroup('2')
Name: "languages\itIT"; Description: "Italiano"; Types: Full; Check: hasLanguageGroup('1')
Name: "languages\jaJP"; Description: "日本語"; Types: Full; Check: hasLanguageGroup('7')
;Name: "languages\koKR"; Description: "Korean"; Types: Full; Check: hasLanguageGroup('8')
Name: "languages\ltLT"; Description: "Lietuvių"; Types: Full; Check: hasLanguageGroup('3')
Name: "languages\plPL"; Description: "Polski"; Types: Full; Check: hasLanguageGroup('2')
Name: "languages\ptBR"; Description: "Português do Brasil"; Types: Full; Check: hasLanguageGroup('1')
Name: "languages\ptPT"; Description: "Português de Portugal"; Types: Full; Check: hasLanguageGroup('1')
Name: "languages\ukUA"; Description: "Українська"; Types: Full; Check: hasLanguageGroup('5')
Name: "languages\ruRU"; Description: "Pусский"; Types: Full; Check: hasLanguageGroup('5')
Name: "languages\svSE"; Description: "Svenska"; Types: Full; Check: hasLanguageGroup('1')
Name: "languages\trTR"; Description: "Turkish"; Types: Full; Check: hasLanguageGroup('6')
Name: "languages\viVN"; Description: "Việt"; Types: Full; Check: hasLanguageGroup('e')
Name: "languages\zhCN"; Description: "简体中文"; Types: Full; Check: hasLanguageGroup('a')
Name: "languages\zhTW"; Description: "繁體中文"; Types: Full; Check: hasLanguageGroup('9')
[Code]
// Build a list of greenshot parameters from the supplied installer parameters

View file

@ -44,6 +44,7 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="CustomMarshalers" />
<Reference Include="log4net">
<HintPath>..\Greenshot\Lib\log4net.dll</HintPath>
</Reference>
@ -54,6 +55,126 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLBodyElement.cs">
<Link>Interop\IHTMLBodyElement.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLCurrentStyle.cs">
<Link>Interop\IHTMLCurrentStyle.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLDocument.cs">
<Link>Interop\IHTMLDocument.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLDocument2.cs">
<Link>Interop\IHTMLDocument2.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLDocument3.cs">
<Link>Interop\IHTMLDocument3.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLDocument4.cs">
<Link>Interop\IHTMLDocument4.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLDocument5.cs">
<Link>Interop\IHTMLDocument5.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLElement.cs">
<Link>Interop\IHTMLElement.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLElement2.cs">
<Link>Interop\IHTMLElement2.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLElementCollection.cs">
<Link>Interop\IHTMLElementCollection.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLFrameBase.cs">
<Link>Interop\IHTMLFrameBase.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLFramesCollection2.cs">
<Link>Interop\IHTMLFramesCollection2.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLRect.cs">
<Link>Interop\IHTMLRect.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLScreen.cs">
<Link>Interop\IHTMLScreen.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLScreen2.cs">
<Link>Interop\IHTMLScreen2.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLSelectionObject.cs">
<Link>Interop\IHTMLSelectionObject.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLStyle.cs">
<Link>Interop\IHTMLStyle.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLTxtRange.cs">
<Link>Interop\IHTMLTxtRange.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLWindow2.cs">
<Link>Interop\IHTMLWindow2.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLWindow3.cs">
<Link>Interop\IHTMLWindow3.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IHTMLWindow4.cs">
<Link>Interop\IHTMLWindow4.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\IEInterop\IWebBrowser2.cs">
<Link>Interop\IWebBrowser2.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\Interop\Base.cs">
<Link>Interop\Base.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\Interop\ComProgIdAttribute.cs">
<Link>Interop\ComProgIdAttribute.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\Interop\COMWrapper.cs">
<Link>Interop\COMWrapper.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\Interop\IDispatch.cs">
<Link>Interop\IDispatch.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\Interop\IOleWindow.cs">
<Link>Interop\IOleWindow.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\Interop\IServiceProvider.cs">
<Link>Interop\IServiceProvider.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\OfficeExport\ExcelExporter.cs">
<Link>Interop\ExcelExporter.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\OfficeExport\OneNoteExporter.cs">
<Link>Interop\OneNoteExporter.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\OfficeExport\OutlookEmailExporter.cs">
<Link>Interop\OutlookEmailExporter.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\OfficeExport\PowerpointExporter.cs">
<Link>Interop\PowerpointExporter.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\OfficeExport\WordExporter.cs">
<Link>Interop\WordExporter.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\OfficeInterop\ExcelInterop.cs">
<Link>Interop\ExcelInterop.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\OfficeInterop\OfficeInterop.cs">
<Link>Interop\OfficeInterop.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\OfficeInterop\OneNoteInterop.cs">
<Link>Interop\OneNoteInterop.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\OfficeInterop\OutlookInterop.cs">
<Link>Interop\OutlookInterop.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\OfficeInterop\OutlookUtils.cs">
<Link>Interop\OutlookUtils.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\OfficeInterop\PowerpointInterop.cs">
<Link>Interop\PowerpointInterop.cs</Link>
</Compile>
<Compile Include="..\GreenshotInterop\OfficeInterop\WordInterop.cs">
<Link>Interop\WordInterop.cs</Link>
</Compile>
<Compile Include="Controls\HotkeyControl.cs" />
<Compile Include="Controls\BackgroundForm.cs" />
<Compile Include="Controls\BackgroundForm.Designer.cs">
@ -94,8 +215,6 @@
<Compile Include="Interfaces\IDestination.cs" />
<Compile Include="Interfaces\IProcessor.cs" />
<Compile Include="Interfaces\Plugin\PluginInterfaces.cs" />
<Compile Include="Interop\ComProgIdAttribute.cs" />
<Compile Include="Interop\COMWrapper.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UnmanagedHelpers\DWM.cs" />
<Compile Include="UnmanagedHelpers\Enumerations.cs" />
@ -124,12 +243,6 @@
<Folder Include="Interop" />
<Folder Include="UnmanagedHelpers" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\GreenshotInterop\GreenshotInterop.csproj">
<Project>{ADD4E400-56E1-4E31-A5C2-070BEB238A0F}</Project>
<Name>GreenshotInterop</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup>
<PreBuildEvent>rmdir /S /Q "$(SolutionDir)bin\$(Configuration)\Plugins"
"$(SolutionDir)\tools\TortoiseSVN\SubWCRev.exe" "$(ProjectDir)\" "$(ProjectDir)\Properties\AssemblyInfo.cs.template" "$(ProjectDir)\Properties\AssemblyInfo.cs"</PreBuildEvent>