diff --git a/programs/other/kpack/trunk/data.inc b/programs/other/kpack/trunk/data.inc index 32d6091301..e54ee567be 100644 --- a/programs/other/kpack/trunk/data.inc +++ b/programs/other/kpack/trunk/data.inc @@ -2,7 +2,7 @@ params: rb 256 ;--------------------------------------------------------------------- -color_table sys_colors_new +color_table system_colors innamelen rd 1 inname rb 256 ;48 diff --git a/programs/other/kpack/trunk/kpack.asm b/programs/other/kpack/trunk/kpack.asm index f645b32451..74519a960e 100644 --- a/programs/other/kpack/trunk/kpack.asm +++ b/programs/other/kpack/trunk/kpack.asm @@ -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.win_body] + mov edx,[color_table.work] add edx,34000000h xor esi,esi xor edi,edi - mcall ,<100,436>,,,[color_table.win_title],caption_str + mcall ,<100,436>,,,,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.gui_frame] + mcall 38,<3,423>,,[color_table.work_graph] add ecx,224*(1 shl 16+1) mcall sub cx,224 @@ -508,7 +508,7 @@ draw_lines: draw_buttons: ; define compress button mov cx,18 - mcall 8,<351,73>,<1, 17>,2,[color_table.btn_face] + mcall 8,<351,73>,<1, 17>,2,[color_table.work_button] ; uncompress button add ecx,18 shl 16 inc edx @@ -521,7 +521,7 @@ draw_buttons: mcall ,<413,11> shr ecx,16 lea ebx,[ecx+1A00002h] - mcall 4,,[color_table.btn_text],aQuestion,1 + mcall 4,,[color_table.work_button_text],aQuestion,1 pop esi ; define settings buttons mov ecx,16*2+2 @@ -531,7 +531,7 @@ draw_buttons: ; text on settings buttons mov ebx,8 shl 16+5 mov al,4 - mov ecx,[color_table.win_text] + mov ecx,[color_table.work_text] push buttons1names pop edx push 8 @@ -543,7 +543,7 @@ draw_buttons: mcall add edx,esi add ebx,16 - mov ecx,[color_table.btn_text] + mov ecx,[color_table.work_button_text] mcall ; text on compress and decompress buttons or ecx,0x80000000 diff --git a/programs/other/t_edit/t_edit.asm b/programs/other/t_edit/t_edit.asm index e9465fa570..04e7d94465 100644 --- a/programs/other/t_edit/t_edit.asm +++ b/programs/other/t_edit/t_edit.asm @@ -81,7 +81,7 @@ icon_tl_sys dd 0 ;ука align 4 start: - mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.sys_colors_new + mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors mcall SF_SYS_MISC,SSF_HEAP_INIT or eax,eax @@ -591,7 +591,7 @@ i_end: buf_find rb 302 ;буфер для поиска текста run_file_70 FileInfoBlock sc system_colors - rb sizeof.sys_colors_new-sizeof.system_colors + rb sizeof.system_colors IncludeUGlobals align 16 procinfo process_information diff --git a/programs/system/board/trunk/board.asm b/programs/system/board/trunk/board.asm index 1ae2878194..d5b6056537 100644 --- a/programs/system/board/trunk/board.asm +++ b/programs/system/board/trunk/board.asm @@ -49,7 +49,7 @@ param: sub eax, 399 shl 16 add eax, 399 mov [xstart], eax - mcall 48, 3, sc, sizeof.sys_colors_new + mcall 48, 3, sc, sizeof.system_colors mov esi, filename call CreateFile @@ -214,12 +214,12 @@ draw_window: xor esi, esi mcall ,[xstart],,,,title mov ebx, 296 shl 16+31 - mcall 8,,<4,13>,3,[sc.btn_face] + mcall 8,,<4,13>,3,[sc.work_button] mov edx, [vmode] lea edx, [edx*4+duk] mov ecx, 0x80 shr ecx, 24 - add ecx, [sc.btn_text] + add ecx, [sc.work_button_text] mcall 4,<300,7>,,,4 call draw_text mcall 12, 2 ; 2, end of draw @@ -438,7 +438,7 @@ krnl_cnt dd ? pid_tid dd ? filepos dd ? xstart dd ? -sc sys_colors_new +sc system_colors rd 2 text1 rb 80*(MAXSTRINGS+1)