* slightly enlarged the progress_for_downloads-panel-to-be and fixed some bugs in...

[vlc] / vlc.win32.nsi

diff --git a/vlc.win32.nsi b/vlc.win32.nsi
index 71f8fd90f4527cb708747aadfad96f6fa547ac5b..8dd1bd30ae857546ac359960c3fd2cd92ace0f74 100644 (file)
--- a/vlc.win32.nsi
+++ b/vlc.win32.nsi
@@ -43,8 +43,8 @@ InstType "Full"
 \r
 ; MUI Settings\r
   !define MUI_ABORTWARNING\r
 \r
 ; MUI Settings\r
   !define MUI_ABORTWARNING\r

-  !define MUI_ICON "vlc48x48new.ico"\r
-  !define MUI_UNICON "vlc48x48new.ico"\r
+  !define MUI_ICON "vlc48x48.ico"\r
+  !define MUI_UNICON "vlc48x48.ico"\r

   !define MUI_COMPONENTSPAGE_SMALLDESC\r
 \r
 ; Installer pages\r
   !define MUI_COMPONENTSPAGE_SMALLDESC\r
 \r
 ; Installer pages\r


@@ -61,8 +61,7 @@ InstType "Full"
     !insertmacro MUI_PAGE_INSTFILES\r
   ; Finish page\r
     !define MUI_FINISHPAGE_RUN "$INSTDIR\vlc.exe"\r
     !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 "$INSTDIR\README.txt"\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_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


@@ -174,7 +173,7 @@ NoBackup:
   ReadRegStr $0 HKCR "VLC$R0" ""\r
   WriteRegStr HKCR "VLC$R0" "" "VLC media file"\r
   WriteRegStr HKCR "VLC$R0\shell" "" "Play"\r
   ReadRegStr $0 HKCR "VLC$R0" ""\r
   WriteRegStr HKCR "VLC$R0" "" "VLC media file"\r
   WriteRegStr HKCR "VLC$R0\shell" "" "Play"\r

-  WriteRegStr HKCR "VLC$R0\shell\Play\command" "" '"$INSTDIR\vlc.exe" "%1"'\r
+  WriteRegStr HKCR "VLC$R0\shell\Play\command" "" '"$INSTDIR\vlc.exe" --one-instance "%1"'\r

   WriteRegStr HKCR "VLC$R0\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
 FunctionEnd\r
 \r
   WriteRegStr HKCR "VLC$R0\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
 FunctionEnd\r
 \r


@@ -270,6 +269,7 @@ Section "Media player (required)" SEC01
 \r
   File  /r plugins\r
   File  /r locale\r
 \r
   File  /r plugins\r
   File  /r locale\r

+  File  /r osdmenu\r

   File  /r skins\r
   File  /r http\r
 \r
   File  /r skins\r
   File  /r http\r
 \r


@@ -283,10 +283,10 @@ Section "Media player (required)" SEC01
 \r
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC" "" "Play with VLC media player"\r
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC\command" "" \\r
 \r
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC" "" "Play with VLC media player"\r
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC\command" "" \\r

-    "$INSTDIR\vlc.exe cdda:%1"\r
+    "$INSTDIR\vlc.exe --one-instance cdda:%1"\r

   WriteRegStr HKCR "DVD\shell\PlayWithVLC" "" "Play with VLC media player"\r
   WriteRegStr HKCR "DVD\shell\PlayWithVLC\command" "" \\r
   WriteRegStr HKCR "DVD\shell\PlayWithVLC" "" "Play with VLC media player"\r
   WriteRegStr HKCR "DVD\shell\PlayWithVLC\command" "" \\r

-    "$INSTDIR\vlc.exe dvd:%1"\r
+    "$INSTDIR\vlc.exe --one-instance dvd:%1"\r

 \r
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayDVDMovieOnArrival" "VLCPlayDVDMovieOnArrival" ""\r
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Action" "Play DVD movie"\r
 \r
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayDVDMovieOnArrival" "VLCPlayDVDMovieOnArrival" ""\r
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Action" "Play DVD movie"\r


@@ -304,29 +304,27 @@ Section "Media player (required)" SEC01
   WriteRegStr HKCR "VLC.DVDMovie" "" "VLC DVD Movie"\r
   WriteRegStr HKCR "VLC.DVDMovie\shell" "" "Play"\r
   WriteRegStr HKCR "VLC.DVDMovie\shell\Play\command" "" \\r
   WriteRegStr HKCR "VLC.DVDMovie" "" "VLC DVD Movie"\r
   WriteRegStr HKCR "VLC.DVDMovie\shell" "" "Play"\r
   WriteRegStr HKCR "VLC.DVDMovie\shell\Play\command" "" \\r

-    '$INSTDIR\vlc.exe dvd:%1@1:0'\r
+    '$INSTDIR\vlc.exe --one-instance dvd:%1'\r

   WriteRegStr HKCR "VLC.DVDMovie\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
   WriteRegStr HKCR "VLC.CDAudio" "" "VLC CD Audio"\r
   WriteRegStr HKCR "VLC.CDAudio\shell" "" "Play"\r
   WriteRegStr HKCR "VLC.CDAudio\shell\Play\command" "" \\r
   WriteRegStr HKCR "VLC.DVDMovie\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
   WriteRegStr HKCR "VLC.CDAudio" "" "VLC CD Audio"\r
   WriteRegStr HKCR "VLC.CDAudio\shell" "" "Play"\r
   WriteRegStr HKCR "VLC.CDAudio\shell\Play\command" "" \\r

