XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

Eolite 2.85: highlight current device

Browse Source 
git-svn-id: svn://kolibrios.org@5633 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-07-30 23:11:23 +00:00
parent 774b015389
commit e8ed0cae6f
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
programs/cmm/eolite/Eolite.c
View File

@ -103,8 +103,8 @@
enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
enum { CREATE_FILE=1, CREATE_FOLDER, RENAME_ITEM }; //NewElement enum { CREATE_FILE=1, CREATE_FOLDER, RENAME_ITEM }; //NewElement
#define TITLE "Eolite File Manager v2.84" #define TITLE "Eolite File Manager v2.85"
#define ABOUT_TITLE "Eolite v2.84" #define ABOUT_TITLE "Eolite v2.85"
dword col_padding, col_selec, col_lpanel; dword col_padding, col_selec, col_lpanel;
int toolbar_buttons_x[7]={9,46,85,134,167,203}; int toolbar_buttons_x[7]={9,46,85,134,167,203};
@ -812,6 +812,7 @@ void Open_Dir(dword dir_path, redraw){
WriteText(sorting_arrow_x,45,0x80,sc.work_graph,"\x19"); WriteText(sorting_arrow_x,45,0x80,sc.work_graph,"\x19");
if (redraw!=ONLY_SHOW) Sorting(); if (redraw!=ONLY_SHOW) Sorting();
if (redraw!=ONLY_OPEN)&&(!_not_draw) List_ReDraw(); if (redraw!=ONLY_OPEN)&&(!_not_draw) List_ReDraw();
DrawSystemDiscs();
} }
if (files.count==-1) && (redraw!=ONLY_OPEN) {files.visible=files.count=0; if(!_not_draw)List_ReDraw();} if (files.count==-1) && (redraw!=ONLY_OPEN) {files.visible=files.count=0; if(!_not_draw)List_ReDraw();}
} }

24
programs/cmm/eolite/include/left_panel.h
View File

@ -112,14 +112,14 @@ void GetSystemDiscs()
void DrawSystemDiscs() void DrawSystemDiscs()
{ {
char dev_name[15], disc_name[100]; char dev_name[15], disc_name[100];
int i, dev_icon; int i, dev_icon, pos_y;
Tip(56, T_DEVICES, 55, "="); for (i=disc_num; i<30; i++) DeleteButton(100+i);
for (i=0; i<20; i++) DeleteButton(100+i);
for (i=0;i<disc_num;i++) for (i=0;i<disc_num;i++)
{ {
DrawBar(17,i*16+74,160,17,0xFFFFFF); pos_y = i*16+74;
DefineButton(17,i*16+74,159,16,100+i+BT_HIDE,0xFFFFFF); DrawBar(17,pos_y,160,17,0xFFFFFF);
DefineButton(17,pos_y,159,16,100+i+BT_HIDE,0xFFFFFF);
strcpy(#dev_name, #disk_list[i].Item); strcpy(#dev_name, #disk_list[i].Item);
dev_name[strlen(#dev_name)-1]=NULL; dev_name[strlen(#dev_name)-1]=NULL;
switch(dev_name[1]) switch(dev_name[1])
@ -161,9 +161,18 @@ void DrawSystemDiscs()
dev_icon=3; //ïî-óìîë÷àíèþ óñòðîéñòâî âûãëÿäèò êàê æåñòÿê íî ýòî íåïðàâèëüíî dev_icon=3; //ïî-óìîë÷àíèþ óñòðîéñòâî âûãëÿäèò êàê æåñòÿê íî ýòî íåïðàâèëüíî
strcpy(#disc_name, T_UNC); strcpy(#disc_name, T_UNC);
} }
if (show_dev_name)
{
strcat(#disc_name, #dev_name); strcat(#disc_name, #dev_name);
if (show_dev_name) WriteText(45,i*16+79,0x80,0,#disc_name); else WriteText(45,i*16+79,0x80,0,#dev_name); if (strstr(#path, #dev_name)) WriteText(45+1,pos_y+5,0x80,0x555555,#disc_name);
_PutImage(23,i*16+76, 14,13, dev_icon*14*13*3+#devices); WriteText(45,pos_y+5,0x80,0,#disc_name);
}
else
{
if (strstr(#path, #dev_name)) WriteText(45+1,pos_y+5,0x80,0x555555,#dev_name);
WriteText(45,pos_y+5,0x80,0,#dev_name);
}
_PutImage(23,pos_y+2, 14,13, dev_icon*14*13*3+#devices);
} }
} }
@ -206,6 +215,7 @@ void DrawLeftPanelBg()
void DrawLeftPanel() void DrawLeftPanel()
{ {
Tip(56, T_DEVICES, 55, "=");
DrawSystemDiscs(); DrawSystemDiscs();
ActionsDraw(); ActionsDraw();
DrawLeftPanelBg(); DrawLeftPanelBg();