Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5753 → Rev 5752

/programs/cmm/eolite/include/translations.h
1,5 → 1,5
#define TITLE "Eolite File Manager v3.1"
#define ABOUT_TITLE "Eolite 3.1"
#define TITLE "Eolite File Manager v3.08"
#define ABOUT_TITLE "Eolite 3.08"
 
#ifdef LANG_RUS
?define T_FILE "” ©«"
/programs/cmm/eolite/include/settings.h
47,8 → 47,8
else if (id==26) && (files.line_h>18) files.line_h--;
else if (id==27) MOUSE_TIME++;
else if (id==28) && (MOUSE_TIME>29) MOUSE_TIME--;
else if (id==30) && (font.size.text<22) { font.size.text++; BigFontsChange(); }
else if (id==31) && (font.size.text>9) { font.size.text--; BigFontsChange(); }
else if (id==30) && (font_size<22) { font_size++; BigFontsChange(); }
else if (id==31) && (font_size>9) { font_size--; BigFontsChange(); }
SaveIniSettings();
EventRedrawWindow(Form.left,Form.top);
DrawSettingsCheckBoxes();
69,7 → 69,6
 
void ExitSettings()
{
active_settings=0;
settings_window = 0;
cmd_free = 4;
SaveIniSettings();
84,7 → 83,7
CheckBox2(10, 77, 24, USE_TWO_PANELS, two_panels);
MoreLessBox(10, 103, 18, 27, 28, #system.color, MOUSE_TIME, T_DOUBLE_CLICK);
MoreLessBox(10, 130, 18, 25, 26, #system.color, files.line_h, LIST_LINE_HEIGHT);
if (font.data) MoreLessBox(10, 157, 18, 30, 31, #system.color, font.size.text, FONT_SIZE_LABEL);
if (font.data) MoreLessBox(10, 157, 18, 30, 31, #system.color, font_size, FONT_SIZE_LABEL);
}
 
 
94,7 → 93,7
ini_get_int stdcall (eolite_ini_path, #config_section, "ShowDeviceName", 1); show_dev_name = EAX;
ini_get_int stdcall (eolite_ini_path, #config_section, "RealFileNamesCase", 0); real_files_names_case = EAX;
ini_get_int stdcall (eolite_ini_path, #config_section, "InfoAfterCopy", 0); info_after_copy = EAX;
ini_get_int stdcall (eolite_ini_path, #config_section, "FontSize", 9); font.size.text = EAX;
ini_get_int stdcall (eolite_ini_path, #config_section, "FontSize", 9); font_size = EAX;
ini_get_int stdcall (eolite_ini_path, #config_section, "TwoPanels", 0); two_panels = EAX;
ini_get_int stdcall (eolite_ini_path, #config_section, "LineHeight", 18); files.line_h = EAX;
ini_get_int stdcall (eolite_ini_path, #config_section, "TimeDoubleClick", 50); MOUSE_TIME = EAX;
103,6 → 102,8
ini_get_int stdcall (eolite_ini_path, #config_section, "WinW", 550); WinW = EAX;
ini_get_int stdcall (eolite_ini_path, #config_section, "WinH", 500); WinH = EAX;
BigFontsChange();
font.no_bg_copy = true;
font.load("/sys/font/Tahoma.kf");
}
 
 
111,7 → 112,7
ini_set_int stdcall (eolite_ini_path, #config_section, "ShowDeviceName", show_dev_name);
ini_set_int stdcall (eolite_ini_path, #config_section, "RealFileNamesCase", real_files_names_case);
ini_set_int stdcall (eolite_ini_path, #config_section, "InfoAfterCopy", info_after_copy);
ini_set_int stdcall (eolite_ini_path, #config_section, "FontSize", font.size.text);
ini_set_int stdcall (eolite_ini_path, #config_section, "FontSize", font_size);
ini_set_int stdcall (eolite_ini_path, #config_section, "TwoPanels", two_panels);
ini_set_int stdcall (eolite_ini_path, #config_section, "LineHeight", files.line_h);
ini_set_int stdcall (eolite_ini_path, #config_section, "TimeDoubleClick", MOUSE_TIME);
/programs/cmm/eolite/include/left_panel.h
115,7 → 115,7
 
void DrawSystemDiscs()
{
char dev_name[15], disc_name[100], i, dev_icon, is_active, name_len;
char dev_name[15], disc_name[100], i, dev_icon, is_active;
int pos_y, pos_x=2;
for (i=disc_num; i<30; i++) DeleteButton(100+i);
185,12 → 185,11
else
{
pos_y = 43;
name_len = strlen(#dev_name)-1*8;
DrawBar(pos_x, pos_y, name_len + 31, 17, 0xFFFFFF);
DefineButton(pos_x+2, pos_y, name_len + 27, 16, 100+i+BT_HIDE,0xFFFFFF);
DrawBar(pos_x, pos_y, strlen(#dev_name)*6 + 29, 17, 0xFFFFFF);
DefineButton(pos_x+2, pos_y, strlen(#dev_name)*6 + 25, 16, 100+i+BT_HIDE,0xFFFFFF);
_PutImage(pos_x + 5, pos_y, 18,17, is_active*6+dev_icon*17*18*3+#devices);
WriteText(pos_x + 24, pos_y+1, 10110000b, 0, #dev_name+1);
pos_x += name_len + 31;
WriteText(pos_x + 24, pos_y+5, 0x80, 0, #dev_name);
pos_x += strlen(#dev_name)*6 + 29;
}
}
if (two_panels)
/programs/cmm/eolite/Eolite.c
35,7 → 35,6
byte active_about=0;
word about_window;
word settings_window;
byte active_settings=0;
dword _not_draw = false;
byte menu_call_mouse=0;
 
75,7 → 74,8
byte CMD_REFRESH;
 
//struct t_settings {
byte sort_num=2,
byte font_size=9,
sort_num=2,
show_dev_name=true,
real_files_names_case=false,
info_after_copy=false,
128,8 → 128,6
Open_Dir(#path,ONLY_OPEN);
strcpy(#inactive_path, #path);
llist_copy(#files_inactive, #files);
font.no_bg_copy = true;
font.load("/sys/font/Tahoma.kf");
SetEventMask(1100111b);
loop(){
switch(WaitEvent())
688,7 → 686,7
if (text_col==0xA6A6B7) text_col=0xFFFFFF;
}
if (file.selected) text_col=0xFF0000;
if (font.size.text==9) || (!font.data)
if (font_size==9) || (!font.data)
{
if (Form.width>=480)
{
704,7 → 702,7
else
{
font.bg_color = color;
font.text(files.x + 23, files.line_h - font.height / 2 - 1 + y, file_name_off);
font.text(files.x + 23, files.line_h - font.height / 2 - 1 + y, file_name_off, 0, font_size);
}
DrawBar(files.x+files.w-141,y,1,files.line_h,system.color.work); //gray line 1
DrawBar(files.x+files.w-68,y,1,files.line_h,system.color.work); //gray line 2
1120,7 → 1118,7
CreateThread(#properties_dialog, properties_stak+8092);
break;
case 10: //F10
if (!active_settings)
if (!settings_window)
{
settings_stak = malloc(4096);
settings_window = CreateThread(#settings_dialog, settings_stak+4092);
/programs/cmm/lib/encoding.h
File deleted
\ No newline at end of file
/programs/cmm/lib/font.h
9,17 → 9,10
#include "../lib/io.h"
#endif
 
:struct __SIZE
{
word width,height;
signed offset_x,offset_y;
byte text;
};
:struct FONT
{
__SIZE size;
byte width,height,offsetLine,r,g,b,weight;
dword color;
byte width,height,offsetLine,r,g,b;
word width_buffer;
dword file_size;
dword buffer;
dword buffer_size;
30,10 → 23,10
byte load(...);
byte symbol(word x;byte s;dword c);
byte symbol_size(byte s);
dword text(word x,y;dword text1,c);
dword getsize(dword text1);
dword textarea(word x,y;dword text,c);
byte changeSIZE();
dword text(word x,y;dword text1,c;byte size);
dword text_width(dword text1;byte size);
dword textarea(word x,y;dword text,c;byte size);
byte changeSIZE(byte size);
void PixelRGB(word x,y);
dword tmp_y,tmp_height,tmp_x;
byte no_bg_copy;
44,7 → 37,7
:void FONT::PixelRGB(dword x,y)
{
dword tmp;
tmp = y*size.width*3;
tmp = y*width_buffer*3;
tmp += x*3;
tmp += buffer;
 
54,14 → 47,14
tmp++;
DSBYTE[tmp] = b;
}
:byte FONT::changeSIZE()
:byte FONT::changeSIZE(byte size)
{
dword TMP_DATA;
dword ofs;
byte s;
IF(size.text<9) size.text = 8;
IF(size.text>45)size.text = 45;
s = size.text-8;
IF(size<9) size = 8;
IF(size>45)size = 45;
s = size-8;
data = begin;
TMP_DATA = data;
TMP_DATA +=s*4;
81,23 → 74,16
}
:proc_info Form_SELF_FONTS;
 
:dword FONT::getsize(dword text1)
:dword FONT::text_width(dword text1;byte size)
{
size.height = size.width = 0;
size.offset_x = size.offset_y = -1;
IF(size.text)IF(!changeSIZE())return 0;
dword len=0;
IF(size)IF(!changeSIZE(size))return 0;
WHILE(DSBYTE[text1])
{
symbol_size(DSBYTE[text1]);
len += symbol_size(DSBYTE[text1]);
text1++;
}
$neg size.offset_y
$neg size.offset_x
size.height++;
size.height += size.offset_y;
size.width += size.offset_x;
size.width++;
return size.width;
return len;
}
:byte FONT::symbol_size(byte s)
{
105,24 → 91,13
dword tmp,_;
dword iii;
byte rw=0;
byte X;
IF(s==32)
{
size.width += width/4;
IF(weight) size.width++;
return;
}
IF(s==9)
{
size.width += width;
IF(weight) size.width++;
return;
}
IF(s==32)return width/4;
IF(s==9)return width;
yi = 0;
iii = 0;
tmp = 4*block*s;
tmp +=data;
while(yi<height)
WHILE(yi<height)
{
xi = 0;
WHILE(xi<width)
133,32 → 108,18
tmp += 4;
_ = DSDWORD[tmp];
}
IF(_&1)
{
IF(xi>rw)rw=xi;
IF(size.height<yi)size.height = yi;
IF(size.offset_y<0)size.offset_y = yi;
ELSE IF(yi<size.offset_y)size.offset_y = yi;
IF(!X) X = xi;
ELSE IF(X>xi)X = xi;
}
IF(_&1) IF(xi>rw)rw=xi;
xi++;
iii++;
}
yi++;
}
size.width += rw;
IF(weight) size.width++;
IF(s=='_') size.width--;
IF(size.offset_x<0)size.offset_x = X;
return rw;
}
:dword FONT::text(word x,y;dword text1)
:dword FONT::text(word x,y;dword text1,c;byte size)
{
signed len=0;
dword c;
word _tmp_h;
c = color;
IF(size.text)IF(!changeSIZE())return 0;
IF(size)IF(!changeSIZE(size))return 0;
GetProcessInfo(#Form_SELF_FONTS, SelfInfo);
IF(y>Form_SELF_FONTS.cheight) return 0;
IF(x>Form_SELF_FONTS.cwidth) return 0;
169,15 → 130,16
c>>=16;
AX = c;
b = AL;
getsize(text1);
width_buffer = text_width(text1,size);
//width_buffer *= strlen(text1);
IF(!buffer_size)
{
buffer_size = size.width*size.height*3;
buffer_size = width_buffer*height*3;
buffer = malloc(buffer_size);
}
ELSE IF(buffer_size<size.width*size.height*3)
ELSE IF(buffer_size<width_buffer*height*3)
{
buffer_size = size.width*size.height*3;
buffer_size = width_buffer*height*3;
buffer = realloc(buffer,buffer_size);
}
IF (no_bg_copy)
191,16 → 153,15
$add edi,3
}
}
ELSE CopyScreen(buffer,x+Form_SELF_FONTS.left+5,y+Form_SELF_FONTS.top+GetSkinHeight(),size.width,size.height);
 
ELSE CopyScreen(buffer,x+Form_SELF_FONTS.left+5,y+Form_SELF_FONTS.top+GetSkinHeight(),width_buffer,height);
//width_buffer = text_width(text1);
WHILE(DSBYTE[text1])
{
IF(DSBYTE[text1]=='_') len--;
len+=symbol(len,DSBYTE[text1],c);
IF(weight)len++;
symbol(len,DSBYTE[text1],c);
len+=EAX;
text1++;
}
_PutImage(x,y-size.offset_y,size.width,size.height,buffer);
_PutImage(x,y,width_buffer,height,buffer);
return len;
}
:dword FONT::textarea(word x,y;dword text1,c;byte size)
215,7 → 176,7
dword iii;
dword ___x;
byte rw=0;
x += size.offset_x;
x -= 2;
IF(s==32)return width/4;
IF(s==9)return width;
yi = 0;
225,7 → 186,7
while(yi<height)
{
xi = 0;
while(xi<width)
WHILE(xi<width)
{
IF(iii%32) _ >>= 1;
ELSE
237,12 → 198,8
{
IF(xi>rw)rw=xi;
___x = x+xi;
IF(___x<Form_SELF_FONTS.cwidth)&&(tmp_y+yi<Form_SELF_FONTS.cheight)
{
PixelRGB(___x,size.offset_y+yi);
IF(weight) PixelRGB(___x+1,size.offset_y+yi);
IF(___x<Form_SELF_FONTS.cwidth)&&(tmp_y+yi<Form_SELF_FONTS.cheight)PixelRGB(___x,yi);
}
}
xi++;
iii++;
}