diff options
author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2009-08-17 04:00:00 +0400 |
---|---|---|
committer | Kornel LesiĆski <kornel@geekhood.net> | 2016-05-28 02:16:00 +0300 |
commit | c99f3ebdd639c2adb03d8b44001b10af18516504 (patch) | |
tree | 92aaf34e5edbd7287c3f55037190da75ab0a8000 /CPP/7zip/UI/FileManager/ExtractCallback.h | |
parent | 829409452d85cd6dd9dfc9151f109d6e13a2bb1c (diff) |
9.06 beta
Diffstat (limited to 'CPP/7zip/UI/FileManager/ExtractCallback.h')
-rwxr-xr-x | CPP/7zip/UI/FileManager/ExtractCallback.h | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/CPP/7zip/UI/FileManager/ExtractCallback.h b/CPP/7zip/UI/FileManager/ExtractCallback.h index ee46222a..b4e88fd5 100755 --- a/CPP/7zip/UI/FileManager/ExtractCallback.h +++ b/CPP/7zip/UI/FileManager/ExtractCallback.h @@ -1,30 +1,27 @@ // ExtractCallback.h -#ifndef __EXTRACTCALLBACK_H -#define __EXTRACTCALLBACK_H +#ifndef __EXTRACT_CALLBACK_H +#define __EXTRACT_CALLBACK_H + +#include "Common/MyCom.h" + +#include "Windows/ResourceString.h" #include "../Agent/IFolderArchive.h" -#include "Common/MyString.h" #include "../Common/ArchiveOpenCallback.h" -#ifdef _SFX -#include "ProgressDialog.h" -#else -#include "ProgressDialog2.h" +#ifndef _NO_CRYPTO +#include "../../IPassword.h" #endif -#include "Windows/ResourceString.h" +#include "IFolder.h" + +#include "ProgressDialog2.h" #ifdef LANG #include "LangUtils.h" #endif -#ifndef _NO_CRYPTO -#include "../../IPassword.h" -#endif -#include "Common/MyCom.h" -#include "IFolder.h" - class CExtractCallbackImp: public IExtractCallbackUI, public IOpenCallbackUI, @@ -99,32 +96,23 @@ public: #endif private: - // bool _extractMode; UString _currentArchivePath; bool _needWriteArchivePath; UString _currentFilePath; bool _isFolder; - // void CreateComplexDirectory(const UStringVector &aDirPathParts); - HRESULT SetCurrentFilePath2(const wchar_t *filePath); void AddErrorMessage(LPCWSTR message); public: - CProgressDialog ProgressDialog; - UStringVector Messages; - bool ShowMessages; + CProgressDialog *ProgressDialog; #ifndef _SFX UInt64 NumFolders; UInt64 NumFiles; bool NeedAddFile; #endif - HWND ParentWindow; - INT_PTR StartProgressDialog(const UString &title) - { - return ProgressDialog.Create(title, ParentWindow); - } UInt32 NumArchiveErrors; + bool ThereAreMessageErrors; NExtract::NOverwriteMode::EEnum OverwriteMode; #ifndef _NO_CRYPTO @@ -138,13 +126,13 @@ public: PasswordIsDefined(false), PasswordWasAsked(false), #endif - OverwriteMode(NExtract::NOverwriteMode::kAskBefore), - ParentWindow(0), - ShowMessages(true) + OverwriteMode(NExtract::NOverwriteMode::kAskBefore) {} ~CExtractCallbackImp(); void Init(); + + bool IsOK() const { return NumArchiveErrors == 0 && !ThereAreMessageErrors; } }; #endif |