Added a dialog that shows up if compress whole is used and initial uncompressing lasts longer than a second.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@700 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
e94571b191
commit
755ea80f75
1 changed files with 22 additions and 12 deletions
|
@ -221,28 +221,28 @@
|
|||
|
||||
// fixes
|
||||
#ifndef NSIS_CONFIG_VISIBLE_SUPPORT
|
||||
#ifdef NSIS_CONFIG_LICENSEPAGE
|
||||
#undef NSIS_CONFIG_LICENSEPAGE
|
||||
#endif
|
||||
#ifdef NSIS_CONFIG_COMPONENTPAGE
|
||||
#undef NSIS_CONFIG_COMPONENTPAGE
|
||||
#endif
|
||||
#ifdef NSIS_SUPPORT_BGBG
|
||||
#undef NSIS_SUPPORT_BGBG
|
||||
#endif
|
||||
#ifdef NSIS_CONFIG_LICENSEPAGE
|
||||
#undef NSIS_CONFIG_LICENSEPAGE
|
||||
#endif
|
||||
#ifdef NSIS_CONFIG_COMPONENTPAGE
|
||||
#undef NSIS_CONFIG_COMPONENTPAGE
|
||||
#endif
|
||||
#ifdef NSIS_SUPPORT_BGBG
|
||||
#undef NSIS_SUPPORT_BGBG
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(NSIS_CONFIG_CRC_SUPPORT) && defined(NSIS_CONFIG_VISIBLE_SUPPORT)
|
||||
#define _NSIS_CONFIG_VERIFYDIALOG
|
||||
#define _NSIS_CONFIG_VERIFYDIALOG
|
||||
#endif
|
||||
|
||||
#if defined(NSIS_CONFIG_UNINSTALL_SUPPORT) && defined(NSIS_CONFIG_VISIBLE_SUPPORT)
|
||||
#define _NSIS_CONFIG_UNINSTDLG
|
||||
#define _NSIS_CONFIG_UNINSTDLG
|
||||
#endif
|
||||
|
||||
#if defined(NSIS_CONFIG_UNINSTALL_SUPPORT) && defined(NSIS_CONFIG_VISIBLE_SUPPORT)
|
||||
#define _NSIS_CONFIG_UNINSTDLG
|
||||
#define _NSIS_CONFIG_UNINSTDLG
|
||||
#endif
|
||||
|
||||
#ifdef EXEHEAD
|
||||
|
@ -263,12 +263,22 @@
|
|||
#ifdef NSIS_COMPRESS_USE_ZLIB
|
||||
#ifdef NSIS_ZLIB_COMPRESS_WHOLE
|
||||
#define NSIS_COMPRESS_WHOLE
|
||||
#ifdef NSIS_CONFIG_VISIBLE_SUPPORT
|
||||
#ifndef _NSIS_CONFIG_VERIFYDIALOG
|
||||
#define _NSIS_CONFIG_VERIFYDIALOG
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef NSIS_COMPRESS_USE_BZIP2
|
||||
#ifdef NSIS_BZIP2_COMPRESS_WHOLE
|
||||
#define NSIS_COMPRESS_WHOLE
|
||||
#ifdef NSIS_CONFIG_VISIBLE_SUPPORT
|
||||
#ifndef _NSIS_CONFIG_VERIFYDIALOG
|
||||
#define _NSIS_CONFIG_VERIFYDIALOG
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif // EXEHEAD
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue