Compare commits

..

1 Commits
main ... main

Author SHA1 Message Date
Taldariner
cd0534afb1 Apps/sysmon: Fixed #85
Small code changes to fix all issues mentioned in Issue #85:
- Bumped app version and added it to header.
- Changed system disk usage subscription from MB to KB in English version.
- Properly aligned CPU usage percents in process list with header.
- Free space on disks now rounds down, instead of rounding app.
- Small formatting fixes.
- Fixed wrong laguage set in English version of compilation script.
2024-11-15 20:10:04 +02:00
3 changed files with 8 additions and 10 deletions

View File

@ -62,7 +62,6 @@ char *actions[] = {
#define T_FD "„¨áª¥â  " #define T_FD "„¨áª¥â  "
#define T_HD "†¥á⪨© ¤¨áª " #define T_HD "†¥á⪨© ¤¨áª "
#define T_SATA "SATA ¤¨áª " #define T_SATA "SATA ¤¨áª "
#define T_NVME "NVMe disk "
#define T_USB "USB ¤¨áª " #define T_USB "USB ¤¨áª "
#define T_RAM "RAM ¤¨áª " #define T_RAM "RAM ¤¨áª "
#define T_UNC "<22>¥¨§¢¥áâ­® " #define T_UNC "<22>¥¨§¢¥áâ­® "
@ -161,7 +160,6 @@ char *actions[] = {
#define T_FD "Floppy disk " #define T_FD "Floppy disk "
#define T_HD "Hard disk " #define T_HD "Hard disk "
#define T_SATA "SATA disk " #define T_SATA "SATA disk "
#define T_NVME "NVMe disk "
#define T_USB "USB disk " #define T_USB "USB disk "
#define T_RAM "RAM disk " #define T_RAM "RAM disk "
#define T_UNC "Unknown " #define T_UNC "Unknown "
@ -254,7 +252,6 @@ char *devinfo = {
"hd", 4, T_HD, "hd", 4, T_HD,
"bd", 4, T_HD, "bd", 4, T_HD,
"sd", 4, T_SATA, "sd", 4, T_SATA,
"nv", 4, T_NVME,
"tm", 5, T_RAM, "tm", 5, T_RAM,
"us", 6, T_USB, "us", 6, T_USB,
0 0

View File

@ -1,5 +1,5 @@
@del sysmon @del sysmon
@c-- /D=LANG_RUS sysmon.c @c-- /D=LANG_ENG sysmon.c
@rename sysmon.com sysmon @rename sysmon.com sysmon
@del warning.txt @del warning.txt
if not exist sysmon ( @pause ) if not exist sysmon ( @pause )

View File

@ -1,6 +1,6 @@
/* /*
* System Monitor * System Monitor
* version 1.41 * version 1.42
* Author: Leency * Author: Leency
*/ */
@ -38,7 +38,7 @@
#define BOTPANEL_H 36 #define BOTPANEL_H 36
#ifdef LANG_RUS #ifdef LANG_RUS
#define T_APP_TITLE "‘¨á⥬­ë© ¬®­¨â®à" #define T_APP_TITLE "‘¨á⥬­ë© Œ®­¨â®à 1.42"
#define T_SHOW_SYSTEM "‘¨á⥬­ë¥" #define T_SHOW_SYSTEM "‘¨á⥬­ë¥"
#define T_DETAILS "<22>®¤à®¡­¥¥" #define T_DETAILS "<22>®¤à®¡­¥¥"
#define T_PROC_KILL "‘­ïâì § ¤ çã" #define T_PROC_KILL "‘­ïâì § ¤ çã"
@ -49,7 +49,7 @@
#define T_RD_USAGE "‘¨á⥬­ë© ¤¨áª: %i Š¡ ᢮¡®¤­® ¨§ 1.4 Œ¡" #define T_RD_USAGE "‘¨á⥬­ë© ¤¨áª: %i Š¡ ᢮¡®¤­® ¨§ 1.4 Œ¡"
#define T_TMP_USAGE "TMP%i ¤¨áª: %i Œ¡ ᢮¡®¤­® ¨§ %i Œ¡" #define T_TMP_USAGE "TMP%i ¤¨áª: %i Œ¡ ᢮¡®¤­® ¨§ %i Œ¡"
#else #else
#define T_APP_TITLE "System Monitor" #define T_APP_TITLE "System Monitor 1.42"
#define T_SHOW_SYSTEM "System" #define T_SHOW_SYSTEM "System"
#define T_DETAILS "Details" #define T_DETAILS "Details"
#define T_PROC_KILL "Terminate" #define T_PROC_KILL "Terminate"
@ -57,7 +57,7 @@
#define T_PROC_HEADER "Process RAM KB CPU %" #define T_PROC_HEADER "Process RAM KB CPU %"
#define T_CPU_LOAD "CPU load %i%% " #define T_CPU_LOAD "CPU load %i%% "
#define T_RAM_USAGE "RAM usage: %i MB free of %i MB" #define T_RAM_USAGE "RAM usage: %i MB free of %i MB"
#define T_RD_USAGE "System disk usage: %i MB free of 1.4 MB" #define T_RD_USAGE "System disk usage: %i KB free of 1.4 MB"
#define T_TMP_USAGE "TMP%i usage: %i MB free of %i MB" #define T_TMP_USAGE "TMP%i usage: %i MB free of %i MB"
#endif #endif
@ -281,7 +281,7 @@ void SelectList_DrawLine(dword i)
} }
sprintf(#cpu_use, "%i", Process.use_cpu*100/maxcpu); sprintf(#cpu_use, "%i", Process.use_cpu*100/maxcpu);
if (maxcpu) WriteText(GAP+203 - calc(strlen(#cpu_use)-4*8), if (maxcpu) WriteText(GAP+205 - calc(strlen(#cpu_use)-4*8),
posy+select_list.text_y, 0x90, 0x444444, #cpu_use); posy+select_list.text_y, 0x90, 0x444444, #cpu_use);
} }
@ -311,6 +311,7 @@ dword GetTmpDiskFreeSpace(int _id)
sprintf(#param, "/tmp%i/1", _id); sprintf(#param, "/tmp%i/1", _id);
dir_size.get(#param); dir_size.get(#param);
dir_size.sizelo += dir_size.files/2 + 32 * 512; //file attr size + FAT table size dir_size.sizelo += dir_size.files/2 + 32 * 512; //file attr size + FAT table size
dir_size.sizelo += 1024*1024 - 1; // add this line to round up
dir_size.sizelo /= 1024*1024; //convert to MiB dir_size.sizelo /= 1024*1024; //convert to MiB
return dir_size.sizelo; return dir_size.sizelo;
} }