[ros-diffs] [greatlrd] 15144: Remove two hardcode string to En.rc it is IDS_Not_Responding, IDS_Running

Remove two hardcode string to En.rc it is IDS_Not_Responding,
IDS_Running   
thx irc: potapnik for notice one of them
Modified: trunk/reactos/subsys/system/taskmgr/En.rc
Modified: trunk/reactos/subsys/system/taskmgr/applpage.c
Modified: trunk/reactos/subsys/system/taskmgr/resource.h
Modified: trunk/reactos/subsys/system/taskmgr/trayicon.c
  _____  

Modified: trunk/reactos/subsys/system/taskmgr/En.rc
--- trunk/reactos/subsys/system/taskmgr/En.rc	2005-05-08 18:07:35 UTC
(rev 15143)
+++ trunk/reactos/subsys/system/taskmgr/En.rc	2005-05-08 18:20:39 UTC
(rev 15144)
@@ -664,6 +664,8 @@

     IDS_STATUS_MEMUSAGE           "Mem Usage: %dK / %dK"
     IDS_STATUS_CPUUSAGE           "CPU Usage: %3d%%"
     IDS_STATUS_PROCESSES          "Processes: %d"
+    IDS_Not_Responding            "Not Responding"
+    IDS_Running                   "Running"  
 END
 
 
  _____  

Modified: trunk/reactos/subsys/system/taskmgr/applpage.c
--- trunk/reactos/subsys/system/taskmgr/applpage.c	2005-05-08
18:07:35 UTC (rev 15143)
+++ trunk/reactos/subsys/system/taskmgr/applpage.c	2005-05-08
18:20:39 UTC (rev 15144)
@@ -489,6 +489,7 @@

     LPNM_LISTVIEW   pnmv;
     LV_DISPINFO*    pnmdi;
     LPAPPLICATION_PAGE_LIST_ITEM pAPLI;
+	TCHAR szMsg[256];
 
 
     idctrl = (int) wParam;
@@ -515,9 +516,15 @@
             else if (pnmdi->item.iSubItem == 1)
             {
                 if (pAPLI->bHung)
-                    _tcsncpy(pnmdi->item.pszText, _T("Not Responding"),
pnmdi->item.cchTextMax);
+				{
+					LoadString(
GetModuleHandle(NULL), IDS_Not_Responding , (LPTSTR)
szMsg,sizeof(szMsg));
+                    _tcsncpy(pnmdi->item.pszText, szMsg,
pnmdi->item.cchTextMax);
+				}
                 else
-                    _tcsncpy(pnmdi->item.pszText, _T("Running"),
pnmdi->item.cchTextMax);
+				{
+                    LoadString( GetModuleHandle(NULL), IDS_Running,
(LPTSTR) szMsg,sizeof(szMsg));
+                    _tcsncpy(pnmdi->item.pszText, szMsg,
pnmdi->item.cchTextMax);
+				}
             }
 
             break;
  _____  

Modified: trunk/reactos/subsys/system/taskmgr/resource.h
--- trunk/reactos/subsys/system/taskmgr/resource.h	2005-05-08
18:07:35 UTC (rev 15143)
+++ trunk/reactos/subsys/system/taskmgr/resource.h	2005-05-08
18:20:39 UTC (rev 15144)
@@ -240,6 +240,8 @@

 #define IDS_STATUS_MEMUSAGE             363
 #define IDS_STATUS_CPUUSAGE             364
 #define IDS_STATUS_PROCESSES            365
+#define IDS_Not_Responding              366
+#define IDS_Running                     367
 
 
 // Next default values for new objects
  _____  

Modified: trunk/reactos/subsys/system/taskmgr/trayicon.c
--- trunk/reactos/subsys/system/taskmgr/trayicon.c	2005-05-08
18:07:35 UTC (rev 15143)
+++ trunk/reactos/subsys/system/taskmgr/trayicon.c	2005-05-08
18:20:39 UTC (rev 15144)
@@ -135,6 +135,7 @@

     NOTIFYICONDATA    nid;
     HICON            hIcon = NULL;
     BOOL            bRetVal;
+    TCHAR szMsg[256];
 
     memset(&nid, 0, sizeof(NOTIFYICONDATA));
 
@@ -146,8 +147,11 @@
     nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
     nid.uCallbackMessage = WM_ONTRAYICON;
     nid.hIcon = hIcon;
-    wsprintf(nid.szTip, _T("CPU Usage: %d%%"),
PerfDataGetProcessorUsage());
 
+	      
+	LoadString( GetModuleHandle(NULL), IDS_MSG_TRAYICONCPUUSAGE,
(LPTSTR) szMsg,sizeof(szMsg));
+    wsprintf(nid.szTip, szMsg, PerfDataGetProcessorUsage());
+
     bRetVal = Shell_NotifyIcon(NIM_ADD, &nid);
 
     if (hIcon)