Palitra: refactoring, add shared icons

Move t_edit into separate folder


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

data/Tupfile.lua

@@ -292,22 +292,22 @@ extra_files = {
  {"kolibrios/utils/man2html", "common/utils/MAN2HTML"},
  {"kolibrios/utils/vmode", "common/vmode"},
  {"kolibrios/utils/texture", "common/utils/texture"},
- {"kolibrios/utils/t_edit.ini", PROGS .. "/other/t_edit/t_edit.ini"},
  {"kolibrios/utils/cnc_editor/cnc_editor", PROGS .. "/other/cnc_editor/cnc_editor"},
  {"kolibrios/utils/cnc_editor/kolibri.NC", PROGS .. "/other/cnc_editor/kolibri.NC"},
- {"kolibrios/utils/info/ASM.SYN", PROGS .. "/other/t_edit/info/asm.syn"},
- {"kolibrios/utils/info/CPP_CLA.SYN", PROGS .. "/other/t_edit/info/cpp_kol_cla.syn"},
- {"kolibrios/utils/info/CPP_DAR.SYN", PROGS .. "/other/t_edit/info/cpp_kol_dar.syn"},
- {"kolibrios/utils/info/CPP_DEF.SYN", PROGS .. "/other/t_edit/info/cpp_kol_def.syn"},
- {"kolibrios/utils/info/DEFAULT.SYN", PROGS .. "/other/t_edit/info/default.syn"},
- {"kolibrios/utils/info/HTML.SYN", PROGS .. "/other/t_edit/info/html.syn"},
- {"kolibrios/utils/info/INI.SYN", PROGS .. "/other/t_edit/info/ini_files.syn"},
  {"kolibrios/utils/kfm/kfm.ini", "common/File Managers/kfm.ini"},
  {"kolibrios/utils/kfm/kfm_keys_eng.txt", PROGS .. "/fs/kfm/trunk/docs/english/kfm_keys.txt"},
  {"kolibrios/utils/kfm/kfm_keys_rus.txt", PROGS .. "/fs/kfm/trunk/docs/russian/dos_kolibri/kfm_keys.txt"},
  {"kolibrios/utils/NDN/", "common/File Managers/ndn/*"},
  {"kolibrios/utils/NDN/COLORS/", "common/File Managers/ndn/COLORS/*"},
  {"kolibrios/utils/NDN/XLT/", "common/File Managers/ndn/XLT/*"},
+ {"kolibrios/utils/t_edit/t_edit.ini", PROGS .. "/other/t_edit/t_edit.ini"},
+ {"kolibrios/utils/t_edit/info/ASM.SYN", PROGS .. "/other/t_edit/info/asm.syn"},
+ {"kolibrios/utils/t_edit/info/CPP_CLA.SYN", PROGS .. "/other/t_edit/info/cpp_kol_cla.syn"},
+ {"kolibrios/utils/t_edit/info/CPP_DAR.SYN", PROGS .. "/other/t_edit/info/cpp_kol_dar.syn"},
+ {"kolibrios/utils/t_edit/info/CPP_DEF.SYN", PROGS .. "/other/t_edit/info/cpp_kol_def.syn"},
+ {"kolibrios/utils/t_edit/info/DEFAULT.SYN", PROGS .. "/other/t_edit/info/default.syn"},
+ {"kolibrios/utils/t_edit/info/HTML.SYN", PROGS .. "/other/t_edit/info/html.syn"},
+ {"kolibrios/utils/t_edit/info/INI.SYN", PROGS .. "/other/t_edit/info/ini_files.syn"},
  }
 if build_type == "rus" then tup.append_table(extra_files, {
  {"Docs/cp866/config.txt", build_type .. "/docs/CONFIG.TXT"},
@@ -605,10 +605,10 @@ tup.append_table(extra_files, {
  {"kolibrios/media/zsea/plugins/convert.obj", PROGS .. "/media/zsea/plugins/convert/convert.obj"},
  {"kolibrios/media/zsea/plugins/rotate.obj", PROGS .. "/media/zsea/plugins/rotate/rotate.obj"},
  {"kolibrios/media/zsea/plugins/scaling.obj", PROGS .. "/media/zsea/plugins/scaling/scaling.obj"},
+ {"kolibrios/utils/AMDtemp", PROGS .. "/system/amd_temp_view/AMDtemp"},
  {"kolibrios/utils/calcplus", PROGS .. "/other/calcplus/calcplus"},
  {"kolibrios/utils/kfm/kfm", PROGS .. "/fs/kfm/trunk/kfm"},
- {"kolibrios/utils/t_edit", PROGS .. "/other/t_edit/t_edit"},
+ {"kolibrios/utils/t_edit/t_edit", PROGS .. "/other/t_edit/t_edit"},
- {"kolibrios/utils/AMDtemp", PROGS .. "/system/amd_temp_view/AMDtemp"},
 })
 -- For russian build, add russian-only programs.
 if build_type == "rus" then tup.append_table(img_files, {

data/common/settings/assoc.ini

@@ -68,7 +68,7 @@ exec=/kolibrios/utils/thashview
 icon=124
 
 [TextEdit]
-exec=/kolibrios/utils/t_edit
+exec=/kolibrios/utils/t_edit/t_edit
 icon=9
 next=$CodeEdit
 

programs/gui_patterns.inc

@@ -1,12 +1,3 @@
-BT_DEL     equ 0x80000000
-BT_HIDE    equ 0x40000000
-BT_NOFRAME equ 0x20000000
-
-macro DefineButton  x, y, w, h, id, background_color
-{
-	mcall 8, (x) shl 16 + (w), (y) shl 16 + (h), id, background_color
-}
-
 macro DrawBar  x, y, width, height, color 
 {
 	mcall 13, (x) shl 16 + (width), (y) shl 16 + (height), color
@@ -36,15 +27,4 @@ macro DrawWideRectangle  x, y, w, h, boder, color
 	DrawBar x+w-boder, y+boder, boder, h-boder-boder
 }
 
-macro WriteText  x, y, fontType, color, text
-{
-	mcall 4, (x) shl 16 + (y), (fontType) shl 24 + (color), text
-}
-
-macro WriteTextBold  x, y, fontType, color, text
-{
-	mcall 4, (x) shl 16 + (y), (fontType) shl 24 + (color), text
-	add ebx,1 shl 16
-	mcall
-}
 

programs/macros.inc

@@ -569,6 +569,11 @@ irp cond, e, ne, g, ng, l, nl, ge, le {
 
 ; constants
 
+; button flags
+BT_DEL         = 0x80000000
+BT_HIDE        = 0x40000000
+BT_NOFRAME     = 0x20000000
+
 ; events
 EV_IDLE        = 0
 EV_TIMER       = 0
@@ -593,5 +598,5 @@ EVM_STACK      =   10000000b
 EVM_DEBUG      =  100000000b
 EVM_STACK2     = 1000000000b
 
-EVM_MOUSE_FILTER = 0x80000000
+EVM_MOUSE_FILTER  = 0x80000000
 EVM_CURSOR_FILTER = 0x40000000

programs/media/palitra/branch/build.bat

@@ -1,4 +1,5 @@
-@fasm.exe  palitra.asm palitra
+del palitra
-@kpack palitra
+@fasm.exe palitra.asm palitra
+rem @kpack palitra
 
-pause
+if not exist palitra ( @pause )

programs/media/palitra/branch/palitra.asm

@@ -74,20 +74,27 @@
   include '../../../KOSfuncs.inc'
   include '../../../dll.inc'
 
-  WIN_W  equ 394            ; <20><>ਭ<EFBFBD> <20><><EFBFBD><EFBFBD>
+  WIN_W  = 394            ; <20><>ਭ<EFBFBD> <20><><EFBFBD><EFBFBD>
-  WIN_H  equ 251            ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+  WIN_H  = 251            ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
-  WIN_X  equ 250            ; <20><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>
+  WIN_X  = 250            ; <20><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>
-  WIN_Y  equ 190            ; <20><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>
+  WIN_Y  = 190            ; <20><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>
-
+  
-panel:
+  CELLW  = 8              ; not used yet, but has to be :)
-  file "panel.raw"
+  DRAWY  = 9
+  ICONX  = WIN_W - 35
+  SLIDEW = 25
 
 START:
     mcall   SF_SYS_MISC,SSF_HEAP_INIT ; <20><><EFBFBD>樠<EFBFBD><E6A8A0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+    mcall SF_SYS_MISC, SSF_MEM_OPEN, i18_name
+    mov [icons18], eax
+    mcall SF_SYS_MISC, SSF_MEM_OPEN, i18bg_name
+    mov [icons18bg], eax
+
     stdcall dll.Load, @IMPORT
     or      eax,eax
     jnz     bexit
-    mcall   SF_SET_EVENTS_MASK,0x27   ; <20><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ᮡ<>⨩
+    mcall   SF_SET_EVENTS_MASK,EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE ; <20><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ᮡ<>⨩
     include 'params_init.inc'             ; <20><>ࠡ<EFBFBD>⪠ <20><>ࠬ<EFBFBD><E0A0AC>஢ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ப<EFBFBD>
 
 ;#___________________________________________________________________________________________________
@@ -98,13 +105,13 @@ red:
     call draw_main                        ; <20><><EFBFBD>뢠<EFBFBD><EBA2A0> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2> <20><><EFBFBD><EFBFBD> <20>ਫ<EFBFBD><E0A8AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 still:
     mcall   SF_WAIT_EVENT         ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 10 - <20><><EFBFBD><EFBFBD><EFBFBD> ᮡ<><E1AEA1><EFBFBD><EFBFBD>
-    cmp     eax,1                         ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2><EFBFBD> <20><><EFBFBD><EFBFBD> ?
+    cmp     eax,EV_REDRAW                 ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2><EFBFBD> <20><><EFBFBD><EFBFBD> ?
     je      red                           ; <20>᫨ <20><> - <20><> <20><><EFBFBD><EFBFBD><EFBFBD> red
-    cmp     eax,2                         ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ?
+    cmp     eax,EV_KEY                    ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ?
     je      key                           ; <20>᫨ <20><> - <20><> key
-    cmp     eax,3                         ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ?
+    cmp     eax,EV_BUTTON                 ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ?
     je      button                        ; <20>᫨ <20><> - <20><> button
-    cmp     eax,6                         ; ᮡ<>⨥ <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>
+    cmp     eax,EV_MOUSE                  ; ᮡ<>⨥ <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>
     je      mouse                         ; <20>᫨ <20><> - <20><> button
     jmp     still                         ; <20>᫨ <20><>㣮<EFBFBD> ᮡ<>⨥ - <20> <20><>砫<EFBFBD> 横<><E6A8AA>
 ;end_still
@@ -265,23 +272,22 @@ draw_main:
     call    draw_palitra                  ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     call    draw_result                   ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
-    ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 8 - <20><>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD>/㤠<><E3A4A0><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    mcall   SF_DEFINE_BUTTON, <110,147>, <DRAWY,147>, 0x07+BT_HIDE
-    mcall   SF_DEFINE_BUTTON, (110 shl 16)+147, (9 shl 16)+147, 0x60000007
 
-    inc     edx
+    add     edx,1++BT_NOFRAME
-    mcall   , 18*65536+22, 61*65536+188 ; <20><><EFBFBD>㥬 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> ᫠<><E1ABA0><EFBFBD>஬ red
+    mcall   , <10,22>, <62,128>           ; <20><><EFBFBD>㥬 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> ᫠<><E1ABA0><EFBFBD>஬ red
-    add     ebx,20*65536+20 ;23 shl 16                ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞
+    add     ebx,25*65536                  ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞
     inc     edx                           ; ID = 9
     int     0x40                          ; <20><><EFBFBD>㥬 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> ᫠<><E1ABA0><EFBFBD>஬ green
-    add     ebx,20*65536+20;23 shl 16                 ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞
+    add     ebx,25*65536                  ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞
     inc     edx                           ; ID = 10
     int     0x40                          ; <20><><EFBFBD>㥬 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> ᫠<><E1ABA0><EFBFBD>஬ blue
-    add     ebx, 20*65536+20;23 shl 16                 ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞
+    add     ebx,25*65536                  ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞
     inc     edx                           ; ID = 11
     int     0x40                          ; <20><><EFBFBD>㥬 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> ᫠<><E1ABA0><EFBFBD>஬ alpha
 
     ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 8 - <20><>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD>/㤠<><E3A4A0><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>)
-    mcall   , (13 shl 16)+20, (20 shl 16)+20, 0x6000000D
+    mcall   , <13,19>, <20,18>, 0x0D+BT_HIDE
 
     call    draw_bottom_panel
     call    draw_left_panel
@@ -290,6 +296,32 @@ draw_main:
     mcall SF_REDRAW,SSF_END_DRAW
     ret
 
+proc DrawRectangle3D, _x:word, _w:word, _y:word, _h:word, color1:dword, color2:dword
+    mov ebx,[_w]
+    add ebx,[_x] ;<3B><><EFBFBD> <20><>筮 <20><><EFBFBD><EFBFBD><EFBFBD>-<2D><> <20><><EFBFBD><EFBFBD>... <20>㦭<EFBFBD> <20><>९<EFBFBD><E0A5AF><EFBFBD><EFBFBD><EFBFBD> :)
+    shl ebx,16
+    mov bx,1
+    mov ecx,[_h]
+    inc cx
+    mov edx,[_color2]
+    mcall SF_DRAW_RECT ; x+w,y,1,h+1,color2
+    rol ebx,16
+    sub bx,[_w]
+    ror ebx,16
+    dec cx
+    mov edx,[_color1]
+    mcall ;SF_DRAW_RECT x,y,1,h,color1
+    mov bx,[_h]
+    xchg bx,cx
+    mcall ;SF_DRAW_RECT x,y,w,1,color1
+    rol ecx,16
+    add cx,[_h]
+    ror ecx,16
+    mov edx,[_color2]
+    mcall ;SF_DRAW_RECT x,y+h,w,1,color2
+	ret 
+endp
+
 ;#___________________________________________________________________________________________________
 ;****************************************************************************************************|
 ; <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>                                                 |
@@ -300,14 +332,27 @@ draw_main:
     draw_left_panel:                      ; <20><><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  SL97: <20><> ᠬ<><E1A0AC> <20><><EFBFBD><EFBFBD> <20>ࠢ<EFBFBD><E0A0A2>.
     ;.................................................................................................
     ; button_next_colorsheme
-    mcall   SF_DEFINE_BUTTON, (266 shl 16)+16, (9 shl 16)+16, 0x6000000C, [sc.work_button]
+    mcall   SF_DEFINE_BUTTON, <ICONX,21>, <DRAWY,21>, 12+BT_HIDE
     ; circle diagram
     add     ecx,19 shl 16                 ; move rect
-    mov     edx,0x6000000F                ; ID = 15
+    add     edx,3                         ; ID = 15
-    int     0x40                          ; call
+    mcall
 
-    mcall   SF_PUT_IMAGE, panel, (16 shl 16)+149, (266 shl 16)+9
+    mov     ebx,[icons18bg]
+    add     ebx,18*18*4*53
+    mcall   SF_PUT_IMAGE_EXT, ebx, <18,18>, <ICONX+2,DRAWY+2>, 32, 0, 0
 
+    add     ebx,18*18*4*(39-53)
+    mov     edx,ICONX*65536+WIN_H-90
+    mcall
+    
+    mov     ebx,[icons18]
+    add     ebx,18*18*4*(52-39)
+    sub     edx,40
+    mcall
+    
+    ;stdcall DrawRectangle3D ICONX, DRAWY, 22, 22, [sc.work_light], [sc.work_dark]   ;Leency: draw rectangle around the button, buggy now
+  
     ;mov     eax,13                        ; draw rect
     ;mov     ebx,266 shl 16+16             ; [x] + [size]
     ;mov     ecx,9 shl 16+16               ; [y] + [size]
@@ -788,8 +833,8 @@ draw_result:
     ;.................................................................................................
     ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ࠬ<><E0A0AC> <20>뢮<EFBFBD><EBA2AE> १<><E0A5A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     ;.................................................................................................
-    mcall   SF_DRAW_RECT, 4 shl 16+110, 9 shl 16+219-18, 0x00666666
+    mcall   SF_DRAW_RECT, <4,110>, <9,219-18>, [sc.work_graph]
-    mcall   , 5 shl 16+110-2, 10 shl 16+219-20, 0x00F3F3F3
+    mcall   , <5,110-2>, <10,219-20>, [sc.work_light]
 
     ;.................................................................................................
     ; <20><><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2> १<><E0A5A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 梥<><E6A2A5> <20> hex color2
@@ -809,7 +854,7 @@ draw_result:
 
     ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 47 - <20>뢮<EFBFBD> <20><>᫠ <20> <20><><EFBFBD><EFBFBD>
     ;ebx - <20><>ࠬ<EFBFBD><E0A0AC><EFBFBD><EFBFBD> <20>८<EFBFBD>ࠧ<EFBFBD><E0A0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>᫠ <20> ⥪<><E2A5AA> (HEX)
-    mcall   SF_DRAW_NUMBER, 256+8 shl 16, [color], (40 shl 16)+22, 0x10000000, 0
+    mcall   SF_DRAW_NUMBER, 256+8 shl 16, [color], <40,22>, 0x10000000, 0
 
     ; <20>㭪<EFBFBD><E3ADAA><EFBFBD> 4: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⥪<><E2A5AA> <20> <20><><EFBFBD><EFBFBD>
     ; edx - <20><><EFBFBD>㥬 '#'
@@ -841,8 +886,9 @@ draw_result:
     ; <20>뢮<EFBFBD><EBA2AE><EFBFBD> <20>㪢<EFBFBD> r g b a
     ;.................................................................................................
     mov     eax,SF_DRAW_TEXT  ; 4 - <20>뢥<EFBFBD><EBA2A5><EFBFBD> <20><>ப<EFBFBD> ⥪<><E2A5AA><EFBFBD> <20> <20><><EFBFBD><EFBFBD>
-    mov     ebx,19 shl 16+49              ; [<5B><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> x]*65536 + [<5B><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> y]
+    mov     ebx,17 shl 16+DRAWY+37              ; [<5B><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> x]*65536 + [<5B><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> y]
-    mov     ecx, 0x0                       ; 0xX0RRGGBB (RR, GG, BB <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 梥<> ⥪<><E2A5AA><EFBFBD>)
+    mov     ecx, 0x10000000               ; 0xX0RRGGBB (RR, GG, BB <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 梥<> ⥪<><E2A5AA><EFBFBD>)
+    add     ecx, [sc.work_text]
     mov     edx,cname                     ; 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><>砫<EFBFBD> <20><>ப<EFBFBD>
     mov     esi,1                         ; <20>뢮<EFBFBD><EBA2AE><EFBFBD><EFBFBD> esi ᨬ<><E1A8AC><EFBFBD><EFBFBD><EFBFBD>
     newline:                              ; 横<>
@@ -876,7 +922,8 @@ draw_value:
     jne     draw_value_e
     add     ebx,7 shl 16
   draw_value_e:
-    mov     ecx,0x0; 0x10000000                 ; 梥<> ⥪<><E2A5AA><EFBFBD> RRGGBB
+    mov     ecx,0x0;0x10000000                 ; 梥<> ⥪<><E2A5AA><EFBFBD> RRGGBB
+    add     ecx,[sc.work_text]
     mov     edx,buff                      ; 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><>砫<EFBFBD> ⥪<><E2A5AA><EFBFBD>
     int     0x40
     ret                                   ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>頥<EFBFBD> <20><>ࠢ<EFBFBD><E0A0A2><EFBFBD><EFBFBD><EFBFBD>
@@ -1091,7 +1138,7 @@ str_len:
 set_background2:
     mcall   SF_SYS_MISC, SSF_HEAP_INIT
     mcall   SF_SYS_MISC, SSF_MEM_ALLOC, 256 * 256 * 3
-    mov     [image], eax
+    mov     [bgimg_buf], eax
 
     mov     edx, eax
     mov     ecx, 256 * 256
@@ -1113,10 +1160,10 @@ set_background2:
 
     mcall   SF_BACKGROUND_SET, SSF_SIZE_BG, 256, 256
     mcall   SF_BACKGROUND_SET, SSF_MODE_BG, 1
-    mcall   SF_BACKGROUND_SET, SSF_IMAGE_BG, [image], 0, 256 * 256 * 3
+    mcall   SF_BACKGROUND_SET, SSF_IMAGE_BG, [bgimg_buf], 0, 256 * 256 * 3
     mcall   SF_BACKGROUND_SET, SSF_REDRAW_BG
 
-    mcall   SF_SYS_MISC, SSF_MEM_FREE, [image]
+    mcall   SF_SYS_MISC, SSF_MEM_FREE, [bgimg_buf]
     stdcall save_eskin_ini, 'B '
 ret
 
@@ -1182,15 +1229,15 @@ endp
 ; <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>                                                                         |
 ;----------------------------------------------------------------------------------------------------/
 circle:
-    title       db 'Palitra v0.77',0       ; <20>࠭<EFBFBD><E0A0AD> <20><><EFBFBD> <20>ணࠬ<E0AEA3><E0A0AC>
+    title       db 'Palitra v0.77',0      ; <20>࠭<EFBFBD><E0A0AD> <20><><EFBFBD> <20>ணࠬ<E0AEA3><E0A0AC>
     hidden      db 'Hidden',0
-;    hex         db '#',0                  ; <20><><EFBFBD> <20>뢮<EFBFBD><EBA2AE> <20><><EFBFBD><EFBFBD>⪨ <20><><EFBFBD> ⥪<><E2A5AA><EFBFBD>
+;    hex         db '#',0                 ; <20><><EFBFBD> <20>뢮<EFBFBD><EBA2AE> <20><><EFBFBD><EFBFBD>⪨ <20><><EFBFBD> ⥪<><E2A5AA><EFBFBD>
     cname       db 'RGBAx'                ; <20>࠭<EFBFBD><E0A0AD> ࠧ<><E0A0A7><EFBFBD><EFBFBD> 梥⮢ (red,green,blue) x-<2D><>⪠ <20><><EFBFBD><EFBFBD><EFBFBD>
     larrow      db 0x1A,0
     buff        db '000',0
     bground     db 'BACKGROUND',0         ; <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - 14
-    bground1    db 'Gradient',0           ; <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - 14
+    bground1    db 'Gradient',0           ; <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - 15
-    bground2    db 'Noisy',0         ; <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - 14
+    bground2    db 'Noisy',0              ; <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - 16
     runmode     dd 1                      ; ०<><E0A5A6> <20><><EFBFBD><EFBFBD>᪠ (1-normal, 2-hidden, 3-colordialog)
     color2      dd 00FFFFFFh              ; <20>࠭<EFBFBD><E0A0AD> <20><><EFBFBD>祭<EFBFBD><E7A5AD> <20><><EFBFBD>ண<EFBFBD> <20><><EFBFBD>࠭<EFBFBD><E0A0AD><EFBFBD><EFBFBD> 梥<><E6A2A5>
 
@@ -1198,6 +1245,10 @@ circle:
     amain       db 'style',0
     aprogram    db 'bg_program',0
     aparam      db 'bg_param',0
+    
+    i18_name    db 'ICONS18',0
+    i18bg_name  db 'ICONS18W',0
+
 
 align 16
 @IMPORT:
@@ -1217,7 +1268,7 @@ I_END:
     desctop_w   rd 1                      ; <20>࠭<EFBFBD><E0A0AD> <20><>ਭ<EFBFBD> <20><>࠭<EFBFBD>
     desctop_h   rd 1                      ; <20>࠭<EFBFBD><E0A0AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>࠭<EFBFBD>
     sc          system_colors             ; <20>࠭<EFBFBD><E0A0AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⥬<EFBFBD><E2A5AC><EFBFBD> 梥⮢ ᪨<><E1AAA8>
-    cred        rb 1                      ; <20>࠭<EFBFBD><E0A0AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᯥ<><E1AFA5><EFBFBD>
+    cred        rb 1                      ; <20>࠭<EFBFBD><E0A0AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᯥ<><E1AFA5><EFBFBD>
     cgreen      rb 1                      ; <20>࠭<EFBFBD><E0A0AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᯥ<><E1AFA5><EFBFBD>
     cblue       rb 1                      ; <20>࠭<EFBFBD><E0A0AD> ᨭ<><E1A8AD> ᯥ<><E1AFA5><EFBFBD>
     calpha      rb 1                      ; <20>࠭<EFBFBD><E0A0AD> <20>஧<EFBFBD><E0AEA7>筮<EFBFBD><E7ADAE><EFBFBD>
@@ -1225,7 +1276,9 @@ I_END:
     renmode     rd 1                      ; ०<><E0A5A6> <20><><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2> (1-梥⮢<E6A2A5><E2AEA2> <20>奬<EFBFBD>,2-<2D><><EFBFBD><EFBFBD>⪠,3-<2D><>㣮<EFBFBD><E3A3AE><EFBFBD>)
     params      rb 20                     ; <20><><EFBFBD><EFBFBD><EFBFBD> <20><>ࠬ<EFBFBD><E0A0AC>஢
     params_c    rb 9                      ; <20><><EFBFBD>񬭨<EFBFBD> <20><><EFBFBD> 梥<><E6A2A5>
-    image           rd 1
+    bgimg_buf   rd 1                      ; buffer for a generated image
+    icons18     dd ?                      ; pointer to a shared memory of icons18.png
+    icons18bg   dd ?                      ; pointer to a shared memory of icons18.png with filled bg
 
         rd 1024
 stacktop:

programs/system/end/light/end.asm

@@ -160,9 +160,6 @@ draw_window:
 	mcall SF_DEFINE_BUTTON, <WIN_W-35,32>, <2,22>, CANCEL_BUTTON_ID
 	mcall SF_DEFINE_BUTTON, <32,14>, <70,14>, CHECKBOX_BUTTON_ID
 	mcall SF_DEFINE_BUTTON, <47,WIN_W-47>, <68,34>, CHECKBOX_BUTTON_ID+BT_NOFRAME
-    ;DefineButton  WIN_W-33, 2, 32, 20, CANCEL_BUTTON_ID, 0
-    ;DefineButton  32, 70, 14, 14, CHECKBOX_BUTTON_ID, 0
-    ;DefineButton  47, 68, WIN_W-47, 34, CHECKBOX_BUTTON_ID+BT_NOFRAME, 0
     DrawRectangle3D 32, 70, 14, 14, 0x606060, 0xAFAFAF
     call draw_checkbox_flag
 

programs/testing/cpuid/trunk/CPUID.ASM

@@ -2281,8 +2281,8 @@ draw_window:
         Window 150, 150, 350, 405, 0x34FFFFFF, 0x805080d0, title
 
         mov   esi, [sc.work_button]
-        DefineButton 138, 345, 92, 24, 2,
+        mcall SF_DEFINE_BUTTON, <138,92>, <345,24>, 2
-        DefineButton 238, 345, 92, 24, 3,
+        mcall SF_DEFINE_BUTTON, <238,92>, <345,24>, 3
 
         mov   ecx, [sc.work_button_text]
         or    ecx, 0x90000000