[Inteproxy-commits] r153 - in trunk: . packaging/Windows

[scm-commit@wald.intevation.org]

Author: emanuel
Date: 2008-06-20 10:27:59 +0200 (Fri, 20 Jun 2008)
New Revision: 153

Modified:
   trunk/ChangeLog
   trunk/packaging/Windows/inteproxy-installer.nsi
Log:
Add non-administrator warning for uninstallation. Set correct 'all
users' folder for uninstall.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-20 07:23:32 UTC (rev 152)
+++ trunk/ChangeLog	2008-06-20 08:27:59 UTC (rev 153)
@@ -1,3 +1,9 @@
+2008-06-20  Emanuel Schuetze <emanuel at intevation.de>
+
+	* packaging/Windows/inteproxy-installer.nsi: Add non-administrator
+	warning for uninstallation. Set correct 'all users' folder for
+	uninstall.	  
+
 2008-06-20  Stephan Holl <stephan.holl at intevation.de>
 
 	* packaging/Windows/Makefile: Adopted the release-date

Modified: trunk/packaging/Windows/inteproxy-installer.nsi
===================================================================
--- trunk/packaging/Windows/inteproxy-installer.nsi	2008-06-20 07:23:32 UTC (rev 152)
+++ trunk/packaging/Windows/inteproxy-installer.nsi	2008-06-20 08:27:59 UTC (rev 153)
@@ -76,6 +76,7 @@
   !insertmacro MUI_PAGE_INSTFILES
   !insertmacro MUI_PAGE_FINISH
 
+  !define MUI_PAGE_CUSTOMFUNCTION_SHOW un.PrintNonAdminWarning
   !insertmacro MUI_UNPAGE_WELCOME
   !insertmacro MUI_UNPAGE_CONFIRM
   !insertmacro MUI_UNPAGE_INSTFILES
@@ -257,11 +258,15 @@
 LangString T_InstOptFieldB ${LANG_GERMAN} "Arbeitsfläche"
 LangString T_InstOptFieldC ${LANG_GERMAN} "Schnellstartleiste"
 
-# From Function PrintNonAdminWarning
+# From Function (un.)PrintNonAdminWarning
 LangString T_AdminNeeded ${LANG_ENGLISH} \
    "Warning: Administrator permissions required for the installation of ${PRODUCT_NAME_SHORT}."
 LangString T_AdminNeeded ${LANG_GERMAN} \
    "Achtung: Für die Installation von ${PRODUCT_NAME_SHORT} werden Administratorrechte benötigt."
+LangString T_AdminNeeded_uninstall ${LANG_ENGLISH} \
+   "Warning: Administrator permissions required for the uninstallation of ${PRODUCT_NAME_SHORT}."
+LangString T_AdminNeeded_uninstall ${LANG_GERMAN} \
+   "Achtung: Für die Deinstallation von ${PRODUCT_NAME_SHORT} werden Administratorrechte benötigt."
 
 # User Manual Strings
 LangString UserManualLinkName ${LANG_ENGLISH} "User Manual.lnk"
@@ -279,6 +284,9 @@
 
   ; Delete installation dir
   RMDir /R "$INSTDIR"
+  
+  # 'all users' shell folder is used (for $DESKTOP, $SMPROGRAMS, $QUICKLAUNCH,...)
+  SetShellVarContext all
 
   ; Delete start menu entries
   RMDir /R  "$SMPROGRAMS\${PRODUCT_NAME_SHORT}"
@@ -302,3 +310,18 @@
   !insertmacro MUI_UNGETLANGUAGE
 
 FunctionEnd
+
+# PrintNonAdminWarning (uninstall)
+Function un.PrintNonAdminWarning
+  ClearErrors
+  UserInfo::GetName
+  IfErrors leave
+  Pop $0
+  UserInfo::GetAccountType
+  Pop $1
+  StrCmp $1 "Admin" leave +1
+  MessageBox MB_OK|MB_ICONEXCLAMATION "$(T_AdminNeeded_uninstall)"
+  Quit
+
+ leave:
+FunctionEnd