From e8fd1b02ee7f2c43a93c7bebcc7c2294f156619a Mon Sep 17 00:00:00 2001
From: RKrom <robin@getgreenshot.org>
Date: Mon, 26 Jul 2010 15:46:52 +0000
Subject: [PATCH] Added bitmap example, Thomas should change this!

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@715 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
---
 Greenshot/releases/innosetup/greenshot.bmp | Bin 0 -> 24534 bytes
 Greenshot/releases/innosetup/setup.iss     |  33 ++++++++++++++-------
 2 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 Greenshot/releases/innosetup/greenshot.bmp

diff --git a/Greenshot/releases/innosetup/greenshot.bmp b/Greenshot/releases/innosetup/greenshot.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..b2a609a1c98dbb163dd33941e1100d18f75ad783
GIT binary patch
literal 24534
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
MHXqGP{T}^a0JF$B*Z=?k

literal 0
HcmV?d00001

diff --git a/Greenshot/releases/innosetup/setup.iss b/Greenshot/releases/innosetup/setup.iss
index 1145d735d..1d599485f 100644
--- a/Greenshot/releases/innosetup/setup.iss
+++ b/Greenshot/releases/innosetup/setup.iss
@@ -3,8 +3,8 @@ Source: ..\..\bin\Release\*; DestDir: {app}; Flags: overwritereadonly ignorevers
 Source: ..\..\bin\Release\Languages\*; DestDir: {app}\Languages; Flags: overwritereadonly ignoreversion replacesameversion
 Source: ..\additional_files\*; DestDir: {app}; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion
 ;Flickr Plugin
-Source: ..\..\bin\Release\Plugins\GreenshotFlickrPlugin\*; DestDir: {app}\Plugins\GreenshotFlickrPlugin; Components: plugins\flickr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
-Source: ..\..\bin\Release\Languages\Plugins\GreenshotFlickrPlugin\*; DestDir: {app}\Languages\Plugins\GreenshotFlickrPlugin; Components: plugins\flickr; Flags: overwritereadonly ignoreversion replacesameversion;
+;Source: ..\..\bin\Release\Plugins\GreenshotFlickrPlugin\*; DestDir: {app}\Plugins\GreenshotFlickrPlugin; Components: plugins\flickr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+;Source: ..\..\bin\Release\Languages\Plugins\GreenshotFlickrPlugin\*; DestDir: {app}\Languages\Plugins\GreenshotFlickrPlugin; Components: plugins\flickr; Flags: overwritereadonly ignoreversion replacesameversion;
 ;OCR Plugin
 ;Source: ..\..\bin\Release\Plugins\Greenshot-OCR-Plugin\*; DestDir: {app}\Plugins\Greenshot-OCR-Plugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
 ;Source: ..\..\bin\Release\Languages\Plugins\Greenshot-OCR-Plugin\*; DestDir: {app}\Languages\Plugins\Greenshot-OCR-Plugin; Components: plugins\ocr; Flags: overwritereadonly ignoreversion replacesameversion;
@@ -20,11 +20,22 @@ OutputBaseFilename=Greenshot-INSTALLER-0.8.0.$WCREV$
 DefaultDirName={pf}\Greenshot
 DefaultGroupName=Greenshot
 AppName=Greenshot
-AppVerName=Greenshot
+AppVerName=0.8.0.$WCREV$
 AppMutex=F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08,Global\F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08
 PrivilegesRequired=admin
+; Reference a bitmap, max size 164x314
+WizardImageFile=greenshot.bmp
+WizardImageStretch=false
+; Color for rest (needed when stretch=false)
+WizardImageBackColor=$3f3f3f
+; Reference a bitmap, max size 55x58
+WizardSmallImageFile=greenshot.bmp
+VersionInfoVersion=0.8.0.$WCREV$
+VersionInfoCompany=Greenshot
+VersionInfoProductName=Greenshot
+MinVersion=,5.01.2600
 [Registry]
-Root: HKCU; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "Greenshot"; ValueData: "{app}\Greenshot.exe"; Permissions: users-modify; Flags: uninsdeletevalue; Tasks: startup
+Root: HKCU; Subkey: Software\Microsoft\Windows\CurrentVersion\Run; ValueType: string; ValueName: Greenshot; ValueData: {app}\Greenshot.exe; Permissions: users-modify; Flags: uninsdeletevalue; Tasks: startup
 [Icons]
 Name: {group}\Greenshot; Filename: {app}\Greenshot.exe; WorkingDir: {app}
 Name: {group}\Uninstall Greenshot; Filename: {app}\unins000.exe; WorkingDir: {app}
@@ -37,13 +48,13 @@ Name: en; MessagesFile: compiler:Default.isl
 Name: de; MessagesFile: compiler:Languages\German.isl
 Name: nl; MessagesFile: compiler:Languages\Dutch.isl
 [Tasks]
-Name: startup; Description: "{cm:startup}";
-[Components]
-Name: "plugins"; Description: "Plugins"; Types: Full
+Name: startup; Description: {cm:startup}
+;[Components]
+;Name: "plugins"; Description: "Plugins"; Types: Full
 ;Name: "plugins\ocr"; Description: "OCR Plugin"; Types: Full
 ;Name: "plugins\jira"; Description: "JIRA Plugin"; Types: Full
 ;Name: "plugins\titlefix"; Description: "Title-fix Plugin"; Types: Full
-Name: "plugins\flickr"; Description: "Flickr Plugin"; Types: Full
+;Name: "plugins\flickr"; Description: "Flickr Plugin"; Types: Full
 [CustomMessages]
 en.dotnetmissing=This setup requires the .NET Framework v2.0.%nDo you want to download the framework now?
 de.dotnetmissing=Dieses Programm benötigt Microsoft .NET Framework v2.0.%nWollen Sie das Framework jetzt downloaden?
@@ -84,8 +95,8 @@ begin
 end;
 
 [Run]
-Filename: {app}\Greenshot.exe; Description: "{cm:startgreenshot}"; Parameters: --config Ui_Language={language}; WorkingDir: {app}; Flags: nowait postinstall runasoriginaluser skipifsilent
+Filename: {app}\Greenshot.exe; Description: {cm:startgreenshot}; Parameters: --config Ui_Language={language}; WorkingDir: {app}; Flags: nowait postinstall runasoriginaluser skipifsilent
 [InstallDelete]
 Name: {app}; Type: filesandordirs; Languages: 
-Name: {userstartup}\Greenshot.lnk; Type: files; Languages:
-Name: {commonstartup}\Greenshot.lnk; Type: files; Languages:
+Name: {userstartup}\Greenshot.lnk; Type: files; Languages: 
+Name: {commonstartup}\Greenshot.lnk; Type: files; Languages: