4.25 beta

This commit is contained in:
Igor Pavlov
2005-08-01 00:00:00 +00:00
committed by Kornel Lesiński
parent 47f4915611
commit af1fe52701
359 changed files with 5969 additions and 9853 deletions

View File

@@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?><assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="7-Zip.7-Zip.7zFM" type="win32"/><description>7-Zip File manager.</description><dependency> <dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"/></dependentAssembly></dependency></assembly>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?><assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="7-Zip.7-Zip.7zFM" type="win32"/><description>7-Zip File manager.</description><dependency> <dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/></dependentAssembly></dependency></assembly>

View File

@@ -71,6 +71,7 @@ void CApp::SetListSettings()
extendedStyle |= LVS_EX_FULLROWSELECT;
if (ReadShowGrid())
extendedStyle |= LVS_EX_GRIDLINES;
bool mySelectionMode = ReadAlternativeSelection();
/*
if (ReadSingleClick())
@@ -84,10 +85,19 @@ void CApp::SetListSettings()
for (int i = 0; i < kNumPanelsMax; i++)
{
Panels[i]._showDots = showDots;
Panels[i]._showRealFileIcons = showRealFileIcons;
Panels[i]._exStyle = extendedStyle;
Panels[i].SetExtendedStyle();
CPanel &panel = Panels[i];
panel._mySelectMode = mySelectionMode;
panel._showDots = showDots;
panel._showRealFileIcons = showRealFileIcons;
panel._exStyle = extendedStyle;
DWORD style = panel._listView.GetStyle();
if (mySelectionMode)
style |= LVS_SINGLESEL;
else
style &= ~LVS_SINGLESEL;
panel._listView.SetStyle(style);
panel.SetExtendedStyle();
}
}
@@ -477,7 +487,7 @@ void CApp::OnCopy(bool move, bool copyToSame, int srcPanelIndex)
if (focusedItem < 0)
return;
int realIndex = srcPanel.GetRealItemIndex(focusedItem);
if (realIndex == -1)
if (realIndex == kParentIndex)
return;
indices.Add(realIndex);
destPath = srcPanel.GetItemName(realIndex);
@@ -660,7 +670,7 @@ void CApp::OnSetSubFolder(int srcPanelIndex)
destPanel.BindToFolder(string);
*/
CMyComPtr<IFolderFolder> newFolder;
if (realIndex == -1)
if (realIndex == kParentIndex)
{
if (srcPanel._folder->BindToParentFolder(&newFolder) != S_OK)
return;

View File

@@ -50,6 +50,7 @@ class CDropTarget:
public CMyUnknownImp
{
CMyComPtr<IDataObject> m_DataObject;
UStringVector m_SourcePaths;
int m_SelectionIndex;
bool m_DropIsAllowed; // = true, if data contain fillist
bool m_PanelDropIsAllowed; // = false, if current target_panel is source_panel.
@@ -60,6 +61,10 @@ class CDropTarget:
CPanel *m_Panel;
bool m_IsAppTarget; // true, if we want to drop to app window (not to panel).
bool m_SetPathIsOK;
bool IsItSameDrive() const;
void QueryGetData(IDataObject *dataObject);
bool IsFsFolderPath() const;
DWORD GetEffect(DWORD keyState, POINTL pt, DWORD allowedEffect);
@@ -87,7 +92,8 @@ public:
m_PanelDropIsAllowed(false),
m_DropIsAllowed(false),
m_SelectionIndex(-1),
m_SubFolderIndex(-1) {}
m_SubFolderIndex(-1),
m_SetPathIsOK(false) {}
CApp *App;
int SrcPanelIndex; // index of D&D source_panel

View File

@@ -6,6 +6,7 @@
#include "Windows/FileFind.h"
#include "Windows/FileDir.h"
#include "Windows/Error.h"
#include "Resource/OverwriteDialog/OverwriteDialog.h"
#ifndef _NO_CRYPTO
@@ -228,8 +229,10 @@ HRESULT CExtractCallbackImp::ExtractResult(HRESULT result)
if (result == S_OK)
return result;
NumArchiveErrors++;
if (result == E_ABORT)
if (result == E_ABORT || result == ERROR_DISK_FULL)
return result;
MessageError(_currentFilePath);
MessageError(NError::MyFormatMessageW(result));
return S_OK;
}

View File

@@ -126,7 +126,7 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
g_hInstance = hInstance;
ReloadLang();
ReloadLangSmart();
// LoadString(hInstance, IDS_CLASS, windowClass, MAX_LOADSTRING);

View File

@@ -401,15 +401,6 @@ SOURCE=.\PanelSplitFile.cpp
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\Resource\SettingsPage\resource.h
# End Source File
# Begin Source File
SOURCE=.\Resource\SettingsPage\resource.rc
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Resource\SettingsPage\SettingsPage.cpp
# End Source File
# Begin Source File
@@ -461,15 +452,6 @@ SOURCE=Resource\PasswordDialog\PasswordDialog.cpp
SOURCE=Resource\PasswordDialog\PasswordDialog.h
# End Source File
# Begin Source File
SOURCE=.\Resource\PasswordDialog\resource.h
# End Source File
# Begin Source File
SOURCE=.\Resource\PasswordDialog\resource.rc
# PROP Exclude_From_Build 1
# End Source File
# End Group
# Begin Group "Progress"
@@ -482,15 +464,6 @@ SOURCE=.\Resource\ProgressDialog2\ProgressDialog.cpp
SOURCE=.\Resource\ProgressDialog2\ProgressDialog.h
# End Source File
# Begin Source File
SOURCE=.\Resource\ProgressDialog2\resource.h
# End Source File
# Begin Source File
SOURCE=.\Resource\ProgressDialog2\resource.rc
# PROP Exclude_From_Build 1
# End Source File
# End Group
# Begin Group "About"
@@ -503,15 +476,6 @@ SOURCE=.\Resource\AboutDialog\AboutDialog.cpp
SOURCE=.\Resource\AboutDialog\AboutDialog.h
# End Source File
# Begin Source File
SOURCE=.\Resource\AboutDialog\resource.h
# End Source File
# Begin Source File
SOURCE=.\Resource\AboutDialog\resource.rc
# PROP Exclude_From_Build 1
# End Source File
# End Group
# Begin Group "Benchmark"
@@ -524,30 +488,12 @@ SOURCE=.\Resource\BenchmarkDialog\BenchmarkDialog.cpp
SOURCE=.\Resource\BenchmarkDialog\BenchmarkDialog.h
# End Source File
# Begin Source File
SOURCE=.\Resource\BenchmarkDialog\resource.h
# End Source File
# Begin Source File
SOURCE=.\Resource\BenchmarkDialog\resource.rc
# PROP Exclude_From_Build 1
# End Source File
# End Group
# Begin Group "Split"
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\Resource\SplitDialog\resource.h
# End Source File
# Begin Source File
SOURCE=.\Resource\SplitDialog\resource.rc
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\Resource\SplitDialog\SplitDialog.cpp
# End Source File
# Begin Source File
@@ -1110,6 +1056,10 @@ SOURCE=.\7zFM.exe.manifest
# End Source File
# Begin Source File
SOURCE=.\7zipLogo.ico
# End Source File
# Begin Source File
SOURCE=.\Add2.bmp
# End Source File
# Begin Source File

View File

@@ -4,9 +4,11 @@
#include "LangUtils.h"
#include "Common/StringConvert.h"
#include "Common/StringToInt.h"
#include "Windows/ResourceString.h"
#include "Windows/Synchronization.h"
#include "Windows/Window.h"
#include "Windows/FileFind.h"
#include "RegistryUtils.h"
#include "ProgramLocation.h"
@@ -19,7 +21,7 @@ void ReloadLang()
{
ReadRegLang(g_LangID);
g_Lang.Clear();
if (!g_LangID.IsEmpty())
if (!g_LangID.IsEmpty() && g_LangID != TEXT("-"))
{
CSysString langPath = g_LangID;
if (langPath.Find('\\') < 0)
@@ -98,3 +100,96 @@ UString LangLoadStringW(UINT resourceID, UInt32 langID)
return message;
return NWindows::MyLoadStringW(resourceID);
}
void LoadLangs(CObjectVector<CLangEx> &langs)
{
langs.Clear();
UString folderPath;
if (!::GetProgramFolderPath(folderPath))
return;
folderPath += L"Lang\\";
NWindows::NFile::NFind::CEnumeratorW enumerator(folderPath + L"*.txt");
NWindows::NFile::NFind::CFileInfoW fileInfo;
while (enumerator.Next(fileInfo))
{
if (fileInfo.IsDirectory())
continue;
CLangEx lang;
UString filePath = folderPath + fileInfo.Name;
const kExtSize = 4;
if (fileInfo.Name.Right(kExtSize) != L".txt")
continue;
lang.ShortName = fileInfo.Name.Left(fileInfo.Name.Length() - kExtSize);
if (lang.Lang.Open(GetSystemString(filePath)))
langs.Add(lang);
}
}
bool SplidID(const UString &id, WORD &primID, WORD &subID)
{
primID = 0;
subID = 0;
const wchar_t *start = id;
const wchar_t *end;
UInt64 value = ConvertStringToUInt64(start, &end);
if (start == end)
return false;
primID = (WORD)value;
if (*end == 0)
return true;
if (*end != L'-')
return false;
start = end + 1;
value = ConvertStringToUInt64(start, &end);
if (start == end)
return false;
subID = (WORD)value;
return (*end == 0);
}
void FindMatchLang(UString &shortName)
{
shortName.Empty();
LANGID langID = GetUserDefaultLangID();
WORD primLang = PRIMARYLANGID(langID);
WORD subLang = SUBLANGID(langID);
CObjectVector<CLangEx> langs;
LoadLangs(langs);
for (int i = 0; i < langs.Size(); i++)
{
const CLangEx &lang = langs[i];
UString id;
if (lang.Lang.GetMessage(0x00000002, id))
{
WORD primID;
WORD subID;
if (SplidID(id, primID, subID))
if (primID == primLang)
{
if (subID == 0)
shortName = lang.ShortName;
if (subLang == subID)
{
shortName = lang.ShortName;
return;
}
}
}
}
}
void ReloadLangSmart()
{
#ifdef _UNICODE
ReadRegLang(g_LangID);
if (g_LangID.IsEmpty())
{
UString shortName;
FindMatchLang(shortName);
if (shortName.IsEmpty())
shortName = L"-";
SaveRegLang(GetSystemString(shortName));
}
#endif
ReloadLang();
}

View File

@@ -15,6 +15,15 @@ struct CIDLangPair
void ReloadLang();
void LoadLangOneTime();
void ReloadLangSmart();
struct CLangEx
{
CLang Lang;
UString ShortName;
};
void LoadLangs(CObjectVector<CLangEx> &langs);
void LangSetDlgItemsText(HWND dialogWindow, CIDLangPair *idLangPairs, int numItems);
void LangSetWindowText(HWND window, UInt32 langID);

View File

@@ -59,7 +59,6 @@ LRESULT CPanel::Create(HWND mainWindow, HWND parentWindow, UINT id,
_processTimer = true;
_processNotify = true;
_panelCallback = panelCallback;
_appState = appState;
// _index = index;
@@ -82,7 +81,7 @@ LRESULT CPanel::Create(HWND mainWindow, HWND parentWindow, UINT id,
return S_OK;
}
LRESULT CPanel::OnMessage(UINT message, UINT wParam, LPARAM lParam)
LRESULT CPanel::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
{
switch(message)
{
@@ -303,8 +302,9 @@ bool CPanel::OnCreate(CREATESTRUCT *createStruct)
style |= kStyles[_ListViewMode]
| WS_TABSTOP
| LVS_EDITLABELS
| LVS_SINGLESEL;
| LVS_EDITLABELS;
if (_mySelectMode)
style |= LVS_SINGLESEL;
/*
if (_virtualMode)
@@ -608,6 +608,8 @@ void CPanel::MessageBoxMyError(LPCWSTR message)
{ MessageBox(message, L"Error"); }
void CPanel::MessageBoxError(HRESULT errorCode, LPCWSTR caption)
{ MessageBox(GetUnicodeString(NError::MyFormatMessage(errorCode)), caption); }
void CPanel::MessageBoxError(HRESULT errorCode)
{ MessageBoxError(errorCode, L"7-Zip"); }
void CPanel::MessageBoxLastError(LPCWSTR caption)
{ MessageBoxError(::GetLastError(), caption); }
void CPanel::MessageBoxLastError()
@@ -639,7 +641,7 @@ UString CPanel::GetFolderTypeID() const
return L"";
CMyComBSTR typeID;
folderGetTypeID->GetTypeID(&typeID);
return typeID;
return (wchar_t *)typeID;
}
bool CPanel::IsRootFolder() const
@@ -657,6 +659,36 @@ bool CPanel::IsFSDrivesFolder() const
return (GetFolderTypeID() == L"FSDrives");
}
UString CPanel::GetFsPath() const
{
if (IsFSDrivesFolder())
return UString();
return _currentFolderPrefix;
}
UString CPanel::GetDriveOrNetworkPrefix() const
{
if (!IsFSFolder())
return UString();
UString drive = GetFsPath();
if (drive.Length() < 3)
return UString();
if (drive[0] == L'\\' && drive[1] == L'\\')
{
// if network
int pos = drive.Find(L'\\', 2);
if (pos < 0)
return UString();
pos = drive.Find(L'\\', pos + 1);
if (pos < 0)
return UString();
return drive.Left(pos + 1);
}
if (drive[1] != L':' || drive[2] != L'\\')
return UString();
return drive.Left(3);
}
bool CPanel::DoesItSupportOperations() const
{
CMyComPtr<IFolderOperations> folderOperations;

View File

@@ -30,6 +30,8 @@ const int kParentFolderID = 100;
const int kPluginMenuStartID = 1000;
const int kToolbarStartID = 2000;
const int kParentIndex = -1;
class CPanelCallback
{
public:
@@ -150,7 +152,7 @@ class CPanel:public NWindows::NControl::CWindow2
CAppState *_appState;
bool OnCommand(int code, int itemID, LPARAM lParam, LRESULT &result);
LRESULT OnMessage(UINT message, UINT wParam, LPARAM lParam);
LRESULT OnMessage(UINT message, WPARAM wParam, LPARAM lParam);
virtual bool OnCreate(CREATESTRUCT *createStruct);
virtual bool OnSize(WPARAM wParam, int xSize, int ySize);
virtual void OnDestroy();
@@ -159,6 +161,7 @@ class CPanel:public NWindows::NControl::CWindow2
bool OnNotifyComboBoxEndEdit(PNMCBEENDEDIT info, LRESULT &result);
bool OnNotifyReBar(LPNMHDR lParam, LRESULT &result);
bool OnNotifyComboBox(LPNMHDR lParam, LRESULT &result);
void OnItemChanged(NMLISTVIEW *item);
bool OnNotifyList(LPNMHDR lParam, LRESULT &result);
void OnDrag(LPNMLISTVIEW nmListView);
bool OnKeyDown(LPNMLVKEYDOWN keyDownInfo, LRESULT &result);
@@ -192,6 +195,7 @@ private:
// void OnUpWithShift();
// void OnDownWithShift();
public:
void UpdateSelection();
void SelectSpec(bool selectMode);
void SelectByType(bool selectMode);
void SelectAll(bool selectMode);
@@ -219,8 +223,11 @@ public:
bool _showRealFileIcons;
// bool _virtualMode;
// CUIntVector _realIndices;
bool _mySelectMode;
CBoolVector _selectedStatusVector;
UString _focusedName;
UInt32 GetRealIndex(const LVITEM &item) const
{
/*
@@ -303,15 +310,14 @@ public:
_startGroupSelect(0),
_selectionIsDefined(false),
_ListViewMode(3),
_xSize(300)
_xSize(300),
_mySelectMode(false)
{}
void SetExtendedStyle()
{
// DWORD extendedStyle = _listView.GetExtendedListViewStyle();
if (_listView != 0)
_listView.SetExtendedListViewStyle(_exStyle);
// extendedStyle |= _exStyle;
}
@@ -336,7 +342,7 @@ public:
CMyComPtr<IContextMenu> _sevenZipContextMenu;
CMyComPtr<IContextMenu> _systemContextMenu;
void CreateShellContextMenu(
HRESULT CreateShellContextMenu(
const CRecordVector<UInt32> &operatedIndices,
CMyComPtr<IContextMenu> &systemContextMenu);
void CreateSystemMenu(HMENU menu,
@@ -379,6 +385,9 @@ public:
bool IsFSFolder() const;
bool IsFSDrivesFolder() const;
UString GetFsPath() const;
UString GetDriveOrNetworkPrefix() const;
bool DoesItSupportOperations() const;
bool _processTimer;
@@ -418,6 +427,7 @@ public:
void MessageBox(LPCWSTR message, LPCWSTR caption);
void MessageBoxMyError(LPCWSTR message);
void MessageBoxError(HRESULT errorCode, LPCWSTR caption);
void MessageBoxError(HRESULT errorCode);
void MessageBoxLastError(LPCWSTR caption);
void MessageBoxLastError();

View File

@@ -176,11 +176,12 @@ HRESULT CPanel::CopyFrom(const UString &folderPrefix, const UStringVector &fileP
void CPanel::CopyFrom(const UStringVector &filePaths)
{
UString message = L"Are you sure you want to copy files to archive\n\'";
UString title = LangLoadStringW(IDS_CONFIRM_FILE_COPY, 0x03020222);
UString message = LangLoadStringW(IDS_WANT_TO_COPY_FILES, 0x03020223);
message += L"\n\'";
message += _currentFolderPrefix;
message += L"\' ?";
int res = ::MessageBoxW(*(this), message, L"Confirm File Copy",
MB_YESNOCANCEL | MB_ICONQUESTION | MB_SYSTEMMODAL);
int res = ::MessageBoxW(*(this), message, title, MB_YESNOCANCEL | MB_ICONQUESTION | MB_SYSTEMMODAL);
if (res != IDYES)
return;
@@ -197,7 +198,7 @@ void CPanel::CopyFrom(const UStringVector &filePaths)
// For Password:
SetFocusToList();
if (result != E_ABORT)
MessageBoxError(result, L"Error");
MessageBoxError(result);
return;
}

View File

@@ -155,11 +155,13 @@ class CDropSource:
public IDropSource,
public CMyUnknownImp
{
DWORD m_Effect;
public:
MY_UNKNOWN_IMP1_MT(IDropSource)
STDMETHOD(QueryContinueDrag)(BOOL escapePressed, DWORD keyState);
STDMETHOD(GiveFeedback)(DWORD effect);
bool NeedExtract;
CPanel *Panel;
CRecordVector<UInt32> Indices;
@@ -171,7 +173,7 @@ public:
HRESULT Result;
UStringVector Messages;
CDropSource(): NeedPostCopy(false), Panel(0), Result(S_OK) {}
CDropSource(): NeedPostCopy(false), Panel(0), Result(S_OK), m_Effect(DROPEFFECT_NONE) {}
};
STDMETHODIMP CDropSource::QueryContinueDrag(BOOL escapePressed, DWORD keyState)
@@ -180,6 +182,8 @@ STDMETHODIMP CDropSource::QueryContinueDrag(BOOL escapePressed, DWORD keyState)
return DRAGDROP_S_CANCEL;
if((keyState & MK_LBUTTON) == 0)
{
if (m_Effect == DROPEFFECT_NONE)
return DRAGDROP_S_CANCEL;
Result = S_OK;
bool needExtract = NeedExtract;
// MoveMode = (((keyState & MK_SHIFT) != 0) && MoveIsAllowed);
@@ -204,6 +208,7 @@ STDMETHODIMP CDropSource::QueryContinueDrag(BOOL escapePressed, DWORD keyState)
STDMETHODIMP CDropSource::GiveFeedback(DWORD effect)
{
m_Effect = effect;
return DRAGDROP_S_USEDEFAULTCURSORS;
}
@@ -319,7 +324,7 @@ void CPanel::OnDrag(LPNMLISTVIEW nmListView)
else
{
if (res != DRAGDROP_S_CANCEL && res != S_OK)
MessageBoxError(res, L"7-Zip");
MessageBoxError(res);
res = dropSourceSpec->Result;
}
@@ -330,7 +335,7 @@ void CPanel::OnDrag(LPNMLISTVIEW nmListView)
messagesDialog.Create((*this));
}
if (res != S_OK && res != E_ABORT)
MessageBoxError(res, L"7-Zip");
MessageBoxError(res);
if (res == S_OK && dropSourceSpec->Messages.IsEmpty() && !canceled)
KillSelection();
}
@@ -339,6 +344,7 @@ void CDropTarget::QueryGetData(IDataObject *dataObject)
{
FORMATETC etc = { CF_HDROP, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
m_DropIsAllowed = (dataObject->QueryGetData(&etc) == S_OK);
}
static void MySetDropHighlighted(HWND hWnd, int index, bool enable)
@@ -419,7 +425,7 @@ void CDropTarget::PositionCursor(POINTL ptl)
if (index < 0)
return;
int realIndex = m_Panel->GetRealItemIndex(index);
if (realIndex == -1)
if (realIndex == kParentIndex)
return;
if (!m_Panel->IsItemFolder(realIndex))
return;
@@ -436,12 +442,112 @@ bool CDropTarget::IsFsFolderPath() const
return false;
}
static void ReadUnicodeStrings(const wchar_t *p, size_t size, UStringVector &names)
{
names.Clear();
UString name;
for (;size > 0; size--)
{
wchar_t c = *p++;
if (c == 0)
{
if (name.IsEmpty())
break;
names.Add(name);
name.Empty();
}
else
name += c;
}
}
static void ReadAnsiStrings(const char *p, size_t size, UStringVector &names)
{
names.Clear();
AString name;
for (;size > 0; size--)
{
char c = *p++;
if (c == 0)
{
if (name.IsEmpty())
break;
names.Add(GetUnicodeString(name));
name.Empty();
}
else
name += c;
}
}
static void GetNamesFromDataObject(IDataObject *dataObject, UStringVector &names)
{
names.Clear();
FORMATETC etc = { CF_HDROP, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
STGMEDIUM medium;
HRESULT res = dataObject->GetData(&etc, &medium);
if (res != S_OK)
return;
if (medium.tymed != TYMED_HGLOBAL)
return;
{
NMemory::CGlobal global;
global.Attach(medium.hGlobal);
size_t blockSize = GlobalSize(medium.hGlobal);
NMemory::CGlobalLock dropLock(medium.hGlobal);
const DROPFILES* dropFiles = (DROPFILES*)dropLock.GetPointer();
if (dropFiles == 0)
return;
if (blockSize < dropFiles->pFiles)
return;
size_t size = blockSize - dropFiles->pFiles;
const void *namesData = (const Byte *)dropFiles + dropFiles->pFiles;
if (dropFiles->fWide)
ReadUnicodeStrings((const wchar_t *)namesData, size / sizeof(wchar_t), names);
else
ReadAnsiStrings((const char *)namesData, size, names);
}
}
bool CDropTarget::IsItSameDrive() const
{
if (m_Panel == 0)
return false;
if (!IsFsFolderPath())
return false;
UString drive;
if (m_Panel->IsFSFolder())
{
drive = m_Panel->GetDriveOrNetworkPrefix();
if (drive.IsEmpty())
return false;
}
else if (m_Panel->IsFSDrivesFolder() && m_SelectionIndex >= 0)
drive = m_SubFolderName + L'\\';
else
return false;
if (m_SourcePaths.Size() == 0)
return false;
for (int i = 0; i < m_SourcePaths.Size(); i++)
{
const UString &path = m_SourcePaths[i];
if (drive.CollateNoCase(path.Left(drive.Length())) != 0)
return false;
}
return true;
}
DWORD CDropTarget::GetEffect(DWORD keyState, POINTL pt, DWORD allowedEffect)
{
if (!m_DropIsAllowed || !m_PanelDropIsAllowed)
return DROPEFFECT_NONE;
if (!IsFsFolderPath())
allowedEffect &= ~DROPEFFECT_MOVE;
if (!m_SetPathIsOK)
allowedEffect &= ~DROPEFFECT_MOVE;
DWORD effect = 0;
@@ -451,8 +557,13 @@ DWORD CDropTarget::GetEffect(DWORD keyState, POINTL pt, DWORD allowedEffect)
effect = allowedEffect & DROPEFFECT_MOVE;
if(effect == 0)
{
if(allowedEffect & DROPEFFECT_COPY) effect = DROPEFFECT_COPY;
if(allowedEffect & DROPEFFECT_MOVE) effect = DROPEFFECT_MOVE;
if(allowedEffect & DROPEFFECT_COPY)
effect = DROPEFFECT_COPY;
if(allowedEffect & DROPEFFECT_MOVE)
{
if (IsItSameDrive())
effect = DROPEFFECT_MOVE;
}
}
if(effect == 0)
return DROPEFFECT_NONE;
@@ -504,12 +615,14 @@ bool CDropTarget::SetPath(bool enablePath) const
bool CDropTarget::SetPath()
{
return SetPath(m_DropIsAllowed && m_PanelDropIsAllowed && IsFsFolderPath());
m_SetPathIsOK = SetPath(m_DropIsAllowed && m_PanelDropIsAllowed && IsFsFolderPath());
return m_SetPathIsOK;
}
STDMETHODIMP CDropTarget::DragEnter(IDataObject * dataObject, DWORD keyState,
POINTL pt, DWORD *effect)
{
GetNamesFromDataObject(dataObject, m_SourcePaths);
QueryGetData(dataObject);
m_DataObject = dataObject;
return DragOver(keyState, pt, effect);
@@ -519,8 +632,8 @@ STDMETHODIMP CDropTarget::DragEnter(IDataObject * dataObject, DWORD keyState,
STDMETHODIMP CDropTarget::DragOver(DWORD keyState, POINTL pt, DWORD *effect)
{
PositionCursor(pt);
*effect = GetEffect(keyState, pt, *effect);
SetPath();
*effect = GetEffect(keyState, pt, *effect);
return S_OK;
}
@@ -541,13 +654,14 @@ STDMETHODIMP CDropTarget::Drop(IDataObject *dataObject, DWORD keyState,
{
QueryGetData(dataObject);
PositionCursor(pt);
*effect = GetEffect(keyState, pt, *effect);
m_DataObject = dataObject;
bool needDrop = true;
if(m_DropIsAllowed && m_PanelDropIsAllowed)
{
bool needDrop = true;
if (IsFsFolderPath())
needDrop = !SetPath();
*effect = GetEffect(keyState, pt, *effect);
if(m_DropIsAllowed && m_PanelDropIsAllowed)
{
if (needDrop)
{
UString path = GetTargetPath();
@@ -562,75 +676,13 @@ STDMETHODIMP CDropTarget::Drop(IDataObject *dataObject, DWORD keyState,
return S_OK;
}
static void ReadUnicodeStrings(const wchar_t *p, size_t size, UStringVector &names)
{
names.Clear();
UString name;
for (;size > 0; size--)
{
wchar_t c = *p++;
if (c == 0)
{
if (name.IsEmpty())
break;
names.Add(name);
name.Empty();
}
else
name += c;
}
}
static void ReadAnsiStrings(const char *p, size_t size, UStringVector &names)
{
names.Clear();
AString name;
for (;size > 0; size--)
{
char c = *p++;
if (c == 0)
{
if (name.IsEmpty())
break;
names.Add(GetUnicodeString(name));
name.Empty();
}
else
name += c;
}
}
void CPanel::DropObject(IDataObject *dataObject, const UString &folderPath)
{
FORMATETC etc = { CF_HDROP, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
STGMEDIUM medium;
HRESULT res = dataObject->GetData(&etc, &medium);
if (res != S_OK)
return;
if (medium.tymed != TYMED_HGLOBAL)
return;
UStringVector names;
{
NMemory::CGlobal global;
global.Attach(medium.hGlobal);
size_t blockSize = GlobalSize(medium.hGlobal);
NMemory::CGlobalLock dropLock(medium.hGlobal);
const DROPFILES* dropFiles = (DROPFILES*)dropLock.GetPointer();
if (dropFiles == 0)
return;
if (blockSize < dropFiles->pFiles)
return;
size_t size = blockSize - dropFiles->pFiles;
const void *namesData = (const Byte *)dropFiles + dropFiles->pFiles;
if (dropFiles->fWide)
ReadUnicodeStrings((const wchar_t *)namesData, size / sizeof(wchar_t), names);
else
ReadAnsiStrings((const char *)namesData, size, names);
}
GetNamesFromDataObject(dataObject, names);
CompressDropFiles(names, folderPath);
}
/*
void CPanel::CompressDropFiles(HDROP dr)
{

View File

@@ -1,208 +0,0 @@
// PanelExtract.cpp
#include "StdAfx.h"
#include "Windows/COM.h"
#include "Panel.h"
#include "resource.h"
#include "LangUtils.h"
#include "ExtractCallback.h"
#include "Windows/Thread.h"
////////////////////////////////////////////////////////////////
#include "..\UI\Resource\Extract\resource.h"
#include "UpdateCallback100.h"
using namespace NWindows;
struct CThreadExtractInArchive2
{
CMyComPtr<IFolderOperations> FolderOperations;
CRecordVector<UInt32> Indices;
UString DestPath;
CExtractCallbackImp *ExtractCallbackSpec;
CMyComPtr<IFolderOperationsExtractCallback> ExtractCallback;
HRESULT Result;
bool MoveMode;
CThreadExtractInArchive2(): MoveMode(false) {}
DWORD Extract()
{
// NCOM::CComInitializer comInitializer;
ExtractCallbackSpec->ProgressDialog.WaitCreating();
if (MoveMode)
Result = FolderOperations->MoveTo(&Indices.Front(), Indices.Size(),
DestPath, ExtractCallback);
else
Result = FolderOperations->CopyTo(&Indices.Front(), Indices.Size(),
DestPath, ExtractCallback);
ExtractCallbackSpec->ProgressDialog.MyClose();
return 0;
}
static DWORD WINAPI MyThreadFunction(void *param)
{
return ((CThreadExtractInArchive2 *)param)->Extract();
}
};
HRESULT CPanel::CopyTo(const CRecordVector<UInt32> &indices, const UString &folder,
bool moveMode, bool showErrorMessages, UStringVector *messages)
{
CMyComPtr<IFolderOperations> folderOperations;
if (_folder.QueryInterface(IID_IFolderOperations, &folderOperations) != S_OK)
{
UString errorMessage = LangLoadStringW(IDS_OPERATION_IS_NOT_SUPPORTED, 0x03020208);
if (showErrorMessages)
MessageBox(errorMessage);
else if (messages != 0)
messages->Add(errorMessage);
return E_FAIL;
}
CThreadExtractInArchive2 extracter;
extracter.ExtractCallbackSpec = new CExtractCallbackImp;
extracter.ExtractCallback = extracter.ExtractCallbackSpec;
extracter.ExtractCallbackSpec->ParentWindow = GetParent();
extracter.ExtractCallbackSpec->ShowMessages = showErrorMessages;
UString title = moveMode ?
LangLoadStringW(IDS_MOVING, 0x03020206):
LangLoadStringW(IDS_COPYING, 0x03020205);
UString progressWindowTitle = LangLoadStringW(IDS_APP_TITLE, 0x03000000);
extracter.ExtractCallbackSpec->ProgressDialog.MainWindow = GetParent();
extracter.ExtractCallbackSpec->ProgressDialog.MainTitle = progressWindowTitle;
extracter.ExtractCallbackSpec->ProgressDialog.MainAddTitle = title + L" ";
extracter.ExtractCallbackSpec->OverwriteMode = NExtract::NOverwriteMode::kAskBefore;
extracter.ExtractCallbackSpec->Init();
extracter.Indices = indices;
extracter.DestPath = folder;
extracter.FolderOperations = folderOperations;
extracter.MoveMode = moveMode;
CThread extractThread;
if (!extractThread.Create(CThreadExtractInArchive2::MyThreadFunction, &extracter))
throw 271824;
extracter.ExtractCallbackSpec->StartProgressDialog(title);
if (messages != 0)
*messages = extracter.ExtractCallbackSpec->Messages;
return extracter.Result;
}
struct CThreadUpdate
{
CMyComPtr<IFolderOperations> FolderOperations;
UString FolderPrefix;
UStringVector FileNames;
CRecordVector<const wchar_t *> FileNamePointers;
CMyComPtr<IFolderArchiveUpdateCallback> UpdateCallback;
CUpdateCallback100Imp *UpdateCallbackSpec;
HRESULT Result;
DWORD Process()
{
NCOM::CComInitializer comInitializer;
UpdateCallbackSpec->ProgressDialog.WaitCreating();
Result = FolderOperations->CopyFrom(
FolderPrefix,
&FileNamePointers.Front(),
FileNamePointers.Size(),
UpdateCallback);
UpdateCallbackSpec->ProgressDialog.MyClose();
return 0;
}
static DWORD WINAPI MyThreadFunction(void *param)
{
return ((CThreadUpdate *)param)->Process();
}
};
HRESULT CPanel::CopyFrom(const UString &folderPrefix, const UStringVector &filePaths,
bool showErrorMessages, UStringVector *messages)
{
CMyComPtr<IFolderOperations> folderOperations;
if (_folder.QueryInterface(IID_IFolderOperations, &folderOperations) != S_OK)
{
UString errorMessage = LangLoadStringW(IDS_OPERATION_IS_NOT_SUPPORTED, 0x03020208);
if (showErrorMessages)
MessageBox(errorMessage);
else if (messages != 0)
messages->Add(errorMessage);
return E_FAIL;
}
CThreadUpdate updater;
updater.UpdateCallbackSpec = new CUpdateCallback100Imp;
updater.UpdateCallback = updater.UpdateCallbackSpec;
UString title = LangLoadStringW(IDS_COPYING, 0x03020205);
UString progressWindowTitle = LangLoadStringW(IDS_APP_TITLE, 0x03000000);
updater.UpdateCallbackSpec->ProgressDialog.MainWindow = GetParent();
updater.UpdateCallbackSpec->ProgressDialog.MainTitle = progressWindowTitle;
updater.UpdateCallbackSpec->ProgressDialog.MainAddTitle = title + UString(L" ");
updater.UpdateCallbackSpec->Init((HWND)*this, false, L"");
updater.FolderOperations = folderOperations;
updater.FolderPrefix = folderPrefix;
updater.FileNames.Reserve(filePaths.Size());
int i;
for(i = 0; i < filePaths.Size(); i++)
updater.FileNames.Add(filePaths[i]);
updater.FileNamePointers.Reserve(updater.FileNames.Size());
for(i = 0; i < updater.FileNames.Size(); i++)
updater.FileNamePointers.Add(updater.FileNames[i]);
CThread thread;
if (!thread.Create(CThreadUpdate::MyThreadFunction, &updater))
throw 271824;
updater.UpdateCallbackSpec->StartProgressDialog(title);
if (messages != 0)
*messages = updater.UpdateCallbackSpec->Messages;
return updater.Result;
}
void CPanel::CopyFrom(const UStringVector &filePaths)
{
UString message = L"Are you sure you want to copy files to archive\n\'";
message += _currentFolderPrefix;
message += L"\' ?";
int res = ::MessageBoxW(*(this), message, L"Confirm File Copy",
MB_YESNOCANCEL | MB_ICONQUESTION | MB_TASKMODAL);
if (res != IDYES)
return;
CDisableTimerProcessing disableTimerProcessing(*this);
CSelectedState srcSelState;
SaveSelectedState(srcSelState);
HRESULT result = CopyFrom(L"", filePaths, true, 0);
if (result != S_OK)
{
disableTimerProcessing.Restore();
// For Password:
SetFocusToList();
if (result != E_ABORT)
MessageBoxError(result, L"Error");
return;
}
RefreshListCtrl(srcSelState);
disableTimerProcessing.Restore();
SetFocusToList();
}

View File

@@ -359,7 +359,7 @@ void CPanel::OpenDrivesFolder()
void CPanel::OpenFolder(int index)
{
if (index == -1)
if (index == kParentIndex)
{
OpenParentFolder();
return;

View File

@@ -230,7 +230,7 @@ void CPanel::EditItem(int index)
void CPanel::OpenFolderExternal(int index)
{
HANDLE hProcess = StartApplication(_currentFolderPrefix + GetItemName(index), (HWND)*this);
HANDLE hProcess = StartApplication(GetFsPath() + GetItemName(index), (HWND)*this);
if (hProcess != 0)
::CloseHandle(hProcess);
}
@@ -263,7 +263,7 @@ void CPanel::OpenItem(int index, bool tryInternal, bool tryExternal)
}
}
HRESULT CPanel::OnOpenItemChanged(const UString &folderPath, const UString &itemName)
LRESULT CPanel::OnOpenItemChanged(const UString &folderPath, const UString &itemName)
{
CMyComPtr<IFolderOperations> folderOperations;
if (_folder.QueryInterface(IID_IFolderOperations, &folderOperations) != S_OK)
@@ -382,7 +382,7 @@ void CPanel::OpenItemInArchive(int index, bool tryInternal, bool tryExternal,
if ((result != S_OK && result != E_ABORT))
{
MessageBoxError(result, L"7-Zip");
MessageBoxError(result);
return;
}

View File

@@ -231,7 +231,7 @@ void CPanel::GetSelectedNames(UStringVector &selectedNames)
if (!_listView.GetItem(&item))
continue;
int realIndex = GetRealIndex(item);
if (realIndex == -1)
if (realIndex == kParentIndex)
continue;
if (_selectedStatusVector[realIndex])
selectedNames.Add(GetUnicodeString(item.pszText));
@@ -248,7 +248,7 @@ void CPanel::SaveSelectedState(CSelectedState &s)
if (s.FocusedItem >= 0)
{
int realIndex = GetRealItemIndex(s.FocusedItem);
if (realIndex != -1)
if (realIndex != kParentIndex)
s.FocusedName = GetItemName(realIndex);
/*
const int kSize = 1024;
@@ -263,6 +263,11 @@ void CPanel::SaveSelectedState(CSelectedState &s)
focusedName = GetUnicodeString(item.pszText);
*/
}
if (!_focusedName.IsEmpty())
{
s.FocusedName = _focusedName;
_focusedName.Empty();
}
GetSelectedNames(s.SelectedNames);
}
@@ -344,7 +349,7 @@ void CPanel::RefreshListCtrl(const UString &focusedName, int focusedPos,
item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE;
int subItem = 0;
item.iSubItem = subItem++;
item.lParam = -1;
item.lParam = kParentIndex;
const int kMaxNameSize = MAX_PATH * 2;
TCHAR string[kMaxNameSize];
lstrcpyn(string, GetSystemString(itemName), kMaxNameSize);
@@ -369,18 +374,15 @@ void CPanel::RefreshListCtrl(const UString &focusedName, int focusedPos,
if (selectedNames.FindInSorted(itemName) >= 0)
selected = true;
_selectedStatusVector.Add(selected);
/*
if (_virtualMode)
{
_realIndices.Add(i);
}
else
*/
{
item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE;
// item.mask = LVIF_TEXT | LVIF_PARAM;
if (!_mySelectMode)
if (selected)
{
item.mask |= LVIF_STATE;
item.state = LVIS_SELECTED;
}
int subItem = 0;
item.iItem = _listView.GetItemCount();
@@ -450,7 +452,6 @@ void CPanel::RefreshListCtrl(const UString &focusedName, int focusedPos,
if(_listView.InsertItem(&item) == -1)
return; // error
}
}
// OutputDebugStringA("End2\n");
@@ -506,7 +507,7 @@ void CPanel::GetOperatedItemIndices(CRecordVector<UINT32> &indices) const
if (focusedItem >= 0)
{
int realIndex = GetRealItemIndex(focusedItem);
if (realIndex != -1)
if (realIndex != kParentIndex)
indices.Add(realIndex);
}
}
@@ -538,7 +539,7 @@ void CPanel::EditItem()
if (focusedItem < 0)
return;
int realIndex = GetRealItemIndex(focusedItem);
if (realIndex == -1)
if (realIndex == kParentIndex)
return;
if (!IsItemFolder(realIndex))
EditItem(realIndex);
@@ -570,7 +571,7 @@ void CPanel::OpenSelectedItems(bool tryInternal)
if (focusedItem >= 0)
{
int realIndex = GetRealItemIndex(focusedItem);
if (realIndex == -1 && (tryInternal || indices.Size() == 0))
if (realIndex == kParentIndex && (tryInternal || indices.Size() == 0))
indices.Insert(0, realIndex);
}
@@ -600,7 +601,7 @@ void CPanel::OpenSelectedItems(bool tryInternal)
UString CPanel::GetItemName(int itemIndex) const
{
if (itemIndex == -1)
if (itemIndex == kParentIndex)
return L"..";
NCOM::CPropVariant propVariant;
if (_folder->GetProperty(itemIndex, kpidName, &propVariant) != S_OK)
@@ -613,7 +614,7 @@ UString CPanel::GetItemName(int itemIndex) const
bool CPanel::IsItemFolder(int itemIndex) const
{
if (itemIndex == -1)
if (itemIndex == kParentIndex)
return true;
NCOM::CPropVariant propVariant;
if (_folder->GetProperty(itemIndex, kpidIsFolder, &propVariant) != S_OK)
@@ -627,7 +628,7 @@ bool CPanel::IsItemFolder(int itemIndex) const
UINT64 CPanel::GetItemSize(int itemIndex) const
{
if (itemIndex == -1)
if (itemIndex == kParentIndex)
return 0;
NCOM::CPropVariant propVariant;
if (_folder->GetProperty(itemIndex, kpidSize, &propVariant) != S_OK)

View File

@@ -82,7 +82,7 @@ LRESULT CPanel::SetItemText(LVITEM &item)
if ((item.mask & LVIF_TEXT) == 0)
return 0;
if (realIndex == (UINT32)-1)
if (realIndex == kParentIndex)
return 0;
UString string;
UINT32 subItemIndex = item.iSubItem;
@@ -148,6 +148,18 @@ LRESULT CPanel::SetItemText(LVITEM &item)
extern DWORD g_ComCtl32Version;
void CPanel::OnItemChanged(NMLISTVIEW *item)
{
int index = item->lParam;
if (index == kParentIndex)
return;
bool oldSelected = (item->uOldState & LVIS_SELECTED) != 0;
bool newSelected = (item->uNewState & LVIS_SELECTED) != 0;
// Don't change this code. It works only with such check
if(oldSelected != newSelected)
_selectedStatusVector[index] = newSelected;
}
bool CPanel::OnNotifyList(LPNMHDR header, LRESULT &result)
{
bool alt = (::GetKeyState(VK_MENU) & 0x8000) != 0;
@@ -157,6 +169,8 @@ bool CPanel::OnNotifyList(LPNMHDR header, LRESULT &result)
{
case LVN_ITEMCHANGED:
{
if (!_mySelectMode)
OnItemChanged((LPNMLISTVIEW)header);
RefreshStatusBar();
return false;
}
@@ -244,10 +258,9 @@ bool CPanel::OnNotifyList(LPNMHDR header, LRESULT &result)
case NM_CLICK:
{
RefreshStatusBar();
if(g_ComCtl32Version >= MAKELONG(71, 4))
{
OnLeftClick((LPNMITEMACTIVATE)header);
}
if(_mySelectMode)
if(g_ComCtl32Version >= MAKELONG(71, 4))
OnLeftClick((LPNMITEMACTIVATE)header);
return false;
}
case LVN_BEGINLABELEDIT:
@@ -258,7 +271,11 @@ bool CPanel::OnNotifyList(LPNMHDR header, LRESULT &result)
return true;
case NM_CUSTOMDRAW:
return OnCustomDraw((LPNMLVCUSTOMDRAW)header, result);
{
if (_mySelectMode)
return OnCustomDraw((LPNMLVCUSTOMDRAW)header, result);
break;
}
case LVN_BEGINDRAG:
{
OnDrag((LPNMLISTVIEW)header);
@@ -290,7 +307,7 @@ bool CPanel::OnCustomDraw(LPNMLVCUSTOMDRAW lplvcd, LRESULT &result)
*/
int realIndex = lplvcd->nmcd.lItemlParam;
bool selected = false;
if (realIndex != -1)
if (realIndex != kParentIndex)
selected = _selectedStatusVector[realIndex];
if (selected)
lplvcd->clrTextBk = RGB(255, 192, 192);
@@ -331,10 +348,10 @@ void CPanel::OnRefreshStatusBar()
{
CRecordVector<UINT32> indices;
GetOperatedItemIndices(indices);
_statusBar.SetText(0, GetSystemString(MyFormatNew(IDS_N_SELECTED_ITEMS,
0x02000301, NumberToStringW(indices.Size()))));
UString selectSizeString;
if (indices.Size() > 0)
@@ -353,7 +370,7 @@ void CPanel::OnRefreshStatusBar()
if (focusedItem >= 0 && _listView.GetSelectedCount() > 0)
{
int realIndex = GetRealItemIndex(focusedItem);
if (realIndex != -1)
if (realIndex != kParentIndex)
{
sizeString = ConvertSizeToString(GetItemSize(realIndex));
NCOM::CPropVariant propVariant;

View File

@@ -22,14 +22,15 @@ static const UINT kSystemStartMenuID = kPluginMenuStartID + 100;
void CPanel::InvokeSystemCommand(const char *command)
{
if (!IsFSFolder())
if (!IsFSFolder() && !IsFSDrivesFolder())
return;
CRecordVector<UINT32> operatedIndices;
GetOperatedItemIndices(operatedIndices);
if (operatedIndices.IsEmpty())
return;
CMyComPtr<IContextMenu> contextMenu;
CreateShellContextMenu(operatedIndices, contextMenu);
if (CreateShellContextMenu(operatedIndices, contextMenu) != S_OK)
return;
CMINVOKECOMMANDINFO ci;
ZeroMemory(&ci, sizeof(ci));
@@ -58,19 +59,19 @@ void CPanel::EditPaste()
InvokeSystemCommand("paste");
}
void CPanel::CreateShellContextMenu(
HRESULT CPanel::CreateShellContextMenu(
const CRecordVector<UINT32> &operatedIndices,
CMyComPtr<IContextMenu> &systemContextMenu)
{
systemContextMenu.Release();
UString folderPath = _currentFolderPrefix;
UString folderPath = GetFsPath();
CMyComPtr<IShellFolder> desktopFolder;
::SHGetDesktopFolder(&desktopFolder);
RINOK(::SHGetDesktopFolder(&desktopFolder));
if (!desktopFolder)
{
// ShowMessage("Failed to get Desktop folder.");
return;
return E_FAIL;
}
// Separate the file from the folder.
@@ -80,24 +81,19 @@ void CPanel::CreateShellContextMenu(
// is located in.
LPITEMIDLIST parentPidl;
DWORD eaten;
DWORD result = desktopFolder->ParseDisplayName(
RINOK(desktopFolder->ParseDisplayName(
GetParent(), 0, (wchar_t *)(const wchar_t *)folderPath,
&eaten, &parentPidl, 0);
if (result != NOERROR)
{
// ShowMessage("Invalid file name.");
return;
}
&eaten, &parentPidl, 0));
// Get an IShellFolder for the folder
// the file is located in.
CMyComPtr<IShellFolder> parentFolder;
result = desktopFolder->BindToObject(parentPidl,
0, IID_IShellFolder, (void**)&parentFolder);
RINOK(desktopFolder->BindToObject(parentPidl,
0, IID_IShellFolder, (void**)&parentFolder));
if (!parentFolder)
{
// ShowMessage("Invalid file name.");
return;
return E_FAIL;
}
// Get a pidl for the file itself.
@@ -107,10 +103,10 @@ void CPanel::CreateShellContextMenu(
{
LPITEMIDLIST pidl;
UString fileName = GetItemName(operatedIndices[i]);
HRESULT result = parentFolder->ParseDisplayName(GetParent(), 0,
(wchar_t *)(const wchar_t *)fileName, &eaten, &pidl, 0);
if (result != NOERROR)
return;
if (IsFSDrivesFolder())
fileName += L'\\';
RINOK(parentFolder->ParseDisplayName(GetParent(), 0,
(wchar_t *)(const wchar_t *)fileName, &eaten, &pidl, 0));
pidls.Add(pidl);
}
@@ -130,14 +126,15 @@ void CPanel::CreateShellContextMenu(
// Get the IContextMenu for the file.
CMyComPtr<IContextMenu> cm;
result = parentFolder->GetUIObjectOf(GetParent(), pidls.Size(),
(LPCITEMIDLIST *)&pidls.Front(), IID_IContextMenu, 0, (void**)&cm);
RINOK( parentFolder->GetUIObjectOf(GetParent(), pidls.Size(),
(LPCITEMIDLIST *)&pidls.Front(), IID_IContextMenu, 0, (void**)&cm));
if (!cm)
{
// ShowMessage("Unable to get context menu interface.");
return;
return E_FAIL;
}
systemContextMenu = cm;
return S_OK;
}
void CPanel::CreateSystemMenu(HMENU menuSpec,

View File

@@ -119,7 +119,7 @@ void CPanel::DeleteItems()
BOOL CPanel::OnBeginLabelEdit(LV_DISPINFO * lpnmh)
{
int realIndex = GetRealIndex(lpnmh->item);
if (realIndex == -1)
if (realIndex == kParentIndex)
return TRUE;
CMyComPtr<IFolderOperations> folderOperations;
if (_folder.QueryInterface(IID_IFolderOperations, &folderOperations) != S_OK)
@@ -141,7 +141,7 @@ BOOL CPanel::OnEndLabelEdit(LV_DISPINFO * lpnmh)
CPanel::CDisableTimerProcessing disableTimerProcessing2(*this);
int realIndex = GetRealIndex(lpnmh->item);
if (realIndex == -1)
if (realIndex == kParentIndex)
return FALSE;
HRESULT result = folderOperations->Rename(realIndex, newName, 0);
if (result != S_OK)
@@ -151,6 +151,7 @@ BOOL CPanel::OnEndLabelEdit(LV_DISPINFO * lpnmh)
}
// Can't use RefreshListCtrl here.
// RefreshListCtrlSaveFocused();
_focusedName = newName;
PostMessage(kReLoadMessage);
return TRUE;
}
@@ -182,6 +183,8 @@ void CPanel::CreateFolder()
int pos = newName.Find(TEXT('\\'));
if (pos >= 0)
newName = newName.Left(pos);
if (!_mySelectMode)
state.SelectedNames.Clear();
state.FocusedName = newName;
RefreshListCtrl(state);
}
@@ -213,6 +216,8 @@ void CPanel::CreateFile()
int pos = newName.Find(TEXT('\\'));
if (pos >= 0)
newName = newName.Left(pos);
if (!_mySelectMode)
state.SelectedNames.Clear();
state.FocusedName = newName;
RefreshListCtrl(state);
}
@@ -231,7 +236,7 @@ void CPanel::ChangeComment()
if (index < 0)
return;
int realIndex = GetRealItemIndex(index);
if (realIndex == -1)
if (realIndex == kParentIndex)
return;
CSelectedState state;
SaveSelectedState(state);

View File

@@ -15,6 +15,8 @@
void CPanel::OnShiftSelectMessage()
{
if (!_mySelectMode)
return;
int focusedItem = _listView.GetFocusedItem();
if (focusedItem < 0)
return;
@@ -25,7 +27,7 @@ void CPanel::OnShiftSelectMessage()
for (int i = 0; i < _listView.GetItemCount(); i++)
{
int realIndex = GetRealItemIndex(i);
if (realIndex == -1)
if (realIndex == kParentIndex)
continue;
if (i >= startItem && i <= finishItem)
if (_selectedStatusVector[realIndex] != _selectMark)
@@ -39,18 +41,20 @@ void CPanel::OnShiftSelectMessage()
void CPanel::OnArrowWithShift()
{
if (!_mySelectMode)
return;
int focusedItem = _listView.GetFocusedItem();
if (focusedItem < 0)
return;
int realIndex = GetRealItemIndex(focusedItem);
if (_selectionIsDefined)
{
if (realIndex != -1)
if (realIndex != kParentIndex)
_selectedStatusVector[realIndex] = _selectMark;
}
else
{
if (realIndex == -1)
if (realIndex == kParentIndex)
{
_selectionIsDefined = true;
_selectMark = true;
@@ -81,8 +85,13 @@ void CPanel::OnInsert()
if (focusedItem < 0)
return;
int realIndex = GetRealItemIndex(focusedItem);
if (realIndex != -1)
_selectedStatusVector[realIndex] = !_selectedStatusVector[realIndex];
bool isSelected = !_selectedStatusVector[realIndex];
if (realIndex != kParentIndex)
_selectedStatusVector[realIndex] = isSelected;
if (!_mySelectMode)
_listView.SetItemState(focusedItem, isSelected ? LVIS_SELECTED: 0, LVIS_SELECTED);
_listView.RedrawItem(focusedItem);
int nextIndex = focusedItem + 1;
@@ -116,6 +125,26 @@ void CPanel::OnDownWithShift()
}
*/
void CPanel::UpdateSelection()
{
if (!_mySelectMode)
{
int numItems = _listView.GetItemCount();
for (int i = 0; i < numItems; i++)
{
int realIndex = GetRealItemIndex(i);
if (realIndex != kParentIndex)
{
UINT value = 0;
value = _selectedStatusVector[realIndex] ? LVIS_SELECTED: 0;
_listView.SetItemState(i, value, LVIS_SELECTED);
}
}
}
_listView.RedrawAllItems();
}
void CPanel::SelectSpec(bool selectMode)
{
CComboDialog comboDialog;
@@ -126,11 +155,11 @@ void CPanel::SelectSpec(bool selectMode)
comboDialog.Value = L"*";
if (comboDialog.Create(GetParent()) == IDCANCEL)
return;
UString mask = GetUnicodeString(comboDialog.Value);
const UString &mask = comboDialog.Value;
for (int i = 0; i < _selectedStatusVector.Size(); i++)
if (CompareWildCardWithName(mask, GetItemName(i)))
_selectedStatusVector[i] = selectMode;
_listView.RedrawAllItems();
UpdateSelection();
}
void CPanel::SelectByType(bool selectMode)
@@ -142,10 +171,12 @@ void CPanel::SelectByType(bool selectMode)
UString name = GetItemName(realIndex);
bool isItemFolder = IsItemFolder(realIndex);
/*
UINT32 numItems;
_folder->GetNumberOfItems(&numItems);
if ((UInt32)_selectedStatusVector.Size() != numItems)
throw 11111;
*/
if (isItemFolder)
{
@@ -170,26 +201,32 @@ void CPanel::SelectByType(bool selectMode)
_selectedStatusVector[i] = selectMode;
}
}
_listView.RedrawAllItems();
UpdateSelection();
}
void CPanel::SelectAll(bool selectMode)
{
for (int i = 0; i < _selectedStatusVector.Size(); i++)
_selectedStatusVector[i] = selectMode;
_listView.RedrawAllItems();
UpdateSelection();
}
void CPanel::InvertSelection()
{
for (int i = 0; i < _selectedStatusVector.Size(); i++)
_selectedStatusVector[i] = !_selectedStatusVector[i];
_listView.RedrawAllItems();
UpdateSelection();
}
void CPanel::KillSelection()
{
SelectAll(false);
if (!_mySelectMode)
{
int focused = _listView.GetFocusedItem();
if (focused >= 0)
_listView.SetItemState(focused, LVIS_SELECTED, LVIS_SELECTED);
}
}
void CPanel::OnLeftClick(LPNMITEMACTIVATE itemActivate)
@@ -211,7 +248,7 @@ void CPanel::OnLeftClick(LPNMITEMACTIVATE itemActivate)
for (int i = 0; i < _selectedStatusVector.Size(); i++)
{
int realIndex = GetRealItemIndex(i);
if (realIndex == -1)
if (realIndex == kParentIndex)
continue;
bool selected = (i >= startItem && i <= finishItem);
if (_selectedStatusVector[realIndex] != selected)
@@ -227,7 +264,7 @@ void CPanel::OnLeftClick(LPNMITEMACTIVATE itemActivate)
if ((itemActivate->uKeyFlags & LVKF_CONTROL) != 0)
{
int realIndex = GetRealItemIndex(indexInList);
if (realIndex != -1)
if (realIndex != kParentIndex)
{
_selectedStatusVector[realIndex] = !_selectedStatusVector[realIndex];
_listView.RedrawItem(indexInList);

View File

@@ -71,9 +71,9 @@ int CALLBACK CompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData)
{
if(lpData == NULL)
return 0;
if (lParam1 == -1)
if (lParam1 == kParentIndex)
return -1;
if (lParam2 == -1)
if (lParam2 == kParentIndex)
return 1;
CPanel *panel = (CPanel*)lpData;

View File

@@ -191,8 +191,6 @@ void CApp::Split()
srcPanel.GetOperatedItemIndices(indices);
if (indices.IsEmpty())
return;
UString title;
UString message;
if (indices.Size() != 1)
{
srcPanel.MessageBox(L"Select one file");
@@ -225,6 +223,12 @@ void CApp::Split()
CProgressDialog progressDialog;
spliter.ProgressDialog = &progressDialog;
UString progressWindowTitle = LangLoadStringW(IDS_APP_TITLE, 0x03000000);
UString title = LangLoadStringW(IDS_SPLITTING, 0x03020510);
progressDialog.MainWindow = _window;
progressDialog.MainTitle = progressWindowTitle;
progressDialog.MainAddTitle = title + UString(L" ");
progressDialog.ProgressSynch.SetTitleFileName(itemName);
path = splitDialog.Path;
@@ -264,8 +268,7 @@ void CApp::Split()
CThread thread;
if (!thread.Create(CThreadSplit::MyThreadFunction, &spliter))
throw 271824;
progressDialog.Create(
LangLoadStringW(IDS_SPLITTING, 0x03020510));
progressDialog.Create(title, _window);
if (!spliter.Error.IsEmpty())
srcPanel.MessageBoxMyError(spliter.Error);
@@ -396,8 +399,6 @@ void CApp::Combine()
srcPanel.GetOperatedItemIndices(indices);
if (indices.IsEmpty())
return;
UString title;
UString message;
if (indices.Size() != 1)
{
srcPanel.MessageBox(L"Select only first file");
@@ -433,7 +434,14 @@ void CApp::Combine()
CProgressDialog progressDialog;
combiner.ProgressDialog = &progressDialog;
UString progressWindowTitle = LangLoadStringW(IDS_APP_TITLE, 0x03000000);
UString title = LangLoadStringW(IDS_COMBINING, 0x03020610);
progressDialog.MainWindow = _window;
progressDialog.MainTitle = progressWindowTitle;
progressDialog.MainAddTitle = title + UString(L" ");
path = copyDialog.Value;
NFile::NName::NormalizeDirPathPrefix(path);
if (!NFile::NDirectory::CreateComplexDirectory(path))
@@ -452,7 +460,7 @@ void CApp::Combine()
CThread thread;
if (!thread.Create(CThreadCombine::MyThreadFunction, &combiner))
throw 271824;
progressDialog.Create(LangLoadStringW(IDS_COMBINING, 0x03020610));
progressDialog.Create(title, _window);
if (!combiner.Error.IsEmpty())
srcPanel.MessageBoxMyError(combiner.Error);

View File

@@ -102,8 +102,6 @@ static const TCHAR *kShellKeyName = TEXT("shell");
static const TCHAR *kOpenKeyName = TEXT("open");
static const TCHAR *kCommandKeyName = TEXT("command");
static const TCHAR *kOpenCommandValue = TEXT("7zFMn.exe \"%1\"");
static CSysString GetExtensionKeyName(const CSysString &extension)
{
return CSysString(TEXT(".")) + extension;
@@ -114,7 +112,7 @@ static CSysString GetExtProgramKeyName(const CSysString &extension)
return CSysString(TEXT("7-Zip.")) + extension;
}
bool CheckShellExtensionInfo(const CSysString &extension)
static bool CheckShellExtensionInfo2(const CSysString &extension)
{
NSynchronization::CCriticalSectionLock lock(g_CriticalSection);
CKey extKey;
@@ -124,10 +122,16 @@ bool CheckShellExtensionInfo(const CSysString &extension)
if (extKey.QueryValue(NULL, programNameValue) != ERROR_SUCCESS)
return false;
CSysString extProgramKeyName = GetExtProgramKeyName(extension);
if (programNameValue.CollateNoCase(extProgramKeyName) != 0)
return (programNameValue.CollateNoCase(extProgramKeyName) == 0);
}
bool CheckShellExtensionInfo(const CSysString &extension)
{
NSynchronization::CCriticalSectionLock lock(g_CriticalSection);
if (!CheckShellExtensionInfo2(extension))
return false;
CKey extProgKey;
return (extProgKey.Open(HKEY_CLASSES_ROOT, extProgramKeyName, KEY_READ) == ERROR_SUCCESS);
return (extProgKey.Open(HKEY_CLASSES_ROOT, GetExtProgramKeyName(extension), KEY_READ) == ERROR_SUCCESS);
}
static void DeleteShellExtensionKey(const CSysString &extension)
@@ -150,7 +154,7 @@ static void DeleteShellExtensionProgramKey(const CSysString &extension)
void DeleteShellExtensionInfo(const CSysString &extension)
{
if (CheckShellExtensionInfo(extension))
if (CheckShellExtensionInfo2(extension))
DeleteShellExtensionKey(extension);
DeleteShellExtensionProgramKey(extension);
}

View File

@@ -94,6 +94,7 @@ static bool ReadPluginInfo(CPluginInfo &pluginInfo)
CSysString GetProgramFolderPrefix();
#ifndef _WIN64
static bool IsItWindowsNT()
{
OSVERSIONINFO versionInfo;
@@ -102,6 +103,7 @@ static bool IsItWindowsNT()
return false;
return (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT);
}
#endif
void ReadPluginInfoList(CObjectVector<CPluginInfo> &plugins)
{
@@ -110,12 +112,14 @@ void ReadPluginInfoList(CObjectVector<CPluginInfo> &plugins)
CSysString baseFolderPrefix = GetProgramFolderPrefix();
{
CSysString path = baseFolderPrefix + TEXT("7-zip");
#ifndef _WIN64
if (IsItWindowsNT())
path += TEXT("n");
#endif
path += TEXT(".dll");
CPluginInfo pluginInfo;
pluginInfo.FilePath = path;
if (::ReadPluginInfo(pluginInfo))
plugins.Add(pluginInfo);
}

View File

@@ -19,6 +19,7 @@ static const TCHAR *kShowSystemMenu = TEXT("ShowSystemMenu");
static const TCHAR *kFullRow = TEXT("FullRow");
static const TCHAR *kShowGrid = TEXT("ShowGrid");
static const TCHAR *kAlternativeSelection = TEXT("AlternativeSelection");
// static const TCHAR *kSingleClick = TEXT("SingleClick");
// static const TCHAR *kUnderline = TEXT("Underline");
@@ -88,6 +89,9 @@ bool ReadFullRow() { return ReadOption(kFullRow, false); }
void SaveShowGrid(bool enable) { SaveOption(kShowGrid, enable); }
bool ReadShowGrid(){ return ReadOption(kShowGrid, false); }
void SaveAlternativeSelection(bool enable) { SaveOption(kAlternativeSelection, enable); }
bool ReadAlternativeSelection(){ return ReadOption(kAlternativeSelection, false); }
/*
void SaveSingleClick(bool enable) { SaveOption(kSingleClick, enable); }
bool ReadSingleClick(){ return ReadOption(kSingleClick, false); }

View File

@@ -26,6 +26,9 @@ bool ReadFullRow();
void SaveShowGrid(bool enable);
bool ReadShowGrid();
void SaveAlternativeSelection(bool enable);
bool ReadAlternativeSelection();
/*
void SaveSingleClick(bool enable);
bool ReadSingleClick();

View File

@@ -4,20 +4,22 @@
#include "resource.h"
#include "AboutDialog.h"
#include "Common/String.h"
#include "../../HelpUtils.h"
#include "../../LangUtils.h"
static CIDLangPair kIDLangPairs[] =
{
{ IDC_ABOUT_STATIC_REGISTER_INFO, 0x01000103 },
{ IDC_ABOUT_BUTTON_SUPPORT, 0x01000104 },
{ IDC_ABOUT_BUTTON_REGISTER, 0x01000105 },
{ IDOK, 0x02000702 }
{ IDOK, 0x02000702 }
};
static LPCTSTR kHomePageURL = TEXT("http://www.7-zip.org/");
static LPCTSTR kRegisterPageURL = TEXT("http://www.7-zip.org/register.html");
static LPCTSTR kSupportPageURL = TEXT("http://www.7-zip.org/support.html");
#define MY_HOME_PAGE TEXT("http://www.7-zip.org/")
static LPCTSTR kHomePageURL = MY_HOME_PAGE;
static LPCTSTR kRegisterPageURL = MY_HOME_PAGE TEXT("register.html");
static LPCTSTR kSupportPageURL = MY_HOME_PAGE TEXT("support.html");
static LPCWSTR kHelpTopic = L"start.htm";
@@ -46,15 +48,11 @@ bool CAboutDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
::MyShellExecute(kHomePageURL);
break;
case IDC_ABOUT_BUTTON_REGISTER:
{
::MyShellExecute(kRegisterPageURL);
break;
}
case IDC_ABOUT_BUTTON_EMAIL:
{
case IDC_ABOUT_BUTTON_SUPPORT:
::MyShellExecute(kSupportPageURL);
break;
}
default:
return CModalDialog::OnButtonClicked(buttonID, buttonHWND);
}

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,21 +1,6 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_ABOUT 100
#define IDI_LOGO 138
#define IDC_ABOUT_STATIC_REGISTER_INFO 1010
#define IDC_ABOUT_BUTTON_HOMEPAGE 1020
#define IDC_ABOUT_BUTTON_EMAIL 1021
#define IDC_ABOUT_BUTTON_SUPPORT 1021
#define IDC_ABOUT_BUTTON_REGISTER 1022
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 139
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1023
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,117 +1,41 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#include "../../../MyVersion.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#define xSize2 224
#define ySize2 158
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
#define bXPos (xSize - marg - bXSize)
#define bYPos (ySize - marg - bYSize)
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#undef b2XSize
#undef b2XPos
#undef infoYPos
#undef infoYSize
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#define b2XSize 94
#define b2XPos (xSize - marg - b2XSize)
#define gSpace 2
#define gSize (xSize2 - gSpace - b2XSize)
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
#define infoYPos 91
#define infoYSize (ySize2 - infoYPos - bYSize - 2)
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
IDI_LOGO ICON "7zipLogo.ico"
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_LOGO ICON DISCARDABLE "7zipLogo.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_ABOUT DIALOG DISCARDABLE 0, 0, 237, 172
STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION |
WS_SYSMENU
IDD_ABOUT DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE
CAPTION "About 7-Zip"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
PUSHBUTTON "OK",IDOK,180,151,50,14
PUSHBUTTON "www.7-zip.org",IDC_ABOUT_BUTTON_HOMEPAGE,136,7,94,14
PUSHBUTTON "Support",IDC_ABOUT_BUTTON_EMAIL,136,30,94,14
PUSHBUTTON "Register",IDC_ABOUT_BUTTON_REGISTER,136,53,94,14
ICON IDI_LOGO,IDC_STATIC,7,7,20,20,SS_REALSIZEIMAGE
LTEXT "7-Zip 4.24 beta",IDC_STATIC,7,54,119,9
LTEXT "Copyright (c) 1999-2005 Igor Pavlov",IDC_STATIC,7,67,
119,17
LTEXT "7-Zip is free software. However, you can support development of 7-Zip by registering.",
IDC_ABOUT_STATIC_REGISTER_INFO,7,91,223,54
PUSHBUTTON "OK", IDOK, bXPos, bYPos, bXSize, bYSize
PUSHBUTTON "www.7-zip.org", IDC_ABOUT_BUTTON_HOMEPAGE, b2XPos, 7, b2XSize, bYSize
PUSHBUTTON "Support", IDC_ABOUT_BUTTON_SUPPORT, b2XPos, 30, b2XSize, bYSize
PUSHBUTTON "Register", IDC_ABOUT_BUTTON_REGISTER, b2XPos, 53, b2XSize, bYSize
ICON IDI_LOGO, -1, marg, marg, 20, 20, SS_REALSIZEIMAGE
LTEXT MY_7ZIP_VERSION, -1, marg, 54, gSize, 9
LTEXT MY_COPYRIGHT, -1, marg, 67, gSize, 17
LTEXT "7-Zip is free software. However, you can support development of 7-Zip by registering.",
IDC_ABOUT_STATIC_REGISTER_INFO, marg, infoYPos, xSize2, infoYSize
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_ABOUT, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 230
VERTGUIDE, 126
VERTGUIDE, 136
TOPMARGIN, 7
BOTTOMMARGIN, 165
END
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -693,8 +693,14 @@ DWORD CThreadBenchmark::Process()
NWindows::NCOM::CPropVariant properties[kNumProps];
properties[0] = UInt32(dictionarySize);
properties[1] = bool(multiThread);
RINOK(setCoderProperties->SetCoderProperties(propIDs,
properties, kNumProps));
HRESULT res = setCoderProperties->SetCoderProperties(propIDs,
properties, kNumProps);
if (res != S_OK)
{
// SyncInfo->Pause();
MessageBox(0, NError::MyFormatMessage(res), TEXT("7-Zip"), MB_ICONERROR);
return res;
}
}
if (propStream)

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,7 +1,3 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_DIALOG_BENCHMARK 800
#define IDC_BUTTON_STOP 1001
#define IDC_BUTTON_RESTART 1002
@@ -36,14 +32,3 @@
#define IDC_BENCHMARK_ERRORS_VALUE 1065
#define IDC_BENCHMARK_PASSES 1066
#define IDC_BENCHMARK_PASSES_VALUE 1067
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 157
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1070
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,149 +1,87 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#define xSize2 210
#define ySize2 228
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#define bXPos1 (xSize - marg - bXSize)
#define bXPos2 (bXPos1 - 10 - bXSize)
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#define bYPos (ySize - marg - bYSize)
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
#define gSize 160
#define gSpace 24
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
#define g0XSize 75
#define g1XSize 44
#define g1XPos (marg + g0XSize)
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
#define g10XPos (marg + marg)
#define gRatingSize 51
#define gSpeedSize 64
#define gRatingPos (xSize - marg - marg - gRatingSize)
#define gSpeedPos (gRatingPos - gSpeedSize)
#define gLabelSize (gSpeedPos - g10XPos)
#define gTotalRatingSize (gRatingSize + marg + marg)
#define gTotalRatingPos (xSize - marg - gTotalRatingSize)
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
#define g2XSize 58
#define g3XSize 36
#define g3XPos (marg + g2XSize)
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DIALOG_BENCHMARK DIALOG DISCARDABLE 0, 0, 219, 242
STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
WS_CAPTION | WS_SYSMENU
IDD_DIALOG_BENCHMARK DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE | WS_MINIMIZEBOX
CAPTION "Benchmark"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
PUSHBUTTON "&Restart",IDC_BUTTON_RESTART,151,7,62,14
PUSHBUTTON "&Stop",IDC_BUTTON_STOP,151,27,62,14
PUSHBUTTON "&Help",IDHELP,82,221,62,14
PUSHBUTTON "Cancel",IDCANCEL,151,221,62,14
LTEXT "&Dictionary size:",IDC_BENCHMARK_DICTIONARY,7,8,75,8
COMBOBOX IDC_BENCHMARK_COMBO_DICTIONARY,88,7,44,140,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Memory usage:",IDC_BENCHMARK_MEMORY,7,25,75,8
LTEXT "0 MB",IDC_BENCHMARK_MEMORY_VALUE,88,25,44,8
CONTROL "Multi-threading",IDC_BENCHMARK_MULTITHREADING,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,41,75,10
RTEXT "Speed",IDC_BENCHMARK_SPEED_LABEL,82,53,64,8
RTEXT "Rating",IDC_BENCHMARK_RATING_LABEL,151,53,51,8
GROUPBOX "Compressing",IDC_BENCHMARK_COMPRESSING,7,64,205,40
LTEXT "Current",IDC_BENCHMARK_CURRENT,17,76,65,8
RTEXT "100 KB/s",IDC_BENCHMARK_COMPRESSING_SPEED,82,76,64,8
RTEXT "0",IDC_BENCHMARK_COMPRESSING_RATING,151,76,51,8
LTEXT "Resulting",IDC_BENCHMARK_RESULTING,17,89,65,8
RTEXT "100 KB/s",IDC_BENCHMARK_COMPRESSING_SPEED2,82,89,64,8
RTEXT "0",IDC_BENCHMARK_COMPRESSING_RATING2,151,89,51,8
GROUPBOX "Decompressing",IDC_BENCHMARK_DECOMPRESSING,7,111,205,40
LTEXT "Current",IDC_BENCHMARK_CURRENT2,17,123,65,8
RTEXT "100 KB/s",IDC_BENCHMARK_DECOMPRESSING_SPEED,82,123,64,8
RTEXT "0",IDC_BENCHMARK_DECOMPRESSING_RATING,151,123,51,8
LTEXT "Resulting",IDC_BENCHMARK_RESULTING2,17,136,65,8
RTEXT "100 KB/s",IDC_BENCHMARK_DECOMPRESSING_SPEED2,82,136,64,
8
RTEXT "0",IDC_BENCHMARK_DECOMPRESSING_RATING2,151,136,51,8
GROUPBOX "Total Rating",IDC_BENCHMARK_TOTAL_RATING,137,162,75,38
RTEXT "0",IDC_BENCHMARK_TOTAL_RATING_VALUE,146,180,56,8
LTEXT "Elapsed time:",IDC_BENCHMARK_ELAPSED,7,163,58,8
RTEXT "00:00:00",IDC_BENCHMARK_ELAPSED_VALUE,65,163,36,8
LTEXT "Size:",IDC_BENCHMARK_SIZE,7,176,58,8
RTEXT "0",IDC_BENCHMARK_SIZE_VALUE,65,176,36,8
LTEXT "Passes:",IDC_BENCHMARK_PASSES,7,189,58,8
RTEXT "0",IDC_BENCHMARK_PASSES_VALUE,65,189,36,8
LTEXT "Errors:",IDC_BENCHMARK_ERRORS,7,202,58,8
RTEXT "0",IDC_BENCHMARK_ERRORS_VALUE,65,202,36,8
PUSHBUTTON "&Restart", IDC_BUTTON_RESTART, bXPos1, marg, bXSize, bYSize
PUSHBUTTON "&Stop", IDC_BUTTON_STOP, bXPos1, 27, bXSize, bYSize
PUSHBUTTON "&Help", IDHELP, bXPos2, bYPos, bXSize,bYSize
PUSHBUTTON "Cancel", IDCANCEL, bXPos1, bYPos, bXSize, bYSize
LTEXT "&Dictionary size:", IDC_BENCHMARK_DICTIONARY, marg, marg + 1, g0XSize, 8
COMBOBOX IDC_BENCHMARK_COMBO_DICTIONARY, g1XPos, marg, g1XSize, 140, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Memory usage:", IDC_BENCHMARK_MEMORY, marg, 25, g0XSize, 8
LTEXT "0 MB", IDC_BENCHMARK_MEMORY_VALUE, g1XPos,25,g1XSize,8
CONTROL "Multi-threading", IDC_BENCHMARK_MULTITHREADING, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
marg, 41, g0XSize, 10
RTEXT "Speed", IDC_BENCHMARK_SPEED_LABEL, gSpeedPos, 53, gSpeedSize, 8
RTEXT "Rating", IDC_BENCHMARK_RATING_LABEL, gRatingPos, 53, gRatingSize, 8
GROUPBOX "Compressing", IDC_BENCHMARK_COMPRESSING, marg, 64, xSize2, 40
LTEXT "Current", IDC_BENCHMARK_CURRENT, g10XPos, 76, gLabelSize, 8
RTEXT "100 KB/s", IDC_BENCHMARK_COMPRESSING_SPEED, gSpeedPos, 76, gSpeedSize, 8
RTEXT "0", IDC_BENCHMARK_COMPRESSING_RATING, gRatingPos, 76, gRatingSize, 8
LTEXT "Resulting", IDC_BENCHMARK_RESULTING, g10XPos, 89, gLabelSize, 8
RTEXT "100 KB/s", IDC_BENCHMARK_COMPRESSING_SPEED2, gSpeedPos, 89, gSpeedSize, 8
RTEXT "0", IDC_BENCHMARK_COMPRESSING_RATING2, gRatingPos, 89, gRatingSize, 8
GROUPBOX "Decompressing", IDC_BENCHMARK_DECOMPRESSING, marg, 111, xSize2, 40
LTEXT "Current", IDC_BENCHMARK_CURRENT2, g10XPos, 123, gLabelSize, 8
RTEXT "100 KB/s", IDC_BENCHMARK_DECOMPRESSING_SPEED, gSpeedPos, 123, gSpeedSize, 8
RTEXT "0", IDC_BENCHMARK_DECOMPRESSING_RATING, gRatingPos, 123, gRatingSize, 8
LTEXT "Resulting", IDC_BENCHMARK_RESULTING2, g10XPos, 136, gLabelSize, 8
RTEXT "100 KB/s", IDC_BENCHMARK_DECOMPRESSING_SPEED2, gSpeedPos, 136, gSpeedSize, 8
RTEXT "0", IDC_BENCHMARK_DECOMPRESSING_RATING2, gRatingPos, 136, gRatingSize, 8
GROUPBOX "Total Rating", IDC_BENCHMARK_TOTAL_RATING, gTotalRatingPos, 163, gTotalRatingSize, 38
RTEXT "0", IDC_BENCHMARK_TOTAL_RATING_VALUE, gRatingPos, 181, gRatingSize, 8
LTEXT "Elapsed time:", IDC_BENCHMARK_ELAPSED, marg, 163, g2XSize, 8
LTEXT "Size:", IDC_BENCHMARK_SIZE, marg, 176, g2XSize, 8
LTEXT "Passes:", IDC_BENCHMARK_PASSES, marg, 189, g2XSize, 8
LTEXT "Errors:", IDC_BENCHMARK_ERRORS, marg, 202, g2XSize, 8
RTEXT "00:00:00", IDC_BENCHMARK_ELAPSED_VALUE, g3XPos, 163, g3XSize, 8
RTEXT "0", IDC_BENCHMARK_SIZE_VALUE, g3XPos, 176, g3XSize, 8
RTEXT "0", IDC_BENCHMARK_PASSES_VALUE, g3XPos, 189, g3XSize, 8
RTEXT "0", IDC_BENCHMARK_ERRORS_VALUE, g3XPos, 202, g3XSize, 8
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_DIALOG_BENCHMARK, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 212
VERTGUIDE, 17
VERTGUIDE, 65
VERTGUIDE, 82
VERTGUIDE, 88
VERTGUIDE, 101
VERTGUIDE, 132
VERTGUIDE, 146
VERTGUIDE, 151
VERTGUIDE, 202
TOPMARGIN, 7
BOTTOMMARGIN, 235
HORZGUIDE, 24
HORZGUIDE, 53
HORZGUIDE, 76
HORZGUIDE, 89
HORZGUIDE, 123
HORZGUIDE, 136
END
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,21 +1,4 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_DIALOG_COMBO 200
#define IDC_COMBO_STATIC 1000
#define IDC_COMBO_COMBO 1001
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 157
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1002
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,100 +1,24 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#define xSize2 233
#define ySize2 57
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
#define bYPos (ySize - marg - bYSize)
#define b1XPos (xSize - marg - bXSize)
#define b2XPos (b1XPos - 10 - bXSize)
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DIALOG_COMBO DIALOG DISCARDABLE 0, 0, 247, 71
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
IDD_DIALOG_COMBO DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE
CAPTION "Combo"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
COMBOBOX IDC_COMBO_COMBO,7,20,233,65,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,127,50,50,14
PUSHBUTTON "Cancel",IDCANCEL,190,50,50,14
LTEXT "",IDC_COMBO_STATIC,7,7,233,8
LTEXT "", IDC_COMBO_STATIC, marg, marg, xSize2, 8
COMBOBOX IDC_COMBO_COMBO, marg, 20, xSize2, 65, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, b2XPos, bYPos, bXSize, bYSize
PUSHBUTTON "Cancel", IDCANCEL, b1XPos, bYPos, bXSize, bYSize
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_DIALOG_COMBO, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 240
TOPMARGIN, 7
BOTTOMMARGIN, 64
END
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,22 +1,5 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_DIALOG_COPY 202
#define IDC_COPY_STATIC 1000
#define IDC_COPY_COMBO 1001
#define IDC_COPY_SET_PATH 1002
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 157
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1003
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,101 +1,23 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#define xSize2 346
#define ySize2 57
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#define bYPos (ySize - marg - bYSize)
#define b1XPos (xSize - marg - bXSize)
#define b2XPos (b1XPos - 10 - bXSize)
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DIALOG_COPY DIALOG DISCARDABLE 0, 0, 360, 71
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
IDD_DIALOG_COPY DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE
CAPTION "Copy"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
LTEXT "",IDC_COPY_STATIC,7,7,346,8
COMBOBOX IDC_COPY_COMBO,7,20,317,65,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "...",IDC_COPY_SET_PATH,333,20,20,14,WS_GROUP
DEFPUSHBUTTON "OK",IDOK,240,50,50,14
PUSHBUTTON "Cancel",IDCANCEL,303,50,50,14
LTEXT "", IDC_COPY_STATIC, marg, marg, xSize2, 8
COMBOBOX IDC_COPY_COMBO, marg, 20, xSize2 - bDotsSize - 12, 65, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "...", IDC_COPY_SET_PATH, (xSize - marg - bDotsSize), 20, bDotsSize, 14, WS_GROUP
DEFPUSHBUTTON "OK", IDOK, b2XPos, bYPos, bXSize, bYSize
PUSHBUTTON "Cancel", IDCANCEL, b1XPos, bYPos, bXSize, bYSize
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_DIALOG_COPY, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 353
TOPMARGIN, 7
BOTTOMMARGIN, 64
END
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,19 +1,4 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_EDIT 903
#define IDC_EDIT_STATIC_EDITOR 1000
#define IDC_EDIT_EDIT_EDITOR 1002
#define IDC_EDIT_BUTTON_SET 1003
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 135
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1004
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,98 +1,16 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#define xSize2 196
#define ySize2 140
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_EDIT DIALOG DISCARDABLE 0, 0, 210, 154
STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
IDD_EDIT DIALOG 0, 0, xSize, ySize MY_PAGE_STYLE
CAPTION "Editor"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
LTEXT "&Editor:",IDC_EDIT_STATIC_EDITOR,7,7,196,8
EDITTEXT IDC_EDIT_EDIT_EDITOR,7,20,160,14,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_EDIT_BUTTON_SET,182,20,21,14
LTEXT "&Editor:", IDC_EDIT_STATIC_EDITOR, marg, marg, xSize2, 8
EDITTEXT IDC_EDIT_EDIT_EDITOR, marg, 20, xSize2 - 12 - bDotsSize, 14, ES_AUTOHSCROLL
PUSHBUTTON "...", IDC_EDIT_BUTTON_SET, (xSize - marg - bDotsSize), 20, bDotsSize, bYSize
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_EDIT, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 203
TOPMARGIN, 7
BOTTOMMARGIN, 147
END
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -6,22 +6,18 @@
#include "Common/StringConvert.h"
#include "Windows/Defs.h"
#include "Windows/FileFind.h"
#include "Windows/ResourceString.h"
#include "../../RegistryUtils.h"
#include "../../HelpUtils.h"
#include "../../LangUtils.h"
#include "../../ProgramLocation.h"
#include "../../MyLoadMenu.h"
static CIDLangPair kIDLangPairs[] =
{
{ IDC_LANG_STATIC_LANG, 0x01000401}
};
static LPCWSTR kLangTopic = L"FM/options.htm#language";
static LPCWSTR kLangTopic = L"fm/options.htm#language";
bool CLangPage::OnInit()
{
@@ -30,53 +26,40 @@ bool CLangPage::OnInit()
_langCombo.Attach(GetItem(IDC_LANG_COMBO_LANG));
int index = _langCombo.AddString(TEXT("English (English)"));
CSysString s = NWindows::MyLoadString(IDS_LANG_ENGLISH);
s += TEXT(" (");
s += NWindows::MyLoadString(IDS_LANG_NATIVE);
s += TEXT(")");
int index = _langCombo.AddString(s);
_langCombo.SetItemData(index, _paths.Size());
_paths.Add(TEXT(""));
_paths.Add(TEXT("-"));
_langCombo.SetCurSel(0);
UString folderPath;
if (::GetProgramFolderPath(folderPath))
CObjectVector<CLangEx> langs;
LoadLangs(langs);
for (int i = 0; i < langs.Size(); i++)
{
folderPath += L"Lang\\";
NWindows::NFile::NFind::CEnumeratorW enumerator(folderPath + L"*.txt");
NWindows::NFile::NFind::CFileInfoW fileInfo;
while (enumerator.Next(fileInfo))
const CLangEx &lang = langs[i];
UString name;
UString englishName, nationalName;
if (lang.Lang.GetMessage(0x00000000, englishName))
name = englishName;
else
name = lang.ShortName;
if (lang.Lang.GetMessage(0x00000001, nationalName))
{
if (fileInfo.IsDirectory())
continue;
CLang lang;
UString filePath = folderPath + fileInfo.Name;
UString shortName;
const kExtSize = 4;
if (fileInfo.Name.Right(kExtSize) != L".txt")
continue;
shortName = fileInfo.Name.Left(fileInfo.Name.Length() - kExtSize);
if (lang.Open(GetSystemString(filePath)))
if (!nationalName.IsEmpty())
{
UString name;
UString englishName, nationalName;
if (lang.GetMessage(0x00000000, englishName))
name = englishName;
else
name = shortName;
if (lang.GetMessage(0x00000001, nationalName))
{
if (!nationalName.IsEmpty())
{
name += L" (";
name += nationalName;
name += L")";
}
}
index = _langCombo.AddString(GetSystemString(name));
_langCombo.SetItemData(index, _paths.Size());
_paths.Add(GetSystemString(shortName));
if (g_LangID.CollateNoCase(GetSystemString(shortName)) == 0 ||
g_LangID.CollateNoCase(GetSystemString(filePath)) == 0)
_langCombo.SetCurSel(index);
name += L" (";
name += nationalName;
name += L")";
}
}
index = _langCombo.AddString(GetSystemString(name));
_langCombo.SetItemData(index, _paths.Size());
_paths.Add(GetSystemString(lang.ShortName));
if (g_LangID.CollateNoCase(GetSystemString(lang.ShortName)) == 0)
_langCombo.SetCurSel(index);
}
return CPropertyPage::OnInit();
}
@@ -105,4 +88,3 @@ bool CLangPage::OnCommand(int code, int itemID, LPARAM param)
}
return CPropertyPage::OnCommand(code, itemID, param);
}

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,19 +1,6 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_LANG 900
#define IDD_LANG 900
#define IDS_LANG_ENGLISH 995
#define IDS_LANG_NATIVE 996
#define IDC_LANG_STATIC_LANG 1000
#define IDC_LANG_COMBO_LANG 1001
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 135
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1002
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,99 +1,21 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#define xSize2 238
#define ySize2 204
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_LANG DIALOG DISCARDABLE 0, 0, 210, 154
STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
IDD_LANG DIALOG 0, 0, xSize, ySize MY_PAGE_STYLE
CAPTION "Language"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
LTEXT "Language:",IDC_LANG_STATIC_LANG,7,7,196,8
COMBOBOX IDC_LANG_COMBO_LANG,7,20,146,124,CBS_DROPDOWNLIST |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
LTEXT "Language:", IDC_LANG_STATIC_LANG, marg, marg, xSize2, 8
COMBOBOX IDC_LANG_COMBO_LANG, marg, 20, 146, ySize2 - 12, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
STRINGTABLE
BEGIN
IDD_LANG, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 203
TOPMARGIN, 7
BOTTOMMARGIN, 147
END
IDS_LANG_ENGLISH "English"
IDS_LANG_NATIVE "English"
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,20 +1,3 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_DIALOG_LISTBOX 202
#define IDC_LISTBOX_LIST 1000
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 157
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1002
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,102 +1,22 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#define xSize2 223
#define ySize2 177
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#define bYPos (ySize - marg - bYSize)
#define b1XPos (xSize - marg - bXSize)
#define b2XPos (b1XPos - 10 - bXSize)
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
IDD_DIALOG_LISTBOX DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE
CAPTION "List Box"
MY_FONT
BEGIN
"resource.h\0"
LISTBOX IDC_LISTBOX_LIST, marg, marg, xSize2, 149, LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, b2XPos, bYPos, bXSize, bYSize
PUSHBUTTON "Cancel", IDCANCEL, b1XPos, bYPos, bXSize, bYSize
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DIALOG_LISTBOX DIALOG DISCARDABLE 0, 0, 237, 191
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK",IDOK,64,170,50,14
PUSHBUTTON "Cancel",IDCANCEL,123,170,50,14
LISTBOX IDC_LISTBOX_LIST,7,7,223,149,LBS_SORT |
LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_DIALOG_LISTBOX, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 230
TOPMARGIN, 7
BOTTOMMARGIN, 184
HORZGUIDE, 156
END
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,20 +1,3 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_DIALOG_LISTVIEW 201
#define IDC_LISTVIEW_LIST 1000
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 157
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1002
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,101 +1,26 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#define xSize2 342
#define ySize2 220
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#define bYPos (ySize - marg - bYSize)
#define b1XPos (xSize - marg - bXSize)
#define b2XPos (b1XPos - 10 - bXSize)
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
IDD_DIALOG_LISTVIEW DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE
CAPTION "ListView"
MY_FONT
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DIALOG_LISTVIEW DIALOG DISCARDABLE 0, 0, 356, 234
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "List1",IDC_LISTVIEW_LIST,"SysListView32",LVS_REPORT |
LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER |
WS_BORDER | WS_TABSTOP,7,7,342,196
DEFPUSHBUTTON "OK",IDOK,238,213,50,14
PUSHBUTTON "Cancel",IDCANCEL,299,213,50,14
CONTROL "List1", IDC_LISTVIEW_LIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,
marg, marg, xSize2, ySize2 - bYSize - 10
DEFPUSHBUTTON "OK", IDOK, b2XPos, bYPos, bXSize, bYSize
PUSHBUTTON "Cancel", IDCANCEL, b1XPos, bYPos, bXSize, bYSize
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_DIALOG_LISTVIEW, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 349
TOPMARGIN, 7
BOTTOMMARGIN, 227
HORZGUIDE, 203
END
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,22 +1,3 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDS_MESSAGES_DIALOG_MESSAGE_COLUMN 503
#define IDD_DIALOG_MESSAGES 503
#define IDC_MESSAGE_LIST 1000
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 657
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1002
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,111 +1,25 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
#define xSize2 335
#define ySize2 121
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
#define bXPos (xSize - marg - bXSize)
#define bYPos (ySize - marg - bYSize)
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DIALOG_MESSAGES DIALOG DISCARDABLE 0, 0, 349, 135
STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION |
WS_SYSMENU
IDD_DIALOG_MESSAGES DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE
CAPTION "7-Zip: Diagnostic messages"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
DEFPUSHBUTTON "&Close",IDOK,143,114,64,14
CONTROL "List1",IDC_MESSAGE_LIST,"SysListView32",LVS_REPORT |
LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER |
WS_TABSTOP,7,7,335,101
DEFPUSHBUTTON "&Close", IDOK, bXPos, bYPos, bXSize, bYSize
CONTROL "List1",IDC_MESSAGE_LIST,"SysListView32",
LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,
marg, marg, xSize2, ySize2 - bYSize - 6
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
STRINGTABLE
BEGIN
IDD_DIALOG_MESSAGES, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 342
TOPMARGIN, 7
BOTTOMMARGIN, 128
END
IDS_MESSAGES_DIALOG_MESSAGE_COLUMN "Message"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE DISCARDABLE
BEGIN
IDS_MESSAGES_DIALOG_MESSAGE_COLUMN "Message"
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,7 +1,3 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDS_FILE_MODIFIED 600
#define IDS_FILE_SIZE 601
@@ -21,16 +17,3 @@
#define IDC_BUTTON_OVERWRITE_YES_TO_ALL 1010
#define IDC_BUTTON_OVERWRITE_NO_TO_ALL 1011
#define IDC_BUTTON_OVERWRITE_AUTO_RENAME 1012
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 102
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1013
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,132 +1,47 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#define xSize2 357
#define ySize2 204
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#undef iconSize
#define iconSize 20
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#undef fiXPos
#undef fiXSize
#undef fiYSize
#define fiXPos (iconSize + 12)
#define fiXSize (xSize2 - fiXPos)
#define fiYSize 50
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
#define b1YPos (ySize - marg - bYSize)
#define b2YPos (b1YPos - bYSize - 10)
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DIALOG_OVERWRITE DIALOG DISCARDABLE 0, 0, 371, 218
STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION |
WS_SYSMENU
IDD_DIALOG_OVERWRITE DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE
CAPTION "Confirm File Replace"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
LTEXT "Destination folder already contains processed file.",
IDC_STATIC_OVERWRITE_HEADER,6,7,358,8
LTEXT "Would you like to replace the existing file",
IDC_STATIC_OVERWRITE_QUESTION_BEGIN,7,28,357,8
ICON "",IDC_STATIC_OVERWRITE_OLD_FILE_ICON,7,44,20,20
LTEXT "",IDC_STATIC_OVERWRITE_OLD_FILE_SIZE_TIME,39,44,325,50
LTEXT "with this one?",IDC_STATIC_OVERWRITE_QUESTION_END,7,98,
357,8
ICON "",IDC_STATIC_OVERWRITE_NEW_FILE_ICON,7,114,20,20
LTEXT "",IDC_STATIC_OVERWRITE_NEW_FILE_SIZE_TIME,39,114,325,50
PUSHBUTTON "&Yes",IDYES,78,173,64,14
PUSHBUTTON "Yes to &All",IDC_BUTTON_OVERWRITE_YES_TO_ALL,152,173,64,
14
PUSHBUTTON "&No",IDNO,226,172,64,14
PUSHBUTTON "No to A&ll",IDC_BUTTON_OVERWRITE_NO_TO_ALL,300,172,64,
14
PUSHBUTTON "A&uto Rename",IDC_BUTTON_OVERWRITE_AUTO_RENAME,181,197,
109,14
PUSHBUTTON "&Cancel",IDCANCEL,300,197,64,14
LTEXT "Destination folder already contains processed file.", IDC_STATIC_OVERWRITE_HEADER, marg, 7, xSize2, 8
LTEXT "Would you like to replace the existing file", IDC_STATIC_OVERWRITE_QUESTION_BEGIN, marg, 28, xSize2, 8
ICON "", IDC_STATIC_OVERWRITE_OLD_FILE_ICON, marg, 44, iconSize, iconSize
LTEXT "", IDC_STATIC_OVERWRITE_OLD_FILE_SIZE_TIME, fiXPos, 44, fiXSize, fiYSize
LTEXT "with this one?",IDC_STATIC_OVERWRITE_QUESTION_END, marg, 98, xSize2, 8
ICON "",IDC_STATIC_OVERWRITE_NEW_FILE_ICON, marg, 114, iconSize, iconSize
LTEXT "",IDC_STATIC_OVERWRITE_NEW_FILE_SIZE_TIME, fiXPos, 114, fiXSize, fiYSize
PUSHBUTTON "&Yes", IDYES, 78, b2YPos, bXSize, bYSize
PUSHBUTTON "Yes to &All", IDC_BUTTON_OVERWRITE_YES_TO_ALL, 152, b2YPos, bXSize, bYSize
PUSHBUTTON "&No", IDNO, 226, b2YPos, bXSize, bYSize
PUSHBUTTON "No to A&ll", IDC_BUTTON_OVERWRITE_NO_TO_ALL, 300, b2YPos, bXSize, bYSize
PUSHBUTTON "A&uto Rename", IDC_BUTTON_OVERWRITE_AUTO_RENAME, 181, b1YPos, 109, bYSize
PUSHBUTTON "&Cancel", IDCANCEL, 300, b1YPos, bXSize, bYSize
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
STRINGTABLE
BEGIN
IDD_DIALOG_OVERWRITE, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 364
VERTGUIDE, 39
TOPMARGIN, 7
BOTTOMMARGIN, 211
END
IDS_FILE_MODIFIED "modified on"
IDS_FILE_SIZE "{0} bytes"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE DISCARDABLE
BEGIN
IDS_FILE_MODIFIED "modified on"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_FILE_SIZE "{0} bytes"
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,19 +1,4 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_DIALOG_PASSWORD 501
#define IDC_STATIC_PASSWORD_HEADER 1000
#define IDC_EDIT_PASSWORD 1001
#define IDC_CHECK_PASSWORD_SHOW 1002
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 157
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1003
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,103 +1,26 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#define xSize2 172
#define ySize2 68
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
#define bYPos (ySize - marg - bYSize)
#define b1XPos (xSize - marg - bXSize)
#define b2XPos (b1XPos - 10 - bXSize)
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DIALOG_PASSWORD DIALOG DISCARDABLE 0, 0, 186, 82
STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION |
WS_SYSMENU
IDD_DIALOG_PASSWORD DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE
CAPTION "Enter password"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
LTEXT "&Enter password:",IDC_STATIC_PASSWORD_HEADER,7,7,172,8
EDITTEXT IDC_EDIT_PASSWORD,7,19,172,14,ES_PASSWORD |
ES_AUTOHSCROLL
CONTROL "&Show password",IDC_CHECK_PASSWORD_SHOW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,41,172,10
DEFPUSHBUTTON "OK",IDOK,41,61,64,14
PUSHBUTTON "Cancel",IDCANCEL,115,61,64,14
LTEXT "&Enter password:", IDC_STATIC_PASSWORD_HEADER, marg, marg, xSize2, 8
EDITTEXT IDC_EDIT_PASSWORD, marg , 19, xSize2, 14, ES_PASSWORD | ES_AUTOHSCROLL
CONTROL "&Show password", IDC_CHECK_PASSWORD_SHOW, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
marg, 41, xSize2, 10
DEFPUSHBUTTON "OK", IDOK, b2XPos, bYPos, bXSize, bYSize
PUSHBUTTON "Cancel", IDCANCEL, b1XPos, bYPos, bXSize, bYSize
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_DIALOG_PASSWORD, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 179
TOPMARGIN, 7
BOTTOMMARGIN, 75
END
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -128,6 +128,7 @@ STDMETHODIMP CPluginOptionsCallback::GetProgramFolderPath(BSTR *value)
return S_OK;
}
#ifndef _WIN64
static bool IsItWindowsNT()
{
OSVERSIONINFO aVersionInfo;
@@ -136,13 +137,17 @@ static bool IsItWindowsNT()
return false;
return (aVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT);
}
#endif
static UString GetDefaultProgramName()
{
if (IsItWindowsNT())
return L"7zFMn.exe";
else
return L"7zFM.exe";
UString name;
name += L"7zFM";
#ifndef _WIN64
if (IsItWindowsNT())
name += L"n";
#endif
return name + L".exe";
}
STDMETHODIMP CPluginOptionsCallback::GetProgramPath(BSTR *value)

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,19 +1,4 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_PLUGINS 901
#define IDC_PLUGINS_STATIC_PLUGINS 1000
#define IDC_PLUGINS_LIST 1001
#define IDC_PLUGINS_BUTTON_OPTIONS 1002
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 135
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 103
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,100 +1,19 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
#define xSize2 196
#define ySize2 140
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_PLUGINS DIALOG DISCARDABLE 0, 0, 210, 154
STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
IDD_PLUGINS DIALOG 0, 0, xSize, ySize MY_PAGE_STYLE
CAPTION "Plugins"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
LTEXT "&Plugins:",IDC_PLUGINS_STATIC_PLUGINS,7,7,196,8
CONTROL "List1",IDC_PLUGINS_LIST,"SysListView32",LVS_REPORT |
LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER |
LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,20,135,127
PUSHBUTTON "Options...",IDC_PLUGINS_BUTTON_OPTIONS,153,20,50,14
LTEXT "&Plugins:", IDC_PLUGINS_STATIC_PLUGINS, marg, marg, xSize2, 8
CONTROL "List1", IDC_PLUGINS_LIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,
marg, 20, xSize2 - bXSize - 12, ySize2 - 12
PUSHBUTTON "Options...", IDC_PLUGINS_BUTTON_OPTIONS, (xSize - marg - bXSize), 20, bXSize, bYSize
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_PLUGINS, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 203
TOPMARGIN, 7
BOTTOMMARGIN, 147
END
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,20 +1,3 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_DIALOG_PROGRESS 500
#define IDC_PROGRESS1 1000
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 157
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1002
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,101 +1,20 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#define xSize2 172
#define ySize2 42
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
#define bYPos (ySize - marg - bYSize)
#define bXPos (xSize - marg - bXSize)
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DIALOG_PROGRESS DIALOG DISCARDABLE 0, 0, 186, 55
STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION |
WS_SYSMENU
IDD_DIALOG_PROGRESS DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE
CAPTION "Progress"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
PUSHBUTTON "Cancel",IDCANCEL,61,34,64,14
CONTROL "Progress1",IDC_PROGRESS1,"msctls_progress32",PBS_SMOOTH |
WS_BORDER,7,7,172,14
PUSHBUTTON "Cancel", IDCANCEL, bXPos, bYPos , bXSize, bYSize
CONTROL "Progress1", IDC_PROGRESS1,"msctls_progress32",PBS_SMOOTH | WS_BORDER,
marg,marg, xSize2, 14
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_DIALOG_PROGRESS, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 179
TOPMARGIN, 7
BOTTOMMARGIN, 48
END
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -332,10 +332,13 @@ void CProgressDialog::SetTitleText()
title = pausedString;
title += L" ";
}
wchar_t s[64];
ConvertUInt64ToString(_prevPercentValue, s);
title += s;
title += L"%";
if (_prevPercentValue != UInt32(-1))
{
wchar_t s[64];
ConvertUInt64ToString(_prevPercentValue, s);
title += s;
title += L"%";
}
if (!_foreground)
{
title += L" ";

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,7 +1,3 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDC_BUTTON_PAUSE 3
#define IDC_BUTTON_PROGRESS_PRIORITY 4
#define IDD_DIALOG_PROGRESS 500
@@ -19,14 +15,3 @@
#define IDC_PROGRESS_TOTAL 1008
#define IDC_PROGRESS_SPEED_TOTAL_VALUE 1009
#define IDC_PROGRESS_FILE_NAME 1010
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 157
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1006
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,128 +1,57 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#define xSize2 290
#define ySize2 76
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#define bYPos (ySize - marg - bYSize)
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#undef bXSize
#define bXSize 72
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
#define bXPos1 (xSize - marg - bXSize)
#define bXPos2 (bXPos1 - 10 - bXSize)
#define bXPos3 (bXPos2 - 10 - bXSize)
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
#define valSize 42
#define timeSize 91
#define labelPos 178
#define valPos1 (marg + timeSize)
#define valPos2 (xSize - marg - valSize)
#define labelSize (valPos2 - labelPos)
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
#undef yPos
#define yPos (marg + 11)
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DIALOG_PROGRESS DIALOG DISCARDABLE 0, 0, 304, 90
STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
WS_CAPTION | WS_SYSMENU
IDD_DIALOG_PROGRESS DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE | WS_MINIMIZEBOX
CAPTION "Progress"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
PUSHBUTTON "&Background",IDC_BUTTON_PROGRESS_PRIORITY,61,69,72,14
PUSHBUTTON "&Pause",IDC_BUTTON_PAUSE,143,69,72,14
PUSHBUTTON "Cancel",IDCANCEL,225,69,72,14
LTEXT "Elapsed time:",IDC_PROGRESS_ELAPSED,7,7,91,8
RTEXT "00:00:00",IDC_PROGRESS_ELAPSED_VALUE,98,7,42,8
LTEXT "Remaining time:",IDC_PROGRESS_REMAINING,7,18,91,8
RTEXT "",IDC_PROGRESS_REMAINING_VALUE,98,18,42,8
LTEXT "Size:",IDC_PROGRESS_TOTAL,178,7,77,8
RTEXT "",IDC_PROGRESS_SPEED_TOTAL_VALUE,255,7,42,8
LTEXT "Speed:",IDC_PROGRESS_SPEED,178,18,77,8
RTEXT "",IDC_PROGRESS_SPEED_VALUE,255,18,42,8
CONTROL "Progress1",IDC_PROGRESS1,"msctls_progress32",PBS_SMOOTH |
WS_BORDER,7,49,290,13
LTEXT "",IDC_PROGRESS_FILE_NAME,7,34,290,8
PUSHBUTTON "&Background", IDC_BUTTON_PROGRESS_PRIORITY, bXPos3, bYPos, bXSize, bYSize
PUSHBUTTON "&Pause", IDC_BUTTON_PAUSE, bXPos2, bYPos, bXSize, bYSize
PUSHBUTTON "Cancel", IDCANCEL, bXPos1, bYPos, bXSize, bYSize
LTEXT "Elapsed time:", IDC_PROGRESS_ELAPSED, marg, marg, timeSize, 8
LTEXT "Remaining time:", IDC_PROGRESS_REMAINING, marg, yPos, timeSize, 8
LTEXT "Size:", IDC_PROGRESS_TOTAL, labelPos, marg, labelSize, 8
LTEXT "Speed:", IDC_PROGRESS_SPEED, labelPos, yPos, labelSize, 8
RTEXT "00:00:00", IDC_PROGRESS_ELAPSED_VALUE, valPos1, marg, valSize, 8
RTEXT "", IDC_PROGRESS_REMAINING_VALUE, valPos1, yPos, valSize, 8
RTEXT "", IDC_PROGRESS_SPEED_TOTAL_VALUE, valPos2, marg, valSize, 8
RTEXT "", IDC_PROGRESS_SPEED_VALUE, valPos2, yPos, valSize, 8
LTEXT "", IDC_PROGRESS_FILE_NAME, marg, yPos + 16, xSize2, 8
CONTROL "Progress1", IDC_PROGRESS1, "msctls_progress32", PBS_SMOOTH | WS_BORDER,
marg, bYPos - 20, xSize2, 13
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_DIALOG_PROGRESS, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 297
VERTGUIDE, 98
VERTGUIDE, 140
VERTGUIDE, 178
VERTGUIDE, 255
TOPMARGIN, 7
BOTTOMMARGIN, 83
END
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE DISCARDABLE
BEGIN
IDS_PROGRESS_PAUSED "Paused"
IDS_PROGRESS_FOREGROUND "&Foreground"
IDS_PROGRESS_CONTINUE "&Continue"
IDS_PROGRESS_ASK_CANCEL "Are you sure you want to cancel?"
IDS_PROGRESS_PAUSED "Paused"
IDS_PROGRESS_FOREGROUND "&Foreground"
IDS_PROGRESS_CONTINUE "&Continue"
IDS_PROGRESS_ASK_CANCEL "Are you sure you want to cancel?"
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -1,7 +1,3 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDS_PROPERTY_PATH 3
#define IDS_PROPERTY_NAME 4
#define IDS_PROPERTY_EXTENSION 5
@@ -28,15 +24,4 @@
#define IDS_PROPERTY_GROUP 26
#define IDS_PROPERTY_BLOCK 27
#define IDS_PROPERTY_COMMENT 28
#define IDS_PROPERTY_POSITION 29
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 157
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1002
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
#define IDS_PROPERTY_POSITION 29

View File

@@ -1,104 +1,34 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE DISCARDABLE
STRINGTABLE
BEGIN
IDS_PROPERTY_PATH "Path"
IDS_PROPERTY_NAME "Name"
IDS_PROPERTY_EXTENSION "Extension"
IDS_PROPERTY_IS_FOLDER "Folder"
IDS_PROPERTY_SIZE "Size"
IDS_PROPERTY_PACKED_SIZE "Packed Size"
IDS_PROPERTY_ATTRIBUTES "Attributes"
IDS_PROPERTY_CREATION_TIME "Created"
IDS_PROPERTY_LAST_ACCESS_TIME "Accessed"
IDS_PROPERTY_LAST_WRITE_TIME "Modified"
IDS_PROPERTY_SOLID "Solid"
IDS_PROPERTY_C0MMENTED "Commented"
IDS_PROPERTY_ENCRYPTED "Encrypted"
IDS_PROPERTY_PATH "Path"
IDS_PROPERTY_NAME "Name"
IDS_PROPERTY_EXTENSION "Extension"
IDS_PROPERTY_IS_FOLDER "Folder"
IDS_PROPERTY_SIZE "Size"
IDS_PROPERTY_PACKED_SIZE "Packed Size"
IDS_PROPERTY_ATTRIBUTES "Attributes"
IDS_PROPERTY_CREATION_TIME "Created"
IDS_PROPERTY_LAST_ACCESS_TIME "Accessed"
IDS_PROPERTY_LAST_WRITE_TIME "Modified"
IDS_PROPERTY_SOLID "Solid"
IDS_PROPERTY_C0MMENTED "Commented"
IDS_PROPERTY_ENCRYPTED "Encrypted"
IDS_PROPERTY_DICTIONARY_SIZE "Dictionary Size"
IDS_PROPERTY_SPLIT_BEFORE "Split Before"
IDS_PROPERTY_SPLIT_AFTER "Split After"
IDS_PROPERTY_CRC "CRC"
IDS_PROPERTY_FILE_TYPE "Type"
IDS_PROPERTY_ANTI "Anti"
IDS_PROPERTY_METHOD "Method"
IDS_PROPERTY_HOST_OS "Host OS"
IDS_PROPERTY_FILE_SYSTEM "File System"
IDS_PROPERTY_USER "User"
IDS_PROPERTY_GROUP "Group"
IDS_PROPERTY_BLOCK "Block"
IDS_PROPERTY_COMMENT "Comment"
IDS_PROPERTY_POSITION "Position"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_PROPERTY_DICTIONARY_SIZE "Dictionary Size"
IDS_PROPERTY_SPLIT_BEFORE "Split Before"
IDS_PROPERTY_SPLIT_AFTER "Split After"
IDS_PROPERTY_CRC "CRC"
IDS_PROPERTY_FILE_TYPE "Type"
IDS_PROPERTY_ANTI "Anti"
IDS_PROPERTY_METHOD "Method"
IDS_PROPERTY_HOST_OS "Host OS"
IDS_PROPERTY_FILE_SYSTEM "File System"
IDS_PROPERTY_USER "User"
IDS_PROPERTY_GROUP "Group"
IDS_PROPERTY_BLOCK "Block"
IDS_PROPERTY_COMMENT "Comment"
IDS_PROPERTY_POSITION "Position"
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -21,7 +21,8 @@ static CIDLangPair kIDLangPairs[] =
{ IDC_SETTINGS_SHOW_REAL_FILE_ICONS, 0x03010402},
{ IDC_SETTINGS_SHOW_SYSTEM_MENU, 0x03010410},
{ IDC_SETTINGS_FULL_ROW, 0x03010420},
{ IDC_SETTINGS_SHOW_GRID, 0x03010421}
{ IDC_SETTINGS_SHOW_GRID, 0x03010421},
{ IDC_SETTINGS_ALTERNATIVE_SELECTION, 0x03010430},
// { IDC_SETTINGS_SINGLE_CLICK, 0x03010422},
// { IDC_SETTINGS_UNDERLINE, 0x03010423}
};
@@ -38,6 +39,7 @@ bool CSettingsPage::OnInit()
CheckButton(IDC_SETTINGS_FULL_ROW, ReadFullRow());
CheckButton(IDC_SETTINGS_SHOW_GRID, ReadShowGrid());
CheckButton(IDC_SETTINGS_ALTERNATIVE_SELECTION, ReadAlternativeSelection());
// CheckButton(IDC_SETTINGS_SINGLE_CLICK, ReadSingleClick());
// CheckButton(IDC_SETTINGS_UNDERLINE, ReadUnderline());
@@ -61,6 +63,7 @@ LONG CSettingsPage::OnApply()
SaveFullRow(IsButtonCheckedBool(IDC_SETTINGS_FULL_ROW));
SaveShowGrid(IsButtonCheckedBool(IDC_SETTINGS_SHOW_GRID));
SaveAlternativeSelection(IsButtonCheckedBool(IDC_SETTINGS_ALTERNATIVE_SELECTION));
// SaveSingleClick(IsButtonCheckedBool(IDC_SETTINGS_SINGLE_CLICK));
// SaveUnderline(IsButtonCheckedBool(IDC_SETTINGS_UNDERLINE));
@@ -87,6 +90,7 @@ bool CSettingsPage::OnButtonClicked(int buttonID, HWND buttonHWND)
case IDC_SETTINGS_SHOW_REAL_FILE_ICONS:
case IDC_SETTINGS_FULL_ROW:
case IDC_SETTINGS_SHOW_GRID:
case IDC_SETTINGS_ALTERNATIVE_SELECTION:
Changed();
return true;
}

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -1,23 +1,10 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_SETTINGS 904
#define IDC_SETTINGS_SHOW_DOTS 1000
#define IDC_SETTINGS_SHOW_REAL_FILE_ICONS 1001
#define IDC_SETTINGS_SHOW_SYSTEM_MENU 1010
#define IDC_SETTINGS_FULL_ROW 1011
#define IDC_SETTINGS_SHOW_GRID 1013
#define IDC_SETTINGS_SINGLE_CLICK 1014
#define IDC_SETTINGS_UNDERLINE 1015
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 135
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1011
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
#define IDC_SETTINGS_ALTERNATIVE_SELECTION 1016

View File

@@ -1,112 +1,32 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
#define xSize2 196
#define ySize2 140
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_SETTINGS DIALOG DISCARDABLE 0, 0, 210, 154
STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
IDD_SETTINGS DIALOG 0, 0, xSize, ySize MY_PAGE_STYLE
CAPTION "Settings"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
CONTROL "Show "".."" item",IDC_SETTINGS_SHOW_DOTS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,7,196,10
CONTROL "Show real file &icons",
IDC_SETTINGS_SHOW_REAL_FILE_ICONS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,21,196,10
CONTROL "Show system &menu",IDC_SETTINGS_SHOW_SYSTEM_MENU,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,35,196,10
CONTROL "&Full row select",IDC_SETTINGS_FULL_ROW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,63,196,10
CONTROL "Show &grid lines",IDC_SETTINGS_SHOW_GRID,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,77,196,10
CONTROL "&Single-click to open an item",
IDC_SETTINGS_SINGLE_CLICK,"Button",BS_AUTOCHECKBOX | NOT
WS_VISIBLE | WS_TABSTOP,7,91,196,10
CONTROL "&Underline current name",IDC_SETTINGS_UNDERLINE,"Button",
BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,19,105,184,
10
CONTROL "Show "".."" item", IDC_SETTINGS_SHOW_DOTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
marg, marg, xSize2, 10
CONTROL "Show real file &icons", IDC_SETTINGS_SHOW_REAL_FILE_ICONS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
marg, 21, xSize2, 10
CONTROL "Show system &menu", IDC_SETTINGS_SHOW_SYSTEM_MENU, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
marg, 35, xSize2, 10
CONTROL "&Full row select", IDC_SETTINGS_FULL_ROW, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
marg, 63, xSize2, 10
CONTROL "Show &grid lines", IDC_SETTINGS_SHOW_GRID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
marg, 77, xSize2, 10
CONTROL "&Single-click to open an item", IDC_SETTINGS_SINGLE_CLICK, "Button", BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,
marg, 91, xSize2, 10
CONTROL "&Underline current name", IDC_SETTINGS_UNDERLINE, "Button", BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,
marg + 12, 105, xSize2 - 12, 10
CONTROL "&Alternative selection mode", IDC_SETTINGS_ALTERNATIVE_SELECTION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
marg, 122, xSize2, 10
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_SETTINGS, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 203
TOPMARGIN, 7
BOTTOMMARGIN, 147
END
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -0,0 +1,18 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
// #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include "Common/NewHandler.h"
#endif

View File

@@ -1,21 +1,6 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_DIALOG_SPLIT 504
#define IDC_STATIC_SPLIT_PATH 1000
#define IDC_COMBO_SPLIT_PATH 1001
#define IDC_BUTTON_SPLIT_PATH 1002
#define IDC_STATIC_SPLIT_VOLUME 1010
#define IDC_COMBO_SPLIT_VOLUME 1011
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 157
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1004
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@@ -1,106 +1,27 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#define xSize2 223
#define ySize2 89
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
#define bYPos (ySize - marg - bYSize)
#define b1XPos (xSize - marg - bXSize)
#define b2XPos (b1XPos - 10 - bXSize)
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DIALOG_SPLIT DIALOG DISCARDABLE 0, 0, 237, 103
STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION |
WS_SYSMENU
IDD_DIALOG_SPLIT DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE
CAPTION "Split File"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
LTEXT "&Split to:",IDC_STATIC_SPLIT_PATH,7,7,223,8
COMBOBOX IDC_COMBO_SPLIT_PATH,7,18,193,126,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "...",IDC_BUTTON_SPLIT_PATH,210,17,20,14,WS_GROUP
LTEXT "Split to &volumes, bytes:",IDC_STATIC_SPLIT_VOLUME,7,38,
223,8
COMBOBOX IDC_COMBO_SPLIT_VOLUME,7,50,120,52,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,91,82,64,14
PUSHBUTTON "Cancel",IDCANCEL,166,82,64,14
LTEXT "&Split to:", IDC_STATIC_SPLIT_PATH, marg, marg, xSize2, 8
COMBOBOX IDC_COMBO_SPLIT_PATH, marg, 18, xSize2 - bDotsSize - 12, 126, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "...", IDC_BUTTON_SPLIT_PATH, xSize - marg - bDotsSize, 17, bDotsSize, bYSize, WS_GROUP
LTEXT "Split to &volumes, bytes:", IDC_STATIC_SPLIT_VOLUME, marg, 38, xSize2, 8
COMBOBOX IDC_COMBO_SPLIT_VOLUME, marg, 50, 120, 52, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, b2XPos, bYPos, bXSize, bYSize
PUSHBUTTON "Cancel", IDCANCEL, b1XPos, bYPos, bXSize, bYSize
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_DIALOG_SPLIT, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 230
TOPMARGIN, 7
BOTTOMMARGIN, 96
END
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -0,0 +1,16 @@
// stdafx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#define _WIN32_WINNT 0x0400
// it's for Windows NT supporting (MENUITEMINFOW)
#define WINVER 0x0400
#include <windows.h>
#include <commctrl.h>
#include "Common/NewHandler.h"
#endif

View File

@@ -26,7 +26,8 @@ const int kUpdateDatabase = kRefreshpluginsListMessage + 1;
static CIDLangPair kIDLangPairs[] =
{
{ IDC_SYSTEM_STATIC_ASSOCIATE, 0x03010302}
{ IDC_SYSTEM_STATIC_ASSOCIATE, 0x03010302},
{ IDC_SYSTEM_SELECT_ALL, 0x03000330}
};
static LPCWSTR kSystemTopic = L"FM/options.htm#system";
@@ -115,6 +116,7 @@ void CSystemPage::SetMainPluginText(int itemIndex, int indexInDatabase)
_listViewExt.SetItem(&item);
}
#ifndef _WIN64
static bool IsItWindowsNT()
{
OSVERSIONINFO versionInfo;
@@ -123,6 +125,7 @@ static bool IsItWindowsNT()
return false;
return (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT);
}
#endif
static UString GetProgramCommand()
{
@@ -130,11 +133,12 @@ static UString GetProgramCommand()
UString folder;
if (GetProgramFolderPath(folder))
path += folder;
path += L"7zFM";
#ifndef _WIN64
if (IsItWindowsNT())
path += L"7zFMn.exe";
else
path += L"7zFM.exe";
path += L"\" \"%1\"";
path += L"n";
#endif
path += L".exe\" \"%1\"";
return path;
}
@@ -174,6 +178,7 @@ static CSysString GetIconPath(const CSysString &filePath,
LONG CSystemPage::OnApply()
{
UpdateDatabase();
_extDatabase.Save();
UString command = GetProgramCommand();
@@ -214,13 +219,24 @@ void CSystemPage::OnNotifyHelp()
ShowHelpWindow(NULL, kSystemTopic);
}
void CSystemPage::SelectAll()
{
int count = _listViewExt.GetItemCount();
for (int i = 0; i < count; i++)
_listViewExt.SetCheckState(i, true);
UpdateDatabase();
}
bool CSystemPage::OnButtonClicked(int buttonID, HWND buttonHWND)
{
switch(buttonID)
{
case IDC_SYSTEM_INTEGRATE_TO_CONTEXT_MENU:
case IDC_SYSTEM_SELECT_ALL:
{
SelectAll();
Changed();
return true;
}
}
return CPropertyPage::OnButtonClicked(buttonID, buttonHWND);
}
@@ -332,7 +348,7 @@ bool CSystemPage::OnItemChanged(const NMLISTVIEW *info)
return true;
}
bool CSystemPage::OnMessage(UINT message, UINT wParam, LPARAM lParam)
bool CSystemPage::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
{
switch(message)
{

View File

@@ -23,9 +23,10 @@ class CSystemPage: public NWindows::NControl::CPropertyPage
void RefreshPluginsList(int selectIndex);
void MovePlugin(bool upDirection);
void UpdateDatabase();
void SelectAll();
public:
virtual bool OnMessage(UINT message, UINT wParam, LPARAM lParam);
virtual bool OnMessage(UINT message, WPARAM wParam, LPARAM lParam);
virtual bool OnInit();
virtual void OnNotifyHelp();
virtual bool OnNotify(UINT controlID, LPNMHDR lParam);

View File

@@ -1,21 +1,7 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDD_SYSTEM 902
#define IDS_PLUGIN 990
#define IDC_SYSTEM_INTEGRATE_TO_CONTEXT_MENU 1010
// #define IDC_SYSTEM_INTEGRATE_TO_CONTEXT_MENU 1010
#define IDC_SYSTEM_STATIC_ASSOCIATE 1020
#define IDC_SYSTEM_LIST_ASSOCIATE 1021
#define IDC_SYSTEM_LIST_PLUGINS 1022
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 135
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1022
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
#define IDC_SYSTEM_SELECT_ALL 1023

View File

@@ -1,115 +1,31 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "../../../GuiCommon.rc"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
#define xSize2 238
#define ySize2 204
#define xSize (xSize2 + marg + marg)
#define ySize (ySize2 + marg + marg)
#define gSpace 30
#define g0Size 105
#define gYSize (ySize2 - 20 - bYSize)
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_SYSTEM DIALOG DISCARDABLE 0, 0, 252, 218
STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
IDD_SYSTEM DIALOG 0, 0, xSize, ySize MY_PAGE_STYLE
CAPTION "System"
FONT 8, "MS Shell Dlg"
MY_FONT
BEGIN
LTEXT "Associate 7-Zip with:",IDC_SYSTEM_STATIC_ASSOCIATE,7,7,
238,8
CONTROL "List1",IDC_SYSTEM_LIST_ASSOCIATE,"SysListView32",
LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING |
WS_BORDER | WS_TABSTOP,7,20,105,186
CONTROL "List1",IDC_SYSTEM_LIST_PLUGINS,"SysListView32",
LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | NOT
WS_VISIBLE | WS_BORDER | WS_TABSTOP,143,20,102,186
LTEXT "Associate 7-Zip with:", IDC_SYSTEM_STATIC_ASSOCIATE, marg, marg, xSize2, 8
CONTROL "List1", IDC_SYSTEM_LIST_ASSOCIATE, "SysListView32",
LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
marg, 20, g0Size, gYSize
CONTROL "List1", IDC_SYSTEM_LIST_PLUGINS, "SysListView32",
LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | NOT WS_VISIBLE | WS_BORDER | WS_TABSTOP,
marg + g0Size + gSpace, 20, xSize2 - gSpace - g0Size, gYSize
PUSHBUTTON "Select all", IDC_SYSTEM_SELECT_ALL, marg, (ySize - marg - bYSize), 90, bYSize
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
STRINGTABLE
BEGIN
IDD_SYSTEM, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 245
TOPMARGIN, 7
BOTTOMMARGIN, 211
HORZGUIDE, 25
END
IDS_PLUGIN "Plugin"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE DISCARDABLE
BEGIN
IDS_PLUGIN "Plugin"
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View File

@@ -62,4 +62,5 @@ void AddVolumeItems(NWindows::NControl::CComboBox &volumeCombo)
volumeCombo.AddString(TEXT("1457664 - 3.5\" floppy"));
volumeCombo.AddString(TEXT("650M - CD"));
volumeCombo.AddString(TEXT("700M - CD"));
volumeCombo.AddString(TEXT("4480M - DVD"));
}

173
7zip/FileManager/makefile Executable file
View File

@@ -0,0 +1,173 @@
PROG = 7zFM.exe
LIBS = $(LIBS) user32.lib oleaut32.lib advapi32.lib shell32.lib ole32.lib comctl32.lib htmlhelp.lib Mpr.lib Gdi32.lib comdlg32.lib
CFLAGS = $(CFLAGS) -I../../ -DLANG
FM_OBJS = \
$O\App.obj \
$O\ClassDefs.obj \
$O\EnumFormatEtc.obj \
$O\ExtractCallback.obj \
$O\FileFolderPluginOpen.obj \
$O\FilePlugins.obj \
$O\FM.obj \
$O\FormatUtils.obj \
$O\FSDrives.obj \
$O\FSFolder.obj \
$O\FSFolderCopy.obj \
$O\HelpUtils.obj \
$O\LangUtils.obj \
$O\MyLoadMenu.obj \
$O\NetFolder.obj \
$O\OpenCallback.obj \
$O\OptionsDialog.obj \
$O\Panel.obj \
$O\PanelCopy.obj \
$O\PanelDrag.obj \
$O\PanelFolderChange.obj \
$O\PanelItemOpen.obj \
$O\PanelItems.obj \
$O\PanelKey.obj \
$O\PanelListNotify.obj \
$O\PanelMenu.obj \
$O\PanelOperations.obj \
$O\PanelSelect.obj \
$O\PanelSort.obj \
$O\PanelSplitFile.obj \
$O\ProgramLocation.obj \
$O\PropertyName.obj \
$O\RegistryAssociations.obj \
$O\RegistryPlugins.obj \
$O\RegistryUtils.obj \
$O\RootFolder.obj \
$O\SplitUtils.obj \
$O\StringUtils.obj \
$O\SysIconUtils.obj \
$O\TextPairs.obj \
$O\UpdateCallback100.obj \
$O\ViewSettings.obj \
COMMON_OBJS = \
$O\Alloc.obj \
$O\CRC.obj \
$O\IntToString.obj \
$O\Lang.obj \
$O\ListFileUtils.obj \
$O\NewHandler.obj \
$O\Random.obj \
$O\StdInStream.obj \
$O\StdOutStream.obj \
$O\String.obj \
$O\StringConvert.obj \
$O\StringToInt.obj \
$O\TextConfig.obj \
$O\UTFConvert.obj \
$O\Vector.obj \
$O\Wildcard.obj \
WIN_OBJS = \
$O\DLL.obj \
$O\Error.obj \
$O\FileDir.obj \
$O\FileFind.obj \
$O\FileIO.obj \
$O\FileName.obj \
$O\FileSystem.obj \
$O\Memory.obj \
$O\Net.obj \
$O\PropVariant.obj \
$O\PropVariantConversions.obj \
$O\Registry.obj \
$O\ResourceString.obj \
$O\Shell.obj \
$O\Synchronization.obj \
$O\Window.obj \
WIN_CTRL_OBJS = \
$O\ComboBox.obj \
$O\Dialog.obj \
$O\ListView.obj \
$O\PropertyPage.obj \
$O\Window2.obj \
7ZIP_COMMON_OBJS = \
$O\FilePathAutoRename.obj \
$O\FileStreams.obj \
$O\StreamObjects.obj \
UI_COMMON_OBJS = \
$O\ArchiveName.obj \
$O\CompressCall.obj \
$O\PropIDUtils.obj \
OBJS = \
$O\StdAfx.obj \
$(FM_OBJS)\
$(COMMON_OBJS) \
$(WIN_OBJS) \
$(WIN_CTRL_OBJS) \
$(7ZIP_COMMON_OBJS) \
$(UI_COMMON_OBJS) \
$O\AboutDialog.obj \
$O\BenchmarkDialog.obj \
$O\ComboDialog.obj \
$O\CopyDialog.obj \
$O\EditPage.obj \
$O\LangPage.obj \
$O\ListViewDialog.obj \
$O\MessagesDialog.obj \
$O\OverwriteDialog.obj \
$O\PasswordDialog.obj \
$O\PluginsPage.obj \
$O\ProgressDialog.obj \
$O\SettingsPage.obj \
$O\SplitDialog.obj \
$O\SystemPage.obj \
$O\resource.res \
!include "../../Build.mak"
$(FM_OBJS): $(*B).cpp
$(COMPL)
$(COMMON_OBJS): ../../Common/$(*B).cpp
$(COMPL)
$(WIN_OBJS): ../../Windows/$(*B).cpp
$(COMPL)
$(WIN_CTRL_OBJS): ../../Windows/Control/$(*B).cpp
$(COMPL)
$(7ZIP_COMMON_OBJS): ../Common/$(*B).cpp
$(COMPL)
$(UI_COMMON_OBJS): ../UI/Common/$(*B).cpp
$(COMPL)
$O\AboutDialog.obj: Resource/AboutDialog/AboutDialog.cpp
$(COMPL)
$O\BenchmarkDialog.obj: Resource/BenchmarkDialog/BenchmarkDialog.cpp
$(COMPL)
$O\ComboDialog.obj: Resource/ComboDialog/ComboDialog.cpp
$(COMPL)
$O\CopyDialog.obj: Resource/CopyDialog/CopyDialog.cpp
$(COMPL)
$O\EditPage.obj: Resource/EditPage/EditPage.cpp
$(COMPL)
$O\LangPage.obj: Resource/LangPage/LangPage.cpp
$(COMPL)
$O\ListViewDialog.obj: Resource/ListViewDialog/ListViewDialog.cpp
$(COMPL)
$O\MessagesDialog.obj: Resource/MessagesDialog/MessagesDialog.cpp
$(COMPL)
$O\OverwriteDialog.obj: Resource/OverwriteDialog/OverwriteDialog.cpp
$(COMPL)
$O\PasswordDialog.obj: Resource/PasswordDialog/PasswordDialog.cpp
$(COMPL)
$O\PluginsPage.obj: Resource/PluginsPage/PluginsPage.cpp
$(COMPL)
$O\ProgressDialog.obj: Resource/ProgressDialog2/ProgressDialog.cpp
$(COMPL)
$O\SettingsPage.obj: Resource/SettingsPage/SettingsPage.cpp
$(COMPL)
$O\SplitDialog.obj: Resource/SplitDialog/SplitDialog.cpp
$(COMPL)
$O\SystemPage.obj: Resource/SystemPage/SystemPage.cpp
$(COMPL)

View File

@@ -1,7 +1,3 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by resource.rc
//
#define IDI_FAM 101
#define IDI_FM 101
#define IDR_MENUBAR1 103
@@ -79,6 +75,7 @@
#define IDS_MOVING 2206
#define IDS_CANNOT_COPY 2207
#define IDS_OPERATION_IS_NOT_SUPPORTED 2208
#define IDS_CONFIRM_FILE_DELETE 2210
#define IDS_CONFIRM_FOLDER_DELETE 2211
#define IDS_CONFIRM_ITEMS_DELETE 2212
@@ -87,8 +84,13 @@
#define IDS_WANT_TO_DELETE_ITEMS 2215
#define IDS_DELETING 2216
#define IDS_ERROR_DELETING 2217
#define IDS_RENAMING 2220
#define IDS_ERROR_RENAMING 2221
#define IDS_CONFIRM_FILE_COPY 2222
#define IDS_WANT_TO_COPY_FILES 2223
#define IDS_CREATE_FOLDER 2230
#define IDS_CREATE_FOLDER_NAME 2231
#define IDS_CREATE_FOLDER_DEFAULT_NAME 2232
@@ -132,14 +134,3 @@
#define IDS_COMBINE 4030
#define IDS_COMBINE_TO 4031
#define IDS_COMBINING 4032
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 4030
#define _APS_NEXT_COMMAND_VALUE 40080
#define _APS_NEXT_CONTROL_VALUE 3000
#define _APS_NEXT_SYMED_VALUE 4010
#endif
#endif

View File

@@ -1,430 +1,212 @@
//Microsoft Developer Studio generated resource script.
//
#include "../MyVersionInfo.rc"
#include "../GuiCommon.rc"
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
MY_VERSION_INFO_APP("7-Zip File Manager", "7zFM")
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Russian resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
IDR_ACCELERATOR1 ACCELERATORS
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""Resource\\ComboDialog\\resource.rc""\r\n"
"#include ""Resource\\CopyDialog\\resource.rc""\r\n"
"#include ""Resource\\ListViewDialog\\resource.rc""\r\n"
"#include ""Resource\\PropertyName\\resource.rc""\r\n"
"#include ""Resource\\MessagesDialog\\resource.rc""\r\n"
"#include ""Resource\\OverwriteDialog\\resource.rc""\r\n"
"#include ""Resource\\PasswordDialog\\resource.rc""\r\n"
"#include ""Resource\\SplitDialog\\resource.rc""\r\n"
"#include ""Resource\\ProgressDialog2\\resource.rc""\r\n"
"#include ""Resource\\BenchmarkDialog\\resource.rc""\r\n"
"#include ""Resource\\AboutDialog\\resource.rc""\r\n"
"#include ""Resource\\LangPage\\resource.rc""\r\n"
"#include ""Resource\\PluginsPage\\resource.rc""\r\n"
"#include ""Resource\\SystemPage\\resource.rc""\r\n"
"#include ""Resource\\EditPage\\resource.rc""\r\n"
"#include ""Resource\\SettingsPage\\resource.rc""\r\n"
"#include ""..\\UI\\Resource\\Extract\\resource.rc""\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,24,0,0
PRODUCTVERSION 4,24,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Igor Pavlov\0"
VALUE "FileDescription", "7-Zip File Manager\0"
VALUE "FileVersion", "4, 24, 0, 0\0"
VALUE "InternalName", "7zFM\0"
VALUE "LegalCopyright", "Copyright (C) 1999-2005 Igor Pavlov\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "7zFM.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "7-Zip\0"
VALUE "ProductVersion", "4, 24, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // !_MAC
/////////////////////////////////////////////////////////////////////////////
//
// Accelerator
//
IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE
BEGIN
"N", IDM_CREATE_FILE, VIRTKEY, CONTROL, NOINVERT
VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT
VK_F12, IDM_FOLDERS_HISTORY, VIRTKEY, ALT, NOINVERT
VK_F7, IDM_CREATE_FOLDER, VIRTKEY, NOINVERT
"N", IDM_CREATE_FILE, VIRTKEY, CONTROL, NOINVERT
VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT
VK_F12, IDM_FOLDERS_HISTORY, VIRTKEY, ALT, NOINVERT
VK_F7, IDM_CREATE_FOLDER, VIRTKEY, NOINVERT
END
/////////////////////////////////////////////////////////////////////////////
//
// Menu
//
IDM_MENU MENU DISCARDABLE
IDM_MENU MENU
BEGIN
POPUP "&File"
POPUP "&File"
BEGIN
MENUITEM "&Open\tEnter", IDM_FILE_OPEN
MENUITEM "Open &Inside\tCtrl+PgDn", IDM_FILE_OPEN_INSIDE
MENUITEM "Open O&utside\tShift+Enter", IDM_FILE_OPEN_OUTSIDE
MENUITEM "&Edit\tF4", IDM_FILE_EDIT
MENUITEM SEPARATOR
MENUITEM "Rena&me\tF2", IDM_RENAME
MENUITEM "&Copy To...\tF5", IDM_COPY_TO
MENUITEM "&Move To...\tF6", IDM_MOVE_TO
MENUITEM "&Delete\tDel", IDM_DELETE
MENUITEM SEPARATOR
MENUITEM "&Split file...", IDM_FILE_SPLIT
MENUITEM "Com&bine files...", IDM_FILE_COMBINE
MENUITEM SEPARATOR
MENUITEM "P&roperties\tAlt+Enter", IDM_FILE_PROPERTIES
MENUITEM "Comme&nt\tCtrl+Z", IDM_FILE_COMMENT
MENUITEM SEPARATOR
MENUITEM "Create Folder\tF7", IDM_CREATE_FOLDER
MENUITEM "Create File\tCtrl+N", IDM_CREATE_FILE
MENUITEM SEPARATOR
MENUITEM "E&xit\tAlt+F4", IDCLOSE
END
POPUP "&Edit"
BEGIN
MENUITEM "Cu&t\tCtrl+X", IDM_EDIT_CUT, GRAYED
MENUITEM "&Copy\tCtrl+C", IDM_EDIT_COPY, GRAYED
MENUITEM "&Paste\tCtrl+V", IDM_EDIT_PASTE, GRAYED
MENUITEM SEPARATOR
MENUITEM "Select &All\tShift+[Grey +]", IDM_SELECT_ALL
MENUITEM "Deselect All\tShift+[Grey -]", IDM_DESELECT_ALL
MENUITEM "&Invert Selection\tGrey *", IDM_INVERT_SELECTION
MENUITEM "Select...\tGrey +", IDM_SELECT
MENUITEM "Deselect...\tGrey -", IDM_DESELECT
MENUITEM "Select by Type\tAlt+[Grey+]", IDM_SELECT_BY_TYPE
MENUITEM "Deselect by Type\tAlt+[Grey -]", IDM_DESELECT_BY_TYPE
END
POPUP "&View"
BEGIN
MENUITEM "Lar&ge Icons\tCtrl+1", IDM_VIEW_LARGE_ICONS
MENUITEM "S&mall Icons\tCtrl+2", IDM_VIEW_SMALL_ICONS
MENUITEM "&List\tCtrl+3", IDM_VIEW_LIST
MENUITEM "&Details\tCtrl+4", IDM_VIEW_DETAILS, CHECKED
MENUITEM SEPARATOR
MENUITEM "Name\tCtrl+F3", IDM_VIEW_ARANGE_BY_NAME
MENUITEM "Type\tCtrl+F4", IDM_VIEW_ARANGE_BY_TYPE
MENUITEM "Date\tCtrl+F5", IDM_VIEW_ARANGE_BY_DATE
MENUITEM "Size\tCtrl+F6", IDM_VIEW_ARANGE_BY_SIZE
MENUITEM "Unsorted\tCtrl+F7", IDM_VIEW_ARANGE_NO_SORT
MENUITEM SEPARATOR
MENUITEM "&2 Panels\tF9", IDM_VIEW_TWO_PANELS
POPUP "Toolbars"
BEGIN
MENUITEM "&Open\tEnter", IDM_FILE_OPEN
MENUITEM "Open &Inside\tCtrl+PgDn", IDM_FILE_OPEN_INSIDE
MENUITEM "Open O&utside\tShift+Enter", IDM_FILE_OPEN_OUTSIDE
MENUITEM "&Edit\tF4", IDM_FILE_EDIT
MENUITEM SEPARATOR
MENUITEM "Rena&me\tF2", IDM_RENAME
MENUITEM "&Copy To...\tF5", IDM_COPY_TO
MENUITEM "&Move To...\tF6", IDM_MOVE_TO
MENUITEM "&Delete\tDel", IDM_DELETE
MENUITEM SEPARATOR
MENUITEM "&Split file...", IDM_FILE_SPLIT
MENUITEM "Com&bine files...", IDM_FILE_COMBINE
MENUITEM SEPARATOR
MENUITEM "P&roperties\tAlt+Enter", IDM_FILE_PROPERTIES
MENUITEM "Comme&nt\tCtrl+Z", IDM_FILE_COMMENT
MENUITEM SEPARATOR
MENUITEM "Create Folder\tF7", IDM_CREATE_FOLDER
MENUITEM "Create File\tCtrl+N", IDM_CREATE_FILE
MENUITEM SEPARATOR
MENUITEM "E&xit\tAlt+F4", IDCLOSE
MENUITEM "Archive Toolbar", IDM_VIEW_ARCHIVE_TOOLBAR
MENUITEM "Standard Toolbar", IDM_VIEW_STANDARD_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "Large Buttons", IDM_VIEW_TOOLBARS_LARGE_BUTTONS
MENUITEM "Show Buttons Text", IDM_VIEW_TOOLBARS_SHOW_BUTTONS_TEXT
END
POPUP "&Edit"
MENUITEM SEPARATOR
MENUITEM "Open Root Folder\t\\", IDM_OPEN_ROOT_FOLDER
MENUITEM "Up One Level\tBackspace", IDM_OPEN_PARENT_FOLDER
MENUITEM "Folders History...\tAlt+F12", IDM_FOLDERS_HISTORY
MENUITEM SEPARATOR
MENUITEM "&Refresh\tCtrl+R", IDM_VIEW_REFRESH
END
POPUP "F&avorites"
BEGIN
POPUP "&Add folder to Favorites as"
BEGIN
MENUITEM "Cu&t\tCtrl+X", IDM_EDIT_CUT, GRAYED
MENUITEM "&Copy\tCtrl+C", IDM_EDIT_COPY, GRAYED
MENUITEM "&Paste\tCtrl+V", IDM_EDIT_PASTE, GRAYED
MENUITEM SEPARATOR
MENUITEM "Select &All\tShift+[Grey +]", IDM_SELECT_ALL
MENUITEM "Deselect All\tShift+[Grey -]", IDM_DESELECT_ALL
MENUITEM "&Invert Selection\tGrey *", IDM_INVERT_SELECTION
MENUITEM "Select...\tGrey +", IDM_SELECT
MENUITEM "Deselect...\tGrey -", IDM_DESELECT
MENUITEM "Select by Type\tAlt+[Grey+]", IDM_SELECT_BY_TYPE
MENUITEM "Deselect by Type\tAlt+[Grey -]", IDM_DESELECT_BY_TYPE
END
POPUP "&View"
BEGIN
MENUITEM "Lar&ge Icons\tCtrl+1", IDM_VIEW_LARGE_ICONS
MENUITEM "S&mall Icons\tCtrl+2", IDM_VIEW_SMALL_ICONS
MENUITEM "&List\tCtrl+3", IDM_VIEW_LIST
MENUITEM "&Details\tCtrl+4", IDM_VIEW_DETAILS, CHECKED
MENUITEM SEPARATOR
MENUITEM "Name\tCtrl+F3", IDM_VIEW_ARANGE_BY_NAME
MENUITEM "Type\tCtrl+F4", IDM_VIEW_ARANGE_BY_TYPE
MENUITEM "Date\tCtrl+F5", IDM_VIEW_ARANGE_BY_DATE
MENUITEM "Size\tCtrl+F6", IDM_VIEW_ARANGE_BY_SIZE
MENUITEM "Unsorted\tCtrl+F7", IDM_VIEW_ARANGE_NO_SORT
MENUITEM SEPARATOR
MENUITEM "&2 Panels\tF9", IDM_VIEW_TWO_PANELS
POPUP "Toolbars"
BEGIN
MENUITEM "Archive Toolbar", IDM_VIEW_ARCHIVE_TOOLBAR
MENUITEM "Standard Toolbar", IDM_VIEW_STANDARD_TOOLBAR
MENUITEM SEPARATOR
MENUITEM "Large Buttons", IDM_VIEW_TOOLBARS_LARGE_BUTTONS
MENUITEM "Show Buttons Text", IDM_VIEW_TOOLBARS_SHOW_BUTTONS_TEXT
END
MENUITEM SEPARATOR
MENUITEM "Open Root Folder\t\\", IDM_OPEN_ROOT_FOLDER
MENUITEM "Up One Level\tBackspace", IDM_OPEN_PARENT_FOLDER
MENUITEM "Folders History...\tAlt+F12", IDM_FOLDERS_HISTORY
MENUITEM SEPARATOR
MENUITEM "&Refresh\tCtrl+R", IDM_VIEW_REFRESH
END
POPUP "F&avorites"
BEGIN
POPUP "&Add folder to Favorites as"
BEGIN
MENUITEM SEPARATOR
END
MENUITEM SEPARATOR
END
POPUP "&Tools"
BEGIN
MENUITEM "&Options...", IDM_OPTIONS
MENUITEM "&Benchmark", IDM_BENCHMARK
END
POPUP "&Help"
BEGIN
MENUITEM "&Contents...\tF1", IDM_HELP_CONTENTS
MENUITEM SEPARATOR
MENUITEM "&About 7-Zip...", IDM_ABOUT
END
MENUITEM SEPARATOR
END
POPUP "&Tools"
BEGIN
MENUITEM "&Options...", IDM_OPTIONS
MENUITEM "&Benchmark", IDM_BENCHMARK
END
POPUP "&Help"
BEGIN
MENUITEM "&Contents...\tF1", IDM_HELP_CONTENTS
MENUITEM SEPARATOR
MENUITEM "&About 7-Zip...", IDM_ABOUT
END
END
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
IDI_FM ICON "FM.ico"
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_FM ICON DISCARDABLE "FM.ico"
1 24 MOVEABLE PURE "7zFM.exe.manifest"
/////////////////////////////////////////////////////////////////////////////
//
// 24
//
IDB_ADD BITMAP "Add.bmp"
IDB_EXTRACT BITMAP "Extract.bmp"
IDB_TEST BITMAP "Test.bmp"
IDB_COPY BITMAP "Copy.bmp"
IDB_MOVE BITMAP "Move.bmp"
IDB_DELETE BITMAP "Delete.bmp"
IDB_INFO BITMAP "Info.bmp"
IDB_ADD2 BITMAP "Add2.bmp"
IDB_EXTRACT2 BITMAP "Extract2.bmp"
IDB_TEST2 BITMAP "Test2.bmp"
IDB_COPY2 BITMAP "Copy2.bmp"
IDB_MOVE2 BITMAP "Move2.bmp"
IDB_DELETE2 BITMAP "Delete2.bmp"
IDB_INFO2 BITMAP "Info2.bmp"
1 24 MOVEABLE PURE "7zFM.exe.manifest"
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
IDB_ADD BITMAP DISCARDABLE "Add.bmp"
IDB_EXTRACT BITMAP DISCARDABLE "Extract.bmp"
IDB_TEST BITMAP DISCARDABLE "Test.bmp"
IDB_COPY BITMAP DISCARDABLE "Copy.bmp"
IDB_MOVE BITMAP DISCARDABLE "Move.bmp"
IDB_DELETE BITMAP DISCARDABLE "Delete.bmp"
IDB_INFO BITMAP DISCARDABLE "Info.bmp"
IDB_ADD2 BITMAP DISCARDABLE "Add2.bmp"
IDB_EXTRACT2 BITMAP DISCARDABLE "Extract2.bmp"
IDB_TEST2 BITMAP DISCARDABLE "Test2.bmp"
IDB_COPY2 BITMAP DISCARDABLE "Copy2.bmp"
IDB_MOVE2 BITMAP DISCARDABLE "Move2.bmp"
IDB_DELETE2 BITMAP DISCARDABLE "Delete2.bmp"
IDB_INFO2 BITMAP DISCARDABLE "Info2.bmp"
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE DISCARDABLE
STRINGTABLE
BEGIN
IDS_APP_TITLE "7-Zip File Manager"
IDS_COPY "Copy"
IDS_MOVE "Move"
IDS_COPY_TO "Copy to:"
IDS_MOVE_TO "Move to:"
IDS_COPYING "Copying..."
IDS_MOVING "Moving..."
IDS_CANNOT_COPY "You cannot move or copy items for such folders."
IDS_APP_TITLE "7-Zip File Manager"
IDS_COPY "Copy"
IDS_MOVE "Move"
IDS_COPY_TO "Copy to:"
IDS_MOVE_TO "Move to:"
IDS_COPYING "Copying..."
IDS_MOVING "Moving..."
IDS_CANNOT_COPY "You cannot move or copy items for such folders."
IDS_SPLITTING "Splitting..."
IDS_COMBINE "Combine Files"
IDS_COMBINE_TO "&Combine to:"
IDS_COMBINING "Combining..."
IDS_OPERATION_IS_NOT_SUPPORTED "Operation is not supported."
IDS_CONFIRM_FILE_DELETE "Confirm File Delete"
IDS_CONFIRM_FOLDER_DELETE "Confirm Folder Delete"
IDS_CONFIRM_ITEMS_DELETE "Confirm Multiple File Delete"
IDS_WANT_TO_DELETE_FILE "Are you sure you want to delete '{0}'?"
IDS_WANT_TO_DELETE_FOLDER "Are you sure you want to delete the folder '{0}' and all its contents?"
IDS_WANT_TO_DELETE_ITEMS "Are you sure you want to delete these {0} items?"
IDS_DELETING "Deleting..."
IDS_ERROR_DELETING "Error Deleting File or Folder"
IDS_RENAMING "Renaming..."
IDS_ERROR_RENAMING "Error Renaming File or Folder"
IDS_CONFIRM_FILE_COPY "Confirm File Copy"
IDS_WANT_TO_COPY_FILES "Are you sure you want to copy files to archive"
IDS_CREATE_FOLDER "Create Folder"
IDS_CREATE_FOLDER_NAME "Folder name:"
IDS_CREATE_FOLDER_DEFAULT_NAME "New Folder"
IDS_CREATE_FOLDER_ERROR "Error Creating Folder"
IDS_CREATE_FILE "Create File"
IDS_CREATE_FILE_NAME "File Name:"
IDS_CREATE_FILE_DEFAULT_NAME "New File"
IDS_CREATE_FILE_ERROR "Error Creating File"
IDS_SELECT "Select"
IDS_DESELECT "Deselect"
IDS_SELECT_MASK "Mask:"
IDS_FOLDERS_HISTORY "Folders History"
IDS_N_SELECTED_ITEMS "{0} object(s) selected"
IDS_PROPERTY_TOTAL_SIZE "Total Size"
IDS_PROPERTY_FREE_SPACE "Free Space"
IDS_PROPERTY_CLUSTER_SIZE "Cluster Size"
IDS_PROPERTY_VOLUME_NAME "Label"
IDS_PROPERTY_LOCAL_NAME "Local Name"
IDS_PROPERTY_PROVIDER "Provider"
IDS_OPTIONS "Options"
IDS_COMMENT "Comment"
IDS_COMMENT2 "&Comment:"
IDS_SYSTEM "System"
IDS_WANT_UPDATE_MODIFIED_FILE "File '{0}' was modified.\nDo you want to update it in the archive?"
IDS_CANNOT_UPDATE_FILE "Can not update file\n'{0}'"
IDS_CANNOT_START_EDITOR "Cannot start editor."
IDS_OPENNING "Opening..."
IDS_ADD "Add"
IDS_EXTRACT "Extract"
IDS_TEST "Test"
IDS_BUTTON_COPY "Copy"
IDS_BUTTON_MOVE "Move"
IDS_BUTTON_DELETE "Delete"
IDS_BUTTON_INFO "Info"
IDS_BOOKMARK "Bookmark"
IDS_COMPUTER "Computer"
IDS_NETWORK "Network"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_SPLITTING "Splitting..."
IDS_COMBINE "Combine Files"
IDS_COMBINE_TO "&Combine to:"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_COMBINING "Combining..."
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_OPERATION_IS_NOT_SUPPORTED "Operation is not supported."
IDS_CONFIRM_FILE_DELETE "Confirm File Delete"
IDS_CONFIRM_FOLDER_DELETE "Confirm Folder Delete"
IDS_CONFIRM_ITEMS_DELETE "Confirm Multiple File Delete"
IDS_WANT_TO_DELETE_FILE "Are you sure you want to delete '{0}'?"
IDS_WANT_TO_DELETE_FOLDER
"Are you sure you want to delete the folder '{0}' and all its contents?"
IDS_WANT_TO_DELETE_ITEMS
"Are you sure you want to delete these {0} items?"
IDS_DELETING "Deleting..."
IDS_ERROR_DELETING "Error Deleting File or Folder"
IDS_RENAMING "Renaming..."
IDS_ERROR_RENAMING "Error Renaming File or Folder"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_CREATE_FOLDER "Create Folder"
IDS_CREATE_FOLDER_NAME "Folder name:"
IDS_CREATE_FOLDER_DEFAULT_NAME "New Folder"
IDS_CREATE_FOLDER_ERROR "Error Creating Folder"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_CREATE_FILE "Create File"
IDS_CREATE_FILE_NAME "File Name:"
IDS_CREATE_FILE_DEFAULT_NAME "New File"
IDS_CREATE_FILE_ERROR "Error Creating File"
IDS_SELECT "Select"
IDS_DESELECT "Deselect"
IDS_SELECT_MASK "Mask:"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_FOLDERS_HISTORY "Folders History"
IDS_N_SELECTED_ITEMS "{0} object(s) selected"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_PROPERTY_TOTAL_SIZE "Total Size"
IDS_PROPERTY_FREE_SPACE "Free Space"
IDS_PROPERTY_CLUSTER_SIZE "Cluster Size"
IDS_PROPERTY_VOLUME_NAME "Label"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_PROPERTY_LOCAL_NAME "Local Name"
IDS_PROPERTY_PROVIDER "Provider"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_OPTIONS "Options"
IDS_COMMENT "Comment"
IDS_COMMENT2 "&Comment:"
IDS_SYSTEM "System"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_WANT_UPDATE_MODIFIED_FILE
"File '{0}' was modified.\nDo you want to update it in the archive?"
IDS_CANNOT_UPDATE_FILE "Can not update file\n'{0}'"
IDS_CANNOT_START_EDITOR "Cannot start editor."
IDS_OPENNING "Opening..."
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_ADD "Add"
IDS_EXTRACT "Extract"
IDS_TEST "Test"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_BUTTON_COPY "Copy"
IDS_BUTTON_MOVE "Move"
IDS_BUTTON_DELETE "Delete"
IDS_BUTTON_INFO "Info"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_BOOKMARK "Bookmark"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_COMPUTER "Computer"
IDS_NETWORK "Network"
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
#include "Resource\ComboDialog\resource.rc"
#include "Resource\CopyDialog\resource.rc"
#include "Resource\ListViewDialog\resource.rc"
#include "Resource\PropertyName\resource.rc"
#include "Resource\MessagesDialog\resource.rc"
#include "Resource\OverwriteDialog\resource.rc"
#include "Resource\PasswordDialog\resource.rc"
#include "Resource\SplitDialog\resource.rc"
#include "Resource\ProgressDialog2\resource.rc"
#include "Resource\BenchmarkDialog\resource.rc"
#include "Resource\AboutDialog\resource.rc"
#include "Resource\LangPage\resource.rc"
#include "Resource\PluginsPage\resource.rc"
#include "Resource\SystemPage\resource.rc"
#include "Resource\EditPage\resource.rc"
#include "Resource\SettingsPage\resource.rc"
#include "..\UI\Resource\Extract\resource.rc"
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
#include "Resource/ComboDialog/resource.rc"
#include "Resource/CopyDialog/resource.rc"
#include "Resource/ListViewDialog/resource.rc"
#include "Resource/PropertyName/resource.rc"
#include "Resource/MessagesDialog/resource.rc"
#include "Resource/OverwriteDialog/resource.rc"
#include "Resource/PasswordDialog/resource.rc"
#include "Resource/SplitDialog/resource.rc"
#include "Resource/ProgressDialog2/resource.rc"
#include "Resource/BenchmarkDialog/resource.rc"
#include "Resource/AboutDialog/resource.rc"
#include "Resource/LangPage/resource.rc"
#include "Resource/PluginsPage/resource.rc"
#include "Resource/SystemPage/resource.rc"
#include "Resource/EditPage/resource.rc"
#include "Resource/SettingsPage/resource.rc"
#include "../UI/Resource/Extract/resource.rc"