Changeset 3054

Timestamp:

05/10/09 20:58:25 (4 years ago)

Author:

matysek03

Message:

win32 installer - add quicklaunch shortcut, possibility change current/all users

Location:

trunk/win32/nsis

Files:

• ChangeLog (modified) (1 diff)
• installer.nsi (modified) (6 diffs)

trunk/win32/nsis/ChangeLog

@@ +1 @@
+2009-02-18  matysek <matysek03@users.sf.net>
+
+        * added quick launch icon
+        * added possibility to install shortcuts for all/current user
+
 2009-02-18  matysek <matysek03@users.sf.net>
 

trunk/win32/nsis/installer.nsi

@@ -187 +187 @@
     !insertmacro MUI_PAGE_LICENSE \
         $(LICENSE_FILE) ; defined in language file
-    ;!insertmacro MUI_PAGE_COMPONENTS
+    !insertmacro MUI_PAGE_COMPONENTS
     !insertmacro MUI_PAGE_DIRECTORY
     !insertmacro MUI_PAGE_INSTFILES
 
-    !insertmacro MUI_PAGE_STARTMENU Application $StartMenuDir
+    ;!insertmacro MUI_PAGE_STARTMENU Application $StartMenuDir
 
     ; page with release notes
@@ -243 +243 @@
 ; Section is like one component
 Section $(CORE_SEC_TITLE) SecCore
-
-    ; shortcuts will be installed for all users - Desktop/Startmenu
-    ; and Sword data files will be also installed for all users
-    SetShellVarContext all
-
 
     ; Install fonts
@@ -293 +288 @@
     !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
 
-    ; Install Sword files
+    ; Sword data files need to be installed for all users
+    SetShellVarContext all
+    ; Install Sword files - not needed to uninstall
     SetOutPath '$APPDATA\${INSTPATH_SWORD}'
     File /r "${SWORD_F}"
-
-    ; startmenu/shortcuts
-
-    !define STM_DIR "$SMPROGRAMS\$StartMenuDir"
-
-    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-        ;Create shortcuts
-        CreateDirectory '${STM_DIR}'
-        CreateShortCut '${STM_DIR}\${APP_NAME}.lnk' '$INSTDIR\bin\${APP_BINARY_NAME}'
-        CreateShortCut '${STM_DIR}\Uninstall.lnk' '${UNINST_EXE}'
-        ; utils.bat and EN help file
-        CreateShortCut '${STM_DIR}\Utils.lnk' '$INSTDIR\bin\utils.bat'
-        CreateShortCut '${STM_DIR}\Help.lnk' '$INSTDIR\share\help\C\xiphos.chm'
-    !insertmacro MUI_STARTMENU_WRITE_END
-
-    ; Desktop shortcuts
-    CreateShortCut '$DESKTOP\${APP_NAME}.lnk' '$INSTDIR\bin\${APP_BINARY_NAME}'
+    ; set to default value 
+    SetShellVarContext current
 
     ; Add uninstall information to Add/Remove Programs
@@ -340 +322 @@
 
 ;--------------------------------
+; Other Sections Section
+
+Section "Install for All Users"
+    ; shortcuts will be installed for all users - Desktop/Startmenu/Quick launch
+    SetShellVarContext all
+SectionEnd
+
+Section "Start Menu Shortcuts"
+    ; startmenu/shortcuts
+    !define STM_DIR "$SMPROGRAMS\${APP_NAME}"
+
+    ; Create shortcuts
+    CreateDirectory '${STM_DIR}'
+    CreateShortCut '${STM_DIR}\Uninstall.lnk' '${UNINST_EXE}'
+    CreateShortCut '${STM_DIR}\Xiphos Help.lnk' '$INSTDIR\share\help\C\xiphos.chm'
+    CreateShortCut '${STM_DIR}\Utils.lnk' '$INSTDIR\bin\utils.bat'
+    CreateShortCut '${STM_DIR}\${APP_NAME}.lnk' '$INSTDIR\bin\${APP_BINARY_NAME}'
+SectionEnd
+ 
+Section "Desktop Shortcut"
+    CreateShortCut '$DESKTOP\${APP_NAME}.lnk' '$INSTDIR\bin\${APP_BINARY_NAME}'
+SectionEnd
+
+Section "Quick Launch Icon"
+    CreateShortCut '$QUICKLAUNCH\${APP_NAME}.lnk' '$INSTDIR\bin\${APP_BINARY_NAME}'
+SectionEnd
+
+;--------------------------------
 ; Installer Functions
 
@@ -368 +378 @@
 
 Section Uninstall
-
-    ; uninstall shortcuts for all users - Desktop/Startmenu
-    SetShellVarContext all
 
     ; Hack to speed up uninstaller
@@ -391 +398 @@
     RMDir "$PROGRAMFILES\CrossWire"
 
-    !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuDir
-    !define ST_MENU "$SMPROGRAMS\$StartMenuDir"
-
+
+    ;-----------------------------------
+    ; Uninstall shortcuts for all susers
+
+    ; uninstall shortcuts for all users - Desktop/Startmenu
+    SetShellVarContext all
+
+    !define ST_MENU "$SMPROGRAMS\${APP_NAME}"
+
+    ; remove Startmenu
     Delete "${ST_MENU}\${APP_NAME}.lnk"
     Delete "${ST_MENU}\Uninstall.lnk"
     Delete "${ST_MENU}\Utils.lnk"
-    Delete "${ST_MENU}\Help.lnk"
+    Delete "${ST_MENU}\${APP_NAME} Help.lnk"
     RMDir "${ST_MENU}"
+
+    ; remove desktop icon
     Delete "$DESKTOP\${APP_NAME}.lnk"
+
+    ; remove Quick Launch icon
+    Delete "$QUICKLAUNCH\${APP_NAME}.lnk"
+
+    ;-------------------------------------
+    ; Uninstall shortcuts for current user
+
+    ; uninstall shortcuts for current user - Desktop/Startmenu
+    SetShellVarContext current
+
+    !define ST2_MENU "$SMPROGRAMS\${APP_NAME}"
+
+    ; remove Startmenu
+    Delete "${ST2_MENU}\${APP_NAME}.lnk"
+    Delete "${ST2_MENU}\Uninstall.lnk"
+    Delete "${ST2_MENU}\Utils.lnk"
+    Delete "${ST2_MENU}\${APP_NAME} Help.lnk"
+    RMDir "${ST2_MENU}"
+
+    ; remove desktop icon
+    Delete "$DESKTOP\${APP_NAME}.lnk"
+
+    ; remove Quick Launch icon
+    Delete "$QUICKLAUNCH\${APP_NAME}.lnk"
+
 
     ; clean Windows Registry