From 3407239b8013b0d99cb71c12b04680044888aab4 Mon Sep 17 00:00:00 2001
From: tgotic <tgotic@users.sourceforge.net>
Date: Wed, 4 May 2011 21:57:32 +0200
Subject: [PATCH] version strings updated to 2.4.2

---
 zint.nsi | 55 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/zint.nsi b/zint.nsi
index caf65925..8b7feafe 100644
--- a/zint.nsi
+++ b/zint.nsi
@@ -1,16 +1,11 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;
-; @(#) $Id: zint.nsi,v 1.1 2009/11/17 22:23:06 hooper114 Exp $
-;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
+;******************************************************************************
 ; Script generated by the HM NIS Edit Script Wizard.
 ; HM NIS Edit Wizard helper defines
 ; ver 1.0.0.1 20090914 tgotic removed WinSxS check
 ;******************************************************************************
 !define PRODUCT_NAME "Zint"
 !define PRODUCT_EXE "qtZint.exe"
-!define PRODUCT_VERSION "2.4.1.0"
+!define PRODUCT_VERSION "2.4.2.0"
 !define PRODUCT_WEB_SITE "http://www.zint.org.uk"
 !define PRODUCT_PUBLISHER "Robin Stuart & BogDan Vatra"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_EXE}"
@@ -47,13 +42,15 @@ CRCCheck force
 ;******************************************************************************
 ; MUI Settings
 !define MUI_ABORTWARNING
-; odkomentirati za prikaz MUI_PAGE_INSTFILES
+; uncomment to show MUI_PAGE_INSTFILES
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_UNFINISHPAGE_NOAUTOCLOSE
 
+!define MUI_LANGDLL_REGISTRY_ROOT SHCTX
+!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
+!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
 ;******************************************************************************
-Var USER
-Var ICONS_GROUP
+Var StartMenuFolder
 ;******************************************************************************
 ; Welcome page
 !insertmacro MUI_PAGE_WELCOME
@@ -69,9 +66,11 @@ Var ICONS_GROUP
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT SHCTX
 !define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
 !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"
-!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP
+!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
 ; Instfiles page
 !insertmacro MUI_PAGE_INSTFILES
+; run qtZint
+!define MUI_FINISHPAGE_RUN "$INSTDIR\${PRODUCT_EXE}"
 ;Finish page
 !insertmacro MUI_PAGE_FINISH
 
@@ -91,36 +90,34 @@ FunctionEnd
 ;******************************************************************************
 Function startInstall
   SetOutPath "$INSTDIR"
-  StrCpy $USER 0
   UserInfo::GetName
-  Pop $USER
+  Pop $7
 
   ${GetTime} "" "L" $0 $1 $2 $3 $4 $5 $6
 
-#  LogSet on
   DetailPrint "--------------------------------------------------------------------------------"
-  DetailPrint "Install start $2-$1-$0 $4:$5:$6 user:$USER ($MultiUser.Privileges)"
+  DetailPrint "Install start $2-$1-$0 $4:$5:$6 user:$7 ($MultiUser.Privileges)"
   DetailPrint "--------------------------------------------------------------------------------"
 FunctionEnd
 ;******************************************************************************
-;******************************************************************************
 Section ${PRODUCT_NAME} SEC01
   SectionIn RO
   Call startInstall
   SetOverwrite ifnewer
   File ".\frontend_qt4\release\${PRODUCT_EXE}"
-  File ".\backend\zlib1.dll"
-  File ".\backend\libpng14.dll"
-  File ".\backend\zint.dll"
+  File ".\frontend\zlib1.dll"
+  File ".\frontend\libpng15.dll"
+  File ".\frontend\zint.dll"
   File ".\frontend\zint.exe"
   File "zint.sha1"
+  File "gpl-3.0.txt"
   
   WriteUninstaller "$INSTDIR\uninst.exe"
 
 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-  CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Zint Barcode Studio.lnk" "$INSTDIR\${PRODUCT_EXE}"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" "$INSTDIR\uninst.exe"
+  CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
+  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Zint Barcode Studio.lnk" "$INSTDIR\${PRODUCT_EXE}"
+  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\uninst.exe"
 !insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd
 ;******************************************************************************
@@ -151,15 +148,14 @@ LangString MSG5 ${LANG_ENGLISH}   "Unable to create $INSTDIR"
 ;******************************************************************************
 Function un.onInit
   !insertmacro MULTIUSER_UNINIT
-  StrCpy $USER 0
   UserInfo::GetName
-  Pop $USER
+  Pop $7
 
   ${GetTime} "" "L" $0 $1 $2 $3 $4 $5 $6
 
 #  LogSet on
   DetailPrint "--------------------------------------------------------------------------------"
-  DetailPrint "Uninstall start $2-$1-$0 $4:$5:$6 user:$USER ($MultiUser.Privileges)"
+  DetailPrint "Uninstall start $2-$1-$0 $4:$5:$6 user:$7 ($MultiUser.Privileges)"
   DetailPrint "--------------------------------------------------------------------------------"
 
   MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 $(MSG3) /SD IDYES IDYES +2
@@ -185,16 +181,17 @@ Section Uninstall
   DeleteRegKey SHCTX  "${PRODUCT_UNINST_KEY}"
   DeleteRegKey SHCTX  "${PRODUCT_DIR_REGKEY}"
 
-!insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP
-  RmDir /r "$SMPROGRAMS\$ICONS_GROUP"
+!insertmacro MUI_STARTMENU_GETFOLDER "Application" $StartMenuFolder
+  RmDir /r "$SMPROGRAMS\$StartMenuFolder"
   Delete /REBOOTOK "$INSTDIR\${PRODUCT_EXE}"
   Delete /REBOOTOK "$INSTDIR\zint.exe"
   Delete /REBOOTOK "$INSTDIR\zint.dll"
-  Delete /REBOOTOK "$INSTDIR\libpng14.dll"
+  Delete /REBOOTOK "$INSTDIR\libpng15.dll"
   Delete /REBOOTOK "$INSTDIR\zint.sha1"
   Delete /REBOOTOK "$INSTDIR\zlib1.dll"
   Delete /REBOOTOK "$INSTDIR\uninst.exe"
   Delete /REBOOTOK "$INSTDIR\install.log"
+  Delete /REBOOTOK "$INSTDIR\gpl-3.0.txt"
   RmDir /REBOOTOK "$INSTDIR"
 SectionEnd
 ;******************************************************************************
@@ -205,5 +202,5 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${PRODUCT_NAME} Setup"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${PRODUCT_VERSION}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright © 2011 Robin Stuart & BogDan Vatra"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "License" "GNU General Public License version 3"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "WWW" "${PRODUCT_WEB_SITE}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "www" "${PRODUCT_WEB_SITE}"
 ;******************************************************************************