X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc.win32.nsi.in;h=5186397c1ffca96bc0544bc8caca3c5ecbc02fcb;hb=31067bdd518685da15e015b26788b7845980f5ea;hp=c9329ac559d3014eaecddde30630361c25d39f42;hpb=b60d207ba59e04e151d8144be7dfa00ec77904a2;p=vlc

diff --git a/vlc.win32.nsi.in b/vlc.win32.nsi.in
index c9329ac559..5186397c1f 100644
--- a/vlc.win32.nsi.in
+++ b/vlc.win32.nsi.in
@@ -96,6 +96,7 @@ InstType "Full"
   !insertmacro MUI_LANGUAGE "Russian"
   !insertmacro MUI_LANGUAGE "Portuguese"
   !insertmacro MUI_LANGUAGE "Arabic"
+  !insertmacro MUI_LANGUAGE "Polish"
 
 !insertmacro MUI_RESERVEFILE_LANGDLL
 
@@ -196,7 +197,7 @@ NoOwn:
 FunctionEnd
 
 !macro RegisterExtensionSection EXT
-  Section /o ${EXT}
+  Section ${EXT}
     SectionIn 1 3
     Push $R0
     StrCpy $R0 ${EXT}
@@ -238,7 +239,6 @@ FunctionEnd
 ;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 !macro delprefs
-  SectionIn 1 3
   StrCpy $0 0
   !define Index 'Line${__LINE__}'
   "${Index}-Loop:"
@@ -393,34 +393,41 @@ SectionEnd
 Section "Start Menu Shortcut" SEC02a
   SectionIn 1 2 3
   CreateDirectory "$SMPROGRAMS\VideoLAN"
-  CreateDirectory "$SMPROGRAMS\VideoLAN\Utilities"
-  CreateShortCut "$SMPROGRAMS\VideoLAN\Utilities\Reset VLC media player preferences and cache files.lnk" \
-    "$INSTDIR\vlc.exe" "--reset-config --reset-plugins-cache --save-config vlc:quit "
-  CreateShortCut "$SMPROGRAMS\VideoLAN\Utilities\Set Audio mode to DirectX (default).lnk" \
-    "$INSTDIR\vlc.exe" "--aout aout_directx --save-config vlc:quit "
-  CreateShortCut "$SMPROGRAMS\VideoLAN\Utilities\Set Audio mode to Waveout.lnk" \
-    "$INSTDIR\vlc.exe" "--aout waveout --save-config vlc:quit "
-  CreateShortCut "$SMPROGRAMS\VideoLAN\Utilities\Set Main Interface to Skinnable.lnk" \
-    "$INSTDIR\vlc.exe" "-I skins --save-config vlc:quit "
-  CreateShortCut "$SMPROGRAMS\VideoLAN\Utilities\Set Main Interface to wxWidgets (default).lnk" \
-    "$INSTDIR\vlc.exe" "-I wxwin --save-config vlc:quit "
+  CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings"
+  CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Audio"
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Audio\Set Audio mode to DirectX (default).lnk" \
+    "$INSTDIR\vlc.exe" "--aout aout_directx --save-config vlc:quit"
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Audio\Set Audio mode to Waveout.lnk" \
+    "$INSTDIR\vlc.exe" "--aout waveout --save-config vlc:quit"
+  CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Interface"
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to Skinnable.lnk" \
+    "$INSTDIR\vlc.exe" "-I skins --save-config vlc:quit"
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to wxWidgets (default).lnk" \
+    "$INSTDIR\vlc.exe" "-I wxwin --save-config vlc:quit"
+  CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Video"
   ; FIXME add detection for Vista. Direct3D will be default there, for all others it's DirectX
