Sweetbread/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Issues Pull Requests Actions Activity

cmm: minor fixes and improvements

Browse Source 
git-svn-id: svn://kolibrios.org@5997 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-12-21 19:04:39 +00:00
parent a12ef7aa3c
commit 9c51b90ee4
5 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
programs/cmm/eolite/include/settings.h
View File

@ -9,7 +9,7 @@
?define smooth_FONT "ˆá¯®«ì§®¢ âì ᣫ ¦¥­­ë© èà¨äâ" ?define smooth_FONT "ˆá¯®«ì§®¢ âì ᣫ ¦¥­­ë© èà¨äâ"
?define LIST_LINE_HEIGHT "‚ëá®â  áâப¨ ¢ ᯨ᪥" ?define LIST_LINE_HEIGHT "‚ëá®â  áâப¨ ¢ ᯨ᪥"
?define NOTIFY_COPY_END "“¢¥¤®¬«ïâì ® § ¢¥à襭¨¨ ª®¯¨à®¢ ­¨ï" ?define NOTIFY_COPY_END "“¢¥¤®¬«ïâì ® § ¢¥à襭¨¨ ª®¯¨à®¢ ­¨ï"
#define SAVE_PATH_AS_DEFAULT "‘®åà ­¨âì ⥪ã騩 ¯ãâì ¯® 㬮«ç ­¨î" ?define SAVE_PATH_AS_DEFAULT "‘¤¥« âì ⥪ã騩 ¯ãâì ¤®¬ è­¨¬ ª â «®£®¬"
#else #else
?define EDIT_FILE_ASSOCIATIONS "Edit file associations" ?define EDIT_FILE_ASSOCIATIONS "Edit file associations"
?define TITLE_SETT "Settings" ?define TITLE_SETT "Settings"
@ -20,7 +20,7 @@
?define smooth_FONT "Use smooth font" ?define smooth_FONT "Use smooth font"
?define LIST_LINE_HEIGHT "List line height" ?define LIST_LINE_HEIGHT "List line height"
?define NOTIFY_COPY_END "Notify when copying finished" ?define NOTIFY_COPY_END "Notify when copying finished"
#define SAVE_PATH_AS_DEFAULT "Save the current default path" ?define SAVE_PATH_AS_DEFAULT "Save current path as home folder"
#endif #endif
char config_section[] = "Config"; char config_section[] = "Config";
@ -66,10 +66,10 @@ void settings_dialog()
break; break;
case evReDraw: case evReDraw:
DefineAndDrawWindow(Form.left + Form.width/2-10, Form.top + Form.height/2 - 75, 300, 260+GetSkinHeight(),0x34,system.color.work,TITLE_SETT); DefineAndDrawWindow(Form.left + Form.width/2-10, Form.top + Form.height/2 - 75, 300, 240+GetSkinHeight(),0x34,system.color.work,TITLE_SETT);
DrawSettingsCheckBoxes(); DrawSettingsCheckBoxes();
DrawFlatButton(9, 183, strlen(SAVE_PATH_AS_DEFAULT)+4*6, 22, 6, 0xE4DFE1, SAVE_PATH_AS_DEFAULT); DrawFlatButton(9, 166, strlen(SAVE_PATH_AS_DEFAULT)+4*6, 22, 6, 0xE4DFE1, SAVE_PATH_AS_DEFAULT);
DrawFlatButton(9, 215, strlen(EDIT_FILE_ASSOCIATIONS)+4*6, 22, 5, 0xE4DFE1, EDIT_FILE_ASSOCIATIONS); DrawFlatButton(9, 198, strlen(EDIT_FILE_ASSOCIATIONS)+4*6, 22, 5, 0xE4DFE1, EDIT_FILE_ASSOCIATIONS);
} }
} }
} }
@ -88,8 +88,8 @@ void DrawSettingsCheckBoxes()
CheckBox2(10, 33, 21, SHOW_REAL_NAMES, real_files_names_case); CheckBox2(10, 33, 21, SHOW_REAL_NAMES, real_files_names_case);
CheckBox2(10, 55, 22, NOTIFY_COPY_END, info_after_copy); CheckBox2(10, 55, 22, NOTIFY_COPY_END, info_after_copy);
CheckBox2(10, 77, 24, USE_TWO_PANELS, two_panels); CheckBox2(10, 77, 24, USE_TWO_PANELS, two_panels);
MoreLessBox(10, 125, 18, 25, 26, #system.color, files.item_h, LIST_LINE_HEIGHT); MoreLessBox(10, 105, 18, 25, 26, #system.color, files.item_h, LIST_LINE_HEIGHT);
if (label.font) MoreLessBox(10, 152, 18, 30, 31, #system.color, label.size.pt, FONT_SIZE_LABEL); if (label.font) MoreLessBox(10, 132, 18, 30, 31, #system.color, label.size.pt, FONT_SIZE_LABEL);
} }

