Eolite v2.9: highlight current device

git-svn-id: svn://kolibrios.org@5634 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-07-31 11:57:51 +00:00
parent e8ed0cae6f
commit d4d026590b
5 changed files with 13 additions and 11 deletions

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.85" #define TITLE "Eolite File Manager v2.9"
#define ABOUT_TITLE "Eolite v2.85" #define ABOUT_TITLE "Eolite v2.9"
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};

Binary file not shown.

View File

@ -18,7 +18,7 @@ dword blue_hl_pal[]= {0x0001699C,0x0000699C,0x00026A9C,0x0002699C,
0x001E7AA8,0x001C79A6,0x001575A4,0x00207CA8,0x001E7AA7,0x001D79A7, 0x001E7AA8,0x001C79A6,0x001575A4,0x00207CA8,0x001E7AA7,0x001D79A7,
0x001976A4,0x00217CA8,0x00227CA8,0x00207BA8,0x001976A5,0x001473A3,0}; 0x001976A4,0x00217CA8,0x00227CA8,0x00207BA8,0x001976A5,0x001473A3,0};
unsigned char devices[14*78]= FROM "imgs\dev.raw"; unsigned char devices[18*204]= FROM "imgs\dev.raw";
unsigned char factions[14*39] = FROM "imgs\actions.raw"; unsigned char factions[14*39] = FROM "imgs\actions.raw";

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -111,14 +111,15 @@ void GetSystemDiscs()
void DrawSystemDiscs() void DrawSystemDiscs()
{ {
char dev_name[15], disc_name[100]; char dev_name[15], disc_name[100], i, dev_icon, is_active;
int i, dev_icon, pos_y; int pos_y;
for (i=disc_num; i<30; i++) DeleteButton(100+i); for (i=disc_num; i<30; i++) DeleteButton(100+i);
for (i=0;i<disc_num;i++) for (i=0;i<disc_num;i++)
{ {
pos_y = i*16+74; pos_y = i*16+74;
DrawBar(17,pos_y,160,17,0xFFFFFF); DrawBar(17,pos_y,6,17,0xFFFFFF);
DrawBar(17+6+18,pos_y,160-6-18,17,0xFFFFFF);
DefineButton(17,pos_y,159,16,100+i+BT_HIDE,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;
@ -161,18 +162,19 @@ void DrawSystemDiscs()
dev_icon=3; //ïî-óìîë÷àíèþ óñòðîéñòâî âûãëÿäèò êàê æåñòÿê íî ýòî íåïðàâèëüíî dev_icon=3; //ïî-óìîë÷àíèþ óñòðîéñòâî âûãëÿäèò êàê æåñòÿê íî ýòî íåïðàâèëüíî
strcpy(#disc_name, T_UNC); strcpy(#disc_name, T_UNC);
} }
if (strstr(#path, #dev_name)) is_active=true; else is_active=false;
if (show_dev_name) if (show_dev_name)
{ {
strcat(#disc_name, #dev_name); strcat(#disc_name, #dev_name);
if (strstr(#path, #dev_name)) WriteText(45+1,pos_y+5,0x80,0x555555,#disc_name); if (is_active) WriteText(46+1,pos_y+5,0x80,0x555555,#disc_name);
WriteText(45,pos_y+5,0x80,0,#disc_name); WriteText(46,pos_y+5,0x80,0,#disc_name);
} }
else else
{ {
if (strstr(#path, #dev_name)) WriteText(45+1,pos_y+5,0x80,0x555555,#dev_name); if (is_active) WriteText(46+1,pos_y+5,0x80,0x555555,#dev_name);
WriteText(45,pos_y+5,0x80,0,#dev_name); WriteText(46,pos_y+5,0x80,0,#dev_name);
} }
_PutImage(23,pos_y+2, 14,13, dev_icon*14*13*3+#devices); _PutImage(23,pos_y, 18,17, is_active*6+dev_icon*17*18*3+#devices);
} }
} }