[matroska] r1163 - in trunk/MatroskaPack/Satsuki: . langs
[email protected] Wed, 11 May 2005 18:24:37 +0400 (MSD)
| Newsgroups | gmane.comp.multimedia.matroska.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: robux4
Date: 2005-05-11 18:24:34 +0400 (Wed, 11 May 2005)
New Revision: 1163
Modified:
trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi
trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi
trunk/MatroskaPack/Satsuki/langs/en.nsh
trunk/MatroskaPack/Satsuki/langs/fr.nsh
trunk/MatroskaPack/Satsuki/langs/ru.nsh
Log:
Pack: beta 6
- only icons of installed items
- make the RealMediaSplitter a visible item
- less pages in the uninstaller
- remove unused macros
- matroska.ico is not provided anymore (not used)
Full :
- remove all the embedded non-unicode items
Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi 2005-05-10 21:02:42 UTC (rev 1162)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi 2005-05-11 14:24:34 UTC (rev 1163)
@@ -12,12 +12,13 @@
!include "MUI.nsh"
!include "sections.nsh"
Name "Matroska Pack"
-OutFile "Matroska_Pack_Full_v1.1.0b5.exe"
+OutFile "Matroska_Pack_Full_v1.1.0b6.exe"
InstallDir "$PROGRAMFILES\Matroska Pack"
InstallDirRegKey HKCU "Software\Matroska Pack" ""
Var MUI_TEMP
Var STARTMENU_FOLDER
Var UNCICODEF
+!define VAR_0 0 ;$0
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Matroska Pack"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
@@ -40,11 +41,8 @@
!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
!insertmacro MUI_PAGE_INSTFILES
-Page custom RealSplitter
!insertmacro MUI_UNPAGE_WELCOME
-!insertmacro MUI_UNPAGE_DIRECTORY
-!insertmacro MUI_UNPAGE_COMPONENTS
!insertmacro MUI_UNPAGE_INSTFILES
@@ -61,8 +59,8 @@
;--------------------------------
;Version Information
- VIProductVersion "1.1.0.5"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Matroska Pack 1.1.0 Full Beta 5"
+ VIProductVersion "1.1.0.6"
+ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Matroska Pack 1.1.0 Full Beta 6"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Matroska.org"
; VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "Test Application is a trademark of Fake company"
@@ -112,7 +110,7 @@
; Check for updates
MessageBox MB_YESNO $(SecCheckUpdates) IDNO notonline
Internet::GetUrlCode "packs.matroska.org" "" ${VAR_0}
- StrCmp $0 "404" notonline verificationversion
+ StrCmp "$0" "404" notonline verificationversion
verificationversion:
Internet::GetUrlCode "packs.matroska.org" "pack_full.v1.1.0.html" ${VAR_0}
StrCmp "$0" "404" questionviste notonline
@@ -120,20 +118,24 @@
MessageBox MB_YESNO $(SecverifversionName) IDYES NoAbort IDNO notonline
NoAbort:
ExecShell "open" "http://packs.matroska.org/"
- abort
+ Abort
notonline:
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioA.ini"
-
functionend
-section "-desinstallversion"
+Section "-UninstallPrevious"
ReadRegStr $R1 HKCU "Software\Matroska Pack" ""
IfFileExists "$R1\uninstall.exe" desinstallpack suiteinstall
desinstallpack:
- ExecWait '"$R1\uninstall.exe" /S _?=$R7'
- suiteinstall:
+ ExecWait '"$R1\uninstall.exe" /S _?=$R1'
+ suiteinstall:
WriteRegStr HKCU "Software\Matroska Pack" "" $INSTDIR
-sectionend
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+ SetOutPath "$INSTDIR"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\$(SecShortUninstall).lnk" "$INSTDIR\uninstall.exe" "" "" "" "" "" $(SecShortUninstall)
+ !insertmacro MUI_STARTMENU_WRITE_END
+SectionEnd
Function VerifWindowsVersion
StrCpy $UNCICODEF "oui"
@@ -173,58 +175,30 @@
StrCmp $R0 "badversion" badversion1 badversion2
badversion1:
StrCpy $UNCICODEF "non"
-; Abort
badversion2:
FunctionEnd
-!macro Associate Ext
-!define Index "Line${__LINE__}"
- ReadRegStr $1 HKCR ".${Ext}" ""
- StrCmp $1 "" "${Index}-setfileformat" "${Index}-alreadydef"
- "${Index}-setfileformat:"
- WriteRegStr HKCR ".${Ext}" "" "fichier ${Ext}"
- "${Index}-alreadydef:"
- ReadRegStr $1 HKCR ".${Ext}" ""
- ReadRegStr $0 HKCR "$1\shell" ""
- WriteRegStr HKCR "$1" "backupshell" $0
- ReadRegStr $0 HKCR "$1\DefaultIcon" ""
- WriteRegStr HKCR "$1" "backupicon" $0
- ReadRegStr $0 HKCR "$1\shell\open\command" ""
- WriteRegStr HKCR "$1" "backupcommand" $0
- WriteRegStr HKCR "$1" "" $1
- WriteRegStr HKCR "$1\shell" "" "open"
-
- readregstr $3 HKCR ".avi" ""
- readregstr $2 HKCR "$3\shell\open\command" ""
-
- WriteRegStr HKCR "$1\shell\open\command" "" $2
-!undef Index
-!macroend
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;
;Sections
;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;section "-iconetassoc"
-; !insertmacro Associate "mka"
-; !insertmacro Associate "mkv"
-;sectionend
-
sectiongroup "!Haali Media Splitter" SecHaali
Section "!Matroska" SecHaaliMkv
SetOutPath "$INSTDIR\provo"
AddSize 495
file "elements\MatroskaSplitter.exe"
execwait '"$INSTDIR\provo\MatroskaSplitter.exe" /S /NCRC /D=$INSTDIR\haali'
-; WriteRegStr HKCR "Media Type\Extensions\.mkv" "Source Filter" "{55DA30FC-F16B-49FC-BAA5-AE59FC65F82D}"
WriteRegdword HKCU "Software\Haali\Matroska Splitter" "vsfilter.autoload" "00000001"
- delete "$INSTDIR\provo\MatroskaSplitter.exe"
SetShellVarContext "all"
RMDir /r "$SMPROGRAMS\Haali Media Splitter"
SetShellVarContext "current"
RMDir /r "$SMPROGRAMS\Haali Media Splitter"
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ SetOutPath "$INSTDIR\haali"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Haali Media Splitter.lnk" rundll32.exe "splitter.ax,Configure" "$INSTDIR\haali\splitter.ax" 0 "" "" $(SecShortHaali)
+ !insertmacro MUI_STARTMENU_WRITE_END
SectionEnd
; MP4
Section /o "MP4" SecHaaliMp4
@@ -239,7 +213,7 @@
section "!FFDShow" SecFFDShow
IfFileExists "$R5\uninstall.exe" "ffvir" "ffsuite"
ffvir:
- unregdll "ffdshow.ax"
+ unregdll "$R5\ffdshow.ax"
ExecWait '"$R5\uninstall.exe" /S _?=$R5'
ffsuite:
deleteregkey HKLM "SOFTWARE\GNU\ffdshow"
@@ -313,30 +287,32 @@
AddSize 4530
file /R "elements\ffdshow\*.*"
regdll "$INSTDIR\ffdshow\ffdshow.ax"
- ; not for W9X
- strcmp $UNCICODEF "oui" 0 ffdsuite
SetOutPath "$INSTDIR\provo"
file "elements\ffdshow\ffvid.reg"
file "elements\ffdshow\ffaud.reg"
execwait 'regedit /s "$INSTDIR\provo\ffvid.reg"'
execwait 'regedit /s "$INSTDIR\provo\ffaud.reg"'
- ffdsuite:
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ SetOutPath "$INSTDIR\icones"
+ file "elements\ffdico.ico"
+ SetOutPath "$INSTDIR\ffdshow"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\FFdshow.lnk" rundll32.exe "ffdshow.ax,configure" "$INSTDIR\icones\ffdico.ico" 0 "" "" "Video codec"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\FFdshow Audio.lnk" rundll32.exe "ffdshow.ax,configureAudio" "$INSTDIR\icones\ffdico.ico" 0 "" "" "Audio codec"
+ !insertmacro MUI_STARTMENU_WRITE_END
sectionend
section "!VSFilter" SecVSFilter
Unregdll "VSFilter.dll"
SetOutPath "$INSTDIR"
- strcmp $UNCICODEF "non" vsnormal vsunicode
- vsnormal:
- AddSize 535
- file "elements\VSFilter.dll"
- file "elements\unicows.dll"
- goto vssuite
- vsunicode:
AddSize 294
file "elements\unicode\VSFilter.dll"
- vssuite:
regdll "$INSTDIR\VSFilter.dll"
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ SetOutPath "$INSTDIR\icones"
+ file "elements\vobsub.ico"
+ SetOutPath "$INSTDIR"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\VSFilter.lnk" rundll32.exe "vsfilter.dll,DirectVobSub" "$INSTDIR\icones\vobsub.ico" 0 "" "" $(SecShortSubs)
+ !insertmacro MUI_STARTMENU_WRITE_END
sectionend
section "MPEG2 decoder" SecGabestMPEG2
@@ -376,6 +352,10 @@
SetOutPath "$INSTDIR\MatroskaDiag"
AddSize 253
file "elements\MatroskaDiag.exe"
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ SetOutPath "$INSTDIR\MatroskaDiag"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\MatroskaDiag.lnk" "$INSTDIR\MatroskaDiag\MatroskaDiag.exe" "" "" "" "" "" $(SecShortDiag)
+ !insertmacro MUI_STARTMENU_WRITE_END
sectionend
section /o "Matroska Shell Extension" SecMSE
@@ -396,44 +376,16 @@
Section "-Désinstalleur"
SetOutPath "$INSTDIR"
- WriteUninstaller "$INSTDIR\Uninstall.exe"
+ WriteUninstaller "$INSTDIR\uninstall.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" "DisplayName" "Matroska Pack"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" "UninstallString" "$INSTDIR\Uninstall.exe"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" "DisplayIcon" "$INSTDIR\Uninstall.exe"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" "UninstallString" "$INSTDIR\uninstall.exe"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" "DisplayIcon" "$INSTDIR\uninstall.exe"
SectionEnd
-section "-raccourcis"
- SetOutPath "$INSTDIR\icones"
- file "elements\ffdico.ico"
- file "elements\vobsub.ico"
- file "elements\matroska.ico"
- !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
- CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
- SetOutPath "$INSTDIR\haali"
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Haali Media Splitter.lnk" rundll32.exe "splitter.ax,Configure" "$INSTDIR\haali\splitter.ax" 0 "" "" $(SecShortHaali)
- SetOutPath "$INSTDIR\MatroskaDiag"
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\MatroskaDiag.lnk" "$INSTDIR\MatroskaDiag\MatroskaDiag.exe" "" "" "" "" "" $(SecShortDiag)
- SetOutPath "$INSTDIR"
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\VSFilter.lnk" rundll32.exe "vsfilter.dll,DirectVobSub" "$INSTDIR\icones\vobsub.ico" 0 "" "" $(SecShortSubs)
- SetOutPath "$INSTDIR\ffdshow"
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\FFdshow.lnk" rundll32.exe "ffdshow.ax,configure" "$INSTDIR\icones\ffdico.ico" 0 "" "" "Video codec"
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\FFdshow Audio.lnk" rundll32.exe "ffdshow.ax,configureAudio" "$INSTDIR\icones\ffdico.ico" 0 "" "" "Audio codec"
- SetOutPath "$INSTDIR"
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\$(SecShortUninstall).lnk" "$INSTDIR\Uninstall.exe" "" "" "" "" "" $(SecShortUninstall)
- !insertmacro MUI_STARTMENU_WRITE_END
-sectionend
-
-Function Realsplitter
- Unregdll "RealMediaSplitter.ax"
+section "Realsplitter" SecRealMedia
+ Unregdll "$INSTDIR\RealMediaSplitter.ax"
SetOutPath "$INSTDIR"
- strcmp $UNCICODEF "non" realnormal realunicode
- realnormal:
- file "elements\RealMediaSplitter.ax"
- goto realsuite
- realunicode:
file "elements\unicode\RealMediaSplitter.ax"
-
- realsuite:
regdll "$INSTDIR\RealMediaSplitter.ax"
IfFileExists "$SYSDIR\rv40.dll" realsuite2
realsuite2:
@@ -452,7 +404,7 @@
StrCmp $R0 "1" "" +2
ExecShell "open" "http://google.com/search?q=real%20alternative"
finreal:
-FunctionEnd
+SectionEnd
section "-finalisation"
rmdir /r "$INSTDIR\provo"
@@ -471,7 +423,6 @@
ExecWait '"$INSTDIR\filtres\uninstall.exe" /S _?=$INSTDIR\haali'
DeleteRegValue HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "2"
DeleteRegValue HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "3"
-; DeleteRegValue HKCR "Media Type\Extensions\.mkv" "Source Filter"
; deleteregkey HKCU "Software\Haali\Matroska Splitter\vsfilter.autoload"
ExecWait '"$INSTDIR\MSE\MatroskaProp-uninstall.exe" /S _?=$INSTDIR\MSE'
@@ -498,7 +449,7 @@
RMDir /r /REBOOTOK "$INSTDIR\icones"
RMDir /r /REBOOTOK "$INSTDIR"
!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
- Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+ Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
RMDir $MUI_TEMP
RMDir /r $MUI_TEMP
@@ -518,4 +469,5 @@
!insertmacro MUI_DESCRIPTION_TEXT ${SecMSE} $(SecSecMSE)
!insertmacro MUI_DESCRIPTION_TEXT ${SecDiag} $(SecSecDiag)
!insertmacro MUI_DESCRIPTION_TEXT ${SecMuxer} $(SecSecMuxer)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecRealMedia} $(SecSecRealMedia)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi 2005-05-10 21:02:42 UTC (rev 1162)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi 2005-05-11 14:24:34 UTC (rev 1163)
@@ -12,12 +12,13 @@
!include "MUI.nsh"
!include "sections.nsh"
Name "Matroska Pack"
-OutFile "Matroska_Pack_Lite_v1.1.0b5.exe"
+OutFile "Matroska_Pack_Lite_v1.1.0b6.exe"
InstallDir "$PROGRAMFILES\Matroska Pack"
InstallDirRegKey HKCU "Software\Matroska Pack" ""
Var MUI_TEMP
Var STARTMENU_FOLDER
Var UNCICODEF
+!define VAR_0 0 ;$0
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Matroska Pack"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
@@ -39,11 +40,9 @@
!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
!insertmacro MUI_PAGE_INSTFILES
+
!insertmacro MUI_UNPAGE_WELCOME
-!insertmacro MUI_UNPAGE_DIRECTORY
-!insertmacro MUI_UNPAGE_COMPONENTS
!insertmacro MUI_UNPAGE_INSTFILES
-!insertmacro MUI_RESERVEFILE_LANGDLL
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -59,8 +58,8 @@
;--------------------------------
;Version Information
- VIProductVersion "1.1.0.5"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Matroska Pack 1.1.0 Lite Beta 5"
+ VIProductVersion "1.1.0.6"
+ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Matroska Pack 1.1.0 Lite Beta 6"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Matroska.org"
; VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "Test Application is a trademark of Fake company"
@@ -105,7 +104,7 @@
; Check for updates
MessageBox MB_YESNO $(SecCheckUpdates) IDNO notonline
Internet::GetUrlCode "packs.matroska.org" "" ${VAR_0}
- StrCmp $0 "404" notonline verificationversion
+ StrCmp "$0" "404" notonline verificationversion
verificationversion:
Internet::GetUrlCode "packs.matroska.org" "pack_full.v1.1.0.html" ${VAR_0}
StrCmp "$0" "404" questionviste notonline
@@ -113,18 +112,24 @@
MessageBox MB_YESNO $(SecverifversionName) IDYES NoAbort IDNO notonline
NoAbort:
ExecShell "open" "http://packs.matroska.org/"
- abort
+ Abort
notonline:
+ !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioA.ini"
functionend
-section "-desinstallversion"
+Section "-UninstallPrevious"
ReadRegStr $R1 HKCU "Software\Matroska Pack" ""
IfFileExists "$R1\uninstall.exe" desinstallpack suiteinstall
desinstallpack:
- ExecWait '"$R1\uninstall.exe" /S _?=$R7'
- suiteinstall:
+ ExecWait '"$R1\uninstall.exe" /S _?=$R1'
+ suiteinstall:
WriteRegStr HKCU "Software\Matroska Pack" "" $INSTDIR
-sectionend
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+ SetOutPath "$INSTDIR"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\$(SecShortUninstall).lnk" "$INSTDIR\uninstall.exe" "" "" "" "" "" $(SecShortUninstall)
+ !insertmacro MUI_STARTMENU_WRITE_END
+SectionEnd
Function VerifWindowsVersion
StrCpy $UNCICODEF "oui"
@@ -164,58 +169,30 @@
StrCmp $R0 "badversion" badversion1 badversion2
badversion1:
StrCpy $UNCICODEF "non"
-; Abort
badversion2:
FunctionEnd
-!macro Associate Ext
-!define Index "Line${__LINE__}"
- ReadRegStr $1 HKCR ".${Ext}" ""
- StrCmp $1 "" "${Index}-setfileformat" "${Index}-alreadydef"
- "${Index}-setfileformat:"
- WriteRegStr HKCR ".${Ext}" "" "fichier ${Ext}"
- "${Index}-alreadydef:"
- ReadRegStr $1 HKCR ".${Ext}" ""
- ReadRegStr $0 HKCR "$1\shell" ""
- WriteRegStr HKCR "$1" "backupshell" $0
- ReadRegStr $0 HKCR "$1\DefaultIcon" ""
- WriteRegStr HKCR "$1" "backupicon" $0
- ReadRegStr $0 HKCR "$1\shell\open\command" ""
- WriteRegStr HKCR "$1" "backupcommand" $0
- WriteRegStr HKCR "$1" "" $1
- WriteRegStr HKCR "$1\shell" "" "open"
-
- readregstr $3 HKCR ".avi" ""
- readregstr $2 HKCR "$3\shell\open\command" ""
-
- WriteRegStr HKCR "$1\shell\open\command" "" $2
-!undef Index
-!macroend
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;
;Sections
;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;section "-iconetassoc"
-; !insertmacro Associate "mka"
-; !insertmacro Associate "mkv"
-;sectionend
-
sectiongroup "!Haali Media Splitter" SecHaali
Section "!Matroska" SecHaaliMkv
SetOutPath "$INSTDIR\provo"
AddSize 495
file "elements\MatroskaSplitter.exe"
execwait '"$INSTDIR\provo\MatroskaSplitter.exe" /S /NCRC /D=$INSTDIR\haali'
-; WriteRegStr HKCR "Media Type\Extensions\.mkv" "Source Filter" "{55DA30FC-F16B-49FC-BAA5-AE59FC65F82D}"
WriteRegdword HKCU "Software\Haali\Matroska Splitter" "vsfilter.autoload" "00000001"
- delete "$INSTDIR\provo\MatroskaSplitter.exe"
SetShellVarContext "all"
RMDir /r "$SMPROGRAMS\Haali Media Splitter"
SetShellVarContext "current"
RMDir /r "$SMPROGRAMS\Haali Media Splitter"
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ SetOutPath "$INSTDIR\haali"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Haali Media Splitter.lnk" rundll32.exe "splitter.ax,Configure" "$INSTDIR\haali\splitter.ax" 0 "" "" $(SecShortHaali)
+ !insertmacro MUI_STARTMENU_WRITE_END
SectionEnd
; MP4
Section /o "MP4" SecHaaliMp4
@@ -241,6 +218,12 @@
file "elements\unicode\VSFilter.dll"
vssuite:
regdll "$INSTDIR\VSFilter.dll"
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ SetOutPath "$INSTDIR\icones"
+ file "elements\vobsub.ico"
+ SetOutPath "$INSTDIR"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\VSFilter.lnk" rundll32.exe "vsfilter.dll,DirectVobSub" "$INSTDIR\icones\vobsub.ico" 0 "" "" $(SecShortSubs)
+ !insertmacro MUI_STARTMENU_WRITE_END
sectionend
section "CoreVorbis" SCoreVorbis
@@ -266,6 +249,10 @@
SetOutPath "$INSTDIR\MatroskaDiag"
AddSize 253
file "elements\MatroskaDiag.exe"
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ SetOutPath "$INSTDIR\MatroskaDiag"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\MatroskaDiag.lnk" "$INSTDIR\MatroskaDiag\MatroskaDiag.exe" "" "" "" "" "" $(SecShortDiag)
+ !insertmacro MUI_STARTMENU_WRITE_END
sectionend
section "MKVMuxer" SecMuxer
@@ -278,27 +265,12 @@
Section "-Désinstalleur"
SetOutPath "$INSTDIR"
- WriteUninstaller "$INSTDIR\Uninstall.exe"
+ WriteUninstaller "$INSTDIR\uninstall.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" "DisplayName" "Matroska Pack"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" "UninstallString" "$INSTDIR\Uninstall.exe"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" "DisplayIcon" "$INSTDIR\Uninstall.exe"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" "UninstallString" "$INSTDIR\uninstall.exe"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" "DisplayIcon" "$INSTDIR\uninstall.exe"
SectionEnd
-section "-raccourcis"
- SetOutPath "$INSTDIR\icones"
- file "elements\ffdico.ico"
- file "elements\vobsub.ico"
- file "elements\matroska.ico"
- !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
- CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
- SetOutPath "$INSTDIR\haali"
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Haali Media Splitter.lnk" rundll32.exe "splitter.ax,Configure" "$INSTDIR\haali\splitter.ax" 0 "" "" $(SecShortHaali)
- SetOutPath "$INSTDIR"
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\VSFilter.lnk" rundll32.exe "vsfilter.dll,DirectVobSub" "$INSTDIR\icones\vobsub.ico" 0 "" "" $(SecShortSubs)
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\$(SecShortUninstall).lnk" "$INSTDIR\Uninstall.exe" "" "" "" "" "" $(SecShortUninstall)
- !insertmacro MUI_STARTMENU_WRITE_END
-sectionend
-
section "-finalisation"
rmdir /r "$INSTDIR\provo"
sectionend
@@ -316,7 +288,6 @@
ExecWait '"$INSTDIR\filtres\uninstall.exe" /S _?=$INSTDIR\haali'
DeleteRegValue HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "2"
DeleteRegValue HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "3"
-; DeleteRegValue HKCR "Media Type\Extensions\.mkv" "Source Filter"
; deleteregkey HKCU "Software\Haali\Matroska Splitter\vsfilter.autoload"
Unregdll "$INSTDIR\MatroskaMuxer.ax"
@@ -345,6 +316,6 @@
!insertmacro MUI_DESCRIPTION_TEXT ${SecVSFilter} $(SecSecVSFilter)
!insertmacro MUI_DESCRIPTION_TEXT ${SCoreVorbis} $(SecCoreVorbis)
!insertmacro MUI_DESCRIPTION_TEXT ${SecWavpack} $(SecSecWavpack)
- !insertmacro MUI_DESCRIPTION_TEXT ${SecMuxer} $(SecSecMuxer)
!insertmacro MUI_DESCRIPTION_TEXT ${SecDiag} $(SecSecDiag)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecMuxer} $(SecSecMuxer)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
Modified: trunk/MatroskaPack/Satsuki/langs/en.nsh
===================================================================
--- trunk/MatroskaPack/Satsuki/langs/en.nsh 2005-05-10 21:02:42 UTC (rev 1162)
+++ trunk/MatroskaPack/Satsuki/langs/en.nsh 2005-05-11 14:24:34 UTC (rev 1163)
@@ -2,7 +2,7 @@
LangString SecCheckUpdates ${LANG_ENGLISH} "Check for updates online"
LangString SeccompletedName ${LANG_ENGLISH} "Installation finished"
-LangString SecinstallName ${LANG_ENGLISH} "Installation of Matroska Pack 1.1.0 Beta 5"
+LangString SecinstallName ${LANG_ENGLISH} "Installation of Matroska Pack 1.1.0 Beta 6"
LangString SecdescName ${LANG_ENGLISH} "Select the components you want to install"
LangString SecverifversionName ${LANG_ENGLISH} "Your version of Matroska Pack isn't up to date$\nDo you want to visit packs.matroska.org to download the latest version ?"
LangString SecrealName ${LANG_ENGLISH} "Your system doesn't seems to have RealNetwork DLL installed$\nWithout them you won't be able to play RealVideo in mkv files$\nDo you want to download RealAlternative to install those dll ?"
@@ -26,12 +26,13 @@
LangString SecSecMSE ${LANG_ENGLISH} "v2.8$\nMisc. utilities to manipulate Matroska files in Windows Explorer"
LangString SecSecDiag ${LANG_ENGLISH} "v1.0.0.59$\nTo diagnose possible problems"
LangString SecSecMuxer ${LANG_ENGLISH} "v1.0.0.9$\nCapture video to matroska files"
-LangString SecCoreVorbis ${LANG_FRENCH} "v1.0.0.2$\nOpenSource audio codec"
+LangString SecCoreVorbis ${LANG_ENGLISH} "v1.0.0.2$\nOpenSource audio codec"
+LangString SecSecRealMedia ${LANG_ENGLISH} "v1.0.1.0$\nNeeded for RealVideo playback"
LangString SecRealPlayer ${LANG_ENGLISH} "http://www.real.com/?lang=en&loc=us"
LangString SecRealPlayerText ${LANG_ENGLISH} "Select a package to read RealPlayer data"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.1.0 b5"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.1.0 b6 ${__DATE__}"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Matroska Pack"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2005 Matroska.org"
VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "Includes the necessary Directshow filters and Windows utilities to use Matroska files"
Modified: trunk/MatroskaPack/Satsuki/langs/fr.nsh
===================================================================
--- trunk/MatroskaPack/Satsuki/langs/fr.nsh 2005-05-10 21:02:42 UTC (rev 1162)
+++ trunk/MatroskaPack/Satsuki/langs/fr.nsh 2005-05-11 14:24:34 UTC (rev 1163)
@@ -2,7 +2,7 @@
LangString SecCheckUpdates ${LANG_FRENCH} "Vérifier les mises à jour en ligne"
LangString SeccompletedName ${LANG_FRENCH} "Installation terminée"
-LangString SecinstallName ${LANG_FRENCH} "Installation du Matroska Pack 1.1.0 Beta 5"
+LangString SecinstallName ${LANG_FRENCH} "Installation du Matroska Pack 1.1.0 Beta 6"
LangString SecdescName ${LANG_FRENCH} "Sélectionnez les éléments que vous désirez"
LangString SecverifversionName ${LANG_FRENCH} "Votre version du Matroska Pack n'est pas à jour$\nVoulez vous visiter packs.matroska.org pour téléchager la dernière version ?"
LangString SecrealName ${LANG_FRENCH} "Votre système ne semble pas avoir des DLL RealNetwork installées$\nSans ces DLL vous ne pourrez pas lire les mkv contenant un flux RealVideo$\nVoulez vous télécharger RealAlternative pour installer ces DLL ?"
@@ -27,11 +27,12 @@
LangString SecSecDiag ${LANG_FRENCH} "v1.0.0.59$\nPour diagnostiquer les problèmes éventuels"
LangString SecSecMuxer ${LANG_FRENCH} "v1.0.0.9$\nCrée des fichiers matroska (utile pour la capture video)"
LangString SecCoreVorbis ${LANG_FRENCH} "v1.0.0.2$\nCodec audio OpenSource"
+LangString SecSecRealMedia ${LANG_FRENCH} "v1.0.1.0$\nNécessaire pour lire le codec RealVideo"
LangString SecRealPlayer ${LANG_FRENCH} "http://www.real.com/?lang=fr&loc=fr"
LangString SecRealPlayerText ${LANG_FRENCH} "Selectionnez un programme contenant les codecs Real"
-VIAddVersionKey /LANG=${LANG_FRENCH} "FileVersion" "1.1.0 b5"
+VIAddVersionKey /LANG=${LANG_FRENCH} "FileVersion" "1.1.0 b6 ${__DATE__}"
VIAddVersionKey /LANG=${LANG_FRENCH} "FileDescription" "Matroska Pack"
VIAddVersionKey /LANG=${LANG_FRENCH} "LegalCopyright" "© 2005 Matroska.org"
VIAddVersionKey /LANG=${LANG_FRENCH} "Comments" "Inclus les filtres Directshow et utilitaires pour utiliser les fichiers Matroska sous Windows"
Modified: trunk/MatroskaPack/Satsuki/langs/ru.nsh
===================================================================
--- trunk/MatroskaPack/Satsuki/langs/ru.nsh 2005-05-10 21:02:42 UTC (rev 1162)
+++ trunk/MatroskaPack/Satsuki/langs/ru.nsh 2005-05-11 14:24:34 UTC (rev 1163)
@@ -4,11 +4,11 @@
;; Author: Maxim Ryazanov <[email protected]>
;; Version: 2005.05.10/2
-LangString SecNotFullW9x ${LANG_ENGLISH} "The FULL Pack doesn't work on Windows 9x$\nPlease use the LITE Pack$\n$\nhttp://packs.matroska.org/"
+LangString SecNotFullW9x ${LANG_RUSSIAN} "The FULL Pack doesn't work on Windows 9x$\nPlease use the LITE Pack$\n$\nhttp://packs.matroska.org/"
LangString SecCheckUpdates ${LANG_RUSSIAN} "Ïðîâåðèòü íàëè÷èå áîëåå íîâîé âåðñèè?"
LangString SeccompletedName ${LANG_RUSSIAN} "Óñòàíîâêà çàâåðøåíà"
-LangString SecinstallName ${LANG_RUSSIAN} "Óñòàíîâêà Matroska Pack 1.1.0 Beta 5"
+LangString SecinstallName ${LANG_RUSSIAN} "Óñòàíîâêà Matroska Pack 1.1.0 Beta 6"
LangString SecdescName ${LANG_RUSSIAN} "Âûáåðèòå êîìïîíåíòû, êîòîðûå Âû õîòèòå óñòàíîâèòü"
LangString SecverifversionName ${LANG_RUSSIAN} "Âàøà âåðñèÿ Matroska Pack óñòàðåëà$\nÕîòèòå ëè ïîñåòèòü packs.matroska.org, ÷òîáû ñêà÷àòü áîëåå íîâóþ âåðñèþ?"
LangString SecrealName ${LANG_RUSSIAN} " Âàøåé ñèñòåìå íå îáíàðóæåíà RealNetwork DLL$\nÁåç íå¸ ó âàñ íå áóäåò âîçìîæíîñòè âîñïðîèçâîäèòü RealVideo â mkv ôàéëàõ$\nÕîòèòå ëè ñêà÷àòü RealAlternative äëÿ óñòàíîâêè ýòîé dll?"
@@ -32,12 +32,13 @@
LangString SecSecMSE ${LANG_RUSSIAN} "Èíñòðóìåíòàðèé äëÿ ðàáîòû ñ ôàéëàìè matroska â Windows-ïðîâîäíèêå$\nÂåðñèÿ: v2.8"
LangString SecSecDiag ${LANG_RUSSIAN} "Óòèëèòà äèàãíîñòèêè íåèñïðàâíîñòåé âîñïðîèçâåäåíèÿ$\nÂåðñèÿ: v1.0.0.59"
LangString SecSecMuxer ${LANG_RUSSIAN} "DirectShow ôèëüòð, äëÿ çàïèñè âèäåî â ôîðìàòå matroska$\nÂåðñèÿ: v1.0.0.9"
-LangString SecCoreVorbis ${LANG_FRENCH} "v1.0.0.2$\nOpenSource audio codec"
+LangString SecCoreVorbis ${LANG_RUSSIAN} "v1.0.0.2$\nOpenSource audio codec"
+LangString SecSecRealMedia ${LANG_RUSSIAN} "v1.0.1.0$\nNeeded for RealVideo playback"
LangString SecRealPlayer ${LANG_RUSSIAN} "http://www.real.com/?lang=en&loc=us"
LangString SecRealPlayerText ${LANG_RUSSIAN} "Selectionnez un programme contenant les codecs Real"
-VIAddVersionKey /LANG=${LANG_RUSSIAN} "FileVersion" "1.1.0 b5"
+VIAddVersionKey /LANG=${LANG_RUSSIAN} "FileVersion" "1.1.0 b6 ${__DATE__}"
VIAddVersionKey /LANG=${LANG_RUSSIAN} "FileDescription" "Matroska Pack"
VIAddVersionKey /LANG=${LANG_RUSSIAN} "LegalCopyright" "© 2005 Matroska.org"
VIAddVersionKey /LANG=${LANG_RUSSIAN} "Comments" "Ñîäåðæèò íåîáõîäèìûå DirectShow ôèëüòðû è óòèëèòû äëÿ âîñïðîèçâåäåíèÿ ôàéëîâ â ôîðìàòå matroska" ; "Include the necessary Directshow filters and Windows utilities to use Matroska files"