diff --git a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.cpp b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.cpp
index 148b92746..33d05cd1c 100644
--- a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.cpp
+++ b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.cpp
@@ -30,6 +30,9 @@ static LPCTSTR const kFullRow = TEXT("FullRow");
static LPCTSTR const kShowGrid = TEXT("ShowGrid");
static LPCTSTR const kSingleClick = TEXT("SingleClick");
static LPCTSTR const kAlternativeSelection = TEXT("AlternativeSelection");
+// **************** NanaZip Modification Start ****************
+static LPCTSTR const kOpenFolderAfterExtract = TEXT("OpenFolderAfterExtract");
+// **************** NanaZip Modification End ****************
// static LPCTSTR const kUnderline = TEXT("Underline");
static LPCTSTR const kShowSystemMenu = TEXT("ShowSystemMenu");
@@ -152,6 +155,9 @@ void CFmSettings::Save() const
SaveOption(kCopyHistory, CopyHistory);
SaveOption(kFolderHistory, FolderHistory);
SaveOption(kLowercaseHashes, LowercaseHashes);
+ // **************** NanaZip Modification Start ****************
+ SaveOption(kOpenFolderAfterExtract, OpenFolderAfterExtract);
+ // **************** NanaZip Modification End ****************
// SaveOption(kUnderline, Underline);
SaveOption(kShowSystemMenu, ShowSystemMenu);
@@ -170,6 +176,7 @@ void CFmSettings::Load()
CopyHistory = false;
FolderHistory = false;
LowercaseHashes = false;
+ OpenFolderAfterExtract = false;
// Underline = false;
ShowSystemMenu = false;
@@ -188,6 +195,9 @@ void CFmSettings::Load()
ReadOption(key, kCopyHistory, CopyHistory);
ReadOption(key, kFolderHistory, FolderHistory);
ReadOption(key, kLowercaseHashes, LowercaseHashes);
+ // **************** NanaZip Modification Start ****************
+ ReadOption(key, kOpenFolderAfterExtract, OpenFolderAfterExtract);
+ // **************** NanaZip Modification End ****************
// ReadOption(key, kUnderline, Underline);
ReadOption(key, kShowSystemMenu, ShowSystemMenu );
@@ -206,6 +216,9 @@ bool WantPathHistory() { return ReadFMOption(kPathHistory); }
bool WantCopyHistory() { return ReadFMOption(kCopyHistory); }
bool WantFolderHistory() { return ReadFMOption(kFolderHistory); }
bool WantLowercaseHashes() { return ReadFMOption(kLowercaseHashes); }
+// **************** NanaZip Modification Start ****************
+bool WantOpenFolderAfterExtract() { return ReadFMOption(kOpenFolderAfterExtract); }
+// **************** NanaZip Modification End ****************
static CSysString GetFlatViewName(UInt32 panelIndex)
{
diff --git a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.h b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.h
index 5d9ba1bbc..5be0acaf4 100644
--- a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.h
+++ b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.h
@@ -30,6 +30,9 @@ struct CFmSettings
bool CopyHistory;
bool FolderHistory;
bool LowercaseHashes;
+ // **************** NanaZip Modification Start ****************
+ bool OpenFolderAfterExtract;
+ // **************** NanaZip Modification End ****************
// bool Underline;
bool ShowSystemMenu;
@@ -49,6 +52,9 @@ bool WantPathHistory();
bool WantCopyHistory();
bool WantFolderHistory();
bool WantLowercaseHashes();
+// **************** NanaZip Modification Start ****************
+bool WantOpenFolderAfterExtract();
+// **************** NanaZip Modification End ****************
void SaveFlatView(UInt32 panelIndex, bool enable);
bool ReadFlatView(UInt32 panelIndex);
diff --git a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPage.cpp b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPage.cpp
index c7e9c9751..564912969 100644
--- a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPage.cpp
+++ b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPage.cpp
@@ -33,7 +33,10 @@ static const UInt32 kLangIDs[] =
IDX_SETTINGS_WANT_PATH_HISTORY,
IDX_SETTINGS_WANT_COPY_HISTORY,
IDX_SETTINGS_WANT_FOLDER_HISTORY,
- IDX_SETTINGS_LOWERCASE_HASHES
+ IDX_SETTINGS_LOWERCASE_HASHES,
+ // **************** NanaZip Modification Start ****************
+ IDX_SETTINGS_OPEN_FOLDER_AFTER
+ // **************** NanaZip Modification End ****************
// , IDT_COMPRESS_MEMORY
};
@@ -125,6 +128,9 @@ bool CSettingsPage::OnInit()
CheckButton(IDX_SETTINGS_SHOW_GRID, st.ShowGrid);
CheckButton(IDX_SETTINGS_SINGLE_CLICK, st.SingleClick);
CheckButton(IDX_SETTINGS_ALTERNATIVE_SELECTION, st.AlternativeSelection);
+ // **************** NanaZip Modification Start ****************
+ CheckButton(IDX_SETTINGS_OPEN_FOLDER_AFTER, st.OpenFolderAfterExtract);
+ // **************** NanaZip Modification End ****************
// CheckButton(IDX_SETTINGS_UNDERLINE, st.Underline);
CheckButton(IDX_SETTINGS_SHOW_SYSTEM_MENU, st.ShowSystemMenu);
@@ -224,6 +230,9 @@ LONG CSettingsPage::OnApply()
st.CopyHistory = IsButtonCheckedBool(IDX_SETTINGS_WANT_COPY_HISTORY);
st.FolderHistory = IsButtonCheckedBool(IDX_SETTINGS_WANT_FOLDER_HISTORY);
st.LowercaseHashes = IsButtonCheckedBool(IDX_SETTINGS_LOWERCASE_HASHES);
+ // **************** NanaZip Modification Start ****************
+ st.OpenFolderAfterExtract = IsButtonCheckedBool(IDX_SETTINGS_OPEN_FOLDER_AFTER);
+ // **************** NanaZip Modification End ****************
// st.Underline = IsButtonCheckedBool(IDX_SETTINGS_UNDERLINE);
st.ShowSystemMenu = IsButtonCheckedBool(IDX_SETTINGS_SHOW_SYSTEM_MENU);
@@ -341,6 +350,9 @@ bool CSettingsPage::OnButtonClicked(int buttonID, HWND buttonHWND)
case IDX_SETTINGS_FULL_ROW:
case IDX_SETTINGS_SHOW_GRID:
case IDX_SETTINGS_ALTERNATIVE_SELECTION:
+ // **************** NanaZip Modification Start ****************
+ case IDX_SETTINGS_OPEN_FOLDER_AFTER:
+ // **************** NanaZip Modification End ****************
case IDX_SETTINGS_WANT_ARC_HISTORY:
case IDX_SETTINGS_WANT_PATH_HISTORY:
case IDX_SETTINGS_WANT_COPY_HISTORY:
diff --git a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc
index c8f0e9d9d..0d58f8dd7 100644
--- a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc
+++ b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc
@@ -8,16 +8,30 @@ BEGIN
CONTROL "Show &grid lines", IDX_SETTINGS_SHOW_GRID, MY_CHECKBOX, m, 50, xc, 10
CONTROL "&Single-click to open an item", IDX_SETTINGS_SINGLE_CLICK, MY_CHECKBOX, m, 64, xc, 10
CONTROL "&Alternative selection mode", IDX_SETTINGS_ALTERNATIVE_SELECTION, MY_CHECKBOX, m, 78, xc, 10
+ // **************** NanaZip Modification Start ****************
+
+ // CONTROL "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 100, xc, 10
+ // CONTROL "Use &large memory pages", IDX_SETTINGS_LARGE_PAGES, MY_CHECKBOX, m, 122, xc, 10
- CONTROL "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 100, xc, 10
+ // CONTROL "Want ArcHistory", IDX_SETTINGS_WANT_ARC_HISTORY, MY_CHECKBOX, m, 140, xc, 10
+ // CONTROL "Want PathHistory", IDX_SETTINGS_WANT_PATH_HISTORY, MY_CHECKBOX, m, 154, xc, 10
+ // CONTROL "Want CopyHistory", IDX_SETTINGS_WANT_COPY_HISTORY, MY_CHECKBOX, m, 168, xc, 10
+ // CONTROL "Want FolderHistory", IDX_SETTINGS_WANT_FOLDER_HISTORY, MY_CHECKBOX, m, 182, xc, 10
+ // CONTROL "Use Lowercase Hashes", IDX_SETTINGS_LOWERCASE_HASHES, MY_CHECKBOX, m, 196, xc, 10
+
+
+ CONTROL "&Open folder after extract", IDX_SETTINGS_OPEN_FOLDER_AFTER, MY_CHECKBOX, m, 92, xc, 10
- CONTROL "Use &large memory pages", IDX_SETTINGS_LARGE_PAGES, MY_CHECKBOX, m, 122, xc, 10
+ CONTROL "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 114, xc, 10
- CONTROL "Want ArcHistory", IDX_SETTINGS_WANT_ARC_HISTORY, MY_CHECKBOX, m, 140, xc, 10
- CONTROL "Want PathHistory", IDX_SETTINGS_WANT_PATH_HISTORY, MY_CHECKBOX, m, 154, xc, 10
- CONTROL "Want CopyHistory", IDX_SETTINGS_WANT_COPY_HISTORY, MY_CHECKBOX, m, 168, xc, 10
- CONTROL "Want FolderHistory", IDX_SETTINGS_WANT_FOLDER_HISTORY, MY_CHECKBOX, m, 182, xc, 10
- CONTROL "Use Lowercase Hashes", IDX_SETTINGS_LOWERCASE_HASHES, MY_CHECKBOX, m, 196, xc, 10
+ CONTROL "Use &large memory pages", IDX_SETTINGS_LARGE_PAGES, MY_CHECKBOX, m, 136, xc, 10
+
+ CONTROL "Want ArcHistory", IDX_SETTINGS_WANT_ARC_HISTORY, MY_CHECKBOX, m, 154, xc, 10
+ CONTROL "Want PathHistory", IDX_SETTINGS_WANT_PATH_HISTORY, MY_CHECKBOX, m, 168, xc, 10
+ CONTROL "Want CopyHistory", IDX_SETTINGS_WANT_COPY_HISTORY, MY_CHECKBOX, m, 182, xc, 10
+ CONTROL "Want FolderHistory", IDX_SETTINGS_WANT_FOLDER_HISTORY, MY_CHECKBOX, m, 196, xc, 10
+ CONTROL "Use Lowercase Hashes", IDX_SETTINGS_LOWERCASE_HASHES, MY_CHECKBOX, m, 220, xc, 10
+ // **************** NanaZip Modification End ****************
// LTEXT "Memory usage for Compressing:", IDT_COMPRESS_MEMORY, m, 140, xc, 8
// COMBOBOX IDC_SETTINGS_MEM, m , 152, g1xs, yc - 152, MY_COMBO
diff --git a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPageRes.h b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPageRes.h
index a6c76e992..acb54d168 100644
--- a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPageRes.h
+++ b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPageRes.h
@@ -14,6 +14,9 @@
#define IDX_SETTINGS_WANT_COPY_HISTORY 2511
#define IDX_SETTINGS_WANT_FOLDER_HISTORY 2512
#define IDX_SETTINGS_LOWERCASE_HASHES 2513
+// **************** NanaZip Modification Start ****************
+#define IDX_SETTINGS_OPEN_FOLDER_AFTER 2514
+// **************** NanaZip Modification End ****************
// #define IDT_SETTINGS_MEM 100
diff --git a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/GUI/GUI.cpp b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/GUI/GUI.cpp
index fcb2909e6..1a8737c71 100644
--- a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/GUI/GUI.cpp
+++ b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/GUI/GUI.cpp
@@ -25,6 +25,7 @@
#include "../FileManager/StringUtils.h"
#include "../FileManager/MyWindowsNew.h"
+#include "../FileManager/RegistryUtils.h"
#include "BenchmarkDialog.h"
#include "ExtractGUI.h"
@@ -300,8 +301,14 @@ static int Main2()
return NExitCode::kFatalError;
throw CSystemException(result);
}
+ // **************** NanaZip Modification Start ****************
+ else if (WantOpenFolderAfterExtract()) {
+ ShellExecuteW(NULL, NULL, eo.OutputDir, NULL, NULL, SW_SHOWNORMAL);
+ }
+ // **************** NanaZip Modification End ****************
if (!ecs->IsOK())
return NExitCode::kFatalError;
+
}
else if (options.Command.IsFromUpdateGroup())
{
diff --git a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.cpp b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.cpp
index 148b92746..33d05cd1c 100644
--- a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.cpp
+++ b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.cpp
@@ -30,6 +30,9 @@ static LPCTSTR const kFullRow = TEXT("FullRow");
static LPCTSTR const kShowGrid = TEXT("ShowGrid");
static LPCTSTR const kSingleClick = TEXT("SingleClick");
static LPCTSTR const kAlternativeSelection = TEXT("AlternativeSelection");
+// **************** NanaZip Modification Start ****************
+static LPCTSTR const kOpenFolderAfterExtract = TEXT("OpenFolderAfterExtract");
+// **************** NanaZip Modification End ****************
// static LPCTSTR const kUnderline = TEXT("Underline");
static LPCTSTR const kShowSystemMenu = TEXT("ShowSystemMenu");
@@ -152,6 +155,9 @@ void CFmSettings::Save() const
SaveOption(kCopyHistory, CopyHistory);
SaveOption(kFolderHistory, FolderHistory);
SaveOption(kLowercaseHashes, LowercaseHashes);
+ // **************** NanaZip Modification Start ****************
+ SaveOption(kOpenFolderAfterExtract, OpenFolderAfterExtract);
+ // **************** NanaZip Modification End ****************
// SaveOption(kUnderline, Underline);
SaveOption(kShowSystemMenu, ShowSystemMenu);
@@ -170,6 +176,7 @@ void CFmSettings::Load()
CopyHistory = false;
FolderHistory = false;
LowercaseHashes = false;
+ OpenFolderAfterExtract = false;
// Underline = false;
ShowSystemMenu = false;
@@ -188,6 +195,9 @@ void CFmSettings::Load()
ReadOption(key, kCopyHistory, CopyHistory);
ReadOption(key, kFolderHistory, FolderHistory);
ReadOption(key, kLowercaseHashes, LowercaseHashes);
+ // **************** NanaZip Modification Start ****************
+ ReadOption(key, kOpenFolderAfterExtract, OpenFolderAfterExtract);
+ // **************** NanaZip Modification End ****************
// ReadOption(key, kUnderline, Underline);
ReadOption(key, kShowSystemMenu, ShowSystemMenu );
@@ -206,6 +216,9 @@ bool WantPathHistory() { return ReadFMOption(kPathHistory); }
bool WantCopyHistory() { return ReadFMOption(kCopyHistory); }
bool WantFolderHistory() { return ReadFMOption(kFolderHistory); }
bool WantLowercaseHashes() { return ReadFMOption(kLowercaseHashes); }
+// **************** NanaZip Modification Start ****************
+bool WantOpenFolderAfterExtract() { return ReadFMOption(kOpenFolderAfterExtract); }
+// **************** NanaZip Modification End ****************
static CSysString GetFlatViewName(UInt32 panelIndex)
{
diff --git a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.h b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.h
index 5d9ba1bbc..5be0acaf4 100644
--- a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.h
+++ b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.h
@@ -30,6 +30,9 @@ struct CFmSettings
bool CopyHistory;
bool FolderHistory;
bool LowercaseHashes;
+ // **************** NanaZip Modification Start ****************
+ bool OpenFolderAfterExtract;
+ // **************** NanaZip Modification End ****************
// bool Underline;
bool ShowSystemMenu;
@@ -49,6 +52,9 @@ bool WantPathHistory();
bool WantCopyHistory();
bool WantFolderHistory();
bool WantLowercaseHashes();
+// **************** NanaZip Modification Start ****************
+bool WantOpenFolderAfterExtract();
+// **************** NanaZip Modification End ****************
void SaveFlatView(UInt32 panelIndex, bool enable);
bool ReadFlatView(UInt32 panelIndex);
diff --git a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage.cpp b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage.cpp
index c7e9c9751..564912969 100644
--- a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage.cpp
+++ b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage.cpp
@@ -33,7 +33,10 @@ static const UInt32 kLangIDs[] =
IDX_SETTINGS_WANT_PATH_HISTORY,
IDX_SETTINGS_WANT_COPY_HISTORY,
IDX_SETTINGS_WANT_FOLDER_HISTORY,
- IDX_SETTINGS_LOWERCASE_HASHES
+ IDX_SETTINGS_LOWERCASE_HASHES,
+ // **************** NanaZip Modification Start ****************
+ IDX_SETTINGS_OPEN_FOLDER_AFTER
+ // **************** NanaZip Modification End ****************
// , IDT_COMPRESS_MEMORY
};
@@ -125,6 +128,9 @@ bool CSettingsPage::OnInit()
CheckButton(IDX_SETTINGS_SHOW_GRID, st.ShowGrid);
CheckButton(IDX_SETTINGS_SINGLE_CLICK, st.SingleClick);
CheckButton(IDX_SETTINGS_ALTERNATIVE_SELECTION, st.AlternativeSelection);
+ // **************** NanaZip Modification Start ****************
+ CheckButton(IDX_SETTINGS_OPEN_FOLDER_AFTER, st.OpenFolderAfterExtract);
+ // **************** NanaZip Modification End ****************
// CheckButton(IDX_SETTINGS_UNDERLINE, st.Underline);
CheckButton(IDX_SETTINGS_SHOW_SYSTEM_MENU, st.ShowSystemMenu);
@@ -224,6 +230,9 @@ LONG CSettingsPage::OnApply()
st.CopyHistory = IsButtonCheckedBool(IDX_SETTINGS_WANT_COPY_HISTORY);
st.FolderHistory = IsButtonCheckedBool(IDX_SETTINGS_WANT_FOLDER_HISTORY);
st.LowercaseHashes = IsButtonCheckedBool(IDX_SETTINGS_LOWERCASE_HASHES);
+ // **************** NanaZip Modification Start ****************
+ st.OpenFolderAfterExtract = IsButtonCheckedBool(IDX_SETTINGS_OPEN_FOLDER_AFTER);
+ // **************** NanaZip Modification End ****************
// st.Underline = IsButtonCheckedBool(IDX_SETTINGS_UNDERLINE);
st.ShowSystemMenu = IsButtonCheckedBool(IDX_SETTINGS_SHOW_SYSTEM_MENU);
@@ -341,6 +350,9 @@ bool CSettingsPage::OnButtonClicked(int buttonID, HWND buttonHWND)
case IDX_SETTINGS_FULL_ROW:
case IDX_SETTINGS_SHOW_GRID:
case IDX_SETTINGS_ALTERNATIVE_SELECTION:
+ // **************** NanaZip Modification Start ****************
+ case IDX_SETTINGS_OPEN_FOLDER_AFTER:
+ // **************** NanaZip Modification End ****************
case IDX_SETTINGS_WANT_ARC_HISTORY:
case IDX_SETTINGS_WANT_PATH_HISTORY:
case IDX_SETTINGS_WANT_COPY_HISTORY:
diff --git a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc
index c8f0e9d9d..0d58f8dd7 100644
--- a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc
+++ b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc
@@ -8,16 +8,30 @@ BEGIN
CONTROL "Show &grid lines", IDX_SETTINGS_SHOW_GRID, MY_CHECKBOX, m, 50, xc, 10
CONTROL "&Single-click to open an item", IDX_SETTINGS_SINGLE_CLICK, MY_CHECKBOX, m, 64, xc, 10
CONTROL "&Alternative selection mode", IDX_SETTINGS_ALTERNATIVE_SELECTION, MY_CHECKBOX, m, 78, xc, 10
+ // **************** NanaZip Modification Start ****************
+
+ // CONTROL "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 100, xc, 10
+ // CONTROL "Use &large memory pages", IDX_SETTINGS_LARGE_PAGES, MY_CHECKBOX, m, 122, xc, 10
- CONTROL "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 100, xc, 10
+ // CONTROL "Want ArcHistory", IDX_SETTINGS_WANT_ARC_HISTORY, MY_CHECKBOX, m, 140, xc, 10
+ // CONTROL "Want PathHistory", IDX_SETTINGS_WANT_PATH_HISTORY, MY_CHECKBOX, m, 154, xc, 10
+ // CONTROL "Want CopyHistory", IDX_SETTINGS_WANT_COPY_HISTORY, MY_CHECKBOX, m, 168, xc, 10
+ // CONTROL "Want FolderHistory", IDX_SETTINGS_WANT_FOLDER_HISTORY, MY_CHECKBOX, m, 182, xc, 10
+ // CONTROL "Use Lowercase Hashes", IDX_SETTINGS_LOWERCASE_HASHES, MY_CHECKBOX, m, 196, xc, 10
+
+
+ CONTROL "&Open folder after extract", IDX_SETTINGS_OPEN_FOLDER_AFTER, MY_CHECKBOX, m, 92, xc, 10
- CONTROL "Use &large memory pages", IDX_SETTINGS_LARGE_PAGES, MY_CHECKBOX, m, 122, xc, 10
+ CONTROL "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 114, xc, 10
- CONTROL "Want ArcHistory", IDX_SETTINGS_WANT_ARC_HISTORY, MY_CHECKBOX, m, 140, xc, 10
- CONTROL "Want PathHistory", IDX_SETTINGS_WANT_PATH_HISTORY, MY_CHECKBOX, m, 154, xc, 10
- CONTROL "Want CopyHistory", IDX_SETTINGS_WANT_COPY_HISTORY, MY_CHECKBOX, m, 168, xc, 10
- CONTROL "Want FolderHistory", IDX_SETTINGS_WANT_FOLDER_HISTORY, MY_CHECKBOX, m, 182, xc, 10
- CONTROL "Use Lowercase Hashes", IDX_SETTINGS_LOWERCASE_HASHES, MY_CHECKBOX, m, 196, xc, 10
+ CONTROL "Use &large memory pages", IDX_SETTINGS_LARGE_PAGES, MY_CHECKBOX, m, 136, xc, 10
+
+ CONTROL "Want ArcHistory", IDX_SETTINGS_WANT_ARC_HISTORY, MY_CHECKBOX, m, 154, xc, 10
+ CONTROL "Want PathHistory", IDX_SETTINGS_WANT_PATH_HISTORY, MY_CHECKBOX, m, 168, xc, 10
+ CONTROL "Want CopyHistory", IDX_SETTINGS_WANT_COPY_HISTORY, MY_CHECKBOX, m, 182, xc, 10
+ CONTROL "Want FolderHistory", IDX_SETTINGS_WANT_FOLDER_HISTORY, MY_CHECKBOX, m, 196, xc, 10
+ CONTROL "Use Lowercase Hashes", IDX_SETTINGS_LOWERCASE_HASHES, MY_CHECKBOX, m, 220, xc, 10
+ // **************** NanaZip Modification End ****************
// LTEXT "Memory usage for Compressing:", IDT_COMPRESS_MEMORY, m, 140, xc, 8
// COMBOBOX IDC_SETTINGS_MEM, m , 152, g1xs, yc - 152, MY_COMBO
diff --git a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPageRes.h b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPageRes.h
index a6c76e992..acb54d168 100644
--- a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPageRes.h
+++ b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPageRes.h
@@ -14,6 +14,9 @@
#define IDX_SETTINGS_WANT_COPY_HISTORY 2511
#define IDX_SETTINGS_WANT_FOLDER_HISTORY 2512
#define IDX_SETTINGS_LOWERCASE_HASHES 2513
+// **************** NanaZip Modification Start ****************
+#define IDX_SETTINGS_OPEN_FOLDER_AFTER 2514
+// **************** NanaZip Modification End ****************
// #define IDT_SETTINGS_MEM 100
diff --git a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/GUI/GUI.cpp b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/GUI/GUI.cpp
index fcb2909e6..bf4a40af8 100644
--- a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/GUI/GUI.cpp
+++ b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/GUI/GUI.cpp
@@ -25,6 +25,7 @@
#include "../FileManager/StringUtils.h"
#include "../FileManager/MyWindowsNew.h"
+#include "../FileManager/RegistryUtils.h"
#include "BenchmarkDialog.h"
#include "ExtractGUI.h"
@@ -300,6 +301,13 @@ static int Main2()
return NExitCode::kFatalError;
throw CSystemException(result);
}
+ // **************** NanaZip Modification Start ****************
+
+ else if (WantOpenFolderAfterExtract()) {
+ ShellExecuteW(NULL, NULL, eo.OutputDir, NULL, NULL, SW_SHOWNORMAL);
+ }
+ // **************** NanaZip Modification End ****************
+
if (!ecs->IsOK())
return NExitCode::kFatalError;
}
diff --git a/NanaZipPackage/Strings/en/Legacy.resw b/NanaZipPackage/Strings/en/Legacy.resw
index ad230ab1e..33c09e6cc 100644
--- a/NanaZipPackage/Strings/en/Legacy.resw
+++ b/NanaZipPackage/Strings/en/Legacy.resw
@@ -653,6 +653,9 @@
Use Lowercase Hashes
+
+
+ Open folder after extracting
About NanaZip
@@ -1350,4 +1353,5 @@ Are you sure you want to split archive into such volumes?
Open Windows Settings app to associate files with NanaZip
+
\ No newline at end of file
diff --git a/NanaZipPackage/Strings/nl/Legacy.resw b/NanaZipPackage/Strings/nl/Legacy.resw
index 49217cd62..9c35f41bd 100644
--- a/NanaZipPackage/Strings/nl/Legacy.resw
+++ b/NanaZipPackage/Strings/nl/Legacy.resw
@@ -639,6 +639,9 @@
&Gebruik grote geheugenpagina's
+
+ Map openen na uitpakken
+
Over NanaZip