From bb77db0f4484272b7c3e5cb5b7799d7b0cfd9d9a Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sun, 17 May 2020 13:31:17 +0000 Subject: [PATCH] icons16.png: new icon for .pal and .dtp files skincfg: support of .dtp file open git-svn-id: svn://kolibrios.org@7937 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/File Managers/icons.ini | 2 + data/common/icons16.png | Bin 8221 -> 8313 bytes programs/cmm/TWB/TWB.c | 2 +- programs/system/skincfg/trunk/idata.inc | 7 +- programs/system/skincfg/trunk/skincfg.asm | 86 ++++++++++++++-------- programs/system/skincfg/trunk/udata.inc | 4 +- 6 files changed, 63 insertions(+), 38 deletions(-) diff --git a/data/common/File Managers/icons.ini b/data/common/File Managers/icons.ini index 1071a8f3c5..8c5f4c27e8 100644 --- a/data/common/File Managers/icons.ini +++ b/data/common/File Managers/icons.ini @@ -172,6 +172,8 @@ cpp=28 c=28 fb2=29 mgb=47 +dtp=52 +pal=52 [icons32] =45 diff --git a/data/common/icons16.png b/data/common/icons16.png index a2ee0d24ea449e9faa7bed58a39eadc7921bb4c6..6f9d47ee52dab768d87d8f379d0d88e743139441 100644 GIT binary patch literal 8313 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 Ar~m)} literal 8221 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 I>X^v?2bx7LQvd(} diff --git a/programs/cmm/TWB/TWB.c b/programs/cmm/TWB/TWB.c index 14d3d22f79..d08b6500cb 100644 --- a/programs/cmm/TWB/TWB.c +++ b/programs/cmm/TWB/TWB.c @@ -338,7 +338,7 @@ void TWebBrowser::SetStyle() { if (value = tag.get_value_of("bglink=")) link_bg=GetColor(value); if (value = tag.get_value_of("text=")) text_colors[0]=GetColor(value); if (value = tag.get_value_of("bgcolor=")) { - style.bg_color = page_bg = GetColor(value); + style.bg_color = page_bg = link_bg = GetColor(value); DrawBuf.Fill(0, page_bg); } // Autodetecting encoding if no encoding was set diff --git a/programs/system/skincfg/trunk/idata.inc b/programs/system/skincfg/trunk/idata.inc index 1b8b1ec35e..2c4468ae31 100644 --- a/programs/system/skincfg/trunk/idata.inc +++ b/programs/system/skincfg/trunk/idata.inc @@ -263,7 +263,7 @@ PathShow_data_1: .background_flag dd 0 ;+16 .font_color dd 0x0 ;+20 .background_color dd 0x0 ;+24 -.text_pointer dd fname ;+28 +.text_pointer dd dtp_name ;+28 .work_area_pointer dd text_work_area ;+32 .temp_text_length dd 0 ;+36 ;--------------------------------------------------------------------- @@ -291,7 +291,7 @@ OpenDialog_data: .start_path dd open_dialog_path ;+24 .draw_window dd draw_window ;+28 .status dd 0 ;+32 -.openfile_pach dd fname ;+36 +.openfile_pach dd dtp_name ;+36 .filename_area dd filename_area ;+40 .filter_area dd Filter .x: @@ -349,9 +349,6 @@ Filter2: .end: db 0 -start_temp_file_name: - db 'default.dtp',0 - default_skin: db '/sys/default.skn',0 default_dtp: diff --git a/programs/system/skincfg/trunk/skincfg.asm b/programs/system/skincfg/trunk/skincfg.asm index fb0014dfdc..d0e862c7d5 100644 --- a/programs/system/skincfg/trunk/skincfg.asm +++ b/programs/system/skincfg/trunk/skincfg.asm @@ -23,13 +23,14 @@ dd IM_END ; file size dd I_END ; memory dd stacktop ; stack pointer - dd skin_info ; parameters + dd app_param ; parameters dd cur_dir_path ; path to file include 'lang.inc' include '../../../proc32.inc' include '../../../config.inc' ;for nightbuild include '../../../macros.inc' +include '../../../string.inc' include '../../../dll.inc' include 'kglobals.inc' include 'unpacker.inc' @@ -104,31 +105,8 @@ load_libraries l_libs_start,end_l_libs test eax,eax jz close ;--------------------------------------------------------------------- - mov edi,filename_area - mov esi,start_temp_file_name - xor eax,eax - cld -@@: - lodsb - stosb - test eax,eax - jnz @b - - - mov edi,fname - mov esi,default_dtp - xor eax,eax - cld -@@: - lodsb - stosb - test eax,eax - jnz @b - -;--------------------------------------------------------------------- +; set default pathes mov edi,skin_info - cmp byte [edi], 0 - jne skin_path_ready mov esi,default_skin xor eax,eax cld @@ -137,6 +115,56 @@ load_libraries l_libs_start,end_l_libs stosb test eax,eax jnz @b + + mov edi,dtp_name + mov esi,default_dtp + xor eax,eax + cld +@@: + lodsb + stosb + test eax,eax + jnz @b +;--------------------------------------------------------------------- +; check app param + stdcall string.length, app_param + add eax, app_param + mov ecx, [eax-4] + cmp ecx, '.skn' + je load_skin_from_param + cmp ecx, '.dtp' + jne no_param + +load_dtp_from_param: + mov edi,dtp_name + mov esi,app_param + xor eax,eax + cld +@@: + lodsb + stosb + test eax,eax + jnz @b + call load_dtp_file.1 + jmp skin_path_ready + +load_skin_from_param: + mov edi,skin_info + mov esi,app_param + xor eax,eax + cld +@@: + lodsb + stosb + test eax,eax + jnz @b + call load_skin_file.2 + jmp skin_path_ready + +no_param: + mcall 48,3,color_table,4*10 ; get current colors + call load_skin_file.2 + skin_path_ready: ;--------------------------------------------------------------------- ;OpenDialog initialisation @@ -156,9 +184,6 @@ skin_path_ready: push dword PathShow_data_2 call [PathShow_prepare] -;--------------------------------------------------------------------- - mcall 48,3,color_table,4*10 ; get current colors - call load_skin_file.2 ;--------------------------------------------------------------------- red: call draw_window ; at first, draw the window @@ -187,7 +212,7 @@ button: ; button cmp ah,12 ; load file jne no_load - call load_file + call load_dtp_file call draw_window jmp still ;-------------------------------------- @@ -291,7 +316,7 @@ close: noid1: jmp still ;--------------------------------------------------------------------- -load_file: +load_dtp_file: ;--------------------------------------------------------------------- ; invoke OpenDialog mov [OpenDialog_data.type],dword 0 @@ -307,6 +332,7 @@ load_file: call draw_PathShow ;--------------------------------------------------------------------- +.2: xor eax, eax mov ebx, read_info mov dword [ebx], eax ; subfunction: read diff --git a/programs/system/skincfg/trunk/udata.inc b/programs/system/skincfg/trunk/udata.inc index 16fa617cec..8fe54aaed1 100644 --- a/programs/system/skincfg/trunk/udata.inc +++ b/programs/system/skincfg/trunk/udata.inc @@ -7,7 +7,7 @@ read_info: .blocks dd ? ; 512 bytes .address dd ? .workarea dd ? -fname rb 4096 ; filename +dtp_name rb 4096 virtual at read_info write_info: @@ -26,7 +26,7 @@ read_info2: .workarea dd ? skin_info rb 4096 -;param rb 257 +app_param rb 257 align 4 app_colours: