From 0c97a5b79583df9ccce9ddff91b4004fcc966a90 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Mon, 13 Jun 2011 13:08:52 +0000 Subject: [PATCH] 1) OpenDialog is moved to separate directory and corrected for new cnv_png.obj 2) Ctrldemo (demo of Box_Lib) is corrected for new cnv_png.obj 3) Actual zsea.inc git-svn-id: svn://kolibrios.org@1953 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../libraries/box_lib/asm/trunk/build.bat | 8 +--- .../libraries/box_lib/asm/trunk/build.sh | 4 -- .../libraries/box_lib/asm/trunk/cnv_png.obj | Bin 3214 -> 0 bytes .../libraries/box_lib/asm/trunk/ctrldemo.asm | 6 +-- .../libraries/box_lib/asm/trunk/data.inc | 10 ++-- .../asm/trunk => fs/opendial}/OpenDial.asm | 9 ++-- programs/fs/opendial/build.bat | 5 ++ programs/fs/opendial/build.sh | 12 +++++ .../asm/trunk => fs/opendial}/icons.ini | 0 .../asm/trunk => fs/opendial}/z_icons.png | Bin programs/media/zsea/zSea.ini | 43 ++++++------------ 11 files changed, 47 insertions(+), 50 deletions(-) delete mode 100644 programs/develop/libraries/box_lib/asm/trunk/cnv_png.obj rename programs/{develop/libraries/box_lib/asm/trunk => fs/opendial}/OpenDial.asm (95%) create mode 100644 programs/fs/opendial/build.bat create mode 100644 programs/fs/opendial/build.sh rename programs/{develop/libraries/box_lib/asm/trunk => fs/opendial}/icons.ini (100%) rename programs/{develop/libraries/box_lib/asm/trunk => fs/opendial}/z_icons.png (100%) 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 096b85dc3347ff84a0a09c1d3b6670257bd6fabf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3214 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.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