Blueberries update, cmm dui fixes for dark skins

git-svn-id: svn://kolibrios.org@6649 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/cmm/eolite/Eolite.c

@@ -574,7 +574,7 @@ void DrawStatusBar()
 	int go_up_folder_exists=0;
 	if (!show_status_bar) return;
 	if (files.count>0) && (strcmp(file_mas[0]*304+buf+72,"..")==0) go_up_folder_exists=1;
-	DrawBar(1, Form.cheight - status_bar_h-1, Form.cwidth-2,  status_bar_h, system.color.work);
+	DrawBar(1, Form.cheight - status_bar_h-1, Form.cwidth-2,  status_bar_h, col_work);
 	sprintf(#status_bar_str, STATUS_STR, files.count-go_up_folder_exists, count_dir-go_up_folder_exists, files.count-count_dir, selected_count);
 	WriteText(6,Form.cheight - 13,0x80,0x000000,#status_bar_str);
 }

programs/cmm/eolite/include/gui.h

@@ -50,11 +50,11 @@ void DrawFlatButton(dword x,y,width,height,id,text)
 	DrawFilledBar(x+2, y+2, width-3, height-3);
 	if (id) DefineButton(x+1,y+1,width-2,height-2,id+BT_HIDE,0xEFEBEF);
 	if (height<18) {
-		WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,MixColors(system.color.work_text,0xFFFfff,210),text);
+		WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,0x333333,text);
 	}
 	else {
 		DrawRectangle3D(x-1,y-1,width+2,height+2,system.color.work,MixColors(system.color.work,col_graph,200));
-		WriteText(-strlen(text)*8+width/2+x+1,height/2+y-6,0x90,MixColors(system.color.work_text,0xFFFfff,210),text);
+		WriteText(-strlen(text)*8+width/2+x+1,height/2+y-6,0x90,0x333333,text);
 	}
 }
 

programs/cmm/lib/gui.h

@@ -153,7 +153,7 @@
 	DrawRectangle(x, y, VALUE_FIELD_W, SIZE, system.color.work_graph);
 	DrawRectangle3D(x+1, y+1, VALUE_FIELD_W-2, SIZE-2, 0xDDDddd, 0xffffff);
 	DrawBar(x+2, y+2, VALUE_FIELD_W-3, SIZE-3, 0xffffff);
-	WriteText( -strlen(value_text)+3*8 + x+6, SIZE / 2 + y -6, 0x90, system.color.work_text, value_text);
+	WriteText( -strlen(value_text)+3*8 + x+6, SIZE / 2 + y -6, 0x90, 0x333333, value_text);
 
 	DrawCaptButton(VALUE_FIELD_W + x,     y, SIZE, SIZE, bt_id_more, system.color.work_button, system.color.work_button_text, "+");
 	DrawCaptButton(VALUE_FIELD_W + x + SIZE, y, SIZE, SIZE, bt_id_less, system.color.work_button, system.color.work_button_text, "-");
@@ -171,10 +171,10 @@
 	w = ESI.edit_box.width+1;
 	if (ESI.edit_box.flags & 100000000000b) bg = 0xCACACA; else bg = 0xFFFfff;
 	h = 15;
-	DrawRectangle(x-1, y-1, w+2, h+2, bg);
-	DrawRectangle3D(x-2, y-2, w+2, h+2, 0xDDDddd, bg);
-	DrawRectangle(x-3, y-3, w+6, h+6, system.color.work_graph);
-	DrawRectangle3D(x-4, y-4, w+8, h+8, system.color.work_dark, system.color.work_light);
+	DrawRectangle(x-1, y-1, w+1, h+1, bg);
+	DrawRectangle3D(x-2, y-2, w+3, h+3, 0xDDDddd, bg);
+	DrawRectangle(x-3, y-3, w+5, h+5, system.color.work_graph);
+	DrawRectangle3D(x-4, y-4, w+7, h+7, system.color.work_dark, system.color.work_light);
 	edit_box_draw  stdcall (edit_box_pointer);
 }
 

skins/Leency/Blueberries/default.asm

@@ -3,12 +3,12 @@ include '..\me_skin.inc'
 SKIN_PARAMS \
   height          = bmp_center1.height,\  ; skin height
   margins         = [6:5:43:3],\          ; margins [left:top:right:bottom]
-  colors active   = [binner=0xC8C8C8:\    ; border inner
+  colors active   = [binner=0x626262:\    ; border inner
                      bouter=0x33383A:\    ; border outer
-                     bframe=0xC8C8C8],\   ; border middle
-  colors inactive = [binner=0xC8C8C8:\    ; border inner
+                     bframe=0x626262],\   ; border middle
+  colors inactive = [binner=0x626262:\    ; border inner
                      bouter=0x747474:\    ; border outer
-                     bframe=0xC8C8C8],\   ; border middle
+                     bframe=0x626262],\   ; border middle
   dtp             = 'default.dtp'          ; dtp colors
 
 SKIN_BUTTONS \

skins/Leency/Blueberries/default.dtp.asm

@@ -2,13 +2,13 @@ struc system_colors
  {
   .unused1          dd 0x363535
   .unused2          dd 0xE7E5E5
-  .work_3d_dark     dd 0xAEA6A6
-  .work_3d_light    dd 0xFBFBFB
-  .window_title     dd 0xF3F3F3
-  .work             dd 0xC8C8C8
-  .work_button      dd 0xD9F382
-  .work_button_text dd 0x333333
-  .work_text        dd 0x000000
-  .work_graph       dd 0x7E7E7E
+  .work_3d_dark     dd 0x505050
+  .work_3d_light    dd 0x828282
+  .window_title     dd 0xE3E3E3
+  .work             dd 0x626262
+  .work_button      dd 0x535353
+  .work_button_text dd 0xCC9777
+  .work_text        dd 0xF5EEee
+  .work_graph       dd 0x404040
  }
 struct system_colors