-  CreateShortCut "$SMPROGRAMS\VideoLAN\Utilities\Set Video mode to Direct3D.lnk" \
-    "$INSTDIR\vlc.exe" "--vout direct3d --overlay --save-config vlc:quit "
-  CreateShortCut "$SMPROGRAMS\VideoLAN\Utilities\Set Video mode to DirectX.lnk" \
-    "$INSTDIR\vlc.exe" "--vout directx --overlay --save-config vlc:quit "
-  CreateShortCut "$SMPROGRAMS\VideoLAN\Utilities\Set Video mode to DirectX (no hardware acceleration).lnk" \
-    "$INSTDIR\vlc.exe" "--vout directx --no-overlay --save-config vlc:quit "
-  CreateShortCut "$SMPROGRAMS\VideoLAN\Utilities\Set Video mode to OpenGL.lnk" \
-    "$INSTDIR\vlc.exe" "--vout opengl --overlay --save-config vlc:quit "    
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Video\Set Video mode to Direct3D.lnk" \
+    "$INSTDIR\vlc.exe" "--vout direct3d --overlay --directx-hw-yuv --save-config vlc:quit"
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Video\Set Video mode to Direct3D (no hardware acceleration).lnk" \
+    "$INSTDIR\vlc.exe" "--vout direct3d --overlay --no-directx-hw-yuv --save-config vlc:quit"
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Video\Set Video mode to DirectX.lnk" \
+    "$INSTDIR\vlc.exe" "--vout directx --overlay --directx-hw-yuv --save-config vlc:quit"
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Video\Set Video mode to DirectX (no hardware acceleration).lnk" \
+    "$INSTDIR\vlc.exe" "--vout directx --no-overlay --no-directx-hw-yuv --save-config vlc:quit"
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Video\Set Video mode to DirectX (no video overlay).lnk" \
+    "$INSTDIR\vlc.exe" "--vout directx --no-overlay --directx-hw-yuv --save-config vlc:quit"
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Video\Set Video mode to OpenGL.lnk" \
+    "$INSTDIR\vlc.exe" "--vout opengl --overlay --save-config vlc:quit"
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Reset VLC media player preferences and cache files.lnk" \
+    "$INSTDIR\vlc.exe" "--reset-config --reset-plugins-cache --save-config vlc:quit"
   CreateShortCut "$SMPROGRAMS\VideoLAN\Documentation.lnk" \
     "$INSTDIR\Documentation.url"
   CreateShortCut "$SMPROGRAMS\VideoLAN\Release Notes.lnk" \
-    "$INSTDIR\NEWS.txt" "" 
+    "$INSTDIR\NEWS.txt" ""
   CreateShortCut "$SMPROGRAMS\VideoLAN\${PRODUCT_GROUP} Website.lnk" \
     "$INSTDIR\${PRODUCT_GROUP} Website.url"
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player.lnk" \
-    "$INSTDIR\vlc.exe" "" 
+    "$INSTDIR\vlc.exe" ""
 SectionEnd
 
 Section "Desktop Shortcut" SEC02b
@@ -430,50 +437,49 @@ Section "Desktop Shortcut" SEC02b
 SectionEnd
 
 Section /o "Mozilla plugin" SEC03
-  SectionIn 1 3
+  SectionIn 3
 
+  SetOutPath "$INSTDIR"
   !insertmacro OpenUninstallLog
-  !insertmacro InstallFolder mozilla
+  !insertmacro InstallFile mozilla\npvlc.dll
   !insertmacro CloseUninstallLog
 
-  ; doesn't work. bug in mozilla/mozilla firefox or moz documentation (xpt file isn't loaded)
-  ; see mozilla bugs 184506 and 159445
-  ;!define Moz "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}"
-  ;WriteRegStr HKLM ${Moz} "Description" "VideoLAN VLC plugin for Mozilla"
-  ;WriteRegStr HKLM ${Moz} "Path" "$INSTDIR\mozilla\npvlc.dll"
-  ;WriteRegStr HKLM ${Moz} "Product" "VLC media player"
-  ;WriteRegStr HKLM ${Moz} "Vendor" "VideoLAN"
-  ;WriteRegStr HKLM ${Moz} "Version" "${VERSION}"
-  ;WriteRegStr HKLM ${Moz} "XPTPath" "$INSTDIR\mozilla\vlcintf.xpt"
+  !define Moz "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}"
+  WriteRegStr HKLM ${Moz} "Description" "VLC Multimedia Plugin"
+  WriteRegStr HKLM ${Moz} "Path" "$INSTDIR\npvlc.dll"
+  WriteRegStr HKLM ${Moz} "Product" "VLC media player"
+  WriteRegStr HKLM ${Moz} "Vendor" "VideoLAN"
+  WriteRegStr HKLM ${Moz} "Version" "${VERSION}"
 
