[Gpg4win-commits] r1101 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2009-02-16 19:32:43 +0100 (Mon, 16 Feb 2009)
New Revision: 1101

Modified:
   trunk/ChangeLog
   trunk/src/installer-finish.nsi
   trunk/src/installer.nsi
Log:
2009-02-16  Marcus Brinkmann  <marcus at g10code.de>

	* src/inst-sections.nsi: Install an uninstall entry into the start
	menu.
	* src/inst-finish.nsi: Add translation for uninstall entry.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-02-16 13:50:43 UTC (rev 1100)
+++ trunk/ChangeLog	2009-02-16 18:32:43 UTC (rev 1101)
@@ -1,3 +1,9 @@
+2009-02-16  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/inst-sections.nsi: Install an uninstall entry into the start
+	menu.
+	* src/inst-finish.nsi: Add translation for uninstall entry.
+
 2009-02-06  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
 
 	* po/de.po: Fix two typos.

Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi	2009-02-16 13:50:43 UTC (rev 1100)
+++ trunk/src/installer-finish.nsi	2009-02-16 18:32:43 UTC (rev 1101)
@@ -23,6 +23,20 @@
 Section
   WriteUninstaller "$INSTDIR\${PACKAGE}-uninstall.exe"
 
+!ifdef HAVE_STARTMENU
+  # Check if the start menu entries where requested.
+  !insertmacro MUI_INSTALLOPTIONS_READ $R0 "installer-options.ini" \
+        "Field 2" "State"
+  IntCmp $R0 0 no_start_menu_uninstall
+
+  # Create a shortcut named "new shortcut" in the start menu programs
+  # directory point the new shortcut at the program uninstaller
+  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" \
+    "$INSTDIR\${PACKAGE}-uninstall.exe" \
+    "" "$INSTDIR\${PACKAGE}-uninstall.exe" "" SW_SHOWNORMAL "" $(DESC_Menu_uninstall)
+  no_start_menu_uninstall:
+!endif
+
   # Windows Add/Remove Programs support
   # Note that the version is appended to the DisplayName, despite that
   # this is not necessary as a click on "support information" gives

Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi	2009-02-16 13:50:43 UTC (rev 1100)
+++ trunk/src/installer.nsi	2009-02-16 18:32:43 UTC (rev 1101)
@@ -249,6 +249,9 @@
 LangString DESC_Menu_manuals ${LANG_ENGLISH} \
    "Documentation"
 
+LangString DESC_Menu_uninstall ${LANG_ENGLISH} \
+   "Uninstall"
+
 # Used as subdirectory name on Desktop.
 LangString DESC_Desktop_manuals ${LANG_ENGLISH} \
    "Gpg4win Documentation"