Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7461 → Rev 7462

/programs/cmm/eolite/include/about.h
33,16 → 33,17
break;
case evReDraw:
DefineAndDrawWindow(Form.left+Form.width/2,Form.top+Form.height/2-114,310,300+skin_height,0x34,system.color.work,NULL,0);
DefineAndDrawWindow(Form.left+Form.width/2,Form.top+Form.height/2-114,300,300+skin_height,0x34,system.color.work,T_ABOUT,0);
GetProcessInfo(#about_form, SelfInfo);
if (about_form.status_window>2) break;
logo_pal[0] = system.color.work;
ESDWORD[#logo_pal+16] = system.color.work_dark;
PutPaletteImage(#logo,86,86,about_form.cwidth-86/2,10,8,#logo_pal);
about_x = -strlen(ABOUT_TITLE)*18+about_form.cwidth/2;
WriteTextB(about_x+2,107,0x82,0xD49CD2,ABOUT_TITLE);
WriteTextB(about_x,105,0x82,0x9D129D,ABOUT_TITLE);
DrawRectangle3D(0,154,about_form.cwidth,1,system.color.work_dark,system.color.work_light);
WriteTextLines(7,163,0x90,system.color.work_text,"KolibriOS File Manager\nAuthors: Leency, Veliant\nPunk_Joker, Pavelyakov\n(c) 2008 - 2018",20);
WriteTextLines(7,163,0x90,system.color.work_text,"KolibriOS File Manager\nAuthors: Leency, Veliant\nPunk_Joker, Pavelyakov\n2008 - 2018",20);
#ifdef LANG_RUS
DrawStandartCaptButton(60,about_form.cheight-38,11,"ˆáâ®à¨ï ࠧࠡ®âª¨");
#endif
/programs/cmm/eolite/include/breadcrumbs.h
6,8 → 6,10
DrawBar(PathShow.start_x-3, PathShow.start_y-6, PathShow.area_size_x+3, 19, 0xFFFfff);
DrawRectangle(PathShow.start_x-4,PathShow.start_y-7,PathShow.area_size_x+4,20,col_graph);
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+4, 1, MixColors(col_work,0xFFFfff,120));
DrawFavButton(PathShow.start_x+PathShow.area_size_x);
DrawBar(PathShow.start_x-4, PathShow.start_y+14, PathShow.area_size_x+5+18, 1, system.color.work_light);
 
DrawFlatButtonSmall(PathShow.start_x+PathShow.area_size_x,PathShow.start_y-7,18,20, 61, "\26");
 
PathShow_prepare stdcall(#PathShow);
PathShow_draw stdcall(#PathShow);
}
/programs/cmm/eolite/include/gui.h
1,5 → 1,5
 
dword col_palette[14] = {0xD2D3D3,0xD4D4D4,0xD6D5D6,0xD8D7D8,0xDAD8D9,0xDCDADB,0xDFDCDD,0xE1DDDE,0xE2DEE0,0xE4DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1};
dword col_work_gradient[14];
 
void Scroll() {
dword i;
23,9 → 23,9
}
//slider
DrawRectangle(sc_x,sc_slider_y,16,sc_slider_h,col_graph);
DrawRectangle3D(sc_x+1,sc_slider_y+1,14,sc_slider_h-2,0xFEFEFE,col_padding);
if (!scroll_used) for (i=0; i<13; i++) DrawBar(sc_x + 2 + i, sc_slider_y+2, 1, sc_slider_h-3, col_palette[13-i]);
if (scroll_used) for (i=0; i<13; i++) DrawBar(sc_x + 2 + i, sc_slider_y+2, 1, sc_slider_h-3, col_palette[i]);
DrawRectangle3D(sc_x+1,sc_slider_y+1,14,sc_slider_h-2, system.color.work_light , system.color.work_dark);
if (!scroll_used) for (i=0; i<13; i++) DrawBar(sc_x + 2 + i, sc_slider_y+2, 1, sc_slider_h-3, col_work_gradient[13-i]);
if (scroll_used) for (i=0; i<13; i++) DrawBar(sc_x + 2 + i, sc_slider_y+2, 1, sc_slider_h-3, col_work_gradient[i]);
//area before slider
if (sc_slider_y > sc_y + 1)
{
45,11 → 45,11
void DrawFlatButtonSmall(dword x,y,width,height,id,text)
{
DrawRectangle(x,y,width,height,col_graph);
DrawRectangle3D(x+1,y+1,width-2,height-2,0xFEFEFE,col_padding);
PutPixel(x+width-1, y+1, col_padding);
DrawRectangle3D(x+1,y+1,width-2,height-2, system.color.work_light , system.color.work_dark);
PutPixel(x+width-1, y+1, system.color.work_dark);
DrawFilledBar(x+2, y+2, width-3, height-3);
if (id) DefineButton(x+1,y+1,width-2,height-2,id+BT_HIDE,0xEFEBEF);
WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,0x333333,text);
if (id) DefineHiddenButton(x+1,y+1,width-2,height-2,id);
WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,system.color.work_text,text);
}
 
void DrawFilledBar(dword x, y, w, h)
56,8 → 56,8
{
int i, fill_h;
if (h <= 14) fill_h = h; else fill_h = 14;
for (i=0; i<fill_h; i++) DrawBar(x, y+i, w, 1, col_palette[14-i]);
DrawBar(x, y+i, w, h-fill_h, col_palette[14-i]);
for (i=0; i<fill_h; i++) DrawBar(x, y+i, w, 1, col_work_gradient[14-i]);
DrawBar(x, y+i, w, h-fill_h, col_work_gradient[14-i]);
}
 
int popin_w=260;
68,4 → 68,14
DrawPopup(popin_x, 160, popin_w, 95, 1, system.color.work, col_graph);
but_x = DrawStandartCaptButton(popin_x+23, 215, POPUP_BTN1, b1_text);
DrawStandartCaptButton(popin_x+23 + but_x, 215, POPUP_BTN2, b2_text);
}
 
void DrawDot(dword x,y) {
dword col_pxl = MixColors(col_graph, col_work, 60);
DrawBar(x+1,y,2,4,col_graph);
DrawBar(x,y+1,4,2,col_graph);
PutPixel(x,y,col_pxl);
PutPixel(x+3,y,col_pxl);
PutPixel(x,y+3,col_pxl);
PutPixel(x+3,y+3,col_pxl);
}
/programs/cmm/eolite/include/left_panel.h
197,14 → 197,24
DrawLeftPanelBg();
}
 
