[matroska] r1160 - in trunk/MatroskaPack/Satsuki: . langs
[email protected] Wed, 11 May 2005 00:49:02 +0400 (MSD)
| Newsgroups | gmane.comp.multimedia.matroska.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: robux4
Date: 2005-05-11 00:48:59 +0400 (Wed, 11 May 2005)
New Revision: 1160
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 5
Full :
- won't install on Win9x
- better missing Real notice
- AVI/MP4 disabled by default (safer for n00bs)
Lite :
- AVI/MP4 disabled by default (safer for n00bs)
- added CoreVorbis
Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi 2005-05-10 15:30:44 UTC (rev 1159)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi 2005-05-10 20:48:59 UTC (rev 1160)
@@ -12,7 +12,7 @@
!include "MUI.nsh"
!include "sections.nsh"
Name "Matroska Pack"
-OutFile "Matroska_Pack_Full_v1.1.0b4.exe"
+OutFile "Matroska_Pack_Full_v1.1.0b5.exe"
InstallDir "$PROGRAMFILES\Matroska Pack"
InstallDirRegKey HKCU "Software\Matroska Pack" ""
Var MUI_TEMP
@@ -22,6 +22,7 @@
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Matroska Pack"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+ReserveFile "ioA.ini"
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;
@@ -29,16 +30,22 @@
;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+!insertmacro MUI_RESERVEFILE_LANGDLL
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_COMPONENTS
+
+; Hide the Start Menu name selection
!define MUI_PAGE_CUSTOMFUNCTION_PRE "Skipelpage"
!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+
!insertmacro MUI_PAGE_INSTFILES
-;!define MUI_LANGDLL_REGISTRY_VALUENAME "Select Language"
-!insertmacro MUI_UNPAGE_CONFIRM
+Page custom RealSplitter
+
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_DIRECTORY
+!insertmacro MUI_UNPAGE_COMPONENTS
!insertmacro MUI_UNPAGE_INSTFILES
-!insertmacro MUI_RESERVEFILE_LANGDLL
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -54,8 +61,8 @@
;--------------------------------
;Version Information
- VIProductVersion "1.1.0.4"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Matroska Pack 1.1.0 Beta 4"
+ VIProductVersion "1.1.0.5"
+ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Matroska Pack 1.1.0 Full Beta 5"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Matroska.org"
; VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "Test Application is a trademark of Fake company"
@@ -94,6 +101,15 @@
Function .onInit
!insertmacro MUI_LANGDLL_DISPLAY
+
+ ; Check for Windows
+ call VerifWindowsVersion
+ strcmp $UNCICODEF "oui" nonw9x
+ MessageBox MB_OK|MB_ICONEXCLAMATION $(SecNotFullW9x) IDOK 0
+ Abort
+
+ nonw9x:
+ ; Check for updates
MessageBox MB_YESNO $(SecCheckUpdates) IDNO notonline
Internet::GetUrlCode "packs.matroska.org" "" ${VAR_0}
StrCmp $0 "404" notonline verificationversion
@@ -106,6 +122,8 @@
ExecShell "open" "http://packs.matroska.org/"
abort
notonline:
+ !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioA.ini"
+
functionend
section "-desinstallversion"
@@ -117,10 +135,6 @@
WriteRegStr HKCU "Software\Matroska Pack" "" $INSTDIR
sectionend
-section "-recupwindowsversion"
- call VerifWindowsVersion
-sectionend
-
Function VerifWindowsVersion
StrCpy $UNCICODEF "oui"
Push $R0
@@ -213,11 +227,11 @@
RMDir /r "$SMPROGRAMS\Haali Media Splitter"
SectionEnd
; MP4
- Section "MP4" SecHaaliMp4
+ Section /o "MP4" SecHaaliMp4
WriteRegStr HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "3" "0,2,,0000,4,4,,66747970"
SectionEnd
; AVI
- Section "AVI" SecHaaliAvi
+ Section /o "AVI" SecHaaliAvi
WriteRegStr HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "2" "0,4,,52494646,8,4,,41564920"
SectionEnd
sectiongroupend
@@ -409,29 +423,36 @@
!insertmacro MUI_STARTMENU_WRITE_END
sectionend
-section "-realsplitter"
- Unregdll "RealMediaSplitter.ax"
- SetOutPath "$INSTDIR"
- strcmp $UNCICODEF "non" realnormal realunicode
+Function Realsplitter
+ Unregdll "RealMediaSplitter.ax"
+ SetOutPath "$INSTDIR"
+ strcmp $UNCICODEF "non" realnormal realunicode
realnormal:
- AddSize 238
- file "elements\RealMediaSplitter.ax"
- goto realsuite
+ file "elements\RealMediaSplitter.ax"
+ goto realsuite
realunicode:
- AddSize 348
- file "elements\unicode\RealMediaSplitter.ax"
+ file "elements\unicode\RealMediaSplitter.ax"
+
realsuite:
- regdll "$INSTDIR\RealMediaSplitter.ax"
- IfFileExists "$SYSDIR\rv40.dll" realsuite2
+ regdll "$INSTDIR\RealMediaSplitter.ax"
+ IfFileExists "$SYSDIR\rv40.dll" realsuite2
realsuite2:
- ReadRegStr $R0 HKLM "SOFTWARE\RealNetworks\RealPlayer" version
- StrCmp $R0 "" questionalt finreal
+ ReadRegStr $R0 HKLM "SOFTWARE\RealNetworks\RealPlayer" version
+ StrCmp $R0 "" questionalt finreal
questionalt:
- MessageBox MB_YESNO $(SecrealName) IDYES NoAbort IDNO finreal
- NoAbort:
- ExecShell "open" "http://google.com/search?q=real%20alternative"
+ MessageBox MB_YESNO $(SecrealName) IDYES 0 IDNO finreal
+ !insertmacro MUI_HEADER_TEXT "RealVideo / RealAudio" "$(SecRealPlayerText)"
+ !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioA.ini"
+
+ !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ioA.ini" "Field 1" "State"
+ StrCmp $R0 "1" "" option2
+ ExecShell "open" $(SecRealPlayer)
+ option2:
+ !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ioA.ini" "Field 2" "State"
+ StrCmp $R0 "1" "" +2
+ ExecShell "open" "http://google.com/search?q=real%20alternative"
finreal:
-sectionend
+FunctionEnd
section "-finalisation"
rmdir /r "$INSTDIR\provo"
@@ -474,7 +495,6 @@
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack"
RMDir /r /REBOOTOK "$INSTDIR\ffdshow"
-; RMDir /r "$INSTDIR\haali"
RMDir /r /REBOOTOK "$INSTDIR\icones"
RMDir /r /REBOOTOK "$INSTDIR"
!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi 2005-05-10 15:30:44 UTC (rev 1159)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi 2005-05-10 20:48:59 UTC (rev 1160)
@@ -12,7 +12,7 @@
!include "MUI.nsh"
!include "sections.nsh"
Name "Matroska Pack"
-OutFile "Matroska_Pack_Lite_v1.1.0b4.exe"
+OutFile "Matroska_Pack_Lite_v1.1.0b5.exe"
InstallDir "$PROGRAMFILES\Matroska Pack"
InstallDirRegKey HKCU "Software\Matroska Pack" ""
Var MUI_TEMP
@@ -29,14 +29,19 @@
;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+!insertmacro MUI_RESERVEFILE_LANGDLL
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_COMPONENTS
+
+; Hide the Start Menu name selection
!define MUI_PAGE_CUSTOMFUNCTION_PRE "Skipelpage"
!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+
!insertmacro MUI_PAGE_INSTFILES
-;!define MUI_LANGDLL_REGISTRY_VALUENAME "Select Language"
-!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_DIRECTORY
+!insertmacro MUI_UNPAGE_COMPONENTS
!insertmacro MUI_UNPAGE_INSTFILES
!insertmacro MUI_RESERVEFILE_LANGDLL
@@ -54,8 +59,8 @@
;--------------------------------
;Version Information
- VIProductVersion "1.1.0.4"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Matroska Pack 1.1.0 Beta 4"
+ VIProductVersion "1.1.0.5"
+ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Matroska Pack 1.1.0 Lite Beta 5"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Matroska.org"
; VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "Test Application is a trademark of Fake company"
@@ -94,6 +99,10 @@
Function .onInit
!insertmacro MUI_LANGDLL_DISPLAY
+
+ ; Check for Windows
+ call VerifWindowsVersion
+ ; Check for updates
MessageBox MB_YESNO $(SecCheckUpdates) IDNO notonline
Internet::GetUrlCode "packs.matroska.org" "" ${VAR_0}
StrCmp $0 "404" notonline verificationversion
@@ -117,10 +126,6 @@
WriteRegStr HKCU "Software\Matroska Pack" "" $INSTDIR
sectionend
-section "-recupwindowsversion"
- call VerifWindowsVersion
-sectionend
-
Function VerifWindowsVersion
StrCpy $UNCICODEF "oui"
Push $R0
@@ -213,11 +218,11 @@
RMDir /r "$SMPROGRAMS\Haali Media Splitter"
SectionEnd
; MP4
- Section "MP4" SecHaaliMp4
+ Section /o "MP4" SecHaaliMp4
WriteRegStr HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "3" "0,2,,0000,4,4,,66747970"
SectionEnd
; AVI
- Section "AVI" SecHaaliAvi
+ Section /o "AVI" SecHaaliAvi
WriteRegStr HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "2" "0,4,,52494646,8,4,,41564920"
SectionEnd
sectiongroupend
@@ -238,6 +243,14 @@
regdll "$INSTDIR\VSFilter.dll"
sectionend
+section "CoreVorbis" SecCoreVorbis
+ SetOutPath "$INSTDIR"
+ AddSize 240
+ Unregdll "CoreVorbis.ax"
+ file "elements\CoreVorbis.ax"
+ regdll "$INSTDIR\CoreVorbis.ax"
+sectionend
+
section "WavPack" SecWavpack
SetOutPath "$INSTDIR"
AddSize 192
@@ -314,7 +327,6 @@
Unregdll "$INSTDIR\VSFilter.dll"
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack"
-; RMDir /r "$INSTDIR\haali"
RMDir /r /REBOOTOK "$INSTDIR\icones"
RMDir /r /REBOOTOK "$INSTDIR"
!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
Modified: trunk/MatroskaPack/Satsuki/langs/en.nsh
===================================================================
--- trunk/MatroskaPack/Satsuki/langs/en.nsh 2005-05-10 15:30:44 UTC (rev 1159)
+++ trunk/MatroskaPack/Satsuki/langs/en.nsh 2005-05-10 20:48:59 UTC (rev 1160)
@@ -1,7 +1,8 @@
+LangString SecNotFullW9x ${LANG_ENGLISH} "The FULL Pack doesn't work on Windows 9x$\nPlease use the LITE Pack$\n$\nhttp://packs.matroska.org/"
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 4"
+LangString SecinstallName ${LANG_ENGLISH} "Installation of Matroska Pack 1.1.0 Beta 5"
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 ?"
@@ -25,9 +26,12 @@
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 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 b4"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.1.0 b5"
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 15:30:44 UTC (rev 1159)
+++ trunk/MatroskaPack/Satsuki/langs/fr.nsh 2005-05-10 20:48:59 UTC (rev 1160)
@@ -1,7 +1,8 @@
+LangString SecNotFullW9x ${LANG_FRENCH} "Le Pack FULL ne fonctionne pas avec Windows 9x$\nVeuillez utiliser le pack LITE$\n$\nhttp://packs.matroska.org/"
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 4"
+LangString SecinstallName ${LANG_FRENCH} "Installation du Matroska Pack 1.1.0 Beta 5"
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 ?"
@@ -25,9 +26,12 @@
LangString SecSecMSE ${LANG_FRENCH} "v2.8$\nDivers fonctions matroska disponibles par l'explorateur Windows"
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 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 b4"
+VIAddVersionKey /LANG=${LANG_FRENCH} "FileVersion" "1.1.0 b5"
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 15:30:44 UTC (rev 1159)
+++ trunk/MatroskaPack/Satsuki/langs/ru.nsh 2005-05-10 20:48:59 UTC (rev 1160)
@@ -4,10 +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 SecCheckUpdates ${LANG_RUSSIAN} "Ïðîâåðèòü íàëè÷èå áîëåå íîâîé âåðñèè?"
LangString SeccompletedName ${LANG_RUSSIAN} "Óñòàíîâêà çàâåðøåíà"
-LangString SecinstallName ${LANG_RUSSIAN} "Óñòàíîâêà Matroska Pack 1.1.0 Beta 4"
+LangString SecinstallName ${LANG_RUSSIAN} "Óñòàíîâêà Matroska Pack 1.1.0 Beta 5"
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?"
@@ -31,9 +32,12 @@
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 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 b4"
+VIAddVersionKey /LANG=${LANG_RUSSIAN} "FileVersion" "1.1.0 b5"
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"