-  Push $R0
-  Push $R1
-  Push $R2
+ ; for very old version of mozilla, these lines may be needed 
+ ;Push $R0
+ ;Push $R1
+ ;Push $R2
 
-  !define Index 'Line${__LINE__}'
-  StrCpy $R1 "0"
+ ;!define Index 'Line${__LINE__}'
+ ;StrCpy $R1 "0"
 
-  "${Index}-Loop:"
+ ;"${Index}-Loop:"
 
-    ; Check for Key
-    EnumRegKey $R0 HKLM "SOFTWARE\Mozilla" "$R1"
-    StrCmp $R0 "" "${Index}-End"
-    IntOp $R1 $R1 + 1
-    ReadRegStr $R2 HKLM "SOFTWARE\Mozilla\$R0\Extensions" "Plugins"
-    StrCmp $R2 "" "${Index}-Loop" ""
+ ;  ; Check for Key
+ ;  EnumRegKey $R0 HKLM "SOFTWARE\Mozilla" "$R1"
+ ;  StrCmp $R0 "" "${Index}-End"
+ ;  IntOp $R1 $R1 + 1
+ ;  ReadRegStr $R2 HKLM "SOFTWARE\Mozilla\$R0\Extensions" "Plugins"
+ ;  StrCmp $R2 "" "${Index}-Loop" ""
 
-    CopyFiles "$INSTDIR\mozilla\*" "$R2"
-    !ifdef LIBVLC_DLL
-    CopyFiles ${LIBVLC_DLL} "$R2"
-    !endif
-    Goto "${Index}-Loop"
+ ;  CopyFiles "$INSTDIR\npvlc.dll" "$R2"
+ ;  !ifdef LIBVLC_DLL
+ ;  CopyFiles ${LIBVLC_DLL} "$R2"
+ ;  !endif
+ ;  Goto "${Index}-Loop"
 
-  "${Index}-End:"
-  !undef Index
+ ;"${Index}-End:"
+ ;!undef Index
 
 SectionEnd
 
-Section /o "ActiveX plugin" SEC04
+Section "ActiveX plugin" SEC04
   SectionIn 1 3
   SetOutPath "$INSTDIR"
   !insertmacro OpenUninstallLog
@@ -627,6 +633,7 @@ Section "Uninstall" SEC91
   !insertmacro MacroAllExtensions UnRegisterExtensionSection
   !insertmacro DeleteContextMenu "Directory"
 
+  ;remove activex plugin
   UnRegDLL "$INSTDIR\axvlc.dll"
   Delete /REBOOTOK "$INSTDIR\axvlc.dll"
 
@@ -647,11 +654,15 @@ Section "Uninstall" SEC91
     ReadRegStr $R2 HKLM "SOFTWARE\Mozilla\$R0\Extensions" "Plugins"
     StrCmp $R2 "" "${Index}-Loop" ""
 
-    Delete "$R2\npvlc.dll"
+    ; old files (0.8.5 and before) that may be lying around
+    Delete /REBOOTOK "$R2\npvlc.dll"
+    Delete /REBOOTOK "$R2\libvlc.dll"
+    Delete /REBOOTOK "$R2\vlcintf.xpt"
     Goto "${Index}-Loop"
 
   "${Index}-End:"
   !undef Index
+  Delete /REBOOTOK "$INSTDIR\npvlc.dll"
 
   RMDir "$SMPROGRAMS\VideoLAN"
   RMDir /r $SMPROGRAMS\VideoLAN
@@ -699,7 +710,6 @@ Section "Uninstall" SEC91
 SectionEnd
 
 Section /o "un.Delete preferences and cache" SEC92
-  SectionIn 1 3
   !insertmacro delprefs
 SectionEnd