KolibriOS/kolibrios
12
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

Add SysMon to IMG

Browse Source 
git-svn-id: svn://kolibrios.org@7370 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2018-09-15 12:04:52 +00:00
parent fd19f06ec5
commit 85eba68836
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/Tupfile.lua
View File

@ -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"},

10
data/common/settings/game_center.ini
View File

@ -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

4
data/common/settings/syspanel.ini
View File

@ -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

12
data/rus/settings/game_center.ini
View File

@ -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

7
programs/cmm/sysmon/sysmon.c
View File

@ -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);
}
//===================================================//