4
programs/cmm/eolite/include/translations.h
View File

@ -1,5 +1,5 @@
#define TITLE "Eolite File Manager v3.29" #define TITLE "Eolite File Manager v3.3"
#define ABOUT_TITLE "Eolite 3.29" #define ABOUT_TITLE "Eolite 3.3"
#ifdef LANG_RUS #ifdef LANG_RUS
?define T_FILE "” ©«" ?define T_FILE "” ©«"

34
programs/cmm/lib/font.h
View File

@ -24,7 +24,7 @@
__SIZE size; __SIZE size;
int width,height; int width,height;
byte bold,italic,smooth; byte bold,italic,smooth;
dword color; dword color, background;
dword font,font_begin; dword font,font_begin;
word block; word block;
byte init(); byte init();
@ -215,35 +215,36 @@ inline fastcall dword b24(EBX) { return DSDWORD[EBX] << 8; }
to = size.height - 1 * line_w + raw - 3; to = size.height - 1 * line_w + raw - 3;
for(i=raw; i < to; i+=3) for(i=raw; i < to; i+=3)
{ {
IF(i-raw%line_w +3 == line_w) continue; if(i-raw%line_w +3 == line_w) continue;
IF(b24(i)==0x000000) && (b24(i+3)!=0x000000) && (b24(i+line_w)!=0x000000) && (b24(i+3+line_w)==0x000000) if(b24(i)==0x000000) && (b24(i+3)!=0x000000) && (b24(i+line_w)!=0x000000) && (b24(i+3+line_w)==0x000000)
{
ShadowPixel(i+3, 2);
ShadowPixel(i+line_w, 2);
}
ELSE IF(b24(i)!=0x000000) && (b24(i+3)==0x000000) && (b24(i+line_w)==0x000000) && (b24(i+3+line_w)!=0x000000)
{ {
ShadowPixel(i, 2); ShadowImage(i+3, 1, 1, 2);
ShadowPixel(i+3+line_w, 2); ShadowImage(i+line_w, 1, 1, 2);
}
else if(b24(i)!=0x000000) && (b24(i+3)==0x000000) && (b24(i+line_w)==0x000000) && (b24(i+3+line_w)!=0x000000)
{
ShadowImage(i, 1, 1, 2);
ShadowImage(i+3+line_w, 1, 1, 2);
} }
} }
} }
:int LABEL::write_center(dword x,y,w,h; dword background, color1; byte fontSizePoints; dword txt) :int LABEL::write_center(dword x,y,w,h; dword _background, _color; byte fontSizePoints; dword txt)
{ {
size.pt = fontSizePoints; size.pt = fontSizePoints;
getsize(txt); getsize(txt);
return write(w-size.width/2+x,y, background, color1, fontSizePoints, txt); return write(w-size.width/2+x,y, _background, _color, fontSizePoints, txt);
} }
:int LABEL::write(int x,y; dword background, color1; byte fontSizePoints; dword text1) :int LABEL::write(int x,y; dword _background, _color; byte fontSizePoints; dword text1)
{ {
signed len=0; signed len=0;
IF(!text1)return false; IF(!text1)return false;
IF(size.pt)IF(!changeSIZE())return false; IF(size.pt)IF(!changeSIZE())return false;
size.pt = fontSizePoints; size.pt = fontSizePoints;
getsize(text1); getsize(text1);
color = color1; color = _color;
background = _background;
y -= size.offset_y; y -= size.offset_y;
EDX = size.width*size.height*3; EDX = size.width*size.height*3;
IF(!raw_size) IF(!raw_size)
@ -274,7 +275,7 @@ inline fastcall dword b24(EBX) { return DSDWORD[EBX] << 8; }
return len; return len;
} }
:void LABEL::write_buf(int x,y,w,h; dword background, color1; byte fontSizePoints; dword text1) :void LABEL::write_buf(int x,y,w,h; dword _background, _color; byte fontSizePoints; dword text1)
{ {
dword new_raw_size; dword new_raw_size;
IF(!text1)return; IF(!text1)return;
@ -283,7 +284,8 @@ inline fastcall dword b24(EBX) { return DSDWORD[EBX] << 8; }
size.pt = fontSizePoints; size.pt = fontSizePoints;
getsize(text1); getsize(text1);
y -= size.offset_y; y -= size.offset_y;
color = color1; color = _color;
background = _background;
size.width = w; size.width = w;
size.height = h; size.height = h;

19
programs/cmm/lib/gui.h
View File

@ -177,15 +177,20 @@
} }
} }
:void ShadowPixel(dword color_image, strength) :dword ShadowPixel(dword dwColor, strength)
{ {
dword to = color_image + 3; dword iB, iG, iR;
strength = 10 - strength; strength = 10 - strength;
for ( ; color_image < to; color_image++)
{ iB = dwColor & 0xFF; dwColor >>= 8;
ESI = strength * DSBYTE[color_image] / 10; iG = dwColor & 0xFF; dwColor >>= 8;
DSBYTE[color_image] = ESI; iR = dwColor & 0xFF; dwColor >>= 8;
}
iB = strength * iB / 10 << 16;
iG = strength * iG / 10 << 8;
iR = strength * iR / 10;
return iR + iG + iB;
} }
:void ShadowImage(dword color_image, w, h, strength) :void ShadowImage(dword color_image, w, h, strength)
{ {

8
programs/cmm/software_widget/software_widget.c
View File

@ -145,7 +145,6 @@ byte draw_icons_from_section(dword key_value, key_name, sec_name, f_name)
icon_char_pos = strchr(key_value, ','); icon_char_pos = strchr(key_value, ',');
if (icon_char_pos) icon_id = atoi(icon_char_pos+1); else icon_id = default_icon; if (icon_char_pos) icon_id = atoi(icon_char_pos+1); else icon_id = default_icon;
img_draw stdcall(skin.image, col*cell_w+tmp-10, row*cell_h+5 + list_pos, 32, 32, 0, icon_id*32); img_draw stdcall(skin.image, col*cell_w+tmp-10, row*cell_h+5 + list_pos, 32, 32, 0, icon_id*32);
label.bold = false;
label.write_center(col*cell_w+7,row*cell_h+47 + list_pos, cell_w,0, LIST_BACKGROUND_COLOR, 0xDCDCDC, 12, key_name); label.write_center(col*cell_w+7,row*cell_h+47 + list_pos, cell_w,0, LIST_BACKGROUND_COLOR, 0xDCDCDC, 12, key_name);
label.write_center(col*cell_w+6,row*cell_h+46 + list_pos, cell_w,0, LIST_BACKGROUND_COLOR, 0x000000, 12, key_name); label.write_center(col*cell_w+6,row*cell_h+46 + list_pos, cell_w,0, LIST_BACKGROUND_COLOR, 0x000000, 12, key_name);
current_item_id++; current_item_id++;
@ -177,7 +176,6 @@ byte process_sections(dword sec_name, f_name)
old_row = row; old_row = row;
DrawBar(0, row * cell_h + list_pos, Form.cwidth , 29, LIST_BACKGROUND_COLOR); DrawBar(0, row * cell_h + list_pos, Form.cwidth , 29, LIST_BACKGROUND_COLOR);
//WriteTextB(10, row * cell_h + 9 + list_pos, 0x90, 0x000000, sec_name); //WriteTextB(10, row * cell_h + 9 + list_pos, 0x90, 0x000000, sec_name);
label.bold=false;
text_len = label.write(10, row * cell_h + 10 + list_pos, LIST_BACKGROUND_COLOR, 0, 15, sec_name); text_len = label.write(10, row * cell_h + 10 + list_pos, LIST_BACKGROUND_COLOR, 0, 15, sec_name);
DrawBar(text_len+20, row * cell_h + list_pos + 20, Form.cwidth-text_len-20, 1, 0xDCDCDC); DrawBar(text_len+20, row * cell_h + list_pos + 20, Form.cwidth-text_len-20, 1, 0xDCDCDC);
DrawBar(text_len+20, row * cell_h + list_pos + 21, Form.cwidth-text_len-20, 1, 0xFCFCFC); DrawBar(text_len+20, row * cell_h + list_pos + 21, Form.cwidth-text_len-20, 1, 0xFCFCFC);
@ -190,10 +188,10 @@ byte process_sections(dword sec_name, f_name)
void draw_top_bar() void draw_top_bar()
{ {
int top_position = 26; int top_position = 26;
DrawBar(0,0,Form.cwidth, top_position-1, system.color.work); DrawBar(0,0,Form.cwidth, top_position-2, system.color.work);
DrawBar(0,top_position-2, Form.cwidth, 1, ShadowPixel(system.color.work, 1));
DrawBar(0,top_position-1, Form.cwidth, 1, system.color.work_graph); DrawBar(0,top_position-1, Form.cwidth, 1, system.color.work_graph);
label.bold = false; label.write_center(0,0, Form.cwidth, top_position, system.color.work, system.color.work_text, 16, #window_title);
label.write_center(0,0, Form.cwidth, top_position, system.color.work, system.color.work_text, 17, #window_title);
list_top = top_position; list_top = top_position;
list_pos = list_top; list_pos = list_top;
row = -1; row = -1;