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

app_plus: fix manual directory choose and fix running two SEARCHAP; remove debug information; make some vars and functions optional (decrease apps size)

Browse Source 
git-svn-id: svn://kolibrios.org@6271 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2016-02-20 22:09:50 +00:00
parent 2fb7e8f066
commit 2c6e64c7a0
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,6 @@ need to reboot system to try again."
void CheckKosMounted() void CheckKosMounted()
{ {
while (CheckProcessExists("SEARCHAP")) pause(2);
if (dir_exists("/kolibrios/")) if (dir_exists("/kolibrios/"))
{ {
if (file_exists(APP_PLUS_INI_PATH)) if (file_exists(APP_PLUS_INI_PATH))
@ -52,7 +51,8 @@ void CheckKosMounted()
void RunAutosearch() void RunAutosearch()
{ {
io.run("/sys/SEARCHAP",0); if (!CheckProcessExists("SEARCHAP")) io.run("/sys/SEARCHAP",0);
while (CheckProcessExists("SEARCHAP")) pause(2);
} }
void main() void main()
@ -75,7 +75,7 @@ void main()
if (id==10) if (id==10)
{ {
OpenDialog_start stdcall (#o_dialog); OpenDialog_start stdcall (#o_dialog);
if (o_dialog.status) SetAdditionalSystemDirectory("kolibrios", #openfile_path); if (o_dialog.status) SetAdditionalSystemDirectory("kolibrios", #openfile_path+1);
pause(3); pause(3);
CheckKosMounted(); CheckKosMounted();
} }

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

@ -128,7 +128,6 @@ void main()
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
IF (Form.status_window>=2) break; IF (Form.status_window>=2) break;
DrawWindowContent(); DrawWindowContent();
debugi(menu.list.cur_y);
if (menu.list.cur_y) { if (menu.list.cur_y) {
if (menu.list.cur_y == 10) EventOpenFile(); if (menu.list.cur_y == 10) EventOpenFile();
if (menu.list.cur_y == 11) EventDeleteFile(); if (menu.list.cur_y == 11) EventDeleteFile();

2
programs/cmm/lib/added_sysdir.c
View File

@ -11,8 +11,6 @@ struct sysdir
int i; int i;
strcpy(#sysdir.name, tName); strcpy(#sysdir.name, tName);
strcpy(#sysdir.path, tPath); strcpy(#sysdir.path, tPath);
debugln(#sysdir.name);
debugln(#sysdir.path);
$mov eax, 30 $mov eax, 30
$mov ebx, 3 $mov ebx, 3
ECX = #sysdir; ECX = #sysdir;

8
programs/cmm/lib/gui.h
View File

@ -68,7 +68,7 @@
} }
} }
unsigned char checkbox_flag[507] = { :unsigned char checkbox_flag[507] = {
0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC,
0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4,
0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xDC, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xDC, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04,
@ -277,14 +277,14 @@ dword incn::inc(dword _addition)
#define TAB_PADDING 25 #define TAB_PADDING 25
#define TAB_HEIGHT 25 #define TAB_HEIGHT 25
struct _tabs :struct _tabs
{ {
int active_tab; int active_tab;
void draw(); void draw();
int click(); int click();
} tabs; } tabs;
void _tabs::draw(dword x,y, but_id, text) :void _tabs::draw(dword x,y, but_id, text)
{ {
dword col_bg, col_text; dword col_bg, col_text;
dword w=strlen(text)*8+TAB_PADDING, h=TAB_HEIGHT; dword w=strlen(text)*8+TAB_PADDING, h=TAB_HEIGHT;
@ -303,7 +303,7 @@ void _tabs::draw(dword x,y, but_id, text)
DrawCaptButton(x,y, w-1,h+1, but_id, col_bg, col_text, text); DrawCaptButton(x,y, w-1,h+1, but_id, col_bg, col_text, text);
} }
int _tabs::click(int N) :int _tabs::click(int N)
{ {
if (N==active_tab) return false; if (N==active_tab) return false;
active_tab = N; active_tab = N;

6
programs/cmm/lib/patterns/rgb.h
View File

@ -2,21 +2,21 @@
#define INCLUDE_RGB_H #define INCLUDE_RGB_H
#print "[include <rgb.h>]\n" #print "[include <rgb.h>]\n"
struct _rgb :struct _rgb
{ {
byte b,g,r; byte b,g,r;
void DwordToRgb(); void DwordToRgb();
dword RgbToDword(); dword RgbToDword();
} rgb; } rgb;
void _rgb::DwordToRgb(dword _dword) :void _rgb::DwordToRgb(dword _dword)
{ {
r = _dword & 0xFF; _dword >>= 8; r = _dword & 0xFF; _dword >>= 8;
g = _dword & 0xFF; _dword >>= 8; g = _dword & 0xFF; _dword >>= 8;
b = _dword & 0xFF; _dword >>= 8; b = _dword & 0xFF; _dword >>= 8;
} }
dword _rgb::RgbToDword() :dword _rgb::RgbToDword()
{ {
dword _b, _g; dword _b, _g;
_b = b << 16; _b = b << 16;