dword col_palette_inner[14] = {0xD2D3D3,0xD4D4D4,0xD6D5D6,0xD8D7D8,0xDAD8D9,0xDCDADB,
0xDFDCDD,0xE1DDDE,0xE2DEE0,0xE4DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1};
void DrawFilledBarInner(dword x, y, w, h)
{
int i, fill_h;
if (h <= 14) fill_h = h; else fill_h = 14;
for (i=0; i<fill_h; i++) DrawBar(x, y+i, w, 1, col_palette_inner[14-i]);
DrawBar(x, y+i, w, h-fill_h, col_palette_inner[14-i]);
}
 
void Tip(int y, dword caption, id, arrow)
{
DrawBar(17,y,160,1,0xEFEDEE);
DrawFilledBar(17, y+1, 160, 16);
DrawFilledBarInner(17, y+1, 160, 16);
WriteText(25,y+5,0x80,0x000000,caption);
if (id) DefineButton(159,y+1,16,16,id+BT_HIDE+BT_NOFRAME,0); //arrow button
WriteText(165,y+5,0x80,0x000000,arrow); //arrow
DrawBar(17,y+17,160,1,col_graph);
DrawBar(17,y+17,160,1,0x7E87A3);
}
 
void ActionsDraw()
/programs/cmm/eolite/include/menu.h
100,6 → 100,11
{
int start_y=0;
int index;
 
dword m_col_bg;
dword m_col_text;
dword m_col_sh_text;
 
for (index=0; file_captions[index*3]!=0; index++)
{
if ((itdir) && (file_captions[index*3+2]>=200)) continue;
108,14 → 113,19
if (start_y/rbmenu.item_h==rbmenu.cur_y)
{
cur_action_buf = file_captions[index*3+2];
DrawBar(2,start_y+2,rbmenu.w-1,rbmenu.item_h,0xFFFfff);
m_col_bg = 0xFFFfff;
m_col_sh_text = 0xFAFAFA;
m_col_text = 0;
}
else
{
DrawBar(2,start_y+2,rbmenu.w-1,rbmenu.item_h,col_work);
WriteText(8,start_y+rbmenu.text_y+4,rbmenu.font_type,0xf2f2f2,file_captions[index*3]);
m_col_bg = col_work;
m_col_text = system.color.work_text;
m_col_sh_text = system.color.work_light;
}
WriteText(7, start_y + rbmenu.text_y + 3, rbmenu.font_type, 0, file_captions[index*3]);
DrawBar(2, start_y+2, rbmenu.w-1, rbmenu.item_h, m_col_bg);
WriteText(8, start_y + rbmenu.text_y + 4, rbmenu.font_type, m_col_sh_text, file_captions[index*3]);
WriteText(7, start_y + rbmenu.text_y + 3, rbmenu.font_type, m_col_text, file_captions[index*3]);
WriteText(-strlen(file_captions[index*3+1])-1*rbmenu.font_w + rbmenu.w, start_y + rbmenu.text_y + 3, rbmenu.font_type, 0x888888, file_captions[index*3+1]);
start_y+=rbmenu.item_h;
}
/programs/cmm/eolite/include/settings.h
82,7 → 82,7
}
else if (id==7)
{
ini.SetString("DefaultPath", #path_start,strlen(#path_start));
SetDefaultPath(#path_start);
break;
}
show_dev_name.click(id);
216,17 → 216,20
 
void SetAppColors()
{
int i;
system.color.get();
//system.color.work = 0xE4DFE1;
//system.color.work_text = 0;
//system.color.work_graph = 0x7E87A3; //A0A0B8;
//system.color.work_button = 0x7E87A3;
//system.color.work_button_text = 0x000000
 
for (i=0; i<=14; i++) col_work_gradient[14-i]= MixColors(0, system.color.work, i);
col_work = system.color.work;
col_graph = system.color.work_graph;
system.color.work_dark = MixColors(0, system.color.work, 35);
 
/*
col_work = 0xE4DFE1;
col_padding = 0xC8C9C9;
col_graph = 0x7E87A3;
*/
col_lpanel = 0x00699C;
col_selec = 0x94AECE;
col_lpanel = 0x00699C;
col_graph = 0x7E87A3;
}
 
 
261,3 → 264,9
}
BigFontsChange();
}
 
