drdivx-commits Mailing List for Dr. DivX (Page 3)
Brought to you by:
harikrishnan_v,
seabass089
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(81) |
Jul
(137) |
Aug
(110) |
Sep
(125) |
Oct
(240) |
Nov
(107) |
Dec
(158) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(122) |
Feb
(122) |
Mar
(1) |
Apr
|
May
|
Jun
(4) |
Jul
(27) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
From: <har...@us...> - 2007-02-20 23:36:00
|
Revision: 1285 http://svn.sourceforge.net/drdivx/?rev=1285&view=rev Author: harikrishnan_v Date: 2007-02-20 15:35:54 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Delete installer file Removed Paths: ------------- DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi Deleted: DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi =================================================================== --- DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi 2007-02-20 23:35:25 UTC (rev 1284) +++ DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi 2007-02-20 23:35:54 UTC (rev 1285) @@ -1,491 +0,0 @@ -; -; A "quick and dirty installer for OSS because I'm busy doing the 6.1 codec damn it!" by Al :) -; am...@di... -; - -; ---- Includes ---- - -SetCompressor lzma - -!include "Includes\WinVer.nsh" -!include "Includes\Product.nsh" -!include "Sections.nsh" -!include "Library.nsh" -!include "MUI.nsh" -!include "Library.nsh" -!include "Includes\Utility_SplashScreen.nsh" -!include "Includes\Utility_InstallPath.nsh" -!include "Includes\Utility_InstallLang.nsh" -!include "Includes\Utility_Fireclick.nsh" - -; ---- Resources ---- - -!define MUI_ICON "InstallerResource\Install.ico" -!define MUI_UNICON "InstallerResource\Uninstall.ico" -!define MUI_HEADERIMAGE_BITMAP "InstallerResource\TopSplash.bmp" -!define MUI_WELCOMEFINISHPAGE_BITMAP "InstallerResource\SideSplash.bmp" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "InstallerResource\UninstallSideSplash.bmp" - - - -; ---- Installer settings ---- -Name "${PRODUCT_NAME}" -OutFile "Builds\${PRODUCT_BUILD_NAME}.exe" -BrandingText /TRIMCENTER "DivX, Inc." -FileErrorText $(DESC_FILEWRITEERROR) -SetOverwrite on -ShowInstDetails show - - - -; ---- MUI interface options ---- - -!define MUI_ABORTWARNING -!define MUI_HEADERIMAGE -;!define MUI_LICENSEPAGE_CHECKBOX -!define MUI_COMPONENTSPAGE_SMALLDESC - -; ---- MUI Installer strings ---- - -;!define MUI_LICENSEPAGE_TEXT_TOP $(DESC_LICENSEPAGE_TEXT_TOP) -;!define MUI_LICENSEPAGE_TEXT_BOTTOM $(DESC_LICENSEPAGE_TEXT_BOTTOM) -;!define MUI_LICENSEPAGE_CHECKBOX_TEXT $(DESC_LICENSEPAGE_CHECKBOX_TEXT) -!define MUI_FINISHPAGE_TITLE $(DESC_FINISHPAGE_TITLE) -!define MUI_FINISHPAGE_TEXT $(DESC_FINISHPAGE_TEXT) -!define MUI_FINISHPAGE_TEXT_REBOOT $(DESC_FINISHPAGE_TEXT_REBOOT) -!define MUI_FINISHPAGE_SHOWREADME_TEXT $(DESC_FINISHPAGE_SHOWREADME_TEXT) - - -; ---- Pages ----- - -!insertmacro Utility_SplashScreen_SplashPage DrWelcomeSplash "InstallerResource" "WelcomeSplash.bmp" $(DESC_WELCOME_HEAD) $(DESC_WELCOME_SUBHEAD) -!insertmacro MUI_PAGE_LICENSE $(FILE_EULA) -!insertmacro MUI_PAGE_COMPONENTS -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH - - - -; ---- MUI uninstaller strings ---- - -!define MUI_WELCOMEPAGE_TITLE $(DESC_UNWELCOMEPAGE_TITLE) -!define MUI_WELCOMEPAGE_TEXT $(DESC_UNWELCOMEPAGE_TEXT) -!define MUI_FINISHPAGE_TITLE $(DESC_UNFINISHPAGE_TITLE) -!define MUI_FINISHPAGE_TEXT $(DESC_UNFINISHPAGE_TEXT) -!define MUI_FINISHPAGE_TEXT_REBOOT $(DESC_UNFINISHPAGE_TEXT_REBOOT) - - - -; ---- Uninstaller pages ---- - -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - - - -; ---- MUI localizations ---- - -!insertmacro MUI_LANGUAGE "English" -!include "i18n\En.nsh" -!insertmacro MUI_LANGUAGE "French" -!include "i18n\Fr.nsh" -!insertmacro MUI_LANGUAGE "Swedish" -!include "i18n\Se.nsh" -!insertmacro MUI_LANGUAGE "Spanish" -!include "i18n\Es.nsh" -!insertmacro MUI_LANGUAGE "Hungarian" -!include "i18n\Hu.nsh" -!insertmacro MUI_LANGUAGE "Dutch" -!include "i18n\Nl.nsh" -!insertmacro MUI_LANGUAGE "German" -!include "i18n\De.nsh" -!insertmacro MUI_LANGUAGE "Italian" -!include "i18n\It.nsh" -!insertmacro MUI_LANGUAGE "Polish" -!include "i18n\Pl.nsh" -!insertmacro MUI_LANGUAGE "Portuguese" -!include "i18n\Pt.nsh" -!insertmacro MUI_LANGUAGE "Romanian" -!include "i18n\Ro.nsh" -!insertmacro MUI_LANGUAGE "Czech" -!include "i18n\Cs.nsh" -!insertmacro MUI_LANGUAGE "Catalan" -!include "i18n\Ca.nsh" -!insertmacro MUI_LANGUAGE "Russian" -!include "i18n\Ru.nsh" -!insertmacro MUI_LANGUAGE "Japanese" -!include "i18n\Ja.nsh" -!insertmacro MUI_LANGUAGE "Turkish" -!include "i18n\Tr.nsh" - -; ---- Macros ---- - -!Macro PrintDetails TEXT - ; This macro dumps TEXT into the instfiles details list - SetDetailsPrint both - DetailPrint "${TEXT}" - SetDetailsPrint none -!MacroEnd - -!macro DeleteInstallFiles PATHVARIABLE - ; Call this to delete install files - Delete "${PATHVARIABLE}\drdivx.exe" - Delete "${PATHVARIABLE}\drdivx2.exe" - Delete "${PATHVARIABLE}\cli.exe" - Delete "${PATHVARIABLE}\bmp2xsub.dll" - Delete "${PATHVARIABLE}\drffmpeg.dll" - Delete "${PATHVARIABLE}\DivXMux.dll" - Delete "${PATHVARIABLE}\mp3sencoder.dll" - Delete "${PATHVARIABLE}\SDL.dll" - Delete "${PATHVARIABLE}\drdivx.exe.manifest" - Delete "${PATHVARIABLE}\Microsoft.VC80.CRT.manifest" - Delete "${PATHVARIABLE}\msvcp80.dll" - Delete "${PATHVARIABLE}\msvcr80.dll" - Delete "${PATHVARIABLE}\QtCore4.dll" - Delete "${PATHVARIABLE}\QtGui4.dll" - Delete "${PATHVARIABLE}\QtNetwork4.dll" - Delete "${PATHVARIABLE}\libxml2.dll" - Delete "${PATHVARIABLE}\ContentUploadCheck.dll" - Delete "${PATHVARIABLE}\Remove.exe" - Delete "${PATHVARIABLE}\Dr.DivX_DLL_EULA.txt" - Delete "${PATHVARIABLE}\LGPL_EULA.txt" - Delete "${PATHVARIABLE}\ReadMe.txt" - Delete "${PATHVARIABLE}\*.qm" - Delete "${PATHVARIABLE}\Plugins\call_app_plugin.dll" - Delete "${PATHVARIABLE}\Plugins\copy_plugin.dll" - Delete "${PATHVARIABLE}\Plugins\ftp_plugin.dll" - Delete "${PATHVARIABLE}\Plugins\notify_plugin.dll" - Delete "${PATHVARIABLE}\Plugins\stage6_publish_plugin.dll" - Delete "${PATHVARIABLE}\Plugins\del_source_plugin.dll" - Delete "${PATHVARIABLE}\Plugins\shutdown_plugin.dll" - RMDir "${PATHVARIABLE}\Plugins" - RMDir "${PATHVARIABLE}\Profiles" - RMDir "${PATHVARIABLE}\Logs" - RMDir "${PATHVARIABLE}\Jobs" - RMDir "${PATHVARIABLE}\Encodes" - RMDIR /r "${PATHVARIABLE}\Locale" - Delete "${PATHVARIABLE}\Config\dshow.xml" - RMDir "${PATHVARIABLE}\Config" - RMDir "${PATHVARIABLE}" -!macroend - -Function ConvertLanguageToIso639-1 - Push $2 - Push $1 - StrCpy $1 $LANGUAGE - IntOp $1 $1 & 0xFF - StrCpy $2 "en" - IntCmp $1 0x03 0 +2 - StrCpy $2 "ca" - IntCmp $1 0x05 0 +2 - StrCpy $2 "cs" - IntCmp $1 0x07 0 +2 - StrCpy $2 "de" - IntCmp $1 0x09 0 +2 - StrCpy $2 "en" - IntCmp $1 0x0A 0 +2 - StrCpy $2 "es" - IntCmp $1 0x0C 0 +2 - StrCpy $2 "fr" - IntCmp $1 0x0E 0 +2 - StrCpy $2 "hu" - IntCmp $1 0x10 0 +2 - StrCpy $2 "it" - IntCmp $1 0x11 0 +2 - StrCpy $2 "ja" - IntCmp $1 0x13 0 +2 - StrCpy $2 "nl" - IntCmp $1 0x15 0 +2 - StrCpy $2 "pl" - IntCmp $1 0x16 0 +2 - StrCpy $2 "pt" - IntCmp $1 0x18 0 +2 - StrCpy $2 "ro" - IntCmp $1 0x19 0 +2 - StrCpy $2 "ru" - IntCmp $1 0x1D 0 +2 - StrCpy $2 "sv" - IntCmp $1 0x1F 0 +2 - StrCpy $2 "tr" - Pop $1 - Exch $2 - Pop $2 -FunctionEnd - -!Macro SaveLanguage - SetOutPath "$APPDATA\${PRODUCT_NAME}" - IfFileExists "$APPDATA\${PRODUCT_NAME}\settings.xml" +2 - File "Runtime\settings.xml" - xml::LoadFile /NOUNLOAD "settings.xml" .r0 - xml::SetEncoding /NOUNLOAD "UTF8" - - ; get to the properties - xml::RootElement /NOUNLOAD .r0 .r1 - xml::FirstChildElement /NOUNLOAD "settings" .r0 .r1 - IntCmp $1 -1 no_element - - ; find the property that contains the language - xml::FirstChildElement /NOUNLOAD "property" .r0 .r1 -get_other_element: - IntCmp $1 -1 no_element - xml::GetAttribute /NOUNLOAD "InstallLang" .r0 .r1 - StrCmp $1 0 found_elt - xml::NextSiblingElement /NOUNLOAD "property" .r0 .r1 - Goto get_other_element -found_elt: - Call ConvertLanguageToIso639-1 - xml::SetAttribute /NOUNLOAD "InstallLang" $2 .r0 - Goto modif_done - -no_element: - ; No language Found, create it - xml::CreateNode /NOUNLOAD "<property/>" .R0 - xml::InsertAfterNode /NOUNLOAD "$R0" .r0 - Call ConvertLanguageToIso639-1 - xml::SetAttribute /NOUNLOAD "InstallLang" $2 .r0 - -modif_done: - xml::SaveFile "settings.xml" .r0 - -!MacroEnd - - -; ---- Install sections ---- - -Section - ; Turn off output to the details window - SetDetailsPrint none - - ; If user is overwriting over old installation without uninstalling, delete old files automatically - !insertmacro DeleteInstallFiles $INSTDIR - - ; Set the installation path in the registry for future installations - !insertmacro Utility_InstallPath_StoreInstallPath - CreateDirectory "$INSTDIR" - CreateDirectory "$INSTDIR\Plugins" - - ; Create user data directory - CreateDirectory "$APPDATA\${PRODUCT_NAME}" - - ; Program shortcuts are installed for current user - SetShellVarContext current - CreateDirectory "${PRODUCT_SMPATH}" - - ; Delete the keys written by the first version of Survey.exe - ;DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{936776B4-1FCA-4f51-ADE3-C553FC2FD240}" - ;DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{411AD36B-8022-4012-9955-3C7A3FBF7653}" - - ; Track any error from here onwards - ClearErrors - - ; Write the uninstaller, add uninstall option to Add/Remove control panel + Start menu - !insertmacro PrintDetails $(DESC_DETAILS_CREATEUNINSTALLER) - WriteUninstaller "$INSTDIR\Remove.exe" - CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_REMOVEPRODUCT).lnk" "$INSTDIR\Remove.exe" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" $(DESC_ADDREMOVE_NAME) - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$INSTDIR\Remove.exe" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" "$INSTDIR\Remove.exe" -SectionEnd - -SubSection /e $(SUBSECT_TITLE_MAIN) - Section $(SECT_TITLE_DOCS) SECTION_DOCS - !insertmacro PrintDetails $(DESC_DETAILS_WRITEDOCS) - - ;Write a Readme + license and create a Start menu shortcut - SetOutPath "$INSTDIR" - File "Docs\*.txt" - CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_README).lnk" "$INSTDIR\ReadMe.txt" - CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_DIVXEULA).lnk" "$INSTDIR\Dr.DivX_DLL_EULA.txt" - CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_LGPLEULA).lnk" "$INSTDIR\LGPL_EULA.txt" - CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_HOMEPAGE).lnk" "$(URL_SHORTCUT_SM_HOMEPAGE)" - SectionEnd - - Section $(SECT_TITLE_DRDIVX) SECTION_DRDIVX - !insertmacro PrintDetails $(DESC_DETAILS_WRITEDRDIVX) - - SetOutPath "$INSTDIR" - - ; [Al] Note to all - If you're installing something critical that could be locked, use InstallLib - - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\import\bin\release\divxmux\DivXMux.dll" "$INSTDIR\DivXMux.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\import\bin\release\mp3sencoder\mp3sencoder.dll" "$INSTDIR\mp3sencoder.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\import\bin\release\bmp2xsub\bmp2xsub.dll" "$INSTDIR\bmp2xsub.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\drdivx2.exe" "$INSTDIR\drdivx2.exe" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\cli.exe" "$INSTDIR\cli.exe" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\drffmpeg.dll" "$INSTDIR\drffmpeg.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\notify_plugin.dll" "$INSTDIR\Plugins\notify_plugin.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\ftp_plugin.dll" "$INSTDIR\Plugins\ftp_plugin.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\call_app_plugin.dll" "$INSTDIR\Plugins\call_app_plugin.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\copy_plugin.dll" "$INSTDIR\Plugins\copy_plugin.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\del_source_plugin.dll" "$INSTDIR\Plugins\del_source_plugin.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\shutdown_plugin.dll" "$INSTDIR\Plugins\shutdown_plugin.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "Runtime\stage6_publish_plugin.dll" "$INSTDIR\Plugins\stage6_publish_plugin.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "Runtime\ContentUploadCheck.dll" "$INSTDIR\ContentUploadCheck.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "Runtime\libxml2.dll" "$INSTDIR\libxml2.dll" "$PLUGINSDIR" - File /r "..\..\release\vs_express\release\Locale" - SetOutPath "$APPDATA\${PRODUCT_NAME}\Config" - File "..\src\util\dshow.xml" - !insertmacro SaveLanguage - - ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders" "Personal" - SetOutPath "$0" - CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_EXPERTMODE).lnk" "$INSTDIR\DrDivX2.exe" "expert" "$INSTDIR\DrDivX2.exe" - CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_RESETMODE).lnk" "$INSTDIR\DrDivX2.exe" "reset" "$INSTDIR\DrDivX2.exe" - SectionEnd - - Section $(SECT_TITLE_DESKTOPSHORTCUTS) SECTION_DESKTOPSHORTCUTS - !insertmacro PrintDetails $(DESC_DETAILS_DESKTOPSCUTS) - - ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders" "Personal" - SetOutPath "$0" - CreateShortcut "$DESKTOP\$(SHORTCUT_DT_EXPERTMODE).lnk" "$INSTDIR\DrDivX2.exe" "expert" "$INSTDIR\DrDivX2.exe" - SectionEnd -SubSectionEnd - -Section - !insertmacro PrintDetails $(DESC_DETAILS_FINISHINGUP) - ; Count complete installations via fireclick - Push ${PRODUCT_INSTALLHINT} - Call Utility_Fireclick_SendHint - - Call CheckForCodec - - ; Show a warning if there were errors - IfErrors "" NoErrors - MessageBox MB_ICONEXCLAMATION|MB_OK $(DESC_INSTALLATION_ERRORS) - NoErrors: -SectionEnd - - - -; ---- Component descriptions ---- - -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SECTION_DOCS} $(DESC_SECTION_DOCS) - !insertmacro MUI_DESCRIPTION_TEXT ${SECTION_DRDIVX} $(DESC_SECTION_DRDIVX) - !insertmacro MUI_DESCRIPTION_TEXT ${SECTION_DESKTOPSHORTCUTS} $(DESC_SECTION_DESKTOPSHORTCUTS) -!insertmacro MUI_FUNCTION_DESCRIPTION_END - - - -; ---- Functions ---- - -Function CheckForCodec - ; Check that there is a compatible DivX.dll (at least version 6.4) on the system - Push $R0 - Push $R1 - Push $R2 - - IfFileExists "$SYSDIR\DivX.dll" "" CompatDivXCodecNotInstalled - GetDllVersion "$SYSDIR\DivX.dll" $R0 $R1 - IntOp $R1 $R0 / 0x00010000 - IntOp $R2 $R0 & 0x0000FFFF - IntOp $R1 $R1 * 10 - IntOp $R1 $R1 + $R2 - IntCmp $R1 64 "" CompatDivXCodecNotInstalled "" - Pop $R2 - Pop $R1 - Pop $R0 - Return - - CompatDivXCodecNotInstalled: - MessageBox MB_ICONEXCLAMATION|MB_YESNO $(DESC_DIVXSIXNOTINSTALLED) IDNO SkipWebpage - ExecShell "open" $(URL_GETDIVXSIX) - - SkipWebpage: - Pop $R2 - Pop $R1 - Pop $R0 -FunctionEnd - - - -; ---- Uninstall sections ---- - -Section "Uninstall" - ; Remove the files for this product - - ; Program shortcuts are installed for current user - SetShellVarContext current - - ; Kill the installation directory and Start menu folder for this product - RMDir /r "${PRODUCT_SMPATH}" - - Push $0 - !insertmacro un.Utility_InstallPath_GetInstallationPath $0 - !insertmacro DeleteInstallFiles $0 - Pop $0 - - ; Kill desktop shortcuts - Delete "$DESKTOP\$(SHORTCUT_DT_EXPERTMODE).lnk" - Delete "$DESKTOP\$(SHORTCUT_DT_BATCHQUEUE).lnk" - Delete "$DESKTOP\$(SHORTCUT_DT_WIZARDMODE).lnk" - - ; Delete the record of the installation path and language - !insertmacro un.Utility_InstallPath_ClearInstallPath - !insertmacro un.Utility_InstallLang_ClearLang - - ; Delete uninstaller shortcuts from Start menu + Add/Remove control panel - DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -SectionEnd - - - -; ---- Do this stuff when the installer runs ---- - -Function .onInit - - !insertmacro MUI_LANGDLL_DISPLAY - !insertmacro Utility_InstallLang_StoreLang - - ; Verify windows version - !insertmacro GetWindowsVersion - Exch $0 - StrCmp $0 "2000" OSOK - StrCmp $0 "XP" OSOK - StrCmp $0 "Vista" OSOK - MessageBox MB_ICONEXCLAMATION|MB_YESNO $(DESC_OSNOTSUPPORTED) IDYES OSOK - Pop $0 - Abort - OSOK: - Pop $0 - - ; Init the plugins directory - InitPluginsDir - - ; Get the installation path from the registry if there was a prior installation - !insertmacro Utility_InstallPath_PresetInstallPath - -FunctionEnd - - - -; ---- Do this when the user changes the component selection ---- - -Function .onSelChange - Push $0 - - ; Can't unselect the docs section - !insertmacro SelectSection ${SECTION_DOCS} - - ; Desktop shortcuts require Dr. DivX section to be enabled - SectionGetFlags ${SECTION_DRDIVX} $0 - IntOp $0 $0 && ${SF_SELECTED} - IntCmp $0 ${SF_SELECTED} DrDivXSelected - !insertmacro UnselectSection ${SECTION_DESKTOPSHORTCUTS} - DrDivXSelected: - - Pop $0 -FunctionEnd - - - -; ---- Do this stuff when the uninstaller runs ---- - -Function un.onInit - ; Set the uninstaller to the same language we did the installation in - ; This is necessary to remove localized desktop shortcuts etc. correctly - !insertmacro un.Utility_InstallLang_SetUninstallerLanguage -FunctionEnd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-20 23:35:27
|
Revision: 1284 http://svn.sourceforge.net/drdivx/?rev=1284&view=rev Author: harikrishnan_v Date: 2007-02-20 15:35:25 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Delete win32 installer Removed Paths: ------------- DrDivX/trunk/drdivx2/installer/win32/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-20 23:34:12
|
Revision: 1283 http://svn.sourceforge.net/drdivx/?rev=1283&view=rev Author: harikrishnan_v Date: 2007-02-20 15:34:09 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Relocate win32 installer files Added Paths: ----------- DrDivX/trunk/drdivx2/installer/installer/ Removed Paths: ------------- DrDivX/trunk/drdivx2/installer/win32/installer/ Copied: DrDivX/trunk/drdivx2/installer/installer (from rev 1282, DrDivX/trunk/drdivx2/installer/win32/installer) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-20 23:31:49
|
Revision: 1282 http://svn.sourceforge.net/drdivx/?rev=1282&view=rev Author: harikrishnan_v Date: 2007-02-20 15:31:48 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Relocate win32 installer files Added Paths: ----------- DrDivX/trunk/drdivx2/installer/win32/installer/ Copied: DrDivX/trunk/drdivx2/installer/win32/installer (from rev 1274, DrDivX/trunk/drdivx2/installer) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-20 23:30:32
|
Revision: 1281 http://svn.sourceforge.net/drdivx/?rev=1281&view=rev Author: harikrishnan_v Date: 2007-02-20 15:30:23 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Delete mess Removed Paths: ------------- DrDivX/trunk/drdivx2/installer/installer/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-20 23:00:58
|
Revision: 1280 http://svn.sourceforge.net/drdivx/?rev=1280&view=rev Author: harikrishnan_v Date: 2007-02-20 15:00:51 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Remove mess Removed Paths: ------------- DrDivX/trunk/drdivx2/drdivx2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-20 22:54:54
|
Revision: 1279 http://svn.sourceforge.net/drdivx/?rev=1279&view=rev Author: harikrishnan_v Date: 2007-02-20 14:54:52 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Retrieving deleted files Added Paths: ----------- DrDivX/trunk/drdivx2/drdivx2/ Copied: DrDivX/trunk/drdivx2/drdivx2 (from rev 1274, DrDivX/trunk/drdivx2) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-20 22:52:31
|
Revision: 1278 http://svn.sourceforge.net/drdivx/?rev=1278&view=rev Author: harikrishnan_v Date: 2007-02-20 14:52:25 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Retrieving deleted files Added Paths: ----------- DrDivX/trunk/drdivx2/installer/installer/ Copied: DrDivX/trunk/drdivx2/installer/installer (from rev 1274, DrDivX/trunk/drdivx2/installer) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-20 22:42:26
|
Revision: 1277 http://svn.sourceforge.net/drdivx/?rev=1277&view=rev Author: harikrishnan_v Date: 2007-02-20 14:42:23 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Retrieving deleted .nsi script Added Paths: ----------- DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi Copied: DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi (from rev 1274, DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi) =================================================================== --- DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi (rev 0) +++ DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi 2007-02-20 22:42:23 UTC (rev 1277) @@ -0,0 +1,491 @@ +; +; A "quick and dirty installer for OSS because I'm busy doing the 6.1 codec damn it!" by Al :) +; am...@di... +; + +; ---- Includes ---- + +SetCompressor lzma + +!include "Includes\WinVer.nsh" +!include "Includes\Product.nsh" +!include "Sections.nsh" +!include "Library.nsh" +!include "MUI.nsh" +!include "Library.nsh" +!include "Includes\Utility_SplashScreen.nsh" +!include "Includes\Utility_InstallPath.nsh" +!include "Includes\Utility_InstallLang.nsh" +!include "Includes\Utility_Fireclick.nsh" + +; ---- Resources ---- + +!define MUI_ICON "InstallerResource\Install.ico" +!define MUI_UNICON "InstallerResource\Uninstall.ico" +!define MUI_HEADERIMAGE_BITMAP "InstallerResource\TopSplash.bmp" +!define MUI_WELCOMEFINISHPAGE_BITMAP "InstallerResource\SideSplash.bmp" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "InstallerResource\UninstallSideSplash.bmp" + + + +; ---- Installer settings ---- +Name "${PRODUCT_NAME}" +OutFile "Builds\${PRODUCT_BUILD_NAME}.exe" +BrandingText /TRIMCENTER "DivX, Inc." +FileErrorText $(DESC_FILEWRITEERROR) +SetOverwrite on +ShowInstDetails show + + + +; ---- MUI interface options ---- + +!define MUI_ABORTWARNING +!define MUI_HEADERIMAGE +;!define MUI_LICENSEPAGE_CHECKBOX +!define MUI_COMPONENTSPAGE_SMALLDESC + +; ---- MUI Installer strings ---- + +;!define MUI_LICENSEPAGE_TEXT_TOP $(DESC_LICENSEPAGE_TEXT_TOP) +;!define MUI_LICENSEPAGE_TEXT_BOTTOM $(DESC_LICENSEPAGE_TEXT_BOTTOM) +;!define MUI_LICENSEPAGE_CHECKBOX_TEXT $(DESC_LICENSEPAGE_CHECKBOX_TEXT) +!define MUI_FINISHPAGE_TITLE $(DESC_FINISHPAGE_TITLE) +!define MUI_FINISHPAGE_TEXT $(DESC_FINISHPAGE_TEXT) +!define MUI_FINISHPAGE_TEXT_REBOOT $(DESC_FINISHPAGE_TEXT_REBOOT) +!define MUI_FINISHPAGE_SHOWREADME_TEXT $(DESC_FINISHPAGE_SHOWREADME_TEXT) + + +; ---- Pages ----- + +!insertmacro Utility_SplashScreen_SplashPage DrWelcomeSplash "InstallerResource" "WelcomeSplash.bmp" $(DESC_WELCOME_HEAD) $(DESC_WELCOME_SUBHEAD) +!insertmacro MUI_PAGE_LICENSE $(FILE_EULA) +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + + + +; ---- MUI uninstaller strings ---- + +!define MUI_WELCOMEPAGE_TITLE $(DESC_UNWELCOMEPAGE_TITLE) +!define MUI_WELCOMEPAGE_TEXT $(DESC_UNWELCOMEPAGE_TEXT) +!define MUI_FINISHPAGE_TITLE $(DESC_UNFINISHPAGE_TITLE) +!define MUI_FINISHPAGE_TEXT $(DESC_UNFINISHPAGE_TEXT) +!define MUI_FINISHPAGE_TEXT_REBOOT $(DESC_UNFINISHPAGE_TEXT_REBOOT) + + + +; ---- Uninstaller pages ---- + +!insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + + + +; ---- MUI localizations ---- + +!insertmacro MUI_LANGUAGE "English" +!include "i18n\En.nsh" +!insertmacro MUI_LANGUAGE "French" +!include "i18n\Fr.nsh" +!insertmacro MUI_LANGUAGE "Swedish" +!include "i18n\Se.nsh" +!insertmacro MUI_LANGUAGE "Spanish" +!include "i18n\Es.nsh" +!insertmacro MUI_LANGUAGE "Hungarian" +!include "i18n\Hu.nsh" +!insertmacro MUI_LANGUAGE "Dutch" +!include "i18n\Nl.nsh" +!insertmacro MUI_LANGUAGE "German" +!include "i18n\De.nsh" +!insertmacro MUI_LANGUAGE "Italian" +!include "i18n\It.nsh" +!insertmacro MUI_LANGUAGE "Polish" +!include "i18n\Pl.nsh" +!insertmacro MUI_LANGUAGE "Portuguese" +!include "i18n\Pt.nsh" +!insertmacro MUI_LANGUAGE "Romanian" +!include "i18n\Ro.nsh" +!insertmacro MUI_LANGUAGE "Czech" +!include "i18n\Cs.nsh" +!insertmacro MUI_LANGUAGE "Catalan" +!include "i18n\Ca.nsh" +!insertmacro MUI_LANGUAGE "Russian" +!include "i18n\Ru.nsh" +!insertmacro MUI_LANGUAGE "Japanese" +!include "i18n\Ja.nsh" +!insertmacro MUI_LANGUAGE "Turkish" +!include "i18n\Tr.nsh" + +; ---- Macros ---- + +!Macro PrintDetails TEXT + ; This macro dumps TEXT into the instfiles details list + SetDetailsPrint both + DetailPrint "${TEXT}" + SetDetailsPrint none +!MacroEnd + +!macro DeleteInstallFiles PATHVARIABLE + ; Call this to delete install files + Delete "${PATHVARIABLE}\drdivx.exe" + Delete "${PATHVARIABLE}\drdivx2.exe" + Delete "${PATHVARIABLE}\cli.exe" + Delete "${PATHVARIABLE}\bmp2xsub.dll" + Delete "${PATHVARIABLE}\drffmpeg.dll" + Delete "${PATHVARIABLE}\DivXMux.dll" + Delete "${PATHVARIABLE}\mp3sencoder.dll" + Delete "${PATHVARIABLE}\SDL.dll" + Delete "${PATHVARIABLE}\drdivx.exe.manifest" + Delete "${PATHVARIABLE}\Microsoft.VC80.CRT.manifest" + Delete "${PATHVARIABLE}\msvcp80.dll" + Delete "${PATHVARIABLE}\msvcr80.dll" + Delete "${PATHVARIABLE}\QtCore4.dll" + Delete "${PATHVARIABLE}\QtGui4.dll" + Delete "${PATHVARIABLE}\QtNetwork4.dll" + Delete "${PATHVARIABLE}\libxml2.dll" + Delete "${PATHVARIABLE}\ContentUploadCheck.dll" + Delete "${PATHVARIABLE}\Remove.exe" + Delete "${PATHVARIABLE}\Dr.DivX_DLL_EULA.txt" + Delete "${PATHVARIABLE}\LGPL_EULA.txt" + Delete "${PATHVARIABLE}\ReadMe.txt" + Delete "${PATHVARIABLE}\*.qm" + Delete "${PATHVARIABLE}\Plugins\call_app_plugin.dll" + Delete "${PATHVARIABLE}\Plugins\copy_plugin.dll" + Delete "${PATHVARIABLE}\Plugins\ftp_plugin.dll" + Delete "${PATHVARIABLE}\Plugins\notify_plugin.dll" + Delete "${PATHVARIABLE}\Plugins\stage6_publish_plugin.dll" + Delete "${PATHVARIABLE}\Plugins\del_source_plugin.dll" + Delete "${PATHVARIABLE}\Plugins\shutdown_plugin.dll" + RMDir "${PATHVARIABLE}\Plugins" + RMDir "${PATHVARIABLE}\Profiles" + RMDir "${PATHVARIABLE}\Logs" + RMDir "${PATHVARIABLE}\Jobs" + RMDir "${PATHVARIABLE}\Encodes" + RMDIR /r "${PATHVARIABLE}\Locale" + Delete "${PATHVARIABLE}\Config\dshow.xml" + RMDir "${PATHVARIABLE}\Config" + RMDir "${PATHVARIABLE}" +!macroend + +Function ConvertLanguageToIso639-1 + Push $2 + Push $1 + StrCpy $1 $LANGUAGE + IntOp $1 $1 & 0xFF + StrCpy $2 "en" + IntCmp $1 0x03 0 +2 + StrCpy $2 "ca" + IntCmp $1 0x05 0 +2 + StrCpy $2 "cs" + IntCmp $1 0x07 0 +2 + StrCpy $2 "de" + IntCmp $1 0x09 0 +2 + StrCpy $2 "en" + IntCmp $1 0x0A 0 +2 + StrCpy $2 "es" + IntCmp $1 0x0C 0 +2 + StrCpy $2 "fr" + IntCmp $1 0x0E 0 +2 + StrCpy $2 "hu" + IntCmp $1 0x10 0 +2 + StrCpy $2 "it" + IntCmp $1 0x11 0 +2 + StrCpy $2 "ja" + IntCmp $1 0x13 0 +2 + StrCpy $2 "nl" + IntCmp $1 0x15 0 +2 + StrCpy $2 "pl" + IntCmp $1 0x16 0 +2 + StrCpy $2 "pt" + IntCmp $1 0x18 0 +2 + StrCpy $2 "ro" + IntCmp $1 0x19 0 +2 + StrCpy $2 "ru" + IntCmp $1 0x1D 0 +2 + StrCpy $2 "sv" + IntCmp $1 0x1F 0 +2 + StrCpy $2 "tr" + Pop $1 + Exch $2 + Pop $2 +FunctionEnd + +!Macro SaveLanguage + SetOutPath "$APPDATA\${PRODUCT_NAME}" + IfFileExists "$APPDATA\${PRODUCT_NAME}\settings.xml" +2 + File "Runtime\settings.xml" + xml::LoadFile /NOUNLOAD "settings.xml" .r0 + xml::SetEncoding /NOUNLOAD "UTF8" + + ; get to the properties + xml::RootElement /NOUNLOAD .r0 .r1 + xml::FirstChildElement /NOUNLOAD "settings" .r0 .r1 + IntCmp $1 -1 no_element + + ; find the property that contains the language + xml::FirstChildElement /NOUNLOAD "property" .r0 .r1 +get_other_element: + IntCmp $1 -1 no_element + xml::GetAttribute /NOUNLOAD "InstallLang" .r0 .r1 + StrCmp $1 0 found_elt + xml::NextSiblingElement /NOUNLOAD "property" .r0 .r1 + Goto get_other_element +found_elt: + Call ConvertLanguageToIso639-1 + xml::SetAttribute /NOUNLOAD "InstallLang" $2 .r0 + Goto modif_done + +no_element: + ; No language Found, create it + xml::CreateNode /NOUNLOAD "<property/>" .R0 + xml::InsertAfterNode /NOUNLOAD "$R0" .r0 + Call ConvertLanguageToIso639-1 + xml::SetAttribute /NOUNLOAD "InstallLang" $2 .r0 + +modif_done: + xml::SaveFile "settings.xml" .r0 + +!MacroEnd + + +; ---- Install sections ---- + +Section + ; Turn off output to the details window + SetDetailsPrint none + + ; If user is overwriting over old installation without uninstalling, delete old files automatically + !insertmacro DeleteInstallFiles $INSTDIR + + ; Set the installation path in the registry for future installations + !insertmacro Utility_InstallPath_StoreInstallPath + CreateDirectory "$INSTDIR" + CreateDirectory "$INSTDIR\Plugins" + + ; Create user data directory + CreateDirectory "$APPDATA\${PRODUCT_NAME}" + + ; Program shortcuts are installed for current user + SetShellVarContext current + CreateDirectory "${PRODUCT_SMPATH}" + + ; Delete the keys written by the first version of Survey.exe + ;DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{936776B4-1FCA-4f51-ADE3-C553FC2FD240}" + ;DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{411AD36B-8022-4012-9955-3C7A3FBF7653}" + + ; Track any error from here onwards + ClearErrors + + ; Write the uninstaller, add uninstall option to Add/Remove control panel + Start menu + !insertmacro PrintDetails $(DESC_DETAILS_CREATEUNINSTALLER) + WriteUninstaller "$INSTDIR\Remove.exe" + CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_REMOVEPRODUCT).lnk" "$INSTDIR\Remove.exe" + WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" $(DESC_ADDREMOVE_NAME) + WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$INSTDIR\Remove.exe" + WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" "$INSTDIR\Remove.exe" +SectionEnd + +SubSection /e $(SUBSECT_TITLE_MAIN) + Section $(SECT_TITLE_DOCS) SECTION_DOCS + !insertmacro PrintDetails $(DESC_DETAILS_WRITEDOCS) + + ;Write a Readme + license and create a Start menu shortcut + SetOutPath "$INSTDIR" + File "Docs\*.txt" + CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_README).lnk" "$INSTDIR\ReadMe.txt" + CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_DIVXEULA).lnk" "$INSTDIR\Dr.DivX_DLL_EULA.txt" + CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_LGPLEULA).lnk" "$INSTDIR\LGPL_EULA.txt" + CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_HOMEPAGE).lnk" "$(URL_SHORTCUT_SM_HOMEPAGE)" + SectionEnd + + Section $(SECT_TITLE_DRDIVX) SECTION_DRDIVX + !insertmacro PrintDetails $(DESC_DETAILS_WRITEDRDIVX) + + SetOutPath "$INSTDIR" + + ; [Al] Note to all - If you're installing something critical that could be locked, use InstallLib + + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\import\bin\release\divxmux\DivXMux.dll" "$INSTDIR\DivXMux.dll" "$PLUGINSDIR" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\import\bin\release\mp3sencoder\mp3sencoder.dll" "$INSTDIR\mp3sencoder.dll" "$PLUGINSDIR" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\import\bin\release\bmp2xsub\bmp2xsub.dll" "$INSTDIR\bmp2xsub.dll" "$PLUGINSDIR" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\drdivx2.exe" "$INSTDIR\drdivx2.exe" "$PLUGINSDIR" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\cli.exe" "$INSTDIR\cli.exe" "$PLUGINSDIR" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\drffmpeg.dll" "$INSTDIR\drffmpeg.dll" "$PLUGINSDIR" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\notify_plugin.dll" "$INSTDIR\Plugins\notify_plugin.dll" "$PLUGINSDIR" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\ftp_plugin.dll" "$INSTDIR\Plugins\ftp_plugin.dll" "$PLUGINSDIR" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\call_app_plugin.dll" "$INSTDIR\Plugins\call_app_plugin.dll" "$PLUGINSDIR" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\copy_plugin.dll" "$INSTDIR\Plugins\copy_plugin.dll" "$PLUGINSDIR" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\del_source_plugin.dll" "$INSTDIR\Plugins\del_source_plugin.dll" "$PLUGINSDIR" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\shutdown_plugin.dll" "$INSTDIR\Plugins\shutdown_plugin.dll" "$PLUGINSDIR" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "Runtime\stage6_publish_plugin.dll" "$INSTDIR\Plugins\stage6_publish_plugin.dll" "$PLUGINSDIR" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "Runtime\ContentUploadCheck.dll" "$INSTDIR\ContentUploadCheck.dll" "$PLUGINSDIR" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "Runtime\libxml2.dll" "$INSTDIR\libxml2.dll" "$PLUGINSDIR" + File /r "..\..\release\vs_express\release\Locale" + SetOutPath "$APPDATA\${PRODUCT_NAME}\Config" + File "..\src\util\dshow.xml" + !insertmacro SaveLanguage + + ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders" "Personal" + SetOutPath "$0" + CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_EXPERTMODE).lnk" "$INSTDIR\DrDivX2.exe" "expert" "$INSTDIR\DrDivX2.exe" + CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_RESETMODE).lnk" "$INSTDIR\DrDivX2.exe" "reset" "$INSTDIR\DrDivX2.exe" + SectionEnd + + Section $(SECT_TITLE_DESKTOPSHORTCUTS) SECTION_DESKTOPSHORTCUTS + !insertmacro PrintDetails $(DESC_DETAILS_DESKTOPSCUTS) + + ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders" "Personal" + SetOutPath "$0" + CreateShortcut "$DESKTOP\$(SHORTCUT_DT_EXPERTMODE).lnk" "$INSTDIR\DrDivX2.exe" "expert" "$INSTDIR\DrDivX2.exe" + SectionEnd +SubSectionEnd + +Section + !insertmacro PrintDetails $(DESC_DETAILS_FINISHINGUP) + ; Count complete installations via fireclick + Push ${PRODUCT_INSTALLHINT} + Call Utility_Fireclick_SendHint + + Call CheckForCodec + + ; Show a warning if there were errors + IfErrors "" NoErrors + MessageBox MB_ICONEXCLAMATION|MB_OK $(DESC_INSTALLATION_ERRORS) + NoErrors: +SectionEnd + + + +; ---- Component descriptions ---- + +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${SECTION_DOCS} $(DESC_SECTION_DOCS) + !insertmacro MUI_DESCRIPTION_TEXT ${SECTION_DRDIVX} $(DESC_SECTION_DRDIVX) + !insertmacro MUI_DESCRIPTION_TEXT ${SECTION_DESKTOPSHORTCUTS} $(DESC_SECTION_DESKTOPSHORTCUTS) +!insertmacro MUI_FUNCTION_DESCRIPTION_END + + + +; ---- Functions ---- + +Function CheckForCodec + ; Check that there is a compatible DivX.dll (at least version 6.4) on the system + Push $R0 + Push $R1 + Push $R2 + + IfFileExists "$SYSDIR\DivX.dll" "" CompatDivXCodecNotInstalled + GetDllVersion "$SYSDIR\DivX.dll" $R0 $R1 + IntOp $R1 $R0 / 0x00010000 + IntOp $R2 $R0 & 0x0000FFFF + IntOp $R1 $R1 * 10 + IntOp $R1 $R1 + $R2 + IntCmp $R1 64 "" CompatDivXCodecNotInstalled "" + Pop $R2 + Pop $R1 + Pop $R0 + Return + + CompatDivXCodecNotInstalled: + MessageBox MB_ICONEXCLAMATION|MB_YESNO $(DESC_DIVXSIXNOTINSTALLED) IDNO SkipWebpage + ExecShell "open" $(URL_GETDIVXSIX) + + SkipWebpage: + Pop $R2 + Pop $R1 + Pop $R0 +FunctionEnd + + + +; ---- Uninstall sections ---- + +Section "Uninstall" + ; Remove the files for this product + + ; Program shortcuts are installed for current user + SetShellVarContext current + + ; Kill the installation directory and Start menu folder for this product + RMDir /r "${PRODUCT_SMPATH}" + + Push $0 + !insertmacro un.Utility_InstallPath_GetInstallationPath $0 + !insertmacro DeleteInstallFiles $0 + Pop $0 + + ; Kill desktop shortcuts + Delete "$DESKTOP\$(SHORTCUT_DT_EXPERTMODE).lnk" + Delete "$DESKTOP\$(SHORTCUT_DT_BATCHQUEUE).lnk" + Delete "$DESKTOP\$(SHORTCUT_DT_WIZARDMODE).lnk" + + ; Delete the record of the installation path and language + !insertmacro un.Utility_InstallPath_ClearInstallPath + !insertmacro un.Utility_InstallLang_ClearLang + + ; Delete uninstaller shortcuts from Start menu + Add/Remove control panel + DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" +SectionEnd + + + +; ---- Do this stuff when the installer runs ---- + +Function .onInit + + !insertmacro MUI_LANGDLL_DISPLAY + !insertmacro Utility_InstallLang_StoreLang + + ; Verify windows version + !insertmacro GetWindowsVersion + Exch $0 + StrCmp $0 "2000" OSOK + StrCmp $0 "XP" OSOK + StrCmp $0 "Vista" OSOK + MessageBox MB_ICONEXCLAMATION|MB_YESNO $(DESC_OSNOTSUPPORTED) IDYES OSOK + Pop $0 + Abort + OSOK: + Pop $0 + + ; Init the plugins directory + InitPluginsDir + + ; Get the installation path from the registry if there was a prior installation + !insertmacro Utility_InstallPath_PresetInstallPath + +FunctionEnd + + + +; ---- Do this when the user changes the component selection ---- + +Function .onSelChange + Push $0 + + ; Can't unselect the docs section + !insertmacro SelectSection ${SECTION_DOCS} + + ; Desktop shortcuts require Dr. DivX section to be enabled + SectionGetFlags ${SECTION_DRDIVX} $0 + IntOp $0 $0 && ${SF_SELECTED} + IntCmp $0 ${SF_SELECTED} DrDivXSelected + !insertmacro UnselectSection ${SECTION_DESKTOPSHORTCUTS} + DrDivXSelected: + + Pop $0 +FunctionEnd + + + +; ---- Do this stuff when the uninstaller runs ---- + +Function un.onInit + ; Set the uninstaller to the same language we did the installation in + ; This is necessary to remove localized desktop shortcuts etc. correctly + !insertmacro un.Utility_InstallLang_SetUninstallerLanguage +FunctionEnd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-20 20:11:39
|
Revision: 1276 http://svn.sourceforge.net/drdivx/?rev=1276&view=rev Author: harikrishnan_v Date: 2007-02-20 12:11:37 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Add plugins to dependency list Modified Paths: -------------- DrDivX/trunk/drdivx2/src/wxgui/wxgui.proj Modified: DrDivX/trunk/drdivx2/src/wxgui/wxgui.proj =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/wxgui.proj 2007-02-20 18:48:43 UTC (rev 1275) +++ DrDivX/trunk/drdivx2/src/wxgui/wxgui.proj 2007-02-20 20:11:37 UTC (rev 1276) @@ -117,6 +117,12 @@ USE dvd USE detector USE drffmpeg + USE copy_plugin + USE call_app_plugin + USE del_source_plugin + USE ftp_plugin + USE notify_plugin + USE shutdown_plugin SOURCE AdvancedSettingsWidget.cpp SOURCE BatchEncodeThread.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-20 18:49:00
|
Revision: 1275 http://svn.sourceforge.net/drdivx/?rev=1275&view=rev Author: harikrishnan_v Date: 2007-02-20 10:48:43 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Move files to win32 installer folder Removed Paths: ------------- DrDivX/trunk/drdivx2/installer/Builds/ DrDivX/trunk/drdivx2/installer/Docs/ DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi DrDivX/trunk/drdivx2/installer/Includes/ DrDivX/trunk/drdivx2/installer/InstallerResource/ DrDivX/trunk/drdivx2/installer/Plugin/ DrDivX/trunk/drdivx2/installer/Runtime/ DrDivX/trunk/drdivx2/installer/TODO.txt DrDivX/trunk/drdivx2/installer/i18n/ Deleted: DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi =================================================================== --- DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi 2007-02-20 18:46:12 UTC (rev 1274) +++ DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi 2007-02-20 18:48:43 UTC (rev 1275) @@ -1,491 +0,0 @@ -; -; A "quick and dirty installer for OSS because I'm busy doing the 6.1 codec damn it!" by Al :) -; am...@di... -; - -; ---- Includes ---- - -SetCompressor lzma - -!include "Includes\WinVer.nsh" -!include "Includes\Product.nsh" -!include "Sections.nsh" -!include "Library.nsh" -!include "MUI.nsh" -!include "Library.nsh" -!include "Includes\Utility_SplashScreen.nsh" -!include "Includes\Utility_InstallPath.nsh" -!include "Includes\Utility_InstallLang.nsh" -!include "Includes\Utility_Fireclick.nsh" - -; ---- Resources ---- - -!define MUI_ICON "InstallerResource\Install.ico" -!define MUI_UNICON "InstallerResource\Uninstall.ico" -!define MUI_HEADERIMAGE_BITMAP "InstallerResource\TopSplash.bmp" -!define MUI_WELCOMEFINISHPAGE_BITMAP "InstallerResource\SideSplash.bmp" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "InstallerResource\UninstallSideSplash.bmp" - - - -; ---- Installer settings ---- -Name "${PRODUCT_NAME}" -OutFile "Builds\${PRODUCT_BUILD_NAME}.exe" -BrandingText /TRIMCENTER "DivX, Inc." -FileErrorText $(DESC_FILEWRITEERROR) -SetOverwrite on -ShowInstDetails show - - - -; ---- MUI interface options ---- - -!define MUI_ABORTWARNING -!define MUI_HEADERIMAGE -;!define MUI_LICENSEPAGE_CHECKBOX -!define MUI_COMPONENTSPAGE_SMALLDESC - -; ---- MUI Installer strings ---- - -;!define MUI_LICENSEPAGE_TEXT_TOP $(DESC_LICENSEPAGE_TEXT_TOP) -;!define MUI_LICENSEPAGE_TEXT_BOTTOM $(DESC_LICENSEPAGE_TEXT_BOTTOM) -;!define MUI_LICENSEPAGE_CHECKBOX_TEXT $(DESC_LICENSEPAGE_CHECKBOX_TEXT) -!define MUI_FINISHPAGE_TITLE $(DESC_FINISHPAGE_TITLE) -!define MUI_FINISHPAGE_TEXT $(DESC_FINISHPAGE_TEXT) -!define MUI_FINISHPAGE_TEXT_REBOOT $(DESC_FINISHPAGE_TEXT_REBOOT) -!define MUI_FINISHPAGE_SHOWREADME_TEXT $(DESC_FINISHPAGE_SHOWREADME_TEXT) - - -; ---- Pages ----- - -!insertmacro Utility_SplashScreen_SplashPage DrWelcomeSplash "InstallerResource" "WelcomeSplash.bmp" $(DESC_WELCOME_HEAD) $(DESC_WELCOME_SUBHEAD) -!insertmacro MUI_PAGE_LICENSE $(FILE_EULA) -!insertmacro MUI_PAGE_COMPONENTS -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH - - - -; ---- MUI uninstaller strings ---- - -!define MUI_WELCOMEPAGE_TITLE $(DESC_UNWELCOMEPAGE_TITLE) -!define MUI_WELCOMEPAGE_TEXT $(DESC_UNWELCOMEPAGE_TEXT) -!define MUI_FINISHPAGE_TITLE $(DESC_UNFINISHPAGE_TITLE) -!define MUI_FINISHPAGE_TEXT $(DESC_UNFINISHPAGE_TEXT) -!define MUI_FINISHPAGE_TEXT_REBOOT $(DESC_UNFINISHPAGE_TEXT_REBOOT) - - - -; ---- Uninstaller pages ---- - -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - - - -; ---- MUI localizations ---- - -!insertmacro MUI_LANGUAGE "English" -!include "i18n\En.nsh" -!insertmacro MUI_LANGUAGE "French" -!include "i18n\Fr.nsh" -!insertmacro MUI_LANGUAGE "Swedish" -!include "i18n\Se.nsh" -!insertmacro MUI_LANGUAGE "Spanish" -!include "i18n\Es.nsh" -!insertmacro MUI_LANGUAGE "Hungarian" -!include "i18n\Hu.nsh" -!insertmacro MUI_LANGUAGE "Dutch" -!include "i18n\Nl.nsh" -!insertmacro MUI_LANGUAGE "German" -!include "i18n\De.nsh" -!insertmacro MUI_LANGUAGE "Italian" -!include "i18n\It.nsh" -!insertmacro MUI_LANGUAGE "Polish" -!include "i18n\Pl.nsh" -!insertmacro MUI_LANGUAGE "Portuguese" -!include "i18n\Pt.nsh" -!insertmacro MUI_LANGUAGE "Romanian" -!include "i18n\Ro.nsh" -!insertmacro MUI_LANGUAGE "Czech" -!include "i18n\Cs.nsh" -!insertmacro MUI_LANGUAGE "Catalan" -!include "i18n\Ca.nsh" -!insertmacro MUI_LANGUAGE "Russian" -!include "i18n\Ru.nsh" -!insertmacro MUI_LANGUAGE "Japanese" -!include "i18n\Ja.nsh" -!insertmacro MUI_LANGUAGE "Turkish" -!include "i18n\Tr.nsh" - -; ---- Macros ---- - -!Macro PrintDetails TEXT - ; This macro dumps TEXT into the instfiles details list - SetDetailsPrint both - DetailPrint "${TEXT}" - SetDetailsPrint none -!MacroEnd - -!macro DeleteInstallFiles PATHVARIABLE - ; Call this to delete install files - Delete "${PATHVARIABLE}\drdivx.exe" - Delete "${PATHVARIABLE}\drdivx2.exe" - Delete "${PATHVARIABLE}\cli.exe" - Delete "${PATHVARIABLE}\bmp2xsub.dll" - Delete "${PATHVARIABLE}\drffmpeg.dll" - Delete "${PATHVARIABLE}\DivXMux.dll" - Delete "${PATHVARIABLE}\mp3sencoder.dll" - Delete "${PATHVARIABLE}\SDL.dll" - Delete "${PATHVARIABLE}\drdivx.exe.manifest" - Delete "${PATHVARIABLE}\Microsoft.VC80.CRT.manifest" - Delete "${PATHVARIABLE}\msvcp80.dll" - Delete "${PATHVARIABLE}\msvcr80.dll" - Delete "${PATHVARIABLE}\QtCore4.dll" - Delete "${PATHVARIABLE}\QtGui4.dll" - Delete "${PATHVARIABLE}\QtNetwork4.dll" - Delete "${PATHVARIABLE}\libxml2.dll" - Delete "${PATHVARIABLE}\ContentUploadCheck.dll" - Delete "${PATHVARIABLE}\Remove.exe" - Delete "${PATHVARIABLE}\Dr.DivX_DLL_EULA.txt" - Delete "${PATHVARIABLE}\LGPL_EULA.txt" - Delete "${PATHVARIABLE}\ReadMe.txt" - Delete "${PATHVARIABLE}\*.qm" - Delete "${PATHVARIABLE}\Plugins\call_app_plugin.dll" - Delete "${PATHVARIABLE}\Plugins\copy_plugin.dll" - Delete "${PATHVARIABLE}\Plugins\ftp_plugin.dll" - Delete "${PATHVARIABLE}\Plugins\notify_plugin.dll" - Delete "${PATHVARIABLE}\Plugins\stage6_publish_plugin.dll" - Delete "${PATHVARIABLE}\Plugins\del_source_plugin.dll" - Delete "${PATHVARIABLE}\Plugins\shutdown_plugin.dll" - RMDir "${PATHVARIABLE}\Plugins" - RMDir "${PATHVARIABLE}\Profiles" - RMDir "${PATHVARIABLE}\Logs" - RMDir "${PATHVARIABLE}\Jobs" - RMDir "${PATHVARIABLE}\Encodes" - RMDIR /r "${PATHVARIABLE}\Locale" - Delete "${PATHVARIABLE}\Config\dshow.xml" - RMDir "${PATHVARIABLE}\Config" - RMDir "${PATHVARIABLE}" -!macroend - -Function ConvertLanguageToIso639-1 - Push $2 - Push $1 - StrCpy $1 $LANGUAGE - IntOp $1 $1 & 0xFF - StrCpy $2 "en" - IntCmp $1 0x03 0 +2 - StrCpy $2 "ca" - IntCmp $1 0x05 0 +2 - StrCpy $2 "cs" - IntCmp $1 0x07 0 +2 - StrCpy $2 "de" - IntCmp $1 0x09 0 +2 - StrCpy $2 "en" - IntCmp $1 0x0A 0 +2 - StrCpy $2 "es" - IntCmp $1 0x0C 0 +2 - StrCpy $2 "fr" - IntCmp $1 0x0E 0 +2 - StrCpy $2 "hu" - IntCmp $1 0x10 0 +2 - StrCpy $2 "it" - IntCmp $1 0x11 0 +2 - StrCpy $2 "ja" - IntCmp $1 0x13 0 +2 - StrCpy $2 "nl" - IntCmp $1 0x15 0 +2 - StrCpy $2 "pl" - IntCmp $1 0x16 0 +2 - StrCpy $2 "pt" - IntCmp $1 0x18 0 +2 - StrCpy $2 "ro" - IntCmp $1 0x19 0 +2 - StrCpy $2 "ru" - IntCmp $1 0x1D 0 +2 - StrCpy $2 "sv" - IntCmp $1 0x1F 0 +2 - StrCpy $2 "tr" - Pop $1 - Exch $2 - Pop $2 -FunctionEnd - -!Macro SaveLanguage - SetOutPath "$APPDATA\${PRODUCT_NAME}" - IfFileExists "$APPDATA\${PRODUCT_NAME}\settings.xml" +2 - File "Runtime\settings.xml" - xml::LoadFile /NOUNLOAD "settings.xml" .r0 - xml::SetEncoding /NOUNLOAD "UTF8" - - ; get to the properties - xml::RootElement /NOUNLOAD .r0 .r1 - xml::FirstChildElement /NOUNLOAD "settings" .r0 .r1 - IntCmp $1 -1 no_element - - ; find the property that contains the language - xml::FirstChildElement /NOUNLOAD "property" .r0 .r1 -get_other_element: - IntCmp $1 -1 no_element - xml::GetAttribute /NOUNLOAD "InstallLang" .r0 .r1 - StrCmp $1 0 found_elt - xml::NextSiblingElement /NOUNLOAD "property" .r0 .r1 - Goto get_other_element -found_elt: - Call ConvertLanguageToIso639-1 - xml::SetAttribute /NOUNLOAD "InstallLang" $2 .r0 - Goto modif_done - -no_element: - ; No language Found, create it - xml::CreateNode /NOUNLOAD "<property/>" .R0 - xml::InsertAfterNode /NOUNLOAD "$R0" .r0 - Call ConvertLanguageToIso639-1 - xml::SetAttribute /NOUNLOAD "InstallLang" $2 .r0 - -modif_done: - xml::SaveFile "settings.xml" .r0 - -!MacroEnd - - -; ---- Install sections ---- - -Section - ; Turn off output to the details window - SetDetailsPrint none - - ; If user is overwriting over old installation without uninstalling, delete old files automatically - !insertmacro DeleteInstallFiles $INSTDIR - - ; Set the installation path in the registry for future installations - !insertmacro Utility_InstallPath_StoreInstallPath - CreateDirectory "$INSTDIR" - CreateDirectory "$INSTDIR\Plugins" - - ; Create user data directory - CreateDirectory "$APPDATA\${PRODUCT_NAME}" - - ; Program shortcuts are installed for current user - SetShellVarContext current - CreateDirectory "${PRODUCT_SMPATH}" - - ; Delete the keys written by the first version of Survey.exe - ;DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{936776B4-1FCA-4f51-ADE3-C553FC2FD240}" - ;DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{411AD36B-8022-4012-9955-3C7A3FBF7653}" - - ; Track any error from here onwards - ClearErrors - - ; Write the uninstaller, add uninstall option to Add/Remove control panel + Start menu - !insertmacro PrintDetails $(DESC_DETAILS_CREATEUNINSTALLER) - WriteUninstaller "$INSTDIR\Remove.exe" - CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_REMOVEPRODUCT).lnk" "$INSTDIR\Remove.exe" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" $(DESC_ADDREMOVE_NAME) - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$INSTDIR\Remove.exe" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" "$INSTDIR\Remove.exe" -SectionEnd - -SubSection /e $(SUBSECT_TITLE_MAIN) - Section $(SECT_TITLE_DOCS) SECTION_DOCS - !insertmacro PrintDetails $(DESC_DETAILS_WRITEDOCS) - - ;Write a Readme + license and create a Start menu shortcut - SetOutPath "$INSTDIR" - File "Docs\*.txt" - CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_README).lnk" "$INSTDIR\ReadMe.txt" - CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_DIVXEULA).lnk" "$INSTDIR\Dr.DivX_DLL_EULA.txt" - CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_LGPLEULA).lnk" "$INSTDIR\LGPL_EULA.txt" - CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_HOMEPAGE).lnk" "$(URL_SHORTCUT_SM_HOMEPAGE)" - SectionEnd - - Section $(SECT_TITLE_DRDIVX) SECTION_DRDIVX - !insertmacro PrintDetails $(DESC_DETAILS_WRITEDRDIVX) - - SetOutPath "$INSTDIR" - - ; [Al] Note to all - If you're installing something critical that could be locked, use InstallLib - - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\import\bin\release\divxmux\DivXMux.dll" "$INSTDIR\DivXMux.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\import\bin\release\mp3sencoder\mp3sencoder.dll" "$INSTDIR\mp3sencoder.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\import\bin\release\bmp2xsub\bmp2xsub.dll" "$INSTDIR\bmp2xsub.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\drdivx2.exe" "$INSTDIR\drdivx2.exe" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\cli.exe" "$INSTDIR\cli.exe" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\drffmpeg.dll" "$INSTDIR\drffmpeg.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\notify_plugin.dll" "$INSTDIR\Plugins\notify_plugin.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\ftp_plugin.dll" "$INSTDIR\Plugins\ftp_plugin.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\call_app_plugin.dll" "$INSTDIR\Plugins\call_app_plugin.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\copy_plugin.dll" "$INSTDIR\Plugins\copy_plugin.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\del_source_plugin.dll" "$INSTDIR\Plugins\del_source_plugin.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "..\..\release\vs_express\release\plugins\shutdown_plugin.dll" "$INSTDIR\Plugins\shutdown_plugin.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "Runtime\stage6_publish_plugin.dll" "$INSTDIR\Plugins\stage6_publish_plugin.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "Runtime\ContentUploadCheck.dll" "$INSTDIR\ContentUploadCheck.dll" "$PLUGINSDIR" - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "Runtime\libxml2.dll" "$INSTDIR\libxml2.dll" "$PLUGINSDIR" - File /r "..\..\release\vs_express\release\Locale" - SetOutPath "$APPDATA\${PRODUCT_NAME}\Config" - File "..\src\util\dshow.xml" - !insertmacro SaveLanguage - - ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders" "Personal" - SetOutPath "$0" - CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_EXPERTMODE).lnk" "$INSTDIR\DrDivX2.exe" "expert" "$INSTDIR\DrDivX2.exe" - CreateShortcut "${PRODUCT_SMPATH}\$(SHORTCUT_SM_RESETMODE).lnk" "$INSTDIR\DrDivX2.exe" "reset" "$INSTDIR\DrDivX2.exe" - SectionEnd - - Section $(SECT_TITLE_DESKTOPSHORTCUTS) SECTION_DESKTOPSHORTCUTS - !insertmacro PrintDetails $(DESC_DETAILS_DESKTOPSCUTS) - - ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders" "Personal" - SetOutPath "$0" - CreateShortcut "$DESKTOP\$(SHORTCUT_DT_EXPERTMODE).lnk" "$INSTDIR\DrDivX2.exe" "expert" "$INSTDIR\DrDivX2.exe" - SectionEnd -SubSectionEnd - -Section - !insertmacro PrintDetails $(DESC_DETAILS_FINISHINGUP) - ; Count complete installations via fireclick - Push ${PRODUCT_INSTALLHINT} - Call Utility_Fireclick_SendHint - - Call CheckForCodec - - ; Show a warning if there were errors - IfErrors "" NoErrors - MessageBox MB_ICONEXCLAMATION|MB_OK $(DESC_INSTALLATION_ERRORS) - NoErrors: -SectionEnd - - - -; ---- Component descriptions ---- - -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SECTION_DOCS} $(DESC_SECTION_DOCS) - !insertmacro MUI_DESCRIPTION_TEXT ${SECTION_DRDIVX} $(DESC_SECTION_DRDIVX) - !insertmacro MUI_DESCRIPTION_TEXT ${SECTION_DESKTOPSHORTCUTS} $(DESC_SECTION_DESKTOPSHORTCUTS) -!insertmacro MUI_FUNCTION_DESCRIPTION_END - - - -; ---- Functions ---- - -Function CheckForCodec - ; Check that there is a compatible DivX.dll (at least version 6.4) on the system - Push $R0 - Push $R1 - Push $R2 - - IfFileExists "$SYSDIR\DivX.dll" "" CompatDivXCodecNotInstalled - GetDllVersion "$SYSDIR\DivX.dll" $R0 $R1 - IntOp $R1 $R0 / 0x00010000 - IntOp $R2 $R0 & 0x0000FFFF - IntOp $R1 $R1 * 10 - IntOp $R1 $R1 + $R2 - IntCmp $R1 64 "" CompatDivXCodecNotInstalled "" - Pop $R2 - Pop $R1 - Pop $R0 - Return - - CompatDivXCodecNotInstalled: - MessageBox MB_ICONEXCLAMATION|MB_YESNO $(DESC_DIVXSIXNOTINSTALLED) IDNO SkipWebpage - ExecShell "open" $(URL_GETDIVXSIX) - - SkipWebpage: - Pop $R2 - Pop $R1 - Pop $R0 -FunctionEnd - - - -; ---- Uninstall sections ---- - -Section "Uninstall" - ; Remove the files for this product - - ; Program shortcuts are installed for current user - SetShellVarContext current - - ; Kill the installation directory and Start menu folder for this product - RMDir /r "${PRODUCT_SMPATH}" - - Push $0 - !insertmacro un.Utility_InstallPath_GetInstallationPath $0 - !insertmacro DeleteInstallFiles $0 - Pop $0 - - ; Kill desktop shortcuts - Delete "$DESKTOP\$(SHORTCUT_DT_EXPERTMODE).lnk" - Delete "$DESKTOP\$(SHORTCUT_DT_BATCHQUEUE).lnk" - Delete "$DESKTOP\$(SHORTCUT_DT_WIZARDMODE).lnk" - - ; Delete the record of the installation path and language - !insertmacro un.Utility_InstallPath_ClearInstallPath - !insertmacro un.Utility_InstallLang_ClearLang - - ; Delete uninstaller shortcuts from Start menu + Add/Remove control panel - DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -SectionEnd - - - -; ---- Do this stuff when the installer runs ---- - -Function .onInit - - !insertmacro MUI_LANGDLL_DISPLAY - !insertmacro Utility_InstallLang_StoreLang - - ; Verify windows version - !insertmacro GetWindowsVersion - Exch $0 - StrCmp $0 "2000" OSOK - StrCmp $0 "XP" OSOK - StrCmp $0 "Vista" OSOK - MessageBox MB_ICONEXCLAMATION|MB_YESNO $(DESC_OSNOTSUPPORTED) IDYES OSOK - Pop $0 - Abort - OSOK: - Pop $0 - - ; Init the plugins directory - InitPluginsDir - - ; Get the installation path from the registry if there was a prior installation - !insertmacro Utility_InstallPath_PresetInstallPath - -FunctionEnd - - - -; ---- Do this when the user changes the component selection ---- - -Function .onSelChange - Push $0 - - ; Can't unselect the docs section - !insertmacro SelectSection ${SECTION_DOCS} - - ; Desktop shortcuts require Dr. DivX section to be enabled - SectionGetFlags ${SECTION_DRDIVX} $0 - IntOp $0 $0 && ${SF_SELECTED} - IntCmp $0 ${SF_SELECTED} DrDivXSelected - !insertmacro UnselectSection ${SECTION_DESKTOPSHORTCUTS} - DrDivXSelected: - - Pop $0 -FunctionEnd - - - -; ---- Do this stuff when the uninstaller runs ---- - -Function un.onInit - ; Set the uninstaller to the same language we did the installation in - ; This is necessary to remove localized desktop shortcuts etc. correctly - !insertmacro un.Utility_InstallLang_SetUninstallerLanguage -FunctionEnd Deleted: DrDivX/trunk/drdivx2/installer/TODO.txt =================================================================== --- DrDivX/trunk/drdivx2/installer/TODO.txt 2007-02-20 18:46:12 UTC (rev 1274) +++ DrDivX/trunk/drdivx2/installer/TODO.txt 2007-02-20 18:48:43 UTC (rev 1275) @@ -1,3 +0,0 @@ -* Update the DivX EULA - the copy in the installer is dated December 04, it should be the Feb 17th 2004 version, but with the company name changed to "DivX, Inc." -* Update the section that installs files to use InstallLib for all executable files that might be locked during installation -* Move the fireclick hint into it's own dll so that we can exec it as a seperate process. This avoids pauses during installation for firewalled users. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-20 18:46:14
|
Revision: 1274 http://svn.sourceforge.net/drdivx/?rev=1274&view=rev Author: harikrishnan_v Date: 2007-02-20 10:46:12 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Organize installer folders Added Paths: ----------- DrDivX/trunk/drdivx2/installer/osx/ DrDivX/trunk/drdivx2/installer/win32/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-20 18:40:29
|
Revision: 1273 http://svn.sourceforge.net/drdivx/?rev=1273&view=rev Author: harikrishnan_v Date: 2007-02-20 10:34:01 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Added Turkish translation to installer. Thanks alex51 (alex51mod {at} gotmail [dot] com) Modified Paths: -------------- DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi Added Paths: ----------- DrDivX/trunk/drdivx2/installer/i18n/Tr.nsh Modified: DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi =================================================================== --- DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi 2007-02-20 17:54:40 UTC (rev 1272) +++ DrDivX/trunk/drdivx2/installer/DrDivXInstaller.nsi 2007-02-20 18:34:01 UTC (rev 1273) @@ -117,6 +117,8 @@ !include "i18n\Ru.nsh" !insertmacro MUI_LANGUAGE "Japanese" !include "i18n\Ja.nsh" +!insertmacro MUI_LANGUAGE "Turkish" +!include "i18n\Tr.nsh" ; ---- Macros ---- @@ -204,7 +206,9 @@ IntCmp $1 0x19 0 +2 StrCpy $2 "ru" IntCmp $1 0x1D 0 +2 - StrCpy $2 "sv" + StrCpy $2 "sv" + IntCmp $1 0x1F 0 +2 + StrCpy $2 "tr" Pop $1 Exch $2 Pop $2 Added: DrDivX/trunk/drdivx2/installer/i18n/Tr.nsh =================================================================== --- DrDivX/trunk/drdivx2/installer/i18n/Tr.nsh (rev 0) +++ DrDivX/trunk/drdivx2/installer/i18n/Tr.nsh 2007-02-20 18:34:01 UTC (rev 1273) @@ -0,0 +1,101 @@ +; Turkish language strings +; alex51 (ale...@go...) +; +; Provides various language strings for use throughout +; the installer GUI. Note that some LangStrings are not +; used as text, they might change things like URL targets +; and desktop shortcut names also. +; + +!include "Includes\Product.nsh" ; Contains product names, versions, etc. +!include "MUI.nsh" + +!ifndef _i18n_Tr_NSH +!define _i18n_Tr_NSH + + ; ----- Installer component descriptions ----- + + LangString DESC_SECTION_DOCS ${LANG_TURKISH} "Lisans ve BeniOku dosyalar\xFD (\xD6nerilen)" + LangString DESC_SECTION_DRDIVX ${LANG_TURKISH} "${PRODUCT_NAME} program dosyalar\xFD" + LangString DESC_SECTION_DESKTOPSHORTCUTS ${LANG_TURKISH} "${PRODUCT_SHORTNAME} i\xE7in masa\xFCst\xFC k\xFDsayollar" + + LangString SUBSECT_TITLE_MAIN ${LANG_TURKISH} "${PRODUCT_NAME}" + LangString SECT_TITLE_DOCS ${LANG_TURKISH} "Dok\xFCmanlar (\xD6nerilen)" + LangString SECT_TITLE_DRDIVX ${LANG_TURKISH} "${PRODUCT_SHORTNAME}" + LangString SECT_TITLE_DESKTOPSHORTCUTS ${LANG_TURKISH} "Masa\xFCst\xFC K\xFDsayollar" + + + + ; ----- EULA ----- + + LicenseLangString FILE_EULA ${LANG_TURKISH} "InstallerResource\LicensePage_EULA.txt" + + + + ; ----- Installer ----- + + LangString DESC_WELCOME_HEAD ${LANG_TURKISH} "${PRODUCT_NAME} e Ho\xFEgeldiniz" + LangString DESC_WELCOME_SUBHEAD ${LANG_TURKISH} "Devam etmek i\xE7in \xDDleri'yi t\xFDklay\xFDn..." + LangString DESC_LICENSEPAGE_TEXT_TOP ${LANG_TURKISH} "L\xFCtfen LGPL ve DivX lisans\xFDn\xFD dikkatlice g\xF6zden ger\xE7irin:" + LangString DESC_LICENSEPAGE_TEXT_BOTTOM ${LANG_TURKISH} "Y\xFCklemeye devam etmek i\xE7in her iki lisans s\xF6zle\xFEmesini kabul etmelisiniz." + LangString DESC_LICENSEPAGE_CHECKBOX_TEXT ${LANG_TURKISH} "LGPL ve DivX lisans s\xF6zle\xFEmelerinin maddelerini kabul ediyorum" + LangString DESC_FINISHPAGE_TITLE ${LANG_TURKISH} "Y\xFCkeleme tamamland\xFD" + LangString DESC_FINISHPAGE_TEXT ${LANG_TURKISH} "${PRODUCT_NAME} ba\xFEar\xFDyla y\xFCklendi." + LangString DESC_FINISHPAGE_TEXT_REBOOT ${LANG_TURKISH} "${PRODUCT_NAME} ba\xFEar\xFDyla y\xFCklendi ama do\xF0ru \xE7al\xFD\xFEmas\xFD i\xE7in bilgisayar\xFDn\xFDz yeniden ba\xFElatman\xFDz gerekmektedir." + LangString DESC_FINISHPAGE_SHOWREADME_TEXT ${LANG_TURKISH} "${PRODUCT_SHORTNAME} nas\xFDl \xE7al\xFD\xFEt\xFDralaca\xF0\xFDn\xFD oku..." + + LangString URL_FINISHPAGE_SHOWREADME ${LANG_TURKISH} "http://labs.divx.com/node/35" + + ; ----- Installer errors and warnings ----- + + LangString DESC_INSTALLATION_ERRORS ${LANG_TURKISH} "Y\xFCkleme s\xFDras\xFDnda hata olu\xFEtu!$\r$\nBaz\xFD bile\xFEenler d\xFCzg\xFCn \xE7al\xFD\xFEmayabilir." + LangString DESC_DIVXSIXNOTINSTALLED ${LANG_TURKISH} "${PRODUCT_NAME} kullanman\xFDz i\xE7in DivX 6 Kode\xF0ine ihtiyac\xFDn\xFDz var.$\r$\nDivX.com y\xFCkleme sayfas\xFDn\xFD ziyaret etmek istermisiniz?" + LangString DESC_OSNOTSUPPORTED ${LANG_TURKISH} "\xDD\xFEletim sisteminiz ${PRODUCT_NAME} taraf\xFDndan desteklenmiyor.$\r$\nBu y\xFCklemeye devam etmeniz bilgisayar\xFDn\xFDza zarar verebilir.$\r\$\n$\r$\nDevam Edilsinmi?" + LangString DESC_FILEWRITEERROR ${LANG_TURKISH} "Yazma hatas\xFD $0,$\r$\nL\xFCtfen dosyan\xFDn kullan\xFDlmad\xFD\xF0\xFDn\xFD kontrol ediniz, veya bilgisayar\xFDn\xFDz\xFD yeniden ba\xFElat\xFDn ve tekrar deneyin." + + LangString URL_GETDIVXSIX ${LANG_TURKISH} "http://www.divx.com/divx" + + + + ; ----- Installer Details ----- + + LangString DESC_DETAILS_CREATEUNINSTALLER ${LANG_TURKISH} "Uninstaller yarat\xFDl\xFDyor..." + LangString DESC_DETAILS_WRITEDOCS ${LANG_TURKISH} "Dok\xFCmanlar yaz\xFDl\xFDyor..." + LangString DESC_DETAILS_WRITEDRDIVX ${LANG_TURKISH} "${PRODUCT_SHORTNAME} \xC7\xFDkart\xFDl\xFDyor..." + LangString DESC_DETAILS_DESKTOPSCUTS ${LANG_TURKISH} "Masa\xFCst\xFC k\xFDsayollar\xFD yarat\xFDl\xFDyor..." + LangString DESC_DETAILS_FINISHINGUP ${LANG_TURKISH} "Bitiriliyor..." + + ; ----- Shortcuts ----- + + LangString SHORTCUT_SM_REMOVEPRODUCT ${LANG_TURKISH} "Remove ${PRODUCT_NAME}" + LangString SHORTCUT_SM_README ${LANG_TURKISH} "BeniOku" + LangString SHORTCUT_SM_DIVXEULA ${LANG_TURKISH} "Dr.DivX DLL S\xF6zle\xFEmesi" + LangString SHORTCUT_SM_LGPLEULA ${LANG_TURKISH} "LGPL S\xF6zle\xFEmesi" + LangString SHORTCUT_SM_HOMEPAGE ${LANG_TURKISH} "${PRODUCT_SHORTNAME} Anasayfa" + + LangString URL_SHORTCUT_SM_HOMEPAGE ${LANG_TURKISH} "http://www.drdivx.com" + + LangString SHORTCUT_SM_EXPERTMODE ${LANG_TURKISH} "${PRODUCT_SHORTNAME}" + LangString SHORTCUT_SM_RESETMODE ${LANG_TURKISH} "Reset" +; LangString SHORTCUT_SM_EXPERTMODE ${LANG_TURKISH} "${PRODUCT_SHORTNAME} Detayl\xFD Mod" + LangString SHORTCUT_SM_BATCHQUEUE ${LANG_TURKISH} "${PRODUCT_SHORTNAME} \xC7oklu Encode S\xFDras\xFD" + LangString SHORTCUT_SM_WIZARDMODE ${LANG_TURKISH} "${PRODUCT_SHORTNAME} Basit Mod" + + LangString SHORTCUT_DT_EXPERTMODE ${LANG_TURKISH} "${PRODUCT_SHORTNAME}" + LangString SHORTCUT_DT_RESETMODE ${LANG_TURKISH} "Reset" + LangString SHORTCUT_DT_BATCHQUEUE ${LANG_TURKISH} "${PRODUCT_SHORTNAME} \xC7oklu Encode S\xFDras\xFD" + LangString SHORTCUT_DT_WIZARDMODE ${LANG_TURKISH} "${PRODUCT_SHORTNAME} Basit Mod" + + + + ; ----- Uninstaller ----- + + LangString DESC_ADDREMOVE_NAME ${LANG_TURKISH} "${PRODUCT_NAME}" + + LangString DESC_UNWELCOMEPAGE_TITLE ${LANG_TURKISH} "${PRODUCT_NAME}" + LangString DESC_UNWELCOMEPAGE_TEXT ${LANG_TURKISH} "${PRODUCT_NAME} \xFD kald\xFDrmak i\xE7in 'Uninstall' \xFD t\xFDklay\xFDn." + LangString DESC_UNFINISHPAGE_TITLE ${LANG_TURKISH} "Kald\xFDrma bitti" + LangString DESC_UNFINISHPAGE_TEXT ${LANG_TURKISH} "${PRODUCT_NAME} Ba\xFEar\xFDyla kald\xFDr\xFDld\xFD." + LangString DESC_UNFINISHPAGE_TEXT_REBOOT ${LANG_TURKISH} "${PRODUCT_NAME} kald\xFDr\xFDld\xFD ama baz\xFD dosyalar\xFDn tamamen kald\xFDr\xFDlmas\xFD i\xE7in bilgisayar\xFDn\xFDz yeniden ba\xFElatman\xFDz gerekmektedir." + +!endif \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-20 17:55:04
|
Revision: 1272 http://svn.sourceforge.net/drdivx/?rev=1272&view=rev Author: harikrishnan_v Date: 2007-02-20 09:54:40 -0800 (Tue, 20 Feb 2007) Log Message: ----------- win32 and os x have different build numbers Modified Paths: -------------- DrDivX/trunk/drdivx2/src/util/AppDefaults.cpp Modified: DrDivX/trunk/drdivx2/src/util/AppDefaults.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/util/AppDefaults.cpp 2007-02-19 23:10:37 UTC (rev 1271) +++ DrDivX/trunk/drdivx2/src/util/AppDefaults.cpp 2007-02-20 17:54:40 UTC (rev 1272) @@ -47,9 +47,19 @@ const char *COMPANY_NAME = "DivX, Inc."; const char *APP_NAME = "Dr. DivX 2.0 OSS"; + +#ifdef _WIN32 const char *APP_VERSION = __DATE__ " Beta 3"; const char *APP_VERSION_NAME = "Samsara"; const char *APP_VERSION_BUILD = "2.0.1 b3"; const char *APP_VERSION_DATE = "2007-02-10"; +#elif defined (__APPLE__) && defined (__MACH__) +const char *APP_VERSION = __DATE__ " Beta 1"; +const char *APP_VERSION_NAME = "Shesha"; +const char *APP_VERSION_BUILD = "2.0.0 b1"; +const char *APP_VERSION_DATE = "2007-02-10"; +#else + #error "Unsupported OS" +#endif const wchar_t *USER_DIR_NAME = L".drdivx2"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-19 23:10:39
|
Revision: 1271 http://svn.sourceforge.net/drdivx/?rev=1271&view=rev Author: harikrishnan_v Date: 2007-02-19 15:10:37 -0800 (Mon, 19 Feb 2007) Log Message: ----------- Use wxStdDialogButtonSizer to make button panels look correct on win32 and os x Modified Paths: -------------- DrDivX/trunk/drdivx2/src/wxgui/MetaDataDialog.cpp DrDivX/trunk/drdivx2/src/wxgui/MetaDataDialog.pjd DrDivX/trunk/drdivx2/src/wxgui/PluginSelectionDialog.cpp DrDivX/trunk/drdivx2/src/wxgui/PluginSelectionDialog.pjd DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.pjd DrDivX/trunk/drdivx2/src/wxgui/ProfileNameSelectionDialog.cpp DrDivX/trunk/drdivx2/src/wxgui/ProfileNameSelectionDialog.pjd DrDivX/trunk/drdivx2/src/wxgui/TrackSelectionDialog.cpp DrDivX/trunk/drdivx2/src/wxgui/TrackSelectionDialog.pjd Modified: DrDivX/trunk/drdivx2/src/wxgui/MetaDataDialog.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/MetaDataDialog.cpp 2007-02-19 22:47:34 UTC (rev 1270) +++ DrDivX/trunk/drdivx2/src/wxgui/MetaDataDialog.cpp 2007-02-19 23:10:37 UTC (rev 1271) @@ -227,16 +227,16 @@ encoderUriLineEdit = new wxTextCtrl( itemDialog1, ID_TEXTCTRL7, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer4->Add(encoderUriLineEdit, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - wxBoxSizer* itemBoxSizer23 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer2->Add(itemBoxSizer23, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); + wxStdDialogButtonSizer* itemStdDialogButtonSizer23 = new wxStdDialogButtonSizer; - itemBoxSizer23->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer2->Add(itemStdDialogButtonSizer23, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); + wxButton* itemButton24 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStdDialogButtonSizer23->AddButton(itemButton24); - wxButton* itemButton25 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer23->Add(itemButton25, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxButton* itemButton25 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStdDialogButtonSizer23->AddButton(itemButton25); - wxButton* itemButton26 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer23->Add(itemButton26, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemStdDialogButtonSizer23->Realize(); ////@end MetaDataDialog content construction } Modified: DrDivX/trunk/drdivx2/src/wxgui/MetaDataDialog.pjd =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/MetaDataDialog.pjd 2007-02-19 22:47:34 UTC (rev 1270) +++ DrDivX/trunk/drdivx2/src/wxgui/MetaDataDialog.pjd 2007-02-19 23:10:37 UTC (rev 1271) @@ -6,7 +6,7 @@ <string name="title">""</string> <string name="author">""</string> <string name="description">""</string> - <long name="doc_count">33</long> + <long name="doc_count">32</long> <string name="xrc_filename">""</string> <bool name="convert_images_to_xpm">1</bool> <bool name="inline_images">0</bool> @@ -1501,7 +1501,7 @@ </document> </document> <document> - <string name="title">"wxBoxSizer H"</string> + <string name="title">"wxStdDialogButtonSizer"</string> <string name="type">"dialog-control-document"</string> <string name="filename">""</string> <string name="icon-name">"sizer"</string> @@ -1510,8 +1510,15 @@ <long name="title-mode">0</long> <long name="locked">0</long> <string name="created">"23/11/2006"</string> - <string name="proxy-type">"wbBoxSizerProxy"</string> - <string name="proxy-Orientation">"Horizontal"</string> + <string name="proxy-type">"wbStdDialogButtonSizerProxy"</string> + <bool name="proxy-wxID_OK">1</bool> + <bool name="proxy-wxID_CANCEL">1</bool> + <bool name="proxy-wxID_YES">0</bool> + <bool name="proxy-wxID_NO">0</bool> + <bool name="proxy-wxID_HELP">0</bool> + <bool name="proxy-wxID_APPLY">0</bool> + <bool name="proxy-wxID_SAVE">0</bool> + <bool name="proxy-wxID_CONTEXT_HELP">0</bool> <string name="proxy-Member variable name">""</string> <string name="proxy-AlignH">"Expand"</string> <string name="proxy-AlignV">"Centre"</string> @@ -1526,32 +1533,6 @@ <bool name="proxy-wxFIXED_MINSIZE">0</bool> <string name="proxy-Platform">"<Any platform>"</string> <document> - <string name="title">"Spacer"</string> - <string name="type">"dialog-control-document"</string> - <string name="filename">""</string> - <string name="icon-name">"spacer"</string> - <long name="is-transient">0</long> - <long name="owns-file">1</long> - <long name="title-mode">0</long> - <long name="locked">0</long> - <string name="created">"23/11/2006"</string> - <string name="proxy-type">"wbSpacerProxy"</string> - <long name="proxy-Width">5</long> - <long name="proxy-Height">5</long> - <string name="proxy-AlignH">"Centre"</string> - <string name="proxy-AlignV">"Centre"</string> - <long name="proxy-Stretch factor">1</long> - <long name="proxy-Border">5</long> - <bool name="proxy-wxLEFT">1</bool> - <bool name="proxy-wxRIGHT">1</bool> - <bool name="proxy-wxTOP">1</bool> - <bool name="proxy-wxBOTTOM">1</bool> - <bool name="proxy-wxSHAPED">0</bool> - <bool name="proxy-wxADJUST_MINSIZE">0</bool> - <bool name="proxy-wxFIXED_MINSIZE">0</bool> - <string name="proxy-Platform">"<Any platform>"</string> - </document> - <document> <string name="title">"wxButton: wxID_OK"</string> <string name="type">"dialog-control-document"</string> <string name="filename">""</string> Modified: DrDivX/trunk/drdivx2/src/wxgui/PluginSelectionDialog.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/PluginSelectionDialog.cpp 2007-02-19 22:47:34 UTC (rev 1270) +++ DrDivX/trunk/drdivx2/src/wxgui/PluginSelectionDialog.cpp 2007-02-19 23:10:37 UTC (rev 1271) @@ -174,16 +174,16 @@ pluginSettingsPanel = new wxPanel( itemDialog1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); itemBoxSizer5->Add(pluginSettingsPanel, 1, wxGROW, 5); - wxBoxSizer* itemBoxSizer10 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer2->Add(itemBoxSizer10, 0, wxGROW, 0); + wxStdDialogButtonSizer* itemStdDialogButtonSizer10 = new wxStdDialogButtonSizer; - itemBoxSizer10->Add(5, 5, 2, wxALIGN_CENTER_VERTICAL, 5); + itemBoxSizer2->Add(itemStdDialogButtonSizer10, 0, wxGROW, 0); + wxButton* itemButton11 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStdDialogButtonSizer10->AddButton(itemButton11); - wxButton* itemButton12 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer10->Add(itemButton12, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxButton* itemButton12 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStdDialogButtonSizer10->AddButton(itemButton12); - wxButton* itemButton13 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer10->Add(itemButton13, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemStdDialogButtonSizer10->Realize(); ////@end PluginSelectionDialog content construction } Modified: DrDivX/trunk/drdivx2/src/wxgui/PluginSelectionDialog.pjd =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/PluginSelectionDialog.pjd 2007-02-19 22:47:34 UTC (rev 1270) +++ DrDivX/trunk/drdivx2/src/wxgui/PluginSelectionDialog.pjd 2007-02-19 23:10:37 UTC (rev 1271) @@ -6,7 +6,7 @@ <string name="title">""</string> <string name="author">""</string> <string name="description">""</string> - <long name="doc_count">20</long> + <long name="doc_count">19</long> <string name="xrc_filename">""</string> <bool name="convert_images_to_xpm">1</bool> <bool name="inline_images">0</bool> @@ -636,7 +636,7 @@ </document> </document> <document> - <string name="title">"wxBoxSizer H"</string> + <string name="title">"wxStdDialogButtonSizer"</string> <string name="type">"dialog-control-document"</string> <string name="filename">""</string> <string name="icon-name">"sizer"</string> @@ -645,8 +645,15 @@ <long name="title-mode">0</long> <long name="locked">0</long> <string name="created">"22/11/2006"</string> - <string name="proxy-type">"wbBoxSizerProxy"</string> - <string name="proxy-Orientation">"Horizontal"</string> + <string name="proxy-type">"wbStdDialogButtonSizerProxy"</string> + <bool name="proxy-wxID_OK">1</bool> + <bool name="proxy-wxID_CANCEL">1</bool> + <bool name="proxy-wxID_YES">0</bool> + <bool name="proxy-wxID_NO">0</bool> + <bool name="proxy-wxID_HELP">0</bool> + <bool name="proxy-wxID_APPLY">0</bool> + <bool name="proxy-wxID_SAVE">0</bool> + <bool name="proxy-wxID_CONTEXT_HELP">0</bool> <string name="proxy-Member variable name">""</string> <string name="proxy-AlignH">"Expand"</string> <string name="proxy-AlignV">"Centre"</string> @@ -661,32 +668,6 @@ <bool name="proxy-wxFIXED_MINSIZE">0</bool> <string name="proxy-Platform">"<Any platform>"</string> <document> - <string name="title">"Spacer"</string> - <string name="type">"dialog-control-document"</string> - <string name="filename">""</string> - <string name="icon-name">"spacer"</string> - <long name="is-transient">0</long> - <long name="owns-file">1</long> - <long name="title-mode">0</long> - <long name="locked">0</long> - <string name="created">"22/11/2006"</string> - <string name="proxy-type">"wbSpacerProxy"</string> - <long name="proxy-Width">5</long> - <long name="proxy-Height">5</long> - <string name="proxy-AlignH">"Centre"</string> - <string name="proxy-AlignV">"Centre"</string> - <long name="proxy-Stretch factor">2</long> - <long name="proxy-Border">5</long> - <bool name="proxy-wxLEFT">0</bool> - <bool name="proxy-wxRIGHT">0</bool> - <bool name="proxy-wxTOP">0</bool> - <bool name="proxy-wxBOTTOM">0</bool> - <bool name="proxy-wxSHAPED">0</bool> - <bool name="proxy-wxADJUST_MINSIZE">0</bool> - <bool name="proxy-wxFIXED_MINSIZE">0</bool> - <string name="proxy-Platform">"<Any platform>"</string> - </document> - <document> <string name="title">"wxButton: wxID_OK"</string> <string name="type">"dialog-control-document"</string> <string name="filename">""</string> Modified: DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp 2007-02-19 22:47:34 UTC (rev 1270) +++ DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp 2007-02-19 23:10:37 UTC (rev 1271) @@ -663,16 +663,16 @@ itemBoxSizer2->Add(itemNotebook3, 1, wxGROW|wxALL, 5); - wxBoxSizer* itemBoxSizer87 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer2->Add(itemBoxSizer87, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); + wxStdDialogButtonSizer* itemStdDialogButtonSizer87 = new wxStdDialogButtonSizer; - itemBoxSizer87->Add(5, 5, 2, wxALIGN_CENTER_VERTICAL, 5); + itemBoxSizer2->Add(itemStdDialogButtonSizer87, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); + wxButton* itemButton88 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStdDialogButtonSizer87->AddButton(itemButton88); - wxButton* itemButton89 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer87->Add(itemButton89, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); + wxButton* itemButton89 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStdDialogButtonSizer87->AddButton(itemButton89); - wxButton* itemButton90 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer87->Add(itemButton90, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5); + itemStdDialogButtonSizer87->Realize(); ////@end PreferencesDialog content construction } Modified: DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.pjd =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.pjd 2007-02-19 22:47:34 UTC (rev 1270) +++ DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.pjd 2007-02-19 23:10:37 UTC (rev 1271) @@ -6,7 +6,7 @@ <string name="title">""</string> <string name="author">""</string> <string name="description">""</string> - <long name="doc_count">99</long> + <long name="doc_count">98</long> <string name="xrc_filename">""</string> <bool name="convert_images_to_xpm">1</bool> <bool name="inline_images">0</bool> @@ -4304,7 +4304,7 @@ </document> </document> <document> - <string name="title">"wxBoxSizer H"</string> + <string name="title">"wxStdDialogButtonSizer"</string> <string name="type">"dialog-control-document"</string> <string name="filename">""</string> <string name="icon-name">"sizer"</string> @@ -4313,8 +4313,15 @@ <long name="title-mode">0</long> <long name="locked">0</long> <string name="created">"22/11/2006"</string> - <string name="proxy-type">"wbBoxSizerProxy"</string> - <string name="proxy-Orientation">"Horizontal"</string> + <string name="proxy-type">"wbStdDialogButtonSizerProxy"</string> + <bool name="proxy-wxID_OK">1</bool> + <bool name="proxy-wxID_CANCEL">1</bool> + <bool name="proxy-wxID_YES">0</bool> + <bool name="proxy-wxID_NO">0</bool> + <bool name="proxy-wxID_HELP">0</bool> + <bool name="proxy-wxID_APPLY">0</bool> + <bool name="proxy-wxID_SAVE">0</bool> + <bool name="proxy-wxID_CONTEXT_HELP">0</bool> <string name="proxy-Member variable name">""</string> <string name="proxy-AlignH">"Expand"</string> <string name="proxy-AlignV">"Centre"</string> @@ -4329,32 +4336,6 @@ <bool name="proxy-wxFIXED_MINSIZE">0</bool> <string name="proxy-Platform">"<Any platform>"</string> <document> - <string name="title">"Spacer"</string> - <string name="type">"dialog-control-document"</string> - <string name="filename">""</string> - <string name="icon-name">"spacer"</string> - <long name="is-transient">0</long> - <long name="owns-file">1</long> - <long name="title-mode">0</long> - <long name="locked">0</long> - <string name="created">"22/11/2006"</string> - <string name="proxy-type">"wbSpacerProxy"</string> - <long name="proxy-Width">5</long> - <long name="proxy-Height">5</long> - <string name="proxy-AlignH">"Centre"</string> - <string name="proxy-AlignV">"Centre"</string> - <long name="proxy-Stretch factor">2</long> - <long name="proxy-Border">5</long> - <bool name="proxy-wxLEFT">0</bool> - <bool name="proxy-wxRIGHT">0</bool> - <bool name="proxy-wxTOP">0</bool> - <bool name="proxy-wxBOTTOM">0</bool> - <bool name="proxy-wxSHAPED">0</bool> - <bool name="proxy-wxADJUST_MINSIZE">0</bool> - <bool name="proxy-wxFIXED_MINSIZE">0</bool> - <string name="proxy-Platform">"<Any platform>"</string> - </document> - <document> <string name="title">"wxButton: wxID_OK"</string> <string name="type">"dialog-control-document"</string> <string name="filename">""</string> Modified: DrDivX/trunk/drdivx2/src/wxgui/ProfileNameSelectionDialog.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/ProfileNameSelectionDialog.cpp 2007-02-19 22:47:34 UTC (rev 1270) +++ DrDivX/trunk/drdivx2/src/wxgui/ProfileNameSelectionDialog.cpp 2007-02-19 23:10:37 UTC (rev 1271) @@ -145,16 +145,16 @@ profileNameCombo = new wxComboBox( itemDialog1, ID_COMBOBOX1, _T(""), wxDefaultPosition, wxDefaultSize, 0, profileNameComboStrings, wxCB_DROPDOWN ); itemBoxSizer3->Add(profileNameCombo, 1, wxGROW|wxALL, 5); - wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer2->Add(itemBoxSizer6, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxStdDialogButtonSizer* itemStdDialogButtonSizer6 = new wxStdDialogButtonSizer; - itemBoxSizer6->Add(5, 5, 2, wxALIGN_CENTER_VERTICAL, 5); + itemBoxSizer2->Add(itemStdDialogButtonSizer6, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxButton* itemButton7 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStdDialogButtonSizer6->AddButton(itemButton7); - wxButton* itemButton8 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer6->Add(itemButton8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxButton* itemButton8 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStdDialogButtonSizer6->AddButton(itemButton8); - wxButton* itemButton9 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer6->Add(itemButton9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemStdDialogButtonSizer6->Realize(); ////@end ProfileNameSelectionDialog content construction } Modified: DrDivX/trunk/drdivx2/src/wxgui/ProfileNameSelectionDialog.pjd =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/ProfileNameSelectionDialog.pjd 2007-02-19 22:47:34 UTC (rev 1270) +++ DrDivX/trunk/drdivx2/src/wxgui/ProfileNameSelectionDialog.pjd 2007-02-19 23:10:37 UTC (rev 1271) @@ -6,7 +6,7 @@ <string name="title">""</string> <string name="author">""</string> <string name="description">""</string> - <long name="doc_count">16</long> + <long name="doc_count">15</long> <string name="xrc_filename">""</string> <bool name="convert_images_to_xpm">1</bool> <bool name="inline_images">0</bool> @@ -448,7 +448,7 @@ </document> </document> <document> - <string name="title">"wxBoxSizer H"</string> + <string name="title">"wxStdDialogButtonSizer"</string> <string name="type">"dialog-control-document"</string> <string name="filename">""</string> <string name="icon-name">"sizer"</string> @@ -457,8 +457,15 @@ <long name="title-mode">0</long> <long name="locked">0</long> <string name="created">"23/11/2006"</string> - <string name="proxy-type">"wbBoxSizerProxy"</string> - <string name="proxy-Orientation">"Horizontal"</string> + <string name="proxy-type">"wbStdDialogButtonSizerProxy"</string> + <bool name="proxy-wxID_OK">1</bool> + <bool name="proxy-wxID_CANCEL">1</bool> + <bool name="proxy-wxID_YES">0</bool> + <bool name="proxy-wxID_NO">0</bool> + <bool name="proxy-wxID_HELP">0</bool> + <bool name="proxy-wxID_APPLY">0</bool> + <bool name="proxy-wxID_SAVE">0</bool> + <bool name="proxy-wxID_CONTEXT_HELP">0</bool> <string name="proxy-Member variable name">""</string> <string name="proxy-AlignH">"Centre"</string> <string name="proxy-AlignV">"Top"</string> @@ -473,32 +480,6 @@ <bool name="proxy-wxFIXED_MINSIZE">0</bool> <string name="proxy-Platform">"<Any platform>"</string> <document> - <string name="title">"Spacer"</string> - <string name="type">"dialog-control-document"</string> - <string name="filename">""</string> - <string name="icon-name">"spacer"</string> - <long name="is-transient">0</long> - <long name="owns-file">1</long> - <long name="title-mode">0</long> - <long name="locked">0</long> - <string name="created">"1/2/2007"</string> - <string name="proxy-type">"wbSpacerProxy"</string> - <long name="proxy-Width">5</long> - <long name="proxy-Height">5</long> - <string name="proxy-AlignH">"Centre"</string> - <string name="proxy-AlignV">"Centre"</string> - <long name="proxy-Stretch factor">2</long> - <long name="proxy-Border">5</long> - <bool name="proxy-wxLEFT">0</bool> - <bool name="proxy-wxRIGHT">0</bool> - <bool name="proxy-wxTOP">0</bool> - <bool name="proxy-wxBOTTOM">0</bool> - <bool name="proxy-wxSHAPED">0</bool> - <bool name="proxy-wxADJUST_MINSIZE">0</bool> - <bool name="proxy-wxFIXED_MINSIZE">0</bool> - <string name="proxy-Platform">"<Any platform>"</string> - </document> - <document> <string name="title">"wxButton: wxID_OK"</string> <string name="type">"dialog-control-document"</string> <string name="filename">""</string> Modified: DrDivX/trunk/drdivx2/src/wxgui/TrackSelectionDialog.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/TrackSelectionDialog.cpp 2007-02-19 22:47:34 UTC (rev 1270) +++ DrDivX/trunk/drdivx2/src/wxgui/TrackSelectionDialog.cpp 2007-02-19 23:10:37 UTC (rev 1271) @@ -329,16 +329,16 @@ itemBoxSizer10->Add(10, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer19 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer2->Add(itemBoxSizer19, 0, wxGROW|wxALL, 5); + wxStdDialogButtonSizer* itemStdDialogButtonSizer19 = new wxStdDialogButtonSizer; - itemBoxSizer19->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer2->Add(itemStdDialogButtonSizer19, 0, wxGROW|wxALL, 5); + wxButton* itemButton20 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStdDialogButtonSizer19->AddButton(itemButton20); - wxButton* itemButton21 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer19->Add(itemButton21, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxButton* itemButton21 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStdDialogButtonSizer19->AddButton(itemButton21); - wxButton* itemButton22 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer19->Add(itemButton22, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemStdDialogButtonSizer19->Realize(); ////@end TrackSelectionDialog content construction } Modified: DrDivX/trunk/drdivx2/src/wxgui/TrackSelectionDialog.pjd =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/TrackSelectionDialog.pjd 2007-02-19 22:47:34 UTC (rev 1270) +++ DrDivX/trunk/drdivx2/src/wxgui/TrackSelectionDialog.pjd 2007-02-19 23:10:37 UTC (rev 1271) @@ -6,7 +6,7 @@ <string name="title">""</string> <string name="author">""</string> <string name="description">""</string> - <long name="doc_count">36</long> + <long name="doc_count">35</long> <string name="xrc_filename">""</string> <bool name="convert_images_to_xpm">1</bool> <bool name="inline_images">0</bool> @@ -1109,7 +1109,7 @@ </document> </document> <document> - <string name="title">"wxBoxSizer H"</string> + <string name="title">"wxStdDialogButtonSizer"</string> <string name="type">"dialog-control-document"</string> <string name="filename">""</string> <string name="icon-name">"sizer"</string> @@ -1118,8 +1118,15 @@ <long name="title-mode">0</long> <long name="locked">0</long> <string name="created">"23/11/2006"</string> - <string name="proxy-type">"wbBoxSizerProxy"</string> - <string name="proxy-Orientation">"Horizontal"</string> + <string name="proxy-type">"wbStdDialogButtonSizerProxy"</string> + <bool name="proxy-wxID_OK">1</bool> + <bool name="proxy-wxID_CANCEL">1</bool> + <bool name="proxy-wxID_YES">0</bool> + <bool name="proxy-wxID_NO">0</bool> + <bool name="proxy-wxID_HELP">0</bool> + <bool name="proxy-wxID_APPLY">0</bool> + <bool name="proxy-wxID_SAVE">0</bool> + <bool name="proxy-wxID_CONTEXT_HELP">0</bool> <string name="proxy-Member variable name">""</string> <string name="proxy-AlignH">"Expand"</string> <string name="proxy-AlignV">"Centre"</string> @@ -1134,32 +1141,6 @@ <bool name="proxy-wxFIXED_MINSIZE">0</bool> <string name="proxy-Platform">"<Any platform>"</string> <document> - <string name="title">"Spacer"</string> - <string name="type">"dialog-control-document"</string> - <string name="filename">""</string> - <string name="icon-name">"spacer"</string> - <long name="is-transient">0</long> - <long name="owns-file">1</long> - <long name="title-mode">0</long> - <long name="locked">0</long> - <string name="created">"23/11/2006"</string> - <string name="proxy-type">"wbSpacerProxy"</string> - <long name="proxy-Width">5</long> - <long name="proxy-Height">5</long> - <string name="proxy-AlignH">"Centre"</string> - <string name="proxy-AlignV">"Centre"</string> - <long name="proxy-Stretch factor">1</long> - <long name="proxy-Border">5</long> - <bool name="proxy-wxLEFT">1</bool> - <bool name="proxy-wxRIGHT">1</bool> - <bool name="proxy-wxTOP">1</bool> - <bool name="proxy-wxBOTTOM">1</bool> - <bool name="proxy-wxSHAPED">0</bool> - <bool name="proxy-wxADJUST_MINSIZE">0</bool> - <bool name="proxy-wxFIXED_MINSIZE">0</bool> - <string name="proxy-Platform">"<Any platform>"</string> - </document> - <document> <string name="title">"wxButton: wxID_OK"</string> <string name="type">"dialog-control-document"</string> <string name="filename">""</string> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-19 22:47:37
|
Revision: 1270 http://svn.sourceforge.net/drdivx/?rev=1270&view=rev Author: harikrishnan_v Date: 2007-02-19 14:47:34 -0800 (Mon, 19 Feb 2007) Log Message: ----------- No support for audio decoder info retrieval for os x Modified Paths: -------------- DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp Modified: DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp 2007-02-19 21:18:48 UTC (rev 1269) +++ DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp 2007-02-19 22:47:34 UTC (rev 1270) @@ -236,8 +236,15 @@ tmpStr += wxString::FromAscii(av_version_info()); ffmpegVersionLabel->SetLabel(tmpStr); +#ifdef _WIN32 tmpStr = _("Audio Filters:"); tmpStr += wxString::FromAscii(avcodec_dshow_info()); +#elif defined (__APPLE__) && defined (__MACH__) + tmpStr = wxEmptyString; +#else + #error "Unsupported OS" +#endif + audFilterInfoLabel->SetLabel(tmpStr); av_set_thread_logger(NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-19 21:18:56
|
Revision: 1269 http://svn.sourceforge.net/drdivx/?rev=1269&view=rev Author: harikrishnan_v Date: 2007-02-19 13:18:48 -0800 (Mon, 19 Feb 2007) Log Message: ----------- Disable audio track selection on os x. Debug and fix mutex issue later. Modified Paths: -------------- DrDivX/trunk/drdivx2/src/wxgui/InputWidget.cpp Modified: DrDivX/trunk/drdivx2/src/wxgui/InputWidget.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/InputWidget.cpp 2007-02-19 21:14:19 UTC (rev 1268) +++ DrDivX/trunk/drdivx2/src/wxgui/InputWidget.cpp 2007-02-19 21:18:48 UTC (rev 1269) @@ -930,7 +930,10 @@ if (inputAudioTracksListWidget->GetCount() > 0) { inputAudioTracksListWidget->Enable(true); + +#ifndef FIX_FOR_OSX selectAudioTracksPushButton->Enable(true); +#endif UpdateAudioTrackMap(fromJob); } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-19 21:14:42
|
Revision: 1268 http://svn.sourceforge.net/drdivx/?rev=1268&view=rev Author: harikrishnan_v Date: 2007-02-19 13:14:19 -0800 (Mon, 19 Feb 2007) Log Message: ----------- mp3gain sometimes generates bitstreams which drffmpeg interprets incorrectly as having more than 1 audio stream. Disable and debug later Modified Paths: -------------- DrDivX/trunk/drdivx2/src/encoder/AudioTrackEncoder.cpp Modified: DrDivX/trunk/drdivx2/src/encoder/AudioTrackEncoder.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/encoder/AudioTrackEncoder.cpp 2007-02-19 00:40:39 UTC (rev 1267) +++ DrDivX/trunk/drdivx2/src/encoder/AudioTrackEncoder.cpp 2007-02-19 21:14:19 UTC (rev 1268) @@ -173,7 +173,8 @@ FireFinished(err); goto clean_exit; } - + +#ifndef FIX_FOR_OSX if (has_boost) { user_report report; @@ -187,6 +188,7 @@ mp3gain(dest.c_str(), &report); } +#endif encoderNotifier->SetProgressRange(0, 100); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-19 00:40:41
|
Revision: 1267 http://svn.sourceforge.net/drdivx/?rev=1267&view=rev Author: harikrishnan_v Date: 2007-02-18 16:40:39 -0800 (Sun, 18 Feb 2007) Log Message: ----------- Choose a better temp folder on os x Modified Paths: -------------- DrDivX/trunk/drdivx2/src/util/Utility.cpp Modified: DrDivX/trunk/drdivx2/src/util/Utility.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/util/Utility.cpp 2007-02-19 00:31:18 UTC (rev 1266) +++ DrDivX/trunk/drdivx2/src/util/Utility.cpp 2007-02-19 00:40:39 UTC (rev 1267) @@ -204,7 +204,7 @@ folderPath += L'\\'; #elif defined (__APPLE__) && defined (__MACH__) FSRef f; - OSStatus err = FSFindFolder(kUserDomain, kTemporaryFolderType, kCreateFolder, &f); + OSStatus err = FSFindFolder(kLocalDomain, kTemporaryFolderType, kCreateFolder, &f); assert(err == noErr); UInt8 path[PATH_MAX]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-19 00:31:20
|
Revision: 1266 http://svn.sourceforge.net/drdivx/?rev=1266&view=rev Author: harikrishnan_v Date: 2007-02-18 16:31:18 -0800 (Sun, 18 Feb 2007) Log Message: ----------- Fix behaviour of remove intermediate files on failure and remove intermediate files on success Modified Paths: -------------- DrDivX/trunk/drdivx2/src/util/Utility.cpp DrDivX/trunk/drdivx2/src/wxgui/Expert.cpp DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.pjd Modified: DrDivX/trunk/drdivx2/src/util/Utility.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/util/Utility.cpp 2007-02-18 23:05:29 UTC (rev 1265) +++ DrDivX/trunk/drdivx2/src/util/Utility.cpp 2007-02-19 00:31:18 UTC (rev 1266) @@ -78,7 +78,7 @@ {"EncodeFolderMode", "Encodes", NULL}, {"DeleteFolderOnFail", "false", NULL}, - {"DeleteFolderOnJobRemove", "false", NULL}, + {"DeleteFolderOnJobRemove", "true", NULL}, {"EncodeOnStartup", "false", NULL}, {"SurveyEnabled", "true", NULL}, {"CheckForUpdates", "true", NULL}, Modified: DrDivX/trunk/drdivx2/src/wxgui/Expert.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/Expert.cpp 2007-02-18 23:05:29 UTC (rev 1265) +++ DrDivX/trunk/drdivx2/src/wxgui/Expert.cpp 2007-02-19 00:31:18 UTC (rev 1266) @@ -983,24 +983,24 @@ void Expert::JobTerminated(IJob &job, ErrorCode err) { - bool bDelete = (err == noAppErr); + bool remove = false; IPreferences *prefs = NULL; CreatePreferences(&prefs); wxASSERT(prefs != NULL); - if (!bDelete && err != jobExitingErr) + if (err == noAppErr) { - string tmpStr = prefs->GetStringOption(DEL_WORKING_FOLDER_ON_FAIL); - bDelete = (tmpStr != "false"); + string tmpStr = prefs->GetStringOption(DEL_WORKING_FOLDER_ON_JOB_REMOVAL); + remove = (tmpStr != "false"); } - else + else if (err != jobExitingErr) { - string tmpStr = prefs->GetStringOption(DEL_WORKING_FOLDER_ON_JOB_REMOVAL); - bDelete = (tmpStr == "false"); + string tmpStr = prefs->GetStringOption(DEL_WORKING_FOLDER_ON_FAIL); + remove = (tmpStr != "false"); } - if (bDelete) + if (remove) { IProperty *prop; job.GetProperty(JOB_TMP_FOLDER_PATH_PROP, &prop); Modified: DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp 2007-02-18 23:05:29 UTC (rev 1265) +++ DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp 2007-02-19 00:31:18 UTC (rev 1266) @@ -415,11 +415,11 @@ CheckForUpdates->SetValue(false); itemFlexGridSizer7->Add(CheckForUpdates, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - checkBoxDelOnFail = new wxCheckBox( itemPanel4, ID_CHECKBOX3, _("Remove working folder"), wxDefaultPosition, wxDefaultSize, 0 ); + checkBoxDelOnFail = new wxCheckBox( itemPanel4, ID_CHECKBOX3, _("Remove intermediate files if encode fails"), wxDefaultPosition, wxDefaultSize, 0 ); checkBoxDelOnFail->SetValue(false); itemFlexGridSizer7->Add(checkBoxDelOnFail, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - checkBoxDelOnJobDeath = new wxCheckBox( itemPanel4, ID_CHECKBOX4, _("Delete work data on job removal"), wxDefaultPosition, wxDefaultSize, 0 ); + checkBoxDelOnJobDeath = new wxCheckBox( itemPanel4, ID_CHECKBOX4, _("Remove intermediate files if encode succeeds"), wxDefaultPosition, wxDefaultSize, 0 ); checkBoxDelOnJobDeath->SetValue(false); itemFlexGridSizer7->Add(checkBoxDelOnJobDeath, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); Modified: DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.pjd =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.pjd 2007-02-18 23:05:29 UTC (rev 1265) +++ DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.pjd 2007-02-19 00:31:18 UTC (rev 1266) @@ -650,7 +650,7 @@ <long name="proxy-Id value">11005</long> <string name="proxy-Class">"wxCheckBox"</string> <string name="proxy-Member variable name">"checkBoxDelOnFail"</string> - <string name="proxy-Label">"Remove working folder"</string> + <string name="proxy-Label">"Remove intermediate files if encode fails"</string> <bool name="proxy-Initial value">0</bool> <string name="proxy-Help text">""</string> <string name="proxy-Tooltip text">""</string> @@ -703,7 +703,7 @@ <long name="proxy-Id value">11006</long> <string name="proxy-Class">"wxCheckBox"</string> <string name="proxy-Member variable name">"checkBoxDelOnJobDeath"</string> - <string name="proxy-Label">"Delete work data on job removal"</string> + <string name="proxy-Label">"Remove intermediate files if encode succeeds"</string> <bool name="proxy-Initial value">0</bool> <string name="proxy-Help text">""</string> <string name="proxy-Tooltip text">""</string> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-18 23:05:31
|
Revision: 1265 http://svn.sourceforge.net/drdivx/?rev=1265&view=rev Author: harikrishnan_v Date: 2007-02-18 15:05:29 -0800 (Sun, 18 Feb 2007) Log Message: ----------- Remove hard-coded width Modified Paths: -------------- DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.pjd Modified: DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp 2007-02-18 22:20:23 UTC (rev 1264) +++ DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp 2007-02-18 23:05:29 UTC (rev 1265) @@ -537,7 +537,7 @@ _("8"), _("16") }; - modVidWidthComboBox = new wxComboBox( itemPanel41, ID_COMBOBOX_MOD_VID_WIDTH, _("16"), wxDefaultPosition, wxSize(50, -1), 3, modVidWidthComboBoxStrings, wxCB_READONLY ); + modVidWidthComboBox = new wxComboBox( itemPanel41, ID_COMBOBOX_MOD_VID_WIDTH, _("16"), wxDefaultPosition, wxDefaultSize, 3, modVidWidthComboBoxStrings, wxCB_READONLY ); modVidWidthComboBox->SetStringSelection(_("16")); itemBoxSizer47->Add(modVidWidthComboBox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); @@ -550,7 +550,7 @@ _("8"), _("16") }; - modVidHeightComboBox = new wxComboBox( itemPanel41, ID_COMBOBOX_MOD_VID_HEIGHT, _("16"), wxDefaultPosition, wxSize(50, -1), 4, modVidHeightComboBoxStrings, wxCB_READONLY ); + modVidHeightComboBox = new wxComboBox( itemPanel41, ID_COMBOBOX_MOD_VID_HEIGHT, _("16"), wxDefaultPosition, wxDefaultSize, 4, modVidHeightComboBoxStrings, wxCB_READONLY ); modVidHeightComboBox->SetStringSelection(_("16")); itemBoxSizer47->Add(modVidHeightComboBox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); Modified: DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.pjd =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.pjd 2007-02-18 22:20:23 UTC (rev 1264) +++ DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.pjd 2007-02-18 23:05:29 UTC (rev 1265) @@ -2605,7 +2605,7 @@ <string name="proxy-Custom styles">""</string> <long name="proxy-X">-1</long> <long name="proxy-Y">-1</long> - <long name="proxy-Width">50</long> + <long name="proxy-Width">-1</long> <long name="proxy-Height">-1</long> <string name="proxy-AlignH">"Centre"</string> <string name="proxy-AlignV">"Centre"</string> @@ -2718,7 +2718,7 @@ <string name="proxy-Custom styles">""</string> <long name="proxy-X">-1</long> <long name="proxy-Y">-1</long> - <long name="proxy-Width">50</long> + <long name="proxy-Width">-1</long> <long name="proxy-Height">-1</long> <string name="proxy-AlignH">"Centre"</string> <string name="proxy-AlignV">"Centre"</string> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-18 22:20:26
|
Revision: 1264 http://svn.sourceforge.net/drdivx/?rev=1264&view=rev Author: harikrishnan_v Date: 2007-02-18 14:20:23 -0800 (Sun, 18 Feb 2007) Log Message: ----------- Fix svn:eol property Modified Paths: -------------- DrDivX/trunk/drdivx2/src/util/AppDefaults.cpp Property Changed: ---------------- DrDivX/trunk/drdivx2/src/util/AppDefaults.cpp Modified: DrDivX/trunk/drdivx2/src/util/AppDefaults.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/util/AppDefaults.cpp 2007-02-18 22:18:37 UTC (rev 1263) +++ DrDivX/trunk/drdivx2/src/util/AppDefaults.cpp 2007-02-18 22:20:23 UTC (rev 1264) @@ -1,55 +1,55 @@ -/* - * Default Strings and values for Dr DivX - * - * Copyright (c) 2005 DivX, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -const char *PRIORITY_IDLE = "Idle"; -const char *PRIORITY_LOW = "Low"; -const char *PRIORITY_NORMAL = "Normal"; -const char *PRIORITY_HIGH = "High"; - -#ifdef _WIN32 -#define USE_DIVX_MUX -#endif - -#ifdef USE_DIVX_MUX -const char *ENCODE_FILE_EXT = ".divx"; -#else -const char *ENCODE_FILE_EXT = ".avi"; -#endif -const char *JOB_FILE_EXT = ".xml"; -const char *WATCH_FOLDER_FILE_EXT = ".wat"; -const char *LOG_FILE_EXT = ".log"; -const char *PROFILE_FILE_EXT = ".xml"; - -const char *JOB_FILE_PREFIX = "job"; -const char *JOBS_FILE_NAME = "batch.xml"; - -const char *SURVEY_APP_NAME = "Survey.exe"; -const char *APP_ID = "411AD36B-8022-4012-9955-3C7A3FBF7653"; - -const char *LOCALE_FOLDER_NAME = "locale"; - -const char *COMPANY_NAME = "DivX, Inc."; -const char *APP_NAME = "Dr. DivX 2.0 OSS"; -const char *APP_VERSION = __DATE__ " Beta 3"; -const char *APP_VERSION_NAME = "Samsara"; -const char *APP_VERSION_BUILD = "2.0.1 b3"; -const char *APP_VERSION_DATE = "2007-02-10"; - -const wchar_t *USER_DIR_NAME = L".drdivx2"; +/* + * Default Strings and values for Dr DivX + * + * Copyright (c) 2005 DivX, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +const char *PRIORITY_IDLE = "Idle"; +const char *PRIORITY_LOW = "Low"; +const char *PRIORITY_NORMAL = "Normal"; +const char *PRIORITY_HIGH = "High"; + +#ifdef _WIN32 +#define USE_DIVX_MUX +#endif + +#ifdef USE_DIVX_MUX +const char *ENCODE_FILE_EXT = ".divx"; +#else +const char *ENCODE_FILE_EXT = ".avi"; +#endif +const char *JOB_FILE_EXT = ".xml"; +const char *WATCH_FOLDER_FILE_EXT = ".wat"; +const char *LOG_FILE_EXT = ".log"; +const char *PROFILE_FILE_EXT = ".xml"; + +const char *JOB_FILE_PREFIX = "job"; +const char *JOBS_FILE_NAME = "batch.xml"; + +const char *SURVEY_APP_NAME = "Survey.exe"; +const char *APP_ID = "411AD36B-8022-4012-9955-3C7A3FBF7653"; + +const char *LOCALE_FOLDER_NAME = "locale"; + +const char *COMPANY_NAME = "DivX, Inc."; +const char *APP_NAME = "Dr. DivX 2.0 OSS"; +const char *APP_VERSION = __DATE__ " Beta 3"; +const char *APP_VERSION_NAME = "Samsara"; +const char *APP_VERSION_BUILD = "2.0.1 b3"; +const char *APP_VERSION_DATE = "2007-02-10"; + +const wchar_t *USER_DIR_NAME = L".drdivx2"; Property changes on: DrDivX/trunk/drdivx2/src/util/AppDefaults.cpp ___________________________________________________________________ Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-18 22:19:48
|
Revision: 1263 http://svn.sourceforge.net/drdivx/?rev=1263&view=rev Author: harikrishnan_v Date: 2007-02-18 14:18:37 -0800 (Sun, 18 Feb 2007) Log Message: ----------- Fix win32 build Modified Paths: -------------- DrDivX/trunk/drdivx2/src/wxgui/VersionChecker.cpp Modified: DrDivX/trunk/drdivx2/src/wxgui/VersionChecker.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/VersionChecker.cpp 2007-02-18 22:14:14 UTC (rev 1262) +++ DrDivX/trunk/drdivx2/src/wxgui/VersionChecker.cpp 2007-02-18 22:18:37 UTC (rev 1263) @@ -209,7 +209,7 @@ if (ret == wxID_YES) { #ifdef _WIN32 - cli = wxT("rundll32.exe "); + wxString cli = wxT("rundll32.exe "); cli += wxT("url.dll,FileProtocolHandler "); cli += wxString(lastBuildLink.c_str(), wxConvUTF8); ::wxExecute(cli); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-18 22:14:16
|
Revision: 1262 http://svn.sourceforge.net/drdivx/?rev=1262&view=rev Author: harikrishnan_v Date: 2007-02-18 14:14:14 -0800 (Sun, 18 Feb 2007) Log Message: ----------- Make version checker work on os x Modified Paths: -------------- DrDivX/trunk/drdivx2/src/wxgui/Expert.cpp DrDivX/trunk/drdivx2/src/wxgui/Expert.h DrDivX/trunk/drdivx2/src/wxgui/VersionChecker.cpp DrDivX/trunk/drdivx2/src/wxgui/VersionChecker.h Modified: DrDivX/trunk/drdivx2/src/wxgui/Expert.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/Expert.cpp 2007-02-18 21:01:58 UTC (rev 1261) +++ DrDivX/trunk/drdivx2/src/wxgui/Expert.cpp 2007-02-18 22:14:14 UTC (rev 1262) @@ -280,22 +280,20 @@ LogManager::Instance().Log(DebugLog, BATCH, "GUIBatch] Create Watch Folder Scanner"); watchFolderScanTimer.SetOwner(this, wxID_TIMER_SCANFOLDER); watchFolderScanTimer.Start(4000); - -#ifndef FIX_FOR_OSX - // Turn it back on after we have a stable RSS feed URL - if (prefs->GetStringOption(CHECK_FOR_UPDATES) != "false") - { - versionChecker.SetParent(this); - versionChecker.Check(); - } -#endif - + if (GetSizer()) { GetSizer()->SetSizeHints(this); } + Centre(); - + + if (prefs->GetStringOption(CHECK_FOR_UPDATES) != "false") + { + versionChecker.SetParent(this); + versionChecker.Check(); + } + return true; } Modified: DrDivX/trunk/drdivx2/src/wxgui/Expert.h =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/Expert.h 2007-02-18 21:01:58 UTC (rev 1261) +++ DrDivX/trunk/drdivx2/src/wxgui/Expert.h 2007-02-18 22:14:14 UTC (rev 1262) @@ -190,9 +190,7 @@ ThreadPriority currentPrio; IJobBatch* jobBatch; wxString jobsPath; -#ifndef FIX_FOR_OSX VersionChecker versionChecker; -#endif wxMutex jobFolderScanMutex; wxTimer statusUpdateTimer; wxTimer watchFolderScanTimer; Modified: DrDivX/trunk/drdivx2/src/wxgui/VersionChecker.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/VersionChecker.cpp 2007-02-18 21:01:58 UTC (rev 1261) +++ DrDivX/trunk/drdivx2/src/wxgui/VersionChecker.cpp 2007-02-18 22:14:14 UTC (rev 1262) @@ -169,7 +169,7 @@ strncpy(buf, pubDate + 8, 3); buf[3] = '\0'; - month = MonthFromString(buf); + month = MonthFromString(wxString(buf, wxConvUTF8)); strncpy(buf, pubDate + 12, 4); buf[4] = '\0'; @@ -181,7 +181,7 @@ if (buildDate > lastBuildDate) { lastBuildTitle = wxString::FromAscii(title); - lastBuildLink = link; + lastBuildLink = wxString(link, wxConvUTF8); lastBuildDate = buildDate; } } @@ -202,69 +202,75 @@ void VersionChecker::OnNewVersionAvailable( wxCommandEvent& event ) { - wxString text = _("A new version of Dr.DivX was released on %s and is available for download.\nWould you like to view the details of the new version?"); - text = wxString::Format(text,lastBuildDate.FormatDate()); + wxString text = wxString::Format(_("A new version of Dr.DivX was released on %s and is available for download.\nWould you like to view the details of the new version?"), lastBuildDate.Format(_T("%d %b %Y")).c_str()); + int ret = wxMessageDialog(parent, text, _("Dr.DivX Update Available"), wxYES_NO|wxICON_QUESTION).ShowModal(); if (ret == wxID_YES) { #ifdef _WIN32 -#ifdef UNICODE - ::ShellExecute((HWND)parent->GetHandle(), NULL, Utf8ToWString(lastBuildLink).c_str(), NULL, NULL, SW_SHOW); + cli = wxT("rundll32.exe "); + cli += wxT("url.dll,FileProtocolHandler "); + cli += wxString(lastBuildLink.c_str(), wxConvUTF8); + ::wxExecute(cli); +#elif defined (__APPLE__) && defined (__MACH__) + wxString cli = _T("open \""); + cli += wxString(lastBuildLink.c_str(), wxConvUTF8); + cli += _T("\""); + ::wxExecute(cli); #else - ::ShellExecute((HWND)parent->GetHandle(), NULL, lastBuildLink.c_str(), NULL, NULL, SW_SHOW); + #error "Unsupported OS" #endif -#endif } } -int VersionChecker::MonthFromString(const string month) +int VersionChecker::MonthFromString(const wxString month) { - if (month == "Jan") + if (month == _T("Jan")) { return 1; } - else if (month == "Feb") + else if (month == _T("Feb")) { return 2; } - else if (month == "Mar") + else if (month == _T("Mar")) { return 3; } - else if (month == "Apr") + else if (month == _T("Apr")) { return 4; } - else if (month == "May") + else if (month == _T("May")) { return 5; } - else if (month == "Jun") + else if (month == _T("Jun")) { return 6; } - else if (month == "Jul") + else if (month == _T("Jul")) { return 7; } - else if (month == "Aug") + else if (month == _T("Aug")) { return 8; } - else if (month == "Sep") + else if (month == _T("Sep")) { return 9; } - else if (month == "Oct") + else if (month == _T("Oct")) { return 10; } - else if (month == "Nov") + else if (month == _T("Nov")) { return 11; } - else if (month == "Dec") + else if (month == _T("Dec")) { return 12; } Modified: DrDivX/trunk/drdivx2/src/wxgui/VersionChecker.h =================================================================== --- DrDivX/trunk/drdivx2/src/wxgui/VersionChecker.h 2007-02-18 21:01:58 UTC (rev 1261) +++ DrDivX/trunk/drdivx2/src/wxgui/VersionChecker.h 2007-02-18 22:14:14 UTC (rev 1262) @@ -48,11 +48,11 @@ protected: wxWindow *parent; wxDateTime lastBuildDate; - std::string lastBuildLink; + wxString lastBuildLink; wxString lastBuildTitle; void Browse(TiXmlNode *node); - int MonthFromString(const std::string month); + int MonthFromString(const wxString month); /// wxEVENT_NEW_VERSION_AVAILABLE void OnNewVersionAvailable( wxCommandEvent& event ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2007-02-18 21:02:00
|
Revision: 1261 http://svn.sourceforge.net/drdivx/?rev=1261&view=rev Author: harikrishnan_v Date: 2007-02-18 13:01:58 -0800 (Sun, 18 Feb 2007) Log Message: ----------- Enable mp3gain on os x Modified Paths: -------------- DrDivX/trunk/drdivx2/src/encoder/AudioTrackEncoder.cpp Modified: DrDivX/trunk/drdivx2/src/encoder/AudioTrackEncoder.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/encoder/AudioTrackEncoder.cpp 2007-02-18 20:40:41 UTC (rev 1260) +++ DrDivX/trunk/drdivx2/src/encoder/AudioTrackEncoder.cpp 2007-02-18 21:01:58 UTC (rev 1261) @@ -173,8 +173,7 @@ FireFinished(err); goto clean_exit; } - -#ifndef FIX_FOR_OSX + if (has_boost) { user_report report; @@ -188,7 +187,7 @@ mp3gain(dest.c_str(), &report); } -#endif + encoderNotifier->SetProgressRange(0, 100); FireFinished(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |