This commit is contained in:
Igor Pavlov
2005-06-28 00:00:00 +00:00
committed by Kornel Lesiński
parent 3c510ba80b
commit ac2b563958
83 changed files with 3668 additions and 1316 deletions

View File

@@ -83,7 +83,7 @@ BEGIN
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.20",IDC_STATIC,7,54,119,9
LTEXT "7-Zip 4.23",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.",

View File

@@ -3,6 +3,8 @@
#include "StdAfx.h"
#include "CopyDialog.h"
#include "Common/StringConvert.h"
#include "Windows/Control/Static.h"
#include "Windows/Shell.h"
#include "Windows/FileName.h"
@@ -33,7 +35,7 @@ bool CCopyDialog::OnInit()
staticContol.Attach(GetItem(IDC_COPY_STATIC));
staticContol.SetText(Static);
for(int i = 0; i < Strings.Size(); i++)
_path.AddString(Strings[i]);
_path.AddString(GetSystemString(Strings[i]));
_path.SetText(Value);
return CModalDialog::OnInit();
}

View File

@@ -18,7 +18,7 @@ public:
UString Title;
UString Static;
UString Value;
CSysStringVector Strings;
UStringVector Strings;
INT_PTR Create(HWND parentWindow = 0)
{ return CModalDialog::Create(MAKEINTRESOURCE(IDD_DIALOG_COPY), parentWindow); }

View File

@@ -2,6 +2,7 @@
#include "StdAfx.h"
#include "MessagesDialog.h"
#include "Common/StringConvert.h"
#include "Windows/ResourceString.h"
#ifdef LANG
@@ -39,18 +40,18 @@ void CMessagesDialog::AddMessageDirect(LPCTSTR message)
_messageList.SetItem(&item);
}
void CMessagesDialog::AddMessage(LPCTSTR message)
void CMessagesDialog::AddMessage(LPCWSTR message)
{
CSysString s = message;
UString s = message;
while (!s.IsEmpty())
{
int pos = s.Find(TEXT('\n'));
int pos = s.Find(L'\n');
if (pos < 0)
break;
AddMessageDirect(s.Left(pos));
AddMessageDirect(GetSystemString(s.Left(pos)));
s.Delete(0, pos + 1);
}
AddMessageDirect(s);
AddMessageDirect(GetSystemString(s));
}
bool CMessagesDialog::OnInit()

View File

@@ -12,10 +12,10 @@ class CMessagesDialog: public NWindows::NControl::CModalDialog
{
NWindows::NControl::CListView _messageList;
void AddMessageDirect(LPCTSTR message);
void AddMessage(LPCTSTR message);
void AddMessage(LPCWSTR message);
virtual bool OnInit();
public:
const CSysStringVector *Messages;
const UStringVector *Messages;
INT_PTR Create(HWND parentWindow = 0)
{ return CModalDialog::Create(MAKEINTRESOURCE(IDD_DIALOG_MESSAGES), parentWindow); }
};