diff --git a/programs/other/kpack/trunk/data.inc b/programs/other/kpack/trunk/data.inc index e189352559..32d6091301 100644 --- a/programs/other/kpack/trunk/data.inc +++ b/programs/other/kpack/trunk/data.inc @@ -2,7 +2,7 @@ params: rb 256 ;--------------------------------------------------------------------- -color_table rd 10 +color_table sys_colors_new innamelen rd 1 inname rb 256 ;48 diff --git a/programs/other/kpack/trunk/kpack.asm b/programs/other/kpack/trunk/kpack.asm index d6824cb191..f645b32451 100644 --- a/programs/other/kpack/trunk/kpack.asm +++ b/programs/other/kpack/trunk/kpack.asm @@ -425,7 +425,7 @@ draw_window: ; start redraw mcall 12,1 - mcall 48,3,color_table,40 + mcall 48,3,color_table,192 ;-------------------------------------- edit_boxes_set_sys_color edit1,editboxes_end,color_table check_boxes_set_sys_color2 check1,check1_end,color_table @@ -433,11 +433,11 @@ check_boxes_set_sys_color2 check1,check1_end,color_table ; define window xor eax,eax mov ecx,100 shl 16+306 - mov edx,[color_table+20] + mov edx,[color_table.win_body] add edx,34000000h xor esi,esi xor edi,edi - mcall ,<100,436>,,,,caption_str + mcall ,<100,436>,,,[color_table.win_title],caption_str mcall 9,procinfo,-1 mov eax,[procinfo+70] ;status of window @@ -496,7 +496,7 @@ draw_lines: ; draw frame for messages data push ecx add ecx,50 shl 16+16 - mcall 38,<3,423>,,[color_table+36] + mcall 38,<3,423>,,[color_table.gui_frame] add ecx,224*(1 shl 16+1) mcall sub cx,224 @@ -508,19 +508,20 @@ draw_lines: draw_buttons: ; define compress button mov cx,18 - mcall 8,<351,72>,<1, 17>,2,[color_table+24] + mcall 8,<351,73>,<1, 17>,2,[color_table.btn_face] ; uncompress button add ecx,18 shl 16 inc edx mcall - add ecx,-12h+0Ah+140000h + ;add ecx,-12h+0Ch+140000h + mov ecx, 38 shl 16 + 11 ; question button push esi mov dl,7 - mcall ,<414,9> + mcall ,<413,11> shr ecx,16 - lea ebx,[ecx+1A10002h] - mcall 4,,[color_table+28],aQuestion,1 + lea ebx,[ecx+1A00002h] + mcall 4,,[color_table.btn_text],aQuestion,1 pop esi ; define settings buttons mov ecx,16*2+2 @@ -528,9 +529,9 @@ draw_buttons: mov cx,13 mcall 8,<6,50>,,4 ; text on settings buttons - mov ebx,9 shl 16+5 + mov ebx,8 shl 16+5 mov al,4 - mov ecx,[color_table+32] + mov ecx,[color_table.win_text] push buttons1names pop edx push 8 @@ -542,10 +543,10 @@ draw_buttons: mcall add edx,esi add ebx,16 - mov ecx,[color_table+28] + mov ecx,[color_table.btn_text] mcall ; text on compress and decompress buttons - or ecx,80000000h + or ecx,0x80000000 mcall ,<364,6>,,aCompress mcall ,<359,24>,,aDecompress ret