diff --git a/Greenshot-OCR-Plugin/Greenshot-OCR-Plugin.csproj b/Greenshot-OCR-Plugin/Greenshot-OCR-Plugin.csproj
index 76d1060f3..eaee24e10 100644
--- a/Greenshot-OCR-Plugin/Greenshot-OCR-Plugin.csproj
+++ b/Greenshot-OCR-Plugin/Greenshot-OCR-Plugin.csproj
@@ -22,12 +22,12 @@
Full
False
True
- DEBUG;TRACE
False
- Auto
+ Off
4194304
x86
4096
+ DEBUG;TRACE
bin\Release\
@@ -36,7 +36,7 @@
True
False
False
- Auto
+ Off
4194304
AnyCPU
4096
diff --git a/Greenshot/Greenshot.csproj b/Greenshot/Greenshot.csproj
index f58991aa2..02aae6cb9 100644
--- a/Greenshot/Greenshot.csproj
+++ b/Greenshot/Greenshot.csproj
@@ -23,12 +23,12 @@
Full
True
False
- DEBUG;TRACE
False
- Auto
+ Off
4194304
x86
4096
+ DEBUG;TRACE
bin\Release\
@@ -37,7 +37,7 @@
False
True
False
- Auto
+ Off
4194304
AnyCPU
4096
@@ -74,7 +74,6 @@
-
diff --git a/Greenshot/releases/additional_files/donate.bmp b/Greenshot/releases/additional_files/donate.bmp
deleted file mode 100644
index 26e4697fc..000000000
Binary files a/Greenshot/releases/additional_files/donate.bmp and /dev/null differ
diff --git a/Greenshot/releases/build.bat b/Greenshot/releases/build.bat
index d43b9f30e..23cb8018d 100644
--- a/Greenshot/releases/build.bat
+++ b/Greenshot/releases/build.bat
@@ -3,8 +3,8 @@ echo Starting Greenshot BUILD
cd ..
echo Getting current Version
tools\TortoiseSVN\SubWCRev.exe . releases\innosetup\setup.iss releases\innosetup\setup-SVN.iss
-del bin\Release\*.log
cd bin\Release
+del *.log
echo Making MD5
..\..\tools\FileVerifier++\fvc.exe -c -a MD5 -r -o checksum.MD5 Greenshot.exe GreenshotPlugin.dll
cd ..\..
diff --git a/Greenshot/releases/innosetup/setup.iss b/Greenshot/releases/innosetup/setup.iss
index 07cfbcf81..c9fa845aa 100644
--- a/Greenshot/releases/innosetup/setup.iss
+++ b/Greenshot/releases/innosetup/setup.iss
@@ -23,7 +23,7 @@ Source: ..\..\bin\Release\checksum.MD5; DestDir: {app}; Flags: overwritereadonly
Source: ..\additional_files\installer.txt; DestDir: {app}; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion
Source: ..\additional_files\license.txt; DestDir: {app}; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion
Source: ..\additional_files\readme.txt; DestDir: {app}; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion
-Source: ..\additional_files\donate.bmp; Flags: dontcopy
+;Source: ..\additional_files\donate.bmp; Flags: dontcopy
; Core language files
Source: ..\..\bin\Release\Languages\*nl-NL*; DestDir: {app}\Languages; Flags: overwritereadonly ignoreversion replacesameversion;
Source: ..\..\bin\Release\Languages\*en-US*; DestDir: {app}\Languages; Flags: overwritereadonly ignoreversion replacesameversion;
@@ -213,7 +213,7 @@ Name: "languages\ruRU"; Description: "Pусский"; Types: Full; Check: hasLan
Name: "languages\svSE"; Description: "Svenska"; Types: Full; Check: hasLanguageGroup('1')
Name: "languages\trTR"; Description: "Türk"; Types: Full; Check: hasLanguageGroup('6')
Name: "languages\ukUA"; Description: "Українська"; Types: Full; Check: hasLanguageGroup('5')
-Name: "languages\trTR"; Description: "Việt"; Types: Full; Check: hasLanguageGroup('e')
+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]
@@ -301,43 +301,43 @@ end;
function CreateSupportUsPage(PreviousPageId: Integer) : Integer;
var
SupportUsPage: TWizardPage;
- DonateImage : TBitmapImage;
- BitmapLocation: string;
+ //DonateImage : TBitmapImage;
+ //BitmapLocation: string;
RichTextViewer : TRichEditViewer;
- Button1, Button5, Button10: TButton;
+ Button5, Button10: TButton;
begin
SupportUsPage := CreateCustomPage(PreviousPageId, ExpandConstant('{cm:supportus_caption}'), ExpandConstant('{cm:supportus_description}'));
- ExtractTemporaryFile('donate.bmp');
- BitmapLocation := ExpandConstant('{tmp}')+'\donate.bmp';
+ //ExtractTemporaryFile('donate.bmp');
+ //BitmapLocation := ExpandConstant('{tmp}')+'\donate.bmp';
// Image
- DonateImage := TBitmapImage.Create(SupportUsPage);
- DonateImage.Left := 10;
- DonateImage.Top := 100;
- DonateImage.AutoSize := True;
- DonateImage.Bitmap.LoadFromFile(BitmapLocation);
- DonateImage.Parent := SupportUsPage.Surface;
- DonateImage.OnClick := @ImageClick;
+ //DonateImage := TBitmapImage.Create(SupportUsPage);
+ //DonateImage.Left := 10;
+ //DonateImage.Top := 100;
+ //DonateImage.AutoSize := True;
+ //DonateImage.Bitmap.LoadFromFile(BitmapLocation);
+ //DonateImage.Parent := SupportUsPage.Surface;
+ //DonateImage.OnClick := @ImageClick;
// Donate Buttons
- Button1 := TButton.Create(SupportUsPage);
- Button1.Width := 50;
- Button1.Height := 20;
- Button1.Left := 20;
- Button1.Top := 45;
- Button1.Caption := '1$';
- Button1.OnClick := @DonateClick;
- Button1.Parent := SupportUsPage.Surface;
-
Button5 := TButton.Create(SupportUsPage);
Button5.Width := 50;
Button5.Height := 20;
Button5.Left := 20;
- Button5.Top := 70;
+ Button5.Top := 45;
Button5.Caption := '5$';
Button5.OnClick := @DonateClick;
Button5.Parent := SupportUsPage.Surface;
+ Button10 := TButton.Create(SupportUsPage);
+ Button10.Width := 50;
+ Button10.Height := 20;
+ Button10.Left := 20;
+ Button10.Top := 70;
+ Button10.Caption := '10$';
+ Button10.OnClick := @DonateClick;
+ Button10.Parent := SupportUsPage.Surface;
+
// Text
RichTextViewer := TRichEditViewer.Create(SupportUsPage);
RichTextViewer.Parent := SupportUsPage.Surface;
diff --git a/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj b/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj
index a0b0bcc97..de9f86c8a 100644
--- a/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj
+++ b/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj
@@ -25,7 +25,7 @@
True
DEBUG;TRACE
False
- Auto
+ Off
4194304
x86
4096
@@ -38,7 +38,7 @@
False
TRACE
False
- Auto
+ Off
4194304
AnyCPU
4096
diff --git a/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj b/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj
index 6901e1720..59b4b4d0a 100644
--- a/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj
+++ b/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj
@@ -24,7 +24,7 @@
True
DEBUG;TRACE
False
- Auto
+ Off
4194304
x86
4096
@@ -37,7 +37,7 @@
False
TRACE
False
- Auto
+ Off
4194304
AnyCPU
4096
diff --git a/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj b/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj
index 7a43cd81f..9904bf021 100644
--- a/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj
+++ b/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj
@@ -22,12 +22,12 @@
Full
False
True
- DEBUG;TRACE
False
- Auto
+ Off
4194304
x86
4096
+ DEBUG;TRACE
bin\Release\
@@ -36,7 +36,7 @@
True
False
False
- Auto
+ Off
4194304
AnyCPU
4096
diff --git a/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj b/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj
index 44e4c53c1..84f238bcc 100644
--- a/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj
+++ b/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj
@@ -22,12 +22,12 @@
Full
False
True
- DEBUG;TRACE
False
- Auto
+ Off
4194304
x86
4096
+ DEBUG;TRACE
bin\Release\
@@ -36,7 +36,7 @@
True
False
False
- Auto
+ Off
4194304
AnyCPU
4096
diff --git a/GreenshotNetworkImportPlugin/GreenshotNetworkImportPlugin.csproj b/GreenshotNetworkImportPlugin/GreenshotNetworkImportPlugin.csproj
index 61229d133..350d8e037 100644
--- a/GreenshotNetworkImportPlugin/GreenshotNetworkImportPlugin.csproj
+++ b/GreenshotNetworkImportPlugin/GreenshotNetworkImportPlugin.csproj
@@ -19,7 +19,7 @@
bin\Debug\
- True
+ true
Full
False
True
@@ -32,11 +32,7 @@
None
True
False
- False
- Auto
- 4194304
AnyCPU
- 4096
TRACE
@@ -67,4 +63,10 @@
mkdir "$(SolutionDir)bin\$(Configuration)\Plugins\$(ProjectName)"
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
+
+ False
+ Off
+ 4194304
+ 4096
+
\ No newline at end of file
diff --git a/GreenshotPlugin/GreenshotPlugin.csproj b/GreenshotPlugin/GreenshotPlugin.csproj
index 307346da5..be05ffdbd 100644
--- a/GreenshotPlugin/GreenshotPlugin.csproj
+++ b/GreenshotPlugin/GreenshotPlugin.csproj
@@ -23,7 +23,7 @@
False
True
False
- Auto
+ Off
4194304
x86
4096
@@ -36,7 +36,7 @@
True
False
False
- Auto
+ Off
4194304
AnyCPU
4096
diff --git a/GreenshotTest/GreenshotTest.csproj b/GreenshotTest/GreenshotTest.csproj
index 3c4e1b9aa..348b57bd0 100644
--- a/GreenshotTest/GreenshotTest.csproj
+++ b/GreenshotTest/GreenshotTest.csproj
@@ -23,7 +23,7 @@
True
DEBUG;TRACE
False
- Auto
+ Off
4194304
x86
4096
diff --git a/PluginExample/PluginExample.csproj b/PluginExample/PluginExample.csproj
index ce349552f..14d36a89e 100644
--- a/PluginExample/PluginExample.csproj
+++ b/PluginExample/PluginExample.csproj
@@ -19,7 +19,7 @@
x86
False
- Auto
+ Off
4194304
4096