Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3990 → Rev 3991

/programs/cmm/buildall.bat
File deleted
\ No newline at end of file
/programs/cmm/dicty/dicty.c
22,8 → 22,8
 
char edword[256], search_word[256], translate_result[4096], dict_folder[4096], cur_dict[256];
#define DICT_DIRECROTY "dictionaries"
#define PRONOUNCED_FILE "/tmp9/1/dicty/pronounced.txt"
#define SPEECH_PATH "/tmp9/1/media/speech/speech"
#define PRONOUNCED_FILE "/sys/pronounced.txt"
#define SPEECH_PATH "/kolibrios/media/speech/speech"
dword dir_buf, file_buf, fsize;
 
int mouse_dd, speaker_id;
/programs/cmm/eolite/Eolite.c
73,8 → 73,8
 
enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
 
#define TITLE "Eolite File Manager v1.97"
#define ABOUT_TITLE "Eolite v1.97"
#define TITLE "Eolite File Manager v1.97.2"
#define ABOUT_TITLE "Eolite v1.97.2"
dword col_work = 0xE4DFE1;
dword col_border = 0x9098B0; //A0A0B8; //0x819FC5;
dword col_padding = 0xC8C9C9;
640,28 → 640,23
 
void Del_Form()
{
int dform_x = files.w - 200 / 2 + files.x;
//oeia ieii
int dform_x = files.w - 200 / 2 + files.x-3;
if (!files.count) return;
#ifdef LANG_RUS
DrawFlatButton(dform_x,160,215,80,0,col_work, ""); //oi?ia
#else
DrawFlatButton(dform_x,160,200,80,0,col_work, ""); //oi?ia
#endif
WriteText(dform_x+19,175,0x80,0,T_DELETE_FILE);
DrawPopup(dform_x,160,213,80,1,col_work,col_border);
WriteText(-strlen(T_DELETE_FILE)*3+107+dform_x,175,0x80,0,T_DELETE_FILE);
IF (strlen(#file_name)<28)
{
WriteText(strlen(#file_name)*6+dform_x+20,190,0x80,0,"?");
WriteText(dform_x+20,190,0x80,0,#file_name); //ieoai eiy
WriteText(strlen(#file_name)*3+107+dform_x+2,190,0x80,0,"?");
WriteText(-strlen(#file_name)*3+107+dform_x,190,0x80,0,#file_name);
}
ELSE
else
{
WriteText(164+dform_x,190,0x80,0,"...?");
ESI = 24;
WriteText(dform_x+20,190,0,0,#file_name); //ieoai eiy
WriteText(dform_x+20,190,0,0,#file_name);
}
DrawFlatButton(dform_x+20,208,70,20,301,0xFFB6B5,T_YES);
DrawFlatButton(dform_x+111,208,70,20,302,0xC6DFC6,T_NO);
DrawFlatButton(dform_x+26,208,70,20,301,0xFFB6B5,T_YES);
DrawFlatButton(dform_x+119,208,70,20,302,0xC6DFC6,T_NO);
del_active=1;
}
 
/programs/cmm/eolite/include/file_menu.h
28,7 → 28,6
"Kustuta", "Del",
"Värskenda", "F5",
0, 0};
 
#else
char *captions[] = {
"Open", "Enter",
101,10 → 100,7
GetProcessInfo(#MenuForm, SelfInfo);
DrawRectangle(0,0,linew+1,ccount*lineh+2,col_border);
DrawBar(1,1,linew,1,0xFFFfff);
PutShadow(linew+2,1,1,ccount*lineh+2,0,2);
PutShadow(linew+3,2,1,ccount*lineh+2,0,1);
PutShadow(1,ccount*lineh+3,linew+2,1,0,2);
PutShadow(2,ccount*lineh+4,linew+1,1,0,1);
DrawPopupShadow(1,1,linew,ccount*lineh,0);
 
_ITEMS_DRAW:
for (index=0; captions[index*2]!=0; index++)
/programs/cmm/installer/main.c
48,6 → 48,34
return 1;
}
 
 
struct sysdir
{
char name[64];
char path[64];
} sysdir;
 
 
int SetAddApplDir(dword tName, tPath)
{
int i;
strcpy(#sysdir.name, tName);
strcpy(#sysdir.path, tPath);
if (sysdir.name[0]=='/') strcpy(#sysdir.name, #sysdir.name+1);
if (sysdir.path[0]=='/') strcpy(#sysdir.path, #sysdir.path+1);
i = strlen(#sysdir.name);
if (sysdir.name[i]=='/') sysdir.name[i]='\0';
i = strlen(#sysdir.path);
if (sysdir.path[i]=='/') sysdir.path[i]='\0';
debug(#sysdir.name);
debug(#sysdir.path);
$mov eax, 30
$mov ebx, 3
ECX = #sysdir;
$int 0x40
}
 
 
#include "tmp_add.c"
#include "hallo.c";
#include "installation.c";
/programs/cmm/lib/figures.h
96,18 → 96,34
}
 
 
:void PutShadow(dword x,y,w,h,border,strength)
:void PutShadow(dword x,y,w,h,skinned,strength)
{
proc_info wForm;
dword shadow_buf, skin_height;
shadow_buf = mem_Alloc(w*h*3);
GetProcessInfo(#wForm, SelfInfo);
CopyScreen(shadow_buf, 5*border+x+wForm.left, GetSkinHeight()*border+y+wForm.top, w, h);
CopyScreen(shadow_buf, 5*skinned+x+wForm.left, GetSkinHeight()*skinned+y+wForm.top, w, h);
ShadowImage(shadow_buf, w, h, strength);
_PutImage(x,y,w,h,shadow_buf);
mem_Free(shadow_buf);
}
 
:void DrawPopupShadow(dword x,y,w,h,skinned)
{
PutShadow(w+x+1,y,1,h+2,skinned,2);
PutShadow(w+x+2,y+1,1,h+2,skinned,1);
PutShadow(x,y+h+2,w+2,1,skinned,2);
PutShadow(x+1,y+h+3,w+1,1,skinned,1);
}
 
:void DrawPopup(dword x,y,w,h,skinned, col_work,col_border)
{
DrawRectangle(x,y,w,h,col_border);
DrawRectangle3D(x+1,y+1,w-2,h-2,0xFFFfff,col_work);
DrawBar(x+2,y+2,w-3,h-3,col_work);
DrawPopupShadow(x,y,w,h-1,skinned);
}
 
:void GrayScaleImage(dword color_image, w, h)
{
dword i,j, gray,rr,gg,bb;
/programs/cmm/lib/kolibri.h
34,7 → 34,7
 
struct mouse
{
signed int x,y,lkm,pkm,hor,vert;
signed x,y,lkm,pkm,hor,vert;
void get();
};
 
48,6 → 48,8
$and ebx,0x0000FFFF
x = EAX;
y = EBX;
if (x>6000) x-=65535;
if (y>6000) y-=65535;
EAX = 37;
EBX = 2;
$int 0x40
65,7 → 67,6
$and ebx,0x0000FFFF
//hor = EAX;
vert = EBX;
if (y>6000) y=0;
}