XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

add sntp to IMG

Browse Source 
move notes to ISO
new icons: MGB, TXT; folder icon update
KFM fix toolbar background overflow window border
fit eskin into a single FAT sector

git-svn-id: svn://kolibrios.org@7640 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2019-04-25 17:51:39 +00:00
parent bf5320cbe8
commit bbe41151a9
13 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/Tupfile.lua
View File

@ -245,6 +245,7 @@ extra_files = {
{"kolibrios/media/zsea/buttons/buttons.png", PROGS .. "/media/zsea/buttons.png"},
{"kolibrios/res/skins/", "../skins/authors.txt"},
{"kolibrios/res/templates/", "common/templates/*"},
{"kolibrios/res/templates/", PROGS .. "/emulator/e80/trunk/games/*"},
{"kolibrios/res/wallpapers/", "common/wallpapers/*"},
}
if build_type == "rus" then tup.append_table(extra_files, {
@ -456,6 +457,7 @@ tup.append_table(img_files, {
{"NETWORK/NSLOOKUP", PROGS .. "/network/nslookup/nslookup"},
{"NETWORK/PASTA", PROGS .. "/network/pasta/pasta"},
{"NETWORK/SYNERGYC", PROGS .. "/network/synergyc/synergyc"},
{"NETWORK/SNTP", PROGS .. "/network/sntp/sntp"},
{"NETWORK/TELNET", PROGS .. "/network/telnet/telnet"},
{"NETWORK/@ZEROCONF", PROGS .. "/network/zeroconf/zeroconf"},
{"NETWORK/FTPC", PROGS .. "/network/ftpc/ftpc"},
@ -582,7 +584,6 @@ tup.append_table(img_files, {
{"APP_PLUS", PROGS .. "/cmm/app_plus/app_plus.com"},
{"EASYSHOT", PROGS .. "/cmm/easyshot/easyshot.com"},
{"MOUSECFG", PROGS .. "/cmm/mousecfg/mousecfg.com"},
{"NOTES", PROGS .. "/cmm/notes/notes.com"},
{"BARSCFG", PROGS .. "/cmm/barscfg/barscfg.com"},
{"SYSPANEL", PROGS .. "/cmm/software_widget/software_widget.com"},
{"SYSMON", PROGS .. "/cmm/sysmon/sysmon.com"},
@ -609,6 +610,7 @@ tup.append_table(extra_files, {
{"kolibrios/utils/codeview", PROGS .. "/cmm/codeview/codeview.com"},
{"kolibrios/utils/dicty.kex", PROGS .. "/cmm/dicty/dicty.com"},
{"kolibrios/utils/netcheck", PROGS .. "/cmm/examples/netcheck.com"},
{"kolibrios/utils/notes", PROGS .. "/cmm/notes/notes.com"},
})
end -- tup.getconfig('NO_CMM') ~= 'full'

4
data/common/File Managers/icons.ini
View File

@ -180,7 +180,6 @@ sh=1
exe=2
img=3
ini=5
txt=9
lif=13
csv=28
xls=28
@ -222,7 +221,6 @@ midi=74
stl=78
zip=89
7z=89
mnt=90
obj=92
dll=92
skn=80
@ -230,3 +228,5 @@ kex=88
rft=85
rft=85
kf=118
mgb=121
txt=122

BIN
data/common/icons32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

6
data/common/settings/app_plus.ini
View File

@ -22,7 +22,7 @@ M2View=/k/3D/md2view/md2view,78
Globe=/k/3D/TEXTURES1,78
[Misc]
Guide=network/webview|/kolibrios/res/guide/guide.htm,55
Guide=network/webview|/kolibrios/res/guide/guide.htm,92
DosBox=/k/emul/dosbox/dosbox,11
Dicty=/k/utils/DICTY.KEX,79
fNav=File managers/fNav/fNav,93
@ -30,9 +30,9 @@ CncEditor=/k/utils/cnc_editor/cnc_editor,15
Life=/k/demos/life2,13
Calc+=/k/utils/calcplus,4
TinyBasic=/k/develop/TinyBasic/TinyBasic,91
Notes=notes,117
Notes=/k/utils/notes,117
Table=table,28
FtpClient=network/ftpc,45
FtpClient=network/ftpc,90
VncViewer=network/vncc,77
Timer=demos/timer,119
ASCII View=asciivju,118

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

@ -7,7 +7,7 @@ window_title=KolibriOS System Panel
[Configuration]
RamDisks=tmpdisk,36
VideoMode=vmode,108
NetConfig=network/netcfg,33
LanConfig=network/netcfg,71
SysSetup=setup,5
Date&Time=calendar,52
Appearance=/k/utils/appearance,62
@ -16,7 +16,7 @@ SkinConfig=skincfg,80
Volume=@VOLUME,64
Panels=barscfg,63
Mouse=mousecfg,54
DriverInstall=/k/drivers/DRVINST.KEX,71
DriverInstall=/k/drivers/DRVINST.KEX,38
Autorun=tinypad|/sys/settings/autorun.dat,55
HotAngles=HACONFIG,105
@ -35,5 +35,5 @@ Display=disptest,113
File Speed=fspeed,45
HDDinfo=hdd_info,50
BusOff=kbd,37
GraphicBench=mgb,38
GraphicBench=mgb,121
PciDevice=pcidev,38

BIN
data/common/wallpapers/Cool Blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
data/common/wallpapers/Gradient Pink.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 454 B

3
data/common/wallpapers/copyright.txt
View File

@ -10,4 +10,5 @@ Browser Plutogeezer http://www.pixeljoint.com/p/12237.htm
Snake real Troll http://realtroll.npage.de
Flood-it iMoose http://benjamus.deviantart.com
Dicty Susumu Yoshida http://www.mcdodesign.com
Liza mail Asher Abbasi http://kyo-tux.deviantart.com http://www.iconfinder.com/
GraphicBench Wrim Rimbaug https://www.deviantart.com/wrim
Pig ($) Gnome Patate http://porctrijambiste.e-monsite.com/

3
programs/cmm/lib/patterns/select_list.h
View File

@ -53,8 +53,7 @@ void SelectList_ProcessMouse()
void SelectList_DrawBorder() {
DrawRectangle3D(select_list.x-2, select_list.y-2,
select_list.w+3+scroll1.size_x, select_list.h+3,
MixColors(system.color.work, system.color.work_dark, 125),
system.color.work_light);
system.color.work_dark, system.color.work_light);
DrawRectangle(select_list.x-1, select_list.y-1, select_list.w+1+scroll1.size_x, select_list.h+1, system.color.work_graph);
}

2
programs/cmm/notes/notes.c
View File

@ -68,7 +68,7 @@ void main()
if (GetCpuFrequency()/1000000>=1000) window_dragable=true; else window_dragable=false;
if (param) notes.OpenTxt(#param); else notes.OpenTxt(abspath("notes.txt"));
if (param) notes.OpenTxt(#param); else notes.OpenTxt("/sys/notes.txt");
SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER);
LoadIniSettings();

1
programs/fs/kfm/trunk/menu_drv.inc
View File

@ -279,6 +279,7 @@ draw_left_menu:
mov cx,ax
imul cx,10
mov edx,0xffffcc
dec ebx
mov eax,13
mcall
call draw_menu_Selection

2
programs/system/deskcfg/build.bat Normal file
View File

@ -0,0 +1,2 @@
@fasm -m 16384 deskcfg.asm deskcfg
@pause

2
programs/system/eskin/trunk/eskin.asm
View File

@ -1 +1 @@
use32 org 0x0 db 'MENUET01' ; 8 byte id dd 38 ; required os dd STARTAPP ; program start dd I_END ; program image size dd 0x1000000 ; required amount of memory dd 0x1000000 ; stack heap dd 0x0 dd 0x0 include '../../../proc32.inc' include '../../../macros.inc' include '../../../dll.inc' PATH_MAX equ 255 STARTAPP: ; Initialize memory mcall 68, 11 or eax,eax jz close_app ; Import libraries stdcall dll.Load,importTable test eax, eax jnz close_app ; Set button style: flat or gradient (3D) invoke ini_get_int, aIni, aSectionSkn, aButtonStyle, 0 mov ecx, eax mcall 48, 1 ; Set bg or not? invoke ini_get_int, aIni, aSectionBg, aBgActive, 0 cmp eax, 1 jne set_skin set_bg: invoke ini_get_str, aIni, aSectionBg, aBgProgram, sz_buffer, PATH_MAX, 0 invoke ini_get_str, aIni, aSectionBg, aBgParam, sz_param, PATH_MAX, 0 or eax,eax or eax,eax set_skin: invoke ini_get_str, aIni, aSectionSkn, aSkinPath, sz_param, PATH_MAX, 0 mcall 48, 8, sz_param or eax,eax mcall -1 proc RunProgram stdcall, app_path:dword, app_param:dword push eax m2m dword [InfoStructure+8], [app_param] ; pointer to the parametrs m2m dword [InfoStructure+21], [app_path] ; pointer to the file name mcall 70, InfoStructure jz close_app stdcall dll.Load,importTable jz close_app test eax, eax endp align 16 importTable: library \ libini, 'libini.obj' import libini, \ ini_get_str ,'ini_get_str', \ ini_get_int ,'ini_get_int' InfoStructure: dd 7 ; subfunction number dd 0 ; position in the file in bytes dd ? ; upper part of the position address dd 0 ; number of bytes to read dd 0 ; pointer to the buffer to write data db 0 dd ? ; pointer to the filename aIni db '/sys/settings/eskin.ini',0 aSectionBg db 'bg',0 aBgActive db 'active',0 aBgProgram db 'program',0 aBgParam db 'param',0 aSectionSkn db 'skin',0 aButtonStyle db '3d',0 aSkinPath db 'file',0 sz_buffer: rb PATH_MAX sz_param: rb PATH_MAX I_END: ; End of application code and data marker
use32 org 0x0 db 'MENUET01' ; 8 byte id dd 38 ; required os dd STARTAPP ; program start dd I_END ; program image size dd 0x1000000 ; required amount of memory dd 0x1000000 ; stack heap dd 0x0 dd 0x0 include '../../../proc32.inc' include '../../../macros.inc' include '../../../dll.inc' PATH_MAX equ 255 STARTAPP: ; Initialize memory mcall 68, 11 ; Import libraries stdcall dll.Load,importTable ; Set button style: flat or gradient (3D) invoke ini_get_int, aIni, aSectionSkn, aButtonStyle, 0 mov ecx, eax mcall 48, 1 ; Set bg or not? invoke ini_get_int, aIni, aSectionBg, aBgActive, 0 cmp eax, 1 jne set_skin set_bg: invoke ini_get_str, aIni, aSectionBg, aBgProgram, sz_buffer, PATH_MAX, 0 invoke ini_get_str, aIni, aSectionBg, aBgParam, sz_param, PATH_MAX, 0 m2m dword [InfoStructure+8], sz_param ; pointer to the parametrs ; Import libraries or eax,eax mcall 70, InfoStructure set_skin: invoke ini_get_str, aIni, aSectionSkn, aSkinPath, sz_param, PATH_MAX, 0 mcall 48, 8, sz_param mcall -1 proc RunProgram stdcall, app_path:dword, app_param:dword m2m dword [InfoStructure+8], [app_param] ; pointer to the parametrs m2m dword [InfoStructure+21], [app_path] ; pointer to the file name mcall 70, InfoStructure jz close_app test eax, eax endp importTable: library \ libini, 'libini.obj' import libini, \ ini_get_str ,'ini_get_str', \ ini_get_int ,'ini_get_int' InfoStructure: dd 7 ; subfunction number dd 0 ; position in the file in bytes dd ? ; upper part of the position address dd 0 ; number of bytes to read dd 0 ; pointer to the buffer to write data db 0 dd ? ; pointer to the filename aIni db '/sys/settings/eskin.ini',0 aSectionBg db 'bg',0 aBgActive db 'active',0 aBgProgram db 'program',0 aBgParam db 'param',0 aSectionSkn db 'skin',0 aButtonStyle db '3d',0 aSkinPath db 'file',0 sz_buffer: rb PATH_MAX sz_param: rb PATH_MAX I_END: ; End of application code and data marker