badpork/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

zSea use check_box2

Browse Source 
git-svn-id: svn://kolibrios.org@3184 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA 2013-01-18 10:13:35 +00:00
parent ebd56b6fdf
commit 81ba3134e6
5 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
programs/media/zsea/data.inc
View File

@ -742,6 +742,7 @@ 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
;version_ch dd aVersion_ch
@ -780,9 +781,10 @@ aEdit_box_key db 'edit_box_key',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
;aVersion_ch db 'version_ch',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
aOption_box_draw db 'option_box_draw',0
aOption_box_mouse db 'option_box_mouse',0
@ -952,15 +954,15 @@ option_group2_old dd 0
option_boxes_sort dd sort0, sort2, sort4, sort6,0
;---------------------------------------------------------------------
check1 check_box 120,50,6,12,0xFFFFFF,0,0xffffff,check_text1,14,0 ;ch_flag_en
check1 check_box2 (120 shl 16)+12,(50 shl 16)+12,6,0xFFFFFF,0,0xffffff,check_text1,ch_flag_middle ;ch_flag_en
check_text1 db 'Show file name'
check_text1 db 'Show file name',0
show_file_name_old dd 0
;---------------------------------------------------------------------
check2 check_box 120,70,6,12,0xFFFFFF,0,0xffffff,check_text2,14,0 ;ch_flag_en
check2 check_box2 (120 shl 16)+12,(70 shl 16)+12,6,0xFFFFFF,0,0xffffff,check_text2,ch_flag_middle ;ch_flag_en
check_text2 db 'Bilinear filtering'
check_text2 db 'Bilinear filtering',0
filtering_flag dd 0
filtering_flag_old dd 0

2
programs/media/zsea/draw_img.inc
View File

@ -320,7 +320,7 @@
ret
;****************************************************************************
draw_file_name_to_work_area:
mov eax,[check1+32]
mov eax,[check1.flags]
test eax,10b
jz @f
mov ebx,[file_name_length]

10
programs/media/zsea/libini.inc
View File

@ -44,7 +44,7 @@ Get_ini:
mov eax,1
@@:
shl eax,1
mov [check1+32],eax
mov [check1.flags],eax
invoke ini_get_int,plugin_pach,aVariables,aFilteringFlag,0
cmp eax,0
jb .error_aFilteringFlag
@ -55,7 +55,7 @@ Get_ini:
@@:
mov [filtering_flag],eax
shl eax,1
mov [check2+32],eax
mov [check2.flags],eax
; get convert plugins names
invoke ini_get_str,plugin_pach,aConvertPlugins,aCP0,plugin_0_name,127,ConvertPlugins_no_key
@ -84,10 +84,10 @@ Set_ini:
invoke ini_set_int,plugin_pach,aVariables,aSortMode,[sort_type]
invoke ini_set_int,plugin_pach,aVariables,aArrowsOffset,[arrows_offset]
invoke ini_set_int,plugin_pach,aVariables,aSlideShowDelay,[slide_show_delay]
mov eax,[check1+32]
mov eax,[check1.flags]
shr eax,1
mov [check1+32],eax
invoke ini_set_int,plugin_pach,aVariables,aShowFileName,[check1+32]
mov [check1.flags],eax
invoke ini_set_int,plugin_pach,aVariables,aShowFileName,[check1.flags]
invoke ini_set_int,plugin_pach,aVariables,aFilteringFlag,[filtering_flag]
ret
;---------------------------------------------------------------------

30
programs/media/zsea/win_opti.inc
View File

@ -24,9 +24,9 @@ thread7: ; start of bgrd thread
mov [slide_show_delay_old],eax
mov eax,[arrows_offset]
mov [arrows_offset_old],eax
mov eax,[check1+32]
mov eax,[check1.flags]
mov [show_file_name_old],eax
mov eax,[check2+32]
mov eax,[check2.flags]
mov [filtering_flag_old],eax
xor eax,eax
mov [option_pointer],eax
@ -53,11 +53,11 @@ thread7: ; start of bgrd thread
jmp .still
;---------------------------------------------------------------------
.mouse:
mov ebx,[check1+32]
mov ebx,[check1.flags]
and ebx,10b
push dword check1
call [check_box_mouse]
mov eax,[check1+32]
mov eax,[check1.flags]
and eax,10b
cmp ebx,eax
je @f ;.still
@ -68,11 +68,11 @@ thread7: ; start of bgrd thread
jmp .still
;---------------------------------------------------------------------
@@:
mov ebx,[check2+32]
mov ebx,[check2.flags]
and ebx,10b
push dword check2
call [check_box_mouse]
mov eax,[check2+32]
mov eax,[check2.flags]
and eax,10b
cmp ebx,eax
je .still
@ -144,13 +144,13 @@ thread7: ; start of bgrd thread
mov eax,[arrows_offset_old]
mov [arrows_offset],eax
mov eax,[show_file_name_old]
mov [check1+32],eax
mov [check1.flags],eax
mov eax,[filtering_flag_old]
mov [check2+32],eax
mov [check2.flags],eax
jmp .close_all
;---------------------------------------------------------------------
.close_1:
mov eax,[check2+32]
mov eax,[check2.flags]
test eax,10b
jz @f
@ -240,27 +240,27 @@ thread7: ; start of bgrd thread
jmp .still
;---------------------------------------------------------------------
.space_check1:
test [check1+32],dword 10b
test [check1.flags],dword 10b
jnz @f
or [check1+32],dword 10b
or [check1.flags],dword 10b
jmp .space_check1_1
;---------------------------------------------------------------------
@@:
xor [check1+32],dword 10b
xor [check1.flags],dword 10b
.space_check1_1:
call .draw_all_options_values
jmp .still
;---------------------------------------------------------------------
.space_check2:
test [check2+32],dword 10b
test [check2.flags],dword 10b
jnz @f
or [check2+32],dword 10b
or [check2.flags],dword 10b
jmp .space_check2_1
;---------------------------------------------------------------------
@@:
xor [check2+32],dword 10b
xor [check2.flags],dword 10b
.space_check2_1:
call .draw_all_options_values
jmp .still

7
programs/media/zsea/zSea.asm
View File

@ -85,6 +85,11 @@ START: ; start of execution
call load_plugins
;init_checkboxes2 check1,...
push check1
call [init_checkbox]
push check2
call [init_checkbox]
call load_buttons
@ -473,7 +478,7 @@ include 'win_bcgr.inc'
include 'win_sort.inc'
include 'win_opti.inc'
include 'libini.inc'
include '../../../dll.inc'
include '../../dll.inc'
include 'data.inc'
;---------------------------------------------------------------------
IM_END: