diff --git a/Greenshot-OCR-Plugin/Greenshot-OCR-Plugin.csproj b/Greenshot-OCR-Plugin/Greenshot-OCR-Plugin.csproj
index 429a2a110..76d1060f3 100644
--- a/Greenshot-OCR-Plugin/Greenshot-OCR-Plugin.csproj
+++ b/Greenshot-OCR-Plugin/Greenshot-OCR-Plugin.csproj
@@ -78,10 +78,6 @@
-
- {ADD4E400-56E1-4E31-A5C2-070BEB238A0F}
- GreenshotInterop
-
{5B924697-4DCD-4F98-85F1-105CB84B7341}
GreenshotPlugin
diff --git a/Greenshot/Greenshot.csproj b/Greenshot/Greenshot.csproj
index 637a0a313..f58991aa2 100644
--- a/Greenshot/Greenshot.csproj
+++ b/Greenshot/Greenshot.csproj
@@ -365,10 +365,6 @@
-
- {ADD4E400-56E1-4E31-A5C2-070BEB238A0F}
- GreenshotInterop
-
{5B924697-4DCD-4F98-85F1-105CB84B7341}
GreenshotPlugin
diff --git a/Greenshot/Greenshot.sln b/Greenshot/Greenshot.sln
index 583131783..248d89a1b 100644
--- a/Greenshot/Greenshot.sln
+++ b/Greenshot/Greenshot.sln
@@ -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
diff --git a/Greenshot/releases/innosetup/setup.iss b/Greenshot/releases/innosetup/setup.iss
index 3a4cc088f..4c0460bcb 100644
--- a/Greenshot/releases/innosetup/setup.iss
+++ b/Greenshot/releases/innosetup/setup.iss
@@ -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
diff --git a/Greenshot/tools/TortoiseSVN/SubWCRev.exe b/Greenshot/tools/TortoiseSVN/SubWCRev.exe
index 1c0898e45..06a6bba03 100644
Binary files a/Greenshot/tools/TortoiseSVN/SubWCRev.exe and b/Greenshot/tools/TortoiseSVN/SubWCRev.exe differ
diff --git a/GreenshotPlugin/GreenshotPlugin.csproj b/GreenshotPlugin/GreenshotPlugin.csproj
index a585f6f60..307346da5 100644
--- a/GreenshotPlugin/GreenshotPlugin.csproj
+++ b/GreenshotPlugin/GreenshotPlugin.csproj
@@ -44,6 +44,7 @@
+
..\Greenshot\Lib\log4net.dll
@@ -54,6 +55,126 @@
+
+ Interop\IHTMLBodyElement.cs
+
+
+ Interop\IHTMLCurrentStyle.cs
+
+
+ Interop\IHTMLDocument.cs
+
+
+ Interop\IHTMLDocument2.cs
+
+
+ Interop\IHTMLDocument3.cs
+
+
+ Interop\IHTMLDocument4.cs
+
+
+ Interop\IHTMLDocument5.cs
+
+
+ Interop\IHTMLElement.cs
+
+
+ Interop\IHTMLElement2.cs
+
+
+ Interop\IHTMLElementCollection.cs
+
+
+ Interop\IHTMLFrameBase.cs
+
+
+ Interop\IHTMLFramesCollection2.cs
+
+
+ Interop\IHTMLRect.cs
+
+
+ Interop\IHTMLScreen.cs
+
+
+ Interop\IHTMLScreen2.cs
+
+
+ Interop\IHTMLSelectionObject.cs
+
+
+ Interop\IHTMLStyle.cs
+
+
+ Interop\IHTMLTxtRange.cs
+
+
+ Interop\IHTMLWindow2.cs
+
+
+ Interop\IHTMLWindow3.cs
+
+
+ Interop\IHTMLWindow4.cs
+
+
+ Interop\IWebBrowser2.cs
+
+
+ Interop\Base.cs
+
+
+ Interop\ComProgIdAttribute.cs
+
+
+ Interop\COMWrapper.cs
+
+
+ Interop\IDispatch.cs
+
+
+ Interop\IOleWindow.cs
+
+
+ Interop\IServiceProvider.cs
+
+
+ Interop\ExcelExporter.cs
+
+
+ Interop\OneNoteExporter.cs
+
+
+ Interop\OutlookEmailExporter.cs
+
+
+ Interop\PowerpointExporter.cs
+
+
+ Interop\WordExporter.cs
+
+
+ Interop\ExcelInterop.cs
+
+
+ Interop\OfficeInterop.cs
+
+
+ Interop\OneNoteInterop.cs
+
+
+ Interop\OutlookInterop.cs
+
+
+ Interop\OutlookUtils.cs
+
+
+ Interop\PowerpointInterop.cs
+
+
+ Interop\WordInterop.cs
+
@@ -94,8 +215,6 @@
-
-
@@ -124,12 +243,6 @@
-
-
- {ADD4E400-56E1-4E31-A5C2-070BEB238A0F}
- GreenshotInterop
-
-
rmdir /S /Q "$(SolutionDir)bin\$(Configuration)\Plugins"
"$(SolutionDir)\tools\TortoiseSVN\SubWCRev.exe" "$(ProjectDir)\" "$(ProjectDir)\Properties\AssemblyInfo.cs.template" "$(ProjectDir)\Properties\AssemblyInfo.cs"