diff --git a/programs/develop/libraries/box_lib/asm/trunk/build.bat b/programs/develop/libraries/box_lib/asm/trunk/build.bat index 1f74d2a24a..2c93334ae5 100644 --- a/programs/develop/libraries/box_lib/asm/trunk/build.bat +++ b/programs/develop/libraries/box_lib/asm/trunk/build.bat @@ -4,15 +4,9 @@ if not exist bin mkdir bin @fasm.exe -m 16384 ctrldemo.asm bin\ctrldemo.kex @kpack bin\ctrldemo.kex -@fasm.exe -m 16384 OpenDial.asm bin\OpenDial -@kpack bin\OpenDial - @copy reload_16x16_8b.png bin\reload_16x16_8b.png -@copy cnv_png.obj bin\cnv_png.obj -@copy icons.ini bin\icons.ini -@copy z_icons.png bin\z_icons.png @fasm.exe -m 16384 editbox_ex.asm bin\editbox_ex.kex @kpack bin\editbox_ex.kex -pause \ No newline at end of file +@pause \ No newline at end of file diff --git a/programs/develop/libraries/box_lib/asm/trunk/build.sh b/programs/develop/libraries/box_lib/asm/trunk/build.sh index ffea4da9e7..14012118eb 100755 --- a/programs/develop/libraries/box_lib/asm/trunk/build.sh +++ b/programs/develop/libraries/box_lib/asm/trunk/build.sh @@ -6,13 +6,9 @@ echo "lang fix en" > lang.inc mkdir bin fasm -m 16384 ctrldemo.asm ./bin/ctrldemo.kex - fasm -m 16384 OpenDial.asm ./bin/OpenDial fasm -m 16384 editbox_ex.asm ./bin/editbox_ex.kex rm -f lang.inc cp reload_16x16_8b.png ./bin/reload_16x16_8b.png - cp cnv_png.obj ./bin/cnv_png.obj - cp icons.ini ./bin/icons.ini - cp z_icons.png ./bin/z_icons.png exit 0 diff --git a/programs/develop/libraries/box_lib/asm/trunk/cnv_png.obj b/programs/develop/libraries/box_lib/asm/trunk/cnv_png.obj deleted file mode 100644 index 096b85dc33..0000000000 Binary files a/programs/develop/libraries/box_lib/asm/trunk/cnv_png.obj and /dev/null differ diff --git a/programs/develop/libraries/box_lib/asm/trunk/ctrldemo.asm b/programs/develop/libraries/box_lib/asm/trunk/ctrldemo.asm index 8e2f465c38..18550d9c59 100644 --- a/programs/develop/libraries/box_lib/asm/trunk/ctrldemo.asm +++ b/programs/develop/libraries/box_lib/asm/trunk/ctrldemo.asm @@ -105,7 +105,8 @@ load_libraries l_libs_start,end_l_libs xor eax,eax mov [return_code],eax - mov eax,image_file +; mov eax,image_file + push image_file call [cnv_png_import.Start] mov ecx,[image_file] @@ -300,8 +301,7 @@ OpenDialog_start: ; mov edi,library_path ; call copy_file_path - copy_path open_dialog_name,path,library_path,0 - +; copy_path open_dialog_name,path,library_path,0 push dword OpenDialog_data call [OpenDialog_Start] diff --git a/programs/develop/libraries/box_lib/asm/trunk/data.inc b/programs/develop/libraries/box_lib/asm/trunk/data.inc index aca34d7566..9acf77af89 100644 --- a/programs/develop/libraries/box_lib/asm/trunk/data.inc +++ b/programs/develop/libraries/box_lib/asm/trunk/data.inc @@ -450,7 +450,7 @@ OpenDialog_data: .com_area dd 0 ;+12 .opendir_pach dd plugin_pach ;+16 .dir_default_pach dd communication_area_default_pach ;+20 -.start_path dd library_path ;+24 +.start_path dd od_path ;+24 .draw_window dd draw_window ;+28 .status dd 0 ;+32 .openfile_pach dd openfile_pach ;+36 @@ -465,8 +465,12 @@ OpenDialog_data: communication_area_name: db 'FFFFFFFF_open_dialog',0 -open_dialog_name: - db 'opendial',0 +;open_dialog_name: +; db 'opendial',0 + +od_path: + db '/sys/File Managers/OpenDial',0 + communication_area_default_pach: db '/rd/1',0 diff --git a/programs/develop/libraries/box_lib/asm/trunk/OpenDial.asm b/programs/fs/opendial/OpenDial.asm similarity index 95% rename from programs/develop/libraries/box_lib/asm/trunk/OpenDial.asm rename to programs/fs/opendial/OpenDial.asm index 1c1b7ade01..0a65cd77f5 100644 --- a/programs/develop/libraries/box_lib/asm/trunk/OpenDial.asm +++ b/programs/fs/opendial/OpenDial.asm @@ -38,9 +38,9 @@ dd param dd path -include '../../../../../macros.inc' -include '../../load_lib.mac' -include '../../trunk/box_lib.mac' +include '../../macros.inc' +include '../../develop/libraries/box_lib/load_lib.mac' +include '../../develop/libraries/box_lib/trunk/box_lib.mac' ;include 'macros.inc' ;include 'load_lib.mac' ;include 'box_lib.mac' @@ -1660,7 +1660,8 @@ get_window_param: convert_icons: xor eax,eax mov [return_code],eax - mov eax,image_file +; mov eax,image_file + push image_file call [cnv_png_import.Start] mov ecx,[image_file] diff --git a/programs/fs/opendial/build.bat b/programs/fs/opendial/build.bat new file mode 100644 index 0000000000..66fd50694b --- /dev/null +++ b/programs/fs/opendial/build.bat @@ -0,0 +1,5 @@ +@echo lang fix en >lang.inc +@fasm.exe -m 16384 opendial.asm opendial +@erase lang.inc +@kpack opendial +@pause \ No newline at end of file diff --git a/programs/fs/opendial/build.sh b/programs/fs/opendial/build.sh new file mode 100644 index 0000000000..cd51f9260e --- /dev/null +++ b/programs/fs/opendial/build.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# This script does for Linux the same as build.bat for DOS, +# it compiles the current KolibriOS applications + + echo "lang fix en" + echo "lang fix en" > lang.inc + fasm -m 16384 opendial.asm opendial + rm -f lang.inc + exit 0 + + + diff --git a/programs/develop/libraries/box_lib/asm/trunk/icons.ini b/programs/fs/opendial/icons.ini similarity index 100% rename from programs/develop/libraries/box_lib/asm/trunk/icons.ini rename to programs/fs/opendial/icons.ini diff --git a/programs/develop/libraries/box_lib/asm/trunk/z_icons.png b/programs/fs/opendial/z_icons.png similarity index 100% rename from programs/develop/libraries/box_lib/asm/trunk/z_icons.png rename to programs/fs/opendial/z_icons.png diff --git a/programs/media/zsea/zSea.ini b/programs/media/zsea/zSea.ini index 8301415507..2a7fbf28ca 100644 --- a/programs/media/zsea/zSea.ini +++ b/programs/media/zsea/zSea.ini @@ -1,35 +1,20 @@ -[Associations] -ImageEditor=/sys/media/animage -TextViewer=/sys/tinypad +[ConvertPlugins] +CP0=cnv_bmp.obj +CP1=cnv_png.obj +CP2=cnv_jpeg.obj +CP3=cnv_gif.obj -[Path] -Plugins=/plugins/ -SysLibrary=/sys/lib/ -ButtonPictures=/buttons/ +[ApplicationsPaths] +Help=/sys/tinypad +Editor=/sys/media/animage +OpenDialog=/sys/File Managers/OpenDial -[Files] -PassiveButtonsPic=1.png -AktiveButtonsPic=2.png -ClickButtonsPic=3.png -DisableAButtonsPic=4.png -HelpText=zSea_keys.txt +[Other] +HelpFile=zSea_keys.txt -[Plugins] -BoxLib=box_lib.obj -Sort=sort.obj -Convert=convert.obj -Rotate=rotate.obj -Scaling=scaling.obj -Plugin1=cnv_bmp.obj -Plugin2=cnv_png.obj -Plugin3=cnv_jpeg.obj -Plugin4=cnv_gif.obj - -[Var] +[Variables] SortMode=2 ArrowsOffset=10 -SlideShowDelay=300 - +SlideShowDelay=200 ShowFileName=1 -FullScreen=1 -Zoom=100 \ No newline at end of file +FilteringFlag=1