Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5752 → Rev 5753

/programs/cmm/eolite/Eolite.c
35,6 → 35,7
byte active_about=0;
word about_window;
word settings_window;
byte active_settings=0;
dword _not_draw = false;
byte menu_call_mouse=0;
 
74,8 → 75,7
byte CMD_REFRESH;
 
//struct t_settings {
byte font_size=9,
sort_num=2,
byte sort_num=2,
show_dev_name=true,
real_files_names_case=false,
info_after_copy=false,
128,6 → 128,8
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())
686,7 → 688,7
if (text_col==0xA6A6B7) text_col=0xFFFFFF;
}
if (file.selected) text_col=0xFF0000;
if (font_size==9) || (!font.data)
if (font.size.text==9) || (!font.data)
{
if (Form.width>=480)
{
702,7 → 704,7
else
{
font.bg_color = color;
font.text(files.x + 23, files.line_h - font.height / 2 - 1 + y, file_name_off, 0, font_size);
font.text(files.x + 23, files.line_h - font.height / 2 - 1 + y, file_name_off);
}
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
1118,7 → 1120,7
CreateThread(#properties_dialog, properties_stak+8092);
break;
case 10: //F10
if (!settings_window)
if (!active_settings)
{
settings_stak = malloc(4096);
settings_window = CreateThread(#settings_dialog, settings_stak+4092);
/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;
char dev_name[15], disc_name[100], i, dev_icon, is_active, name_len;
int pos_y, pos_x=2;
for (i=disc_num; i<30; i++) DeleteButton(100+i);
185,11 → 185,12
else
{
pos_y = 43;
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);
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);
_PutImage(pos_x + 5, pos_y, 18,17, is_active*6+dev_icon*17*18*3+#devices);
WriteText(pos_x + 24, pos_y+5, 0x80, 0, #dev_name);
pos_x += strlen(#dev_name)*6 + 29;
WriteText(pos_x + 24, pos_y+1, 10110000b, 0, #dev_name+1);
pos_x += name_len + 31;
}
}
if (two_panels)
/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<22) { font_size++; BigFontsChange(); }
else if (id==31) && (font_size>9) { font_size--; BigFontsChange(); }
else if (id==30) && (font.size.text<22) { font.size.text++; BigFontsChange(); }
else if (id==31) && (font.size.text>9) { font.size.text--; BigFontsChange(); }
SaveIniSettings();
EventRedrawWindow(Form.left,Form.top);
DrawSettingsCheckBoxes();
69,6 → 69,7
 
void ExitSettings()
{
active_settings=0;
settings_window = 0;
cmd_free = 4;
SaveIniSettings();
83,7 → 84,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, FONT_SIZE_LABEL);
if (font.data) MoreLessBox(10, 157, 18, 30, 31, #system.color, font.size.text, FONT_SIZE_LABEL);
}
 
 
93,7 → 94,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 = 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, "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;
102,8 → 103,6
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");
}
 
 
112,7 → 111,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);
ini_set_int stdcall (eolite_ini_path, #config_section, "FontSize", font.size.text);
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/translations.h
1,5 → 1,5
#define TITLE "Eolite File Manager v3.08"
#define ABOUT_TITLE "Eolite 3.08"
#define TITLE "Eolite File Manager v3.1"
#define ABOUT_TITLE "Eolite 3.1"
 
#ifdef LANG_RUS
?define T_FILE "” ©«"