* add context menu item to open directories

 * ask to uninstall VLC before installing
 * use several languages (its nice for people who really don't talk english)
 * small fixes

diff --git a/vlc.win32.nsi b/vlc.win32.nsi
index 04e323ea46a38426f327b9db73a951693a3fa663..3f8b59be8e8c8154a52b1de601b1d526ba748ac9 100644 (file)
--- a/vlc.win32.nsi
+++ b/vlc.win32.nsi
@@ -21,9 +21,9 @@ Name "${PRODUCT_GROUP} ${PRODUCT_NAME} ${PRODUCT_VERSION}"
 OutFile ..\vlc-${VERSION}-win32.exe\r
 InstallDir "$PROGRAMFILES\VideoLAN\VLC"\r
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "Install_Dir"\r
-SetCompressor lzma\r
-ShowInstDetails show\r
-ShowUnInstDetails show\r
+SetCompressor /SOLID lzma\r
+;ShowInstDetails show\r
+;ShowUnInstDetails show\r
 SetOverwrite ifnewer\r
 CRCCheck on\r
 \r
@@ -44,6 +44,7 @@ InstType "Full"
 !define MUI_COMPONENTSPAGE_SMALLDESC\r
 \r
 ; Welcome page\r
+!define MUI_WELCOMEPAGE_TITLE_3LINES\r
 !insertmacro MUI_PAGE_WELCOME\r
 ; License page\r
 !insertmacro MUI_PAGE_LICENSE "COPYING.txt"\r
@@ -55,21 +56,45 @@ InstType "Full"
 !insertmacro MUI_PAGE_INSTFILES\r
 ; Finish page\r
 !define MUI_FINISHPAGE_RUN "$INSTDIR\vlc.exe"\r
+!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt"\r
+!define MUI_FINISHPAGE_SHOWREADME_TEXT "View changelog"\r
+!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED\r
+!define MUI_FINISHPAGE_LINK "Visit the VideoLAN VLC media player Website"\r
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.videolan.org/vlc/"\r
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT\r
 !insertmacro MUI_PAGE_FINISH\r
 \r
 ; Uninstaller pages\r
+!insertmacro MUI_UNPAGE_CONFIRM\r
 !insertmacro MUI_UNPAGE_INSTFILES\r
 \r
 ; Language files\r
-!insertmacro MUI_LANGUAGE "English"\r
+  !insertmacro MUI_LANGUAGE "English" # first language is the default language\r
+  !insertmacro MUI_LANGUAGE "French"\r
+  !insertmacro MUI_LANGUAGE "German"\r
+  !insertmacro MUI_LANGUAGE "Spanish"\r
+  !insertmacro MUI_LANGUAGE "SimpChinese"\r
+  !insertmacro MUI_LANGUAGE "TradChinese"\r
+  !insertmacro MUI_LANGUAGE "Japanese"\r
+  !insertmacro MUI_LANGUAGE "Korean"\r
+  !insertmacro MUI_LANGUAGE "Italian"\r
+  !insertmacro MUI_LANGUAGE "Dutch"\r
+  !insertmacro MUI_LANGUAGE "Danish"\r
+  !insertmacro MUI_LANGUAGE "Swedish"\r
+  !insertmacro MUI_LANGUAGE "Norwegian"\r
+  !insertmacro MUI_LANGUAGE "Finnish"\r
+  !insertmacro MUI_LANGUAGE "Greek"\r
+  !insertmacro MUI_LANGUAGE "Russian"\r
+  !insertmacro MUI_LANGUAGE "Portuguese"\r
+  !insertmacro MUI_LANGUAGE "Arabic"\r
+\r
+!insertmacro MUI_RESERVEFILE_LANGDLL\r
 \r
 ; Reserve files\r
 !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS\r
 \r
 ; MUI end ------\r
 \r
-\r
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
 ; Push extensions on stack ;\r
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
@@ -162,6 +187,7 @@ FunctionEnd
 \r
 !macro RegisterExtensionSection EXT\r
   Section /o ${EXT}\r
+    SectionIn 2 3\r
     Push $R0\r
     StrCpy $R0 ${EXT}\r
     Call RegisterExtension\r
@@ -327,6 +353,7 @@ SectionEnd
 Section "Context Menus" SEC05\r
   SectionIn 1 2 3\r
   !insertmacro MacroAllExtensions AddContextMenu\r
+  !insertmacro AddContextMenu "Folder"\r
 SectionEnd\r
 \r
 SectionGroup "File type associations" SEC06\r
@@ -372,11 +399,28 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} \\r
     "The VLC ActiveX plugin"\r
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} \\r
-    "Add context menu items (Play With VLC and Add To VLC's Playlist)"\r
+    "Add context menu items ('Play With VLC' and 'Add To VLC's Playlist')"\r
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} \\r
     "Sets VLC media player as the default application for the specified file type"\r
 !insertmacro MUI_FUNCTION_DESCRIPTION_END\r
 \r
+Function .onInit\r
+  ReadRegStr $R0  ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" \\r
+  "UninstallString"\r
+  StrCmp $R0 "" done\r
+ \r
+  MessageBox MB_YESNO|MB_ICONEXCLAMATION \\r
+  "VLC media player has already been installed. $\nDo you want to remove \\r
+  the previous version before installing $(^Name) ?" \\r
+  IDNO done\r
+  \r
+  ;Run the uninstaller\r
+  ;uninst:\r
+    ClearErrors\r
+    ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file\r
+  done:\r
+  !insertmacro MUI_LANGDLL_DISPLAY\r
+FunctionEnd\r
 \r
 Function un.onUninstSuccess\r
   HideWindow\r
@@ -385,9 +429,7 @@ Function un.onUninstSuccess
 FunctionEnd\r
 \r
 Function un.onInit\r
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \\r
-    "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2\r
-  Abort\r
+  !insertmacro MUI_LANGDLL_DISPLAY\r
 FunctionEnd\r
 \r
 Section Uninstall\r
@@ -395,6 +437,7 @@ Section Uninstall
 \r
   !insertmacro MacroAllExtensions DeleteContextMenu\r
   !insertmacro MacroAllExtensions UnRegisterExtensionSection\r
+  !insertmacro DeleteContextMenu "Folder"\r
 \r
   UnRegDLL "$INSTDIR\axvlc.dll"\r
   Delete /REBOOTOK "$INSTDIR\axvlc.dll"\r