X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc.win32.nsi;h=8e6aced57c76256d9379a946a55c8fa108c0a61d;hb=73a9dbadc3f3fa3537a8543f8e589de98eccf28e;hp=71f8fd90f4527cb708747aadfad96f6fa547ac5b;hpb=9a19fa7903a720db53591b483a054a76aad3358a;p=vlc

diff --git a/vlc.win32.nsi b/vlc.win32.nsi
index 71f8fd90f4..8e6aced57c 100644
--- a/vlc.win32.nsi
+++ b/vlc.win32.nsi
@@ -43,8 +43,8 @@ InstType "Full"
 
 ; MUI Settings
   !define MUI_ABORTWARNING
-  !define MUI_ICON "vlc48x48new.ico"
-  !define MUI_UNICON "vlc48x48new.ico"
+  !define MUI_ICON "vlc48x48.ico"
+  !define MUI_UNICON "vlc48x48.ico"
   !define MUI_COMPONENTSPAGE_SMALLDESC
 
 ; Installer pages
@@ -61,8 +61,7 @@ InstType "Full"
     !insertmacro MUI_PAGE_INSTFILES
   ; Finish page
     !define MUI_FINISHPAGE_RUN "$INSTDIR\vlc.exe"
-    !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt"
-    !define MUI_FINISHPAGE_SHOWREADME_TEXT "View changelog"
+    !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
     !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
     !define MUI_FINISHPAGE_LINK "Visit the VideoLAN VLC media player Website"
     !define MUI_FINISHPAGE_LINK_LOCATION "http://www.videolan.org/vlc/"
@@ -174,7 +173,7 @@ NoBackup:
   ReadRegStr $0 HKCR "VLC$R0" ""
   WriteRegStr HKCR "VLC$R0" "" "VLC media file"
   WriteRegStr HKCR "VLC$R0\shell" "" "Play"
-  WriteRegStr HKCR "VLC$R0\shell\Play\command" "" '"$INSTDIR\vlc.exe" "%1"'
+  WriteRegStr HKCR "VLC$R0\shell\Play\command" "" '"$INSTDIR\vlc.exe" --one-instance "%1"'
   WriteRegStr HKCR "VLC$R0\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'
 FunctionEnd
 
@@ -270,6 +269,7 @@ Section "Media player (required)" SEC01
 
   File  /r plugins
   File  /r locale
+  File  /r osdmenu
   File  /r skins
   File  /r http
 
@@ -283,10 +283,10 @@ Section "Media player (required)" SEC01
 
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC" "" "Play with VLC media player"
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC\command" "" \
-    "$INSTDIR\vlc.exe cdda:%1"
+    "$INSTDIR\vlc.exe --one-instance cdda:%1"
   WriteRegStr HKCR "DVD\shell\PlayWithVLC" "" "Play with VLC media player"
   WriteRegStr HKCR "DVD\shell\PlayWithVLC\command" "" \
-    "$INSTDIR\vlc.exe dvd:%1"
+    "$INSTDIR\vlc.exe --one-instance dvd:%1"
 
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayDVDMovieOnArrival" "VLCPlayDVDMovieOnArrival" ""
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Action" "Play DVD movie"
@@ -304,29 +304,27 @@ Section "Media player (required)" SEC01
   WriteRegStr HKCR "VLC.DVDMovie" "" "VLC DVD Movie"
   WriteRegStr HKCR "VLC.DVDMovie\shell" "" "Play"
   WriteRegStr HKCR "VLC.DVDMovie\shell\Play\command" "" \
-    '$INSTDIR\vlc.exe dvd:%1@1:0'
+    '$INSTDIR\vlc.exe --one-instance dvd:%1'
   WriteRegStr HKCR "VLC.DVDMovie\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'
   WriteRegStr HKCR "VLC.CDAudio" "" "VLC CD Audio"
   WriteRegStr HKCR "VLC.CDAudio\shell" "" "Play"
   WriteRegStr HKCR "VLC.CDAudio\shell\Play\command" "" \
-    '$INSTDIR\vlc.exe cdda:%1'
+    '$INSTDIR\vlc.exe --one-instance cdda:%1'
   WriteRegStr HKCR "VLC.CDAudio\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'
 
 SectionEnd
 
-Section "Start Menu + Desktop Shortcut" SEC02
+Section "Start Menu Shortcut" SEC02a
   SectionIn 1 2 3
   CreateDirectory "$SMPROGRAMS\VideoLAN"
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player.lnk" \
-    "$INSTDIR\vlc.exe" "--intf wxwin --wxwin-embed"
+    "$INSTDIR\vlc.exe" "--intf wx --wx-embed"
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (alt).lnk" \
-    "$INSTDIR\vlc.exe" "--intf wxwin --no-wxwin-embed"
+    "$INSTDIR\vlc.exe" "--intf wx --no-wx-embed"
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (skins).lnk" \
     "$INSTDIR\vlc.exe" "--intf skins"
   CreateShortCut "$SMPROGRAMS\VideoLAN\Reset VLC defaults and quit.lnk" \
     "$INSTDIR\vlc.exe" "--reset-config --reset-plugins-cache --save-config vlc:quit "
-  CreateShortCut "$DESKTOP\VLC media player.lnk" \
-    "$INSTDIR\vlc.exe" "--intf wxwin"
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" \
     "${PRODUCT_WEB_SITE}"
   CreateShortCut "$SMPROGRAMS\VideoLAN\${PRODUCT_NAME} Website.lnk" \
@@ -337,6 +335,12 @@ Section "Start Menu + Desktop Shortcut" SEC02
     "$INSTDIR\Documentation.url"
 SectionEnd
 
+Section "Desktop Shortcut" SEC02b
+  SectionIn 1 2 3
+  CreateShortCut "$DESKTOP\VLC media player.lnk" \
+    "$INSTDIR\vlc.exe" "--intf wx"
+SectionEnd
+
 Section /o "Mozilla plugin" SEC03
   SectionIn 2 3
   File /r mozilla
@@ -375,7 +379,7 @@ Section /o "Mozilla plugin" SEC03
 
 SectionEnd
 
-Section /o "ActiveX plugin" SEC04
+Section "ActiveX plugin" SEC04
   SectionIn 2 3
   SetOutPath "$INSTDIR"
   File activex\axvlc.dll
@@ -383,7 +387,7 @@ Section /o "ActiveX plugin" SEC04
 SectionEnd
 
 Section "Context Menus" SEC05
-  SectionIn 1 2 3
+  SectionIn 2 3
   !insertmacro MacroAllExtensions AddContextMenu
   !insertmacro AddContextMenu "Folder"
 SectionEnd
@@ -408,8 +412,10 @@ SectionEnd
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} \
     "The media player itself"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} \
-    "Adds icons to your start menu and your desktop for easy access"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC02a} \
+    "Adds icons to your start menu for easy access"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC02b} \
+    "Adds icon to your desktop for easy access"
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} \
     "The VLC Mozilla and Mozilla Firefox plugin"
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} \