Jame's Easy7Zip changes, translocated from 16 to 18.05

This commit is contained in:
glachancecmaisonneuve
2018-09-05 01:02:45 -04:00
parent b82b3e5533
commit 42fa923138
24 changed files with 822 additions and 67 deletions

View File

@@ -7,6 +7,7 @@
#include "../../../Windows/Control/ComboBox.h"
#include "../../../Windows/Control/Edit.h"
#include "../../../Windows/Control/Static.h"
#include "../Common/ExtractMode.h"
@@ -31,6 +32,7 @@ namespace NExtractionDialog
*/
}
void StartApplication(const UString &dir, const UString &path);
class CExtractDialog: public NWindows::NControl::CModalDialog
{
#ifdef NO_REGISTRY
@@ -45,7 +47,7 @@ class CExtractDialog: public NWindows::NControl::CModalDialog
NWindows::NControl::CComboBox _pathMode;
NWindows::NControl::CComboBox _overwriteMode;
#endif
NWindows::NControl::CStatic _freeSpace;
#ifndef _SFX
// int GetFilesMode() const;
void UpdatePasswordControl();
@@ -58,6 +60,8 @@ class CExtractDialog: public NWindows::NControl::CModalDialog
virtual bool OnInit();
virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
virtual void OnOK();
void OnButtonOpenPath();
virtual bool OnCommand(int code, int itemID, LPARAM lParam);
#ifndef NO_REGISTRY
@@ -67,6 +71,7 @@ class CExtractDialog: public NWindows::NControl::CModalDialog
#endif
void ShowPathFreeSpace(UString & strPath);
bool IsShowPasswordChecked() const { return IsButtonCheckedBool(IDX_PASSWORD_SHOW); }
public:
// bool _enableSelectedFilesButton;
@@ -84,6 +89,9 @@ public:
NExtract::NPathMode::EEnum PathMode;
NExtract::NOverwriteMode::EEnum OverwriteMode;
bool m_bOpenOutputFolder;
bool m_bDeleteSourceFile;
#ifndef _SFX
// CBoolPair AltStreams;
CBoolPair NtSecurity;
@@ -103,7 +111,8 @@ public:
CExtractDialog():
PathMode_Force(false),
OverwriteMode_Force(false)
OverwriteMode_Force(false),
m_bOpenOutputFolder(false), m_bDeleteSourceFile(false)
{
ElimDup.Val = true;
}