From 2bd0075ff196819c15ddb3b2513181c9318749c5 Mon Sep 17 00:00:00 2001 From: Dax Dupont <17237624+DaxDupont@users.noreply.github.com> Date: Sun, 5 Jan 2025 04:02:27 +0100 Subject: [PATCH 1/8] Initial commit with english + modern only for now --- .../CPP/7zip/UI/FileManager/RegistryUtils.cpp | 5 +++++ .../CPP/7zip/UI/FileManager/RegistryUtils.h | 2 ++ .../CPP/7zip/UI/FileManager/SettingsPage.cpp | 6 +++++- .../CPP/7zip/UI/FileManager/SettingsPage2.rc | 15 ++++++++------- .../CPP/7zip/UI/FileManager/SettingsPageRes.h | 1 + .../SevenZip/CPP/7zip/UI/GUI/GUI.cpp | 4 ++++ NanaZipPackage/Strings/en/Legacy.resw | 4 ++++ 7 files changed, 29 insertions(+), 8 deletions(-) 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..bf218d3bc 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,7 @@ static LPCTSTR const kFullRow = TEXT("FullRow"); static LPCTSTR const kShowGrid = TEXT("ShowGrid"); static LPCTSTR const kSingleClick = TEXT("SingleClick"); static LPCTSTR const kAlternativeSelection = TEXT("AlternativeSelection"); +static LPCTSTR const kOpenFolderAfterExtract = TEXT("OpenFolderAfterExtract"); // static LPCTSTR const kUnderline = TEXT("Underline"); static LPCTSTR const kShowSystemMenu = TEXT("ShowSystemMenu"); @@ -152,6 +153,7 @@ void CFmSettings::Save() const SaveOption(kCopyHistory, CopyHistory); SaveOption(kFolderHistory, FolderHistory); SaveOption(kLowercaseHashes, LowercaseHashes); + SaveOption(kOpenFolderAfterExtract, OpenFolderAfterExtract); // SaveOption(kUnderline, Underline); SaveOption(kShowSystemMenu, ShowSystemMenu); @@ -170,6 +172,7 @@ void CFmSettings::Load() CopyHistory = false; FolderHistory = false; LowercaseHashes = false; + OpenFolderAfterExtract = false; // Underline = false; ShowSystemMenu = false; @@ -188,6 +191,7 @@ void CFmSettings::Load() ReadOption(key, kCopyHistory, CopyHistory); ReadOption(key, kFolderHistory, FolderHistory); ReadOption(key, kLowercaseHashes, LowercaseHashes); + ReadOption(key, kOpenFolderAfterExtract, OpenFolderAfterExtract); // ReadOption(key, kUnderline, Underline); ReadOption(key, kShowSystemMenu, ShowSystemMenu ); @@ -206,6 +210,7 @@ bool WantPathHistory() { return ReadFMOption(kPathHistory); } bool WantCopyHistory() { return ReadFMOption(kCopyHistory); } bool WantFolderHistory() { return ReadFMOption(kFolderHistory); } bool WantLowercaseHashes() { return ReadFMOption(kLowercaseHashes); } +bool WantOpenFolderAfterExtract() { return ReadFMOption(kOpenFolderAfterExtract); } 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..3515821f6 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,7 @@ struct CFmSettings bool CopyHistory; bool FolderHistory; bool LowercaseHashes; + bool OpenFolderAfterExtract; // bool Underline; bool ShowSystemMenu; @@ -49,6 +50,7 @@ bool WantPathHistory(); bool WantCopyHistory(); bool WantFolderHistory(); bool WantLowercaseHashes(); +bool WantOpenFolderAfterExtract(); 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..af295ebce 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,8 @@ 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, + IDX_SETTINGS_OPEN_FOLDER_AFTER // , IDT_COMPRESS_MEMORY }; @@ -125,6 +126,7 @@ bool CSettingsPage::OnInit() CheckButton(IDX_SETTINGS_SHOW_GRID, st.ShowGrid); CheckButton(IDX_SETTINGS_SINGLE_CLICK, st.SingleClick); CheckButton(IDX_SETTINGS_ALTERNATIVE_SELECTION, st.AlternativeSelection); + CheckButton(IDX_SETTINGS_OPEN_FOLDER_AFTER, st.OpenFolderAfterExtract); // CheckButton(IDX_SETTINGS_UNDERLINE, st.Underline); CheckButton(IDX_SETTINGS_SHOW_SYSTEM_MENU, st.ShowSystemMenu); @@ -224,6 +226,7 @@ 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); + st.OpenFolderAfterExtract = IsButtonCheckedBool(IDX_SETTINGS_OPEN_FOLDER_AFTER); // st.Underline = IsButtonCheckedBool(IDX_SETTINGS_UNDERLINE); st.ShowSystemMenu = IsButtonCheckedBool(IDX_SETTINGS_SHOW_SYSTEM_MENU); @@ -341,6 +344,7 @@ bool CSettingsPage::OnButtonClicked(int buttonID, HWND buttonHWND) case IDX_SETTINGS_FULL_ROW: case IDX_SETTINGS_SHOW_GRID: case IDX_SETTINGS_ALTERNATIVE_SELECTION: + case IDX_SETTINGS_OPEN_FOLDER_AFTER: 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..5b111e6de 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,17 @@ 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 + CONTROL "&Open folder after extract", IDX_SETTINGS_OPEN_FOLDER_AFTER, MY_CHECKBOX, m, 92, xc, 10 - CONTROL "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 100, xc, 10 + CONTROL "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 114, xc, 10 - CONTROL "Use &large memory pages", IDX_SETTINGS_LARGE_PAGES, MY_CHECKBOX, m, 122, 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, 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 "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 // 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..bfcfdd3b0 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,7 @@ #define IDX_SETTINGS_WANT_COPY_HISTORY 2511 #define IDX_SETTINGS_WANT_FOLDER_HISTORY 2512 #define IDX_SETTINGS_LOWERCASE_HASHES 2513 +#define IDX_SETTINGS_OPEN_FOLDER_AFTER 2514 // #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..c21111f48 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,9 @@ static int Main2() return NExitCode::kFatalError; throw CSystemException(result); } + else if (WantOpenFolderAfterExtract()) { + ShellExecuteW(NULL, NULL, eo.OutputDir, NULL, NULL, SW_SHOWNORMAL); + } 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 From 6cfe8476ebe3ed800791f92bfe6115e6de715209 Mon Sep 17 00:00:00 2001 From: Dax Dupont <17237624+DaxDupont@users.noreply.github.com> Date: Sun, 5 Jan 2025 23:08:25 +0100 Subject: [PATCH 2/8] Open folder support for nanazip classic --- .../CPP/7zip/UI/FileManager/RegistryUtils.cpp | 5 +++++ .../CPP/7zip/UI/FileManager/RegistryUtils.h | 2 ++ .../CPP/7zip/UI/FileManager/SettingsPage.cpp | 6 +++++- .../CPP/7zip/UI/FileManager/SettingsPage2.rc | 15 ++++++++------- .../CPP/7zip/UI/FileManager/SettingsPageRes.h | 1 + .../SevenZip/CPP/7zip/UI/GUI/GUI.cpp | 5 +++++ 6 files changed, 26 insertions(+), 8 deletions(-) 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..bf218d3bc 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,7 @@ static LPCTSTR const kFullRow = TEXT("FullRow"); static LPCTSTR const kShowGrid = TEXT("ShowGrid"); static LPCTSTR const kSingleClick = TEXT("SingleClick"); static LPCTSTR const kAlternativeSelection = TEXT("AlternativeSelection"); +static LPCTSTR const kOpenFolderAfterExtract = TEXT("OpenFolderAfterExtract"); // static LPCTSTR const kUnderline = TEXT("Underline"); static LPCTSTR const kShowSystemMenu = TEXT("ShowSystemMenu"); @@ -152,6 +153,7 @@ void CFmSettings::Save() const SaveOption(kCopyHistory, CopyHistory); SaveOption(kFolderHistory, FolderHistory); SaveOption(kLowercaseHashes, LowercaseHashes); + SaveOption(kOpenFolderAfterExtract, OpenFolderAfterExtract); // SaveOption(kUnderline, Underline); SaveOption(kShowSystemMenu, ShowSystemMenu); @@ -170,6 +172,7 @@ void CFmSettings::Load() CopyHistory = false; FolderHistory = false; LowercaseHashes = false; + OpenFolderAfterExtract = false; // Underline = false; ShowSystemMenu = false; @@ -188,6 +191,7 @@ void CFmSettings::Load() ReadOption(key, kCopyHistory, CopyHistory); ReadOption(key, kFolderHistory, FolderHistory); ReadOption(key, kLowercaseHashes, LowercaseHashes); + ReadOption(key, kOpenFolderAfterExtract, OpenFolderAfterExtract); // ReadOption(key, kUnderline, Underline); ReadOption(key, kShowSystemMenu, ShowSystemMenu ); @@ -206,6 +210,7 @@ bool WantPathHistory() { return ReadFMOption(kPathHistory); } bool WantCopyHistory() { return ReadFMOption(kCopyHistory); } bool WantFolderHistory() { return ReadFMOption(kFolderHistory); } bool WantLowercaseHashes() { return ReadFMOption(kLowercaseHashes); } +bool WantOpenFolderAfterExtract() { return ReadFMOption(kOpenFolderAfterExtract); } 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..3515821f6 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,7 @@ struct CFmSettings bool CopyHistory; bool FolderHistory; bool LowercaseHashes; + bool OpenFolderAfterExtract; // bool Underline; bool ShowSystemMenu; @@ -49,6 +50,7 @@ bool WantPathHistory(); bool WantCopyHistory(); bool WantFolderHistory(); bool WantLowercaseHashes(); +bool WantOpenFolderAfterExtract(); 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..af295ebce 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,8 @@ 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, + IDX_SETTINGS_OPEN_FOLDER_AFTER // , IDT_COMPRESS_MEMORY }; @@ -125,6 +126,7 @@ bool CSettingsPage::OnInit() CheckButton(IDX_SETTINGS_SHOW_GRID, st.ShowGrid); CheckButton(IDX_SETTINGS_SINGLE_CLICK, st.SingleClick); CheckButton(IDX_SETTINGS_ALTERNATIVE_SELECTION, st.AlternativeSelection); + CheckButton(IDX_SETTINGS_OPEN_FOLDER_AFTER, st.OpenFolderAfterExtract); // CheckButton(IDX_SETTINGS_UNDERLINE, st.Underline); CheckButton(IDX_SETTINGS_SHOW_SYSTEM_MENU, st.ShowSystemMenu); @@ -224,6 +226,7 @@ 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); + st.OpenFolderAfterExtract = IsButtonCheckedBool(IDX_SETTINGS_OPEN_FOLDER_AFTER); // st.Underline = IsButtonCheckedBool(IDX_SETTINGS_UNDERLINE); st.ShowSystemMenu = IsButtonCheckedBool(IDX_SETTINGS_SHOW_SYSTEM_MENU); @@ -341,6 +344,7 @@ bool CSettingsPage::OnButtonClicked(int buttonID, HWND buttonHWND) case IDX_SETTINGS_FULL_ROW: case IDX_SETTINGS_SHOW_GRID: case IDX_SETTINGS_ALTERNATIVE_SELECTION: + case IDX_SETTINGS_OPEN_FOLDER_AFTER: 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..5b111e6de 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,17 @@ 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 + CONTROL "&Open folder after extract", IDX_SETTINGS_OPEN_FOLDER_AFTER, MY_CHECKBOX, m, 92, xc, 10 - CONTROL "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 100, xc, 10 + CONTROL "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 114, xc, 10 - CONTROL "Use &large memory pages", IDX_SETTINGS_LARGE_PAGES, MY_CHECKBOX, m, 122, 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, 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 "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 // 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..deeabc9b2 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,7 @@ #define IDX_SETTINGS_WANT_COPY_HISTORY 2511 #define IDX_SETTINGS_WANT_FOLDER_HISTORY 2512 #define IDX_SETTINGS_LOWERCASE_HASHES 2513 +#define IDX_SETTINGS_OPEN_FOLDER_AFTER 2514 // #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..468329588 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,12 @@ static int Main2() return NExitCode::kFatalError; throw CSystemException(result); } + else if (WantOpenFolderAfterExtract()) { + ShellExecuteW(NULL, NULL, eo.OutputDir, NULL, NULL, SW_SHOWNORMAL); + } if (!ecs->IsOK()) return NExitCode::kFatalError; + } else if (options.Command.IsFromUpdateGroup()) { From bd741e5d3dd1b188532656fda9e80298cc583f7a Mon Sep 17 00:00:00 2001 From: Dax Dupont <17237624+DaxDupont@users.noreply.github.com> Date: Tue, 7 Jan 2025 21:36:24 +0100 Subject: [PATCH 3/8] Add dutch translation --- NanaZipPackage/Strings/nl/Legacy.resw | 3 +++ 1 file changed, 3 insertions(+) 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 From a279fd72bc9273ada569351f150962c6beab97a9 Mon Sep 17 00:00:00 2001 From: Dax Dupont <17237624+DaxDupont@users.noreply.github.com> Date: Wed, 8 Jan 2025 03:52:32 +0100 Subject: [PATCH 4/8] add modification markers --- .../SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.cpp | 8 ++++++++ .../SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.h | 4 ++++ .../SevenZip/CPP/7zip/UI/FileManager/SettingsPage.cpp | 8 ++++++++ NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/GUI/GUI.cpp | 2 ++ .../SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.cpp | 8 ++++++++ .../SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.h | 4 ++++ .../SevenZip/CPP/7zip/UI/FileManager/SettingsPage.cpp | 8 ++++++++ NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/GUI/GUI.cpp | 4 ++++ 8 files changed, 46 insertions(+) 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 bf218d3bc..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,7 +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"); @@ -153,7 +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); @@ -191,7 +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 ); @@ -210,7 +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 3515821f6..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,7 +30,9 @@ struct CFmSettings bool CopyHistory; bool FolderHistory; bool LowercaseHashes; + // **************** NanaZip Modification Start **************** bool OpenFolderAfterExtract; + // **************** NanaZip Modification End **************** // bool Underline; bool ShowSystemMenu; @@ -50,7 +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 af295ebce..c9e6e5534 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,9 @@ static const UInt32 kLangIDs[] = IDX_SETTINGS_WANT_PATH_HISTORY, IDX_SETTINGS_WANT_COPY_HISTORY, IDX_SETTINGS_WANT_FOLDER_HISTORY, + // **************** NanaZip Modification Start **************** IDX_SETTINGS_LOWERCASE_HASHES, + // **************** NanaZip Modification End **************** IDX_SETTINGS_OPEN_FOLDER_AFTER // , IDT_COMPRESS_MEMORY }; @@ -126,7 +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); @@ -226,7 +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); @@ -344,7 +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/GUI/GUI.cpp b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/GUI/GUI.cpp index 468329588..1a8737c71 100644 --- a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/GUI/GUI.cpp +++ b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/GUI/GUI.cpp @@ -301,9 +301,11 @@ 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/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.cpp b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.cpp index bf218d3bc..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,7 +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"); @@ -153,7 +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); @@ -191,7 +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 ); @@ -210,7 +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 3515821f6..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,7 +30,9 @@ struct CFmSettings bool CopyHistory; bool FolderHistory; bool LowercaseHashes; + // **************** NanaZip Modification Start **************** bool OpenFolderAfterExtract; + // **************** NanaZip Modification End **************** // bool Underline; bool ShowSystemMenu; @@ -50,7 +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 af295ebce..564912969 100644 --- a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage.cpp +++ b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage.cpp @@ -34,7 +34,9 @@ static const UInt32 kLangIDs[] = IDX_SETTINGS_WANT_COPY_HISTORY, IDX_SETTINGS_WANT_FOLDER_HISTORY, IDX_SETTINGS_LOWERCASE_HASHES, + // **************** NanaZip Modification Start **************** IDX_SETTINGS_OPEN_FOLDER_AFTER + // **************** NanaZip Modification End **************** // , IDT_COMPRESS_MEMORY }; @@ -126,7 +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); @@ -226,7 +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); @@ -344,7 +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/GUI/GUI.cpp b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/GUI/GUI.cpp index c21111f48..bf4a40af8 100644 --- a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/GUI/GUI.cpp +++ b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/GUI/GUI.cpp @@ -301,9 +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; } From 1123c3710f19bfe2735b4bca01feeecf6f3a7f7f Mon Sep 17 00:00:00 2001 From: Dax Dupont <17237624+DaxDupont@users.noreply.github.com> Date: Wed, 8 Jan 2025 04:31:54 +0100 Subject: [PATCH 5/8] More modification markers --- .../CPP/7zip/UI/FileManager/SettingsPage2.rc | 14 ++++++++++++++ .../CPP/7zip/UI/FileManager/SettingsPageRes.h | 2 ++ .../CPP/7zip/UI/FileManager/SettingsPage2.rc | 14 ++++++++++++++ .../CPP/7zip/UI/FileManager/SettingsPageRes.h | 4 +++- 4 files changed, 33 insertions(+), 1 deletion(-) 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 5b111e6de..f9a1a709b 100644 --- a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc +++ b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc @@ -8,6 +8,19 @@ 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 "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 "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 114, xc, 10 @@ -19,6 +32,7 @@ BEGIN 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 deeabc9b2..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,7 +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/FileManager/SettingsPage2.rc b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc index 5b111e6de..f9a1a709b 100644 --- a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc +++ b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc @@ -8,6 +8,19 @@ 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 "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 "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 114, xc, 10 @@ -19,6 +32,7 @@ BEGIN 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 bfcfdd3b0..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,7 +14,9 @@ #define IDX_SETTINGS_WANT_COPY_HISTORY 2511 #define IDX_SETTINGS_WANT_FOLDER_HISTORY 2512 #define IDX_SETTINGS_LOWERCASE_HASHES 2513 -#define IDX_SETTINGS_OPEN_FOLDER_AFTER 2514 +// **************** NanaZip Modification Start **************** +#define IDX_SETTINGS_OPEN_FOLDER_AFTER 2514 +// **************** NanaZip Modification End **************** // #define IDT_SETTINGS_MEM 100 From e9dc70eea6c436d4988876c8af88e94e0c63663f Mon Sep 17 00:00:00 2001 From: Dax Dupont <17237624+DaxDupont@users.noreply.github.com> Date: Wed, 8 Jan 2025 04:38:22 +0100 Subject: [PATCH 6/8] Misplaced a mark --- .../SevenZip/CPP/7zip/UI/FileManager/SettingsPage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c9e6e5534..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,10 +33,10 @@ static const UInt32 kLangIDs[] = IDX_SETTINGS_WANT_PATH_HISTORY, IDX_SETTINGS_WANT_COPY_HISTORY, IDX_SETTINGS_WANT_FOLDER_HISTORY, - // **************** NanaZip Modification Start **************** IDX_SETTINGS_LOWERCASE_HASHES, - // **************** NanaZip Modification End **************** + // **************** NanaZip Modification Start **************** IDX_SETTINGS_OPEN_FOLDER_AFTER + // **************** NanaZip Modification End **************** // , IDT_COMPRESS_MEMORY }; From 8bdae071a925f50d63bc1af1c0981b746b64291f Mon Sep 17 00:00:00 2001 From: Dax Dupont <17237624+DaxDupont@users.noreply.github.com> Date: Sat, 11 Jan 2025 21:45:00 +0100 Subject: [PATCH 7/8] Replace // --- .../CPP/7zip/Bundles/SFXCon/resource.aps | Bin 0 -> 72228 bytes .../CPP/7zip/UI/FileManager/SettingsPage2.rc | 19 +++++++++--------- .../CPP/7zip/UI/FileManager/SettingsPage2.rc | 19 +++++++++--------- 3 files changed, 18 insertions(+), 20 deletions(-) create mode 100644 NanaZip.Core/SevenZip/CPP/7zip/Bundles/SFXCon/resource.aps diff --git a/NanaZip.Core/SevenZip/CPP/7zip/Bundles/SFXCon/resource.aps b/NanaZip.Core/SevenZip/CPP/7zip/Bundles/SFXCon/resource.aps new file mode 100644 index 0000000000000000000000000000000000000000..ddb0a93c01c0a1a8a3d95e9ca0f28e48fd72f2a4 GIT binary patch literal 72228 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
    aE4&`U$V)&ny4}Jg8CkL;GGN4?j&*)&_ z_DMdFS>D|HGaKN4NUp5&ujm`-PaR+43rU$H@7wcm!qmy>|!Jqn?fE zx`@t8ib?^!SITzqH6r>iF6HQDN~t{HeRUjvS-uD=9^TKO5&!;QiW%1%?aBh1GvRa| z?a;I>nyJsQ??v=N4WOICbgGcf40L0(J__dWQAntt0xlr$?@RLa7N9HhM!gvNs-eCt zb6+ni@8mzke>V;M)rigve0j01EX0b)hq|jQhhC(P90%>5!hD~|M097cjwL>A0{#Ow z=&wu1Vx?P1dZVu!`o5u#4s~{TeYCA(p40(H-(f6gD0{y$T`#c3({^_v5A7R=<0sJb z{fG^|CHcTE@0|hqHq_r`@0F*o4|*n)2Ys87vTZx^8MztxuszZJ3EI%QKa>dw^^ipO zhiTMDe&5F4l6+ZKTyNqVU@65%j`}#Hw+DI&bbqi$z6kPr}F7W#%`5*8hXleX%Kt9wBGSmqE=_pU0i!zn(s!U-Xeb)0Kk8Q9H z=`F~bV*|PsJk}cILtpUE{U%UWBJYp*P_!f;=njc*1?n_WkBB-&yna6D9#P+j>GHsJ zMCXZZh(1nG|JGI-j*;SHIqDwK&mHxR;2Rn-uD|?#A-);5Tt50<cL3v~+(# zFABaVv_2Jes*G%SAIr|qB6?HC7o`|vtxLHgT6R~3w&={@VgP{XhGh8As_hpdV?O8 zkGj|r@EfiSTn_r;-sqRZ$2`G+5T^vl?vq66TQZY2S}I-=;GLq&iOGx{wjf&UKjSD+`n z4>qqT<6nQjpnPSZPe#2m(Ji}56CWfd|B2IW3LK@#weK5&KMv@4PiwLHr?ps3gu3S_ zGjS>x+M)g!Dcw$jhq~W0T3`A_w=`}{IS=G32OTu(zCjm_vcWkq4gO4^m&SA?F0V)W5GYL>b=^ z-zt#D9d+fPvj%^0#3l|6abpS3$~?F7Pla@5tQ?-Qf$!8_v8 zIyN8eCH`O+xdY#)JMbMvnc~3rF2g~T=UyeXPTD5sV@D&r!*H zL65(e6&kVQ>v%G>UpzG7csI8r2+N6S#1|y(6{EtparnyREsGhZFZfFxk^Xpe8$%^6#}n!Ks`65C`+!SOlOq{$>3q9t(J?mhd)Bg8X6v z-^iX{>JgYD&x0~Ye{}MrU^sMv_abq?V#7Dk`t1Qx!&Kn7I}V@z+WEa$7hLoe()ICB}Sh;|Nn{S zhsX@^55Sh02}Hd%;eP906S?s@K|gzx8Rf^mAfb(zv9tfl-)}06GuRKk!G4HXQa;)e z(MO*6$wRuO@&6O$UwaN(Dx-btxtWMlMT{zm6@jsHFi&ivnEs(SI=`!ryq0ABS~-y) zF#$j+glLQav6q6}$dPW_kNEvIQ+U>z-M>tTQG(N=AO1u68CxlBPo;4KpUOVjR0-|? z?2?E@$Umz=p-mO3@Zy>#yDN=H0NW+l0g3Grd?V4e+JygwJf@$3F6(D}pj+w?%FozK zo9wE@whDGukQHMl35eh!ungN{%n-(Ih<#zo84kDw+Lrl+?4bXpZJfVFe#BNVxC+|# z3cmAhs>CLX_D!Y?@y|@Ve6S@mvLnw!yDg~)y(-#fftut;nf(s7g#0U`H5V2}Pi&p(l$wkH$YF4~n5hl27UE(PMz@UaZ-)QELw z22J$oKfVOBiCi0^l0qwsq-hx;)^nDQ6sDIb&(yXM9DCRwrk-2-cqCpLMo&tqB9NgDe@%p-89+3 z={)oS`tdvDM{EdQGZ$>#ZxQzcg!XT=>7uQ^2J9Ec*F#?bjNe3j0-#=C+ZV_z@IOG=(SAspgqdW)bnnv#bf#89B@4P0K@=JMkodq;Fkol6MH+I{$0-x+Vu%x zya~Wg)dIGOkqyVb)O-AAJ^_fiDmy)a+?T2_h*1c~qwMrKzzz@RfbpmO0uXaW;#R=8 zqn`kSM}ze5k{|8rr66CVruxTZ9eN1<;F zgSiv@1l%p2W6QMiw$FaUISbc z#$t=wAqIX85`dNaM9+5t{>e;)ih$qo?~)&}edupNb2{b=`g}0u#1{kdpL{Yt`DSDZ zaE45LQXjyEG5!~4zz+j`8XkbJNGimIVSF!;m%2z%aO_o#5%Z&d4PW~W@LXk;n0Tp# z3;Zycw7^FL`vN`?w9f|O6cICc1J)pj3p}e0a-#nQ#H<5Cj`^l|t7oAO2x8Dc{8Wgy z2mTnJ^#%IF%LSh)?91MTKaMNK{?OP)^wpq!G!Wy6{u(r=F^`x={9hE@_gmnT3;r4C z=fbB6Z0e9kY@`Q|8og^JZNH* zHkaX;yD)cnv6}<_q8#u+5@0ADA??VC2m7OJOY(iM9B`cK#1}>2kCN#i0kLyM!HHO1KlpB2QIUIl-L`|ulu*opkNU{glyWw9W>5b;qF zq)EAxX#B6@4RSzZAf7@{g}%@sDern1}yF7emc#4VK6U;LDSl=LB)7(N70rhC=+$rWm3Gw~OV1GW4IJ+c0gh4&zp1 zoKg`o&OakF%FX;ChPE2;v%)d5zb3D68RJ(|eOOGT+Ea=LM13Mjp|o&0q@kas@JwZc zpPs`Th0^gxyT&fE2*7+_NpO*Mo{kCytuKA-J`-1en z_Sgp?UJ3jjA+8(x7X8;`{+_HY)kFMvpC5g1v~-UDEC0U{_|qdmQDMX}>E}5}1`bUW zfaVE@(-02q3l5fEH1^`Z{|P=pAP34XEH6{uT~H2=Tj););SV7mBF!t1Lwy!4^=@WQZEj!vvw8IYqT>{N_Z#w4o%?~t(C^UyYTrM%WqbdC$iKA- z^!-2MANP4bTYR2=Yv+F8WdB3=o{Y&4i2Pfde6Rm-u@-&T&?gD&89z8C&-lHGDs(6H z*oL7WxE?h9&;9*?JU`Tb#*Yi*j56oM{$tEl^owGMscVV<=Xy?GsUa%e?jx8gl+ z9y^1%-&n`Qdlhbj{TJRZj5+7G`2S-6aSRx03x0Ww{7nDRj}q(A=Z*O-U>oc|`W<3B zB<6R)9RD@`zu12!b}sJwfc?ZcCMY}8e~hDpgz;9Gm^DoQ(LWH!0SViDt=xl`e=Uvu#eOn%!g;3u%sp?O|6hFmvCrTuX$ZcZ@vn`)A9Dr!i}8QZ_m}bGY<~YS z<}q{s@qRO7h5ct@-Qe*^OkGR-Puzcuhl72F_|5U?BZ|JE=--OzmgHc{vHuK_-?G5h z73-P%&D7(&o{5=*_1J%=j^WICTjJ2}xBOwBQ%Iks;z@iRhyf(*8~fkzk8P>X!sY*_ z^O;7nvfztq2!5w=7*7bP$(L4;r^_W_Ea-aSYyS_Vf6529`B)L3T<|3pj?+!2(Ki?U zis|^>^!_+>THnw2yT8f*)VRPJ@M`lu{Y;+pAAOG@))9$UPWvYFY5!#KM}~5e7WgJ( ze5d$bohhwL*Z&hf%HJDjZ>1lM1J%-)5T9W1Q6~P%P4S-SxKNCLGQ(+~XL_F^CfyVx z3XZLe^K0^R#`x;O$9?jVmZD-IZU7x$9sC}^X7ic9GaY}O#F(Pnu&C$_uz|!M`eS^e z(a)I>#L5zI@P(%RpK;&BraH236U3?_oT&$YSnG~_^xA zV*WStIVWwP>`(Wf@gv7QJehcAC0FP@3Yh1a#5+TubD&JvTY%X&AahU0rkH3 z%J@t?HNw$XAC4=(`zdCbaCX6>eZ z>S@1uX(|@>IbdS9k^W=9@pl0J5yW?%`2WM$pzk@*AMZc$=g0notcU>szxrZ-ji$a} zpR!?pTDqQ&6$ks(@`d}0vFmUjTjBl-V%L!vcEZO#gV;alQ!nUWQ$Gb|OrDGdj>i*& zKllAZOa%6qA%Y=*JnqGZ{_0GBupa9O2cP?@Xo#N%^+>pHZ;rh@RRQ~;GwpFK=yM^? z00@pD9MaEVkGCd_1o*`;V?ko(;XVI+Z2oxvvoS^<$c6Fp7)(L2?`+Z+rjJZHVia(X zccvWu{PO^Bf%Ui#JX8J-_cTVF0>s{9a1G2ko`K&Ijj_PK3KKjN*mpvo%K!BJXXK+f z9W$^{uwMz&AEr$nU>X=~3Dz-t-D7>_Bj=|6BOZl0CI_(&0>ZM-`VZI!2B!gI(G-)A zU>^jSh(Fzbg2O;u1mHOk*MYp~0ze+!5sp^3(h zkamBx|A;ApIFETGMx-=@8{s$afBE%K7!2$q)+2rdV?#1r7|VfiCYjigqz&Lq=(f_} z3*B`8VgFCS4j|5i5d0Pp10g&nP#*mU-~S9I1>;XLgxHi4AH-~Yy8jHe2Fof!Oq$w~ zV_=_CJO*Pw3Ln#SKE&!kJ+?s}2m5prj0*Ns&~L#QkUWk7UNgrm;8B4sa}lpgr=2tnjA(V>@y#Y{TGn>|o9WY3x7tO9-bU zxc|&^0Cn^jkn%tK{6qiAo=6b?l)>ddo_B@b%U1Y);xkZuNLhgIq5Di9L+?dfmvR&O zp9h4ayS(&E?>LhKNv1^oxC58{5{dxuybhOpm|euB@1pzKfgA230J_@RjN zL6YJN_n(d_3b-=ZGm63e(Cq}cAO;KMA`g2?%_d_+ut9(``qZArJR$xlemngBg>gkmxq5kOnr@%o*{ZlN|PdKM{x7G@9Q5a7(mF!_vNH9d7+K{{;?kd4mA-0Of zS5a6;${@BXbAD$3tN88k{4*FM>@(fpPh5B$pzg`mKR5p^I3S~r_$Z9eN@J=B?ucI# z~jNLvPbh3(1MF<32zlkudFVcNntF&M4{@c;j; zk4;!D!Lz{No&@9YC+|P@pX`N3`i9sog45!c0;a1nXf5>)aA{cfMH>PBi^h5hjuS2; zcrPr6F>Atv(fNcO@ce%btHzW;|C_LEkdFR?&p)~U3^uKae~O_?_Ujg4z_1@*?%#&} zqubLsH}Z@K;_(V$$e<0jL)_R+(0ks6^?oSK{X=1%8wzthLYT(+FW!G4`lI(B@I(X) z*MxrqycmOXBUm}a#0mNV9AXZWzR_)9o`6_0K{>-2EFGPfCVj@e=5XIP#A^8hb_@4M zOR@a|n?R;=2%QM+joTGHJx#A?EH8;I5iu?il{b6e$AVz#FcvhyBEmj}pVBl25%7E?-uikq+j^_b*LIEC-^izOmWa3d1tRtxheB(iBf_KcYlb~XDic&Y> z_l(#;f@4ICBaL+=m`0`yVo@XZ5z1&hV^bR;jN=8s!jW=}IV>m-hIeCv1s%Wot%C>^ zzFlPXzv*X7$725x3;FJ#4B|LxBKt=YTxU~0!(M`V0`IVkfGZ{OxCthbU?jk4UI;fSz)$7^E-`$&*l!;L>_5i#7RFU# zz6_rG)V<;at9S;UNyJy~Tfib5`%mI}lbGLZKAjhEi1RJTlQv8`05FzUU~f&_bCWKk zIbs77EI1V6E-?o9=Oi2>9PoGhMX5)>c?_zs{~n;b0xEaMy-vjmrt}Q_ZVzd&_!#5d zRX{F_S=7Wr(VEePg@p081$6z3=@7Eo@FF_ zrjc-u*JtJ&z`!$DS-`*o4i@9sBNmp#vv-F&L7w5l^-NiFUJ7x@5$nugXhV!RRzLf^ z<2`?6Ba(?RnHK= z0n1qd=V0RC6OMT-7vO4}I4KvjCC7c<2G57M;S9k3A#NBcX%8zi-Hzpbb)(o1zX$N1 z1CBZLd$IL}#{tu2FitOE58wN+H~3}1$_K(eXn-%K5M%rd_5(yudf0<5tB zSNy3Cth~z)7e+Og0 z?DOy^``mmCnEcO;g_tYEZTTw3tOmxQ)=P@2Jtj>dCY&L}hLiL$8Yf;09C7-H%TI&3 z?SG@sOy8UHZ;VAI4{-d=+c(eG9fy4>p#O+1Cxm-cKpOjuSo31|P2)Zl|4V&t-UlYn zjK#Mw^-Nn~j$=>{{f2$T3E|!xxDUqv3w;*u$G=I#GjEN1slVCFZu&m|%D3v@$nf7h zHWj|hI4Al4Q=k8vRBSz zEI1v-k_aPrEvtJLT$O@w5fyMX{HyN{|KP8lX5apQ#y~iZge1ADa2$#K^XE=)#qG?6 zidHjcOj(H0B#Xi;*!K$mYHL!BJZ!i%i9gPS&1c< z(|ztdxSh5mb9dbdi#Xl@`N9k5Pnj40#(zbA3u+c!9e*oxcVUrsyRsb;=67tWLoMA^ zkD7P#c)4E1CqAcF-HA-zpqg#h{N-7FJj$qcj0q=XJ# zJY1@EQml$&6DDfiX$tFncO?#M(zvvTMjyFBO9$Cbk2pEuEL^R9dMzg_;YN(>tJtdJ zRu<($-=}+SI{oOwwvJ8^n=3|6(&;i+Mg5Q{J9nhW*tAFa(LJYWmSpJ+mf6zx&OouS z)9XFEPt=<5a7uU4Yi@14`*t38hkx6}JCnyRJF>T7<}1s!mg?!O6SLV3R|?)(%Cdc* znQp!^NatpMB1+w!gkCPcq$m?s-{V!YW9snT6R z?R&Nzvg+F2=Z$|KEjhX4qP+OY)0!(-rH6_%{oAF4eW=r@ogY%K+NqUlibjNf8F$+8yA{f;`zj-? zx6P8YE_qr#aGT|@&f`=+RJ=2J|MAqMs`#q|H*d)vz?QcB*!qAa|5sP?8nrjPB3iCEJHLF@8F_JuJ)`@xwy3-u;V*uwQ$nG~dxMU#6Yd6G8y>dY zt)XF@?G0)|-wys$6_mqNhEMXb57M4yyN|P{t_SOon51vFRtv6P(cWaRcE^^fKJw!4 zXPlH{jW}MUSvdBz`Nofi@w?2eGOP?vcdl5jbhlAE$}*(hvvB-@$=9mohApLXyUpg< z*hLLN3o*J}aOzhR*Rp|}`Cq+tk8I^za>h0How}STEfgT-feU>$H-|WmuBjzX`wc2i= zb0fOHRsV~;&8EheYScokb2n2n&Q-rDFWkQV1iOc-xZ)*+fUCMUA6$PwvCuBO)oGDl ztkDmvTitn{Vy!yCLG@kjon>!(TpXiZ+(y4ne2P@K%;F9mCfOto=y%m%Q_NWD@udo_ zmOs{Zx~`;P5WusX55JFe{ncXX%e)@gZP}-0RG56r?&8JxJ*~8I4`8?4q654m5sRQuUf{klQM;~wdoboH(2e_!Q|#GNAeDe5+gYt1u& z-^eEEDK*Q_h}LTjUwJ-DW1WVI&-B`^$C5VoR#ESu9e?v$&%r9YygxjfA{t<#Xs)$o z^4>WHyDQsW>jqEHKgo{wG;jBW7s9xNIc?z$@$z=U@J%AoA9h}Df4EKg_}hE$<_+&r z`z-I?xWD{^UvCWwZdj~6e{%P0n-)%fCaTanZ~79|uXCdUCFF zck}HA?6Ln?uV%+fJD%ciH#%X%E58?#DYI|h1O=~#SvOL9i?Q{&?dmmGDmt%cDHW)# zacHw|)_lX>_m^tMt(#VMUp)7{Z05jx)oWZ^^G$k&-3!z@h$jUke@wVKWKOq-SuXEY zkA|9rW}cUBztGvPfxW7tTrGZ=&BW(ZGE>valqRS8I;gKSX}?!G;n;_y(pfP#IzNrD znfVvXd6n#;kAvrlI}Md|lWjcPAh}nx+iOilc*v_CYD;V@<77pIHg+&t`0Ue&$BG>mpA+DeabIiRjq z-n+y2Rb~zAK8Qpc>5V#_!S!@`9xjIA9Ofs$VVOFE|mp9pdK5(~VWZC$^&SQ72mTa36r{&csRpeQ6V8*_)hxH3i^tC>-xGLj-eYLUjM;+_w zig3453hivVpDB6$!oyoL%*|V(LXx%E!9_Rcfno72n?1$-J?9U;Z`1f3`NQk& z#%wrSHbk|%acJ?CR!(ZmEOe|Dv(posd zB^`bBRPDM}``%wY=jx1P-V4R>hygOS#Y;s;50u&BWKs7texUYVSDS{dET5;7kM2sn zowhVZ{eES~;{FG+X32+XmKcZ+s;}5u*GnW_xAnZa3rx*A+9ogZnS7)5Zr3h~TmIhD z*uIPJx`SFts4RnK{mx%iG)NV1i~y67=cw~Wfn zJocPy%#rq)G3I%z4I}rZ4NVE&V{T$#I7(_#*LLC~)Y{jpy%aYa_NXvtS@^OH&gzgg zkzPml*|jN3QftofRsQmEW^^e!xxp z3aNG$Y6E!-;%%&!neFh_(z`wK$=WT$H=S9kUH(jMqW1FrlJZ9{Z(Z&-aJP%n#S^pQ zWq6bJnhz5-G|&zXRxQ!biyape?%UQZ*e3f4*DUx} z-F{I@mR)^suVPV-iEnTK6hYK2%rmBqU&g z;T6B#a>e8JIE2~AiI12ETX%Ydj&yxq9T{dOHzOtN(fu|)qm4I*W>`f&iWpdtA~#Jw zl(TB5^!#cKr>BqVmHc8QE;}8T-?gyo$dcNj=apo<+t@~_j(p{EE^A0Hi#~39IesqM zIrS%}IONZt)2A%DSC!@AMZ-}vmNLve-bVv}SK71i|l1$nKzE3#O6TDA#En-&+3hT4PP{9OWd;Zjtef78PrAJ zxYX;$u%lxhZ!xn2Gpc)*jhCF z$tc#zjI$duX6ZdSbIVmP?R>2I{afO3Tg8*6%vG3e`EK?7-6h?r#J*Rrgl|t-&1Q8` zFtAQKVz#Y_lW1t^9Jtl)p1GHfxv}EfYiv{Np+^(jPLs895140bV68M%bsbM~Kv8L1DL!TdW#;KCD_ZRjPc#`X~M!->$H}IorJIOrL$^%j@&F>hH1`{T!YD&@`{`F{C=eoxZ0L^CxWv>s(YT*V=DTF5^JZ4O$b zwd-2ve|}=%z2d_C?QKR{{M|Emaq!E{vsVl(>(^Sg+q}ajkB2YTF9;bNc4uUZ;{&vvS@lY}c9es@JQCIZkSIePp(@VY7y!1^F)O=c z@rVbGjW5J1Diw`3EuU2Embl|>51Y7^L#_lD92^^Ubf>nN@s_c7$8TsGvhzu)*2NEf z`-|+?y56owYPVNg^v+w}(eCn`^TaFkPOf>W>qRL)ubmfNx=lB&o-+Q;=5wt2$Ww-s zvm>)NzO9u{5KqlWsk61|qyI*?^-cde=Yoy~4&{eloE~*?PM5$|(sL{yE6b>De_;Ef z3?9rAF>Za@=onR25AQAi&Pe)RJr{n&j^;%@opzSWHFO;|>409K-IOg+X(v5zR}Vdw zwEg6yMmxt*JKDU6ewHGiyk)Bd{X z5n2+ zsoAHV@%{8n_xDx_8~afIBfK3S3^X%)FU9h?(5lNg`~4OfA$kVZ4w_ksQ(wu)`##ua zVT*^1#s%KJ`>ITtCF!|fkiKXCoNK{lEANiZu-ubSI&RR_!4iRYmB%j_ zool>(w)*0{dJ)#>#Mnvh{OIX%R>4N0N}fLP^CXV;Ils@PON4f9>-kZ$^k27?Y#bBw zcd;k6FTwTWx)iw%ktfa$8avRvQ%q25$co_(*2ALi&dl6BA$Pp-3TeH2ulgk_g(PLD z^qIZ2Qh9TL&Gh4~bc`&xtkYWd?UH7#p8oN*7)U*|&4}HvHkmAm8tElga&*>3yF+by z1dJQh@jyj-Z-ss`w=<;0>yK_2-uBh3q=oCE4{nHdoM66c{Y{%axz^ERlSa1bT6DX2pHVBsLhD*H1;Ls8iUjMbz@1{+aX1f84 zm$8S{9BW8eb$)cd+P1avwV{`TjIA^kjMjyHNb9mpWk+|D-f2FaA82+riMdtB61Cr& zz}~en@Y0><6*jkmV^3r%9hG`&qV(a>W36GMoQvO#^GR;!-^Z_4m72n({XJ$(_jU5= zr(9XFP%KyFW14hQ8y(|<#wr*0g(H(k9+SR#d1QNqWn#8N6*=WE#QPn5FIna{bL?cD zZ3;4*12|Xt8E-Yc>rc(&?VC`mo-W6lB&V*N8o&7p=lCWk=l-muge6IAU9Y<*cWbFP zZl6)DcU{C~V%oi!p^t|zkdWYr`E8w-x0xH8=`CVaDs}PtdawD%#OF-W8Y$Xo)|!pG z5-a2e>H80_oO)*e^;#wN%*p|6dgj;eQ$IT1X=Cl6gxIZ%Jsh&?ME7kpPaAgjbdJQz zfLQ&_$*a}*{f72UnXPP=kYFX}&3Tr+>+ zTl_A+qRYjQG4PWV>EkDT)3Vezp!1S0aSqG2#LQDy?CW9}Z?z@Z`5)Px<8E3Vu1l`% z+H-v84JG+1p;pdwUp%)8j+N2AS=nb=e?y&{AC|TkKfbKes>I1WW^*l9Y^40-5U;xA z!>|9YeVQuc-d6lr_V?K*6}tj=~AP2$qd`tp^eL+T!R5g z4;!MAmMO#-J>#j_pMKs)HoAZ0k}eyA6m)v()owkV;5cyeDmFi6*1T3!_IvLqb9}Z) zTT^<;9g{c5I4{k3bZw5p<}2(HPn#>I+PPJC#_6uoShp%~AV2Pn%__}{my8FD5S4zl zb#Z`n{9yS%!Hs2x7;zKP7FH6Da$=-nlD;dD7AQKUsw^o&XH)G z(`Dn(K?#wqbZrOj&|NWX+JJtY&skiPU3$j4L$^KCIPFUBTwlG|&?cUWo1@uacW0Ti zuM*`RGt@T1M4`(m5th?ZPnCNgOr4evK5x;-WW$v!!*gy;)i!aykkK{3|xHc;%4ZBUY}ux3{V?`r#-s zHGh8Y{m$cO&(FVYJT*|RctX)6mYOwUQ%4%KvT+b*F{eM*OW?;N+!x-&0mXkY)=dEHvcJ&)b)95<@< zXx`mGtuiMw>)v9^m6410cznUNA^T}t$5Z! z)7ryr;k-RJwcJ$$Tc2~14)a`nK07bTX5+yP`N|hV7EPI+f7s^wx(=#w_6c&2rzyOg z>38S!z9KF2ODo^HS`@8&?Ik6tratfFn1N<(?*^SH{Kr+nfPM8t#-fPz{10>1Tl$o6 z)MG|QYU%ciTOHYD`LXV&BC4}PZi+((%^Khi-cUI@`e1qLJz2bXr4^Y!Pn`LLD6E^Cw`gZZb=@vz+6lF#z zdRX_8(8v$G?A6t;U(D^`5SjWltydjTHp`uJV_C0pk?fPho%BA;;`ra*=ea6Ezi7C& zZs$aIJ)e*<6Q{de2x`~xAR+LvOWi**N(-k`y{F_SZCbhGOxYQ#c zH7V2F%By?f9oGC8x0ZC8)?t+R{HIP5hxS+9vW>X0!Zvi3<`7m}mY<8C+7yM&mst^W zH06~2roU>uHf2VStj^IRHcTqqeLcEh?TRV;?|gVQ#LZk=CUB~A!>0O&JwnDg?&Oq~ zRjI6*At%wWZlLap_B{hl;|5z_&pF?3;^3PH+j|(rgq0S}SuSc{;JRk~nxktrb=|d7 zq$V#(%EMuPS1*ZY8SZ;+HqF{&dvAiDPL;fm`p!Wb5)G@YoG*E=Sl1yku$uR#XFpDq zIqT@^@rLV*3eOL^G_BNKPkuwP?t+7J@(lKkSQ;2oJ$hPMTB z&_R{AZsG%6hbOiuLG1d+S#GakP8x#V$s$G!WlpRJaw+8gzEhl1w` zft4qe;zinLZSy^LH7eNdmQLhiS-Y?vNh7At3C^xD;jP}+h2`NOXFbwF{^I1JQy0#u z-(zoiCplqu?S>s?x75W0v^E|)W`1wy`3>!sze>^!v-`N-vXf2RK}ptWwF&**l&`*g zA+kAR2EX6L-kjo^C7TDr+^1Ns*t!4qG7!7A<2Cb6!_pkvnnbCbNUl`N;dIMrh|`ZB zlfF1&1)H*(Hf5EI*EO3-2Nzo>Up#Tik<)=Y_1+yT7ncLBJ(O<7ENiuXdv?fF?M08- zax+If&Kc9VKS#njFiP~)iD|G!jX9~cCT(z&+5BV(+1^oI={)@QlwSl4>7Y53HSJJqkozKvJXGrK)x%}57M z`^5X3*_)&*o{MYcEWTw>I`Kxu{+g=|J4$Z!+?;96JKec`^!WFU(l4h^j4X#~o7C*N zBWfN@>RmU|`i_yN-@*pNo#AiJ`fYuCt1^F4#Cd+bjke{^!*MU%y+cY*7M2a3VXZyC zi~K*V1*{p1m$UYNn9<>(jf0}Xm3wyCFOqy!6b$;rYUj;Kczw*LP;L3zoQ!vKrM#*V zpKR-B_r}tpLeuXQ*HdPKLh<1Hhi0rb{mWjv*U_Eb2KcVa_em-6H+FI#+n@4oBU$;r zSHEqArv@kG1ss?jW<6JA_`szT9sbceKYD57m8!oj)|@JOqxDz&oksn_YPTOh{W$Q2 z&n_*C`^Fo^va{>f$SmA*^7>)k812}r-d8Vet6o3oM#Gljty`@tIaji))YR5JvCrm0 ziFZ4C$)*ohcQQ8-@x9gC>BwN+n?Y-CyQtYDPR)uw9+uysNcY8E-Y!qg`VTkQnt8Xb zPusN6ZPEIeJJ|yl$Iahx@j_#N)?evUC-aBjlYb_=$zpCrw|f3@PuC}EnYx){3VWXs z)x8+Si!kxg+aWSNe_}g_%QJ@zSk^YjZDPM!yG9qh+%KjZw7dH*&y$NyIpPv-4d-s3 zJhz53?7(zo$7szBC7u_L_ccrl>K%LTy%xKx)*LB+YjeG>HH~uiG4iS_Odo0oOI;qw z=`TO=_@%774;I|@x?;TOe1~~%izi5TC#OHTO7odb&aS++)U4IxhBof!ndMw;XWrfaEl2ygsA)(}FU#X{32o0_H1Je> zdEj=Z9*5bn^cv>#q}|a!*vRbdQ*q z6@58qvF5RHGe?@s4YS}b9)3UjEjzEaO0S4DG}LL)`k7+ZR*G8&>E^YsI@-=LR5ky^ z8~YVS;!i%jsMsFXR%AoOKDD7XCCZ}3Jyg2%nRa$vV#u~DuS71V|Fd$>IzRDEG7J6Z z=YP<6Fi3Yx<`QL@B{nP0&x*-fyLR6$@5D{n<2wwQpB!wd$gL~luHHOkDR+CDj%wCZ z=4NG={*_hu*X^9U(c{X~ucREh(4b>wvuo`$mch!=LmS^2j=dIZ_%?aL=*po7hQF)j z`N%G+eWtu)-s9w_U1wR`UL3#S=Ho2~LbtUKyzI98P~5=29nZ5`hrJeWwd{6Vao>U3 z!`kO7v@xEPWU&49o*Q#!eyl7XwCH?fK=J7lJEJOwX6H}*=f=dKm+e=cx2@GtykeAl zmh&ODyp>4r%1c*pMU&GOi4w5i)f@ha^-`nByV~NG;oma=c&R^>|-=yE3yf`mw$#XVbz5}cJ)DhjPUmYwc4E%mH= zD;Y(Z^jjSg!wf=$CqD5r+Wu&n_>3JYN4AM~-|VTR($=!Hdur+V9zH>B9dF#;btT~8 zt6n!HwIX!RtdJAE!3}>=_Po&6<#BEgKi{goA$M&eBGu!bg>{L9aj{%iy(2X5{ne5w zp*F9|RAY_@|D!{kHtgH?VNmOf5;rv2mAmgKy3K1;TF{?;;6;2@ zU{F@qh6sn(=i=sR8`rist8MRRw$I$4ljia zq1jRa`3r1}r^SX(3p3H&X4vuXot@POrU%5Yw_DfV>5#?VS;=*yHp+C2Ro)@KElEeY zTZv>iYsk9RZN=4XrDW!&&1x4p&o{cJ&z6qwj6`ZG6&3E+P6d_0?u&e@@gJ&h-ApoQ z#cCzx*U&wGeo|v+pGsrtvq{4$6Sl;3lgoG`>vJ^OddIWX@*OhS4s(aEZ?o!e-!byK z7qZ*2ZF@zkjx_EP8`e+S*4#j9>}BhxMZZS&d>IbWlj0mxBuHxj{}vZ)qk($^qj)G;^lwwx@?xy z)b@UMuHB7v{huWbD6V|u{uY);5^Z&E2JOwRRJ;%-)z*50wxd+Uv%Q^QiX8YM)^u9p zGsXEcrc=Ev{@Ez~Dtp?>2X-}T9FG$Y)+U{A9?-vjT|Y43jLo(O^I9*E)$@M5OLvk% zkGcOJ0OCL$zZtB6Nb;cii@_)^g_h^jU;=}=yJ+I%ef!4r^~FCtKYHVj&eUtm=kUuv z_WA4moX!gX+xEsWOD%izxsM53snmvd+XqRR9%++f&Zj85VMpHVXwStk#ArN)f2Vzk_w4^l7)bWEXl9let^9DF4Z)WXK>I^ z^4qz43;z(aZk$R|?+py5YB0govAbyE#C@Q{bD+V^W09N1^q#sc0JxYKezI_5(x^Jm zT8}H}vC%S>M0>G7a~lC?U~^`vdEr1sI6l$!CCoyxA^2Ip|(H%&8`oCYuh3^&2U%>*LmOewPz@*B%L$#4olmVvyO0jOx9>o18JZx*^R zx1k5w#%IT-@=R_N8p-{zPhfGN`5K85i~*u3E)Ka3TmyqinmBehGSkzo&h(zTEdU(C z=Z-nYfQx1kyHp^aOlo5*bH_M9wIVqzzTWW{1AxlFBU_`={aP0&Ya9gwJ4Q5LvjZVuA*T zj`75uZzritd^2fu=@pFL`lH4A^*?;(W;4B~ZVLeKvI1cEaR|a8ca5uk+3*sW5MXmb zkyy$i7K&$j`J*YOH500Qj?sV^2!d__+N8Jlotja`qiX~UsivzMgb9lx!kz&-G>54} za{w6i`Z9)BE@5d+hpC-0-dvAaQoiJR&L zGp7H~XX>@J&+He|d+N3TfM1|(b){6|HO7PILfcvs3*sV@@G|||bO2eXWCsm>sN+_1 zn90(Ye%D!@R%{_Rq=2Gj$fOJPeWI&E!cWP+iYX3K4$Jr73TWhOT(<#2HJvmAKJhm2 z<|?+9FJiRng#i*?u(=KlHwiq-0*a-bAUCskV@3I)LM>z+hP(x>4J!FV&OPV4ofL_h zG_X&iu2rLQVZyZ{5J5|+W=>*o@;+pyzp3-{ATqtD&IveAWXFm+k@M2$3cJC9iXkR7cpVI&^lfrh3!DeQbp$rQ8$dviJ@W2kQUJ0tN;ZFf zHOE&@5P?9`M=&*YKj_rkP;abaYb61Q^~Nf2crx8G+5$G$5|CKeS$;P13!uhJ8~nny zDu;|q=Wn-^VC$;d7+KRucw+6DKMzZ-@d5;(nmLKVvAZ!i`3*hOZ$sS{05<#W)3?~v z{&;~2pwtM=H|6e^`$SzeZ91$PX9q^ZN0K5;)7K)tnzdUX-Qm5Zo1gD@a$tOBDgP(2j9j&+{^%1i?l>7v3qqk;>G%^Nh${i2G9Sd##nbL0uxuWCulG)Oh0*3r(&0w-czRq zfZJ(BdB(uJu=>lY=o3tQh_Cs-+={K!%RiG9_*2wA*We}y66HMs>K@E}0YYDFQxEU1 za=3WSCchj6;azcNsW^aAT$OUn^+=!B;%pEaOip2N>`qJ`yA$f346OH!*yKagyVE@P)&2gmqMRm$8h5kKBB%OIv|_9PAF@4?{YH_-kt z{nt>x{`=2#iRnGvR1oBP)6t)P>njXiXu-}PaDa!Y*)9WQ1&1=a42Y`x;-}tjkj!GG zC_Fq&kc9x{ZERVEf~n}*9>?EfpUI}!#N?*ah<%Kb2&8fQjZInYp26%L*x!}@YZ$F8f)5=79XSF1sXyIW zKI*sz-~w*^3Q9TY)*ZJ(n9=qoBA~7v)3Y*jLuGe?LXBf$rlu1yPcQ892k8$7Ayn`} znPaZh0uA_ZcU|ZmPGGNZCoF`y*{n!SF`rz*J*vSJs@YSRoH><*!TJ(LE6Kf>T#InR zV1qCkf)$aM>0Oi@i5j07TejTPj5am3bMzmeZa-zx>=Vc>s((+t2GXvyLnaskFKS;!At%R_9<=nn zh?xE#T!Ae2xmp9F9$I58O31>F5gdettW~VF@;7f+F}L3@jcX-)n{|8FLw?AXYH56y`J!gMxMqXbvXO zTpS$h)ebk%`&i%FGqkL*8ul*RXu-uGuzBX3`DAU%d&sDaS@EigX;d>)Su@y(!r;gx zfH`6j2E%pAY0M0AfGYu&F#XBQpM#dmK6r%+K5S`!Co~&ALgQ762svcV$Gi zhgC`U0AI$Yh^vV7i{H)m{B*#%1fB$U9>mswUjkGcfC(A5i6;RDQmQYT+)7K1?TQIz zIzeI6m)E-0TeStq51_GRsWxMM@a;!4q|g#XfVg&<88ndu!Nk#%;8E5LRxe?+x+uax zGy}rc8U{y?V=#LPgOm5uelUH#^mPmuzphMAndwU^T%5s8*;VSa08m6;CVByi`Bf8{ z%aJqm{6`~7$|&0sNd|t2Do-gT)=3z@PrOg7O)Gb$sWcA3B6Zd0U?mk=#p2ou1hxo; z_=k;47^4?GRi9^7V7^H#u0owpPPkcTH4{zf!dKo2xld8gib%^?;_h**PeT&(vvYy?g)5YPCX6WI#C>+Z=tQZ2ac_BaEvLP z-sNVRiFP#sc<{`dVM=C+FesE^100)q{P{ww!{6872|64^^ibF zM4?oUTtlVS@t|<2Fm86e*eNRbovzNb&0g3u{5+%b?^{3`bY1|cXIT$q;4RNiVHaf( zAZ6?2&=gyRNhZJkUz+Dq#!A9!t+1wNOeZ}=IZpgoJ2nw_q_jh&TQA=U$Jp_0!^ERv z>5`RQG$W2&ZomljySaBP+V^ADKB@fJgb}n`8SOYt$Ee!^pmr`j)j@5pxR0+2EoxcrGA0Ps zY$ZWg=BV=#0<%*@vs0-lPR6fauC=l)DNniQP+ah&Z6D@aP9|eMI5WYoN*pI*o6+i@ zr-H^^#!X=mR@HHW#-acIT=?z!>ywu}*vJLr>N9FP=nSd6x;MGbTPu1GnII8dMwOJZ zPbE3?z>i~iHRrwQGIbgQ0L-p-S-0eYw8p&AN_nXgz9ZE;nZUDCgvY*l8sGQ8 zH13_LzyOvv8Rx#bMW6lB23~wkF@2qLTKHew#?9PB`wD z&_DT}S-k7S0RHybDZ=|6n8N!Wn8Gi8X@j17X&tXF*YMeZJ`mAa;#n9Jm8oSC2k=dA zZkib$=<_OcZcG749TU&7)UGYK+((N$Y*Wq=YpcQwB|}8KcS5`ZrF*sn=eYPIT;qVf z;BNE-;{ZSfT4g-SXOJ;}8}G|E(IhfTrd&e+j`K!zh`Mb8B!n$1*-m3;R_2%49mC5d z5zvEw?2$qIPk-ttzA-a@@kssm`yQCa&wkG=?wQdQO==Ff6-L_(o8hGEB-NM0QX=4#l0t&=g85=q?y(hpMx`Nh+-;QgTYtsk{dshXO3wBbbE8J@ogaC(j%b3yj#!pSRBdW~kbh9Zj zCAo!*MN?$~u|(}3uL#@Y872f~rw1AAs||l*SGYGN78&nyOJfLr!vNIjrET|)8={u` z?Ojaxjg35X?KC_PCR>W4_~Y`v z9#a@Y9q0d!3xKTmLl+;mIpjk6ZElF_DL8{fX#mj+D6 zU~qi{knVS|zpY><9CCJ&_FdW!%Ui*DrndY4hu&jArr{Ceyb9iMR}siLVi4Tm@etTk zjPsZ&5H$e3!S%YSEw&Q1{9P&^e6>b8MBNquZqCi!jF(tX9YLGgGKp9o-XCMM^6f^^=Qb2aP00JH8=ANf1 zz`8Oz78F!WR#kS{b#$V&VnIuaS>wBW;_qfkpl7w#w;8(V@or>Q2 z6l#9zQuD)@-(93`3jm1Zx2QF>@!?k=+i5y2wwx;iJN{Aw0JyMRTl><+7+YFwMfvaj z4;%_JC!*ONge%o-cOI5%oA^Y-mBR|3!B0IW440U}>~I?^V;H~EN6?X*W`YP$(hLUc zb65^dI|%oPt?yrxTbkJEHxK_h$0aqdkujh#?Ubv0kp1OmM~LgeEua8&UjT^zT@q2! z!P+mBq9u5AM@n?4*6P>NvtQkG?T>qI`Zoj}F>udJg-72ur5B6~oS~MsqpLFh87H*- z+lw+8bA9Txz^d>(4^!*eBvPwN0b684wt^j4dw%bRsm3m8L9CI|NlY%mm$828SlDjeK?ehF>+R@xE4 zEeiLhUYD<=*sMLKDXer=78hR8&o-}N%cIACXKufau>IWV0(DvdpqwO$Vy?fpeNn7P zTobhFuPx<%lC`ONH0E!i*(t))-!%j8pDz*d2#ysPoNXjjPWOhEU=!alzrHrRSsxRo z8mN7Q@8J`Fn&ViW^B4z3?ItYKJ~8O0FSF%_b%S?@4qvp6iwyg6Lsse%P_A z`Z&)Cx=-B}0H{0&i2Sb$p3{k`n`X&@lo1H!8-nE9rvT99%~Yc%LU1UKS#yjiEWZ0~ zQ+V`k({bgJ`1=r~g8;^nRug2$h$w(L7&H27GGmpQF*%ir?lI6Q(w9_cTxlt z%uil!#co~)_a4kX`qVb%3c=BJA<%6B zz_oL+IomUnn>Z}RJJL!(aA;P#M(pDpKD@G7xV})TkTIF2)D#%N$G>X^bJJC5!>_vj z>PEm!cy!5}X4l&_wiNnIy|!mH{a8+Xxn+}3*zfJjx(cNjdFaiatQFJ_u+-+V5Tl}d z4mTVNzUJ%Yn_84#d2Jpqb{a$r)X(fe(w3q3I8!-<9i?sy0N9+@k7i3K*!u)?&3{vk zeNvEtglR!#dS!W}D!e_3ohV4;7aWhS6S67roim}Me!>`NxxFnJ=Nvaw*x>gJm9MHzc4r8KnkFyik&WE5Ve|y;uTYqGZ zc=O7eNnPIuprp=)x3! z@ZE=9mmEnnowH-x0H)R;7HTd&(pF*42iKK1xh)9Fy$&J8=-YXi(BZNl@qiXs38;H& zUhx`P{n@^dH0>-6KNjA`V%L@zCbq`gb-F7V>mG=f|ycOJ#x{AWusQAX}@f}qvrjsh*8 zDvb_q^vmzR^;f>-2tM>D4`X(k!n?e>!u0I_yUM@x`)fKjR!G&2S?T<6yC$(095TMH z4cnE;wroq=e7i;7?H`yCQ$h_!WvUi&{taEZ<46hMCt$0TdH{QCD-XW`pjJTEE)Wf+ zP#VJ^H$mahcx(8s&*hq;>yth)|jP4#c%SVgQXU1tv_B z@!`{x_$%+Wa@S?-Ld;hPIDBCK667@RL1ca+Te3d%ZAb7U|J4!9PE+U;0NgV}`1p4o zrCb*M$ zh?|FjT5Lb5SH-$JumhErH^+b2$c#3@Lk3^V^|MoikAK&U^Edl4q}E*Yh1;J2-1BYc zlWm~+qYG25x=b7BI6F=F$KQJlr{@Mzy$t$)nIT!1&%A`@1v`wjZ`Wzst^;CCQ&znV zn&~q~b70pO!CmxNrAvwW7A&MV?#$3->b?L_ zkq-G<#)+yHl=sNDl*uP`wzxT2GX?42Xf9rdmh*BvnF5DBoj?&^z8scV1z*|6 z3%d~3n|0oYPfw2R8x?&7k`VaW?>&auL&Cgb+b3fh%&5qF$C${<=LL6~f|(gC_x=*RzU^?;rP zw2TkHA$^kfVQUyO`AJKdooe77jeeKsPR~|&?3)kgItq1Tj$0&S##`OJT>Ed4(KpU9 z7TyHgX{|?t->~~Or$Gp*4jycT6tgR!VB<1jM2!ftGI>sNlgsSnu%OU z>@@=wXlgi86jfqrl`39aVnN5K+XA2tk=<16A4hHy=&>BBVz;rMbZ!|bzU|fQ{PMV> z$=h`Qv2Q(uhwqsTOLAG;vhi@Yz!QMHuZbn+IZ%K=c=5t!qlt0vQJOFBIyIpNvIJC+ zY%ZYVB@h8LdX5^6vPSmAVw`qy4*EgR%1p?pyN%$PlMua>Y|cgRoXNOBayO=DMfavi zpnz*MMu|PR2x9M|>?(Cz0H_1VS!A}PqzmHpE)dW#op5oUuosp`W1l*Xu}d5vE?n*O z@ki%^o$mMcGmi9Tg1k9G5T16x{mo#kY>qFBb+x`de0tI)S^88$NG>5sD23oHO+AAH z`c8^?>S-?yT>3y*f~Ce2v!arM{n%wv@hDyCZrAvMbUPI{##vyGHx))6ERMrir>TYKOlwW;^hVxx;1OTrrjds+Jws)MHs-R$_soh!IlC{>Y=&}iu!!2BSFhK(Wh}R(JWyawW zEi6D44BrQb=b4{hcY3wliUjnC(8+2H#p;1hWhxFh?K0UoQo?}3wLJ*9ucT_D+QY*1 zy3%L+G@Ao0I|a#3VgguYRd<{TupO<82_Q<(Y(M_U+o$o^w;a};d*Ib%w>~zIFGSNd z-~w4OqBuGY-`aNXr6zG>wQRsE*+K3>!U(&hYsj4b&QRybNTu@KTJIO)@+&l>oY!TM zMtWX$PIek#F%Pm(b%}7js}0N`d}b9K?GDLU*DDr3-r_DIr^H7UW|cu%sXx95oJ@RopvGPfZ*6|C-}v zk%4W%a@VNa0)W(dX9M@xsqsxaG=%vxlMfr<+7_%ZdA6aFH(&VOHN5b9tI|E+)p4%? z0GOSw@bO3ITu@I84AM#1&G)F+Bhiu($u!oQN6jmh_GJcfY2MAp4kVmx*oglHp7O&s~fp)r3 z98~JI07#o#`aP`ysEud4gK3l;n}CoebS?6T?)Y!YV}27Xe_&;^#^3ntrLhS`+tH8w zH#3bWL9Yqe(^RYRFku5H08&)rZf7Y0xV%|MN#p(@?Sqeo-3K@2A+HTI`mnOV+Ld=n2cczno#o)iFO|4QPH>~=n2w*>$I1@06|l3El+ zXdbMXZs@;-a-i_D+a-8Rq+tf-w0cqqC=#GQ?#Gy~ zV{bmlgh}g(n?G8a$c9(`it1M<>DCYci44AzuN<)f_pxeGJt-pR7G^fC4o2pytMvjh zIiCCXSMd993>&An!vhGwW8ZoN51*cDQR%mNZV6xOgPKp|JI^-%)?6JzH(nlL;4MB(zm=Y+ari_>d zlKGf^b{qf%x-I~0r2rg4#q1=tT`BxwP)dLn_JL30TA|Z)Vu&WYl6p_F&=dwt7vY)Vs?E; zsoMeo(1b442bIUQ7$j%Lp&T?|A|8NF!t^)EzJgxm42$Sabop>0@XFEHgFgWo*|Z+I{Rm0KxIziom4k+g6T0IeGIxarHl(k5#(rEvv3U}naF#!dP0lvSMV zUU-mgTZ2eF0Qx(QzI`2vK%5kVCc6(T+rqQff{hx3-Cei>-Ert#aP~zH0`4Oz2Whbi zaU+QYClC5*0I8r)Wa=#Y=1fOTzY$k_TaX*f+%6#qzm)L+e|_AJtK~KZ9zH#V$G-J2 z{A~5!4c(NZmi}_fe=U74-v`Ap04wV?IcexoNrN78hmy^oK|S^!j4FhUV5xd7C_si|TP$o>_6L!qQj z`k)U&WXP+_8%Ir(92YK+@Z5_lt?g~s_Pb6_X4hboD0DI|`wi@Jhy7pPELC@tGekgL zGb<1nUz)@(FOikv9Iy^rV?^;G+8|lnj)(n3I}&_{tZ%Yeqo6*jQD~c4x>)5Xi#-Tn zBcR~03Kq*3v813~Oof9=ofZIqsHjqV&aFE6JQ2q)D@j4fS2+w>)Iz`NT>p>Ec;V%h zga_=B9{UqV@#x#9Ezn2Qa|zhX+V!|zw;dg)zp9JPpl@4^oh`1YxHEe+MDh=%pHTEa2@W=mLbC(KJ(+Ha_Ph!c%~!HlFLxD@{`Lhy_LrEk znE#@XkLohL1RWO}HiXXx^xytYn@jBR+lFABVtHrV0qD8kSq=d@J2fOf{@urL&rF39 z^@y%G4=`|RF2MG|Ov!WMuFlbaIW&kTzs%a3av`)EHviER&qJFz-n`Np^?v#WENU$jj$T6-{!aMEfhR&`B97V z<1-K04Yil|LA%gZ9|gb(Ee7HOM>@YZV7CPT0?tX7vI>zbN_y2*X=!g?-V}t9kY9THg=|Ma1NBLDk8JjOAu1Zt_RG-JTGIJ zqc8(JGy1~2!hjwH5D?LOK2+`TN=F3l-BZeXfY!ME#pb4U=AxP&-p|l&GobSVKwVKD z#dXnVja7?lF*+@@%h~;G*+jc06&j6aGNO8GOU?_wyMnWSxUuVJedya~@bJA;SG~^f zB&^4F^aKV{O0GXfB2dK~P}IIm1Gd$aTbi~+pho_EQT-L!m)-kvcB`yfa1_+H69tEv^3RBIuiK0|*A!Db~Bi3A7WMoo*k_ zHpj9*^U;63hzrX@?3O!4@F#I#JXGorrPp~0`R#OhP4?@T= z>^j{70>BvF+&zXy!mz*h*Dvq-%}>t_ z@bN!4Z*4asi^}J1PyWiK^_pxPM35LB;6PTkQsD+XQsdbfh;@~He8sS_-OMrEcBw{s zrY_VDk>sWjaaut`44P|DK2;e5;*x?CVN6Lt)OFoIQ^y5>>>_ECGfcVN$mocn@#(oi z^F)KTXD$w_Z-kJ`e_woM13&q1b}j_u$q(N!eAVEb`c2 zx8*>`1%Q!$92EpqNb^K4K&a3ZZNf$jpp9KxR@zKs!NZnly;3!Q;dig##aDKQ2lzXG zB9^>+9jNE3?Sd{An6LWd5*#B0B%$Xg{q@XTS z=LLY@rPh-8d|(g6M1XBWVU?{RW^BCFl5awQjr^8>$7u%|Um6z7^0Wmc+1(c|5Ao4o zzvM3V|55R;(doGXKJh&#;-x5_UA#fFL;jiBSLzLDc40Po_1C1JwBs*}|Ily)yBzvm z)aWLU-^fnFex=Ui=xsa#ssCRgpSGwxj~l8yb~2BBQczn6#Q_ ze|v?E3CEctO%wV<-{Io}e8tdlOyB5HIOllF`kRGUN(z$I(rvgZc9m*gse!s?_YGqD zH5}3}arths4d`IZNzm^ovQ<=f-G$6o`}JCYCKQCyd~9xSC34B9iPmV^(HhWn)Ai{q@DGJgrpb zQxhNmbMv@oc7i4GhQ~{;*unPkwY-04OQ-%fBQNb=Wgaa67UKzg1!jxh(=b`l}SNfGC1M0mw9qfsM`Vn0R!^!Dfs{^AmvF- z?}%<|pvcu3W<2?}6(uKO_V#L1Y1OHKmF>9Lx@mUL3w;xQbJ zYRl1X!0goCKdgXQW+&z@NEITLN!|_?gESvkBbWHX(h$%6_R^mE^2}d6L8oUY_V^yD z$R|tUlwe>M6Axyq@F9_b<}C~+zo}Sx{8`Zf88%-JL>N@D5kkaq*ok+QCu&c4K)~H2 z|0?pM(!=@p9eKxV?zI>UniRCB!95_?YlV5mw1uuSW_gRCp)0Mdf_dwa(#@PgjAfEG&X_zpZ%P@_x zl;P$G?5QwhS+OZ-1?I3-Gf7=?c~IN^7;SC_=TRVy<%{UdwW8GH& zfsP9R;n<9`Y4`~ss8Ry4bQShq11}UfFkK1++Rdt2Oass5VJ8~aIb}TwQHWMgLm_DS z&ESvz%S-L1zzv#)TH)8ZQ$rCSvtn4?u3=dgRXcfRgX!;c1%&Zw8^bI6Yn{$#(Rt$j z%g31uAsWWtPlZ^4OkI1-!PRKyflCT11W8w^(*mHXfTWW8a4p-_m0f6R*bd$=_kzZ` zFZu2FP3QIyL9cP-?)8Gh#j1E4M7<3ruWUxfLY#iT0;UT~BmU^Wcx&eaR4##hm1|lL zD>OoR-n$4v6A~HBb17`v{tvpDY6JOd|2-Sid9-+PNmXN}Uz}k__mlt8-DaKvA~Gn_7O5-D{bNxmL3g z1dv6}AtF-^1RPBUVrOcG*i#p&BK0%`Jag}0ScKWs!hg)b**{$87hYNk&uat;`s4mR z+!9<2Tf7g-kg}Gh#g{EsBA}b@4DlN1fS5m!-FL{UnA81pK%X+W^rgTMh&;;b zM?kRxUx>xDg@S1*4x!))F83&ou9%7W+jLz8=(Yd=VB1ie@g|_25B;^Jz+6>|z-zv@ zD`~fr)zhEP|IQwgfwo0GM+zp&xdZ`ul%y|rz#)a= z-*>@X@OXf<%l_*yJ9XX$sLjVOuVG#4`0|gA3jpansmH%oV^AXSEFteL@XJlF!1X|;@12_f@{StWWJ)VCbV;VtRc5HYb78W^0I>JJ z`OcOcls8WaaR-JuIu5jV^*aTLjL6tQnG~b~zr=UN$}z3Rp52-hbSr=W-4+0K-oR21 zIEI#=kO@d!>US2ePVBxo5iz~+@=D$ybN9sLLW@~(i6SW|^}|At1#xmkGb}=MgX4s zt;_i0#l7Pe;|JHN+WKxXrfyAEPGwWWnE|BqXV35!D8S(v*=tL($i{&uvHz2#s5Q7+ zP&rlUeB4!N0d2av)G?@7@EBk4)Bo$V9h2QYGO?r7aRE??S*BGVY!5(?0&hMFz$UBX zH3G@kg@p|*E0A2251E;quKmcbyt$`@p>b5! zHBbf$G5JyVg6P*FDadC-I&d>b=`@(#qxR`{s%zjyj-^^^LI?Ria!d*;!8;Dum*wM% z@8iCom_l&>_8{PXQrZwOre|`Uq`3PsT(eAy05_X^D685Ik(YCS|J)+~(tovnG_RuFIk zm~C$fKqh=Wb2tI)`WQFfC_S0^A(|>czHJ0%j{;tpv*uz@?H+ci2~c&ObPoV>9q{uZ z{B0IZXQ|r)z@cODukbsEuFBsw<3YsqL$&F--@J_X{_F*u{e!jEuDtlQb^P^T zxX2flhH6sSsxP{_>t9TTMT}bX$Kw(v*D)99dFH1d{}*raUct+fQZP{Vc%{B%Ys;MT zx~xl}lWI~F&O?)e%%7KJqDB76&dKsy$4$hD(*(>=*T_EeT;>n~7Z@ZLlSYfmRqS8K zOf0o6v!KnUq$-W-Z|*qlEm8b{QMr{DyJG?{xl&awz$TajA*MBikTEe6@aoc#p8V`Z zK7DKg-+0F)z4MMKtZXuW@#`D(;@37}?7D4%9Y`3Lyc!Fc;N+GyXu>Ttbry&!sf&Zj z2>FG}LwfEvFXKlZIeyLKIy+rqX`^;QgUO>B`>n-SOss`ogPPoW8A_5kk-HX{XR{j`(se9Z&BkJM=aP}gY* zkr1>19znDKsY{nu1?V|dBXtAOunm^Fvk(Hxh(H%E5Bb%lA^!CrtmWC1_Pn#KHzX`V zU0!B-*!k2AV{#u?!zzx%4(8Bdu_w~A2~6@h2Js6oEz_g#ID&^It8uU7Ty|E|K)6eD z1%gjM4T882$+`+-?D!4XL`efwM0!aPZdedd{0%|%@_8<>Ps{pOM8 z({j)AdGuy?hCm?&^!$ow=pg%5p9DBGY(tWtYGMX|^q;@6=QswT)3X)Kme2iCZ-tGc zzLS?_zeO$Rceu61MdM-jlK8XXza ztFm}aBfS6AX#oJ>yxM(g%bCsZ0)Ijds0jgqm<0#m1Rxfnx4Md(ZOKunIH8bN3kmuO z?O45fbv8Qe!eSPJ3M%$9yx|LPi>s%B5;#Zzy>fYoy|^$vWlLEj_;R=;wF$L+v8vtD zM;~tyzX6z0Ym{c*`b!n1DA1iLmB&q0fh_+8iZG9WV20W`1x-W{sC_}%%92Y9*B?6* z%=g1Q7~Q3A3xE^}NV2<&RcLYBezW=Z*saWfEUfGpT+m*p8wRt%?Dsq=HTGRl|Cl~k zkTElP)fl1Aj*YywlCP3Ur#srnd$>(Jr4Rq~3rp9e1>8F~$T5GUPm$gUzCi|vAqy|J z0_PNFZBgB`9E+f)_YbB~60f>Nm;~s^0`BiC58E72_a0NFPNC3%H5zN4DwdHhmih!- zR1Yq3fzDC41puHfA3=jyy-SIbeay^iw`ss%@KO7f-23j+x3@4=cGu@$$qv>jNKSkd zp$DPc0d=-xexJi|(ilLPN=u-t?X2!JCIBm&Tto=&ezEfDOdfb--=;7%rLhL0_rfG- z1VB?k(Wq^yhEBmlKu+L5R^8HkGFPsq2P-biTrhRKKN$XAfQA0MKIxTxAkhAjB&paD zHci0IL2~7`Y<0>fq3WPIl`T$3CaHOVgg-NMAnJUcd^H(QL_f3FJj@kFLB$~BGtGMQ z7=>vv+JKixxfKx*%oi^E?ZrHsd2^zjPR~u6@n0^zehi@g|2#nMYq0$X1L=$#T_xbc z6CnTUdFT2=d7tP?0n`brH?aq= z%m$aj9Qu*(9m*&aV#$WNOhqin@m0WNk}O z1pf^US4oSl&9+t61IQXjB|7>5;6LtzDjb8a(1>1DF9Zbjt-mpo%Q z6kN>#D@CP2P1c@6-!s0T@9~9K))Cjqa>nwQe}Q-1F(nXNh~rQFv<``rAeabVpeam} zjb;j63dK(3Pw^zk%I`##BqQd8FNm&h`z#t5pi90SH_c1Fv*L=H10dgBJM8+F%|e}1 zH*$X84C=H12z%Ek@~rcVlPb@|0@{(4b2pVi_Yu>Xkhsp<;>sMRhUc~wgcf%d8!%R; zrD_tesF%X+Zbn*S5+ER!2s2+Ij6KF+)7cjxW+K9if3(q(B;XdK1&NIhbDy0WY+-U)j$k1;fOwf?p2_PqjH21huU7tumxQr{L39KNWL+8~tbOvrZCp;r* zy9C&LhrcMBvQ`1t7qSpBqZc}Dp{!llFuGG}JJ;aljT$d};j+7^&}X;N4o)8%h&lqx zN@lCL;)|$iti0yflL}yVT!=!VfJJpj78Z7fO%E5py-0T{EnqPd1{ivi&|n=Euqs_0 zQ)>V*HAdDdpnGozn%8!cIvoiJ0ALs9tB0JOm=96*|4A|TaY;dbMatXiYD_uw1k`&- zYTAnJZk@=9DxRMKhz-)BKZ+Wfneja*e-H1w^EdIHlfQ>!lPlPUDDby!l|aJZ_kMYA zpZfp%?xAVFC63sPvl-vNZH{rRwH!Sj(8^z>7~}TFciNY2Sy*HX71x);u<)1P`IS8l z?si0c9*pxK{xrSk%jd3p`Vr8eIgGheMX$9MYeXS;?`u(Hw z?6cyaizSKHz;3nXu-15iVBxY-Ci}16_v`dy?|cDoJN)(QH&(mfU>E@Kw!_!`tKEvU zaNS$v+$PiG{2LFPM^!&Xf94N9eZ3#kX#r59My0z-NWob}?U0v3r}49<(Wcy1Q4z!9 zPEHLV@i@6WmUK;4Gi^2ZJNlUJDr%?*2m`-G02yF8KY0cJ`#1d~`m6W-tNk9@o(>i* zpsvpFZ#?h_Mq3}DN6#-_uZBB~0aU2OZN|<7IWZZ=r}ynT!P0YR`6?o`bW_-e^1-c(yYV1%MH| z0uNS(%9xa;^fL!A4PFBfn7P))-`r3vn4+uV14#~%;6n()Eg+l*j<7dR0EtD=U22Hw z?|<_@!ne--;eHQfPY0a{4`ML!{Pk+C;{u=ttTHU8umFt;POG|i+UHf;<8*S)TuFu$oKusERrLfuG4$%^Ft1)-Tc_U2)C`o+i$x``W-uZv+ z_fYoKHL9y;u17PS766GXxW>ho1YAHabNavS6eO;>e39-Hq#(cFeq5|}Tk|ag5gMc; zZaj;XS5rj2e>r``YN5NgSOrQ3ZC3yoK>S${*Q0&P=CbU?vf5PHC8_l-XW@(R!$%VB{v}WMrS% zSc<=S;~?9*N3(BwiCwSxy@$i|y@mDjF{>yXDk7O_&A^>TMz<*ejPX{c(6^4Jnu*(; zmus$6KNnw%)E;PO?B7ycb@)BK?|1JqE^6J^+q|0SKEkC}zB$62o`m^6itLv#^@kX4 zJNUM!ykSJQ0rlFL^JnQ#L0eAhg-eLdyoG>tHF}ZqiC5{tC*xvYrMB@uDVAa5OuM&G zz0MrdDftpO?L=6n)Q>d>6Sdxtx`Wtc?}_&vPCeI^V7WIDo2?B{UUD2+-=rVgzj=n} z^c{y@8idMi?%8@dxjRPbm7mYJ{374K^h9u9zlX4XeqcU>ng0Y@pS3+{ku0!9B}bx@ z(S|KCJ-P@%&;Izan2E8S|F%_Ed#o>O?@wmSrsoD{cmvM>b&Crp1fp-5@IPt0J1NRK z?TzHQ2dmW|yc{BxFF3Yg=W~ITxL-@3XYDi4gW5vC_>HknB3BwT^`jP)^rL;lY7wS_ z?4fFOQpZ;8<($WH^U2M-5IdmgHwxxh^j8@2%ubu7u+Q-^KDsD=ry5e6Mew>?vFy~h z4;)QZiQW~sn3A9+^FRh`d~fp?7Po#bqaF~JD#Wt7+`AF2J@Hos4HcGop*v$ZkH(6M z#mL@;X&+~XL3GO@@`~c*;tFXhbT0gMkyy|cyz<6uzaKg0v7)GbtIcxL$^C<6OF?y2 zAN6y}T3+z_md|}T20qP|iw!+wYO~Zi&c`rT+xs!(*IW#uFUj2#GV|jb2KZJ=yMzC~ zyMF&|8U$IJeSSJ)Y10I#6HF*07rEXo1LBua4=5b|!CsfZE7{E{J|2&cQG^ANlT+GU zlFm_QI(TIywSI?2=B99H{MRGTvu;+pbC{c{9oc2%A5Ik-wJPvS3r=WOit62%f?$tG zb^-(M8V_#CH#*uxsL@1&k3!<`wP(%1vh8dK5-0ji>L_|8$1$pW5wCL3u1q0z=!?rc z@UshO>Tdb86;korwlbQayDzL}p?X_h3n;qXON(M6Kk~;ipWW4>K64B_6QlYsN6(PU zPgVAPZMF^PJH5#LeJq5~GF@7A_BDY~7aML?c#}Rq*cNQHRGsa0QFZ{O4anR!-AJCZ zt`)kO?Bkig*ly>aCp zEP~OT(@9t9JbY0C<>vK{h#m5RF>_hapsWFG&lk27{$WN5y2wb#cJ00oj-=f4mp$sC z>O01IRyrk_OuTO3E`$5|p?SBez4H3N^6g&_GJ_Df>HyKKJsmKEI&h+%#pPvhYSj>u zFgU}&cDy;@QA^K1B17!ANF_zpS!1o2M$ZR5;L4oHct*-7uB(Z+pw-r81^>{t(5g&g z+&?KXgMnsDk*I5Gknn8f7rd#4)-r(SDN zroIbVQotWGi0t?@di)7txLjnQIkU+YL(1f(yaxlXgBHlO6zgipHpC$u5Rcn@`U5SG zPX_!v%OB*WG@jn(s~8{3IKm2Y?EdK|YqaYHGM=h9VjlD4Ga)A0s%Qps%owgwVRJ;^ zJ^Y|+rgWa}&TaHB*l!SeEhd!up^25-7_TP9VT-N-ai6WQm4izUBIj(^buWQ;Lkf*i zKH@cZhyyoCISdAM$f&@p&g`}x6IoKDzD?_Q$vR2Mkma|M&Zl8dLFq8U*SZLOdp6J4fSb63rLgj(SWD{ zeRzR)qtM8r=k=#v9mt1Y7ZKlTvC;;6O;^|*^y*rLuyDzWre>K?Mpw?6j;8o9hrWg( zfg%6+9xZ>N)WqdG)JW|ng3Hig%DC1}(M`n~`p34IRVQ|;PmQrY%aWQ#thp&M%)#lp zLSoHKAC@wvE94X;W`6EKGEt^v-eHPctB8vDQOC?DSOe~Tgz@mzp}4f8PEAwAkFI-z zIdlw}VcqHKc%5g_*Y5zgwELfU&}2%gMuwRA7n`gwBOFCqeXl>X)!~qo=F^l&8=fb# z;ZqE)M!%4q(V+Ov$`O65Eu*)EEJuu&p^f7RZ^E(I(V4D*Jrh{Y5snV;>g;k$yrQ2q zrqNeW?G5x)GvOm+W|96TY$#*(WtZItHVMR8BO+S>AN%~mWc6&v%Mi%#zO_*pj~B9> zF^W{38z3!np8wLMn9xNBRt-%729bJlWOTBYZ6ubl+SPS>cXQO47!{;d0&%H~&E!4R zT}&1mRJr-#nz|cHVD2?=^0zEI4@Zzt{%=C;(gA zHEoYQ0E*JFBqK<2$|*rj4a#mPCxAPE4WMtWu!O!rcV(qD0F0z(SiY9#A(U!?u>5Pk zXVU8%`~5jr!vo*|FoW{{N;?n^KbHUwmS(^OTmYd^&VwL;1!urjh~Q!U5+DFq;1439 ztsrm_guziY{^84S|M1295HLSzF1@@PPEsPEMCR{vSex<2Ih=%D9H6{gAJ}Q_FkG)l zqE!MFu~-hu8V)1*CoYMf6?|2B4PP5$BQA-k>eh8!PHJ`|E{So~wsjm129J%nBHv0B{?K~D)~#BcYKmIfQ2N^NS%##-o<&n&3^!5L~V%x literal 0 HcmV?d00001 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 f9a1a709b..c0ce2fcfd 100644 --- a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc +++ b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc @@ -8,19 +8,18 @@ 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 **************** + // **************** NanaZip Modification Start **************** - CONTROL "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 100, xc, 10 + // 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 "Use &large memory pages", IDX_SETTINGS_LARGE_PAGES, MY_CHECKBOX, m, 122, 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 "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 "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 114, xc, 10 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 f9a1a709b..c0ce2fcfd 100644 --- a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc +++ b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc @@ -8,19 +8,18 @@ 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 **************** + // **************** NanaZip Modification Start **************** - CONTROL "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 100, xc, 10 + // 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 "Use &large memory pages", IDX_SETTINGS_LARGE_PAGES, MY_CHECKBOX, m, 122, 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 "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 "Show system &menu", IDX_SETTINGS_SHOW_SYSTEM_MENU, MY_CHECKBOX, m, 114, xc, 10 From 69ff084f0f1bf3428c6397441b53255a55ffbffa Mon Sep 17 00:00:00 2001 From: Dax Dupont <17237624+DaxDupont@users.noreply.github.com> Date: Sun, 12 Jan 2025 15:38:16 +0100 Subject: [PATCH 8/8] Remove accidentally commited file + fixes indentation --- .../CPP/7zip/Bundles/SFXCon/resource.aps | Bin 72228 -> 0 bytes .../CPP/7zip/UI/FileManager/SettingsPage2.rc | 14 +++++++------- .../CPP/7zip/UI/FileManager/SettingsPage2.rc | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 NanaZip.Core/SevenZip/CPP/7zip/Bundles/SFXCon/resource.aps diff --git a/NanaZip.Core/SevenZip/CPP/7zip/Bundles/SFXCon/resource.aps b/NanaZip.Core/SevenZip/CPP/7zip/Bundles/SFXCon/resource.aps deleted file mode 100644 index ddb0a93c01c0a1a8a3d95e9ca0f28e48fd72f2a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72228 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
      aE4&`U$V)&ny4}Jg8CkL;GGN4?j&*)&_ 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 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 c0ce2fcfd..0d58f8dd7 100644 --- a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc +++ b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc @@ -10,14 +10,14 @@ BEGIN 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 "Use &large memory pages", IDX_SETTINGS_LARGE_PAGES, MY_CHECKBOX, m, 122, 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 "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 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 c0ce2fcfd..0d58f8dd7 100644 --- a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc +++ b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc @@ -10,14 +10,14 @@ BEGIN 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 "Use &large memory pages", IDX_SETTINGS_LARGE_PAGES, MY_CHECKBOX, m, 122, 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 "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