\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
!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
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
\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
- "$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
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
- '$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
-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
"$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 wx"\r
WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" \\r
"${PRODUCT_WEB_SITE}"\r
CreateShortCut "$SMPROGRAMS\VideoLAN\${PRODUCT_NAME} Website.lnk" \\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
\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
SectionEnd\r
\r
Section "Context Menus" SEC05\r
- SectionIn 1 2 3\r
+ SectionIn 2 3\r
!insertmacro MacroAllExtensions AddContextMenu\r
!insertmacro AddContextMenu "Folder"\r
SectionEnd\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