diff --git a/programs/develop/libraries/box_lib/trunk/box_lib.mac b/programs/develop/libraries/box_lib/trunk/box_lib.mac
index 88f30abbb3..2aa706676e 100644
--- a/programs/develop/libraries/box_lib/trunk/box_lib.mac
+++ b/programs/develop/libraries/box_lib/trunk/box_lib.mac
@@ -189,7 +189,7 @@ macro init_checkboxes2 start,end
mov ecx,((end-start)/ch_struc_size)
@@:
push ebp ;㪠⥫ checkbox
- call [init_checkbox2] ; ન 誨 checkbox'
+ call [init_checkbox] ; ન 誨 checkbox'
add ebp,ch_struc_size
loop @b
}
@@ -201,7 +201,7 @@ macro checkboxes_mouse2 start,end
mov ecx,((end-start)/ch_struc_size)
@@:
push ebp ;㪠⥫ checkbox
- call [check_box_mouse2] ;ᮢ checkbox
+ call [check_box_mouse] ;ᮢ checkbox
add ebp,ch_struc_size
loop @b
}
@@ -213,7 +213,7 @@ macro checkboxes_draw2 start,end
mov ecx,((end-start)/ch_struc_size)
@@:
push ebp ;㪠⥫ checkbox
- call [check_box_draw2] ;ᮢ checkbox
+ call [check_box_draw] ;ᮢ checkbox
add ebp,ch_struc_size
loop @b
}
@@ -225,9 +225,10 @@ macro check_boxes_set_sys_color2 start,end,color_table
mov esi,color_table
@@:
push dword [esi+32] ;梥 ⥪ ࠡ祩
- pop dword ch_text_color
+ or dword [esp],0x80000000 ;室 뢮 ASCIIZ ப
+ pop dword 2ch_text_color
push dword [esi+36] ;梥 䨪 (ࠧ⥫ ..)
- pop dword ch_border_color
+ pop dword 2ch_border_color
add ebp,ch_struc_size
loop @b
}
diff --git a/programs/develop/libraries/box_lib/trunk/doc/checkbox/info_checkbox.htm b/programs/develop/libraries/box_lib/trunk/doc/checkbox/info_checkbox.htm
index 822c35719d..f5c4888adf 100644
--- a/programs/develop/libraries/box_lib/trunk/doc/checkbox/info_checkbox.htm
+++ b/programs/develop/libraries/box_lib/trunk/doc/checkbox/info_checkbox.htm
@@ -8,6 +8,16 @@
↑
+ Version 2
+ 2
+
+
+Version 1
- check_box_draw
@@ -18,8 +28,63 @@
-, .
+Checkbox , .
+ / .
+
+Version 2 2010 . 1:
+
+- ASCIIZ .
+- , .
+- , .
+- , checkbox.
+
+
+
+
+
+ , . checkbox, .
+
+
+ .
+
+
+ .
+
+
+
+
+
+
struc check_box2 left_s,top_s,ch_text_margin,color,border_color,text_color,text,flags
+{ ;
+.left_s: dd left_s ;+0 dw + dw
+.top_s: dd top_s ;+4 dw + dw
+.ch_text_margin: dd ch_text_margin ;
+.color: dd color ;
+.border_color: dd border_color ;
+.text_color: dd text_color ; or 0x80000000, ASCIIZ .
+.text: dd text ;
+.flags: dd flags+0 ;
+.size_of_str: dd 0x0 ; ,
+}
+
+left_s - + ( x * 65536 + ).
+top - + y ( y* 65536 + y).
+ch_text_margin - .
+color - .
+
+
+
+
+ch_flag_en = 10b ; .
+ch_flag_top = 0x0 ; .. 3-
+ch_flag_middle = 100b ; .. 4- .
+ch_flag_bottom = 1000b ; .. .. 3- 4-
+
+
+
+
+Version 1 2007-2009 .
diff --git a/programs/media/scrshoot/scrshoot.asm b/programs/media/scrshoot/scrshoot.asm
index c8ba7e0423..6649ad9c90 100644
--- a/programs/media/scrshoot/scrshoot.asm
+++ b/programs/media/scrshoot/scrshoot.asm
@@ -12,6 +12,7 @@
; 24.07.2008 editbox
; 01.02.07 - editbox
; 31.01.07 - ⥯ ⭮⥫쭮
+; 02.11.10 - ᯮ checkbox ᨨ 2
title equ 'Screenshooter v 1.0' ;
include '../../develop/libraries/box_lib/load_lib.mac'
@@ -140,6 +141,8 @@ load_libraries l_libs_start,end_l_libs
; ⠭ ᮡ⨩
set_events_mask (evm_redraw+evm_key+evm_button+evm_mouse+evm_ipc)
+;樠 checkboxes
+ init_checkboxes2 check_boxes,check_boxes_end
; 룠 ᮢ
red:
@@ -149,7 +152,8 @@ red:
; ⠭ ⥬ 梥 GUI ⮢
txt_but_set_sys_color buttons,buttons_end,sc ; \
labels_set_sys_color labels,labels_end,sc ; |
- check_boxes_set_sys_color check_boxes,check_boxes_end,sc ; |
+ check_boxes_set_sys_color2 check_boxes,check_boxes_end,sc; |
+; check_boxes_set_sys_color check_boxes,check_boxes_end,sc ; |
edit_boxes_set_sys_color editboxes,editboxes_end,sc ; /
get_screen_prop scr ; 砥 ଠ ࠭
@@ -202,20 +206,21 @@ mouse:
push dword edit4
call [edit_box_mouse]
;----------------------------------
- push dword ch1
- call [check_box_mouse]
- push dword ch2
- call [check_box_mouse]
- push dword ch3
- call [check_box_mouse]
- push dword ch4
- call [check_box_mouse]
- push dword ch5
- call [check_box_mouse]
- push dword ch6
- call [check_box_mouse]
- push dword use_rect
- call [check_box_mouse]
+ checkboxes_mouse2 check_boxes,check_boxes_end
+; push dword ch1
+; call [check_box_mouse]
+; push dword ch2
+; call [check_box_mouse]
+; push dword ch3
+; call [check_box_mouse]
+; push dword ch4
+; call [check_box_mouse]
+; push dword ch5
+; call [check_box_mouse]
+; push dword ch6
+; call [check_box_mouse]
+; push dword use_rect
+; call [check_box_mouse]
;-----------------------------------
; mouse_check_boxes check_boxes,check_boxes_end
; mouse_edit_boxes editboxes,editboxes_end
@@ -331,20 +336,23 @@ start_draw_window ;
draw_txt_buttons buttons,buttons_end ;
; draw_check_boxes check_boxes,check_boxes_end ; 䫠
;------ check all checkbox ---------
- push dword ch1
- call [check_box_draw]
- push dword ch2
- call [check_box_draw]
- push dword ch3
- call [check_box_draw]
- push dword ch4
- call [check_box_draw]
- push dword ch5
- call [check_box_draw]
- push dword ch6
- call [check_box_draw]
- push dword use_rect
- call [check_box_draw]
+; push dword ch1
+; call [check_box_draw]
+; push dword ch2
+; call [check_box_draw]
+; push dword ch3
+; call [check_box_draw]
+; push dword ch4
+; call [check_box_draw]
+; push dword ch5
+; call [check_box_draw]
+; push dword ch6
+; call [check_box_draw]
+; push dword use_rect
+; call [check_box_draw]
+
+ checkboxes_draw2 check_boxes,check_boxes_end
+
;------ end check all checkbox ------
stop_draw_window ; ᮢ
@@ -740,13 +748,13 @@ but7 txt_button 40,205,10,150,8,0,0,but_text.7,show_set_rect_window ;
buttons_end:
;---------------------------------------------------------------------
check_boxes:
-ch1 check_box 5,105,5,11,cl_white,0,0,ch_text.1,(ch_text.2-ch_text.1),ch_flag_en ; ᢥ
-ch2 check_box 5,120,5,11,cl_white,0,0,ch_text.2,(ch_text.3-ch_text.2),ch_flag_en ; ⥬ ᤥ ⨢
-ch3 check_box 145,105,5,11,cl_white,0,0,ch_text.3,(ch_text.4-ch_text.3),ch_flag_en ; ᭨
-ch4 check_box 5,135,5,11,cl_white,0,0,ch_text.4,(ch_text.5-ch_text.4),ch_flag_en ; প
-ch5 check_box 5,150,5,11,cl_white,0,0,ch_text.5,(ch_text.6-ch_text.5),ch_flag_en
-ch6 check_box 5,165,5,11,cl_white,0,0,ch_text.6,(ch_text.7-ch_text.6),ch_flag_en
-use_rect check_box 145,150,5,11,cl_white,0,0,ch_text.7,(ch_text.8-ch_text.7) ; .
+ch1 check_box2 (5 shl 16+11),(105 shl 16 +11),5,cl_white,0,0x80000000,ch_text.1,ch_flag_en+ch_flag_bottom ; ᢥ
+ch2 check_box2 (5 shl 16+11),(120 shl 16 +11),5,cl_white,0,0x80000000,ch_text.2,ch_flag_en+ch_flag_bottom ; ⥬ ᤥ ⨢
+ch3 check_box2 (1455 shl 16+11),(105 shl 16 +11),5,cl_white,0,0x80000000,ch_text.3,ch_flag_en+ch_flag_bottom ; ᭨
+ch4 check_box2 (5 shl 16+11),(135 shl 16 +11),5,cl_white,0,0x80000000,ch_text.4,ch_flag_en+ch_flag_bottom ; প
+ch5 check_box2 (5 shl 16+11),(150 shl 16 +11),5,cl_white,0,0x80000000,ch_text.5,ch_flag_en+ch_flag_bottom
+ch6 check_box2 (5 shl 16+11),(165 shl 16 +11),5,cl_white,0,0x80000000,ch_text.6,ch_flag_en+ch_flag_bottom
+use_rect check_box2 (145 shl 16+11),(150 shl 16 +11),5,cl_white,0,0x80000000,ch_text.7,ch_flag_bottom ; .
; ⮭㬥
check_boxes_end:
;---------------------------------------------------------------------
@@ -773,14 +781,13 @@ but_text:
.7 db '',0
ch_text:
-.1 db ' ';,0
-.2 db ' ᭨';,0
-.3 db '⥬ ᤥ ⨢';,0
-.4 db 'প:';,0
-.5 db '࠭';,0
-.6 db '⮭㬥, 稭 ';,0
-.7 db ''
-.8:
+.1 db ' ',0
+.2 db ' ᭨',0
+.3 db '⥬ ᤥ ⨢',0
+.4 db 'প:',0
+.5 db '࠭',0
+.6 db '⮭㬥, 稭 ',0
+.7 db '',0
no_shoot db ' ᤥ',0
shooting db '⮣...',0
@@ -820,14 +827,13 @@ but_text:
.7 db 'Set',0
ch_text:
-.1 db 'Minimize window';,0
-.2 db 'Show photo';,0
-.3 db 'then make active';,0
-.4 db 'Delay:';,0
-.5 db 'Autosave';,0
-.6 db 'Start numeration from';,0
-.7 db 'Area'
-.8:
+.1 db 'Minimize window',0
+.2 db 'Show photo',0
+.3 db 'then make active',0
+.4 db 'Delay:',0
+.5 db 'Autosave',0
+.6 db 'Start numeration from',0
+.7 db 'Area',0
no_shoot db 'There is no photo',0
shooting db 'Photographing...',0
diff --git a/programs/media/scrshoot/scrshoot.mac b/programs/media/scrshoot/scrshoot.mac
index 662461d018..f6c978b527 100644
--- a/programs/media/scrshoot/scrshoot.mac
+++ b/programs/media/scrshoot/scrshoot.mac
@@ -86,18 +86,18 @@ macro set_events_mask mask
mcall
}
-macro check_boxes_set_sys_color start,end,color_table
-{
-ch_left equ [edi] ;
-ch_top equ [edi+2] ;
-ch_text_margin equ [edi+4] ;=4
-ch_size equ [edi+8] ;12
-ch_color equ [edi+12] ; checkbox
-ch_border_color equ [edi+16] ; or [edi+4] ; checkbox
-ch_text_color equ [edi+20];[edi+4] ;
-ch_text_ptr equ [edi+24] ;
-ch_text_length equ [edi+28]
-ch_flags equ [edi+32] ;
+;macro check_boxes_set_sys_color start,end,color_table
+;{
+;ch_left equ [edi] ;
+;ch_top equ [edi+4] ;
+;ch_text_margin equ [edi+8] ;=4
+;ch_size equ [edi+8] ;12
+;ch_color equ [edi+12] ; checkbox
+;ch_border_color equ [edi+16] ; or [edi+4] ; checkbox
+;ch_text_color equ [edi+20];[edi+4] ;
+;ch_text_ptr equ [edi+24] ;
+;ch_text_length equ [edi+28]
+;ch_flags equ [edi+32] ;
;ch_left equ [edi] ;
@@ -109,17 +109,17 @@ ch_flags equ [edi+32] ;
;ch_text_length equ [edi+20] ; (2^64 )
;ch_flags equ [edi+24] ;
- mov edi,start
- mov ecx,((end-start)/ch_struc_size)
- mov esi,color_table
-@@:
- push dword [esi+32]
- pop dword ch_text_color
- push dword [esi+36]
- pop dword ch_border_color
- add edi,ch_struc_size
- loop @b
-}
+; mov edi,start
+; mov ecx,((end-start)/ch_struc_size)
+; mov esi,color_table
+;@@:
+; push dword [esi+32]
+; pop dword ch_text_color
+; push dword [esi+36]
+; pop dword ch_border_color
+; add edi,ch_struc_size
+; loop @b
+;}
macro get_key
{
;mov eax,2
diff --git a/programs/media/scrshoot/srectwin.inc b/programs/media/scrshoot/srectwin.inc
index 37f54dd842..bddf62fbb8 100644
--- a/programs/media/scrshoot/srectwin.inc
+++ b/programs/media/scrshoot/srectwin.inc
@@ -258,8 +258,14 @@ edit_box_key dd aEdit_box_key
edit_box_mouse dd aEdit_box_mouse
;version_ed dd aVersion_ed
+
+init_checkbox dd aInit_checkbox
check_box_draw dd aCheck_box_draw
-check_box_mouse dd aCheck_box_mouse
+check_box_mouse dd aCheck_box_mouse
+;version_ch dd aVersion_ch
+
+;check_box_draw dd aCheck_box_draw
+;check_box_mouse dd aCheck_box_mouse
;version_ch dd aVersion_ch
option_box_draw dd aOption_box_draw
@@ -297,11 +303,17 @@ PathShow_draw dd sz_PathShow_draw
aEdit_box_draw db 'edit_box',0
aEdit_box_key db 'edit_box_key',0
-aEdit_box_mouse db 'edit_box_mouse',0
+aEdit_box_mouse db 'edit_box_mouse',0
;aVersion_ed db 'version_ed',0
-aCheck_box_draw db 'check_box_draw',0
-aCheck_box_mouse db 'check_box_mouse',0
+
+aInit_checkbox db 'init_checkbox2',0
+aCheck_box_draw db 'check_box_draw2',0
+aCheck_box_mouse db 'check_box_mouse2',0
+;aVersion_ch db 'version_ch2',0
+
+;aCheck_box_draw db 'check_box_draw',0
+;aCheck_box_mouse db 'check_box_mouse',0
;aVersion_ch db 'version_ch',0
aOption_box_draw db 'option_box_draw',0