Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8951 → Rev 8952

/programs/cmm/eolite/include/const.h
4,7 → 4,7
// //
//===================================================//
#ifdef LANG_RUS
#define T_FILE "” ©«"
#define T_FILE "ˆ¬ï"
#define T_TYPE "’¨¯"
#define T_SIZE " §¬¥à"
#define T_NEW_FOLDER "®¢ ï ¯ ¯ª "
68,7 → 68,7
// //
//===================================================//
#else
#define T_FILE "File"
#define T_FILE "Name"
#define T_TYPE "Type"
#define T_SIZE "Size"
#define T_NEW_FOLDER "New folder"
180,5 → 180,6
};
 
#define DEV_H 17
#define DDW 120
#define DDW 110
#define KFM2_DEVH 20
#define SELECTY 10
/programs/cmm/eolite/include/copy_and_delete.h
107,13 → 107,13
char copy_rezult;
int j, i, slash_count=0;
int paste_elements_count = 0;
dword buf;
dword clipbuf;
dword path_offset;
buf = Clipboard__GetSlotData(Clipboard__GetSlotCount()-1);
if (DSDWORD[buf+4] != 3) return;
paste_elements_count = ESINT[buf+8];
path_offset = buf + 10;
clipbuf = Clipboard__GetSlotData(Clipboard__GetSlotCount()-1);
if (DSDWORD[clipbuf+4] != 3) return;
paste_elements_count = ESINT[clipbuf+8];
path_offset = clipbuf + 10;
 
if (cut_active) {
DisplayOperationForm(MOVE_FLAG);
138,13 → 138,13
}
 
