* Lets at the very least remove icons we don't use anymore. Should save some space.

[vlc] / vlc.win32.nsi

diff --git a/vlc.win32.nsi b/vlc.win32.nsi
index 71f8fd90f4527cb708747aadfad96f6fa547ac5b..ee859c242b1b5dc8c9e30b28594d89eb921c753f 100644 (file)
--- a/vlc.win32.nsi
+++ b/vlc.win32.nsi
@@ -61,8 +61,7 @@ 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 "$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
@@ -270,6 +269,7 @@ Section "Media player (required)" SEC01
 \r
   File  /r plugins\r
   File  /r locale\r
+  File  /r osdmenu\r
   File  /r skins\r
   File  /r http\r
 \r
@@ -304,7 +304,7 @@ 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
-    '$INSTDIR\vlc.exe dvd:%1@1:0'\r
+    '$INSTDIR\vlc.exe 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
@@ -314,19 +314,17 @@ Section "Media player (required)" SEC01
 \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 wxwin --wxwin-embed"\r
+    "$INSTDIR\vlc.exe" "--intf wx --wx-embed"\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 "$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
@@ -337,6 +335,12 @@ Section "Start Menu + Desktop Shortcut" SEC02
     "$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
@@ -408,8 +412,10 @@ SectionEnd
 !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