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

memory blocks: fix new game (thanks Antonio)

Browse Source 
app_plus: fix typo
appearance: fix current skin save in eskin.ini
pixie player: restrict the length of folder name label (thanks Iuriy Olegov)
fm/icons.ini: add icons for *.stl

git-svn-id: svn://kolibrios.org@7613 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2019-03-16 21:06:09 +00:00
parent 93915682d2
commit c89576f170
7 changed files with 58 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,7 @@ lif=14
3ds=15 3ds=15
asc=15 asc=15
vox=15 vox=15
tls=15
kex=16 kex=16
skn=17 skn=17
obj=18 obj=18
@ -224,3 +225,4 @@ djvu=85
csv=28 csv=28
rft=85 rft=85
lif=13 lif=13
tls=78

2
data/rus/docs/guide/hardware_support.htm
View File

@ -20,7 +20,7 @@
KolibriOS частично обеспечивает поддержку оборудования персонального компьютера. Часть оборудования поддерживается ядром ОС, часть динамически загружаемыми драйверами. KolibriOS частично обеспечивает поддержку оборудования персонального компьютера. Часть оборудования поддерживается ядром ОС, часть динамически загружаемыми драйверами.
<h2>Графика</h2> <h2>Графика</h2>
<b>Стандарт Поддержка в KolibriOS</b> <b>Стандарт Поддержка в KolibriOS</b>
VESA Поддерживается ядром ОС VESA Поддерживается ядром ОС
VGA Поддерживается ядром ОС VGA Поддерживается ядром ОС

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

@ -43,7 +43,7 @@ dword scr_pal[] = {0xFFFFFF,0xBBDDFF,0x4166B5,0xE0E4E6,0xAFBEDD,0xC4D4E8,0x52ACD
?define WINDOW_TITLE_TEXT "‚­¨¬ ­¨¥! <20>â® ¢ ¦­®." ?define WINDOW_TITLE_TEXT "‚­¨¬ ­¨¥! <20>â® ¢ ¦­®."
?define CONTENT_HEADER_TEXT "<EFBFBD>€<EFBFBD>Š€ /KOLIBRIOS/ <20>… <20>€‰„…<E2809E>€" ?define CONTENT_HEADER_TEXT "<EFBFBD>€<EFBFBD>Š€ /KOLIBRIOS/ <20>… <20>€‰„…<E2809E>€"
?define DESCRIPTION_TEXT "<EFBFBD>®¯à®¡ã©â¥ ­ ©â¨ ¥¥ á ¬®áâ®ï⥫쭮. ?define DESCRIPTION_TEXT "<EFBFBD>®¯à®¡ã©â¥ ­ ©â¨ ¥¥ á ¬®áâ®ï⥫쭮.
‘®¤¥à¦¨¬®¥ ¨ª®¬®© ¯ ¯ª¨ ¯®ª § ­® ­  ‘®¤¥à¦¨¬®¥ ¨áª®¬®© ¯ ¯ª¨ ¯®ª § ­® ­ 
ª à⨭ª¥ á¯à ¢ . ‚ á«ãç ¥ ­¥¢¥à­® ª à⨭ª¥ á¯à ¢ . ‚ á«ãç ¥ ­¥¢¥à­®
¢ë¡à ­­®© ¯ ¯ª¨ âॡã¥âáï ¢ë¯®«­¨âì ¢ë¡à ­­®© ¯ ¯ª¨ âॡã¥âáï ¢ë¯®«­¨âì
¯¥à¥§ £à㧪ã <EFBFBD>Š ¨ ¯®¯à®¡®¢ âì á­®¢ ." ¯¥à¥§ £à㧪ã <EFBFBD>Š ¨ ¯®¯à®¡®¢ âì á­®¢ ."

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

@ -436,7 +436,7 @@ void EventOpenFile()
_ini ini = { "/sys/settings/eskin.ini", "main" }; _ini ini = { "/sys/settings/eskin.ini", "main" };
void EventExit() void EventExit()
{ {
ini.SetString("skin", #cur_skin_path, strlen(#cur_skin_path)); if (cur_skin_path) ini.SetString("skin", #cur_skin_path, strlen(#cur_skin_path));
ExitProcess(); ExitProcess();
} }

85
programs/cmm/mblocks/mblocks.c
View File

@ -1,7 +1,7 @@
/* /*
Memory Blocks for KolibriOS v1.1 Memory Blocks for KolibriOS v1.11
Leency&Veliant Edition Leency&Veliant Edition
2008-2017 2008-2019
*/ */
#define MEMSIZE 4096 * 15 #define MEMSIZE 4096 * 15
@ -35,7 +35,7 @@ proc_info Form;
int bitstat[60], bitpict[60]; int bitstat[60], bitpict[60];
dword butonsx[60], butonsy[60]; dword butonsx[60], butonsy[60];
dword firstbit, secondbit; dword firstbit, secondbit;
int i, count, lang; int count;
void main() void main()
@ -57,51 +57,52 @@ void main()
break; break;
case evButton: case evButton:
id = GetButtonID(); id = GetButtonID();
if (id==1) ExitProcess(); if (id==1) ExitProcess();
else if (id==5) NewGame(); else if (id==5) NewGame();
else { else {
if (bitstat[id-100] == 0) if (bitstat[id-100] == 0)
{
if (firstbit <> 0x0BAD)
{ {
if (firstbit <> 0x0BAD) if (secondbit <> 0x0BAD)
{
if (secondbit <> 0x0BAD)
{
if (bitpict[firstbit-100] == bitpict[secondbit-100])
bitstat[firstbit-100] = bitstat[secondbit-100] = 2;
else
bitstat[firstbit-100] = bitstat[secondbit-100] = 0;
ReDraw_Game_Button(firstbit - 100);
ReDraw_Game_Button(secondbit - 100);
secondbit = 0x0BAD;
firstbit = id;
bitstat[id-100] = 1;
ReDraw_Game_Button(id - 100);
count++;
}
else if (firstbit<>id)
{
secondbit = id;
bitstat[id-100] = 1;
ReDraw_Game_Button(id - 100);
count++;
}
}
else
{ {
if (bitpict[firstbit-100] == bitpict[secondbit-100])
bitstat[firstbit-100] = bitstat[secondbit-100] = 2;
else
bitstat[firstbit-100] = bitstat[secondbit-100] = 0;
ReDraw_Game_Button(firstbit - 100);
ReDraw_Game_Button(secondbit - 100);
secondbit = 0x0BAD;
firstbit = id; firstbit = id;
bitstat[id-100] = 1; bitstat[id-100] = 1;
ReDraw_Game_Button(id - 100); ReDraw_Game_Button(id - 100);
count++; count++;
} }
else if (firstbit<>id)
{
secondbit = id;
bitstat[id-100] = 1;
ReDraw_Game_Button(id - 100);
count++;
}
} }
Draw_Count(); else
} {
break; firstbit = id;
bitstat[id-100] = 1;
ReDraw_Game_Button(id - 100);
count++;
}
}
Draw_Count();
}
break;
case evReDraw: case evReDraw:
system.color.get(); system.color.get();
DefineAndDrawWindow(215,100,CELL_SIZE+4*10 + 4 + 9,PANEL_Y + 4 + PANEL_H +skin_height,0x34,0xC0C0C0,"Memory Blocks",0); DefineAndDrawWindow(215,100,CELL_SIZE+4*10 + 4 + 9,PANEL_Y+4+PANEL_H+skin_height,
0x34,0xC0C0C0,"Memory Blocks",0);
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
Draw_Panel(); Draw_Panel();
Draw_Game_Pole(); Draw_Game_Pole();
@ -112,10 +113,11 @@ void main()
void NewGame() void NewGame()
{ {
int off; int off;
int i;
FOR (i = 0; i < 60; i++) FOR (i = 0; i < 60; i++)
{ {
bitpict[i] = 0; bitstat[i] = 0;
bitpict[i] = 0; bitpict[i] = 0;
} }
@ -128,6 +130,8 @@ void NewGame()
do off = random(60); while (bitpict[off] != 0); do off = random(60); while (bitpict[off] != 0);
bitpict[off] = i; bitpict[off] = i;
} }
Draw_Game_Pole();
Draw_Panel();
} }
void ReDraw_Game_Button(int id) void ReDraw_Game_Button(int id)
@ -151,11 +155,12 @@ void ReDraw_Game_Button(int id)
void Draw_Game_Pole() void Draw_Game_Pole()
{ {
int i;
byte j; byte j;
for (j = 0; j < stolbcov; j++) for (i = 0; i < strok; i++) for (j = 0; j < stolbcov; j++) for (i = 0; i < strok; i++)
{ {
butonsx[j*strok+i] = CELL_SIZE+4 * j + 4; //save coordinates to avoid their recalculation after butonsx[j*strok+i] = CELL_SIZE+4 * j + 4; //save coordinates to avoid
butonsy[j*strok+i] = CELL_SIZE+4 * i + 4; butonsy[j*strok+i] = CELL_SIZE+4 * i + 4; //their recalculation after
ReDraw_Game_Button(j*strok + i); ReDraw_Game_Button(j*strok + i);
} }
} }

