[0.4.7][TASKMGR] Tweak the status bar a bit (reusing CORE-15615)

by picking those two commits:
0.4.12-dev-363-g 473e0bfc838ddb7f84ebeaafc86acf3873d99c10
0.4.12-dev-779-g 3b9614864156bef34d1f36447a884709360ca8a3

Although the regression that was introduced by 0.4.12-dev-363-g 473e0bfc838ddb7f84ebeaafc86acf3873d99c10
and then fixed by 0.4.12-dev-779-g 3b9614864156bef34d1f36447a884709360ca8a3
did never affect any release, the older releases do still benefit from those 2 commits applied together:

The status bar consists of 3 sections:
"processes count"
"CPU load"
"Commit charge"

"Commit charge" is extremely dynamic in length, therefore we can improve the usability a bit by maximizing available space for it.
"processes count" also deserves a bit more space, otherwise even 3-digits-count would be cropped in english already.
"CPU load" is most defined in length, as the only dynamic part in there is 0% to 100%, just 2 digits.
Therefore we do sacrifice a bit space from "CPU load" section in favor of the other sections.

See https://jira.reactos.org/secure/attachment/61659/ros_taskmgr_BEFORE_mostCompact.png for a pic before this backmerge.

diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc
index 7612ea4..d226c01 100644 (file)
--- a/base/applications/taskmgr/lang/de-DE.rc
+++ b/base/applications/taskmgr/lang/de-DE.rc
@@ -438,7 +438,7 @@ BEGIN
     IDS_MSG_WARNINGCHANGEPRIORITY "WARNUNG: Das Ändern der Prioritätsklasse dieses Prozesses\nkann zu unerwünschten Ergebnissen, einschl. Systeminstabilität, führen.\nSind Sie sicher, dass Sie diese ändern möchten?"
     IDS_MSG_TRAYICONCPUUSAGE "CPU-Auslastung: %d%%"
     IDS_STATUS_MEMUSAGE "Speicher: %s / %s (%d%%)"
-    IDS_STATUS_CPUUSAGE "CPU-Auslastung: %3d%%"
+    IDS_STATUS_CPUUSAGE "CPU-Last: %3d%%"
     IDS_STATUS_PROCESSES "Prozesse: %d"
     IDS_NOT_RESPONDING "Keine Rückmeldung"
     IDS_RUNNING "Wird ausgeführt"

diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h
index c5da7f1..5e7fed2 100644 (file)
--- a/base/applications/taskmgr/taskmgr.h
+++ b/base/applications/taskmgr/taskmgr.h
@@ -46,8 +46,8 @@ typedef struct _IO_COUNTERS {
 #define RUN_PERF_PAGE
 
 #define STATUS_WINDOW  2001
-#define STATUS_SIZE1   80
-#define STATUS_SIZE2   210
+#define STATUS_SIZE1   85
+#define STATUS_SIZE2   190
 #define STATUS_SIZE3   400
 
 typedef struct