xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-14 12:11:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Origial James Hoo mod to 16.04

Browse Source
This commit is contained in:
shunf4
2024-04-20 18:55:53 +08:00
parent 603abd5528
commit eaa3e8b48c
86 changed files with 55401 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
CPP/7zip/UI/FileManager/PanelSplitFile.cpp
View File

@@ -422,6 +422,9 @@ void CApp::Combine()
AddInfoFileName(info, fs2us(combiner.Names.Back()));
}
bool openOutputFolder;
bool deleteSourceFile;
bool close7Zip;
{
CCopyDialog copyDialog;
copyDialog.Value = path;
@@ -430,9 +433,13 @@ void CApp::Combine()
copyDialog.Title += srcPanel.GetItemRelPath(index);
LangString(IDS_COMBINE_TO, copyDialog.Static);
copyDialog.Info = info;
copyDialog.m_currentFolderPrefix = srcPanel.GetItemFullPath(index);
if (copyDialog.Create(srcPanel.GetParent()) != IDOK)
return;
path = copyDialog.Value;
openOutputFolder = copyDialog.m_bOpenOutputFolder;
deleteSourceFile = copyDialog.m_bDeleteSourceFile;
close7Zip = copyDialog.m_bClose7Zip;
}
NName::NormalizeDirPathPrefix(path);
@@ -479,6 +486,37 @@ void CApp::Combine()
if (combiner.Create(title, _window) != 0)
return;
if (openOutputFolder)
{
StartApplicationDontWait(path, path, (HWND)_window);
}
if (deleteSourceFile)
{
DWORD dwAttr;
UString strFilePath;
for (i = 0; i < combiner.Names.Size(); i++)
{
strFilePath = srcPath + combiner.Names[i];
dwAttr = GetFileAttributesW(strFilePath);
if ((dwAttr != INVALID_FILE_ATTRIBUTES)
&& (dwAttr & FILE_ATTRIBUTE_ARCHIVE))
{
if (dwAttr & FILE_ATTRIBUTE_READONLY)
{
dwAttr &= (~FILE_ATTRIBUTE_READONLY);
SetFileAttributesW(strFilePath, dwAttr);
}
::DeleteFileW(strFilePath);
}
}
}
if (close7Zip)
{
PostMessage (_window, WM_CLOSE, 0, 0);
}
}
RefreshTitleAlways();