From 85eba6883609935025dbd6fa50b84a694c9896cf Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 15 Sep 2018 12:04:52 +0000 Subject: [PATCH] Add SysMon to IMG git-svn-id: svn://kolibrios.org@7370 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 9 +++++---- data/common/settings/game_center.ini | 10 +++++----- data/common/settings/syspanel.ini | 4 ++-- data/rus/settings/game_center.ini | 12 ++++++------ programs/cmm/sysmon/sysmon.c | 7 ++++--- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 1d472fd6f4..de983e0e29 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -573,10 +573,13 @@ if tup.getconfig('NO_CMM') ~= 'full' then tup.append_table(img_files, { {"APP_PLUS", PROGS .. "/cmm/app_plus/app_plus.com"}, {"EASYSHOT", PROGS .. "/cmm/easyshot/easyshot.com"}, + {"GAME_CENTER", PROGS .. "/cmm/software_widget/software_widget.com"}, + {"MOUSECFG", PROGS .. "/cmm/mousecfg/mousecfg.com"}, + {"PANELS_CFG", PROGS .. "/cmm/panels_cfg/panels_cfg.com"}, + {"SYSPANEL", PROGS .. "/cmm/software_widget/software_widget.com"}, + {"SYSMON", PROGS .. "/cmm/sysmon/sysmon.com"}, {"TXTREAD", PROGS .. "/cmm/txtread/txtread.com"}, {"TMPDISK", PROGS .. "/cmm/tmpdisk/tmpdisk.com"}, - {"GAME_CENTER", PROGS .. "/cmm/software_widget/software_widget.com"}, - {"SYSPANEL", PROGS .. "/cmm/software_widget/software_widget.com"}, {"DEVELOP/CLIPVIEW", PROGS .. "/cmm/clipview/clipview.com"}, {"File Managers/EOLITE", PROGS .. "/cmm/eolite/Eolite.com"}, {"FONT_VIEWER", PROGS .. "/cmm/kf_font_viewer/font_viewer.com"}, @@ -588,9 +591,7 @@ tup.append_table(img_files, { {"GAMES/MINE", PROGS .. "/games/mine/trunk/mine"}, {"MEDIA/PIXIE/PIXIE", PROGS .. "/cmm/pixie2/pixie.com"}, {"MEDIA/ICONEDIT", PROGS .. "/cmm/iconedit/iconedit.com"}, - {"MOUSECFG", PROGS .. "/cmm/mousecfg/mousecfg.com"}, {"NETWORK/WEBVIEW", PROGS .. "/cmm/browser/WebView.com"}, - {"PANELS_CFG", PROGS .. "/cmm/panels_cfg/panels_cfg.com"}, }) tup.append_table(extra_files, { {"kolibrios/drivers/DRVINST.KEX", PROGS .. "/cmm/drvinst/drvinst.com"}, diff --git a/data/common/settings/game_center.ini b/data/common/settings/game_center.ini index 6d545f671c..6b68a71ce7 100644 --- a/data/common/settings/game_center.ini +++ b/data/common/settings/game_center.ini @@ -3,11 +3,6 @@ window_width=750 window_title=KolibriOS Game Center default_icon=35 -[3D Shooter] -Quake=/kolibrios/games/quake/sdlquake,56 -DOOM1=/kolibrios/games/doom1/doom,43 -; DOOM2=/kolibrios/games/doom2/doom,43 - [Arcade] LaserTank=/kolibrios/games/lasertank/lasertank,72 Heliothryx=/kolibrios/games/heliothryx/heliothryx @@ -60,3 +55,8 @@ Freecell=/sys/games/freecell,68 Pong=/sys/games/pong,12 Pong3=/sys/games/pong3,12 Arcanii=/kolibrios/games/arcanii,12 + +[3D Shooter] +Quake=/kolibrios/games/quake/sdlquake,56 +DOOM1=/kolibrios/games/doom1/doom,43 +; DOOM2=/kolibrios/games/doom2/doom,43 diff --git a/data/common/settings/syspanel.ini b/data/common/settings/syspanel.ini index 4e6102ae2b..241227ccf8 100644 --- a/data/common/settings/syspanel.ini +++ b/data/common/settings/syspanel.ini @@ -22,11 +22,11 @@ Autorun=/sys/tinypad|/sys/settings/autorun.dat,55 [Monitoring] Debug Board=/sys/develop/board,19 NetStat=/sys/network/netstat,33 -SysMonitor=gmon,57 +GhostMonitor=gmon,57 +SysMonitor=sysmon,57 Processes=cpu,60 Clipboard=/sys/develop/clipview,83 - [Testing] Protection=test,37 CpuID=cpuid,37 diff --git a/data/rus/settings/game_center.ini b/data/rus/settings/game_center.ini index d773c63535..76406a8953 100644 --- a/data/rus/settings/game_center.ini +++ b/data/rus/settings/game_center.ini @@ -3,11 +3,6 @@ window_width=750 window_title=Игровой центр KolibriOS default_icon=35 -[Шутеры] -Quake=/kolibrios/games/quake/sdlquake,56 -DOOM1=/kolibrios/games/doom1/doom,43 -; DOOM2=/kolibrios/games/doom2/doom,43 - [Аркады] LaserTank=/kolibrios/games/lasertank/lasertank,72 Heliothryx=/kolibrios/games/heliothryx/heliothryx @@ -17,7 +12,7 @@ Loderunner=/kolibrios/games/LRL/LRL,41 TheBus=/kolibrios/games/the_bus/the_bus,86 Mun=/kolibrios/games/mun/mun Kosilka=/sys/games/kosilka,23 -Bomber=/kolibrios/games/bomber/bomber,14 +Bomber=/kolibrios/games/bomber/bomber,97 Invaders=/kolibrios/games/invaders Tanks=/sys/games/tanks,67 RocketForces=/sys/games/rforces @@ -60,3 +55,8 @@ Freecell=/sys/games/freecell,68 Pong=/sys/games/pong,12 Pong3=/sys/games/pong3,12 Arcanii=/kolibrios/games/arcanii,12 + +[Шутеры] +Quake=/kolibrios/games/quake/sdlquake,56 +DOOM1=/kolibrios/games/doom1/doom,43 +; DOOM2=/kolibrios/games/doom2/doom,43 diff --git a/programs/cmm/sysmon/sysmon.c b/programs/cmm/sysmon/sysmon.c index 8b0e5a2035..5a14dcbb46 100644 --- a/programs/cmm/sysmon/sysmon.c +++ b/programs/cmm/sysmon/sysmon.c @@ -1,6 +1,6 @@ /* * System Monitor - * version 0.85 + * version 0.86 * Author: Leency */ @@ -22,7 +22,8 @@ #define MIN_PB_BLOCK_W 19 #define LOAD_BG 0xFFFfff -#define LOAD_ACTIVE 0x3887EE +#define LOAD_ACTIVE 0x6C81DC +#define LOAD_BG_TEXT 0x696969 struct sensor { int x,y,w,h; @@ -57,7 +58,7 @@ void sensor::draw_progress(dword progress_w, active_value, bg_value, mesure) DrawBar(x+w-progress_w, y, progress_w, h, LOAD_BG); sprintf(#param, "%i%s", bg_value, mesure); - WriteText(-progress_w - calc(strlen(#param)*8)/2 + w+x, h/2-7+y, 0x90, LOAD_ACTIVE, #param); + WriteText(-progress_w - calc(strlen(#param)*8)/2 + w+x, h/2-7+y, 0x90, LOAD_BG_TEXT, #param); } //===================================================//