sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

appearance: fix skins path, installer: update, eolite: use tahoma.kf

Browse Source 
git-svn-id: svn://kolibrios.org@5765 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-08-22 17:38:33 +00:00
parent 5d31042f78
commit a97a1f029d
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/cmm/appearance/appearance.c
View File

@ -25,9 +25,7 @@
unsigned char icons[]= FROM "icons.raw"; unsigned char icons[]= FROM "icons.raw";
#define PANEL_H 30 #define PANEL_H 30
#define SKINS_STANDART_PATH "/sys/skins" #define SKINS_STANDART_PATH "/kolibrios/res/skins"
//"/kolibrios/res/skins"
#define WALP_STANDART_PATH "/kolibrios/res/wallpapers" #define WALP_STANDART_PATH "/kolibrios/res/wallpapers"
llist list[2]; llist list[2];

1
programs/cmm/appearance/compile_en.bat
View File

@ -7,3 +7,4 @@ C-- appearance.c
@del warning.txt @del warning.txt
@del lang.h-- @del lang.h--
@pause @pause
kpack appearance

1
programs/cmm/appearance/compile_ru.bat
View File

@ -7,3 +7,4 @@ C-- appearance.c
@del warning.txt @del warning.txt
@del lang.h-- @del lang.h--
@pause @pause
kpack appearance

2
programs/cmm/eolite/Eolite.c
View File

@ -129,7 +129,7 @@ void main()
strcpy(#inactive_path, #path); strcpy(#inactive_path, #path);
llist_copy(#files_inactive, #files); llist_copy(#files_inactive, #files);
font.no_bg_copy = true; font.no_bg_copy = true;
font.load("/sys/font/Tahoma.kf"); font.load("/sys/fonts/tahoma.kf");
SetEventMask(1100111b); SetEventMask(1100111b);
loop(){ loop(){
switch(WaitEvent()) switch(WaitEvent())

6
programs/cmm/installer/installer.c
View File

@ -14,16 +14,16 @@
void main() void main()
{ {
SetAddApplDir("kolibrios", abspath("kolibrios")+1); SetAddApplDir("kolibrios", abspath("install/kolibrios")+1);
io.run("/sys/media/kiv", "\\S__/kolibrios/res/Wallpapers/In the wind there is longing.png"); io.run("/sys/media/kiv", "\\S__/kolibrios/res/Wallpapers/In the wind there is longing.png");
copyf(abspath("sys"), "/sys"); copyf(abspath("install/sys"), "/sys");
RestartProcessByName("@icon", MULTIPLE); RestartProcessByName("@icon", MULTIPLE);
RestartProcessByName("@taskbar", SINGLE); RestartProcessByName("@taskbar", SINGLE);
RestartProcessByName("@docky", SINGLE); RestartProcessByName("@docky", SINGLE);
notify(T_END); notify(T_END);
io.run("/sys/tmpdisk", "a0s10"); io.run("/sys/tmpdisk", "a0s10");
pause(50); pause(50);
copyf(abspath("tmp"), "/tmp0/1"); copyf(abspath("install/tmp"), "/tmp0/1");
ExitProcess(); ExitProcess();
} }

2
programs/cmm/lib/font.h
View File

@ -336,7 +336,7 @@ inline fastcall dword b24(EBX) { return DSDWORD[EBX] << 8; }
dword tmp; dword tmp;
buffer_size = 0; buffer_size = 0;
IF(data)free(data); IF(data)free(data);
if (!io.read(path)) if (!io.readKPACK(path))
{ {
debug("Error while loading font: "); debug("Error while loading font: ");
debugln(path); debugln(path);