From 3ce5a90320e610ded7dc4ec4783aa11c805e63b3 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Sun, 1 May 2005 09:23:12 +0000 Subject: [PATCH] Move the statusbar strings to resources. svn path=/trunk/; revision=14902 --- reactos/subsys/system/taskmgr/En.rc | 4 +++- reactos/subsys/system/taskmgr/perfpage.c | 5 ++++- reactos/subsys/system/taskmgr/procpage.c | 4 ++++ reactos/subsys/system/taskmgr/resource.h | 3 +++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/reactos/subsys/system/taskmgr/En.rc b/reactos/subsys/system/taskmgr/En.rc index 9fa11c8a159..9ad69e3a495 100644 --- a/reactos/subsys/system/taskmgr/En.rc +++ b/reactos/subsys/system/taskmgr/En.rc @@ -661,7 +661,9 @@ BEGIN 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_TRAYICONCPUUSAGE "CPU Usage: %d%%" - + IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK" + IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" + IDS_STATUS_PROCESSES "Processes: %d" END diff --git a/reactos/subsys/system/taskmgr/perfpage.c b/reactos/subsys/system/taskmgr/perfpage.c index d60f164ab0b..ae07c86b3f5 100644 --- a/reactos/subsys/system/taskmgr/perfpage.c +++ b/reactos/subsys/system/taskmgr/perfpage.c @@ -318,6 +318,7 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) ULONG TotalProcesses; TCHAR Text[260]; + TCHAR szMemUsage[256]; /* Create the event */ hPerformancePageEvent = CreateEvent(NULL, TRUE, TRUE, NULL); @@ -326,6 +327,8 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) if (!hPerformancePageEvent) return 0; + LoadString(hInst, IDS_STATUS_MEMUSAGE, szMemUsage, 256); + while (1) { DWORD dwWaitVal; @@ -358,7 +361,7 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) SetWindowText(hPerformancePageCommitChargeLimitEdit, Text); _ultoa(CommitChargePeak, Text, 10); SetWindowText(hPerformancePageCommitChargePeakEdit, Text); - wsprintf(Text, _T("Mem Usage: %dK / %dK"), CommitChargeTotal, CommitChargeLimit); + wsprintf(Text, szMemUsage, CommitChargeTotal, CommitChargeLimit); SendMessage(hStatusWnd, SB_SETTEXT, 2, (LPARAM)Text); /* diff --git a/reactos/subsys/system/taskmgr/procpage.c b/reactos/subsys/system/taskmgr/procpage.c index 99e9dd13c5f..676ef47d647 100644 --- a/reactos/subsys/system/taskmgr/procpage.c +++ b/reactos/subsys/system/taskmgr/procpage.c @@ -490,6 +490,7 @@ DWORD WINAPI ProcessPageRefreshThread(void *lpParameter) { ULONG OldProcessorUsage = 0; ULONG OldProcessCount = 0; + TCHAR szCpuUsage[256], szProcesses[256]; /* Create the event */ hProcessPageEvent = CreateEvent(NULL, TRUE, TRUE, NULL); @@ -498,6 +499,9 @@ DWORD WINAPI ProcessPageRefreshThread(void *lpParameter) if (!hProcessPageEvent) return 0; + LoadString(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, 256); + LoadString(hInst, IDS_STATUS_PROCESSES, szProcesses, 256); + while (1) { DWORD dwWaitVal; diff --git a/reactos/subsys/system/taskmgr/resource.h b/reactos/subsys/system/taskmgr/resource.h index e82c9d9d94d..d5fc2d713e9 100644 --- a/reactos/subsys/system/taskmgr/resource.h +++ b/reactos/subsys/system/taskmgr/resource.h @@ -237,6 +237,9 @@ #define IDS_MSG_UNABLECHANGEPRIORITY 360 #define IDS_MSG_WARNINGCHANGEPRIORITY 361 #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