sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Eolite 1.98.6: better icon wrap by selection, a little bit decrease repaint, much unnecessary now code were deleted

Browse Source 
git-svn-id: svn://kolibrios.org@4038 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2013-10-15 23:30:35 +00:00
parent 96a26843dc
commit b7c730f2b9
5 changed files with 20 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,8 +76,8 @@
enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
#define TITLE "Eolite File Manager v1.98.5" #define TITLE "Eolite File Manager v1.98.6"
#define ABOUT_TITLE "Eolite v1.98.5" #define ABOUT_TITLE "Eolite v1.98.6"
dword col_work = 0xE4DFE1; dword col_work = 0xE4DFE1;
dword col_border = 0x9098B0; //A0A0B8; //0x819FC5; dword col_border = 0x9098B0; //A0A0B8; //0x819FC5;
dword col_padding = 0xC8C9C9; dword col_padding = 0xC8C9C9;

BIN
programs/cmm/eolite/imgs/icons.raw
View File

Binary file not shown.

2
programs/cmm/eolite/imgs/icons.txt
View File

@ -2,6 +2,6 @@
//Èêîíêè ïàïîê è ôàéëîâ// //Èêîíêè ïàïîê è ôàéëîâ//
///////////////////////// /////////////////////////
dword ficons_pal[] = {0xFCFEFC,0x5C627C,0xCCCCD0,0x848AA4,0xFCF2F5,0xF4F4FA,0x9498AF,0xE4DEEC,0x9CA4B6,0xE4E2E4,0xF4EDFB,0xACABAC,0x74799A,0xECEDEE,0xC4C2C9,0xE4E5EC,0xECF2F3,0xDBDCE4,0xD4CEDC,0x00D4D3DA,0xC6CBE2,0x5C6684,0x5C568C,0xFCB694,0xC4C6D4,0x7C829C,0xBCBECC,0xFC9D73,0xBBBCC3,0xC4BEC7,0xD7E2EF,0x515870,0x5C7AA4,0x647EA4,0xA4A3AC,0x8CA2BC,0xE4EBF0,0xCCD5D9,0x7896B8,0xBCC2D4,0xDCF0FC,0xD4EAFC,0x6C86A7,0xC4CBD1,0x9CADC4,0x748EAC,0xB5E2FC,0xC4DEFC,0x00B9CDE4,0x7CAADA,0xABAEBC,0xCCDBE4,0x578FC4,0x5484B8,0x6482A4,0xABB2C4,0x5C89BC,0xA47868,0x644A44,0x7C603C,0x6C4F26,0xFCFD9F,0xBA9D40,0xFCE274,0xFCDE60,0xC4A650,0x644E44,0xF4D27C,0xA29880,0xFCDA84,0xFCC354,0xECB847,0xFCC24C,0x9C8E74,0xE4AA54,0xDCA24C,0x9B6A55,0x543A34,0x6EBEE0,0x64BEDC,0xB4DEF4,0x7CBAE4,0xECFEFC,0xA4CAF4,0x99C5F1,0xA4C6EA,0x040204,0x94BAE4,0x64718B,0xB4B2B4,0xF43E4C,0x44CE3C,0x4CDA44,0x047CBC,0xFCBB3C,0x1C62AC,0x00FBD65C,0xC4B6A4,0xD59A52,0x7B7C7E,0x7B828A,0xC48A34,0x54463C,0xAB5A04,0xFCDE98,0xAC6A14,0xF4EED4,0xFCE8A1,0xFCCA34,0xECB624,0x34120C,0xD2A226,0xAEC5DA,0x7C9DCC,0x5C7A9C,0x84AAD4,0x2C72BD,0x518AC2,0x447EBC,0x3C7AB4,0x247AB4,0x2669B1,0x8BB5E0,0xBCD2EC,0x6C9CC9,0x008496BC,0xEC8D99,0xD49694,0x8C8C8C,0x949392,0xCC8387,0xFCFBD3,0xE4FED4,0xBC7A24,0xA47A04,0xE7C267,0x8C5A14,0xDCBA54,0xBC6A1C,0xCC923F,0xB0722C,0xF0DAB4,0x8C522C,0x9C5204,0x945204,0xC49204,0xCC9A14,0xFCF6BC,0xFCEAC4,0xF8E4B4,0xF4D67C,0xECD274,0x7CBE7C,0x1C8E1C,0x00A98D04,0x1C8204,0x90D280,0x2C9018,0xBCFAAC,0x3CC234,0x488404,0x54AE4C,0xC8F7A4,0x84F26C,0x5CE64C,0x24AE1C,0xB4D6A4,0x49A939,0xA8F694,0x44E63C,0x149E0C,0x848204,0x97B951,0x5C9D2F,0x6FCB4C,0x8CE264,0x4C9A24,0x509224,0x749224,0xECCA7C,0xDCBE74,0x349E2C,0x5CAE3C,0x84B64C,0xD0EC90,0x9CDA64,0x70B63C,0xBCE274,0xC4BA4C,0xDCB23C,0xC4E6F4,0x94CDC6,0x3CA674,0x51A389,0x74BAAC,0x2C8E64,0x3C8E94,0x1C6E5C,0x84AEA4,0x2489B9,0x1C6A84,0x145A6C,0x0064827C,0xACBEA4,0x0C4E5C,0x4CA6CC,0x84BAB4,0xB4CEA4,0xA4CEAC,0x0796D9,0x1C96CC,0x2496CC,0x54CAFC,0x30A6D8,0xBC2E34,0x946684,0x447684,0x34867C,0x449664,0xA4CA94,0xF46264,0x8C6E34,0xACEE64,0x9C2624,0xE42A3C,0xDC1A2C,0x846224,0x84C73F,0x8C4644,0x3C7A24,0x547A44,0x00E15671,0x6492CC,0x5C8614,0xC44244,0xDC4A6C,0x84BA1C,0x04A6F4,0xE4627C,0xEC7E94,0xB45A04,0x848387,0x9C9D9E,0xFCD94A,0xC9FEA4,0xFCCE1C,0xFCC514,0x464F6A,0x343644,0xFC0204,0xFCCBCC}; dword ficons_pal[] = {0xFCCEFC,0x5C627C,0xCCCCD0,0xFCFDFC,0x848AA4,0x9498AF,0xE4E2E4,0xF4F4FA,0x9CA4B6,0xABAEBC,0x7C829C,0xECEDEE,0xC4C2C9,0xE4E5EC,0xDBDCE4,0xD4D3DA,0xC4C6D4,0xFCB694,0xD7E2EF,0xBCBECC,0xFC9D73,0x5C7A9C,0x5C7AA4,0x647EA4,0x8CA2BC,0xE4EBF0,0xCCD5D9,0x7896B8,0xBCC2D4,0xD4EAFC,0xC4CBD1,0xCCDBE4,0x6C86A7,0xECF2F3,0xDCF0FC,0x748EAC,0xB5E2FC,0xC4DEFC,0xB9CDE4,0x7CAADA,0xABB2C4,0x6492CC,0x5484B8,0x5C89BC,0x9CADC4,0x6482A4,0xA47868,0x644A44,0x7C603C,0x6C4F26,0x644E44,0xFCFD9F,0xBA9D40,0xFCE274,0xFCDE60,0xC4A650,0xECD274,0xA29880,0xFCC354,0xECB847,0xFCF2F5,0xE4AA54,0xDCA24C,0x9B6A55,0x543A34,0x74799A,0x6EBEE0,0x7CBAE4,0xA4CAF4,0x040204,0xF43E4C,0x44CE3C,0x047CBC,0xFCC24C,0x9C8E74,0xFCBB3C,0xC4B6A4,0x7B828A,0xC48A34,0x54463C,0xAB5A04,0xFCE8A1,0xAC6A14,0xF4EED4,0xFBD65C,0xFCCA34,0xECB624,0x34120C,0xD2A226,0xAEC5DA,0x7C9DCC,0xB4DEF4,0x578FC4,0x94BAE4,0xECFEFC,0x84AAD4,0x2C72BD,0xA4C6EA,0x518AC2,0x447EBC,0x2669B1,0x8BB5E0,0xBCD2EC,0x1C62AC,0x6C9CC9,0x3C7AB4,0x64718B,0xC6CBE2,0x8496BC,0xEC8D99,0xD49694,0x949392,0xCC8387,0xBC7A24,0xBC6A1C,0xE7C267,0x8C5A14,0xD59A52,0xB0722C,0xF0DAB4,0xB45A04,0x8C522C,0xCC923F,0x9C5204,0x945204,0xCC9A14,0xFCFBD3,0xFCF6BC,0xFCDE98,0xFCEAC4,0xFCDA84,0xF4D67C,0xF4D27C,0xDCBA54,0x7CBE7C,0x1C8E1C,0xA98D04,0x1C8204,0x90D280,0x147E04,0x2C9018,0xBCFAAC,0x3CC234,0xC49204,0x488404,0x54AE4C,0xC8F7A4,0x84F26C,0x5CE64C,0x24AE1C,0xF8E4B4,0xB4D6A4,0x49A939,0xE4FED4,0xA8F694,0x4CDA44,0x44E63C,0x149E0C,0x848204,0x97B951,0x5C9D2F,0x6FCB4C,0x8CE264,0x4C9A24,0x749224,0xECCA7C,0xDCBE74,0x349E2C,0x5CAE3C,0x84B64C,0xD0EC90,0x84C73F,0x9CDA64,0x70B63C,0xBCE274,0xC4BA4C,0xDCB23C,0xC4E6F4,0x94CDC6,0x3CA674,0x51A389,0x74BAAC,0x2C8E64,0x64BEDC,0x3C8E94,0x1C6E5C,0x84AEA4,0x2489B9,0x1C6A84,0x145A6C,0x64827C,0xACBEA4,0x0C4E5C,0x4CA6CC,0x84BAB4,0xB4CEA4,0xA4CEAC,0x0796D9,0x1C96CC,0x2496CC,0x54CAFC,0x30A6D8,0xBC2E34,0x247AB4,0x946684,0x5C568C,0x447684,0x34867C,0x449664,0xA4CA94,0xF46264,0x8C6E34,0xACEE64,0x6CAE34,0xA02624,0xE42A3C,0xDC1A2C,0x846224,0xB4B2B4,0x8C4644,0x7C6634,0x509224,0xBBBCC3,0xACABAC,0x3C7A24,0x547A44,0xE15671,0x5C8614,0xC44244,0xDC4A6C,0x84BA1C,0x04A6F4,0xE4627C,0xEC7E94,0xA47A04,0x8C8C8C,0x848387,0x7B7C7E,0x9C9D9E,0xA4A3AC,0xD4CEDC,0xFCD94A,0xC9FEA4,0x5C6684,0xFCCE1C,0xFCC514,0x464F6A,0xF4EDFB,0xC4BEC7,0x515870,0x99C5F1,0xE4DEEC,0xFCA274,0x343644,0xFC0204,0xFCCBCC};
unsigned char ficons[sizeof(file "imgs\icons.raw")] = FROM "imgs\icons.raw"; unsigned char ficons[sizeof(file "imgs\icons.raw")] = FROM "imgs\icons.raw";

