github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-21 05:53:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Creating a branch 1.1 where I will try to make the 1.1.7 build available, this means I need to merge some changes from 2.0 to here.

Browse source
This commit is contained in:
RKrom 2013-12-04 17:46:02 +01:00
commit a03bc31aef
247 changed files with 6986 additions and 8233 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appinfo.ini
View file

@ -8,7 +8,7 @@ AppID=PortableApps.comInstaller
Publisher=PortableApps.com
Homepage=PortableApps.com/go/PortableApps.comInstaller
Category=Development
Description=Create PortableApps.com Format installers for portable apps
Description=PortableApps.com Format installer creator
Language=Multilingual
[License]
@ -18,8 +18,8 @@ Freeware=true
CommercialUse=true
[Version]
PackageVersion=3.0.5.0
DisplayVersion=3.0.5
PackageVersion=3.0.6.0
DisplayVersion=3.0.6
[Control]
Icons=1

25
Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstaller.nsi
View file

@ -1,4 +1,4 @@
;Copyright 2007-2012 John T. Haller of PortableApps.com
;Copyright 2007-2013 John T. Haller of PortableApps.com
;Website: http://PortableApps.com/
;This software is OSI Certified Open Source Software.
@ -24,8 +24,8 @@
;as published at PortableApps.com/development. It may also be used with commercial
;software by contacting PortableApps.com.
!define PORTABLEAPPSINSTALLERVERSION "3.0.5.0"
!define PORTABLEAPPS.COMFORMATVERSION "3.0.5"
!define PORTABLEAPPSINSTALLERVERSION "3.0.6.0"
!define PORTABLEAPPS.COMFORMATVERSION "3.0.6"
!if ${__FILE__} == "PortableApps.comInstallerPlugin.nsi"
!include PortableApps.comInstallerPluginConfig.nsh
@ -279,6 +279,7 @@ Var MINIMIZEINSTALLER
Var DOWNLOADEDFILE
Var DOWNLOADALREADYEXISTED
Var SECONDDOWNLOADATTEMPT
Var DownloadURLActual
!endif
Var INTERNALEULAVERSION
Var InstallingStatusString
@ -908,6 +909,7 @@ FunctionEnd
${If} $DOWNLOADALREADYEXISTED == "true"
StrCpy $DOWNLOADEDFILE "$EXEDIR\${DownloadFileName}"
${Else}
StrCpy $DownloadURLActual ${DownloadURL}
DownloadTheFile:
CreateDirectory `$PLUGINSDIR\Downloaded`
SetDetailsPrint both
@ -922,9 +924,9 @@ FunctionEnd
Delete "$PLUGINSDIR\Downloaded\${DownloadFilename}"
${If} $(downloading) != ""
inetc::get /CONNECTTIMEOUT 30 /NOCOOKIES /TRANSLATE $(downloading) $(downloadconnecting) $(downloadsecond) $(downloadminute) $(downloadhour) $(downloadplural) "%dkB (%d%%) of %dkB @ %d.%01dkB/s" " (%d %s%s $(downloadremaining))" "${DownloadURL}" "$PLUGINSDIR\Downloaded\${DownloadName}" /END
inetc::get /CONNECTTIMEOUT 30 /NOCOOKIES /TRANSLATE $(downloading) $(downloadconnecting) $(downloadsecond) $(downloadminute) $(downloadhour) $(downloadplural) "%dkB (%d%%) of %dkB @ %d.%01dkB/s" " (%d %s%s $(downloadremaining))" "$DownloadURLActual" "$PLUGINSDIR\Downloaded\${DownloadName}" /END
${Else}
inetc::get /CONNECTTIMEOUT 30 /NOCOOKIES /TRANSLATE "Downloading %s..." "Connecting..." second minute hour s "%dkB (%d%%) of %dkB @ %d.%01dkB/s" " (%d %s%s remaining)" "${DownloadURL}" "$PLUGINSDIR\Downloaded\${DownloadName}" /END
inetc::get /CONNECTTIMEOUT 30 /NOCOOKIES /TRANSLATE "Downloading %s..." "Connecting..." second minute hour s "%dkB (%d%%) of %dkB @ %d.%01dkB/s" " (%d %s%s remaining)" "$DownloadURLActual" "$PLUGINSDIR\Downloaded\${DownloadName}" /END
${EndIf}
SetDetailsPrint both
DetailPrint $InstallingStatusString
@ -961,13 +963,22 @@ FunctionEnd
${EndIf}
!endif
${Else}
Delete "$INTERNET_CACHE\${DownloadFileName}"
Delete "$PLUGINSDIR\Downloaded\${DownloadFilename}"
StrCpy $0 $DownloadURLActual
;Use backup PA.c download server if necessary
${WordFind} "$DownloadURLActual" "http://download2.portableapps.com" "#" $R0
${If} $R0 == 1
${WordReplace} "$DownloadURLActual" "http://download2.portableapps.com" "http://download.portableapps.com" "+" $DownloadURLActual
Goto DownloadTheFile
${EndIf}
${If} $SECONDDOWNLOADATTEMPT != true
${AndIf} $DOWNLOADRESULT != "Cancelled"
StrCpy $SECONDDOWNLOADATTEMPT true
Goto DownloadTheFile
${EndIf}
Delete "$INTERNET_CACHE\${DownloadFileName}"
Delete "$PLUGINSDIR\Downloaded\${DownloadFilename}"
SetDetailsPrint textonly
DetailPrint ""
SetDetailsPrint listonly

6
Greenshot/tools/PortableApps.comInstaller/Other/Source/InstallerWizard.nsi
View file

@ -1,4 +1,4 @@
;Copyright (C) 2006-2012 John T. Haller
;Copyright (C) 2006-2013 John T. Haller
;Website: http://PortableApps.com/Installer
@ -20,9 +20,9 @@
;Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
!define APPNAME "PortableApps.com Installer"
!define VER "3.0.5.0"
!define VER "3.0.6.0"
!define WEBSITE "PortableApps.com/Installer"
!define FRIENDLYVER "3.0.5"
!define FRIENDLYVER "3.0.6"
!define PORTABLEAPPS.COMFORMATVERSION "3.0"
;=== Program Details

BIN
Greenshot/tools/PortableApps.comInstaller/PortableApps.comInstaller.exe
View file

Binary file not shown.