void SetDefaultPath(dword p)
{
ini.SetString("DefaultPath", p, strlen(p));
notify("'Default path has been set' -O");
}
/programs/cmm/eolite/include/translations.h
1,5 → 1,5
#define TITLE "Eolite File Manager v3.96d"
#define ABOUT_TITLE "EOLITE 3.96d"
#define TITLE "Eolite File Manager 4.0"
#define ABOUT_TITLE "EOLITE 4.0"
 
#ifdef LANG_RUS
?define T_FILE "” ©«"
31,6 → 31,7
?define DEL_MORE_FILES_2 " èâ.)?"
?define STATUS_STR "«¥¬¥­â®¢: %d  ¯®ª: %d ” ©«®¢: %d ‚뤥«¥­­®: %d"
?define COPY_PATH_STR "'ãâì ¯ ¯ª¨ ᪮¯¨à®¢ ­ ¢ ¡ãä¥à ®¡¬¥­ ' -I"
?define T_ABOUT "Ž ¯à®£à ¬¬¥"
#else
?define T_FILE "File"
?define T_TYPE "Type"
62,4 → 63,5
?define DEL_MORE_FILES_2 " pcs.)?"
?define STATUS_STR "Elements: %d Dirs: %d Files: %d Selected: %d"
?define COPY_PATH_STR "'Directory path copied to clipboard' -I"
?define T_ABOUT "About"
#endif