9
programs/cmm/pixie2/pixie.c
View File

@ -30,7 +30,7 @@
char default_dir[] = "/rd/1"; char default_dir[] = "/rd/1";
od_filter filter2 = { 15, "MP3\0WAV\0XM\0\0" }; od_filter filter2 = { 15, "MP3\0WAV\0XM\0\0" };
#define ABOUT_MESSAGE "Pixie Player v2.92 Final #define ABOUT_MESSAGE "Pixie Player v2.93 Final
A tiny music folder player. A tiny music folder player.
Supports MP3, WAV, XM audio file formats. Supports MP3, WAV, XM audio file formats.
@ -331,10 +331,13 @@ void DrawScroller()
if (list.count > list.visible) scrollbar_v_draw(#scroll1); if (list.count > list.visible) scrollbar_v_draw(#scroll1);
} }
void DrawPixieTitle(dword _title) void DrawPixieTitle(dword _t)
{ {
char title[35];
strlcpy(#title, _t, sizeof(title));
if (strlen(#title)>30) strcpy(#title+30, "...");
kfont.WriteIntoWindow(8, 5, theme.color_top_panel_bg, kfont.WriteIntoWindow(8, 5, theme.color_top_panel_bg,
theme.color_top_panel_folder_name, list.font_type, _title); theme.color_top_panel_folder_name, list.font_type, #title);
} }
//===================================================// //===================================================//

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

@ -24,7 +24,7 @@ main:
mcall 18, 7 mcall 18, 7
mov [win.psid], eax mov [win.psid], eax
mcall 40, 100101b mcall 40, EVM_REDRAW+EVM_BUTTON+EVM_MOUSE ;+EVM_DEKSTOP to update colors on skin change
; ==== Load libs ==== ; ==== Load libs ====
load_libraries load_lib_start, load_lib_end load_libraries load_lib_start, load_lib_end