| 修订版 | 587c29a4da1d191c1ebf2656b8ce8a497675adf5 (tree) |
|---|---|
| 时间 | 2016-04-30 00:51:20 |
| 作者 |  lordmulder <mulder2@gmx....> |
| Commiter | lordmulder |
Some installer tweaks.
HISTORY.txt (diff)
etc/setup/language/en.nsh (diff) etc/setup/setup.nsi (diff)
src/version.h (diff)| @@ -2,8 +2,9 @@ | ||
| 2 | 2 | Simple x264/x265 Launcher version history |
| 3 | 3 | ----------------------------------------- |
| 4 | 4 | |
| 5 | -Version 2.69 [2016-04-28] | |
| 6 | -* Fixed a VapourSynth error, when Avisynth is *not* installed | |
| 5 | +Version 2.70 [2016-04-29] | |
| 6 | +* Fixed potential VapourSynth error, when Avisynth is *not* installed | |
| 7 | +* Some installer improvements | |
| 7 | 8 | |
| 8 | 9 | Version 2.69 [2016-04-23] |
| 9 | 10 | * Updated x264 to revision 2692 |
| @@ -41,3 +41,4 @@ LangString X264_LANG_LINK_UNINSTALL ${LANG_ENGLISH} "Uninstall" | ||
| 41 | 41 | LangString X264_LANG_LINK_FAQ ${LANG_ENGLISH} "Frequently Asked Questions" |
| 42 | 42 | LangString X264_LANG_LINK_MANUAL ${LANG_ENGLISH} "User Manual (Readme)" |
| 43 | 43 | LangString X264_LANG_PRERELEASE_WARNING ${LANG_ENGLISH} "You are about to install a Demo (pre-release) version of Simple x264 Launcher!" |
| 44 | +LangString X264_LANG_UNINST_UPDATE_MODE ${LANG_ENGLISH} "Your existing installation will be updated!" |
| @@ -114,6 +114,7 @@ ReserveFile "${NSISDIR}\Plugins\UserInfo.dll" | ||
| 114 | 114 | ;-------------------------------- |
| 115 | 115 | |
| 116 | 116 | Var StartMenuFolder |
| 117 | +Var UpdateNotificationShown | |
| 117 | 118 | |
| 118 | 119 | |
| 119 | 120 | ;-------------------------------- |
| @@ -473,6 +474,19 @@ FunctionEnd | ||
| 473 | 474 | RMDir /r ${options} `$INSTDIR\sources` |
| 474 | 475 | !macroend |
| 475 | 476 | |
| 477 | +!macro SetControlEnabled item_id enable | |
| 478 | + FindWindow $R0 "#32770" "" $HWNDPARENT | |
| 479 | + ${IfNot} $R0 == 0 | |
| 480 | + GetDlgItem $R1 $R0 ${item_id} | |
| 481 | + EnableWindow $R1 ${enable} | |
| 482 | + ${EndIf} | |
| 483 | +!macroend | |
| 484 | + | |
| 485 | +!macro SkipToNextPage | |
| 486 | + GetDlgItem $R0 $HWNDPARENT 1 | |
| 487 | + System::Call "User32::PostMessage(i $HWNDPARENT, i ${WM_COMMAND}, i 1, i $R0)" | |
| 488 | +!macroend | |
| 489 | + | |
| 476 | 490 | |
| 477 | 491 | ;-------------------------------- |
| 478 | 492 | ;Install Files |
| @@ -666,16 +680,19 @@ Function CheckForUpdate | ||
| 666 | 680 | ${If} "$INSTDIR" == "" |
| 667 | 681 | ${OrIf} "$INSTDIR" == "$EXEDIR" |
| 668 | 682 | ${OrIfNot} ${FileExists} "$INSTDIR\x264_launcher.exe" |
| 683 | + StrCpy $UpdateNotificationShown FALSE | |
| 684 | + !insertmacro SetControlEnabled 1019 1 | |
| 685 | + !insertmacro SetControlEnabled 1001 1 | |
| 669 | 686 | Return |
| 687 | + ${Else} | |
| 688 | + !insertmacro SetControlEnabled 1019 0 | |
| 689 | + !insertmacro SetControlEnabled 1001 0 | |
| 690 | + ${If} "$UpdateNotificationShown" != TRUE | |
| 691 | + StrCpy $UpdateNotificationShown TRUE | |
| 692 | + MessageBox MB_ICONINFORMATION|MB_TOPMOST "$(X264_LANG_UNINST_UPDATE_MODE)" | |
| 693 | + !insertmacro SkipToNextPage | |
| 694 | + ${EndIf} | |
| 670 | 695 | ${EndIf} |
| 671 | - | |
| 672 | - FindWindow $R0 "#32770" "" $HWNDPARENT | |
| 673 | - GetDlgItem $R1 $R0 1019 | |
| 674 | - EnableWindow $R1 0 | |
| 675 | - | |
| 676 | - FindWindow $R0 "#32770" "" $HWNDPARENT | |
| 677 | - GetDlgItem $R1 $R0 1001 | |
| 678 | - EnableWindow $R1 0 | |
| 679 | 696 | FunctionEnd |
| 680 | 697 | |
| 681 | 698 | Function un.CheckForcedUninstall |
| @@ -24,9 +24,9 @@ | ||
| 24 | 24 | #endif |
| 25 | 25 | |
| 26 | 26 | #define VER_X264_MAJOR 2 |
| 27 | -#define VER_X264_MINOR 6 | |
| 28 | -#define VER_X264_PATCH 9 | |
| 29 | -#define VER_X264_BUILD 1025 | |
| 27 | +#define VER_X264_MINOR 7 | |
| 28 | +#define VER_X264_PATCH 0 | |
| 29 | +#define VER_X264_BUILD 1026 | |
| 30 | 30 | |
| 31 | 31 | #define VER_X264_PORTABLE_EDITION (0) |
| 32 | 32 |
Simple x264/x265 Launcher
Fork