This commit is contained in:
Igor Pavlov
2014-11-23 00:00:00 +00:00
committed by Kornel Lesiński
parent 83f8ddcc5b
commit f08f4dcc3c
1158 changed files with 76451 additions and 35082 deletions
+16 -16
View File
@@ -2,7 +2,7 @@
#include "StdAfx.h"
#include "Windows/FileName.h"
#include "../../../Windows/FileName.h"
#ifdef LANG
#include "LangUtils.h"
@@ -17,10 +17,10 @@
using namespace NWindows;
#ifdef LANG
static CIDLangPair kIDLangPairs[] =
static const UInt32 kLangIDs[] =
{
{ IDC_STATIC_SPLIT_PATH, 0x03020501 },
{ IDC_STATIC_SPLIT_VOLUME, 0x02000D40 },
IDT_SPLIT_PATH,
IDT_SPLIT_VOLUME
};
#endif
@@ -28,11 +28,11 @@ static CIDLangPair kIDLangPairs[] =
bool CSplitDialog::OnInit()
{
#ifdef LANG
LangSetWindowText(HWND(*this), 0x03020500);
LangSetDlgItemsText(HWND(*this), kIDLangPairs, sizeof(kIDLangPairs) / sizeof(kIDLangPairs[0]));
LangSetWindowText(*this, IDD_SPLIT);
LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
#endif
_pathCombo.Attach(GetItem(IDC_COMBO_SPLIT_PATH));
_volumeCombo.Attach(GetItem(IDC_COMBO_SPLIT_VOLUME));
_pathCombo.Attach(GetItem(IDC_SPLIT_PATH));
_volumeCombo.Attach(GetItem(IDC_SPLIT_VOLUME));
if (!FilePath.IsEmpty())
{
@@ -62,10 +62,10 @@ bool CSplitDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
InvalidateRect(NULL);
{
RECT rect;
GetClientRectOfItem(IDC_BUTTON_SPLIT_PATH, rect);
int bx = rect.right - rect.left;
MoveItem(IDC_BUTTON_SPLIT_PATH, xSize - mx - bx, rect.top, bx, rect.bottom - rect.top);
RECT r;
GetClientRectOfItem(IDB_SPLIT_PATH, r);
int bx = RECT_SIZE_X(r);
MoveItem(IDB_SPLIT_PATH, xSize - mx - bx, r.top, bx, RECT_SIZE_Y(r));
ChangeSubWindowSizeX(_pathCombo, xSize - mx - mx - bx - mx);
}
@@ -79,7 +79,7 @@ bool CSplitDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
{
switch(buttonID)
{
case IDC_BUTTON_SPLIT_PATH:
case IDB_SPLIT_PATH:
OnButtonSetPath();
return true;
}
@@ -91,10 +91,10 @@ void CSplitDialog::OnButtonSetPath()
UString currentPath;
_pathCombo.GetText(currentPath);
// UString title = L"Specify a location for output folder";
UString title = LangStringSpec(IDS_SET_FOLDER, 0x03020209);
UString title = LangString(IDS_SET_FOLDER);
UString resultPath;
if (!MyBrowseForFolder(HWND(*this), title, currentPath, resultPath))
if (!MyBrowseForFolder(*this, title, currentPath, resultPath))
return;
NFile::NName::NormalizeDirPathPrefix(resultPath);
_pathCombo.SetCurSel(-1);
@@ -109,7 +109,7 @@ void CSplitDialog::OnOK()
volumeString.Trim();
if (!ParseVolumeSizes(volumeString, VolumeSizes) || VolumeSizes.Size() == 0)
{
::MessageBoxW(*this, LangString(IDS_INCORRECT_VOLUME_SIZE, 0x02000D41), L"7-Zip", 0);
::MessageBoxW(*this, LangString(IDS_INCORRECT_VOLUME_SIZE), L"7-Zip", MB_ICONERROR);
return;
}
CModalDialog::OnOK();