_DIFFERENT_DRIVES:
path_offset = buf + 10;
path_offset = clipbuf + 10;
for (j = 0; j < paste_elements_count; j++) {
copy_bar.max += GetFilesCount(path_offset);
path_offset += strlen(path_offset) + 1;
}
path_offset = buf + 10;
path_offset = clipbuf + 10;
for (j = 0; j < paste_elements_count; j++) {
strcpy(#copy_from, path_offset);
if (!copy_from) DialogExit();
212,23 → 212,23
{
int j;
int elements_count = 0;
dword buf;
dword clipbuf;
dword path_offset;
 
DisplayOperationForm(DELETE_FLAG);
buf = Clipboard__GetSlotData(Clipboard__GetSlotCount()-1);
clipbuf = Clipboard__GetSlotData(Clipboard__GetSlotCount()-1);
Clipboard__DeleteLastSlot();
if (DSDWORD[buf+4] != 3) return;
elements_count = ESINT[buf+8];
if (DSDWORD[clipbuf+4] != 3) return;
elements_count = ESINT[clipbuf+8];
 
path_offset = buf + 10;
path_offset = clipbuf + 10;
for (j = 0; j < elements_count; j++) {
copy_bar.max += GetFilesCount(path_offset);
path_offset += strlen(path_offset) + 1;
}
path_offset = buf + 10;
path_offset = clipbuf + 10;
for (j = 0; j < elements_count; j++) {
RecursiveDelete(path_offset, true);
path_offset += strlen(path_offset) + 1;
/programs/cmm/eolite/include/gui.h
171,9 → 171,13
{
if (efm) {
DrawPathBarKfm();
return;
} else {
DrawPathEolite();
}
}
 
void DrawPathEolite()
{
if (show_breadcrumb.checked) {
DrawBreadCrumbs();
return;
188,7 → 192,7
DefineHiddenButton(PathShow.start_x-4+1,PathShow.start_y-7+1,PathShow.area_size_x+4-2,20-2,PATH_BTN);
DrawBar(PathShow.start_x-4, PathShow.start_y+14, PathShow.area_size_x+5+18, 1, sc.work_light);
 
DrawFlatButtonSmall(PathShow.start_x+PathShow.area_size_x,PathShow.start_y-7,18,20, 61, "\26");
DrawFlatButtonSmall(PathShow.start_x+PathShow.area_size_x,PathShow.start_y-7,18,20, 61, "\x19");
 
PathShow.font_color = col.list_gb_text;
PathShow_prepare stdcall(#PathShow);
197,36 → 201,31
 
void DrawPathBarKfm()
{
dword bgc;
dword back_color, text_color;
int draw_x, draw_w;
int i=0;
if (!Form.cwidth) return;
 
if (skin_is_dark()) {
bgc = col.odd_line;
PathShow.font_color = col.list_gb_text;
back_color = col.odd_line;
text_color = col.list_gb_text;
} else {
bgc = 0xFFFFCC;
PathShow.font_color = 0x222222;
back_color = 0xFFFFCC;
text_color = 0x222222;
}
PathShow.start_y = Form.cheight - status_bar_h+2;
 
PathShow.start_x = 4;
PathShow.area_size_x = Form.cwidth/2-8;
draw_x = 3 + DDW;
draw_w = Form.cwidth/2 - draw_x - 17;
do {
DrawBar(PathShow.start_x-2,PathShow.start_y-3,PathShow.area_size_x+5,14,bgc);
DrawRectangle(PathShow.start_x-3,PathShow.start_y-4,PathShow.area_size_x+6,15,sc.work_graph);
PathShow.text_pointer = location[i];
PathShow_prepare stdcall(#PathShow);
PathShow_draw stdcall(#PathShow);
PathShow.start_x = Form.cwidth/2 + 2;
PathShow.area_size_x = Form.cwidth - PathShow.start_x - 5;
DrawBar(draw_x, SELECTY-1, draw_w-KFM2_DEVH+1, 1, sc.work_graph);
DrawBar(draw_x, SELECTY, draw_w-KFM2_DEVH+1, KFM2_DEVH, back_color);
DrawBar(draw_x, SELECTY+KFM2_DEVH, draw_w-KFM2_DEVH+1, 1, sc.work_graph);
kfont.WriteIntoWindow(draw_x + 3, math.max(KFM2_DEVH-kfont.height/2+SELECTY,0),
back_color, text_color, kfont.size.pt, location[i]+strrchr(location[i], '/'));
DrawFlatButtonSmall(draw_x+draw_w-KFM2_DEVH+1, SELECTY-1, KFM2_DEVH-1, KFM2_DEVH+1, 576+i, "\x19");
draw_x = Form.cwidth/2 + DDW + 1;
draw_w = Form.cwidth - draw_x - 2;
i++;
} while (i<2);
 
DrawBar(0,PathShow.start_y-2,1,15,sc.work);
DrawBar(Form.cwidth-1,PathShow.start_y-2,1,15,sc.work);
DrawBar(1,PathShow.start_y+12,Form.cwidth-2,1,sc.work_light);
}
 
//===================================================//
262,8 → 261,6
DrawBreadcrumbButton(btn.x, btn.y, btn.w, btn.h, i+BREADCRUMB_ID, text_line);
btn.x += btn.w;
}
//DrawFavButton(btn.x);
//btn.x+=20;
btn.x++;
DrawBar(btn.x,btn.y-1,Form.cwidth-btn.x-25,btn.h+3,sc.work);
}
/programs/cmm/eolite/include/left_panel.h
64,8 → 64,8
int draw_y, draw_x;
if (efm) {
DrawSelect(Form.cwidth/2-DDW, KFM_DEV_DROPDOWN_1, location[0]);
DrawSelect(Form.cwidth-DDW-2, KFM_DEV_DROPDOWN_2, location[sizeof(dword)]);
DrawSelect(2, KFM_DEV_DROPDOWN_1, location[0]);
DrawSelect(Form.cwidth/2, KFM_DEV_DROPDOWN_2, location[sizeof(dword)]);
files.y = 40 + 17;
} else {
Tip(56, T_DEVICES, 55, "=");
97,14 → 97,13
draw_y += DEV_H;
}
DrawBar(draw_x+6, draw_y, 18, 1, 0xFFFfff);
ActionsDraw(SystemDiscs.list.count*DEV_H+108);
DrawLeftPanelBg(SystemDiscs.list.count*DEV_H);
ActionsDraw(list.count*DEV_H+108);
DrawLeftPanelBg(list.count*DEV_H);
}
}
 
void _SystemDiscs::DrawSelect(int draw_x, btid, dword _path)
{
#define SELECTY 10
char dev_name[15], disc_name[100], i, dev_icon;
 
if (ESBYTE[_path+1]=='\0') {