mirror of
https://github.com/reactos/reactos.git
synced 2024-10-06 17:35:07 +00:00
Move the statusbar strings to resources.
svn path=/trunk/; revision=14902
This commit is contained in:
parent
ccbb2fb84b
commit
3ce5a90320
|
@ -661,7 +661,9 @@ BEGIN
|
||||||
IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority"
|
IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority"
|
||||||
IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"
|
IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"
|
||||||
IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%"
|
IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%"
|
||||||
|
IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK"
|
||||||
|
IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%"
|
||||||
|
IDS_STATUS_PROCESSES "Processes: %d"
|
||||||
END
|
END
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -318,6 +318,7 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter)
|
||||||
ULONG TotalProcesses;
|
ULONG TotalProcesses;
|
||||||
|
|
||||||
TCHAR Text[260];
|
TCHAR Text[260];
|
||||||
|
TCHAR szMemUsage[256];
|
||||||
|
|
||||||
/* Create the event */
|
/* Create the event */
|
||||||
hPerformancePageEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
|
hPerformancePageEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
|
||||||
|
@ -326,6 +327,8 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter)
|
||||||
if (!hPerformancePageEvent)
|
if (!hPerformancePageEvent)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
LoadString(hInst, IDS_STATUS_MEMUSAGE, szMemUsage, 256);
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
DWORD dwWaitVal;
|
DWORD dwWaitVal;
|
||||||
|
@ -358,7 +361,7 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter)
|
||||||
SetWindowText(hPerformancePageCommitChargeLimitEdit, Text);
|
SetWindowText(hPerformancePageCommitChargeLimitEdit, Text);
|
||||||
_ultoa(CommitChargePeak, Text, 10);
|
_ultoa(CommitChargePeak, Text, 10);
|
||||||
SetWindowText(hPerformancePageCommitChargePeakEdit, Text);
|
SetWindowText(hPerformancePageCommitChargePeakEdit, Text);
|
||||||
wsprintf(Text, _T("Mem Usage: %dK / %dK"), CommitChargeTotal, CommitChargeLimit);
|
wsprintf(Text, szMemUsage, CommitChargeTotal, CommitChargeLimit);
|
||||||
SendMessage(hStatusWnd, SB_SETTEXT, 2, (LPARAM)Text);
|
SendMessage(hStatusWnd, SB_SETTEXT, 2, (LPARAM)Text);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -490,6 +490,7 @@ DWORD WINAPI ProcessPageRefreshThread(void *lpParameter)
|
||||||
{
|
{
|
||||||
ULONG OldProcessorUsage = 0;
|
ULONG OldProcessorUsage = 0;
|
||||||
ULONG OldProcessCount = 0;
|
ULONG OldProcessCount = 0;
|
||||||
|
TCHAR szCpuUsage[256], szProcesses[256];
|
||||||
|
|
||||||
/* Create the event */
|
/* Create the event */
|
||||||
hProcessPageEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
|
hProcessPageEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
|
||||||
|
@ -498,6 +499,9 @@ DWORD WINAPI ProcessPageRefreshThread(void *lpParameter)
|
||||||
if (!hProcessPageEvent)
|
if (!hProcessPageEvent)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
LoadString(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, 256);
|
||||||
|
LoadString(hInst, IDS_STATUS_PROCESSES, szProcesses, 256);
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
DWORD dwWaitVal;
|
DWORD dwWaitVal;
|
||||||
|
|
||||||
|
|
|
@ -237,6 +237,9 @@
|
||||||
#define IDS_MSG_UNABLECHANGEPRIORITY 360
|
#define IDS_MSG_UNABLECHANGEPRIORITY 360
|
||||||
#define IDS_MSG_WARNINGCHANGEPRIORITY 361
|
#define IDS_MSG_WARNINGCHANGEPRIORITY 361
|
||||||
#define IDS_MSG_TRAYICONCPUUSAGE 362
|
#define IDS_MSG_TRAYICONCPUUSAGE 362
|
||||||
|
#define IDS_STATUS_MEMUSAGE 363
|
||||||
|
#define IDS_STATUS_CPUUSAGE 364
|
||||||
|
#define IDS_STATUS_PROCESSES 365
|
||||||
|
|
||||||
|
|
||||||
// Next default values for new objects
|
// Next default values for new objects
|
||||||
|
|
Loading…
Reference in a new issue