BIN
programs/cmm/eolite/imgs/png/icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

109
programs/cmm/eolite/include/icons_f.h
View File

@ -30,26 +30,25 @@ char *ext[]={
#include "imgs\icons.txt" #include "imgs\icons.txt"
void Put_icon(dword extension, yy, fairing_color) void Put_icon(dword extension, yy, fairing_color)
{ {
int icon_n=0, i; int icon_n=0, i;
for (i=0; ext[i]!=0; i+=2;) if (!strcmp(extension, ext[i])) { icon_n = ext[i+1]; break; } for (i=0; ext[i]!=0; i+=2;) if (!strcmp(extension, ext[i])) { icon_n = ext[i+1]; break; }
ficons_pal[0] = fairing_color;
PutPaletteImage(icon_n*16*15+#ficons,16,15,files.x+3,yy,8,#ficons_pal); PutPaletteImage(icon_n*16*15+#ficons,16,15,files.x+3,yy,8,#ficons_pal);
if (fairing_color!=0xFFFfff) IconFairing(icon_n, files.x+3, yy, fairing_color);
if (icon_n<>17) && (strlen(extension)<9) WriteText(-strlen(extension)*3+Form.cwidth-120,yy+4,0x80,0,extension); if (icon_n<>17) && (strlen(extension)<9) WriteText(-strlen(extension)*3+Form.cwidth-120,yy+4,0x80,0,extension);
if (fairing_color<>0xFFFfff) IconFairing(icon_n, yy, fairing_color); //çàêðàøèâàåì èêîíêó
} }
void IconFairing(dword filenum, y, color) void IconFairing(dword filenum, x,y, color)
{ {
switch(filenum) switch(filenum)
{ {
case 0...1: //ôàéëèê case 0...1: //file
DrawBar(195,y,2,15,color); case 3: //íàñòðîéêè
RIGHT_PAINT: RIGHT_PAINT:
DrawBar(209,y,2,15,color);
DrawBar(205,y,4,1,color); DrawBar(205,y,4,1,color);
DrawBar(206,y+1,3,1,color); DrawBar(206,y+1,3,1,color);
DrawBar(207,y+2,2,1,color); DrawBar(207,y+2,2,1,color);
@ -61,27 +60,7 @@ void IconFairing(dword filenum, y, color)
DrawBar(195,y+10,1,5,color); DrawBar(195,y+10,1,5,color);
DrawBar(196,y+11,1,4,color); DrawBar(196,y+11,1,4,color);
GOTO RIGHT_PAINT; GOTO RIGHT_PAINT;
case 3: //íàñòðîéêè
DrawBar(195,y,2,7,color);
DrawBar(195,y+7,1,2,color);
DrawBar(195,y+12,1,3,color);
PutPixel(196,y+14,color);
GOTO RIGHT_PAINT;
case 9: //inc case 9: //inc
DrawBar(195,y,1,12,color);
DrawBar(196,y,1,11,color);
DrawBar(197,y,1,10,color);
DrawBar(198,y,1,5,color);
DrawBar(199,y,1,4,color);
DrawBar(200,y,1,3,color);
DrawBar(201,y,1,2,color);
DrawBar(202,y,1,3,color);
DrawBar(203,y,1,2,color);
PutPixel(204,y,color);
PutPixel(205,y+4,color);
PutPixel(206,y+3,color);
PutPixel(207,y,color);
PutPixel(207,y+2,color);
DrawBar(208,y,1,3,color); DrawBar(208,y,1,3,color);
DrawBar(209,y,2,4,color); DrawBar(209,y,2,4,color);
DrawBar(210,y,1,15,color); DrawBar(210,y,1,15,color);
@ -96,7 +75,6 @@ void IconFairing(dword filenum, y, color)
PutPixel(209,y+5,color); PutPixel(209,y+5,color);
return; return;
case 10: //font case 10: //font
DrawRectangle3D(195,y,15,14,color,color);
DrawBar(196,y+1,1,13,color); DrawBar(196,y+1,1,13,color);
DrawBar(197,y+1,1,11,color); DrawBar(197,y+1,1,11,color);
DrawBar(198,y+1,1,10,color); DrawBar(198,y+1,1,10,color);
@ -111,37 +89,24 @@ void IconFairing(dword filenum, y, color)
DrawBar(203,y+10,2,1,color); DrawBar(203,y+10,2,1,color);
DrawBar(202,y+11,2,3,color); DrawBar(202,y+11,2,3,color);
return; return;
case 11: //asm
DrawBar(195,y,1,15,color);
return;
case 12: //audio case 12: //audio
DrawBar(195,y,16,1,color); PutPixel(x+2,y+9,color);
DrawBar(195,y,1,15,color); PutPixel(x+1,y+10,color);
DrawBar(196,y+1,4,8,color); PutPixel(x+10,y+8,color);
DrawBar(196,y+9,1,2,color); PutPixel(x+9,y+9,color);
PutPixel(197,y+9,color);
PutPixel(196,y+14,color); PutPixel(x+6,y+13,color);
DrawBar(210,y+1,1,14,color); PutPixel(x+5,y+14,color);
DrawBar(202,y+4,6,4,color); PutPixel(x+14,y+12,color);
DrawBar(202,y+8,4,1,color); PutPixel(x+13,y+13,color);
DrawBar(202,y+9,3,1,color);
DrawBar(202,y+10,2,3,color);
DrawBar(201,y+13,4,1,color);
DrawBar(200,y+14,14,1,color);
DrawBar(209,y+12,1,2,color);
PutPixel(208,y+13,color);
return; return;
case 13: //skin case 13: //skin
PutPixel(210,y,color); PutPixel(210,y,color);
return; return;
case 14...15: //video, book case 16...17: //folder
DrawBar(195,y,1,15,color);
DrawBar(210,y,1,15,color);
return;
case 16...17: //ïàïêà
DrawBar(195,y,1,15,color); DrawBar(195,y,1,15,color);
DrawBar(203,y,8,2,color); DrawBar(203,y,8,2,color);
IF (filenum==17) PutPixel(206,y+1,0x1A7B17); //çåë¸íàÿ òî÷êà ñòðåëêè IF (filenum==17) PutPixel(206,y+1,0x1A7B17); //green arrow part
DrawBar(196,y+13,15,2,color); DrawBar(196,y+13,15,2,color);
PutPixel(196,y,color); //.òî÷êè PutPixel(196,y,color); //.òî÷êè
PutPixel(202,y,color); PutPixel(202,y,color);
@ -150,49 +115,9 @@ void IconFairing(dword filenum, y, color)
PutPixel(210,y+12,color); PutPixel(210,y+12,color);
return; return;
case 18: //êàðòðèäæ case 18: //êàðòðèäæ
DrawBar(195,y,16,2,color);
DrawBar(195,y+11,1,2,color); DrawBar(195,y+11,1,2,color);
DrawBar(210,y+11,1,2,color); DrawBar(210,y+11,1,2,color);
DrawBar(195,y+13,16,2,color); DrawBar(195,y+13,16,1,color);
return;
case 19: //èçîáðàæåíèå
case 20: //èçîáðàæåíèå
DrawBar(195,y+14,16,1,color);
return;
case 21: //äèñêåòà
PutPixel(195,y,color);
PutPixel(210,y,color);
return;
case 22: //áèáëèîòåêà
DrawBar(195,y,16,1,color); //ñâåðõó ñëåâà
DrawBar(195,y+1,3,1,color);
DrawBar(195,y+2,2,1,color);
PutPixel(195,y+3,color);
PutPixel(210,y+11,color); //ñïðàâà ñïðàâà
DrawBar(209,y+12,2,1,color);
DrawBar(208,y+13,3,1,color);
DrawBar(207,y+14,4,1,color);
return;
case 23: //àðõèâ
PutPixel(195,y+3,color);
PutPixel(195,y+11,color);
PutPixel(210,y+3,color);
PutPixel(210,y+11,color);
DrawBar(195,y,7,1,color);
DrawBar(204,y,7,1,color);
DrawBar(195,y+14,7,1,color);
DrawBar(204,y+14,7,1,color);
DrawBar(195,y+1,5,1,color);
DrawBar(206,y+1,5,1,color);
DrawBar(195,y+13,5,1,color);
DrawBar(206,y+13,5,1,color);
DrawBar(195,y+2,3,1,color);
DrawBar(208,y+2,3,1,color);
DrawBar(195,y+12,3,1,color);
DrawBar(208,y+12,3,1,color);
return; return;
case 24: //îáðàç case 24: //îáðàç
DrawBar(195,y,6,1,color); DrawBar(195,y,6,1,color);