-    '$INSTDIR\vlc.exe cdda:%1'\r
+    '$INSTDIR\vlc.exe --one-instance cdda:%1'\r

   WriteRegStr HKCR "VLC.CDAudio\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
 \r
 SectionEnd\r
 \r
   WriteRegStr HKCR "VLC.CDAudio\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
 \r
 SectionEnd\r
 \r

-Section "Start Menu + Desktop Shortcut" SEC02\r
+Section "Start Menu Shortcut" SEC02a\r

   SectionIn 1 2 3\r
   CreateDirectory "$SMPROGRAMS\VideoLAN"\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player.lnk" \\r
   SectionIn 1 2 3\r
   CreateDirectory "$SMPROGRAMS\VideoLAN"\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player.lnk" \\r

-    "$INSTDIR\vlc.exe" "--intf wxwin --wxwin-embed"\r
+    "$INSTDIR\vlc.exe" "--intf wx --wx-embed"\r

   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (alt).lnk" \\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (alt).lnk" \\r

-    "$INSTDIR\vlc.exe" "--intf wxwin --no-wxwin-embed"\r
+    "$INSTDIR\vlc.exe" "--intf wx --no-wx-embed"\r

   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (skins).lnk" \\r
     "$INSTDIR\vlc.exe" "--intf skins"\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\Reset VLC defaults and quit.lnk" \\r
     "$INSTDIR\vlc.exe" "--reset-config --reset-plugins-cache --save-config vlc:quit "\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (skins).lnk" \\r
     "$INSTDIR\vlc.exe" "--intf skins"\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\Reset VLC defaults and quit.lnk" \\r
     "$INSTDIR\vlc.exe" "--reset-config --reset-plugins-cache --save-config vlc:quit "\r

-  CreateShortCut "$DESKTOP\VLC media player.lnk" \\r
-    "$INSTDIR\vlc.exe" "--intf wxwin"\r

   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" \\r
     "${PRODUCT_WEB_SITE}"\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\${PRODUCT_NAME} Website.lnk" \\r
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" \\r
     "${PRODUCT_WEB_SITE}"\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\${PRODUCT_NAME} Website.lnk" \\r


@@ -337,6 +335,12 @@ Section "Start Menu + Desktop Shortcut" SEC02
     "$INSTDIR\Documentation.url"\r
 SectionEnd\r
 \r
     "$INSTDIR\Documentation.url"\r
 SectionEnd\r
 \r

+Section "Desktop Shortcut" SEC02b\r
+  SectionIn 1 2 3\r
+  CreateShortCut "$DESKTOP\VLC media player.lnk" \\r
+    "$INSTDIR\vlc.exe" "--intf wx"\r
+SectionEnd\r
+\r

 Section /o "Mozilla plugin" SEC03\r
   SectionIn 2 3\r
   File /r mozilla\r
 Section /o "Mozilla plugin" SEC03\r
   SectionIn 2 3\r
   File /r mozilla\r


@@ -375,7 +379,7 @@ Section /o "Mozilla plugin" SEC03
 \r
 SectionEnd\r
 \r
 \r
 SectionEnd\r
 \r

-Section /o "ActiveX plugin" SEC04\r
+Section "ActiveX plugin" SEC04\r

   SectionIn 2 3\r
   SetOutPath "$INSTDIR"\r
   File activex\axvlc.dll\r
   SectionIn 2 3\r
   SetOutPath "$INSTDIR"\r
   File activex\axvlc.dll\r


@@ -383,9 +387,9 @@ Section /o "ActiveX plugin" SEC04
 SectionEnd\r
 \r
 Section "Context Menus" SEC05\r
 SectionEnd\r
 \r
 Section "Context Menus" SEC05\r

-  SectionIn 1 2 3\r
+  SectionIn 2 3\r

   !insertmacro MacroAllExtensions AddContextMenu\r
   !insertmacro MacroAllExtensions AddContextMenu\r

-  !insertmacro AddContextMenu "Folder"\r
+  !insertmacro AddContextMenu "Directory"\r

 SectionEnd\r
 \r
 SectionGroup "File type associations" SEC06\r
 SectionEnd\r
 \r
 SectionGroup "File type associations" SEC06\r


@@ -408,8 +412,10 @@ SectionEnd
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN\r
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} \\r
     "The media player itself"\r
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN\r
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} \\r
     "The media player itself"\r

-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} \\r
-    "Adds icons to your start menu and your desktop for easy access"\r
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC02a} \\r
+    "Adds icons to your start menu for easy access"\r
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC02b} \\r
+    "Adds icon to your desktop for easy access"\r

   !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} \\r
     "The VLC Mozilla and Mozilla Firefox plugin"\r
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} \\r
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} \\r
     "The VLC Mozilla and Mozilla Firefox plugin"\r
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} \\r


@@ -470,7 +476,7 @@ Section "Uninstall" SEC91
 \r
   !insertmacro MacroAllExtensions DeleteContextMenu\r
   !insertmacro MacroAllExtensions UnRegisterExtensionSection\r
 \r
   !insertmacro MacroAllExtensions DeleteContextMenu\r
   !insertmacro MacroAllExtensions UnRegisterExtensionSection\r

-  !insertmacro DeleteContextMenu "Folder"\r
+  !insertmacro DeleteContextMenu "Directory"\r

 \r
   UnRegDLL "$INSTDIR\axvlc.dll"\r
   Delete /REBOOTOK "$INSTDIR\axvlc.dll"\r
 \r
   UnRegDLL "$INSTDIR\axvlc.dll"\r
   Delete /REBOOTOK "$INSTDIR\axvlc.dll"\r