Move the statusbar strings to resources.

Modified: trunk/reactos/subsys/system/taskmgr/En.rc
Modified: trunk/reactos/subsys/system/taskmgr/perfpage.c
Modified: trunk/reactos/subsys/system/taskmgr/procpage.c
Modified: trunk/reactos/subsys/system/taskmgr/resource.h

--- trunk/reactos/subsys/system/taskmgr/En.rc	2005-05-01 09:07:31 UTC (rev 14901)
+++ trunk/reactos/subsys/system/taskmgr/En.rc	2005-05-01 09:23:12 UTC (rev 14902)
@@ -661,7 +661,9 @@

     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
 
 

--- trunk/reactos/subsys/system/taskmgr/perfpage.c	2005-05-01 09:07:31 UTC (rev 14901)
+++ trunk/reactos/subsys/system/taskmgr/perfpage.c	2005-05-01 09:23:12 UTC (rev 14902)
@@ -318,6 +318,7 @@

 	ULONG	TotalProcesses;
 
 	TCHAR	Text[260];

+	TCHAR	szMemUsage[256];

 
 	/*  Create the event */
 	hPerformancePageEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
@@ -326,6 +327,8 @@

 	if (!hPerformancePageEvent)
 		return 0;
 

+	LoadString(hInst, IDS_STATUS_MEMUSAGE, szMemUsage, 256);
+

 	while (1)
 	{
 		DWORD	dwWaitVal;
@@ -358,7 +361,7 @@

 			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);
 
 			/* 

--- trunk/reactos/subsys/system/taskmgr/procpage.c	2005-05-01 09:07:31 UTC (rev 14901)
+++ trunk/reactos/subsys/system/taskmgr/procpage.c	2005-05-01 09:23:12 UTC (rev 14902)
@@ -490,6 +490,7 @@

 {
     ULONG    OldProcessorUsage = 0;
     ULONG    OldProcessCount = 0;

+    TCHAR    szCpuUsage[256], szProcesses[256];

 
     /* Create the event */
     hProcessPageEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
@@ -498,6 +499,9 @@

     if (!hProcessPageEvent)
         return 0;
 

+    LoadString(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, 256);
+    LoadString(hInst, IDS_STATUS_PROCESSES, szProcesses, 256);
+

     while (1) {
         DWORD    dwWaitVal;
 

--- trunk/reactos/subsys/system/taskmgr/resource.h	2005-05-01 09:07:31 UTC (rev 14901)
+++ trunk/reactos/subsys/system/taskmgr/resource.h	2005-05-01 09:23:12 UTC (rev 14902)
@@ -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