kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into feature/themes/flat 

fix conflicts in merge
This commit is contained in:
Carsten Haitzler 2019-12-20 16:31:56 +00:00
parent 008b8da792 b9818f566c
commit 45fca5d736
2555 changed files with 113226 additions and 100496 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.ci/asan-ignore-leaks.supp Normal file
View File

@ -0,0 +1,16 @@
# Evas
leak:evas_module_find_type
leak:generic_cache_new
# Edje / cpplib
leak:handle_directive
# Edje_cc
leak:edje_cc
leak:_efl_loop_message_handler_message_send
leak:ecore_ipc_client_add
# Elm_prefs_cc
leak:st_collection_page_items_item_label
leak:st_collection_page_items_item_name
leak:st_collection_page_items_item_string_placeholder
leak:st_collection_page_items_item_string_default
leak:st_collection_page_items_item_string_deny
leak:ob_collection_page_items_item

7
.ci/bootstrap-efl-native-for-cross.sh Executable file
View File

@ -0,0 +1,7 @@
#!/bin/sh
mkdir build-bootstrap-native
meson --prefix=/usr/ --libdir=/usr/lib -Dbuild-examples=false -Dbuild-tests=false -Dbindings=cxx build-bootstrap-native
ninja -C build-bootstrap-native install
rm -rf build-bootstrap-native
ldconfig

7
.ci/bootstrap_eolian.sh
View File

@ -1,7 +0,0 @@
#!/bin/sh
mkdir build-eolian-bootstrap
meson --prefix=/usr/ --libdir=/usr/lib -Deolian-bootstrap=true build-eolian-bootstrap
ninja -C build-eolian-bootstrap install
rm -rf build-eolian-bootstrap
ldconfig

16
.ci/build-example.sh Executable file
View File

@ -0,0 +1,16 @@
#!/bin/sh
set -e
if [ -d /usr/local/lib64 ] ; then
export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
else
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
fi
cd .ci/example
#build the example
mkdir build
meson . build
ninja -C build all

19
.ci/ci-build-test.sh Executable file
View File

@ -0,0 +1,19 @@
#!/bin/sh
set -e
. .ci/travis.sh
if [ "$1" = "coverity" ] || [ "$1" = "mingw" ] || [ "$1" = "release-ready" ] ; then
exit 0
fi
travis_fold compile_test compile_test
if [ "$DISTRO" != "" ] ; then
docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) .ci/build-example.sh
else
exit 0
#FIXME: we don't install efl_ui.pc on osx?
export PATH="$(brew --prefix gettext)/bin:$PATH"
.ci/build-example.sh
fi
travis_endfold compile_test

231
.ci/ci-configure.sh
View File

@ -1,162 +1,103 @@
#!/bin/sh
set -e
. .ci/travis.sh
if [ "$BUILDSYSTEM" = "ninja" ] ; then
if [ "$DISTRO" != "" ] ; then
# Normal build test of all targets
OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Davahi=false -Dbindings=luajit"
if [ "$DISTRO" != "" ] ; then
# Why do we need to disable the imf loaders here?
OPTS=" -Decore-imf-loaders-disabler=scim,ibus"
WAYLAND_LINUX_COPTS=" -Dwl=true -Ddrm=true -Dopengl=es-egl"
MONO_LINUX_COPTS=" -Dbindings=luajit,cxx,mono -Dmono-beta=true"
ENABLED_LINUX_COPTS=" -Dharfbuzz=true -Dhyphen=true"
WAYLAND_LINUX_COPTS=" -Dwl=true -Ddrm=true -Dopengl=es-egl -Dwl-deprecated=true -Ddrm-deprecated=true"
DISABLED_LINUX_COPTS=" -Dsystemd=false"
# TODO:
# - No libelogind package in fedora 30 repo
# - RPM fusion repo for xine and libvlc
# - Ibus
ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \
-Ddebug-threads=true -Dglib=true -Dg-mainloop=true -Dxpresent=true -Dxinput22=true \
-Devas-loaders-disabler=json -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=libvlc,xine \
-Demotion-generic-loaders-disabler=vlc -Dharfbuzz=true -Dpixman=true -Dhyphen=true \
-Dvnc-server=true -Dbindings=luajit,cxx,mono -Delogind=false -Dinstall-eo-files=true -Dphysics=true"
RELEASE_READY_LINUX_COPTS=" --buildtype=release"
# Enabled png, jpeg evas loader for in tree edje file builds
DISABLED_LINUX_COPTS=" -Daudio=false -Davahi=false -Dx11=false -Dphysics=false -Deeze=false \
-Dopengl=none -Deina-magic-debug=false -Dbuild-examples=false -Dbuild-tests=false \
-Dcrypto=gnutls -Dglib=false -Dgstreamer=false -Dsystemd=false -Dpulseaudio=false \
-Dnetwork-backend=connman -Dxinput2=false -Dtslib=false \
-Devas-loaders-disabler=gst,pdf,ps,raw,svg,xcf,bmp,dds,eet,generic,gif,ico,jp2k,json,pmaps,psd,tga,tgv,tiff,wbmp,webp,xpm \
-Decore-imf-loaders-disabler=xim,ibus,scim -Demotion-loaders-disabler=gstreamer1,libvlc,xine \
-Demotion-generic-loaders-disabler=vlc -Dfribidi=false -Dfontconfig=false \
-Dedje-sound-and-video=false -Dembedded-lz4=false -Dlibmount=false -Dv4l2=false \
-Delua=true -Dnls=false -Dbindings= -Dlua-interpreter=luajit -Dnative-arch-optimization=false"
#evas_filter_parser.c:(.text+0xc59): undefined reference to `lua_getglobal' with interpreter lua
if [ "$1" = "options-enabled" ]; then
OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
fi
RELEASE_READY_LINUX_COPTS=" --buildtype=release"
if [ "$1" = "options-disabled" ]; then
OPTS="$OPTS $DISABLED_LINUX_COPTS"
fi
MINGW_COPTS="--cross-file .ci/cross_toolchain.txt -Davahi=false -Deeze=false -Dsystemd=false \
-Dpulseaudio=false -Dx11=false -Dopengl=none -Dlibmount=false \
-Devas-loaders-disabler=json,pdf,ps,raw,svg,rsvg \
-Dharfbuzz=true -Dpixman=true -Dembedded-lz4=false "
if [ "$1" = "wayland" ]; then
OPTS="$OPTS $WAYLAND_LINUX_COPTS"
fi
if [ "$1" = "release-ready" ]; then
OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
fi
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
--env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
--env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
else
# Prepare OSX env for build
mkdir -p ~/Library/LaunchAgents
ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents
launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig"
mkdir build && meson build -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Dbindings=luajit -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine
if [ "$1" = "default" ]; then
OPTS="$OPTS $MONO_LINUX_COPTS"
elif [ "$1" = "options-enabled" ]; then
OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
elif [ "$1" = "options-disabled" ]; then
OPTS="$OPTS $DISABLED_LINUX_COPTS"
elif [ "$1" = "wayland" ]; then
OPTS="$OPTS $WAYLAND_LINUX_COPTS"
elif [ "$1" = "release-ready" ]; then
OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
elif [ "$1" = "coverity" ]; then
OPTS="$OPTS $WAYLAND_LINUX_COPTS"
travis_fold cov-download cov-download
docker exec --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c '.ci/coverity-tools-install.sh'
travis_endfold cov-download
elif [ "$1" = "mingw" ]; then
OPTS="$OPTS $MINGW_COPTS"
travis_fold cross-native cross-native
docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
travis_endfold cross-native
fi
else
CI_BUILD_TYPE="$1"
DEFAULT_LINUX_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings --disable-dependency-tracking -C"
WAYLAND_LINUX_COPTS=" --enable-wayland --enable-elput --enable-drm \
--enable-wayland-ivi-shell --enable-gl-drm --with-opengl=es --enable-egl"
ENABLED_LINUX_COPTS=" --enable-harfbuzz --enable-liblz4 --enable-image-loader-webp --enable-xinput22 \
--enable-multisense --enable-lua-old --enable-xpresent --enable-hyphen \
--enable-pixman --enable-pixman-font --enable-pixman-rect --enable-pixman-line \
--enable-pixman-poly --enable-pixman-image --enable-pixman-image-scale-sample \
--enable-image-loader-generic --enable-libuv --enable-tile-rotate --enable-vnc-server \
--enable-fb --enable-v4l2 --enable-cserve \
--enable-ecore-wayland --enable-ecore-drm --enable-cancel-ok --with-crypto=gnutls \
--enable-debug --disable-gstreamer1 --enable-gstreamer"
# Not compatible with Open GL ES and thus the wayland options. Need to think about having different
# jobs for the different supported GL flavours.
#--enable-sdl
DISABLED_LINUX_COPTS=" --disable-neon --disable-libeeze --disable-systemd --disable-magic-debug \
--disable-valgrind --disable-gstreamer1 \
--disable-fontconfig --disable-fribidi --disable-poppler --disable-spectre --disable-libraw \
--disable-librsvg --disable-xcf --disable-libmount --disable-tslib --disable-audio \
--disable-pulseaudio --disable-avahi --disable-xinput2 --disable-xim --disable-scim \
--disable-ibus --disable-physics --disable-quick-launch --disable-elua"
RELEASE_READY_LINUX_COPTS=" --with-profile=release"
MINGW_COPTS=" --prefix=/ewpi-64-install --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/bin/eolian_gen \
--with-edje-cc=/usr/bin/edje_cc --with-eet-eet=/usr/bin/eet \
--with-bin-elm-prefs-cc=/usr/bin/elm_prefs_cc \
--disable-static --with-tests=regular --with-crypto=openssl \
--disable-libmount --disable-valgrind --disable-avahi --disable-spectre --disable-libraw \
--disable-librsvg --disable-pulseaudio --disable-cxx-bindings"
patch -p1 < .ci/efl.m4.diff
sed -i.orig 's/AC_INIT\(.*\)efl_version-[a-zA-Z0-9]\+/AC_INIT\1efl_version/g' configure.ac
if [ "$DISTRO" != "" ] ; then
# Normal build test of all targets
OPTS="$DEFAULT_LINUX_COPTS"
if [ "$1" = "options-enabled" ]; then
OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
fi
if [ "$1" = "options-disabled" ]; then
OPTS="$OPTS $DISABLED_LINUX_COPTS"
fi
if [ "$1" = "wayland" ]; then
OPTS="$OPTS $WAYLAND_LINUX_COPTS"
fi
if [ "$1" = "release-ready" ]; then
OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
fi
if [ "$1" = "mingw" ]; then
OPTS="$OPTS $MINGW_COPTS"
docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache'
docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap_eolian.sh'
fi
docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf'
travis_fold autoreconf autoreconf
if [ "$1" = "mingw" ]; then
docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache'
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \
--env CPPFLAGS="-I/ewpi-64-install/include -DECORE_WIN32_WIP_POZEFLKSD" --env LDFLAGS="-L/ewpi-64-install/lib/" --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
$(cat $HOME/cid) sh -c "autoreconf -iv"
else
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
--env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
--env LD="ld.gold" $(cat $HOME/cid) sh -c "LIBTOOLIZE_OPTIONS='--no-warn' autoreconf -iv"
fi
travis_endfold autoreconf
travis_fold configure "configure $OPTS"
if [ "$1" = "mingw" ]; then
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \
--env CPPFLAGS="-I/ewpi-64-install/include -DECORE_WIN32_WIP_POZEFLKSD" --env LDFLAGS="-L/ewpi-64-install/lib/" --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
$(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
else
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
--env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
--env LD="ld.gold" $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
fi
if [ "$1" = "asan" ]; then
travis_fold meson meson
docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
--env CXX="ccache g++" --env CFLAGS="-O0 -g" --env CXXFLAGS="-O0 -g" \
--env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS -Db_sanitize=address"
travis_endfold meson
elif [ "$1" = "mingw" ]; then
travis_fold meson meson
docker exec --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
$(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
travis_endfold meson
elif [ "$1" = "coverity" ]; then
travis_fold meson meson
docker exec --env EIO_MONITOR_POLL=1 --env CFLAGS="-fdirectives-only" --env CC="gcc" --env CXX="g++"\
--env CXXFLAGS="-fdirectives-only" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
travis_endfold meson
else
OSX_COPTS="--disable-cxx-bindings --with-tests=regular --disable-dependency-tracking -C"
# Prepare OSX env for build
mkdir -p ~/Library/LaunchAgents
ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents
launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig"
# Normal build test of all targets
rm -f ~/.ccache/ccache.conf
travis_fold autoreconf autoreconf
LIBTOOLIZE_OPTIONS='--no-warn' autoreconf -iv
travis_endfold autoreconf
travis_fold configure "configure $OSX_COPTS"
.ci/configure.sh $OSX_COPTS
travis_fold meson meson
docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
--env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
--env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
travis_endfold meson
fi
travis_endfold configure
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
# Prepare OSX env for build
mkdir -p ~/Library/LaunchAgents
ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents
launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig"
export CC="ccache gcc"
travis_fold meson meson
mkdir build && meson build -Dopengl=full -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Demotion-loaders-disabler=gstreamer1,libvlc,xine
travis_endfold meson
fi

16
.ci/ci-make-benchmark.sh
View File

@ -2,18 +2,14 @@
set -e
. .ci/travis.sh
if [ "$1" = "release-ready" ] ; then
if [ "$1" != "default" ] ; then
exit 0
fi
travis_fold benchmark "make benchmark"
if [ "$BUILDSYSTEM" = "ninja" ] ; then
echo "Nothing to do here, the benchmarks don't seem to terminate"
travis_fold benchmark "ninja benchmark"
if [ "$DISTRO" != "" ] ; then
docker exec --env EIO_MONITOR_POLL=1 --env ELM_ENGINE=buffer $(cat $HOME/cid) ninja benchmark -C build
else
if [ "$DISTRO" != "" ] ; then
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark
else
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
make benchmark
fi
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
ninja benchmark -C build
fi
travis_endfold benchmark

53
.ci/ci-make-check.sh
View File

@ -1,52 +1,25 @@
#!/bin/sh
set -e
. .ci/travis.sh
if [ "$1" = "release-ready" ] ; then
exit 0
fi
if [ "$1" = "mingw" ] ; then
exit 0
fi
#T7151
if [ "$1" = "options-enabled" ] || [ "$1" = "options-disabled" ] ; then
if [ "$1" = "release-ready" ] || [ "$1" = "mingw" ] || [ "$1" = "coverity" ] || [ "$1" = "options-enabled" ] || [ "$1" = "options-disabled" ]; then
exit 0
fi
NUM_TRIES=5
travis_fold check "make check-TESTS"
if [ "$BUILDSYSTEM" = "ninja" ] ; then
if [ "$DISTRO" != "" ] ; then
# disable them for this distros, after meson 0.49 is out, this can be removed
# https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be
if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then
for tries in $(seq 1 ${NUM_TRIES}); do
(docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -C build --wrapper dbus-launch ) && break
docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
false
done
fi
fi
else
if [ "$DISTRO" != "" ] ; then
for tries in $(seq 1 ${NUM_TRIES}); do
(docker exec --env EINA_LOG_BACKTRACE="0" --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make -j2 -C src/ check-TESTS) && break
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log
if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
travis_fold check "ninja test"
if [ "$DISTRO" != "" ] ; then
for tries in $(seq 1 ${NUM_TRIES}); do
if [ "$1" = "asan" ]; then
(docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=detect_leaks=0:abort_on_error=0 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch) && break
else
(docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break
fi
docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
false
done
#else
#export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
#for tries in 1 2 3 ; do
#make -j2 -C src/ check-TESTS && break
#cat src/test-suite.log
#if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi
#false
#done
fi
done
fi
ret=$?
travis_endfold check

22
.ci/ci-make-checkbuild.sh
View File

@ -1,22 +0,0 @@
#!/bin/sh
set -e
. .ci/travis.sh
if [ "$1" = "release-ready" ] ; then
exit 0
fi
if [ "$1" = "mingw" ] ; then
exit 0
fi
travis_fold check-build "make check-build"
if [ "$BUILDSYSTEM" = "ninja" ] ; then
echo "Nothing to do here"
else
if [ "$DISTRO" != "" ] ; then
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make check-build
else
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
make check-build
fi
fi
travis_endfold check-build

31
.ci/ci-make-distcheck.sh
View File

@ -2,31 +2,20 @@
set -e
. .ci/travis.sh
if [ "$1" != "release-ready" ] ; then
exit 0
fi
travis_fold distcheck "make distcheck"
if [ "$BUILDSYSTEM" = "ninja" ] ; then
travis_fold distcheck "ninja dist"
if [ "$DISTRO" != "" ] ; then
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
--env CXX="ccache g++" \
--env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
--env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \
(sudo cat efl-*/_build/sub/src/test-suite.log; false)
else
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
ninja -C build dist
fi
docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
--env CXX="ccache g++" \
--env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
--env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \
(sudo cat efl-*/_build/sub/src/test-suite.log; false)
else
if [ "$DISTRO" != "" ] ; then
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
--env CXX="ccache g++" \
--env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
--env LD="ld.gold" $(cat $HOME/cid) bash -c .ci/distcheck.sh || \
(sudo cat efl-*/_build/sub/src/test-suite.log; false)
else
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
make
fi
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
ninja -C build dist
fi
travis_endfold distcheck

19
.ci/ci-make-examples.sh
View File

@ -1,19 +0,0 @@
#!/bin/sh
set -e
. .ci/travis.sh
if [ "$1" = "release-ready" ] ; then
exit 0
fi
travis_fold examples "make examples"
if [ "$BUILDSYSTEM" = "ninja" ] ; then
echo "TODO"
else
if [ "$DISTRO" != "" ] ; then
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make examples
else
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
make examples
fi
fi
travis_endfold examples

27
.ci/ci-make-install.sh
View File

@ -2,23 +2,20 @@
set -e
. .ci/travis.sh
if [ "$1" = "release-ready" ] ; then
if [ "$1" = "release-ready" ] || [ "$1" = "coverity" ] ; then
exit 0
fi
travis_fold install "make install"
if [ "$BUILDSYSTEM" = "ninja" ] ; then
if [ "$DISTRO" != "" ] ; then
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
else
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
ninja -C build install
fi
travis_fold install "ninja install"
if [ "$1" = "asan" ]; then
docker exec --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=abort_on_error=0 --env LSAN_OPTIONS=suppressions=/src/.ci/asan-ignore-leaks.supp $(cat $HOME/cid) ninja -C build install
exit $?
fi
if [ "$DISTRO" != "" ] ; then
docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
else
if [ "$DISTRO" != "" ] ; then
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make install
else
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
make install
fi
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
ninja -C build install
fi
travis_endfold install

29
.ci/ci-make.sh
View File

@ -2,23 +2,26 @@
set -e
. .ci/travis.sh
if [ "$1" = "release-ready" ] ; then
exit 0
fi
travis_fold make make
if [ "$BUILDSYSTEM" = "ninja" ] ; then
if [ "$DISTRO" != "" ] ; then
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
travis_fold ninja ninja
if [ "$1" = "asan" ]; then
docker exec --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=abort_on_error=0 --env LSAN_OPTIONS=suppressions=/src/.ci/asan-ignore-leaks.supp $(cat $HOME/cid) ninja -C build
exit $?
fi
if [ "$DISTRO" != "" ] ; then
if [ "$1" = "coverity" ] ; then
docker exec --env EIO_MONITOR_POLL=1 --env PATH="/src/cov-analysis-linux64-2019.03/bin:$PATH" $(cat $HOME/cid) sh -c "cov-build --dir cov-int ninja -C build"
docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) sh -c "tar caf efl-$(git rev-parse --short HEAD).xz cov-int"
docker exec --env EIO_MONITOR_POLL=1 --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c ".ci/coverity-upload.sh"
else
export PATH="$(brew --prefix gettext)/bin:$PATH"
ninja -C build
docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
fi
else
if [ "$DISTRO" != "" ] ; then
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make
else
export PATH="$(brew --prefix gettext)/bin:$PATH"
make
fi
export PATH="$(brew --prefix gettext)/bin:$PATH"
ninja -C build
fi
travis_endfold make
travis_endfold ninja

6
.ci/ci-osx-deps.sh
View File

@ -1,6 +0,0 @@
#!/bin/sh
brew update
brew unlink python
brew install gettext check bullet dbus fontconfig freetype fribidi gst-plugins-good gstreamer luajit openssl webp libsndfile glib libspectre libraw librsvg poppler lz4 pulseaudio ccache ninja python3 libffi
pip3 install meson

3
.ci/ci-setup-ccache.sh
View File

@ -7,6 +7,7 @@ if [ "$DISTRO" != "" ] ; then
docker exec $(cat $HOME/cid) ccache -pz
else
cp .ci/ccache.conf ~/.ccache
ccache -o base_dir="$(pwd)"
sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
echo "base_dir = $pwd" >> ~/.ccache/ccache.conf
ccache -pz
fi

11
.ci/configure.sh
View File

@ -1,11 +0,0 @@
#!/bin/bash +e
set -o pipefail
export TEST_VAR=1
if ! ./configure $@ 2>&1 | tee -a configlog ; then
if grep -q 'configure: error: changes in the environment can compromise the build' configlog ; then
echo "clearing config.cache and retrying..."
rm -f configlog config.cache
./configure $@
fi
fi

4
.ci/coverity-tools-install.sh Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
wget https://scan.coverity.com/download/linux64 --post-data="token=$COVERITY_SCAN_TOKEN&project=Enlightenment+Foundation+Libraries" -O coverity_tool.tgz
tar xzf coverity_tool.tgz

8
.ci/coverity-upload.sh Executable file
View File

@ -0,0 +1,8 @@
#!/bin/sh
curl --form token=$COVERITY_SCAN_TOKEN \
--form email=stefan@datenfreihafen.org \
--form file=@efl-$(git rev-parse --short HEAD).xz \
--form version=$(git rev-parse --short HEAD) \
--form description="Submission from Travis CI" \
https://scan.coverity.com/builds?project=Enlightenment+Foundation+Libraries

20
.ci/cross_toolchain.txt Normal file
View File

@ -0,0 +1,20 @@
[binaries]
c = ['ccache', 'x86_64-w64-mingw32-gcc']
cpp = ['ccache', 'x86_64-w64-mingw32-g++']
ar = 'x86_64-w64-mingw32-ar'
ranlib = 'x86_64-w64-mingw32-ranlib'
strip = 'x86_64-w64-mingw32-strip'
windres = 'x86_64-w64-mingw32-windres'
pkgconfig = 'x86_64-w64-mingw32-pkg-config'
[host_machine]
system = 'windows'
cpu_family = 'x86_64'
cpu = 'x86_64'
endian = 'little'
[properties]
c_args = ['-D_WIN32_WINNT=0x0601', '-I/ewpi-64-install/include', '-O2', '-pipe', '-march=x86-64']
c_link_args = ['-L/ewpi-64-install/lib', '-s']
cpp_args = ['-D_WIN32_WINNT=0x0601', '-I/ewpi-64-install/include', '-O2', '-pipe', '-march=x86-64']
cpp_link_args = ['-L/ewpi-64-install/lib', '-s']

125
.ci/distcheck.sh
View File

@ -1,125 +0,0 @@
#!/bin/bash
. .ci/travis.sh
scrape_makefile_variable() {
#try to scrape $1 from Makefile
num=0
var=
while true ; do
var="$(grep -A${num} -m1 -w $1 Makefile.am)"
#continually increment number of lines scraped if backslash is detected
if echo "$var" | tail -n1 | grep -q '\\' ; then
num=$((++num))
else
#cut out line wrapping
var=$(echo "$var" | tr -d '\n\\' | cut -d= -f2-)
break
fi
done
echo $var
}
#attempt to keep this as close to original makefile rule as possible
#for ease of future updating
set -e
travis_fold dist "make dist"
#create dist tarball
make dist
travis_endfold dist
#set distdir variable to current package string
distdir="$(grep '^PACKAGE_STRING' config.log|cut -d\' -f2|tr ' ' -)"
DIST_ARCHIVES=${distdir}.tar.xz
MAKE=make
#unpack dist tarball
xz -dc ${distdir}.tar.xz | tar -xf -
chmod -R a-w ${distdir}
chmod u+w ${distdir}
mkdir ${distdir}/_build ${distdir}/_build/sub ${distdir}/_inst
chmod a-w ${distdir}
test -d ${distdir}/_build
dc_install_base=`cd ${distdir}/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'`
dc_destdir="${TMPDIR-/tmp}/am-dc-XXXX"
am__cwd=`pwd`
AM_DISTCHECK_CONFIGURE_FLAGS="$(scrape_makefile_variable AM_DISTCHECK_CONFIGURE_FLAGS)"
AM_MAKEFLAGS="$(scrape_makefile_variable AM_MAKEFLAGS)"
travis_fold configure "configuring distcheck build"
cd ${distdir}/_build/sub
../../configure \
${AM_DISTCHECK_CONFIGURE_FLAGS} \
${DISTCHECK_CONFIGURE_FLAGS} \
--srcdir=../.. --prefix="$dc_install_base"
travis_endfold configure
travis_fold make make
make ${AM_MAKEFLAGS}
travis_endfold make
travis_fold dvi dvi
make ${AM_MAKEFLAGS} dvi
travis_endfold dvi
travis_fold check-build check-build
make ${AM_MAKEFLAGS} check-build
travis_endfold check-build
travis_fold check-TESTS check-TESTS
set +e
export EINA_LOG_BACKTRACE="0"
NUM_TRIES=5
for tries in $(seq 1 ${NUM_TRIES}); do
make ${AM_MAKEFLAGS} -C src/ -j1 check-TESTS && break
cat src/test-suite.log
if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; continue ; fi
exit 1
done
travis_endfold check-TESTS
set -e
travis_fold make_install "make install"
make ${AM_MAKEFLAGS} install
travis_endfold make_install
travis_fold make_installcheck "make installcheck"
make ${AM_MAKEFLAGS} installcheck
travis_endfold make_installcheck
travis_fold make_testapp "testing external compile"
PKG_CONFIG_PATH=${dc_install_base}/lib/pkgconfig ${am__cwd}/.ci/build-efl-app.sh
travis_endfold make_testapp
travis_fold make_uninstall "make uninstall"
make ${AM_MAKEFLAGS} uninstall
travis_endfold make_uninstall
travis_fold distuninstallcheck "make distuninstallcheck"
make ${AM_MAKEFLAGS} distuninstallcheck_dir="$dc_install_base" \
distuninstallcheck
travis_endfold distuninstallcheck
chmod -R a-w "$dc_install_base"
(cd ../.. && umask 077 && mktemp -d "$dc_destdir")
travis_fold dist-install "make dist-install"
make ${AM_MAKEFLAGS} DESTDIR="$dc_destdir" install
travis_endfold dist-install
travis_fold dist-uninstall "make dist-uninstall"
make ${AM_MAKEFLAGS} DESTDIR="$dc_destdir" uninstall
travis_endfold dist-uninstall
travis_fold dist-distuninstallcheck "make dist-distuninstallcheck"
make ${AM_MAKEFLAGS} DESTDIR="$dc_destdir" \
distuninstallcheck_dir="$dc_destdir" distuninstallcheck \
|| { rm -rf "$dc_destdir"; exit 1; }
travis_endfold dist-distuninstallcheck
rm -rf "$dc_destdir"
travis_fold dist-dist "make dist-dist"
make ${AM_MAKEFLAGS} dist
travis_endfold dist-dist
rm -rf ${DIST_ARCHIVES}
travis_fold dist-distcleancheck "make dist-distcleancheck"
make ${AM_MAKEFLAGS} distcleancheck
travis_endfold dist-distcleancheck
cd "$am__cwd"
#$(am__post_remove_distdir)
if test -d "${distdir}"; then
find "${distdir}" -type d ! -perm -200 -exec chmod u+w {} ';' \
&& rm -rf "${distdir}" \
|| { rm -rf "${distdir}"; }; \
else :; fi

6
.ci/docker-ccache-setup.sh
View File

@ -5,7 +5,9 @@ CI_BUILD_TYPE="$1"
cp .ci/ccache.conf ~/.ccache
if [ "$1" = "release-ready" ] ; then
ccache -o base_dir="$(pwd)/$(grep '^PACKAGE_STRING' config.log|cut -d\' -f2|tr ' ' -)"
sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
echo "base_dir = $(pwd)/$(grep '^PACKAGE_STRING' config.log|cut -d\' -f2|tr ' ' -)" >> ~/.ccache/ccache.conf
else
ccache -o base_dir=$(pwd)
sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
echo "base_dir = $pwd" >> ~/.ccache/ccache.conf
fi

24
.ci/efl.m4.diff
View File

@ -1,24 +0,0 @@
diff --git a/m4/efl.m4 b/m4/efl.m4
index d051155e56..4b91c60963 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -22,14 +22,14 @@ dnl dev_version = development version (svn revision).
dnl def_build_profile = dev or release based on 'dev' release parameter.
AC_DEFUN([EFL_VERSION],
[dnl
-m4_define([v_maj], [$1])dnl
-m4_define([v_min], [$2])dnl
-m4_define([v_mic], [$3])dnl
-m4_define([dev_version], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl
+m4_define([v_maj], [1])dnl
+m4_define([v_min], [99])dnl
+m4_define([v_mic], [99])dnl
+m4_define([dev_version], [0])
m4_define([v_rev], m4_if($4, dev, [dev_version], [0]))dnl
m4_define([v_rel], [])dnl
m4_define([def_build_profile], m4_if($4, dev, [dev], [release]))dnl
-m4_define([efl_version], m4_if($4, dev, [v_maj.v_min.v_mic.v_rev], [v_maj.v_min.v_mic]))dnl
+m4_define([efl_version], [v_maj.v_min.v_mic])dnl
dnl m4_define([efl_version], [v_maj.v_min.v_mic])dnl
])

13
.ci/example/meson.build Normal file
View File

@ -0,0 +1,13 @@
project(
'efl-example', 'c',
version : '0.0.1',
default_options: [ 'c_std=gnu99', 'warning_level=2' ],
meson_version : '>= 0.38.0')
eina = dependency('eina', version : '>=1.20.99')
efl = dependency('efl-ui', version : '>=1.20.99')
elm = dependency('elementary', version : '>=1.20.99')
inc = include_directories('.')
subdir('src')

11
.ci/example/src/main.c Normal file
View File

@ -0,0 +1,11 @@
#define EFL_BETA_API_SUPPORT 1
#define EFL_NOLEGACY_API_SUPPORT
#include <Efl_Ui.h>
EAPI_MAIN void
efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
{
return;
}
EFL_MAIN()

12
.ci/example/src/meson.build Normal file
View File

@ -0,0 +1,12 @@
src = files([
'main.c',
])
deps = [eina, efl, elm]
executable('efl_example', src,
dependencies : deps,
include_directories : inc,
install : true
)

2
.gitignore vendored
View File

@ -72,7 +72,6 @@ __pycache__
/compile
/test-driver
/missing
/INSTALL
/ABOUT-NLS
/config.rpath
/coverage
@ -95,3 +94,4 @@ Session.vim
/.settings/
efl_libs.csv
.vscode/
.uuid

7
.lgtm.yml Normal file
View File

@ -0,0 +1,7 @@
extraction:
python:
python_setup:
version: 3
queries:
-
exclude: cpp/fixme-comment

68
.mailmap
View File

@ -16,9 +16,11 @@ Cedric BAIL <cedric.bail@free.fr> Cedric BAIL <cedric@osg.samsung.com>
Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vtorri@univ-evry.fr>
Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vincent dot torri at gmail dot com>
Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vincent.torri@univ-evry.fr>
Vincent Torri <vincent.torri@gmail.com> Vincent 'vtorri' Torri <vincent.torri@gmail.com>
Tom Hacohen <tom@stosb.com> Tom 'TAsn' Hacohen <tom@stosb.com>
Tom Hacohen <tom@stosb.com> Tom <tom@stosb.com>
Gustavo Sverzut Barbieri <barbieri@gmail.com> Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
Gustavo Sverzut Barbieri <barbieri@gmail.com> Gustavo Sverzut Barbieri <gustavo.barbieri@intel.com>
Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@comcast.net>
Christopher Michael <devilhorns@comcast.net> Christopher Michael <cp.michael@samsung.com>
Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael1@comcast.net>
@ -28,6 +30,7 @@ Christopher Michael <devilhorns@comcast.net> Christopher <devilhorns@comcast.net
Christopher Michael <devilhorns@comcast.net> Chris Michael <cp.michael@samsung.com>
Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@osg.samsung.com>
Christopher Michael <devilhorns@comcast.net> Chris Michael <cpmichael@osg.samsung.com>
Christopher Michael <devilhorns@comcast.net> Chris Micheal <cp.michael@samsung.com>
Sebastian Dransfeld <sd@tango.flipp.net> Sebastian Dransfeld <sebastian.dransfeld@sintef.no>
Sebastian Dransfeld <sd@tango.flipp.net> sebastid <sebastid>
Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <m.blumenkran@samsung.com>
@ -35,13 +38,21 @@ Mike Blumenkrantz <michael.blumenkrantz@gmail.com> discomfitor <michael.blumenkr
Mike Blumenkrantz <michael.blumenkrantz@gmail.com> zmike <michael.blumenkrantz@gmail.com>
Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@samsung.com>
Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@osg.samsung.com>
Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Michael Blumenkrantz <mike@zentific.com>
Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@enlightenment.org>
ChunEon Park <hermet@hermet.pe.kr> ChunEon Park <chuneon.park@samsung.com>
ChunEon Park <hermet@hermet.pe.kr> Hermet Park <hermet@hermet.pe.kr>
ChunEon Park <hermet@hermet.pe.kr> Hermet Park <hermetpark@gmail.com>
ChunEon Park <hermet@hermet.pe.kr> hermet <hermet@neoni.(none)>
ChunEon Park <hermet@hermet.pe.kr> Hermet <hermet@hermet.pe.kr>
ChunEon Park <hermet@hermet.pe.kr> chuneon.park <chuneon.park@samsung.com>
David Walter Seikel <onefang@gmail.com> David Walter Seikel <won_fang@yahoo.com.au>
Rafael Antognolli <antognolli@gmail.com> Rafael Antognolli <rafael.antognolli@intel.com>
Rafael Antognolli <antognolli@gmail.com> Rafael Antognolli <rafael.antognolli@linux.intel.com>
Iván Briano <sachieru@gmail.com> Ivan Briano <ivan.briano@intel.com>
Iván Briano <sachieru@gmail.com> Ivan Briano <sachieru@gmail.com>
Iván Briano <sachieru@gmail.com> Iván Briano <ivan.briano@intel.com>
Iván Briano <sachieru@gmail.com> Ivan Briano <ivan@profusion.mobi>
Lucas De Marchi <lucas.demarchi@profusion.mobi> Lucas De Marchi <lucas.de.marchi@gmail.com>
Lucas De Marchi <lucas.demarchi@profusion.mobi> Lucas De Marchi <lucas.demarchi@intel.com>
Jihoon Kim <imfine98@gmail.com> Jihoon Kim <jihoon48.kim@samsung.com>
@ -60,21 +71,29 @@ Mike McCormack <mike@atratus.org> Mike McCormack <mj.mccormack@samsung.com>
Mike McCormack <mike@atratus.org> Mike McCormack <mikem@ring3k.org>
Mike McCormack <mike@atratus.org> Mike McCormack <mikem@atratus.org>
Boris Faure <billiob@gmail.com> Boris 'billiob' Faure <billiob@gmail.com>
Boris Faure <billiob@gmail.com> Boris Faure <boris@fau.re>
Eduardo Lima <eduardo.lima@intel.com> Eduardo Lima (Etrunko) <eduardo.lima@intel.com>
Panagiotis Galatsanos <galatsanosp@gmail.com> Godfath3r <galatsanosp@gmail.com>
Samuel F. Baggen <thanatermesis@gmail.com> Thanatermesis <thanatermesis@gmail.com>
Samuel F. Baggen <thanatermesis@gmail.com> Samuel F. Baggen <thanatermesis.elive@gmail.com>
Samuel F. Baggen <thanatermesis@gmail.com> Thanatermesis <thanatermesis.ecvs@gmail.com>
Jean Guyomarc'h <jean.guyomarch@gmail.com> Jean GUYOMARC'H <jean.guyomarch@gmail.com>
Marcel Hollerbach <marcel-hollerbach@t-online.de> Marcel Hollerbach <marcel.hollerbach@stzedn.de>
Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean Guyomarc'h <jean.guyomarch@gmail.com>
Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean GUYOMARC'H <jean.guyomarch@gmail.com>
Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean Guyomarc'h <jean.guyomarch@openwide.fr>
Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean Guyomarc'h <jean@guyomarch.bzh>
Marcel Hollerbach <mail@marcel-hollerbach.de> Marcel Hollerbach <marcel.hollerbach@stzedn.de>
Marcel Hollerbach <mail@marcel-hollerbach.de> Marcel Hollerbach <marcel-hollerbach@t-online.de>
Marcel Hollerbach <mail@marcel-hollerbach.de> Marcel Hollerbach <marcel@osg.samsung.com>
Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jp.andre@samsung.com>
Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe ANDRE <jpeg@videolan.org>
Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jpeg@videolan.org>
Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe André <jpeg@videolan.org>
Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <amitesh.sh@samsung.com>
Amitesh Singh <amitesh.sh@samsung.com> ami <singh.amitesh@gmail.com>
Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <singh.amitesh@gmail.com>
Tae-Hwan Kim <the81.kim@samsung.com> bluezery <ohpowel@gmail.com>
Tae-Hwan Kim <the81.kim@samsung.com> Bluezery <ohpowel@gmail.com>
Tae-Hwan Kim <the81.kim@samsung.com> bluezery <the81.kim@samsung.com>
Daniel Kolesa <daniel@octaforge.org> q66 <quaker66@gmail.com>
Daniel Kolesa <daniel@octaforge.org> q66 <d.kolesa@samsung.com>
Daniel Kolesa <daniel@octaforge.org> q66 <d.kolesa@osg.samsung.com>
@ -91,7 +110,52 @@ Daniel Zaoui <daniel.zaoui@samsung.com> Daniel Zaoui <daniel.zaoui@yahoo.com>
Daniel Zaoui <daniel.zaoui@samsung.com> daniel.zaoui@samsung.com <daniel.zaoui@samsung.com>
Jérémy Anger <angerj.dev@gmail.com> kidanger <angerj.dev@gmail.com>
Andy Williams <andy@andywilliams.me> handyande <handyande>
Andy Williams <andy@andywilliams.me> Andy Williams <andy@andywillias.me>
Davide Andreoli <dave@gurumeditation.it> Dave Andreoli <dave@gurumeditation.it>
Davide Andreoli <dave@gurumeditation.it> davemds <dave@gurumeditation.it>
Simon Lees <simon@simotek.net> Simon <simon@simotek.net>
Simon Lees <simon@simotek.net> Simon Lees (SUSE) <sflees@suse.de>
Subhransu Mohanty <sub.mohanty@samsung.com> SubhransuSekhar Mohanty <sub.mohanty@samsung.com>
Subhransu Mohanty <sub.mohanty@samsung.com> Subhransu Sekhar Mohanty <sub.mohanty@samsung.com>
Subhransu Mohanty <sub.mohanty@samsung.com> SubhransuSekhar Mohanty <sub.mohanty@samsung.com>
Subhransu Mohanty <sub.mohanty@samsung.com> sub.mohanty@samsung.com <sub.mohanty@samsung.com>
Subhransu Mohanty <sub.mohanty@samsung.com> subhransu <subhransu@subhransu-System.(none)>
Subhransu Mohanty <sub.mohanty@samsung.com> subhransu mohanty <sub.mohanty@samsung.com>
Thiep Ha <thiepha@gmail.com> Thiep Ha <thiep.ha@samsung.com>
Thiep Ha <thiepha@gmail.com> Thiep Ha <thiep.ha@gmail.com>
Thiep Ha <thiepha@gmail.com> thiepha (Thiep Ha) <thiepha@gmail.com>
Derek Foreman <derekf@osg.samsung.com> Derek Foreman <derek.foreman.samsung@gmail.com>
Daniel Hirt <hirt.danny@gmail.com> Daniel Hirt <daniel.hirt@samsung.com>
Jiyoun Park <jijibe99@gmail.com> Ji-Youn Park <jy0703.park@samsung.com>
Jiyoun Park <jijibe99@gmail.com> Jiyoun Park <jy0703.park@samsung.com>
Bruno da Silva Belo <brunodasilvabelo@gmail.com> Bruno da Silva Belo <bruno.belo@expertisesolutions.com.br>
Rafael Fonseca <rfonseca@profusion.mobi> Rafael Fonseca <r4f4rfs@gmail.com>
Lauro Moura <lauromoura@expertisesolutions.com.br> Lauro Moura <lauromoura@gmail.com>
Jaehyun Cho <jae_hyun.cho@samsung.com> Jaehyun Cho <jae_hyun_cho@naver.com>
Jérémy Zurcher <jeremy@asynk.ch> Jeremy Zurcher <jeremy@asynk.ch>
Youngbok Shin <youngb.shin@samsung.com> Youngbok Shin <youngb.shin@samsung.net>
Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen okra Houston <smhouston88@gmail.com>
Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <smhouston88@gmail.com>
Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <stephen@localhost.localdomain>
Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <stephen@lenovo.fedora>
Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <stephen@stephen.laptop>
WooHyun Jung <wh0705.jung@samsung.com> WooHyun Jung <woohyun0705@gmail.com>
Jaeun Choi <jaeun12.choi@samsung.com> Jaeun Choi <jaeun_choi@naver.com>
Michael BOUCHAUD <michael.bouchaud@gmail.com> Michael Bouchaud (yoz) <yoz@efl.so>
Michael BOUCHAUD <michael.bouchaud@gmail.com> Michael Bouchaud <yoz@efl.so>
Michael BOUCHAUD <michael.bouchaud@gmail.com> michael bouchaud <michael.bouchaud@gmail.com>
Michael Jennings <mej@kainx.org> Michael Jennings <mej@lbl.gov>
Taehyub Kim <taehyub.kim@samsung.com> taehyub <taehyub.kim@samsung.com>
Yury Usishchev <y.usishchev@samsung.com> Yury Usischev <y.usishchev@samsung.com>
Lukasz Stanislawski <l.stanislaws@samsung.com> Lukasz Stanislawski <l.stanislaws@AMDC2785.digital.local>
Lukasz Stanislawski <l.stanislaws@samsung.com> Lukasz Stanislawski <lukasz.stanislawski@gmail.com>
Ryuan Choi <ryuan.choi@gmail.com> Ryuan Choi <ryuan.choi@samsung.com>
Bryce Harrington <bryce@osg.samsung.com> Bryce Harrington <bryce@bryceharrington.org>
Jonathan Atton <jonathan.atton@gmail.com> Atton Jonathan <jonathan.atton@gmail.com>
Yeongjong Lee <yj34.lee@samsung.com> YeongJong Lee <yj34.lee@samsung.com>
Jaehwan Kim <jae.hwan.kim@samsung.com> Jaehwan Kim <jae.hwan.kim.neo@gmail.com>
Jaehwan Kim <jae.hwan.kim@samsung.com> Jae Hwan Kim <jae.hwan.kim@samsung.com>
Jaehwan Kim <jae.hwan.kim@samsung.com> 김재환 <jae.hwan.kim@samsung.com>
Jee-Yong Um <jc9.um@samsung.com> Jeeyong Um <jc9.um@samsung.com>
Savio Sena <savio@expertisesolutions.com.br> Savio S. Machado <savio.sena@acm.org>
Savio Sena <savio@expertisesolutions.com.br> Savio Sena <savio.sena@acm.org>

101
.travis.yml
View File

@ -1,15 +1,44 @@
version: ~> 1.0
language: c
cache:
directories:
- $HOME/cachedir
- $HOME/.ccache
- $HOME/autom4te.cache
sudo: required
dist: trusty
osx_image: xcode10.2
addons:
homebrew:
packages:
- gettext
- check
- bullet
- dbus
- fontconfig
- freetype
- fribidi
- gst-plugins-good
- gstreamer
- luajit
- openssl
- webp
- libsndfile
- glib
- libspectre
- libraw
- librsvg
- poppler
- lz4
- pulseaudio
- ccache
- ninja
- python3
- libffi
env:
global:
- MAKEFLAGS="-j5 -rR"
- EIO_MONITOR_POLL=1
- CC="ccache gcc"
- CXX="ccache g++"
@ -17,45 +46,34 @@ env:
jobs:
include:
- os: osx
env: BUILDSYSTEM=ninja
#- os: linux
#env: DISTRO=Fedora29-mingw CI_BUILD_TYPE=mingw
- os: linux
env: DISTRO=Fedora29 CI_BUILD_TYPE=options-enabled
env: DISTRO=Fedora31-mingw CI_BUILD_TYPE=mingw
- os: linux
env: DISTRO=Fedora29 CI_BUILD_TYPE=options-disabled
env: DISTRO=Fedora31 CI_BUILD_TYPE=options-enabled
- os: linux
env: DISTRO=Fedora29 CI_BUILD_TYPE=wayland
env: DISTRO=Fedora31 CI_BUILD_TYPE=options-disabled
- os: linux
env: DISTRO=Fedora29 CI_BUILD_TYPE=default
env: DISTRO=Fedora31 CI_BUILD_TYPE=wayland
- os: linux
env: DISTRO=Fedora29 CI_BUILD_TYPE=options-enabled BUILDSYSTEM=ninja
- os: linux
env: DISTRO=Fedora29 CI_BUILD_TYPE=options-disabled BUILDSYSTEM=ninja
- os: linux
env: DISTRO=Fedora29 CI_BUILD_TYPE=wayland BUILDSYSTEM=ninja
- os: linux
env: DISTRO=Fedora29 CI_BUILD_TYPE=default BUILDSYSTEM=ninja
- os: osx
if: type = cron
env: DISTRO=Fedora31 CI_BUILD_TYPE=default
- os: linux
if: type = cron
env: DISTRO=Fedora29 CI_BUILD_TYPE=release-ready
env: DISTRO=Fedora31 CI_BUILD_TYPE=release-ready
- os: linux
if: type = cron
env: DISTRO=Fedora29 CI_BUILD_TYPE=release-ready BUILDSYSTEM=ninja
env: DISTRO=Ubuntu1804
- os: linux
if: type = cron
env: DISTRO=Ubuntu1810
env: DISTRO=Ubuntu1910
- os: linux
if: type = cron
env: DISTRO=Debian96
- os: linux
if: type = cron
env: DISTRO=Ubuntu1810 BUILDSYSTEM=ninja
env: DISTRO=Fedora31 CI_BUILD_TYPE=coverity
- os: linux
if: type = cron
env: DISTRO=Debian96 BUILDSYSTEM=ninja
env: DISTRO=Fedora31 CI_BUILD_TYPE=asan
services:
- docker
@ -66,59 +84,35 @@ before_install:
rm -rf $HOME/Library/Caches/Homebrew
rm -rf $HOME/cachedir/Homebrew/Homebrew
mv $HOME/cachedir/Homebrew $HOME/Library/Caches/Homebrew
.ci/ci-osx-deps.sh
pip3 install meson
fi
before_script:
- |
if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" != "" ]]; then
docker pull stefanschmidt1/ci-support-files:$DISTRO
fi
- |
if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
docker version
docker run --cidfile $HOME/cid -t -d -v `pwd`:/src -v $HOME/.ccache:/root/.ccache -w /src stefanschmidt1/ci-support-files:$DISTRO bash
cp $HOME/cachedir/config.cache . || true
fi
- .ci/ci-ccache-stats.sh
- |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
cp $HOME/cachedir/config.cache . || true
fi
script:
- .ci/ci-configure.sh "$CI_BUILD_TYPE"
- .ci/ci-setup-ccache.sh "$CI_BUILD_TYPE"
- .ci/ci-make.sh "$CI_BUILD_TYPE"
- .ci/ci-make-checkbuild.sh "$CI_BUILD_TYPE"
#- .ci/ci-make-examples.sh "$CI_BUILD_TYPE"
- |
if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CI_BUILD_TYPE" == "" ]]; then
.ci/ci-make-benchmark.sh "$CI_BUILD_TYPE"
fi
#- .ci/ci-make-install.sh "$CI_BUILD_TYPE"
- .ci/ci-make-install.sh "$CI_BUILD_TYPE"
- .ci/ci-make-benchmark.sh "$CI_BUILD_TYPE"
- .ci/ci-make-check.sh "$CI_BUILD_TYPE"
- .ci/ci-make-distcheck.sh "$CI_BUILD_TYPE"
#- |
#if [[ "$DISTRO" == "" ]] && [[ "$TRAVIS_OS_NAME" != "linux" ]] ; then
#true
#elif [[ "$CI_BUILD_TYPE" != "release-ready" ]] ; then
#docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) .ci/build-efl-app.sh
#fi
- .ci/ci-build-test.sh "$CI_BUILD_TYPE"
before_cache:
- .ci/ci-ccache-stats.sh
- |
mkdir -p $HOME/cachedir
if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
sudo chown travis:travis $HOME/.ccache
mkdir -p $HOME/cachedir/
sudo cp config.cache $HOME/cachedir/
sudo chown travis:travis $HOME/cachedir/config.cache
sudo chown travis:travis $HOME/autom4te.cache
else
cp config.cache $HOME/cachedir
mv $HOME/Library/Caches/Homebrew $HOME/cachedir/Homebrew
fi
@ -128,7 +122,6 @@ notifications:
- "chat.freenode.net#edevelop"
on_success: change
on_failure: always
on_cancel: never
template:
- "TravisCI build %{build_number} in branch %{branch}: %{result} - %{message} (%{elapsed_time})"
- "Commit: %{commit_subject} (%{commit}) from %{author}"

40
AUTHORS
View File

@ -395,6 +395,46 @@ Jérôme Pinot <ngc891@gmail.com>
EFL-C++
-------
Savio Sena <savio@expertisesolutions.com.br>
Felipe Magno de Almeida <felipe@expertisesolutions.com.br>
Vitor Sousa <vitorsousa@expertisesolutions.com.br>
Lauro Moura <lauromoura@expertisesolutions.com.br>
Jean-Philippe Andre <jp.andre@samsung.com>
Luciana Magno de Almeida <luciana@expertisesolutions.com.br>
Jaehyun Cho <jae_hyun.cho@samsung.com>
Daniel Kolesa <quaker66@gmail.com>
Vincent Torri <vtorri at univ-evry dot fr>
Stefan Schmidt <stefan@datenfreihafen.org>
Cedric BAIL <cedric.bail@free.fr>
Xavi Artigas <xavierartigas@yahoo.es>
YeongJong Lee <yj34.lee@samsung.com>
Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Larry Lira <larry@expertisesolutions.com.br>
WooHyun Jung (woohyun) <woohyun0705@gmail.com>
Marcel Hollerbach <marcel-hollerbach@t-online.de>
Daniel Zaoui <daniel.zaoui@samsung.com>
Sanghyeon Lee <sh10233.lee@samsung.com>
Thiep Ha <thiepha@gmail.com>
Vinícius dos Santos Oliveira <vini.ipsmaker@expertisesolutions.com.br>
Bryce Harrington <bryce@osg.samsung.com>
Tom Hacohen <tom@stosb.com>
Carsten Haitzler <raster@rasterman.com>
Andrew Williams <andy@eandywilliams.me>
Amitesh Singh <singh.amitesh@gmail.com> <amitesh.sh@samsung.com>
EFL-C#
------
Felipe Magno de Almeida <felipe@expertisesolutions.com.br>
Vitor Sousa <vitorsousa@expertisesolutions.com.br>
Lauro Moura <lauromoura@expertisesolutions.com.br>
Jaehyun Cho <jae_hyun.cho@samsung.com>
Xavi Artigas <xavierartigas@yahoo.es>
Marcel Hollerbach <marcel-hollerbach@t-online.de>
YeongJong Lee <yj34.lee@samsung.com>
Daniel Kolesa <quaker66@gmail.com>
Vincent Torri <vtorri at univ-evry dot fr>
WooHyun Jung (woohyun) <woohyun0705@gmail.com>
Jean-Philippe Andre <jp.andre@samsung.com>
ELua
----

4
COMPLIANCE
View File

@ -39,9 +39,7 @@ pieces of information you will need.
Q. Do I need to make the source public of libraries or applications that I
build on top of EFL?
A. No, UNLESS you use the escape library. Escape is GPL. This is ONLY
needed for PS3 development, so unless you are doing this, it is not
relevant.
A. No
Q. Do I need to provide the source for EFL?
A. Yes. In general you do. If you are shipping any of the binaries or

2
COPYING
View File

@ -37,6 +37,8 @@ elementary: licenses/COPYING.LGPL
generic/evas: licenses/COPYING.GPL (separate binary/executable)
generic/emotion: licenses/COPYING.GPL (separate binary/executable)
efl: licenses/COPYING.LGPL
csharp bindings: licenses/COPYING.ASL
cxx bindings: licenses/COPYING.ASL
NOTE: If linked together, the result will be effectively be LGPL (or
GPL if escape is used) due to license characteristics.

59
INSTALL Normal file
View File

@ -0,0 +1,59 @@
** COMPILING and INSTALLING **
------------------------------
Meson is the build system used for this project. For more information please
see:
http://mesonbuild.com
----
Normal compilation in /usr/local:
meson . build
ninja -C build
sudo ninja -C build install
For meson build generic options:
meson --help
For a list of project specific options supported:
cat meson_options.txt
To set 1 or more project specific options:
meson --prefix=/path/to -Doption=value [-Dother=value2] [...] . build
To display current configuration:
meson configure build
The above will only work after at least the following is done:
meson . build
** QUICK AND DIRTY HELP **
--------------------------
How clean out the build and config and start fresh:
rm -rf build
How to make a dist tarball and check its build:
(must do it from git tree clone and commit all changes to git first)
ninja -C build dist
How to change prefix:
meson --prefix=/path/to/prefix . build
How to install in a specific destination directory for packaging:
DESTDIR=/path/to/destdir ninja -C build install
How to build with verbose output (full commands run):
ninja -C build -v

537
Makefile.am
View File

@ -1,537 +0,0 @@
ACLOCAL_AMFLAGS = -I m4
AM_MAKEFLAGS = --no-print-directory
AM_DISTCHECK_CONFIGURE_FLAGS = \
--with-tests=regular \
--with-systemdunitdir=. \
--enable-always-build-examples \
--disable-dependency-tracking
SUBDIRS = src data doc
if HAVE_PO
SUBDIRS += po
endif
MAINTAINERCLEANFILES = \
Makefile.in \
aclocal.m4 \
compile \
config.cache-env \
config.guess \
config.h.in \
config.h.in~ \
config.sub \
configure \
depcomp \
install-sh \
ltmain.sh \
missing \
m4/libtool.m4 \
m4/lt~obsolete.m4 \
m4/ltoptions.m4 \
m4/ltsugar.m4 \
m4/ltversion.m4
EXTRA_DIST = \
m4/pkg_var.m4 \
m4/ac_path_generic.m4 \
m4/ecore_check_c_extension.m4 \
m4/ecore_check_module.m4 \
m4/efl_attribute.m4 \
m4/efl_check_funcs.m4 \
m4/efl_compiler.m4 \
m4/efl_doxygen.m4 \
m4/efl_path_max.m4 \
m4/efl_threads.m4 \
m4/efl_libunwind.m4 \
m4/eina_check.m4 \
m4/eina_config.m4 \
m4/eio_check_options.m4 \
m4/evas_check_engine.m4 \
m4/evas_check_loader.m4 \
m4/evil_windows.m4 \
m4/libgcrypt.m4 \
m4/gcc_check_builtin.m4
EXTRA_DIST += \
README \
AUTHORS \
COPYING \
COMPLIANCE \
licenses/COPYING.LGPL \
licenses/COPYING.GPL \
licenses/COPYING.BSD \
licenses/COPYING.SMALL \
licenses/COPYING.FTL \
licenses/COPYING.NGINX-MIT \
old/ChangeLog.ecore \
old/ChangeLog.edje \
old/ChangeLog.eet \
old/ChangeLog.eeze \
old/ChangeLog.efreet \
old/ChangeLog.eina \
old/ChangeLog.eio \
old/ChangeLog.embryo \
old/ChangeLog.emotion \
old/ChangeLog.escape \
old/ChangeLog.ethumb \
old/ChangeLog.evas \
old/ChangeLog.evil \
old/ChangeLog.evil.0 \
old/NEWS.ecore \
old/NEWS.edje \
old/NEWS.eet \
old/NEWS.eeze \
old/NEWS.efreet \
old/NEWS.eina \
old/NEWS.eio \
old/NEWS.embryo \
old/NEWS.emotion \
old/NEWS.escape \
old/NEWS.ethumb \
old/NEWS.evas \
old/NEWS.evil \
old/README.ecore \
old/README.eldbus \
old/README.edje \
old/README.eet \
old/README.eeze \
old/README.efreet \
old/README.eina \
old/README.eio \
old/README.embryo \
old/README.emotion \
old/README.ephysics \
old/README.escape \
old/README.ethumb \
old/README.evas \
old/README.evil \
spec/efl.spec \
pkgbuild/PKGBUILD \
pkgbuild/efl.install
if HAVE_FREEBSD
pkgconfigdir = $(libdir)data/pkgconfig
else
pkgconfigdir = $(libdir)/pkgconfig
endif
pkgconfig_DATA =
if HAVE_WINDOWS
pkgconfig_DATA += pc/evil.pc
endif
if HAVE_PS3
pkgconfig_DATA += pc/escape.pc
endif
pkgconfig_DATA += \
pc/eina.pc \
pc/eo.pc \
pc/eolian.pc \
pc/efl.pc \
pc/emile.pc \
pc/eet.pc \
pc/evas.pc \
pc/ecore.pc \
pc/efl-core.pc \
pc/ecore-con.pc \
pc/efl-net.pc \
pc/ecore-ipc.pc \
pc/ecore-file.pc \
pc/ecore-input.pc \
pc/ecore-input-evas.pc \
pc/ecore-imf.pc \
pc/ecore-imf-evas.pc \
pc/ecore-evas.pc \
pc/ecore-avahi.pc \
pc/ector.pc \
pc/embryo.pc \
pc/eio.pc \
pc/eldbus.pc \
pc/efreet.pc \
pc/efreet-mime.pc \
pc/efreet-trash.pc \
pc/edje.pc \
pc/emotion.pc \
pc/ethumb.pc \
pc/ethumb_client.pc \
pc/elocation.pc \
pc/elementary.pc \
pc/efl-ui.pc
if HAVE_CXX
pkgconfig_DATA += \
pc/eina-cxx.pc \
pc/evas-cxx.pc \
pc/ecore-cxx.pc \
pc/efl-cxx.pc \
pc/eolian-cxx.pc \
pc/edje-cxx.pc \
pc/eet-cxx.pc \
pc/eo-cxx.pc \
pc/eio-cxx.pc \
pc/elementary-cxx.pc
endif
if HAVE_ELUA
pkgconfig_DATA += pc/elua.pc
endif
if HAVE_JS
pkgconfig_DATA += \
pc/eolian-js.pc \
pc/efl-js.pc \
pc/eo-js.pc \
pc/eina-js.pc
endif
if HAVE_CSHARP
pkgconfig_DATA += \
pc/efl-mono.pc
endif
if BUILD_ENGINE_SOFTWARE_X11
pkgconfig_DATA += pc/evas-software-x11.pc
endif
if BUILD_ENGINE_FB
pkgconfig_DATA += pc/evas-fb.pc
endif
if BUILD_ENGINE_EGLFS
pkgconfig_DATA += pc/evas-eglfs.pc
endif
if BUILD_ENGINE_BUFFER
pkgconfig_DATA += pc/evas-software-buffer.pc
endif
if BUILD_ENGINE_GL_X11
pkgconfig_DATA += pc/evas-opengl-x11.pc
endif
if BUILD_ENGINE_GL_SDL
pkgconfig_DATA += pc/evas-opengl-sdl.pc
endif
if BUILD_ENGINE_GL_COCOA
pkgconfig_DATA += pc/evas-opengl-cocoa.pc
endif
if BUILD_ENGINE_SOFTWARE_GDI
pkgconfig_DATA += pc/evas-software-gdi.pc
endif
if BUILD_ENGINE_SOFTWARE_DDRAW
pkgconfig_DATA += pc/evas-software-ddraw.pc
endif
if BUILD_ENGINE_WAYLAND_SHM
pkgconfig_DATA += pc/evas-wayland-shm.pc
endif
if BUILD_ENGINE_WAYLAND_EGL
pkgconfig_DATA += pc/evas-wayland-egl.pc
endif
if BUILD_ENGINE_DRM
pkgconfig_DATA += pc/evas-drm.pc
endif
if HAVE_ECORE_COCOA
pkgconfig_DATA += pc/ecore-cocoa.pc
endif
if HAVE_ECORE_FB
pkgconfig_DATA += pc/ecore-fb.pc
endif
if HAVE_ECORE_DRM
pkgconfig_DATA += pc/ecore-drm.pc
endif
if HAVE_ECORE_SDL
pkgconfig_DATA += pc/ecore-sdl.pc
endif
if HAVE_ECORE_WAYLAND
pkgconfig_DATA += pc/ecore-wayland.pc
endif
if HAVE_ECORE_WL2
pkgconfig_DATA += pc/ecore-wl2.pc
endif
if HAVE_EFL_WL
pkgconfig_DATA += pc/efl-wl.pc
endif
if HAVE_WIN32
pkgconfig_DATA += pc/ecore-win32.pc
endif
if HAVE_ECORE_X
pkgconfig_DATA += pc/ecore-x.pc
endif
if HAVE_EEZE
pkgconfig_DATA += pc/eeze.pc
endif
if HAVE_EPHYSICS
pkgconfig_DATA += pc/ephysics.pc
endif
if HAVE_ECORE_AUDIO
pkgconfig_DATA += pc/ecore-audio.pc pc/ecore-audio-cxx.pc
endif
if HAVE_ECORE_BUFFER
pkgconfig_DATA += pc/ecore-buffer.pc
endif
if HAVE_ELPUT
pkgconfig_DATA += pc/elput.pc
endif
if HAVE_ECORE_DRM2
pkgconfig_DATA += pc/ecore-drm2.pc
endif
# Cmake configs:
efl_cmakeconfigdir = $(libdir)/cmake/Efl/
efl_cmakeconfig_DATA = \
cmakeconfig/EflConfig.cmake \
cmakeconfig/EflConfigVersion.cmake
eina_cmakeconfigdir = $(libdir)/cmake/Eina/
eina_cmakeconfig_DATA = \
cmakeconfig/EinaConfig.cmake \
cmakeconfig/EinaConfigVersion.cmake
eio_cmakeconfigdir = $(libdir)/cmake/Eio/
eio_cmakeconfig_DATA = \
cmakeconfig/EioConfig.cmake \
cmakeconfig/EioConfigVersion.cmake
eeze_cmakeconfigdir = $(libdir)/cmake/Eeze/
eeze_cmakeconfig_DATA = \
cmakeconfig/EezeConfig.cmake \
cmakeconfig/EezeConfigVersion.cmake
eo_cmakeconfigdir = $(libdir)/cmake/Eo/
eo_cmakeconfig_DATA = \
cmakeconfig/EoConfig.cmake \
cmakeconfig/EoConfigVersion.cmake
eolian_cmakeconfigdir = $(libdir)/cmake/Eolian/
eolian_cmakeconfig_DATA = \
cmakeconfig/EolianConfig.cmake \
cmakeconfig/EolianConfigVersion.cmake \
cmakeconfig/EolianHelper.cmake
eolian_cxx_cmakeconfigdir = $(libdir)/cmake/EolianCxx/
eolian_cxx_cmakeconfig_DATA = \
cmakeconfig/EolianCxxConfig.cmake \
cmakeconfig/EolianCxxConfigVersion.cmake
eina_cxx_cmakeconfigdir = $(libdir)/cmake/EinaCxx/
eina_cxx_cmakeconfig_DATA = \
cmakeconfig/EinaCxxConfig.cmake \
cmakeconfig/EinaCxxConfigVersion.cmake
eo_cxx_cmakeconfigdir = $(libdir)/cmake/EoCxx/
eo_cxx_cmakeconfig_DATA = \
cmakeconfig/EoCxxConfig.cmake \
cmakeconfig/EoCxxConfigVersion.cmake
ecore_cxx_cmakeconfigdir = $(libdir)/cmake/EcoreCxx/
ecore_cxx_cmakeconfig_DATA = \
cmakeconfig/EcoreCxxConfig.cmake \
cmakeconfig/EcoreCxxConfigVersion.cmake
evas_cxx_cmakeconfigdir = $(libdir)/cmake/EvasCxx/
evas_cxx_cmakeconfig_DATA = \
cmakeconfig/EvasCxxConfig.cmake \
cmakeconfig/EvasCxxConfigVersion.cmake
eet_cxx_cmakeconfigdir = $(libdir)/cmake/EetCxx/
eet_cxx_cmakeconfig_DATA = \
cmakeconfig/EetCxxConfig.cmake \
cmakeconfig/EetCxxConfigVersion.cmake
eet_cmakeconfigdir = $(libdir)/cmake/Eet/
eet_cmakeconfig_DATA = \
cmakeconfig/EetConfig.cmake \
cmakeconfig/EetConfigVersion.cmake
evas_cmakeconfigdir = $(libdir)/cmake/Evas/
evas_cmakeconfig_DATA = \
cmakeconfig/EvasConfig.cmake \
cmakeconfig/EvasConfigVersion.cmake
ecore_cmakeconfigdir = $(libdir)/cmake/Ecore/
ecore_cmakeconfig_DATA = \
cmakeconfig/EcoreConfig.cmake \
cmakeconfig/EcoreConfigVersion.cmake
edje_cmakeconfigdir = $(libdir)/cmake/Edje/
edje_cmakeconfig_DATA = \
cmakeconfig/EdjeConfig.cmake \
cmakeconfig/EdjeConfigVersion.cmake
eldbus_cmakeconfigdir = $(libdir)/cmake/Eldbus/
eldbus_cmakeconfig_DATA = \
cmakeconfig/EldbusConfig.cmake \
cmakeconfig/EldbusConfigVersion.cmake
efreet_cmakeconfigdir = $(libdir)/cmake/Efreet/
efreet_cmakeconfig_DATA = \
cmakeconfig/EfreetConfig.cmake \
cmakeconfig/EfreetConfigVersion.cmake
ethumb_cmakeconfigdir = $(libdir)/cmake/Ethumb/
ethumb_cmakeconfig_DATA = \
cmakeconfig/EthumbConfig.cmake \
cmakeconfig/EthumbConfigVersion.cmake
ethumbclient_cmakeconfigdir = $(libdir)/cmake/EthumbClient/
ethumbclient_cmakeconfig_DATA = \
cmakeconfig/EthumbClientConfig.cmake \
cmakeconfig/EthumbClientConfigVersion.cmake
cmakeconfigdir = $(libdir)/cmake/Elementary
cmakeconfig_DATA = \
cmakeconfig/ElementaryConfig.cmake \
cmakeconfig/ElementaryConfigVersion.cmake
emotion_cmakeconfigdir = $(libdir)/cmake/Emotion/
emotion_cmakeconfig_DATA = \
cmakeconfig/EmotionConfig.cmake \
cmakeconfig/EmotionConfigVersion.cmake
elua_cmakeconfigdir = $(libdir)/cmake/Elua
elua_cmakeconfig_DATA = \
cmakeconfig/EluaConfig.cmake \
cmakeconfig/EluaConfigVersion.cmake
emile_cmakeconfigdir = $(libdir)/cmake/Emile
emile_cmakeconfig_DATA = \
cmakeconfig/EmileConfig.cmake \
cmakeconfig/EmileConfigVersion.cmake
# D-Bus services:
servicedir = @dbusservicedir@
service_DATA = \
dbus-services/org.enlightenment.Ethumb.service
if HAVE_SYSTEMD_USER_SESSION
systemdunitsdir = @USER_SESSION_DIR@
systemdunits_DATA = \
systemd-services/ethumb.service
endif
EXTRA_DIST += $(systemdunits_DATA)
.PHONY: doc benchmark examples install-examples
# MSBuild C Sharp projects generation:
if HAVE_CSHARP
msbuildcsprojs:
@$(MAKE) $(AM_MAKEFLAGS) -C src msbuildcsprojs
endif
# Documentation
doc:
@echo "entering doc/"
$(MAKE) $(AM_MAKEFLAGS) -C doc doc
# Unit tests
if EFL_ENABLE_COVERAGE
lcov-reset:
@rm -rf $(abs_top_builddir)/coverage
@find $(abs_top_builddir) -name "*.gcda" -delete
@lcov --zerocounters --directory $(abs_top_builddir)
lcov-baseline:
$(MKDIR_P) $(abs_top_builddir)/coverage
lcov --capture --initial --compat-libtool --no-external --output-file $(abs_top_builddir)/coverage/coverage-baseline.info --directory $(abs_top_builddir) --config-file .lcov-config
lcov-report: lcov-baseline
lcov --capture --compat-libtool --no-external --output-file $(abs_top_builddir)/coverage/coverage-check.info --directory $(abs_top_builddir) --config-file .lcov-config
lcov --no-external --compat-libtool --add-tracefile $(abs_top_builddir)/coverage/coverage-baseline.info --add-tracefile $(abs_top_builddir)/coverage/coverage-check.info --output-file $(abs_top_builddir)/coverage/coverage.info --config-file .lcov-config
lcov --no-external --compat-libtool --remove $(abs_top_builddir)/coverage/coverage.info \
'*.h' '*/tests/*' '*NONE*' '*/doc/*' '*usr/include*' '*/bin*' '*/edje_external*' \
'*/generic/*' '*/modules/*' '*/static_libs/*' \
--output-file $(abs_top_builddir)/coverage/coverage.cleaned.info --config-file .lcov-config
genhtml --config-file .lcov-config --legend -t "$(PACKAGE_STRING)" -o $(abs_top_builddir)/coverage/html $(abs_top_builddir)/coverage/coverage.cleaned.info
@echo "Coverage Report at $(abs_top_builddir)/coverage/html"
endif
if EFL_ENABLE_TESTS
lcov-check:
if EFL_ENABLE_COVERAGE
@$(MAKE) $(AM_MAKEFLAGS) lcov-reset
@$(MAKE) $(AM_MAKEFLAGS) lcov-baseline
endif
@$(MAKE) $(AM_MAKEFLAGS) check
if EFL_ENABLE_COVERAGE
@$(MAKE) $(AM_MAKEFLAGS) lcov-report
endif
check-build:
@$(MAKE) $(AM_MAKEFLAGS) -C src check-build
endif
# benchmark
benchmark:
@$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
$(MKDIR_P) benchmark
@cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
# examples
examples:
@$(MAKE) $(AM_MAKEFLAGS) -C src examples
install-examples:
@$(MAKE) $(AM_MAKEFLAGS) -C src install-examples
pkgbuild::
@echo "making arch packages"
makepkg -f -p $(top_builddir)/pkgbuild/PKGBUILD
# cleaning
clean-local:
rm -rf benchmark coverage
@find . -name '*.eo.legacy.c' -delete
DISTCLEANFILES= \
./src/lib/emile/Makefile \
./src/lib/eo/Makefile \
./src/lib/eet/Makefile \
./src/lib/ecore/Makefile \
./src/lib/efl/Makefile \
./src/lib/eina/Makefile \
./src/lib/eio/Makefile \
./src/lib/elementary/Makefile \
./src/lib/ector/Makefile \
./src/lib/evil/Makefile \
./src/lib/edje/Makefile \
./src/lib/efl/Efl_Config.h \
./src/lib/eina/eina_config.h

21
Makefile_Elm_Helpers.am
View File

@ -1,21 +0,0 @@
if HAVE_ELM_PREFS_CC
ELM_PREFS_CC = @elm_prefs_cc@
else
ELM_PREFS_CC = $(top_builddir)/src/bin/elementary/elm_prefs_cc
endif
AM_V_EPB = $(am__v_EPB_@AM_V@)
am__v_EPB_ = $(am__v_EPB_@AM_DEFAULT_V@)
am__v_EPB_0 = @echo " EPB " $@;
if HAVE_ELEMENTARY_CODEGEN
ELEMENTARY_CODEGEN = @elementary_codegen@
else
ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/elementary/elementary_codegen
endif
AM_V_CODEGEN = $(am__v_CODEGEN_@AM_V@)
am__v_CODEGEN_ = $(am__v_CODEGEN_@AM_DEFAULT_V@)
am__v_CODEGEN_0 = @echo " CODEGEN " $@;

345
NEWS
View File

@ -1,7 +1,216 @@
==========
EFL 1.22.0
EFL 1.23.0
==========
Changes since 1.23.0:
---------------------
Removals:
* emotion & evas: remove gstreamer 0.10 support
* escape: remove library from tree
* ecore_x: remove support XGesture extension
* elocation: remove beta library
* eeze: remove tizen module support from eeze sensor
Changes since 1.22.0:
---------------------
Features:
* ecore-drm2: Add background_color to crtc atomic properties
* ecore-drm2: Fill in crtc background color (if supported) during atomic commits
* ecore-drm2: Add API function to set crtc background color
* eolian: remove @nullable keyword
* ecore-drm2: Add API to check if vblank is supported
* eolian: remove param @nonull
* eolian: rename @warn_unused and its associated API
* eolian: initial versioning implementation
* evas: enable setting any object as a clipper
* eina/hash: add direct variants of list append/prepend functions
* edje: improve user-defined data caching to handle data before file is set
* edje: Add support for map zoom to use other part center.
* efl_ui_textpath: introduce efl_ui_textpath_circular_set() interface.
* efl_ui/layout_base: add "finger_size_multiplier" property (T8059)
* evas: add 'has_fixed_size' property for canvas objects
* efl/hints: add restricted and combined max size hints (T8122)
* efl_ui_animation_view: introduce a new widget for controlling vector animation.
* efl_ui: add scrollable_content mixin
Fixes:
* remove vpath test for user dir the test was broken and fixing is insane (T7728)
* tests - fix check header to always include eina due to windows
* tests - remove one of the eina strtod tests as libc is failing
* ecore_imf: do not loop forever on shutdown when there is no more a display
* efl_ui_list: fix to delete sub objects in efl_object_invalidate
* efl_ui_widget: Fix disabled set calling without meaning. (T7799)
* evas - fix crash/junk pixel content but with tiled rotate at 270 + neon
* ecore-drm2: Make atomic property values support uint64_t
* evas image: check format more strong way for wbmp.
* elm_atspi_bridget: Fix resource leak (CID1399424)
* elput: Remove useless call to eldbus_message_unref
* efl_core_command_line: Fix resource leak (CID1399105)
* ecore-evas-x: Fix double free (CID1382851)
* static_libs/vg_common: Fix resource leak (CID1382215)
* elm_theme: Check the ref count to delete or unref.
* elc_hoversel: Fix crash when no sd->last_location
* ecore drm2 - fix timeout in case case called from thread
* eina_test_file: Fix memory leak (CID1401072)
* efl_check: Fix memory leak (CID1401070)
* elm_test_widget_focus: Fix memory leak (CID1401069)
* emile_test_base64: Fix resource leak (CID1401062)
* evas_test_mesh: Fix memory leak (CID1401009)
* eina_test_binbuf: Fix memory leak (CID1401004)
* efl_ui_test_widget: Fix memory leak (CID1401003)
* efl_ui_test_widget: Fix memory leak (CID1400844)
* eina_bench_stringshare: Fix resourcce leak (CID1400975)
* evas_test_image: Fix resource leak (CID1400945)
* eina_test_file: Fix resource leak (CID1400926)
* eldbus_test_eldbus_message: Fix resource leak (CID1400921)
* efl_ui_test_widget: Fix memory leak (CID1400889)
* emile_test_base64: Fix resource leak (CID1400868)
* efl_ui_test_widget: Fix resource leak (CID1400857)
* emile_test_base64: Fix resource leak (CID1400852)
* ecore_test_ecore_file: Fix resource leak (CID1400825)
* efl_ui_test_widget: Fix resource leak (CID1400824)
* emile_test_base64: Fix resource leak (CID1400820)
* emile_test_base64: Fix memory leak (CID1400815)
* eina_test_ustr: Fix resource leak (CID1400784)
* eina_test_tiler: Fix resource leak (CID1401068)
* eo_test_manager_xattr: Fix resource leak (CID1400953)
* eina_test_strbuf: Fix resource leak (CID1400952)
* evas_object_textblock: Fix binary search fail.
* eolian: refactor parsing API and path handling (T7820)
* evas/image: fix broken auto_fill mechanism when manually changing fill
* elm_test: fix some bugs in elm_image tests
* ecore-evas-drm: Check if vblank is supported
* benchmarks: Fix copy-paste error (CID1401052)
* evas/render: fix proxy clipping when source_clip is disabled
* elm_color_class: use legacy event for genlist selection
* efl_ui_focus_manager_sub: handle manager change when tree is set to unfocusable
* edje/calc: correctly handle swallow/group objects as clippers for state clips
* gl_generic: handle image orientation setting when texture has not been created
* ecore/timer: fix handling of timer freeze during construction
* edje/load: (more) correctly handle part updates after changing edje group
* efl_canvas_layout: permit part_type_get on invalid parts
* eina/prefix: ignore magic files when running in tree
* efl_ui_focus_manager/calc: handle redirect setting if no previous redirect set
* elm/layout: do not trigger sizing eval on subobj deletion if no resize_obj set
* elm/layout: do not trigger sizing eval at end of canvas_group_add
* elm/colorselector: return early from theme apply if object is not yet finalized
* elm/diskselector: fix handling in theme data setup
* elm/diskselector: trigger sizing eval during theme set only if finalized
* elm/entry: use edje functions directly for interacting with edje objects
* elm/gengrid: handle cache item deletion without errors
* elm/gengrid: more null checks for setting mirrored state during construction
* elm/gengrid: handle focus events when no previous focus item was set
* elm/hovers: don't trigger more errors when setting null hover parent
* elm: fix value of datadir when running in tree
* elm/map: ignore zoom events during construction which cannot be handled
* elm/slider: avoid emitting double events when range slider value changes
* elm/slider: check for interval/range state before using that functionality
* efl_ui/button: check icon swallow existence before getting its content
* ecore-evas: check for internal evas presence before using it during free
* ecore-x: protect ecore_x_shutdown from creating a negative init count
* efl/io_model: check for parent object existence before removing wref
* eldbus: don't print warnings for user-canceled calls
* efl_ui/check: check icon swallow existence before getting its content
* efl_ui/image: check image object existence before using it in sizing
* efl_ui/layout: do not trigger sizing eval on hint change if object is dead
* efl_ui/layout: do not trigger sizing eval on subobj delete if layout is dead
* efl_ui/layout: only freeze internal layout during delete if it exists
* efl_ui/progressbar: check for part existence before using parts
* efl_ui/video: do not set 0x0 aspect hint
* efl_ui/widget: skip updating access info during parent_set(NULL) if dead
* elm/fileselector: return early in theme_apply during construction
* elm/popup: remove del callback for internal table object during destruction
* elm/code: check for cursor layout existence before emitting signals to it
* elm/gengrid: trigger unrealize event after unsetting unrealized flag
* elm/gen*: only call focus_object_setup_order_non_recursive if realized
* elm/genlist: unify all creation of calc jobs, skip if genlist is dead
* elm/genlist: trigger unrealize event after unsetting unrealized flag
* elm/genlist: handle cache item deletion without errors
* elm/genlist: handle genlist finding of nearest visible item when not realized
* elm/index: create event_rect[0] earlier in construction
* elm/interface_scrollable: return immediately from setting region if no content
* elm/list: return early from min_limit_cb if list object is dead
* elm/map: move setting initial zoom to later in construction
* elm/scroller: return immediately from updating focused scroll region without content
* elm_widget_item_static_focus: check for adapter existence in unrealize cb
* emotion: don't update crop clipper geometry if crop clipper doesn't exist
* ecore-imf/xim: only call ecore_x_shutdown if init was previously called
* elm/gengrid: handle gengrid finding of nearest visible item when not realized
* elm/fileselector_button: null fileselector model pointer on delete
* gl_generic: directly copy existing image when changing orientation
* theme: fix fileselector search button layout
* efl sel manager - flush wl conenction in cnp to avoid hangs...
* ecore_x - restore move event skipper that was removed long ago
* efl_ui_textpath: fix a center align but that doesn't happen at text_set().
* evas vector: set proper parents of clone objects.
* evas svg: fix missing node opacity attribute.
* elm - cursor - clear cursor job late to avoid crash
* edje - double make sure edje messages are zero'd due to a segv i saw
* ecore: also error when trying to add an event handler for a type 0 event
* edje: fix reapplying markup text on file/group change
* elm_actionslider: fix internal state when programmatically changing value
* elm/scrollable: avoid unnecessary edje recalcs
* evas/box: avoid triggering smart_move callback
* ecore: avoid breaking next main loop start if quit occurs outside of loop
* evas: fix type checking of Evas pointers in legacy functions
* evas/map: permit evas_map_free(NULL)
* ecore wl2 - fall back to shm if dmabuf fails in buf init
* ecore_evas buffer: fix a deadlock issue.
* efl_ui_widget: add safety checks to verify parents aren't being added as children
* [elm] Add missing sizing eval hook at radio
* [elm] Add missing sizing eval hook at check
* elm/glview: fix glview to (again) return null if context creation fails
* elm_test/plug: fix error handling
* elm/ctxpopup: check list existence before trying to delete list items
* efl_ui/popup: implement efl.file.unload for popup backwall part
* efl_ui/popup: unset callbacks on win object when parent is removed
* elm/config: monitor MODIFIED events on config files
* elm/config: fix config usage with EFL_RUN_IN_TREE set
* edje/calc: clamp part calc size to 0
* efl_ui: always set restricted_min size hints internally (T8059)
* evas events - fix segv if pointer data is freed by cb
* efl_ui/flow.box: fix item calc with mixed weights
* elm toolbar - fix packing options at start to avoid visual layout bugs
* elm toolbar - fix toolbar item separators and refactor aling/fill of item
* evas - gl_drm - delete old surfaces before creating new ones
* efl_ui_textpath: clear up path data when it's destructed.
* evas - png loader - fix leake in error case of pixels (CID1403027)
* elm - dnd - fix drop target del to not nuke handler all the time
* elm hoversel - avoid crash when items modified while popping down
* evas svg: fix svg spec compatibility.
* elm/hoversel: avoid calling api functions on null hoversel objects
* edje signal matches/patterns - handle re/alloc errors and missing ptrs
* edje - handle errors and eina file handles and vpath properly
* elm theme - handle error cases and eina file handles properly
* evas - font rendering - dont crash if we have color fonts and gl and sw
* eina file refs in edje/evas - audit them and plug holes where refs stay
* edje - signal callback matches/patterns try fix number 2
* emotion - webcam fix deletion of webcam still left in webcam list
* efl/io: fix race condition with child model deletion
* eio/poll: avoid ever dereferencing the backend's parent in a thread
* edje signal - let's not crash if something odd happens
* edje signal matches - try number 3 to try plug all the holes
* scalecache - handle possible use after free with sci still in list
* evas events: fix corrupted mouse events behavior on mapped object.
* evas -gl engines - buffer age - bring back fix for changing buffer age
* eio - don't call cb's after a cancel
* elm sel mgr - remove event handlers when no drop targets are left
* evas_vg: fix alpha animation bug in case of partial update
* elm_popup: calculate the label min size of popup before the popup group calculation
* vg_common_svg : Initialize "display" attribute
* fix a bunch of breaks that having a blind file unload has brought
* fix xpm loader to be threadable - fixes so much stuff...
* efl: check file's mtime in efl.file::file_set to determine if file is the same
* meson.build: allow to disable tiff evas loader
* ecore/signal: also use nonblock for writing side of signal pipe
* ector engine: +null checking.
* ecore-x: fix null derefs in window prop code
Changes since 1.21.0:
---------------------
@ -187,7 +396,7 @@ Features:
* eo: Add "destruct" event
* efl-wl: move to xdg-shell vfinal
* wayland: add xdg-shell vfinal support for client-side
* Canvas image: add Efl.Canvas.Text.Factory + use in Ui.Text
* Canvas image: add Efl.Canvas.Textblock.Factory + use in Ui.Text
* efl-wl: add functionality for directly passing through xkb objects
* ecore-x: add more info to Ecore_X_Event_Xkb event
* ecore-x: add some useful xkb function wrappers
@ -4248,7 +4457,6 @@ Fixes:
* edje: Edje_Edit - fix wrong behaviour on draggable.event processing while deleting parts.
* evas/text: fix abnormal ellipsis logic when harfbuzz is enabled.
Changes since 1.8.0:
--------------------
@ -4426,8 +4634,8 @@ Improvements:
Fixes:
* Check ecore_x_window_prop_card32_get() return value correctly in ecore_x_e.
* edje freeze count can no longer become negative
* Check ecore_x_window_prop_card32_get() return value correctly in ecore_x_e.
* edje freeze count can no longer become negative
* Revert "Evas font: Change font fallback to not depend on fontconfig >= 2.11." (T1006)
* Evil: Fix parallel build for Windows
* Emotion Generic: receiving the size on opening is correct.
@ -5133,130 +5341,3 @@ Fixes:
- Fix memory leak in error case.
* Eeze:
- Fix sensors to not segv on shutdown.
Changes since 1.21.0:
---------------------
Features:
* evas textblock: add/apply cursor cluster APIs based on grapheme cluster
* efl_ui_spin_button: Addded direction feature.
* scroller: refactory a momentum scroll animator
* elementary textpath: support legacy APIs
* elementary transit: add a convenient API.
* elementary transit: add a new api - elm_transit_progress_value_set()
* Text: add markup_range_get
* Canvas layout: support more Efl.Text.* with efl_part
* efl: Add support to elput for using elogind instead of systemd
* eina: add locale-independent eina_convert_strtod_c function
* elm perf tool - bring one back to efl
* eina: add locale-independent eina_convert_strtod_c function
* elm perf tool - bring one back to efl
* efl gfx_path: introduce efl_gfx_path_reserve()
* efl gfx_path: remove EFL_GFX_PATH_EVENT_CHANGED
* efl gfx_path: remove EFL_GFX_PATH_EVENT_CHANGED
* gfx: Add size hint fill (EO) (T3912)
* efl_app: add "standby" event (T5494)
* edje_cc: fail upon detecting invalid part description references in programs (T7016)
* elput: Add API to allow settings tap-to-click on pointer device
* ecore_drm2: Add API to allow settings tap-to-click on pointer device
* efl_ui_win: add 'exit_on_all_windows_closed' class property and unit test (T5494)
* efl_ui_win: add 'exit_on_close' property and unit test (T5494)
* eo: implement class overriding (+unit tests) (T7516)
* eolian gen: initial support for reflection api
* efl_ui_relative_layout: introduce new relative container (T5487)
* eolian: introduce typed slice types
* eolian: add support for inlist structs
* eolian: remove support for inlist/inarray
* ecore-drm2: Add API function to return output rotation (T7690)
Fixes:
* ecore_wl2_dmabuf: Link with ecore_wl2 (T7327)
* ecore_wl2_dmabuf: Depend on ecore_wl2 (T7327)
* efl selection manager - avoid multiple selection get callbacks for req
* evas image: fix a bug in image preloading.
* evas canvas: fix null possibility of evas_object_above_get().
* edje: Remove hack code
* efl gfx_path: prevent buffer overflow.
* ecore_main: fix the invalid return value
* eina_vpath: fix the memory leak
* elementary: remove meaningless memory allocation and leaking
* elementary: fix memory leak from Efl.Ui.Layout.Object
* evas gl: fix invalid image size.
* elementary entry: apply scale to all edje objects
* eina debug: fix a double unlock issue
* elm_theme: fix return value when default style fallback is done
* evas vg: fix memory leak.
* devas vg: return default root node if possible.
* evas vg: fix memory leak at gradient.
* evas filter: remove critical messages from Evas Filter
* elementary transit: fix wrong pausing time calculation.
* Canvas text: fix line_jump_by logic
* cxx: explicitly require c++11 and fix tests to conform
* edje: fix an overflow issue for state values
* evas textblock: remove white space after line-break by a next item
* evas ector: fix memory leaks.
* evas vg: update render properly.
* ector software: make a pair of ref/unref.
* evas gl: recover current program state.
* ecore_evas - fix aninmator based frame render ticking to full framerate
* ecore evas - buffer - init ecore event evas as many times as shutdown
* eina: fix a build failure caused by missing 'locale_t' from OSX
* ecore_con: handle timeout of the attempt to connect.
* ecore_evas - fix aninmator based frame render ticking to full framerate
* ecore evas - buffer - init ecore event evas as many times as shutdown
* eina: fix a build failure caused by missing 'locale_t' from OSX
* ecore_con: handle timeout of the attempt to connect.
* evas gl - make GLintptr etc. also ndefed for GL_VERSION_1_5 fix typedef (T7502)
* ecore-drm2: Fix drmModeSetCrtc call during fb flip
* textblock: Fix crash with filters
* edje - stop trying to access ready deleted exrt/group swallow objects
* evas: remove memory leaks from deleted Textblock objects
* elm - dnd - restore to working as drop targets
* elm_config: Free data returned from eet_read
* ui/flip: fix efl_pack usage
* elm_entry: make file loading succeed on 0-sized files (T6562)
* theme: fix odd state setting on some items for list/genlist/gengrid
* theme: correct part name in program for elm/hover/base/main_menu_submenu/default (T6219)
* theme: remove a ton of invalid part description references in various programs (T6873)
* ecore-evas/extn: use evas from events when updating key masks (T5536)
* edje: apply maps to textblock cursors and backgrounds (T4977)
* ecore drm2 - work around kms/drm bug seemingly when no flip event comes
* elm textpath: reduces differences between actual pos and modified pos
* elm_map: Make more robust elm_map (T7443)
* Fix leak in elm atspi
* eina_file: set errno on open fail for win32 build
* evas-gl-drm: Fix issue of rotation not actually rotating (T7690)
* solve neon rotation issue by moving to the tiled rotator
* eo: Fix missing varags cleanup (CID1399080)
* efl_core_command_line: Fix logically dead code (CID1399106)
* efl_ui_widget_common: Fix potential resource leak (CID1399088)
* efl_ui_selection_manager: Fix unchecked return value (CID1399092)
* evas_device: Fix dereferencing null pointer (CID1399091)
* efl_ui_stack: Fix dereference null return value (CID1399082)
* efl_ui_datepicker: Fix uninitialized scalar value (CID1397006)
* efl_ui_grid: Fix dereferencing null pointer (CID1397000)
* ecore_con: Fix dereferencing of null pointer (CID1396990)
* elm_atspi_bridge: Fix resource leak (CID1399429)
* efl_ui_win: Fix dereference null return value (CID1399428)
* efl_ui_win: Fix dereference null return (CID1399427)
* efl_ui_win: Fix dereference null return (CID1399426)
* efl_ui_win: Fix dereference null return value (CID1399425)
* efreet: Fix resource leak (CID1399090)
* efl_ui_text: Fix resource leak (CID1396998)
* eldbus: Fix dereference after null check (CID1399422)
* efl_ui_focus_manager_calc: Fix resource leaks (CID1396984, CID1396965)
* elm_focus_legacy: Fix resource leaks (CID1399096, CID1399095)
* eldbus: Fix resource leak (CID1399097)
* efl_canvas_vg_object: Fix dereference after null check (CID1399423, CID1399421)
* efl_ui_win: fix hw accel detection
* efl_ui_layout: Eina_Error type has been modified to work correctly.
* ecore-drm2: Don't use AtomicAddProperty for plane rotation (T7690)
* ecore-drm2: Update plane state values based on FB (T7690)
* ecore-drm2: Factor in output rotation when getting output info (T7690)
* evas drm: Don't use eng_output_resize or redraws clear (T7690)
* evas drm: Fix software output rotation (T7690)
* efl_ui_image: remove job in sizing calc. (T7360)
* evas_render: Process deferred callback in the sync render case.
* efl_ui_selection_manager: Don't leak malloc'd data (CID1396949)
* ecore-drm2: Add missing @ingroup for some doxy

224
README
View File

@ -210,9 +210,9 @@ Ecore main-loop and event queue.
//BSD 2-Clause license//
This is a library to wrap/deal with Xlib as well as optionally XCB to
make dealing with X11 less painful and less footwork as well as being
glue to tie these into the Ecore main-loop and event queue.
This is a library to wrap/deal with Xlib make dealing with X11 less painful
and less footwork as well as being glue to tie these into the Ecore main-loop
and event queue.
@ -365,16 +365,6 @@ their behavior as if they were real physical objects.
**Escape:**
//GPL v2 license//
This library is used as a compatibility library to provide missing
libc APIs for porting to the Playstation 3 (PS3) native runtime
environment.
**Ethumb:**
//LGPL v2 license//
@ -422,15 +412,7 @@ libc calls not in Mingw32 that EFL needs.
COMPILING AND INSTALLING
------------------------
./configure
make
sudo make install
If you have doxygen, then you can build documentation with:
make doc
You will find documentation in the doc/ directory.
See the INSTALL file: https://git.enlightenment.org/core/efl.git/tree/INSTALL
REQUIREMENTS
@ -444,7 +426,7 @@ Required by default:
* bullet
* libpng
* libjpeg
* gstreamer (1.x, 0.10 support optional. Ensure all codecs you want are installed.)
* gstreamer (Ensure all codecs you want are installed.)
* zlib
* luajit (lua 5.1 or 5.2 support optional)
* libtiff
@ -472,7 +454,7 @@ Required by default:
* libxcursor
* libxp
* libxi (2.2 or newer)
* libgl (opengl/glx or opengl-es2/egl)
* opengl(mesa etc.) (opengl/glx/full or opengl-es2/egl. full opengl only on osx - must be explicitly specified to be full to have support)
* giflib
* util-linux (limbount + libblkid)
* systemd / libudev
@ -480,19 +462,43 @@ Required by default:
* libraw
* libspectre
* librsvg
* openmp (clang needs libomp, while gcc uses libgomp)
Recommended requirements (highly recommended):
You might want webp support so disable fewer loaders and remove webp
from the disablers with:
* harfbuzz
* libwebp
* libunwind (where available)
-Devas-loaders-disabler=json
Enable these with configure options:
Wayland support:
--enable-xinput22 \
--enable-image-loader-webp \
--enable-harfbuzz \
--enable-multisense
You may also want wayland support when on Linux. This enables support
for EFL to trget wayland support for client applications. To do this
supply:
-Dwl=true
Framebuffer support:
This requires linux frame-buffer support, headers etc. This supports
basic frame-buffers like /dev/fb as well as input via /dev/input for
keyboards and mice in a basic way. Enable this with:
-Dfb=true
For more modern framebuffer support you may want drm/kms rendering
support so enable this. This is what you also want for wayland
compositor support in enlightenment as it will want to be able to
render to a moder framebuffer tarbet with atomic buffer swapping. To
do this provide:
-Ddrm=true
You may want to change the install prefix for EFL with:
--prefix=/path/to/prefix
The default prefix if not given is "/usr/local". Many people like to
use prefixes like /opt/e or /opt/efl or /home/USERNAME/software etc.
COMPILER FLAGS
--------------
@ -503,159 +509,23 @@ that to ensure ABI stability you should use the exact same CFLAGS /
CXXFLAGS for all the build of EFL and any applications/libraries that
depend on them.
Other possible recommendations:
* scim
Enable this with:
--enable-scim
Framebuffer support:
This requires linux frame-buffer support, headers etc. This supports
basic frame-buffers like /dev/fb as well as input via /dev/input for
keyboards and mice in a basic way. Enable this with:
--enable-fb
This also turns on support for touch-screens via tslib. Not everyone
has tslib, so you may want to disable it with:
--disable-tslib
You likely don't need static libraries most of the time so you can
disable them with:
--disable-static
You may want to change the install prefix for EFL with:
--prefix=/path/to/prefix
The default prefix if not given is "/usr/local". Many people like to
use prefixes like /opt/e or /opt/efl or /home/USERNAME/software etc.
You may want to enable valgrind support if you plan on doing debugging
with EFL or apps built on top of EFL. This requires an install of
valgrind first. You can enable this with:
--enable-valgrind
You may want to enable xine support in emotion, as this library
provides fairly solid support for a lot of codecs and DVD navigation
support and more. You can enable it with:
--enable-xine
Wayland is also supported fairly solidly in EFL 1.8. It is not
required by default due to it being new and not that widely spread.
You can enable Wayland support with:
--enable-wayland \
--enable-elput \
--enable-drm
For faster rendering when dithering down to lower-than 24/32bpp, you
can try:
--with-evas-dither-mask=small
But this will drop quality slightly, using a small 16x16 ordered
dither mask rather than the default 128x128. This should save a little
memory too in the binary size of Evas.
There are many other configure options that can be used, but in
general it is not a good idea to go enabling or disabling things
unless you wish to break things. The defaults are well tested, with
the above recommended options also being well tested. Go much further
and your mileage may vary wildly. Disabling features is a good way of
breaking EFL functionality, so it is not recommended. The defaults
breaking EFL functionality, so it is not recommended to mess with
these without understanding the implications. The defaults
have been carefully considered to provide full functionality so users
will not be missing anything.
VALGRIND DEPENDENCY
-------------------
EFL uses the concept of memory pools (mempool) and this will confuse
valgrind memcheck tool. By using memory pool, the memory is still
owned by EFL, then valgrind won't alert on memory leaks or use of
unused memory. EFL will use memcheck.h from valgrind to declare its
memory pools to valgrind, producing better debugging results.
However valgrind is only available to limited platforms, making it
hard for us to declare it a mandatory requirement. Based on
--with-profile={dev,debug} valgrind will be used if available or will
be issued a warning. You can force valgrind with --enable-valgrind, or
disable it and the warning with --disable-valgrind.
EFL does NOT link to valgrind libraries. Then there is NO runtime
dependency on valgrind.
BULLET PHYSICS DEPENDENCY
-------------------------
EFL comes with EPhysics (a physics wrapper library) enabled by
default. To build it the user must have BulletPhysics engine installed.
More information about BulletPhysics can be obtained in the upstream project
web site at http://bulletphysics.org
We have received many reports about BulletPhysics installation and distros
packages in bad shape, some without even a package. If your distro doesn't
ship a BulletPhysics package or you want to build it from source code follow
the instructions below:
**Required Packages:**
You should have cmake installed. Bullet comes with autotools and cmake build
systems, do not use the autotools alternative, it's unstable, bogus and hasn't
been maintained for quite some time.
**Download the tarball from:**
http://code.google.com/p/bullet/downloads/list
**NOTE:**
The current supported version is 2.80 or greater.
**Compiling and Installing:**
Uncompress it to (say) ~/bullet and:
cd ~/bullet/build
cmake .. -DBUILD_CPU_DEMOS=OFF -DBUILD_DEMOS=OFF -DBUILD_SHARED_LIBS=ON
make
sudo make install
sudo ldconfig
**Ubuntu Users:**
Alternatively Ubuntu users have the option to install the BulletPhysics from
our official EFL PPA:
https://launchpad.net/~efl/+archive/trunk
PROFILES
--------
EFL build is based on "profiles". It will default to "dev" for
unreleased software and "release" for official tarballs. One can
change it with --with-profile=NAME, where NAME is one of:
* **dev**: extra checks useful to test software.
* **debug**: superset of dev, with debug features and assert().
* **release**: optimizations and less checks so it runs faster.
CRYPTOGRAPHY
------------
EFL officially uses "openssl" library to do signature, cipher and related.
Alternatively one can use "gnutls" (some distros are strict about licenses
and want gnutls instead of openssl) or disable it. One can change it with
--with-crypto=NAME, where NAME is one of: "openssl", "gnutls" and "none".
EFL officially offers openssl or gnutls as cryptography backends. By
default it uses "openssl" to do signature, cipher and related. Alternatively
one can use "gnutls" (some distros are strict about licenses and want gnutls
instead of openssl) You can switch to gnutls with:
-Dcrypto=gnutls

53
README.meson
View File

@ -1,53 +0,0 @@
# BUILDING EFL WITH MESON
Building, testing, installing:
mkdir build
cd build
meson ..
ninja all
ninja test
sudo ninja install
In autotools there have been a few flags that are used to disable loaders.
In meson the following four disabler arrays are used:
emotion-generic-loaders-disabler
emotion-loaders-disabler
ecore-imf-loaders-disabler
evas-loaders-disabler
Autotools options that are converted are:
--disable-poppler -> Disable pdf loader
--disable-spectre -> Disable ps loader
--disable-libraw -> Disable raw loader
--disable-librsvg -> Disable svg loader
--disable-xcf -> Disable xcf loader
--disable-xim -> Disable xim loader
--disable-scim -> Disable scim loader
--disable-ibus -> Disable ibus loader
--enable-xine -> Disable xine loader
--enable-libvlc -> Disable vlc loader
--disable-librsvg -> Disable svg loader
The following options are dropped as they did not affect compilation
--enable-lua-old
--enable-cancel-ok
--enable-debug
--disable-quick-launch
--enable-tile-rotate
The following options are merged into the pixman option
--enable-pixman-font
--enable-pixman-rect
--enable-pixman-line
--enable-pixman-poly
--enable-pixman-image
--enable-pixman-image-scale-sample
--disable-valgrind Is dropped, and handled due to the build profile, this can
be handled with --buildtype release or plain.

39
autogen.sh
View File

@ -1,39 +0,0 @@
#!/bin/sh
test -n "$srcdir" || srcdir=`dirname "$0"`
test -n "$srcdir" || srcdir=.
(
cd "$srcdir" &&
(
rm -rf autom4te.cache
rm -f aclocal.m4 ltmain.sh
autoreconf -vif
)
W=0
rm -f config.cache-env.tmp
echo "OLD_PARM=\"$@\"" >> config.cache-env.tmp
echo "OLD_CFLAGS=\"$CFLAGS\"" >> config.cache-env.tmp
echo "OLD_PATH=\"$PATH\"" >> config.cache-env.tmp
echo "OLD_PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\"" >> config.cache-env.tmp
echo "OLD_LDFLAGS=\"$LDFLAGS\"" >> config.cache-env.tmp
cmp config.cache-env.tmp config.cache-env >> /dev/null
if [ $? -ne 0 ]; then
W=1;
fi
if [ $W -ne 0 ]; then
echo "Cleaning configure cache...";
rm -f config.cache config.cache-env
mv config.cache-env.tmp config.cache-env
else
rm -f config.cache-env.tmp
fi
)
if [ -z "$NOCONFIGURE" ]; then
exec $srcdir/configure -C "$@"
fi

31
cmakeconfig/meson.build
View File

@ -31,6 +31,9 @@ cmake_version_src = [
'Elementary',
]
conf = configuration_data()
conf.set('VERSION', meson.project_version())
foreach cmake_file : cmake_src
configure_file(
input: cmake_file+'Config.cmake.in',
@ -38,19 +41,21 @@ foreach cmake_file : cmake_src
install_dir: join_paths(dir_lib, 'cmake', cmake_file),
copy: true,
)
endforeach
conf = configuration_data()
conf.set('VERSION', meson.version())
foreach cmake_version_file : cmake_version_src
configure_file(
input: cmake_version_file+'ConfigVersion.cmake.in',
output: cmake_version_file+'ConfigVersion.cmake',
install_dir: join_paths(dir_lib, 'cmake', cmake_version_file),
configuration : conf,
)
if cmake_version_src.contains(cmake_src)
configure_file(
input: cmake_version_file+'ConfigVersion.cmake.in',
output: cmake_version_file+'ConfigVersion.cmake',
install_dir: join_paths(dir_lib, 'cmake', cmake_version_file),
configuration : conf,
)
else
configure_file(
input: 'EflConfigVersion.cmake.in',
output: cmake_file+'ConfigVersion.cmake',
install_dir: join_paths(dir_lib, 'cmake', cmake_file),
configuration : conf,
)
endif
endforeach
configure_file(

6337
configure.ac
View File

File diff suppressed because it is too large Load Diff

308
data/Makefile.am
View File

@ -1,308 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST =
CLEANFILES =
SUBDIRS =
########################################################################
# Embryo
embryofilesdir = $(datadir)/embryo/include
embryofiles_DATA = embryo/default.inc
EXTRA_DIST += $(embryofiles_DATA)
########################################################################
# Evas
evasfilesdir = $(datadir)/evas
evasfiles_DATA = evas/checkme
EXTRA_DIST += $(evasfiles_DATA)
########################################################################
# Eeze
eezefilesdir = $(datadir)/eeze
eezefiles_DATA = eeze/checkme
EXTRA_DIST += $(eezefiles_DATA)
########################################################################
# Ecore
ecorefilesdir = $(datadir)/ecore
ecorefiles_DATA = ecore/checkme
EXTRA_DIST += $(ecorefiles_DATA)
########################################################################
# Ecore_X
ecore_xfilesdir = $(datadir)/ecore_x
ecore_xfiles_DATA = ecore_x/checkme
EXTRA_DIST += $(ecore_xfiles_DATA)
########################################################################
# Ecore_Imf
ecoreimffilesdir = $(datadir)/ecore_imf
ecoreimffiles_DATA = ecore_imf/checkme
EXTRA_DIST += $(ecoreimffiles_DATA)
########################################################################
# Efreet
efreetfilesdir = $(datadir)/efreet
efreetfiles_DATA = efreet/checkme
EXTRA_DIST += $(efreetfiles_DATA)
########################################################################
# Eo
eogdbdir = $(datadir)/eo/gdb
eogdb_DATA = eo/eo_gdb.py
EXTRA_DIST += $(eogdb_DATA)
# Borrowed from gobject
libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py: eo/libeo-gdb.py.in
$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/eo/libeo-gdb.py.in > $(builddir)/libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py
eogdbloaddir = $(datadir)/gdb/auto-load/$(libdir)
eogdbload_DATA = libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py
EXTRA_DIST += $(eogdbload_DATA)
CLEANFILES += libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py
EXTRA_DIST += $(eogdb_SCRIPTS) eo/libeo-gdb.py.in
########################################################################
# Edje
edjefilesdir = $(datadir)/edje/include
edjefiles_DATA = edje/include/edje.inc
EXTRA_DIST += $(edjefiles_DATA)
mimedir = $(datadir)/mime/packages
mime_DATA = edje/edje.xml
EXTRA_DIST += $(mime_DATA)
# Helper for people using EDJ
include ../src/Makefile_Edje_Helper.am
########################################################################
# Emotion
emotionfilesdir = $(datadir)/emotion
emotionfiles_DATA = emotion/checkme
EXTRA_DIST += $(emotionfiles_DATA)
########################################################################
# Ethumb
ethumbfilesdir = $(datadir)/ethumb
ethumbfiles_DATA = ethumb/checkme
EXTRA_DIST += $(ethumbfiles_DATA)
ethumbframesdir = $(datadir)/ethumb/frames
ethumbframes_DATA = ethumb/frames/default.edj
CLEANFILES += ethumb/frames/default.edj
ethumb/frames/default.edj: ethumb/frames/default.edc
$(AM_V_EDJ) \
$(MKDIR_P) ethumb/frames/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/ethumb/frames/ $< $@
EXTRA_DIST += \
ethumb/frames/default.edc \
ethumb/frames/border-0.jpg
########################################################################
# Ethumb_Client
ethumb_clientfilesdir = $(datadir)/ethumb_client
ethumb_clientfiles_DATA = ethumb_client/checkme
EXTRA_DIST += $(ethumb_clientfiles_DATA)
########################################################################
# Elua
eluafilesdir = $(datadir)/elua
eluafiles_DATA = elua/checkme
EXTRA_DIST += $(eluafiles_DATA)
#######################################################################
# Elementary
# themes
SUBDIRS += elementary/config
elementaryfilesdir = $(datadir)/elementary/themes
elementaryfiles_DATA = elementary/themes/default.edj
CLEANFILES += elementary/themes/default.edj
include elementary/themes/Makefile.am
elementary/themes/default.edj: elementary/themes/default.edc $(elementary_themes_files) $(efl_ui_themes_files) $(elementary_fdo_files) $(top_builddir)/src/bin/edje/edje_cc${EXEEXT}
$(AM_V_EDJ) \
$(MKDIR_P) elementary/themes/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $(EDJE_CC_ELM_FLAGS) -N $< $@
# desktop files
elementarydesktopdir = $(datadir)/applications
elementarydesktop_DATA = elementary/desktop/elementary_test.desktop elementary/desktop/elementary_config.desktop
elementaryicondir = $(datadir)/icons/hicolor/128x128/apps
elementaryicon_DATA = elementary/desktop/elementary.png
EXTRA_DIST += $(elementarydesktop_DATA) $(elementaryicon_DATA)
# fdo icon theme
elementaryfdodir = $(datadir)/icons/Enlightenment-X/
elementaryfdo_DATA = elementary/themes/fdo/index.theme elementary/themes/fdo/README
EXTRA_DIST += $(elementaryfdo_DATA)
elementaryfdo_actions_128dir = $(datadir)/icons/Enlightenment-X/actions/128
elementaryfdo_actions_128_DATA = $(elementary_fdo_actions_128_files)
elementaryfdo_categories_16dir = $(datadir)/icons/Enlightenment-X/categories/16
elementaryfdo_categories_16_DATA = $(elementary_fdo_categories_16_files)
elementaryfdo_categories_128dir = $(datadir)/icons/Enlightenment-X/categories/128
elementaryfdo_categories_128_DATA = $(elementary_fdo_categories_128_files)
elementaryfdo_emblems_96dir = $(datadir)/icons/Enlightenment-X/emblems/96
elementaryfdo_emblems_96_DATA = $(elementary_fdo_emblems_96_files)
elementaryfdo_places_16dir = $(datadir)/icons/Enlightenment-X/places/16
elementaryfdo_places_16_DATA = $(elementary_fdo_places_16_files)
elementaryfdo_places_128dir = $(datadir)/icons/Enlightenment-X/places/128
elementaryfdo_places_128_DATA = $(elementary_fdo_places_128_files)
elementaryfdo_status_128dir = $(datadir)/icons/Enlightenment-X/status/128
elementaryfdo_status_128_DATA = $(elementary_fdo_status_128_files)
elementaryfdo_devices_128dir = $(datadir)/icons/Enlightenment-X/devices/128
elementaryfdo_devices_128_DATA = $(elementary_fdo_devices_128_files)
elementaryfdo_apps_64dir = $(datadir)/icons/Enlightenment-X/apps/64
elementaryfdo_apps_64_DATA = $(elementary_fdo_apps_64_files)
elementaryfdo_intl_128dir = $(datadir)/icons/Enlightenment-X/intl/128
elementaryfdo_intl_128_DATA = $(elementary_fdo_intl_128_files)
elementaryfdo_mimetypes_16dir = $(datadir)/icons/Enlightenment-X/mimetypes/16
elementaryfdo_mimetypes_16_DATA = $(elementary_fdo_mimetypes_16_files)
elementaryfdo_mimetypes_128dir = $(datadir)/icons/Enlightenment-X/mimetypes/128
elementaryfdo_mimetypes_128_DATA = $(elementary_fdo_mimetypes_128_files)
# edje_externals
elementaryedje_externalsdir = $(datadir)/elementary/edje_externals
elementaryedje_externals_DATA = elementary/edje_externals/icons.edj
CLEANFILES += $(elementaryedje_externals_DATA)
include elementary/edje_externals/Makefile.am
elementary/edje_externals/icons.edj: elementary/edje_externals/icons.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/edje_externals/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
# images
include elementary/images/Makefile.am
elementaryimagesdir = $(datadir)/elementary/images
elementaryimages_DATA = $(elementary_images_files)
elementaryimages_glayerdir = $(datadir)/elementary/images/g_layer
elementaryimages_glayer_DATA = $(elementary_images_glayer_files)
EXTRA_DIST += $(elementary_images_files) $(elementary_images_glayer_files)
# objects
include ../Makefile_Elm_Helpers.am
elementaryobjectsdir = $(datadir)/elementary/objects
elementaryobjects_DATA = \
elementary/objects/test.edj \
elementary/objects/test_external.edj \
elementary/objects/test_masking.edj \
elementary/objects/multip.edj \
elementary/objects/cursors.edj \
elementary/objects/font_preview.edj \
elementary/objects/postit_ent.edj \
elementary/objects/multibuttonentry.edj \
elementary/objects/test_pager.edj \
elementary/objects/test_prefs.edj \
elementary/objects/test_prefs.epb \
elementary/objects/test_focus_style.edj \
elementary/objects/test_tooltip.edj \
elementary/objects/test_tab_pager.edj \
$(NULL)
CLEANFILES += $(elementaryobjects_DATA)
include elementary/objects/Makefile.am
elementary/objects/test.edj: elementary/objects/test.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
elementary/objects/test_external.edj: elementary/objects/test_external.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
elementary/objects/test_masking.edj: elementary/objects/test_masking.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
elementary/objects/multip.edj: elementary/objects/multip.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
elementary/objects/cursors.edj: elementary/objects/cursors.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
elementary/objects/font_preview.edj: elementary/objects/font_preview.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
elementary/objects/postit_ent.edj: elementary/objects/postit_ent.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
elementary/objects/multibuttonentry.edj: elementary/objects/multibuttonentry.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
elementary/objects/test_pager.edj: elementary/objects/test_pager.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
elementary/objects/test_prefs.edj: elementary/objects/test_prefs.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
elementary/objects/test_focus_style.edj: elementary/objects/test_focus_style.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(top_srcdir)/data/elementary/themes/img $< $@
elementary/objects/test_tooltip.edj: elementary/objects/test_tooltip.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(top_srcdir)/data/elementary/themes/img $< $@
elementary/objects/test_prefs.epb: elementary/objects/test_prefs.epc
$(AM_V_EPB) \
$(MKDIR_P) elementary/objects/; \
$(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) $< $@
elementary/objects/test_tab_pager.edj: elementary/objects/test_tab_pager.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@

18
data/elementary/config/Makefile.am
View File

@ -1,18 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = default standard mobile
include ../../../src/Makefile_Eet_Helper.am
EXTRA_DIST = profile.src
filesdir = $(datadir)/elementary/config
files_DATA = profile.cfg
%.cfg: %.src
$(AM_V_EET) \
$(MKDIR_P) $(top_builddir)/data/elementary/config/; \
$(EET) -i $(top_builddir)/data/elementary/config/$@ config $< 0
clean-local:
rm -rf *.cfg *~

23
data/elementary/config/default/Makefile.am
View File

@ -1,23 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
include ../../../../src/Makefile_Eet_Helper.am
EXTRA_DIST = \
profile.desktop \
icon.png \
base.src.in
filesdir = $(datadir)/elementary/config/default
files_DATA = \
profile.desktop \
icon.png \
base.cfg
%.cfg: %.src
$(AM_V_EET) \
$(MKDIR_P) $(top_builddir)/data/elementary/config/default/; \
$(EET) -e $(top_builddir)/data/elementary/config/default/$@ config $< 1
clean-local:
rm -rf *.cfg *~

25
data/elementary/config/default/base.src.in
View File

@ -1,5 +1,5 @@
group "Elm_Config" struct {
value "config_version" int: 131093;
value "config_version" int: 131094;
value "entry_select_allow" uchar: 1;
value "engine" string: "";
value "vsync" uchar: 0;
@ -2634,6 +2634,29 @@ group "Elm_Config" struct {
}
}
}
group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Efl.Ui.Item";
group "key_bindings" list {
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "key" string: "Return";
value "action" string: "select";
value "params" string: "";
}
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "key" string: "KP_Enter";
value "action" string: "select";
value "params" string: "";
}
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "key" string: "space";
value "action" string: "select";
value "params" string: "";
}
}
}
group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Efl.Ui.Tab_Bar";
group "key_bindings" list {

2
data/elementary/config/default/profile.desktop
View File

@ -31,7 +31,7 @@ Comment[el]=Επιλέξτε αυτό για να ξεκινήσετε την α
Comment[eo]=Elektu tion por restartigi la pravalorizan agordon.
Comment[es]=Seleccione esto para reestablecer la configuración inicial.
Comment[fi]=Valitse tämä käynnistääksesi alkuasetusvelhon.
Comment[fr]=Sélectionnez ceci pour retrouver la configuration par défaut et reprendre le paramétrage initial.
Comment[fr]=Sélectionnez ceci pour recommencer la configuration initiale.
Comment[gl]=Seleccione isto para volverr á configuración inicial.
Comment[hu]=Válaszd ezt az alap beállítáok megismétléséhez.
Comment[it]=Selezionare questo per riprendere la configurazione iniziale.

22
data/elementary/config/mobile/Makefile.am
View File

@ -1,22 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
include ../../../../src/Makefile_Eet_Helper.am
EXTRA_DIST = \
profile.desktop \
icon.png \
base.src.in
filesdir = $(datadir)/elementary/config/mobile
files_DATA = \
profile.desktop \
icon.png \
base.cfg
%.cfg: %.src
$(AM_V_EET) \
$(MKDIR_P) $(top_builddir)/data/elementary/config/; \
$(EET) -e $(top_builddir)/data/elementary/config/mobile/$@ config $< 1
clean-local:
rm -rf *.cfg *~

25
data/elementary/config/mobile/base.src.in
View File

@ -1,5 +1,5 @@
group "Elm_Config" struct {
value "config_version" int: 131093;
value "config_version" int: 131094;
value "entry_select_allow" uchar: 1;
value "engine" string: "";
value "vsync" uchar: 0;
@ -2631,6 +2631,29 @@ group "Elm_Config" struct {
}
}
}
group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Efl.Ui.Item";
group "key_bindings" list {
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "key" string: "Return";
value "action" string: "select";
value "params" string: "";
}
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "key" string: "KP_Enter";
value "action" string: "select";
value "params" string: "";
}
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "key" string: "space";
value "action" string: "select";
value "params" string: "";
}
}
}
group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Efl.Ui.Tab_Bar";
group "key_bindings" list {

23
data/elementary/config/standard/Makefile.am
View File

@ -1,23 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
include ../../../../src/Makefile_Eet_Helper.am
EXTRA_DIST = \
profile.desktop \
icon.png \
base.src.in
filesdir = $(datadir)/elementary/config/standard
files_DATA = \
profile.desktop \
icon.png \
base.cfg
%.cfg: %.src
$(AM_V_EET) \
$(MKDIR_P) $(top_builddir)/data/elementary/config/standard/; \
$(EET) -e $(top_builddir)/data/elementary/config/standard/$@ config $< 1
clean-local:
rm -rf *.cfg *~

25
data/elementary/config/standard/base.src.in
View File

@ -1,5 +1,5 @@
group "Elm_Config" struct {
value "config_version" int: 131093;
value "config_version" int: 131094;
value "entry_select_allow" uchar: 1;
value "engine" string: "";
value "vsync" uchar: 0;
@ -2628,6 +2628,29 @@ group "Elm_Config" struct {
}
}
}
group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Efl.Ui.Item";
group "key_bindings" list {
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "key" string: "Return";
value "action" string: "select";
value "params" string: "";
}
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "key" string: "KP_Enter";
value "action" string: "select";
value "params" string: "";
}
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "key" string: "space";
value "action" string: "select";
value "params" string: "";
}
}
}
group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Efl.Ui.Tab_Bar";
group "key_bindings" list {

10
data/elementary/desktop/Makefile.am
View File

@ -1,10 +0,0 @@
AUTOMAKE_OPTIONS = 1.4 foreign
MAINTAINERCLEANFILES = Makefile.in
desktopdir = $(datadir)/applications
desktop_DATA = elementary_test.desktop elementary_config.desktop
icondir = $(datadir)/icons/hicolor/128x128/apps
icon_DATA = elementary.png
EXTRA_DIST = $(desktop_DATA) $(icon_DATA)

26
data/elementary/edje_externals/Makefile.am
View File

@ -1,26 +0,0 @@
EDJE_CC_FLAGS += -id $(top_srcdir)/data/elementary/edje_externals -fd $(top_srcdir)/data/elementary/edje_externals
EXTRA_DIST += \
elementary/edje_externals/icons.edc \
elementary/edje_externals/ico_anchorblock.png \
elementary/edje_externals/ico_anchorview.png \
elementary/edje_externals/ico_bubble.png \
elementary/edje_externals/ico_button.png \
elementary/edje_externals/ico_check.png \
elementary/edje_externals/ico_clock.png \
elementary/edje_externals/ico_fileselector.png \
elementary/edje_externals/ico_fileselector_button.png \
elementary/edje_externals/ico_genlist.png \
elementary/edje_externals/ico_hoversel.png \
elementary/edje_externals/ico_list.png \
elementary/edje_externals/ico_map.png \
elementary/edje_externals/ico_notepad.png \
elementary/edje_externals/ico_photocam.png \
elementary/edje_externals/ico_progressbar.png \
elementary/edje_externals/ico_radio.png \
elementary/edje_externals/ico_scrolled_entry.png \
elementary/edje_externals/ico_slider.png \
elementary/edje_externals/ico_slideshow.png \
elementary/edje_externals/ico_spinner.png \
elementary/edje_externals/ico_thumb.png \
elementary/edje_externals/ico_toolbar.png

93
data/elementary/images/Makefile.am
View File

@ -1,93 +0,0 @@
elementary_images_files = \
elementary/images/insanely_huge_test_image.jpg \
elementary/images/panel_01.jpg \
elementary/images/plant_01.jpg \
elementary/images/pol_shadow.png \
elementary/images/pol_sky.png \
elementary/images/pol_twofish.png \
elementary/images/rock_01.jpg \
elementary/images/rock_02.jpg \
elementary/images/sky_01.jpg \
elementary/images/sky_02.jpg \
elementary/images/sky_03.jpg \
elementary/images/sky_04.jpg \
elementary/images/wood_01.jpg \
elementary/images/logo.png \
elementary/images/logo_small.png \
elementary/images/animated_logo.gif \
elementary/images/fire.gif \
elementary/images/parking.png \
elementary/images/icon_00.png \
elementary/images/icon_01.png \
elementary/images/icon_02.png \
elementary/images/icon_03.png \
elementary/images/icon_04.png \
elementary/images/icon_05.png \
elementary/images/icon_06.png \
elementary/images/icon_07.png \
elementary/images/icon_08.png \
elementary/images/icon_09.png \
elementary/images/icon_10.png \
elementary/images/icon_11.png \
elementary/images/icon_12.png \
elementary/images/icon_13.png \
elementary/images/icon_14.png \
elementary/images/icon_15.png \
elementary/images/icon_16.png \
elementary/images/icon_17.png \
elementary/images/icon_18.png \
elementary/images/icon_19.png \
elementary/images/icon_20.png \
elementary/images/icon_21.png \
elementary/images/icon_22.png \
elementary/images/icon_23.png \
elementary/images/icon_right_arrow.png \
elementary/images/bubble.png \
elementary/images/bubble_sh.png \
elementary/images/mystrale.jpg \
elementary/images/mystrale_2.jpg \
elementary/images/twofish.jpg \
elementary/images/pm_fill.png \
elementary/images/pt.png \
elementary/images/earth_normal.png \
elementary/images/space.png \
elementary/images/image_items.eet
elementary_images_glayer_files = \
elementary/images/g_layer/double_tap_1.png \
elementary/images/g_layer/line_1.png \
elementary/images/g_layer/momentum_1.png \
elementary/images/g_layer/tap_5.png \
elementary/images/g_layer/double_tap_2.png \
elementary/images/g_layer/line_2.png \
elementary/images/g_layer/momentum_2.png \
elementary/images/g_layer/triple_tap_1.png \
elementary/images/g_layer/double_tap_3.png \
elementary/images/g_layer/line_3.png \
elementary/images/g_layer/momentum_3.png \
elementary/images/g_layer/triple_tap_2.png \
elementary/images/g_layer/double_tap_4.png \
elementary/images/g_layer/line_4.png \
elementary/images/g_layer/momentum_4.png \
elementary/images/g_layer/triple_tap_3.png \
elementary/images/g_layer/double_tap_5.png \
elementary/images/g_layer/line_5.png \
elementary/images/g_layer/momentum_5.png \
elementary/images/g_layer/triple_tap_4.png \
elementary/images/g_layer/flick_1.png \
elementary/images/g_layer/long_tap_1.png \
elementary/images/g_layer/rotate_1.png \
elementary/images/g_layer/triple_tap_5.png \
elementary/images/g_layer/flick_2.png \
elementary/images/g_layer/long_tap_2.png \
elementary/images/g_layer/tap_1.png \
elementary/images/g_layer/zoom_1.png \
elementary/images/g_layer/flick_3.png \
elementary/images/g_layer/long_tap_3.png \
elementary/images/g_layer/tap_2.png \
elementary/images/g_layer/flick_4.png \
elementary/images/g_layer/long_tap_4.png \
elementary/images/g_layer/tap_3.png \
elementary/images/g_layer/flick_5.png \
elementary/images/g_layer/long_tap_5.png \
elementary/images/g_layer/tap_4.png

1
data/elementary/images/emoji_wink.json Normal file
View File

File diff suppressed because one or more lines are too long

1
data/elementary/images/three_box.json Normal file
View File

@ -0,0 +1 @@
{"v":"5.5.9","fr":29.9700012207031,"ip":0,"op":130.000005295009,"w":1920,"h":1080,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"layer","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[960,540,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[300,300],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-261,"s":[1,0,0,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[1,0,0,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":16,"s":[0,1,0,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":57,"s":[0,0,1,1]},{"t":119.000004846969,"s":[1,0,0,1]}],"ix":4},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-400,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":37,"s":[10]},{"t":108.00000439893,"s":[100]}],"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-600,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"box1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[300,300],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":3,"s":[1,1,1,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":45,"s":[1,0.917647123337,0,1]},{"t":96.0000039101602,"s":[1,1,1,1]}],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":1,"s":[2]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":46,"s":[69]},{"t":102.000004154545,"s":[2]}],"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"box2","np":3,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[300,300],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[600,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"box3","np":3,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":-6.00000024438501,"op":894.000036413367,"st":-6.00000024438501,"bm":0}],"markers":[]}

829
data/elementary/images/tiger.svg Normal file
View File

@ -0,0 +1,829 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
<svg version="1.1" baseProfile="basic" id="svg2" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="900px" height="900px"
viewBox="0 0 900 900" xml:space="preserve">
<path id="path482" fill="none" d="M184.013,144.428"/>
<path id="path6" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M108.956,403.826c0,0,0.178,3.344-1.276,3.311
c-1.455-0.033-30.507-84.917-66.752-80.957C40.928,326.18,72.326,313.197,108.956,403.826z"/>
<path id="path10" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M115.189,398.488c0,0-0.97,3.207-2.327,2.679
c-1.356-0.526,0.203-90.231-35.227-98.837C77.635,302.33,111.576,300.804,115.189,398.488z"/>
<path id="path14" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M163.727,473.225c0,0,2.888,1.695,2.059,2.892
c-0.832,1.194-87.655-21.408-104.35,11.003C61.436,487.118,67.931,453.771,163.727,473.225z"/>
<path id="path18" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M158.767,491.254c0,0,3.277,0.699,2.864,2.096
c-0.411,1.396-89.935,7.298-95.567,43.318C66.063,536.668,61.723,502.971,158.767,491.254z"/>
<path id="path22" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M151.332,481.498c0,0,3.139,1.171,2.528,2.492
c-0.611,1.319-90.037-5.899-100.864,28.915C52.996,512.905,53.617,478.938,151.332,481.498z"/>
<path id="path26" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M132.43,449.356c0,0,2.31,2.427,1.181,3.347
c-1.128,0.919-78.363-44.729-103.341-18.171C30.27,434.532,45.704,404.264,132.43,449.356z"/>
<path id="path30" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M119.108,456.757c0,0,2.571,2.148,1.554,3.192
c-1.017,1.041-82.921-35.576-104.734-6.36C15.928,453.589,27.837,421.769,119.108,456.757z"/>
<path id="path34" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M114.518,463.946c0,0,2.839,1.778,1.974,2.95
c-0.865,1.171-86.997-23.942-104.623,7.974C11.869,474.87,19.329,441.724,114.518,463.946z"/>
<path id="path38" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M133.47,465.03c0,0,1.981,2.703,0.743,3.472
c-1.237,0.768-71.985-54.405-100.161-31.267C34.052,437.235,53.236,409.195,133.47,465.03z"/>
<path id="path42" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M98.546,413.917c0,0,1.06,3.178-0.353,3.531
c-1.413,0.353-51.91-73.804-85.812-60.385C12.381,357.063,39.22,336.229,98.546,413.917z"/>
<path id="path46" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M99.773,426.239c0,0,1.722,2.876,0.417,3.523
c-1.303,0.649-66.605-60.873-96.813-40.458C3.376,389.306,25.088,363.174,99.773,426.239z"/>
<path id="path50" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M99.57,433.955c0,0,1.981,2.703,0.744,3.472
c-1.238,0.767-71.985-54.405-100.162-31.267C0.152,406.16,19.335,378.12,99.57,433.955z"/>
<path id="path54" fill="#FFFFFF" stroke="#000000" d="M95.668,436.985c0.888,10.678,2.632,22.275,5.703,27.783
c0,0-6.356,21.895,9.181,45.2c0,0-0.707,12.712,2.119,18.362c0,0,7.063,14.832,15.538,16.244c6.858,1.143,22.26,6.561,39.67,9.04
c0,0,30.249,24.859,24.599,47.461c0,0-0.706,28.956-7.063,31.781c0,0,20.481-19.775,3.531,9.888l-7.769,33.192
c0,0,45.201-38.138,17.657-5.648l-17.657,45.906c0,0,34.607-32.487,21.894-17.656l-5.65,15.538c0,0,76.276-48.025,21.894,4.237
c0,0,14.125-6.356,21.894-1.412c0,0,12.006-2.119,10.594,0.706c0,0-36.726,18.361-43.082,50.851c0,0,14.831-17.657,9.181,1.412
l0.706,20.48c0,0,7.063-38.138,6.356,28.25c0,0,33.9-31.78,13.419,4.944v29.662c0,0,26.838-28.956,15.538-6.354
c0,0,17.656-15.538,10.594,11.3c0,0-1.413,18.361,6.356-1.412c0,0,28.25-54.029,17.656-7.771c0,0-1.412,33.9,7.063,7.771
c0,0,0.706,18.362,16.95,31.075c0,0-2.119-89.695,20.48-26.133l7.063,28.957c0,0,4.943-16.244,4.237-25.426
c0,0,26.132-28.957,14.125,14.125c0,0,26.838-40.257,21.188-16.95c0,0-13.419,28.251-10.594,36.727c0,0,29.663-61.444,31.782-64.271
c0,0-3.531,74.865,15.537,11.3c0,0,9.888,21.188,4.943,28.957c0,0,14.125-14.125,12.712-19.774c0,0,8.122-14.479,13.066,9.534
c0,0,3.178,16.598,6.003,10.946c0,0,7.063,42.377,9.182,2.119c0,0,2.825-24.013-9.888-44.494c0,0,1.412-5.649-3.531-12.713
c0,0,24.014,38.139,11.3-12.713c0,0,19.777,14.125,21.896,14.125c0,0-24.015-40.963-8.477-32.487c0,0-9.183-18.362,22.602,2.825
c0,0-28.252-28.251,2.825-11.301c0,0,14.125,11.301,0.706-6.356c0,0-25.428-28.25,13.419,3.532c0,0,20.48,28.956,21.895,33.9
c0,0-17.655-51.559-25.426-56.501c0,0,14.832-64.271,87.576-36.727c0,0,12.007,30.369,19.774-2.118c0,0,22.602-11.301,42.375,37.432
c0,0,7.063-24.013,5.65-28.956c0,0,12.007,2.119,10.594,0c0,0,23.308,7.769,25.427,6.356c0,0,12.006,12.006,12.712,5.648
c0,0,16.244,4.944,12.713-1.412c0,0,15.538,27.544,16.244,33.9l4.236-24.719l3.531,4.942c0,0,2.825-13.419,1.413-15.537
c-1.413-2.119,35.313,12.006,43.787,48.731l3.531,14.831c0,0,10.594-26.131,7.77-33.193c0,0,9.181,1.412,9.888,9.181
c0,0,7.063-40.963-1.412-51.557c0,0,7.769-1.412,9.888,4.944V714.78c0,0,12.713,1.411,12.713-2.825c0,0,7.769-7.063,11.3,1.412
c0,0-21.894-62.15,10.594-28.25c0,0,12.714,19.068,6.356-14.125c-6.357-33.194-13.419-36.021-4.943-36.727
c0,0,1.412-6.355-2.118-9.181c-3.531-2.825,2.118,0,2.118,0s8.476,7.063-0.707-31.782c0,0,11.302,2.825-9.888-48.73
c0,0,4.944-4.237-2.118-19.069c0,0,14.125,7.77,19.069,4.944c0,0-0.707-2.825-6.356-9.889c0,0-38.139-96.759-2.118-57.913
c0,0,20.923,23.925,9.623-16.332c0,0-16.088-42.394-14.716-49.979L95.668,436.985z"/>
<path id="path58" fill="#CC7226" stroke="#000000" d="M854.095,396.693c1.108,0.32,5.004,2.304,7.211,5.217
c0,0,12.006,19.068,2.825-13.418c0,0-16.244-50.851-0.707-31.076c0,0,10.594,12.713,4.944-11.3
c-6.824-29.004-11.301-40.257-11.301-40.257s20.48,8.475-26.837-61.444l15.536,6.356c0,0-34.605-69.919-72.743-79.101
l-14.125-10.594c0,0,67.8-67.094,45.199-132.07c0,0-12.007-9.182-28.957,7.063c0,0-11.3,8.475-21.894,5.65
c0,0-54.382,2.119-57.913,2.119S630.359-21.844,514.533,9.231c0,0-9.183,3.531-16.95,1.413c0,0-32.489-28.25-118.653,12.006
c0,0-17.655,3.531-20.48,3.531s-7.77,0-21.895,11.3c-14.125,11.3-14.832,12.712-18.362,15.538c0,0-28.957,19.775-37.432,21.188
c0,0-20.481,11.3-28.25,28.957l-6.356,2.119c0,0-2.825,12.713-3.532,14.832c0,0-8.475,6.356-9.887,16.244
c0,0-15.538,10.594-14.832,18.362c0,0-2.825,9.182-4.238,17.657c0,0-12.712,8.475-11.3,13.419c0,0-13.419,24.719-11.3,36.725
c0,0-11.3-0.706-16.244,3.531c0,0-1.413,8.475-4.238,9.182c0,0-4.944,2.119-0.706,9.181c0,0-2.825,4.944-3.531,7.769
c0,0,1.412,4.944-6.356,14.831c0,0-11.3,33.194-7.769,42.375c0,0,0.707,8.475-4.237,11.3c0,0-6.356-0.707,8.475,20.481
c0,0,1.413,2.119-4.238,6.356c0,0-30.369,6.356-34.606,35.313c0,0-24.013,26.131-24.013,35.313c0,4.069,0.479,9.626,1.713,17.771
c0,0-1.007,14.718,47.725,16.131C191.772,453.469,854.095,396.693,854.095,396.693z"/>
<path id="path62" fill="#CC7226" d="M120.793,436.164c-44.141-69.566-18.716,30.018-18.716,30.018
c15.538,60.738,244.365-5.649,244.365-5.649s298.042-53.677,317.816-60.739c19.775-7.063,187.864,4.237,187.864,4.237l-9.888-29.663
c-114.414-81.926-148.314-40.963-172.327-48.025c-24.013-7.062-19.774,9.888-25.425,11.3c-5.651,1.412-74.863-42.375-86.163-40.963
c-11.301,1.413-56.045-40.523-29.663,15.538c28.25,60.032-103.115,69.213-132.778,49.438
c-29.663-19.775,12.713,32.488,12.713,32.488c32.487,35.313-28.25,5.65-28.25,5.65c-60.737-22.601-103.114,22.6-108.764,24.013
c-5.65,1.412-14.125,7.063-15.538-4.237c-1.412-11.301-14.672-40.789-70.625,5.649c-35.313,29.313-59.679-9.534-59.679-9.534
L120.793,436.164z"/>
<path id="path66" fill="#E87F3A" d="M560.632,299.761c-11.3,1.413-56.089-40.502-29.662,15.538
c29.311,62.151-103.113,69.213-132.775,49.438c-29.665-19.775,12.712,32.488,12.712,32.488c32.488,35.313-28.252,5.649-28.252,5.649
c-60.737-22.6-103.113,22.601-108.763,24.013c-5.65,1.413-14.125,7.063-15.538-4.236c-1.413-11.301-14.441-40.494-70.626,5.649
c-37.495,30.627-61.315-7.255-61.315-7.255l-5.65,17.849c-44.141-70.271-17.529,32.682-17.529,32.682
c15.54,60.739,245.521-7.962,245.521-7.962s298.043-53.676,317.817-60.738c19.774-7.062,186.325,4.109,186.325,4.109l-9.762-30.563
c-114.413-81.926-146.9-39.935-170.914-46.998c-24.013-7.063-19.774,9.888-25.425,11.3
C641.146,342.136,571.933,298.349,560.632,299.761z"/>
<path id="path70" fill="#EA8C4D" d="M562.943,302.842c-11.301,1.413-54.973-41.014-29.663,15.538
c28.604,63.918-103.113,69.215-132.776,49.44c-29.662-19.775,12.713,32.488,12.713,32.488c32.488,35.313-28.25,5.649-28.25,5.649
c-60.738-22.6-103.115,22.601-108.766,24.013c-5.65,1.413-14.125,7.063-15.538-4.236c-1.413-11.301-14.21-40.198-70.625,5.649
c-39.68,31.942-62.952-4.976-62.952-4.976l-6.356,15.216c-42.022-68.86-16.341,35.345-16.341,35.345
c15.538,60.738,246.678-10.271,246.678-10.271s298.04-53.677,317.814-60.738c19.775-7.063,184.783,3.979,184.783,3.979l-9.63-31.46
c-114.415-81.926-145.49-38.909-169.503-45.972c-24.014-7.063-19.775,9.888-25.427,11.302
C643.457,345.219,574.243,301.429,562.943,302.842z"/>
<path id="path74" fill="#EC9961" d="M565.255,305.925c-11.301,1.413-54.963-41.02-29.663,15.538
c29.663,66.311-104.057,68.586-132.775,49.438c-29.663-19.775,12.713,32.488,12.713,32.488c32.486,35.313-28.25,5.649-28.25,5.649
c-60.738-22.6-103.114,22.601-108.764,24.013c-5.65,1.413-14.125,7.063-15.538-4.236c-1.413-11.301-13.979-39.9-70.627,5.649
c-41.862,33.259-64.591-2.696-64.591-2.696l-7.063,12.584c-38.491-64.976-15.151,38.012-15.151,38.012
c15.538,60.736,247.833-12.586,247.833-12.586s298.04-53.677,317.817-60.738c19.773-7.063,183.24,3.853,183.24,3.853l-9.502-32.358
c-114.414-81.928-144.076-37.882-168.09-44.945c-24.015-7.063-19.775,9.888-25.427,11.3
C645.766,348.301,576.555,304.512,565.255,305.925z"/>
<path id="path78" fill="#EEA575" d="M567.567,309.008c-11.303,1.412-54.07-41.412-29.664,15.538
c29.664,69.213-103.114,69.213-132.776,49.438c-29.663-19.775,12.713,32.487,12.713,32.487c32.487,35.313-28.251,5.65-28.251,5.65
c-60.738-22.6-103.113,22.601-108.763,24.013c-5.65,1.412-14.125,7.063-15.538-4.237s-13.746-39.604-70.626,5.649
c-44.046,34.575-66.229-0.418-66.229-0.418l-7.769,9.953c-34.96-61.446-13.964,40.673-13.964,40.673
c15.538,60.74,248.989-14.895,248.989-14.895s298.043-53.677,317.816-60.738c19.775-7.063,181.701,3.724,181.701,3.724
l-9.374-33.259c-114.414-81.926-142.664-36.853-166.677-43.915c-24.014-7.062-19.775,9.888-25.426,11.3
C648.081,351.383,578.868,307.595,567.567,309.008z"/>
<path id="path82" fill="#F1B288" d="M569.879,312.089c-11.3,1.412-57.144-39.994-29.663,15.538
c33.9,68.507-103.115,69.213-132.778,49.438c-29.661-19.775,12.714,32.487,12.714,32.487c32.487,35.313-28.25,5.65-28.25,5.65
c-60.738-22.6-103.114,22.601-108.764,24.013c-5.65,1.412-14.125,7.063-15.538-4.237c-1.413-11.3-13.514-39.309-70.626,5.649
c-46.228,35.893-67.866,1.863-67.866,1.863l-8.475,7.317c-31.782-58.619-12.776,43.341-12.776,43.341
C123.394,553.887,358,475.94,358,475.94s298.042-53.677,317.817-60.738c19.774-7.063,180.158,3.595,180.158,3.595l-9.244-34.156
c-114.413-81.926-141.251-35.827-165.265-42.889c-24.013-7.062-19.774,9.888-25.426,11.3
C650.393,354.464,581.179,310.676,569.879,312.089z"/>
<path id="path86" fill="#F3BF9C" d="M572.19,315.169c-11.303,1.413-57.813-39.656-29.665,15.538
c36.021,70.627-103.113,69.214-132.776,49.439s12.713,32.488,12.713,32.488c32.487,35.313-28.25,5.65-28.25,5.65
c-60.738-22.601-103.114,22.6-108.764,24.013c-5.65,1.412-14.125,7.063-15.538-4.237c-1.412-11.301-13.283-39.014-70.625,5.649
c-48.412,37.208-69.503,4.141-69.503,4.141l-9.181,4.688c-28.25-53.322-11.59,46.004-11.59,46.004
c15.538,60.738,251.301-19.519,251.301-19.519s298.041-53.677,317.816-60.738c19.775-7.063,178.619,3.466,178.619,3.466
l-9.117-35.055c-114.414-81.926-139.84-34.799-163.853-41.862c-24.014-7.064-19.774,9.888-25.425,11.3
C652.702,357.546,583.49,313.757,572.19,315.169z"/>
<path id="path90" fill="#F5CCB0" d="M574.501,318.252c-11.3,1.413-59.753-38.624-29.662,15.538
c38.844,69.92-103.115,69.213-132.778,49.438c-29.662-19.775,12.714,32.488,12.714,32.488c32.486,35.313-28.251,5.65-28.251,5.65
c-60.737-22.602-103.113,22.6-108.764,24.013c-5.65,1.412-14.125,7.063-15.538-4.237c-1.413-11.301-13.05-38.716-70.626,5.649
c-50.594,38.524-71.14,6.422-71.14,6.422l-9.887,2.054c-25.427-50.145-10.401,48.668-10.401,48.668
c15.538,60.74,252.455-21.829,252.455-21.829s298.043-53.677,317.816-60.738c19.775-7.063,177.078,3.339,177.078,3.339
l-8.987-35.956c-114.414-81.926-138.428-33.771-162.439-40.834c-24.013-7.063-19.774,9.888-25.425,11.3
C655.015,360.628,585.802,316.84,574.501,318.252z"/>
<path id="path94" fill="#F8D8C4" d="M576.813,321.335c-11.3,1.413-59.753-38.625-29.662,15.538
c38.845,69.919-103.113,69.213-132.776,49.438c-29.662-19.775,12.713,32.488,12.713,32.488c32.488,35.313-28.25,5.65-28.25,5.65
c-60.74-22.602-103.115,22.6-108.766,24.013c-5.65,1.412-14.125,7.063-15.538-4.238c-1.413-11.3-12.817-38.42-70.625,5.65
c-52.777,39.84-72.776,8.701-72.776,8.701l-10.594-0.579c-24.015-46.615-9.213,51.332-9.213,51.332
c15.538,60.738,253.609-24.143,253.609-24.143s298.042-53.675,317.817-60.736c19.775-7.063,175.538,3.21,175.538,3.21l-8.859-36.854
c-114.416-81.926-137.016-32.744-161.027-39.807c-24.013-7.063-19.775,9.888-25.427,11.3
C657.326,363.711,588.112,319.923,576.813,321.335z"/>
<path id="path98" fill="#FAE5D7" d="M579.124,324.417c-11.301,1.413-59.068-38.998-29.663,15.538
c38.844,72.038-103.113,69.213-132.776,49.438c-29.662-19.775,12.714,32.488,12.714,32.488c32.486,35.313-28.251,5.65-28.251,5.65
c-60.737-22.602-103.113,22.6-108.764,24.013c-5.652,1.412-14.127,7.063-15.54-4.238c-1.412-11.3-12.585-38.123-70.625,5.65
c-54.959,41.157-74.413,10.979-74.413,10.979l-11.302-3.212c-22.954-42.375-8.025,53.999-8.025,53.999
c15.538,60.738,254.769-26.455,254.769-26.455s298.04-53.675,317.814-60.736c19.775-7.063,173.997,3.082,173.997,3.082
l-8.732-37.752c-114.413-81.928-135.602-31.718-159.613-38.781c-24.014-7.063-19.774,9.888-25.426,11.3
S590.424,323.004,579.124,324.417z"/>
<path id="path102" fill="#FCF2EB" d="M581.435,327.498c-11.3,1.412-57.161-39.981-29.661,15.538
c37.432,75.571-103.114,69.215-132.776,49.439c-29.663-19.775,12.713,32.488,12.713,32.488c32.487,35.313-28.251,5.649-28.251,5.649
c-60.738-22.601-103.113,22.601-108.763,24.013c-5.65,1.413-14.125,7.063-15.538-4.237c-1.413-11.3-12.354-37.827-70.626,5.65
c-57.145,42.473-76.053,13.258-76.053,13.258l-12.006-5.842c-22.6-40.964-6.836,56.661-6.836,56.661
c15.538,60.736,255.921-28.766,255.921-28.766s298.043-53.676,317.817-60.737c19.775-7.063,172.454,2.951,172.454,2.951
l-8.604-38.65c-114.415-81.926-134.188-30.688-158.2-37.751c-24.014-7.064-19.775,9.887-25.426,11.3
C661.948,369.875,592.735,326.085,581.435,327.498z"/>
<path id="path106" fill="#FFFFFF" d="M120.44,466.182c-22.601-38.846-5.65,59.325-5.65,59.325
c15.538,60.738,257.078-31.075,257.078-31.075s298.042-53.677,317.816-60.738c19.775-7.063,170.914,2.823,170.914,2.823
l-8.475-39.55c-114.414-81.926-132.776-29.663-156.789-36.726c-24.013-7.063-19.775,9.888-25.426,11.3
c-5.649,1.413-74.862-42.375-86.163-40.963c-11.3,1.412-55.829-40.623-29.663,15.538c39.245,84.232-107.28,66.436-132.777,49.438
c-29.663-19.775,12.712,32.488,12.712,32.488c32.488,35.313-28.25,5.65-28.25,5.65c-60.737-22.602-103.113,22.602-108.764,24.014
c-5.65,1.413-14.125,7.063-15.538-4.237c-1.413-11.302-12.121-37.532-70.625,5.65c-59.326,43.788-77.688,15.537-77.688,15.537
L120.44,466.182z"/>
<path id="path110" d="M193.891,519.15c0,0-12.713,20.48,24.013,43.788c0,0,2.472,2.473-29.31-4.943c0,0-10.947-3.531-13.771-21.896
c0,0-8.475-7.769-16.95-17.655C149.397,508.557,193.891,519.15,193.891,519.15z"/>
<path id="path114" fill="#CCCCCC" d="M441.08,435.104c0,0,31.249,47.356,30.193,55.797c-2.297,18.362-2.648,35.313,3.001,42.376
c5.651,7.063,21.188,65.682,21.188,65.682s-0.706,2.119,21.188-64.976c0,0,20.48-28.25-14.831-60.738
C501.82,473.244,439.668,422.392,441.08,435.104z"/>
<path id="path118" d="M229.204,566.47c0,0,19.775,12.713-5.65,67.802l11.3-4.237c0,0-1.413,19.774-7.063,24.013l12.712-5.65
c0,0,8.475,14.127,1.413,22.602c0,0,29.663,14.125,28.25,25.425c0,0,11.3-14.125,4.237-25.425s-19.775-4.237-18.363-36.727
l-15.538,5.65c0,0,9.888-15.538,9.888-26.838l-14.125,4.237c0,0,27.313-46.928,8.475-49.438
C234.147,566.47,229.204,566.47,229.204,566.47z"/>
<path id="path122" fill="#CCCCCC" d="M286.41,596.133c0,0,4.944-7.769,0-6.355c-4.944,1.413-60.032,27.544-70.625,44.494
C215.785,634.271,276.522,591.189,286.41,596.133z"/>
<path id="path126" fill="#CCCCCC" d="M304.773,610.258c0,0,4.944-7.769,0-6.355s-60.032,27.544-70.625,44.494
C234.147,648.396,294.885,605.314,304.773,610.258z"/>
<path id="path130" fill="#CCCCCC" d="M328.079,583.42c0,0,4.944-7.769,0-6.355c-4.943,1.412-60.032,27.545-70.625,44.494
C257.454,621.559,318.191,578.477,328.079,583.42z"/>
<path id="path134" fill="#CCCCCC" d="M287.117,660.402c0,0,0-10.595-4.944-9.183c-4.944,1.413-68.507,32.488-79.101,49.438
C203.072,700.659,277.229,655.458,287.117,660.402z"/>
<path id="path138" fill="#CCCCCC" d="M289.235,641.333c0,0,2.119-8.475-2.825-7.063c-3.531,0-50.144,20.481-60.738,37.433
C225.672,671.702,277.935,633.564,289.235,641.333z"/>
<path id="path142" fill="#CCCCCC" d="M263.81,725.378l-17.656,13.419c0,0,18.362-13.419,24.719-11.3
c0,0-12.006,19.774-13.419,28.956c0,0,18.363-22.602,28.25-21.895c0,0,13.419,0.706,13.419,19.774c0,0,9.888-18.362,15.537-17.656
c0,0,2.119,11.302,0,23.308c0,0,7.063-13.419,14.125-10.595c0,0,11.301-3.53,9.888,16.95c0,0,0,18.362-1.412,23.308
c0,0,9.889-46.613,14.125-47.319c0,0,14.125-2.119,22.602,13.419c0,0-7.063-13.419,1.412-9.888c0,0,19.068,2.824,24.719,14.831
c0,0-12.006-21.188-2.118-15.537c0,0,12.006,0,14.125,11.3c0,0,14.831,37.432,18.362,40.257c0,0-13.419-38.138-10.595-38.138
c0,0-3.53-21.188,5.65,4.942c0,0-5.65-24.719,4.237-23.307c9.888,1.413,17.655,19.069,32.487,14.832
c0,0,16.952,9.888,20.483-112.295L263.81,725.378z"/>
<path id="path146" d="M272.285,561.526c0,0,26.131-10.595,96.757,0c0,0,12.713,0.706,24.72-14.831
c12.006-15.538,59.325-28.251,70.625-24.721l16.952,11.302l1.413,2.118c0,0,21.895,18.362,22.6,31.781
c0.706,13.418-25.425,98.169-42.377,126.42c-16.949,28.25-33.899,50.145-67.801,45.906c0,0-36.726-7.063-81.926,0
c0,0-51.557-2.825-56.5-16.95s19.775-40.963,19.775-40.963s7.769-14.831,5.65-40.257C280.054,615.908,280.76,566.47,272.285,561.526
z"/>
<path id="path150" fill="#E5668C" d="M311.129,565.058c14.832,32.487-37.431,147.607-37.431,147.607
c-3.531,2.825,22.353,13.499,40.256,9.182c19.327-4.657,90.401,2.825,90.401,2.825c41.669-27.544,64.27-105.938,64.27-105.938
s18.364-42.376-12.713-48.025C424.837,565.058,311.129,565.058,311.129,565.058z"/>
<path id="path154" fill="#B23259" d="M307.543,619.608c5.873-22.582,8.67-43.419,3.586-54.552c0,0,110.177,11.301,129.951-25.426
c7.488-13.904,33.55,40.257,32.842,57.207c0,0-111.236,25.426-137.367,5.65L307.543,619.608z"/>
<path id="path158" fill="#A5264C" d="M315.367,648.396c0,0,3.531,12.713-0.707,19.774c0,0-2.824,1.413-4.943,2.119
c0,0,2.119,6.356,12.713,9.182c0,0,3.531,7.77,7.77,8.476s12.713,10.594,19.774,8.475c7.063-2.118,26.839-9.181,26.839-9.181
s9.888-5.65,25.425,0.706c0,0,4.192-1.416,4.942-8.476c0.884-8.299,6.356-14.832,9.889-18.362
c3.531-3.531,20.48-26.133,18.362-26.838C433.313,633.564,315.367,648.396,315.367,648.396z"/>
<path id="path162" fill="#FF727F" stroke="#000000" d="M307.598,562.938c0,0-4.943,39.552,0.707,54.383
c5.649,14.832,4.237,18.362,2.824,25.426c-1.412,7.063,6.356,24.719,16.244,35.313l21.188,2.825c0,0,26.839-6.355,43.082-1.412
c0,0,15.881,2.371,21.895-24.014c0,0,8.476-11.3,21.188-16.243c12.713-4.943,25.426-78.395,18.362-92.52
c-7.063-14.126-32.488-21.896-60.738,5.648S360.567,550.227,307.598,562.938z"/>
<path id="path166" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M310.423,695.009c0,0-1.412-3.531-9.181-4.237
c0,0-39.55-6.355-54.382-28.25c0,0-12.006-9.888-4.238,10.595c0,0,18.363,36.019,30.369,40.963
C272.991,714.078,301.948,721.141,310.423,695.009z"/>
<path id="path170" fill="#CC3F4C" d="M451.572,582.058c1.163-13.96,4.61-29.169,1.515-35.361
c-11.382-22.768-41.35-13.253-60.738,5.648c-28.25,27.544-31.78-2.118-84.751,10.595c0,0-3.081,24.653-1.598,42.332
c0,0,65.867-20.438,67.28-10.551c0,0,2.823-5.649,19.067-5.649S448.747,587.001,451.572,582.058z"/>
<path id="path174" stroke="#A51926" stroke-width="2" d="M375.398,564.352c0,0,8.476,8.476,2.118,25.426
c0,0-25.426,28.25-21.895,52.97"/>
<path id="path178" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M290.648,714.078c0,0-7.769-22.602,7.769-10.594
c0,0,8.475,3.53,6.356,6.354C302.654,712.665,292.767,719.729,290.648,714.078z"/>
<path id="path182" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M299.547,716.196c0,0-6.215-18.08,6.215-8.476
c0,0,7.806,4.322,5.084,5.085C302.795,715.066,310.847,719.587,299.547,716.196z"/>
<path id="path186" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M308.021,716.196c0,0-6.215-18.08,6.215-8.476
c0,0,7.725,4.078,5.086,5.085C313.39,715.066,319.322,719.587,308.021,716.196z"/>
<path id="path190" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M319.675,716.55c0,0-6.215-18.08,6.215-8.476
c0,0,7.739,4.118,5.087,5.085C325.749,715.066,330.977,719.939,319.675,716.55z"/>
<path id="path194" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M331.116,716.408c0,0-6.215-18.08,6.217-8.476
c0,0,6.78,2.825,5.085,5.085C340.723,715.278,342.418,719.799,331.116,716.408z"/>
<path id="path198" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M342.911,717.609c0,0-8.477-21.896,7.769-10.595
c0,0,8.476,3.531,6.356,6.355C354.917,716.196,357.036,721.847,342.911,717.609z"/>
<path id="path202" stroke="#A5264C" stroke-width="2" d="M292.767,687.24c0,0,23.307-4.944,33.9,0.706
c0,0,10.594,2.119,12.713,1.412c2.118-0.706,7.77-1.412,7.77-1.412"/>
<path id="path206" stroke="#A5264C" stroke-width="2" d="M352.799,702.777c0,0,21.188-24.014,42.375-16.243
c12.389,4.543,10.594-1.413,12.006-6.356c1.413-4.943,1.768-12.358,10.596-17.656"/>
<path id="path210" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M383.168,674.527c0,0-7.063-19.069-12.007,3.53
c-4.944,22.602-10.594,28.957-13.419,33.9c0,0,0,9.182,14.831,8.476c0,0,19.068-0.707,19.774-5.649
C393.055,709.84,390.23,689.358,383.168,674.527z"/>
<path id="path214" stroke="#A5264C" stroke-width="2" d="M407.887,687.24c0,0,6.356-4.237,10.594-2.119"/>
<path id="path218" stroke="#A5264C" stroke-width="2" d="M419.363,658.283c0,0,5.12-8.651,13.596-10.063"/>
<path id="path222" fill="#B2B2B2" d="M279.348,723.259c0,0,31.781,5.65,39.551,2.825c0,0,15.536,0,0.706,3.531
c0,0-22.602,0-36.727-2.118C282.879,727.497,262.397,717.609,279.348,723.259z"/>
<path id="path226" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M304.066,558.701c0,0,31.075,0,34.606,1.412
c0,0,12.713,54.382,6.356,67.801c0,0-2.118,4.944-7.063-4.943c0,0-32.488-57.913-38.138-61.443
C294.177,557.996,301.948,558.701,304.066,558.701z"/>
<path id="path230" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M167.936,553.934c0,0,15.714,3.002,37.961,7.594
c0,0,8.475,39.551,14.125,48.024c5.65,8.475-0.706,8.476-7.063,3.531s-32.488-29.663-36.019-37.432
C173.409,567.882,167.936,553.934,167.936,553.934z"/>
<path id="path234" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M206.534,561.909c0,0,10.241,2.732,12.022,6.645
c1.78,3.909-2.123,9.73-2.123,9.73s-1.766,5.835-3.888,2.018C210.424,576.483,205.353,562.958,206.534,561.909z"/>
<path id="path238" d="M206.603,561.526c0,0,6.356,9.182,12.713,9.182c6.356,0,7.031-0.729,12.006,0.353
c8.122,1.767,7.416-1.766,19.069,0.354c4.661,0.848,9.181-0.706,14.125,1.412c4.944,2.119,10.594,0.706,12.713-2.825
s10.594-10.946,10.594-10.946s-22.6,3.179-27.544,4.591C260.279,563.645,220.729,565.764,206.603,561.526z"/>
<path id="path242" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M285.351,561.879c0,0-11.389,6.182-12.095,10.418
c-0.707,4.237,9.27,10.771,9.27,10.771s4.855,8.122,5.915,3.884C289.5,582.714,286.763,562.586,285.351,561.879z"/>
<path id="path246" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M219.166,571.527c0,0,12.372,19.754,12.755-0.041
c0,0,0.983-2.223-2.124-2.261C219.07,569.092,221.756,561.85,219.166,571.527z"/>
<path id="path250" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M231.839,571.967c0,0,13.986,19.752,12.863-0.164
c0,0,0.012-0.587-3.083-0.855C233.238,570.215,233.847,562.238,231.839,571.967z"/>
<path id="path254" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M244.575,571.98c0,0,14.054,18.766,12.873,1.697
c0,0,0.21-2.177-2.71-2.708C247.866,569.725,247.494,563.987,244.575,571.98z"/>
<path id="path258" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M256.716,572.122c0,0,13.948,20.412,14.563,3.143
c0,0,2.903-2.433-0.18-2.824C260.826,571.133,262.235,563.269,256.716,572.122z"/>
<path id="path262" fill="#E5E5B2" d="M192.845,578.354l-13.521-2.702c-4.591-8.828-8.299-19.688-8.299-19.688
s11.212,1.767,33.282,6.709c0,0,1.547,5.858,4.146,16.091L192.845,578.354z"/>
<path id="path266" fill="#E5E5B2" d="M307.732,570.123c-2.942-4.425-5.268-7.528-6.416-8.245c-5.32-3.325,1.995-2.659,3.989-2.659
c0,0,29.258,0,32.583,1.329c0,0,0.926,3.959,2.134,9.946C340.022,570.494,322.21,566.945,307.732,570.123z"/>
<path id="path270" fill="#CC7226" d="M402.378,326.201c48.945,6.992,94.004-55.936,97.112-73.028
c3.106-17.092-14.762-38.067-14.762-38.067c2.33-5.438-6.216-30.298-15.537-46.613c-9.322-16.314-37.398-14.595-68.367-16.314
c-27.968-1.554-60.599,39.621-62.928,42.729c-2.331,3.108,8.546,70.698,10.876,80.798s-2.33,56.712-2.33,56.712
C406.897,316.349,353.434,319.209,402.378,326.201z"/>
<path id="path274" fill="#EA8E51" d="M339.182,196.051c-2.288,3.051,8.392,69.413,10.68,79.328
c2.288,9.916-2.288,55.682-2.288,55.682c57.687-15.679,6.864-12.967,54.918-6.102c48.056,6.865,92.296-54.918,95.347-71.701
c3.051-16.781-14.492-37.375-14.492-37.375c2.288-5.339-6.103-29.748-15.255-45.766c-9.153-16.018-36.717-14.328-67.125-16.018
C373.506,152.573,341.47,193,339.182,196.051z"/>
<path id="path278" fill="#EFAA7C" d="M340.467,197.195c-2.245,2.995,8.235,68.127,10.481,77.859s-2.246,54.65-2.246,54.65
c55.448-16.173,6.737-12.727,53.9-5.989c47.166,6.738,90.587-53.901,93.581-70.373c2.994-16.47-14.224-36.683-14.224-36.683
c2.245-5.24-5.989-29.197-14.973-44.918c-8.984-15.721-36.037-14.063-65.882-15.721C374.155,154.522,342.713,194.2,340.467,197.195z
"/>
<path id="path282" fill="#F4C6A8" d="M341.753,198.339c-2.204,2.938,8.079,66.842,10.282,76.391
c2.204,9.548-2.203,53.619-2.203,53.619c51.974-15.961,6.61-12.487,52.885-5.876c46.275,6.611,88.877-52.884,91.815-69.043
c2.938-16.161-13.956-35.993-13.956-35.993c2.203-5.142-5.876-28.646-14.69-44.07c-8.813-15.425-35.355-13.799-64.638-15.425
C374.806,156.472,343.956,195.401,341.753,198.339z"/>
<path id="path286" fill="#F9E2D3" d="M343.038,199.483c-2.161,2.881,7.924,65.557,10.085,74.921
c2.161,9.365-2.161,52.588-2.161,52.588c49.205-15.75,6.483-12.246,51.868-5.763c45.386,6.483,87.168-51.868,90.049-67.718
c2.882-15.849-13.687-35.299-13.687-35.299c2.161-5.042-5.765-28.095-14.408-43.223c-8.646-15.128-34.677-13.534-63.396-15.128
C375.455,158.421,345.199,196.602,343.038,199.483z"/>
<path id="path290" fill="#FFFFFF" d="M402.942,319.984c44.493,6.356,85.459-50.85,88.283-66.388
c2.825-15.538-13.419-34.606-13.419-34.606c2.119-4.944-5.65-27.544-14.127-42.375c-8.475-14.831-33.995-13.267-62.149-14.831
c-25.427-1.413-55.088,36.019-57.207,38.844c-2.119,2.825,7.769,64.27,9.888,73.451c2.119,9.182-2.119,51.557-2.119,51.557
C397.116,310.45,358.448,313.628,402.942,319.984z"/>
<path id="path294" fill="#CCCCCC" d="M484.87,259.953c0,0-49.087,13.419-69.568,10.594c0,0-27.896-11.653-43.435,26.838
c0,0-6.356,12.713-9.889,16.244C358.447,317.16,484.87,259.953,484.87,259.953z"/>
<path id="path298" d="M491.58,256.068c0,0-51.206,21.541-68.862,20.834c0,0-28.956-8.122-43.788,17.656
c0,0-14.831,16.244-20.48,19.069c0,0-0.706,2.825,10.594-4.238l18.363,9.182c0,0,26.131,16.95,43.081-11.3
c0,0,7.063-19.775,7.063-23.307c0-3.532,37.433-13.419,40.259-14.125C480.633,269.134,492.286,261.718,491.58,256.068z"/>
<path id="path302" fill="#99CC32" d="M407.887,319.479c-12.134,0-26.918-6.824-26.918-17.857c0-11.032,14.784-22.094,26.918-22.094
c12.138,0,21.976,8.943,21.976,19.975C429.861,310.537,420.023,319.479,407.887,319.479z"/>
<path id="path306" fill="#659900" d="M401.489,290.021c-8.557,1.275-17.541,3.929-17.414,3.547
c2.719-8.156,13.95-14.041,23.812-14.041c7.585,0,14.273,3.493,18.222,8.807C426.107,288.335,416.722,287.753,401.489,290.021z"/>
<path id="path310" fill="#FFFFFF" d="M422.718,289.616c0,0-7.769-5.65-7.769-1.766C414.949,287.85,421.306,295.619,422.718,289.616z
"/>
<path id="path314" d="M405.063,303.963c-4.412,0-7.989-3.577-7.989-7.991c0-4.412,3.577-7.989,7.989-7.989
c4.413,0,7.99,3.577,7.99,7.989C413.053,300.386,409.476,303.963,405.063,303.963z"/>
<path id="path318" fill="#CC7226" d="M221.435,280.434c0,0-5.65-37.432-1.413-45.2c0,0,19.069-17.657,18.363-24.013
c0,0-0.706-31.782-2.825-33.194c-2.119-1.413-15.538-12.006-26.131-0.706c0,0-18.363,31.781-16.95,43.082v3.531
c0,0-13.419-0.706-16.244,2.825c0,0-2.119,9.181-4.238,9.888c0,0-4.944,4.237-1.413,9.181c0,0-3.531,4.237-2.825,11.3l13.419,7.063
c0,0,3.531,25.425,22.601,34.606C212.317,302.909,217.903,291.028,221.435,280.434z"/>
<path id="path322" fill="#FFFFFF" d="M219.669,277.186c0,0-5.085-33.688-1.271-40.681c0,0,17.162-15.891,16.527-21.611
c0,0-0.636-28.604-2.543-29.875c-1.907-1.271-13.984-10.806-23.518-0.636c0,0-16.526,28.604-15.255,38.773v3.178
c0,0-12.077-0.636-14.62,2.542c0,0-1.907,8.263-3.813,8.899c0,0-4.45,3.813-1.271,8.263c0,0-3.178,3.813-2.542,10.17l12.077,6.356
c0,0,3.178,22.883,20.34,31.146C211.462,297.411,216.491,286.72,219.669,277.186z"/>
<path id="path326" fill="#EB955C" d="M234.765,179.775c-1.924-1.519-15.149-11.706-25.478-0.688c0,0-17.904,30.987-16.526,42.004
v3.443c0,0-13.083-0.688-15.838,2.754c0,0-2.066,8.952-4.132,9.641c0,0-4.82,4.132-1.377,8.952c0,0-3.443,4.132-2.754,11.018
l13.083,6.886c0,0,3.443,24.79,22.035,33.741c8.323,4.008,13.772-7.574,17.215-17.903c0,0-5.509-36.496-1.377-44.07
c0,0,18.592-17.215,17.903-23.413C237.52,212.139,236.831,181.152,234.765,179.775z"/>
<path id="path330" fill="#F2B892" d="M233.971,181.523c-1.73-1.625-14.761-11.406-24.825-0.671c0,0-17.444,30.192-16.103,40.927
v3.355c0,0-12.748-0.671-15.432,2.684c0,0-2.013,8.722-4.026,9.394c0,0-4.696,4.025-1.342,8.722c0,0-3.354,4.025-2.684,10.735
l12.748,6.709c0,0,3.354,24.154,21.47,32.876c8.111,3.906,13.419-7.38,16.773-17.445c0,0-5.368-35.56-1.342-42.94
c0,0,18.115-16.773,17.444-22.812C236.654,213.057,235.983,182.865,233.971,181.523z"/>
<path id="path334" fill="#F8DCC8" d="M233.176,183.271c-1.536-1.73-14.373-11.106-24.172-0.653c0,0-16.985,29.398-15.679,39.851
v3.266c0,0-12.413-0.653-15.026,2.613c0,0-1.96,8.493-3.919,9.146c0,0-4.573,3.92-1.307,8.493c0,0-3.267,3.92-2.613,10.453
l12.413,6.533c0,0,3.266,23.518,20.905,32.011c7.897,3.803,13.065-7.186,16.332-16.985c0,0-5.227-34.624-1.307-41.811
c0,0,17.639-16.332,16.985-22.211C235.789,213.976,235.136,184.578,233.176,183.271z"/>
<path id="path338" fill="#FFFFFF" d="M219.669,277.009c0,0-5.085-33.512-1.271-40.504c0,0,17.162-15.891,16.527-21.611
c0,0-0.636-28.604-2.543-29.875c-1.342-1.836-13.984-10.806-23.518-0.636c0,0-16.526,28.604-15.255,38.773v3.178
c0,0-12.077-0.636-14.62,2.542c0,0-1.907,8.263-3.813,8.899c0,0-4.45,3.813-1.271,8.263c0,0-3.178,3.813-2.542,10.17l12.077,6.356
c0,0,3.178,22.883,20.34,31.146C211.462,297.411,216.491,286.543,219.669,277.009z"/>
<path id="path342" fill="#CCCCCC" d="M214.195,265.956c0,0-38.138-18.01-39.727-19.422c0,0,16.067,14.479,17.48,14.479
C193.361,261.013,214.195,265.956,214.195,265.956z"/>
<path id="path346" d="M184.003,255.009c0,0,32.488,6.356,32.488,14.125c0,5.141-0.429,28.834-9.888,26.131
C191.772,291.028,198.128,265.603,184.003,255.009z"/>
<path id="path350" fill="#99CC32" d="M198.834,261.718c0,0,15.852,2.603,17.656,7.416c1.06,2.825,2.23,17.494-7.416,19.422
C201.038,290.165,197.101,272.118,198.834,261.718z"/>
<path id="path354" d="M350.671,336.845c-0.878-3.076,1.438-2.845,4.601-3.794c3.53-1.06,25.071-7.769,26.483-12.359
c1.413-4.591,24.719,3.178,24.719,3.178c3.18,1.412,10.947,6.003,10.947,6.003c8.476,2.119,20.128,2.825,20.128,2.825
c4.238,1.766,10.241,6.709,10.241,6.709c25.778,18.009,47.674,5.297,47.674,5.297c35.313-11.653,24.72-42.022,24.72-42.022
c-5.298-15.891,0.354-21.894,0.354-21.894c0.354-6.709,13.064,4.591,13.064,4.591c4.592,7.416,6.005,16.244,6.005,16.244
c14.125,19.775,8.122-11.653,8.122-11.653c0.353-1.766-4.592-8.122-4.592-10.241s-3.179-8.122-3.179-8.122
c-5.297-6.003-1.06-18.363-1.06-18.363c3.179-24.366-0.706-21.188-0.706-21.188c-2.118-3.178-18.362,14.478-18.362,14.478
c-3.885,6.003-14.479,8.828-14.479,8.828c-4.942,3.178-10.946,0.707-10.946,0.707c-4.59-0.707-14.479,11.653-14.479,11.653
c4.943-0.354,9.182,7.416,13.419,7.769c4.237,0.354,7.415-4.237,10.24-5.297c2.825-1.059,7.769,9.182,7.769,9.182
c0.707,4.59-9.181,13.065-9.181,13.065c-0.707,8.122-3.531,5.297-3.531,5.297c-5.297-1.059-7.415,5.65-9.182,13.772
c-1.766,8.122-9.182,8.829-9.182,8.829c-2.825,13.065-4.945,7.769-4.945,7.769c-0.354-9.888-10.947,0.353-10.947,0.353
c-2.118,3.531-10.239-0.353-10.239-0.353c-12.008-3.531-7.77-7.063-7.77-7.063c3.178-3.884,22.953,0,22.953,0
c3.884-2.825-10.241-9.888-10.241-9.888c-1.06-3.178,0.706-10.947,0.706-10.947c2.119-5.65,14.126-15.538,14.126-15.538
c16.599-2.119,11.654-4.944,11.654-4.944c-10.946-9.182-21.189,4.237-21.189,4.237c-3.884,10.947-34.605,37.432-34.605,37.432
c-8.476,6.003-3.884-6.003-10.947,0c-7.063,6.003-43.435-9.888-43.435-9.888c-20.414-2.106-25.238,25.688-31.47,20.18
C343.93,331.689,353.496,346.732,350.671,336.845z"/>
<path id="path358" d="M694.629,43.132c0,0-45.201,14.125-50.145,47.319c0,0-4.237,40.256,31.78,71.332c0,0,0.707,11.3,4.238,16.95
c0,0-2.825,8.475,30.368-4.944l48.025-14.832c0,0,11.301-4.238,20.481-19.775c9.181-15.538,36.019-48.731,29.662-93.226
c0,0,2.119-19.775-8.475-20.481c0,0-14.832-2.825-27.544,10.594c0,0-12.008,5.65-16.244,4.944L694.629,43.132z"/>
<path id="path362" d="M791.069,41.384c0,0,3.708-15.767-4.837-7.222c0,0-12.432,10.1-25.641,10.1c0,0-25.637,3.884-33.404,27.191
c0,0-6.992,47.39,6.99,57.489c0,0,8.546,13.207,20.978,1.554C767.587,118.843,794.954,65.467,791.069,41.384z"/>
<path id="path366" fill="#323232" d="M790.409,42.016c0,0,3.689-15.438-4.7-7.048c0,0-12.204,9.916-25.173,9.916
c0,0-25.171,3.814-32.798,26.697c0,0-6.865,46.528,6.863,56.444c0,0,8.392,12.967,20.596,1.525
C767.403,118.108,794.224,65.661,790.409,42.016z"/>
<path id="path370" fill="#666666" d="M789.749,42.648c0,0,3.673-15.11-4.563-6.875c0,0-11.978,9.732-24.705,9.732
c0,0-24.705,3.743-32.191,26.202c0,0-6.738,45.667,6.737,55.399c0,0,8.234,12.727,20.213,1.497
C767.22,117.374,793.492,65.855,789.749,42.648z"/>
<path id="path374" fill="#999999" d="M789.089,43.28c0,0,3.654-14.782-4.425-6.703c0,0-11.752,9.549-24.24,9.549
c0,0-24.239,3.672-31.584,25.708c0,0-6.609,44.805,6.61,54.354c0,0,8.08,12.487,19.832,1.469
C767.036,116.639,792.762,66.05,789.089,43.28z"/>
<path id="path378" fill="#CCCCCC" d="M788.429,43.912c0,0,3.638-14.454-4.287-6.529c0,0-11.527,9.365-23.773,9.365
c0,0-23.772,3.602-30.978,25.213c0,0-6.482,43.943,6.483,53.309c0,0,7.924,12.247,19.45,1.441
C766.851,115.904,792.03,66.244,788.429,43.912z"/>
<path id="path382" fill="#FFFFFF" d="M787.767,44.544c0,0,3.619-14.125-4.148-6.356c0,0-11.301,9.181-23.308,9.181
c0,0-23.307,3.531-30.368,24.719c0,0-6.356,43.082,6.355,52.263c0,0,7.77,12.006,19.069,1.412
C766.667,115.17,791.298,66.438,787.767,44.544z"/>
<path id="path386" fill="#992600" d="M414.243,403.323c0,0-36.021-33.901-50.146-35.313c0,0-60.738-7.063-86.87,24.719
c0,0,31.076-36.019,79.807-26.131c0,0-38.138-7.769-60.032-2.119c0,0-29.663,0-46.613,24.719l-4.944,8.475
c0,0,7.063-26.131,39.55-36.726c0,0,40.256-8.475,59.326,0c0,0-38.138-12.006-55.794-8.475c0,0-53.675-4.237-76.275,42.375
c0,0,7.063-25.425,33.194-38.138c0,0,24.013-15.538,60.032-10.594c0,0,25.425,5.65,34.607,9.888
c9.182,4.237,7.063-0.707-7.769-9.182c0,0-9.889-17.656-34.607-16.95c0,0-75.57,6.356-93.932,27.544
c0,0,24.013-19.775,42.375-24.719c0,0,39.55-14.125,54.381-12.713c0,0,43.788,1.766,57.207-5.297c0,0-19.775,8.828-14.125,14.479
c5.649,5.65,17.656,19.069,17.656,21.188s42.729,41.14,49.085,48.908L414.243,403.323z"/>
<path id="path390" fill="#CCCCCC" d="M658.607,745.857c0,0-27.367-64.445-49.438-81.221c0,0,45.906,28.251,52.086,60.032
C661.256,724.67,661.256,742.326,658.607,745.857z"/>
<path id="path394" fill="#CCCCCC" d="M741.593,759.1c0,0-46.789-97.109-79.454-139.484c0,0,76.807,66.212,85.635,113.001
l0.883,9.711l-5.297-4.414C743.358,737.912,742.476,753.803,741.593,759.1z"/>
<path id="path398" fill="#CCCCCC" d="M841.352,673.466c0,0-110.353-105.056-113.001-109.47c0,0,106.821,116.533,112.118,129.775
C840.469,693.771,836.938,677.88,841.352,673.466z"/>
<path id="path402" fill="#CCCCCC" d="M508.528,750.271c0,0,34.43-91.813,67.977-52.087c0,0,26.485,17.656,25.604,22.953
c0,0-7.063-11.477-38.846-10.594C563.263,710.545,529.716,705.248,508.528,750.271z"/>
<path id="path406" fill="#CCCCCC" d="M844.883,525.152c0,0-79.454-50.321-92.695-52.971c-20.848-4.168,87.398,51.204,96.228,69.743
C848.414,541.926,851.945,537.512,844.883,525.152z"/>
<path id="path410" d="M578.803,713.371c0,0,36.02-3.531,48.025-15.537l7.769,6.356l31.075-67.802l6.356,9.183
c0,0,25.426-26.132,24.013-40.257c-1.412-14.125,22.601,10.594,22.601,10.594s-1.413-20.481,11.301-8.477
c0,0-4.237-27.544,10.594-13.419c0,0-18.604-53.246,21.188-7.769c9.889,11.3,2.119-0.706,2.119-0.706s-45.905-84.751-7.769-59.325
c0,0,3.531-40.257,1.412-48.026c-2.118-7.769-5.649-47.319-14.125-56.502c-8.477-9.182,0.706-12.006,10.594-2.824
c0,0-19.775-42.375,3.531-21.188c0,0-6.356-26.838-14.125-31.782c0,0-9.889-30.369,16.949-11.3c0,0-7.769-21.894-13.419-27.544
c0,0-20.48-48.732-7.769-40.257l7.769,6.356c0,0-12.007-24.719-0.706-16.95s11.301,7.063,11.301,7.063s-37.433-58.62-1.412-27.544
c0,0-14.406-24.574-20.481-36.726c0,0-33.193-36.019-7.77-24.719l8.476,2.825c0,0-15.538-17.656-29.663-20.481
c-14.125-2.825,4.237-14.125,15.538-10.594c11.3,3.531,38.844,16.95,38.844,16.95s22.602,33.194,29.663,33.9
c0,0-35.313-13.419-24.719,0.706c0,0,25.425,24.719,12.712,24.013c0,0-10.594,12.713-2.118,28.25c0,0-32.592-32.472-6.355,12.712
l12.006,28.957c0,0-43.081-43.788-23.306-4.944c0,0,30.369,41.669,33.899,42.375c3.531,0.707,11.3,16.244,11.3,16.244l-7.769-3.531
l9.181,15.538c0,0-19.774-21.188-9.181,2.119l9.887,25.425c0,0-36.019-38.844-12.006,13.42c0,0-28.957-9.183-13.419,21.188
c0,0-2.825,28.252-2.119,37.434c0.707,9.183,2.825,59.325-4.942,73.451c-7.77,14.125,10.594,48.025,14.125,55.088
c3.53,7.063,9.888,26.131-5.65,9.889c-15.537-16.244-7.769-6.356-4.237,9.181c3.531,15.538,14.125,43.082,12.713,52.97
c0,0-2.118,2.119-7.769-4.236c0,0-26.132-40.258-23.307-14.832c0,0-2.119,14.125-7.77,29.663c0,0-5.649,19.068-5.649,3.53
c0,0-5.65-29.663-10.595-16.244c-4.943,13.42-11.301,24.014-16.244,28.251c-4.942,4.237-14.125-36.02-16.243-17.656
c0,0-21.188-21.895-29.662,7.063l-20.482,28.957c0,0-0.706-21.894-2.824-11.3C650.135,710.547,597.165,721.141,578.803,713.371z"/>
<path id="path414" d="M518.064,83.389c0,0-20.481-14.125-27.545-13.419c-7.063,0.706,48.731-15.538,121.477,33.194
c0,0,8.476,4.944,14.832,4.238c0,0,5.648,4.237,0.706,10.594c0,0-15.538,16.95,4.237,36.725c0,0,32.487,12.006,22.601-3.531
c0,0,19.069,7.063,23.307,14.125c4.238,7.062,2.118,0,2.118,0s-11.3-12.713-21.894-21.894c0,0-9.183-3.531-14.125-18.363
c-4.944-14.832-9.183-32.488-1.413-38.138c0,0-7.063,7.769-5.649,0.706c1.412-7.063,7.77-13.419,10.594-14.125
c2.825-0.707,31.781-28.604,43.788-29.31c0,0-16.244,2.472-21.541,0.706S617.293,23.003,606.7,20.884c0,0-29.662-11.653-8.476-8.122
c0,0,63.211,6.709,95.346,30.016c0,0-12.713-14.832-45.2-27.191c0,0-39.197-22.247-101.349-13.419c0,0-31.429,5.65-45.2,8.828
c0,0-4.591-1.06-5.65-1.766c-1.059-0.706-21.896-16.597-70.627-4.237c0,0-30.016,8.122-45.2,16.597c0,0-26.838,2.119-33.193,7.769
c0,0-32.842,25.778-36.372,27.191c-3.531,1.413-23.66,14.831-25.072,15.538c0,0,43.435-11.653,47.672-15.891
c4.238-4.237,34.96-8.828,39.197-6.356c4.238,2.472,19.069,1.413,2.119,2.472c0,0,133.483,26.132,134.896,29.663
C511.002,85.507,518.064,83.389,518.064,83.389z"/>
<path id="path418" fill="#CC7226" d="M644.131,67.145c0,0-18.009-13.066-21.54-13.066c-3.532,0-25.426-18.009-32.842-17.303
c-7.415,0.707-28.956-16.95-77.335-2.472c0,0-1.061-3.531,5.297-4.944c0,0,11.301-3.884,12.007-4.944c0,0,35.666-7.416,48.378-1.06
c0,0,16.244,4.591,27.191,15.538c0,0,19.775,5.65,25.425,3.885c0,0,15.538,3.884,16.244,7.063c0,0,10.241,5.297,7.063,9.888
C654.019,59.729,654.725,62.554,644.131,67.145z"/>
<path id="path422" fill="#CC7226" d="M622.112,63.421c1.425,1.116,3.224,1.289,4.292,2.717c0.413,0.554-0.099,1.13-0.653,1.301
c-1.842,0.56-3.706-0.447-5.723,0.591c-0.71,0.366-1.844,0.044-2.819-0.219c-2.882-0.779-6.111-0.823-9.097,0.392
c-3.505-1.994-7.672-0.962-11.348-2.73c-0.102-0.047-0.493,0.563-0.625,0.516c-5.378-2.021-11.985-1.522-16.278-5.555
c-4.286-0.728-8.448-1.543-12.735-2.744c-3.21-0.899-5.697-2.645-8.558-4.114c-2.433-1.25-5.004-2.171-7.713-2.828
c-3.289-0.798-6.521-0.601-9.864-1.519c-0.164-0.044-0.503,0.563-0.648,0.516c-0.57-0.191-1.084-1.22-1.386-1.127
c-2.968,0.922-5.595-0.794-8.533-0.19c-2.08-2.161-5.131-1.729-7.859-2.509c-5.233-1.498-10.804,0.745-16.152-1.022
c7.262-3.252,15.538-1.077,22.71-4.73c4.11-2.094,8.811-0.148,13.348-1.49c0.86-0.254,2.08-0.611,2.786,0.57
c0.237-0.239,0.56-0.661,0.661-0.611c4.325,2.042,8.413,4.292,12.795,6.174c0.604,0.258,1.542-0.152,1.986,0.205
c2.684,2.147,6.114,1.965,8.569,4.119c2.998-0.886,6.164-0.215,9.218-1.317c0.137-0.048,0.55,0.554,0.606,0.516
c1.995-1.321,4.035-0.842,5.609-0.306c0.597,0.203,1.768,0.639,2.307,0.77c1.987,0.487,3.499,1.335,5.581,1.658
c0.201,0.032,0.527-0.568,0.655-0.519c1.982,0.773,3.822,0.674,4.979,2.729c0.238-0.238,0.529-0.658,0.676-0.611
c1.813,0.597,2.959,1.93,4.901,2.355c0.856,0.187,1.938,1.292,2.954,1.603c4.224,1.291,7.479,3.991,11.353,5.571
C619.447,62.132,620.994,62.545,622.112,63.421z"/>
<path id="path426" fill="#CC7226" d="M486.804,38.296c-4.445-3.046-8.627-4.999-12.938-8.152c-0.32-0.235-0.955,0.065-1.313-0.15
c-1.776-1.075-3.346-2.101-5.079-3.33c-0.952-0.674-2.4-0.655-3.299-1.11c-4.491-2.281-9.134-3.267-13.56-5.375
c1.204-1.126,3.185-0.695,4.236-2.119c0.346,0.495,0.766,0.996,1.389,0.659c2.963-1.596,6.229-1.866,9.188-1.708
c3.01,0.163,6.046,0.701,9.181,1.181c0.542,0.083,0.894,1.006,1.464,1.178c3.934,1.171,8.15,0.244,11.894,1.723
c2.81,1.111,5.581,2.564,7.77,4.815c0.444,0.459-0.13,0.991-0.623,1.333c0.685-0.193,1.167,0.171,1.361,0.724
c0.148,0.422,0.148,0.955,0,1.377c-0.196,0.551-0.689,0.729-1.351,0.819c-2.484,0.336,0.645-2.101-0.591-1.31
c-2.248,1.438-0.932,3.92-2.246,6.159c-0.494-0.342-0.9-0.728-0.706-1.413c0.413,0.922-0.65,1.434-0.947,1.992
C489.953,36.869,488.366,39.367,486.804,38.296z"/>
<path id="path430" fill="#CC7226" d="M429.424,51.27c-5.568-1.402-10.954-1.199-16.279-3.452c-0.117-0.049-0.512,0.563-0.625,0.516
c-2.411-1.049-4.032-2.754-5.933-4.602c-1.612-1.568-4.539-0.884-6.789-1.744c-0.572-0.219-0.931-1.123-1.462-1.192
c-2.152-0.277-3.789-1.953-5.634-2.961c4.124-1.404,8.381-1.349,12.729-2.027c0.199-0.031,0.455,0.535,0.69,0.535
c0.24,0,0.47-0.39,0.706-0.627c0.345,0.495,0.878,1.07,1.331,0.622c0.968-0.953,1.949-0.618,2.902-0.547
c0.255,0.018,0.476,0.553,0.709,0.553c0.24,0,0.473-0.549,0.707-0.549c0.239,0.001,0.472,0.549,0.706,0.549
c0.24,0,0.471-0.39,0.706-0.627c1.223,1.381,2.784,0.403,4.235,0.719c1.833,0.401,2.305,2.428,4.201,2.954
c8.324,2.302,15.629,6.09,23.333,9.774c0.542,0.26,0.912,0.698,0.719,1.384c0.471,0,1.023-0.155,1.359,0.078
c1.867,1.292,3.706,2.26,4.937,4.199c0.381,0.599-0.199,1.317-0.61,1.226C444.243,54.292,437.17,53.219,429.424,51.27z"/>
<path id="path434" fill="#CC7226" d="M404.952,129.332c-2.813-2.152-3.842-5.738-5.834-8.902c-0.378-0.6,0.105-1.154,0.666-1.312
c0.987-0.281,1.946,0.563,2.669,0.92c3.081,1.522,5.792,3.715,9.316,3.96c3.515,3.945,11.036,4.625,11.049,10.594
c0.002,1.517-2.521-0.104-3.278,1.412c-4.328-1.771-8.546-1.589-12.748-4.179C405.702,131.152,406.285,130.353,404.952,129.332z"/>
<path id="path438" fill="#CC7226" d="M356.33,36.5c0.238,0.002,12.652,0.413,12.622,0.614c-0.079,0.546-13.729,2.398-14.37,2.098
c-0.29-0.134-13.554,4.156-13.79,3.92C341.266,42.894,355.86,36.5,356.33,36.5z"/>
<path id="path442" d="M383.521,53.726c0,0-26.133,3.178-33.9,5.297c-7.77,2.119-40.609,15.538-45.907,19.069
c0,0-23.66,9.535-53.675,44.848c0,0,13.419-6.003,17.303-10.947c0,0,24.013-22.247,23.66-17.656c0,0,21.541-15.185,20.481-11.3
c0,0,43.082-19.775,39.551-14.125c0,0,38.138-8.122,36.372-4.591c0,0,33.192,7.769,28.25,8.122c0,0-10.241,2.119,1.06,8.475
c0,0-6.003,7.769-15.538,0.707c-9.534-7.063-4.236-3.178-13.064-1.413c0,0-4.592,1.413-12.713-5.65c0,0-9.889-8.122-25.426-1.766
c0,0-54.029,22.247-57.56,23.307c0,0-6.356,4.944-10.594,11.3c0,0-10.241,7.769-15.538,10.241c0,0-22.6,20.481-24.719,22.953
c0,0-6.003,9.181-7.416,9.888c0,0,11.3-6.709,14.831-10.241c0,0,24.719-17.656,34.253-19.069c0,0,7.769-5.297,9.182-7.769
c0,0,25.425-16.244,32.84-16.244c0,0,16.244,9.181,20.482-3.178c0,0,10.239-3.178,20.128-1.06c0,0,5.649-4.591,4.236-8.475
c0,0,2.825-3.178,4.592,3.531c0,0,6.003,6.356,14.479,2.825c0,0,7.063-0.353,3.531,3.884c0,0-7.77,6.709-28.604,7.063
c0,0-21.895,1.06-50.851,14.479c0,0-52.616,18.363-68.86,36.725c0,0-11.3,15.538-20.834,17.657c0,0-10.241,1.412-20.834,14.478
c0,0,17.303-10.241,33.194-10.241c0,0,7.063-4.237,0.353,2.119c0,0-6.356,13.418-3.531,22.953c0,0-1.06,9.181-2.472,12.006
c0,0-13.772,22.6-13.772,26.838c0,4.237,2.119,21.541,2.825,22.6c0.706,1.06-1.766-2.825,4.944,1.413
c6.709,4.237,11.653,7.063,13.065,12.006c1.413,4.944-3.531-9.535-3.884-12.713c-0.353-3.178-7.769-15.891-6.356-20.128
c0,0,1.766,1.766,3.178,4.237c0,0-1.059-1.06,0-7.416c0,0,1.413-9.182,3.885-14.832s6.003-12.359,6.709-13.772
c0.707-1.413,0.707-11.653,3.178-7.063l6.003,4.59c0,0-4.944-4.59-1.06-8.475c0,0-1.766-9.888,1.413-14.479
c0,0,12.359-14.832,15.185-16.597c2.826-1.765,0.353-1.059,0.353-1.059s10.594-7.416,0.353-4.591c0,0-7.063,2.825-12.359,2.825
c0,0-13.419,3.531-6.356-3.885s24.719-16.95,31.429-16.597l1.413,2.825l19.775-4.237l-2.119,1.413c0,0-0.353-0.354,7.063-1.06
s17.656,1.766,20.128-1.413c2.473-3.178,8.477-4.944,7.771-2.472c-0.706,2.472-1.061,6.003-1.061,6.003s8.828-10.241,7.77-6.356
c-1.061,3.884-15.537,13.065-18.011,24.013l18.363-14.479l6.356-5.297c0,0,6.355,3.884,6.709,1.06
c0.354-2.825,8.476-13.066,10.594-12.713c2.119,0.353,5.649-4.591,5.297,0c-0.353,4.591,13.066,14.125,13.066,14.125
s5.648-3.178,8.122-0.706c2.472,2.472,9.887-34.96,9.887-34.96l44.142-18.716l76.983-6.003l-30.017-12.006L383.521,53.726z"/>
<path id="path446" stroke="#4C0000" stroke-width="2" d="M415.655,405.089c0,0-26.484-29.663-41.316-34.254
c0,0-23.659-12.006-67.094,1.766"/>
<path id="path450" stroke="#4C0000" stroke-width="2" d="M368.689,368.363c0,0-44.494-14.125-71.687-6.709
c0,0-32.488,3.531-47.319,27.897"/>
<path id="path454" stroke="#4C0000" stroke-width="2" d="M362.333,366.245c0,0-30.016-12.713-56.147-16.597
c0,0-29.31-4.591-58.62,8.122c0,0-21.541,10.594-31.075,28.603"/>
<path id="path458" stroke="#4C0000" stroke-width="2" d="M364.099,366.951c0,0-27.19-19.422-28.957-21.894
c0,0-12.358-19.422-35.313-20.128c0,0-37.785,1.413-68.154,15.538"/>
<path id="path462" d="M361.794,351.072c2.723,2.583,50.33,53.664,50.33,53.664c62.15,64.624,12.713,4.236,12.713,4.236
c-13.419-8.475-29.663-41.669-29.663-41.669c-2.119-4.944,24.719,12.713,24.719,12.713c7.063,1.412,31.075,35.313,31.075,35.313
c-12.006-4.237-3.53,8.476-3.53,8.476c4.943,3.531,40.965,31.077,40.965,31.077c6.355,7.063,13.419,9.888,13.419,9.888
c24.719-9.182,13.419,14.125,13.419,14.125c4.236,12.007,14.125-8.476,14.125-8.476c19.774-29.664-9.182-25.425-9.182-25.425
c-52.972,4.942-64.978-23.31-64.978-23.31c-4.238-4.236,11.3,0,11.3,0c14.833,3.531-12.713-21.894-12.713-21.894
c4.237,0,20.481,12.006,20.481,12.006c18.363,16.244,21.896,12.713,21.896,12.713c31.782-15.538,50.146-2.119,50.146-2.119
c3.53,2.825-6.356,14.832-3.531,24.016c2.825,9.182,11.3,31.075,11.3,31.075c-4.237,2.824-3.531,21.895-3.531,21.895
c29.663,40.963,12.713,37.432,12.713,37.432c-27.544-0.707-1.411,12.712-1.411,12.712c5.648,3.531,21.188,16.244,21.188,16.244
c-4.944-2.119-7.769,7.063-7.769,7.063c8.475,7.063,3.53,15.538,3.53,15.538c-10.594,2.118-12.713,9.181-12.713,9.181
c12.006,14.126-5.649,14.832-5.649,14.832c6.355,7.769-2.118,28.956-2.118,28.956c-8.477,0-19.775,9.888-19.775,9.888
c4.237,8.477-14.125,18.363-14.125,18.363c-14.832,2.824-9.888,14.831-9.888,14.831c-14.125,10.594-18.363,38.844-18.363,38.844
c-1.412,18.363-5.648,24.014,3.531,20.481c9.182-3.531,7.77-25.425,7.77-25.425c-8.476-27.545,67.095-55.795,67.095-55.795
c7.063-2.824,8.476-12.007,8.476-12.007c3.531,0.706,19.069,14.125,19.069,14.125c13.418,19.775,14.125,3.531,14.125,3.531
c2.118-6.356-0.707-16.95-0.707-16.95c10.595-38.138-14.125-49.438-14.125-49.438c-17.656-59.326,7.063-44.494,7.063-44.494
c4.944,9.888,24.014,19.068,24.014,19.068l6.355-4.237c-2.824-8.477,12.007-19.069,12.007-19.069
c4.943,11.301,15.537-2.824,15.537-2.824c6.356-43.082,28.251-17.656,28.251-17.656c7.063,2.119,9.182-9.889,9.182-9.889
c6.355-18.361,0-42.375,0-42.375c6.355-0.706,23.307,9.889,23.307,9.889c4.944-6.356-11.3-36.021-4.237-31.781
c7.063,4.237,14.831,7.063,14.831,7.063c1.413-3.53-16.243-25.426-16.243-25.426c-7.77-4.945-16.949-40.965-16.949-40.965
c12.712,6.356-4.944-20.481-4.944-20.481c0-5.65,10.594-25.425,10.594-25.425c-1.412-12.006,0-11.3,0-11.3
c4.944,2.119,19.069,4.944,7.063-6.356c-12.006-11.3,1.413-19.775,1.413-19.775c7.769-4.944-16.244-4.238-16.244-4.238
c-9.183-7.769-8.477-14.831-8.477-14.831c14.126,3.531-11.3-21.894-15.536-28.25c-4.237-6.356,12.713-15.538,12.713-15.538
c23.307-6.356,2.823-12.006,2.823-12.006c-34.605,0.706-15.536-18.363-15.536-18.363c10.594,0.707,7.769-3.531,7.769-3.531
c-9.181-2.119-26.132-13.419-26.132-13.419c-7.063-6.356-0.706-4.944-0.706-4.944c29.663,2.119-21.188-17.656-21.188-17.656
c14.125,0-17.655-18.363-17.655-18.363c-3.531-2.825-9.183-16.244-9.183-16.244c-10.594-9.182-19.067-21.188-19.067-21.188
c-0.707-7.769-9.183-16.244-9.183-16.244c-20.48-24.013-30.369-23.307-30.369-23.307c-26.132-6.356-35.313-4.944-35.313-4.944
l-93.229,7.769c-46.612,22.6-32.842,59.679-32.842,59.679c11.301,14.831,27.544,8.122,27.544,8.122
c8.122-10.947,28.604-7.063,28.604-7.063c36.021,5.65,31.431-0.706,31.431-0.706c-4.237-8.122-32.843-19.069-33.196-20.128
c-0.353-1.06-15.891-7.063-15.891-7.063c-5.297-2.119-13.065-18.363-13.065-18.363c-5.649-6.003,22.247,4.238,22.247,4.238
c-2.119,1.766,10.947,8.828,10.947,8.828c30.724-1.766,49.439,17.303,49.439,17.303c19.068,29.31,19.422,14.832,19.422,14.832
c4.943-16.597-15.892-54.029-15.892-54.029c0.706-3.531,15.186,8.122,15.186,8.122c2.472-3.531,3.885,6.709,3.885,6.709
c0.353,4.237,7.063,18.362,7.063,18.362c4.942,22.954,11.3,9.888,11.3,9.888l8.122,16.597c2.472,4.591-8.122,18.01-8.122,18.01
c-0.354,4.944,1.06,4.59-8.828,18.009s-3.885,21.188-3.885,21.188c-2.473,11.653,13.064,10.947,13.064,10.947
c4.591,3.884,10.595,3.884,10.595,3.884c3.179,3.531,7.415,2.472,7.415,2.472c2.825-6.709,13.772-3.178,13.772-3.178
c2.472-4.238,16.95-4.944,16.95-4.944c1.766-4.591,2.472-7.416,8.475-8.475c6.004-1.06-37.432-76.982-37.432-76.982
c11.301-1.413-3.179-23.307-3.179-23.307c-3.885-11.653,16.244,14.125,20.128,16.597c3.886,2.472,5.65,6.356,2.825,6.003
s-6.003,3.532-3.531,3.885c2.473,0.354,25.427,26.837,31.43,44.847c6.003,18.01,16.597,25.072,27.544,35.666
c10.947,10.594,9.534,53.322,9.534,53.322c-0.706,15.538,9.888,34.253,9.888,34.253c3.531,6.709-3.885,38.844-3.885,38.844
c-3.531,3.884-1.06,5.297-1.06,5.297c1.767,2.119,13.771,25.425,13.771,25.425c-3.178-0.353,3.179,6.003,3.179,6.003
c9.181,10.594-2.119,5.297-2.119,5.297c-10.594-2.825,1.767,14.479,1.767,14.479c2.119,3.178-13.772-4.944-13.772-4.944
c-16.243-1.06,4.238,11.653,4.238,11.653c15.185,12.713-4.944,4.943-4.944,4.943c-8.122-3.179-2.472,8.828-2.472,8.828
c5.649,2.824,36.02,15.186,36.02,15.186c0.706,6.711-4.591,15.539-4.591,15.539c0.706,7.063-3.179,13.064-3.179,13.064
c-2.118,14.479-3.178,15.891-3.178,15.891c-7.416,0.354-20.481,24.721-20.481,24.721c-3.179,4.591-21.188,25.777-21.188,25.777
c-3.531,12.359-35.313-0.354-35.313-0.354c-11.653,6.003-8.122,0-8.122,0c-0.706-3.884,7.771-14.479,7.771-14.479
c12.358-4.59,7.769-23.658,7.769-23.658c7.063-2.473-12.713-7.416-12.359-9.534c0.354-2.119,10.595-4.591,10.595-4.591
c14.125-3.531,6.355-7.77,6.355-7.77c-1.06-7.063,4.237-16.95,4.237-16.95c20.48-1.413,0-30.019,0-30.019
c-19.068-13.418-20.835-23.659-20.835-23.659c22.247-14.478,7.77-36.372,8.122-42.729c0.354-6.356,2.473-44.494,2.473-44.494
c-3.531-10.947-8.828-34.96-8.828-34.96c3.885-9.181,16.949-31.428,16.949-31.428c4.944-7.416,20.481-15.891,16.598-21.188
c-3.885-5.297-17.655-2.119-17.655-2.119c-13.772-2.472-12.713,6.709-12.713,6.709c-2.825,1.766-4.237,10.594-4.237,10.594
c-1.273,14.007-16.95,25.072-16.95,25.072c-19.775,10.947-3.531,18.01-3.531,18.01c10.595,11.653-6.71,12.006-6.71,12.006
c-19.422-3.178-4.942,14.831-4.942,14.831c19.067,22.601,13.771,27.544,13.771,27.544c-18.009,1.766,4.237,18.009,4.237,18.009
s-1.412-3.531-1.06-0.353c0.354,3.178,5.649,10.594,7.063,14.125c1.412,3.531-5.65,3.885-5.65,3.885
c1.061,16.95-26.132,9.534-26.132,9.534s0,0-2.824,0.353c-2.824,0.354-22.601-1.059-32.841-4.944
c-10.241-3.884-22.248-3.884-22.248-3.884s-7.063,3.178-20.481,2.825s-27.544,4.59-27.544,4.59
c-7.771-0.706,7.415-8.475,7.769-8.122s10.24-9.535-3.885-8.475c-38.485,2.887-57.561-15.185-57.561-15.185
c-3.53-2.472-8.122-7.416-8.122-7.416c-17.655-3.531,2.473,21.894,2.473,21.894c2.119,2.472-0.354,4.238-0.354,4.238
c-1.413-2.825-15.185-12.359-15.185-12.359C368.316,357.817,365.91,355.461,361.794,351.072z"/>
<path id="path466" fill="#4C0000" d="M319.604,330.579c0,0,20.481,9.887,25.072,14.831c4.591,4.944,29.311,25.072,29.311,25.072
s-9.535-3.531-14.125-6.709c-4.592-3.178-23.66-17.656-23.66-17.656S329.492,335.522,319.604,330.579z"/>
<path id="path470" fill="#99CC32" d="M217.181,275.496c0.595-0.261-0.33-5.05-0.69-6.008c-1.804-4.813-17.656-7.416-17.656-7.416
c-0.401,2.41-0.498,5.229-0.311,8.121C198.523,270.192,207.119,279.936,217.181,275.496z"/>
<path id="path474" fill="#659900" d="M217.181,275.143c-0.793,0.279-0.026-4.827-0.337-5.655
c-1.804-4.813-18.009-7.592-18.009-7.592c-0.401,2.41-0.498,5.228-0.311,8.12C198.523,270.015,206.06,279.053,217.181,275.143z"/>
<path id="path478" d="M209.428,275.395c-1.104,0-1.997-2.013-1.997-4.495c0-2.481,0.894-4.494,1.997-4.494
c1.104,0,1.999,2.013,1.999,4.494C211.427,273.382,210.532,275.395,209.428,275.395z"/>
<path id="path486" d="M128.915,448.525c0,0-9.888,17.655,33.9,7.063c0,0,24.719-2.119,28.957-6.355
c2.119,1.411,16.89,6.591,21.894,7.769c12.006,2.825,26.838-14.833,26.838-14.833s8.122-18.539,13.066-18.539
c4.944,0-0.707,2.825-0.707,2.825s-11.653,17.834-10.947,20.659c0,0-9.181,35.313-37.432,36.726c0,0-28.515,1.678-26.131,12.007
c0,0,15.538-4.237,19.775,0c0,0,19.069-0.707,4.944,10.595l-12.006,20.48c0,0,0.247,6.918-17.656,0.706
c-17.303-6.003-35.489-28.78-35.489-28.78S109.758,473.156,128.915,448.525z"/>
<path id="path490" fill="#E59999" d="M126.796,455.588c0,0-3.531,16.95,61.444-1.413c0,0,7.769,0,12.007,1.413
c4.237,1.412,25.425,6.356,28.957,4.237c0,0-12.713,24.013-33.194,21.188c0,0-23.307,2.825-22.6,11.302
c0,0,7.063,12.712,15.538,16.949c0,0,4.944,4.237,4.237,9.888c-0.706,5.649-5.65,8.476-9.181,9.888
c-3.531,1.413-9.181-4.237-12.006-4.237s-17.656-11.3-25.425-19.774c-7.769-8.476-22.6-29.662-21.894-34.606
C125.384,465.476,126.796,455.588,126.796,455.588z"/>
<path id="path494" fill="#B26565" d="M132.446,486.398c4.591,6.974,10.241,14.39,14.125,18.627
c7.769,8.476,22.6,19.774,25.425,19.774c2.825,0,8.475,5.65,12.006,4.237c3.531-1.412,8.475-4.237,9.181-9.888
c0.707-5.649-4.237-9.888-4.237-9.888c-5.414-2.707-10.251-8.873-13.04-12.975c0,0,0.327,4.499-8.854,3.087
c-9.181-1.413-18.363-6.356-21.188-12.007c-2.825-5.65-7.063-9.888-4.238-3.531s7.063,12.713,9.888,13.419
c2.825,0.706,2.119,2.825-2.119,2.119c-4.238-0.707-9.182-1.413-16.95-10.594L132.446,486.398L132.446,486.398z"/>
<path id="path498" fill="#992600" d="M127.855,449.231c0,0,3.178-24.016,5.297-31.077c0,0-1.413-12.007,2.825-19.422
c4.237-7.417,7.769-18.363,13.066-27.897s5.65-16.597,12.712-19.422c7.062-2.825,17.656-18.01,22.6-19.775
c4.944-1.765,4.591-0.353,4.591-0.353s12.006-26.131,36.019-19.069c0,0-28.604-4.944-0.706-21.541c0,0-8.475,1.942-2.648-10.417
c3.886-8.242,3.001,3.708-16.421,24.542c0,0-8.828,15.185-18.009,20.481c-9.181,5.297-30.369,17.657-32.488,24.366
c-2.119,6.709-7.769,16.95-11.3,19.775c-3.531,2.825-8.475,10.241-9.181,16.244c0,0-2.119,7.063-4.591,9.181
c-2.472,2.119-2.825,7.769-2.825,11.299c0,3.532-3.531,8.477-3.178,12.714c0,0,1.412,33.549,0.706,37.079L127.855,449.231z"/>
<path id="path502" fill="#FFFFFF" d="M112.671,457.354c0,0-3.531-2.472-11.3,8.122c0,0,12.889,58.267,12.889,60.738
c0,0,1.942-3.708-0.354-16.421c-2.295-12.713-3.884-35.137-3.884-35.137L112.671,457.354z"/>
<path id="path506" fill="#992600" d="M150.809,350.354c0,0-31.076,5.65-30.369,57.207l-1.413,43.79c0,0-2.119-45.202-4.238-48.026
c-2.119-2.825,4.944-22.601-0.706-12.007c0,0-24.719,24.719-10.594,62.152c0,0,2.648,5.827-2.648-2.295
c0,0-8.122-22.249-6.18-33.549c0,0,0.353-3.885,3.708-8.828c0,0,15.185-20.659,19.952-24.72c0,0,3.178-25.425,30.369-34.606
C148.69,349.471,158.754,345.41,150.809,350.354z"/>
<path id="path510" d="M396.939,233.468c1.164-0.625,1.148-2.338,2.174-2.644c2.027-0.607,2.317-2.491,3.231-3.875
c1.542-2.329,1.883-5.036,2.91-7.668c0.48-1.236,0.527-2.922-0.024-4.087c-2.072-4.381-3.313-8.705-5.858-12.988
c-0.473-0.794-0.937-2.196-1.29-3.252c-0.817-2.443-3.037-4.193-4.556-6.524c-0.51-0.779,0.419-2.412-0.847-2.56
c-1.584-0.186-4.143-1.209-4.554,0.602c-1.038,4.568,0.747,9.022,2.456,13.334c-1.381,1.222-0.791,2.848-0.522,4.202
c1.255,6.367-0.86,12.286-2.204,18.419c-0.041,0.184,0.563,0.533,0.514,0.643c-2.158,4.743-4.722,9.06-7.935,13.264
c-1.338,1.751-2.878,3.369-3.755,5.246c-0.649,1.39-1.37,3.095-0.929,4.84c-6.065,4.908-10.038,11.697-14.647,18.488
c-0.815,1.201-0.303,3.335,0.672,3.811c1.435,0.703,3.123-1.105,3.953-2.599c0.687-1.232,1.31-2.38,2.177-3.516
c0.233-0.309-0.081-1.049,0.157-1.262c4.647-4.144,7.596-9.328,11.927-13.509c3.442-0.581,6.157-2.343,9.243-4.131
c0.544-0.316,1.469,0.124,1.98-0.221c3.095-2.078,3.091-5.673,3.278-9.045C394.58,236.872,394.927,234.547,396.939,233.468z"/>
<path id="path514" d="M381.329,225.583c0.22-0.136-0.055-0.883,0.138-1.264c0.286-0.572,0.998-0.904,1.284-1.476
c0.192-0.381-0.096-1.052,0.146-1.303c4.118-4.321,4.572-9.66,2.743-14.909c1.809-1.095,1.915-3.323,1.165-4.818
c-1.506-3.002-1.847-6.402-3.567-9.127c-1.416-2.24-4.202-4.437-6.623-2.136c-0.743,0.706-1.311,2.096-0.819,3.353
c0.113,0.288,0.616,0.545,0.568,0.69c-0.188,0.572-1.152,0.967-1.163,1.448c-0.053,2.641-1.737,5.309-0.625,7.656
c1.363,2.876,2.809,6.155,4.003,9.291c-2.179,3.736-0.355,8.06-3.45,11.374c-0.24,0.258-0.225,0.939-0.009,1.296
c0.516,0.858,1.231,1.575,2.09,2.091c0.357,0.213,0.972,0.217,1.324-0.002C379.553,227.106,380.256,226.247,381.329,225.583z"/>
<path id="path518" d="M492.233,207.377c2.451,3.164,2.964,8.099-0.653,10.554c0.971,5.842,6.888,2.348,10.594,1.412
c-0.191-0.685,0.208-1.292,0.708-1.301c1.866-0.026,3.066-1.849,4.941-1.523c0.767-2.75,3.659-3.989,4.796-6.425
c3.048-6.524,2.004-14.069-2.559-19.8c-0.356-0.449,0.025-1.361-0.192-2c-1.335-3.904-4.986-4.46-8.401-5.675
c-2.078-6.842-3.245-13.959-6.354-20.481c-2.851-0.441-4.082-3.512-6.443-4.783c-2.354-1.27-3.355,1.519-3.284,3.365
c0.014,0.362,0.812,0.757,0.512,1.402c-0.136,0.29-0.595,0.486-0.595,0.722c0.002,0.238,0.394,0.47,0.629,0.707
c-1.62,1.448-4.134,2.29-4.653,4.312c-1.686,6.55,2.857,12.068,5.804,17.72c1.044,2.004-0.256,4.249-1.598,6.381
c-0.773,1.227-0.583,3.217-0.097,4.729C486.714,200.806,489.521,203.876,492.233,207.377z"/>
<path id="path522" d="M426.622,239.84c-2.626,3.268-8.65,7.804-3.5,11.208c0.343,0.228,0.996,0.234,1.302-0.002
c3.568-2.763,7.104-4.357,11.405-5.385c0.22-0.051,0.703,0.773,1.354,0.489c2.849-1.242,6.397-1.139,8.487-3.501
c6.651,0.396,12.946-1.575,18.934-3.884c2.051-0.791,4.293-1.778,6.412-2.665c2.431-1.017,4.557-2.655,6.521-4.67
c0.233-0.24,0.858-0.082,1.331-0.082c-0.07-1.523,1.628-1.748,2.063-2.846c0.163-0.41-0.102-1.109,0.133-1.289
c3.775-2.878,5.399-6.441,3.336-10.638c-0.504-1.021-0.942-2.112-1.941-2.952c-1.916-1.608-3.862-0.101-5.711-0.637
c-0.28,1.108-1.567,0.805-2.249,1.155c-1.517,0.775-3.87-0.258-5.387,0.515c-2.405,1.227-4.598,1.526-7.106,2.191
c-0.552,0.145-1.925-0.025-2.208,1.083c-0.236-0.237-0.497-0.65-0.685-0.611c-3.369,0.699-5.595,1.077-7.892,4.064
c-0.182,0.235-0.962-0.081-1.243,0.157c-1.688,1.427-2.403,3.605-4.349,4.792c-0.354,0.217-0.977-0.079-1.319,0.148
c-1.141,0.761-1.787,1.893-2.922,2.682c-0.581,0.404-1.287-0.169-1.229-0.622c0.433-3.438,1.585-6.593,0.569-9.905
c3.667-4.449,8.111-7.891,11.301-12.713c0.025-3.824,1.248-7.613,1.049-11.28c-0.019-0.341-0.526-1.635-0.748-2.248
c-0.552-1.508,1.049-3.39-0.441-4.668c-2.479-2.124-4.761-0.578-6.216,1.953c-3.245,0.688-6.893,1.912-9.679-0.267
c-1.778-1.39-2.799-2.989-4.21-4.854c-1.738-2.299-1.147-4.834-1.023-7.596c0.011-0.226-0.546-0.466-0.546-0.703
c0.002-0.238,0.391-0.47,0.627-0.706c-1.246-1.105-1.731-2.974-3.531-3.532c0.538-1.928-0.654-3.489-2.192-4.022
c-3.522-1.22-6.483,2.156-9.823,2.285c-0.908,0.034-1.732-1.799-2.878-2.373c-0.764-0.381-2.006-0.439-2.646,0.03
c-1.215,0.89-2.255,1.091-3.593,1.453c-2.854,0.77-5.11,2.701-7.725,4.211c-2.622,1.513-4.31,4.05-6.216,6.381
c-1.661,2.034-1.901,6.296,0.605,7.179c3.254,1.148,5.557-3.625,9.027-3.049c0.551,0.09,0.915,0.639,0.721,1.324
c0.688,0.193,1.071-0.212,1.412-0.706c1.515,1.799,3.57,2.394,5.227,3.936c1.714,1.596,4.796,0.858,6.589,2.619
c2.698,2.652,1.712,7.386,5.136,9.69c-1.034,2.318-2.106,4.573-2.698,7.092c-0.497,2.129,1.258,4.243,3.396,4.082
c2.222-0.166,2.684-1.506,3.54-3.406c0.472,0.472,1.3,0.996,1.228,1.377c-0.807,4.214-2.62,7.733-3.429,12.025
c-0.104,0.56-0.644,0.917-1.33,0.722c-0.826,7.326-7.98,11.553-12.475,17.141c-0.712,0.886-0.719,3.092,0.004,3.803
c2.478,2.449,5.938-0.281,8.938-1.169c0.376-2.129,1.893-3.792,4.245-3.694c0.452,0.018,0.866-0.939,1.438-1.169
c0.614-0.244,1.501,0.152,2.007-0.198c3.053-2.11,5.539-4.063,8.606-6.162c0.339-0.231,0.946,0.05,1.328-0.141
c0.574-0.286,0.904-0.969,1.475-1.296c0.614-0.353,1.041,0.159,1.383,0.653c-1.142,0.616-1.147,2.306-2.176,2.663
c-1.367,0.473-2.358,1.379-3.549,2.168c-0.516,0.341-1.68-0.097-1.862,0.219C429.966,237.508,427.875,238.281,426.622,239.84z"/>
<path id="path526" d="M328.785,152.602c0,0-16.312-5.071-36.019,40.257c0,0-4.238,9.181-8.475,12.712
c-4.238,3.531-24.013,9.888-27.544,16.95l-18.363,28.25c0,0,26.131-28.25,31.782-32.488c0,0,14.125-14.832,8.475-2.825
c0,0-24.719,19.069-22.601,35.313c0,0-9.887,25.425-11.3,28.957c0,0,28.25-56.5,32.488-58.62c4.237-2.119,6.356-2.119,4.237,4.238
c-2.119,6.357-2.825,35.313-7.769,38.844c0,0,14.125-36.02,12.712-41.669c0,0,5.65-6.356,9.888,2.825l-2.119,28.25l7.769,21.188
c0,0-4.237-19.775-1.413-47.319c0,0-3.531-18.363,3.531-8.475c7.062,9.888,24.013,20.481,24.013,28.957
c0,0-9.181-31.075-25.425-39.55l-7.063,10.594l-2.119-3.531c0,0-6.356-1.413,1.413-13.419c7.769-12.006,7.063-13.419,7.063-13.419
s11.3,12.713,14.125,12.713c0,0,23.307-13.419,25.425,29.663c0,0,12.007-25.425-4.237-37.432c0,0-26.132-3.531-24.013-12.712
l12.713-21.894c6.356-9.182,3.531-4.238,3.531-4.238L328.785,152.602z"/>
<path id="path530" d="M293.473,181.558c0,0-22.6,0-28.25,9.181l-12.713,16.95c0,0,30.369-17.656,37.432-19.775
S293.473,181.558,293.473,181.558z"/>
<path id="path534" d="M222.847,192.858c0,0-3.531,2.119-4.238,7.063c-0.706,4.944-4.944,5.65-3.531,10.594
c1.413,4.944,4.944,9.182,4.944,2.119c0-7.063,2.825-10.594,4.238-12.712C225.672,197.802,228.497,190.033,222.847,192.858z"/>
<path id="path538" d="M207.31,300.916c0,0-14.832-7.063-20.481-13.419c-5.65-6.356-4.852,2.765-13.419,2.119
c-10.324-0.779-8.475-28.957-8.475-28.957l-7.063,13.418c0,0-2.119,25.425,12.006,21.188c6.898-2.069,9.181,0.706,6.356,2.119
c-2.825,1.413,9.887,2.119,4.943,4.944c-4.943,2.825,20.481-6.356,16.244,12.006L207.31,300.916z"/>
<path id="path542" d="M185.063,326.341c0,0-27.191,7.769-33.547-9.181c0,0-8.475,4.237-4.591,9.534
c3.885,5.297,6.003,6.003,6.003,6.003s9.534,2.119,8.475,3.531c-1.06,1.413-5.297,7.416-5.297,7.416S174.115,333.05,185.063,326.341
z"/>
<path id="path546" fill="#FFFFFF" d="M588.337,464.416c-0.754,3.768-3.704,5.182-7.063,6.355c-3.386-1.69-7.973-7.176-11.301-3.53
c-0.837-0.849-2.213-0.954-2.819-2.123c-0.82-1.585-0.342-3.433-0.944-4.841c-0.962-2.246-2.214-4.658-1.886-7.161
c3.188-1.258,4.239-4.623,3.401-7.735c-0.122-0.454-0.879-0.802-0.525-1.418c0.329-0.57,0.89-0.972,1.36-1.441
c-0.237,0.237-0.493,0.648-0.689,0.613c-1.077-0.188-0.857-1.313-0.628-1.995c1.032-3.083,4.589-3.549,6.969-1.443
c0.452-0.998,1.352-0.655,2.118-0.706c-0.088-1.022,0.633-1.953,0.982-2.694c0.913-1.938,3.791,0.014,5.197-1.065
c1.899-1.457,3.776-2.691,5.681-1.628c3.193,1.789,6.212,3.93,8.327,7.004c1.017,1.473,1.439,3.733,1.338,5.426
c-0.067,1.143-2.507,0.521-3.111,2.161c-1.139,3.086,2.095,4.003,3.43,6.364c0.35,0.616-0.117,1.153-0.673,1.326
c-0.726,0.227-2.11-0.107-1.866,0.691C597.351,462.212,592.484,463.409,588.337,464.416z"/>
<path id="path550" fill="#FFFFFF" d="M571.385,499.022c-0.012-3.068-2.839-6.17-0.704-9.183c0.238,0.237,0.471,0.627,0.706,0.627
c0.238,0,0.471-0.39,0.706-0.627c2.641,3.913,9.088,5.552,8.837,10.576c-0.038,0.79-1.958,2.41-0.36,3.55
c-3.201,2.38-3.3,6.564-4.944,9.887c-2.186-0.505-4.325-1.146-6.356-2.117c0.622-2.624,0.415-5.599,1.863-7.929
C571.896,502.575,571.391,500.67,571.385,499.022z"/>
<path id="path554" fill="#CCCCCC" d="M277.935,483.132c0,0-29.765,17.896-4.944-9.182c15.538-16.95,33.194-26.838,33.194-26.838
s18.362-7.771,24.719-9.89c6.355-2.119,33.193-11.301,38.845-12.007c5.649-0.706,22.6-7.769,34.606-0.706
c12.006,7.063,26.131,14.831,26.131,14.831s-28.956-14.831-35.313-10.594c-6.356,4.237-19.069,3.531-29.663,9.182
c0,0-26.131,7.771-31.781,11.303c-5.649,3.53-24.013,24.013-26.837,22.601c-2.825-1.413,0.706-2.119,2.825-7.063
c2.119-4.943-1.412-7.77-15.538,3.531C280.054,479.601,277.935,483.132,277.935,483.132z"/>
<path id="path558" d="M291.01,472.596c0,0,2.49-23.022,17.459-20.084c0,0,14.523-7.361,19.33-10.837c0,0,14.37-3.006,16.685-4.095
c32.627-15.361,58.614-7.383,59.581-9.359c0.965-1.977,35.614,10.59,41.986,17.806c0.69,0.781-18.063-9.884-35.188-13.223
c-14.607-2.85-52.748,0.438-72.005,10.211c-5.249,2.664-21.043,12.877-25.513,12.682C308.878,455.498,291.01,472.596,291.01,472.596
z"/>
<path id="path562" fill="#CCCCCC" d="M284.292,517.738c0,0-26.838-4.237,2.825-7.063c0,0,31.782-3.531,38.844-12.713
c0,0,24.013-16.244,28.956-16.95c4.944-0.706,57.913-13.419,58.619-17.656c0.707-4.236,10.595-4.236,13.419-2.824
c2.825,1.413,1.413,3.53-3.531,4.943c-4.943,1.412-60.031,30.369-71.332,32.487c-11.3,2.119-31.781,15.538-40.256,17.656
C303.36,517.738,284.292,517.738,284.292,517.738z"/>
<path id="path566" d="M318.757,504.676c0,0-15.153-1.464,0.033-2.909c0,0,15.566-6.046,19.183-10.748c0,0,12.296-8.316,14.826-8.678
c2.531-0.362,27.18-6.872,27.542-9.04c0.362-2.17,60.51-24.384,68.314-18.751c5.14,3.709-12.343,0.748-29.354,8.535
c-2.393,1.095-62.164,26.85-67.95,27.934c-5.785,1.087-16.271,7.956-20.611,9.04C326.402,501.145,318.757,504.676,318.757,504.676z"
/>
<path id="path570" d="M304.773,508.557c0,0,9.181-0.706,7.063,2.119c-2.119,2.825-6.357,1.412-6.357,1.412L304.773,508.557z"/>
<path id="path574" d="M292.061,511.382c0,0,9.181-0.706,7.063,2.119c-2.119,2.825-6.356,1.412-6.356,1.412L292.061,511.382z"/>
<path id="path578" d="M273.698,514.207c0,0,9.181-0.706,7.063,2.119c-2.119,2.824-6.356,1.412-6.356,1.412L273.698,514.207z"/>
<path id="path582" d="M260.279,515.619c0,0,9.181-0.706,7.063,2.119c-2.118,2.825-6.356,1.412-6.356,1.412L260.279,515.619z"/>
<path id="path586" d="M328.079,445.7c0,0,7.77,0,5.649,2.825c-2.119,2.824-7.769,2.117-7.769,2.117L328.079,445.7z"/>
<path id="path590" d="M310.423,455.588c0,0,11.487-3.78,7.063,2.118c-2.118,2.825-6.356,1.413-6.356,1.413L310.423,455.588z"/>
<path id="path594" d="M290.648,464.063c0,0,9.181-0.705,7.063,2.119c-2.118,2.825-6.356,1.412-6.356,1.412L290.648,464.063z"/>
<path id="path598" d="M277.229,474.656c0,0,9.181-0.706,7.063,2.119c-2.118,2.824-6.356,1.411-6.356,1.411L277.229,474.656z"/>
<path id="path602" d="M265.223,483.132c0,0,9.181-0.706,7.063,2.118c-2.119,2.825-6.356,1.413-6.356,1.413L265.223,483.132z"/>
<path id="path606" d="M334.228,494.427c0,0,12.221-0.938,9.4,2.819c-2.82,3.761-8.461,1.881-8.461,1.881L334.228,494.427z"/>
<path id="path610" d="M352.59,485.951c0,0,12.221-0.939,9.4,2.82c-2.819,3.761-8.461,1.88-8.461,1.88L352.59,485.951z"/>
<path id="path614" d="M371.659,478.183c0,0,12.22-0.938,9.399,2.819c-2.819,3.761-8.461,1.881-8.461,1.881L371.659,478.183z"/>
<path id="path618" d="M390.021,469.708c0,0,12.221-0.939,9.399,2.819c-2.819,3.761-8.461,1.88-8.461,1.88L390.021,469.708z"/>
<path id="path622" d="M341.29,437.926c0,0,12.22-0.938,9.4,2.82c-2.82,3.761-9.874,3.293-9.874,3.293L341.29,437.926z"/>
<path id="path626" d="M358.946,432.276c0,0,12.22-0.939,9.399,2.818c-2.818,3.762-10.58,3.293-10.58,3.293L358.946,432.276z"/>
<path id="path630" d="M318.898,502.907c0,0,9.181-0.706,7.063,2.118c-2.119,2.824-6.355,1.413-6.355,1.413L318.898,502.907z"/>
<path id="path634" fill="#992600" d="M189.653,327.753c0,0-7.769,15.538-8.475,21.188c0,0,1.413-15.538,3.531-19.069
C186.828,326.341,189.653,327.753,189.653,327.753z"/>
<path id="path638" fill="#992600" d="M157.165,352.472c0,0-5.65,25.425-4.944,30.369c0,0-2.119-20.481-1.412-22.6
C151.515,358.123,157.165,352.472,157.165,352.472z"/>
<path id="path642" fill="#CCCCCC" d="M193.891,220.755l-0.353,5.65l-3.885,0.354c0,0,25.072,22.247,26.132,35.666
C215.785,262.425,217.197,247.946,193.891,220.755z"/>
<path id="path646" d="M200.925,222.989c-0.761-0.734-0.374-2.05-1.095-2.509c-1.428-0.911,2.292-1.012,1.889-2.276
c-0.676-2.129-0.346-2.167-0.562-4.419c-0.101-1.056,0.938-3.775,1.618-4.552c2.553-2.917,0.215-8.094,3.111-10.833
c0.537-0.51,1.201-1.485,1.704-2.223c1.164-1.7,3.254-2.562,4.931-4.024c0.562-0.487,0.207-1.948,1.211-1.785
c1.261,0.203,3.452-0.026,3.373,1.458c-0.2,3.743-2.546,6.78-4.806,9.725c0.796,1.243-0.013,2.364-0.514,3.348
c-2.357,4.626-2.023,9.642-2.331,14.657c-0.009,0.15-0.551,0.288-0.537,0.381c0.623,4.123,1.654,8.005,3.207,11.941
c0.646,1.642,1.478,3.222,1.743,4.859c0.196,1.211,0.378,2.682-0.343,3.927c3.593,5.103,1.282,9.783,3.346,16.018
c0.365,1.104,3.353,4.483,2.535,4.199c-4.437-1.538-4.635-2.241-4.947-3.57c-0.258-1.1-0.84-3.531-1.259-4.594
c-0.113-0.29-0.415-3.616-0.553-3.832c-2.671-4.206-0.274-3.895-2.692-8.059c-2.521-1.201-4.227-3.15-6.21-5.202
c-0.35-0.36,1.668-1.638,1.349-2.014c-1.928-2.276-3.964-3.63-3.371-6.267C201.997,226.126,202.238,224.26,200.925,222.989z"/>
<path id="path650" d="M194.597,226.052c0,0,0.707,12.006,4.944,14.832c4.238,2.825,2.119,1.413-3.531-0.706
c-5.65-2.119-3.531-3.531-3.531-3.531s-4.944,0.706-0.706,4.237c4.237,3.531,10.594,7.769,7.769,7.769s-16.244-7.063-16.244-12.006
c0-4.944-1.766-12.183-1.766-12.183s1.942-1.413,10.417-1.236C191.948,223.228,194.42,224.463,194.597,226.052z"/>
<path id="path654" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M193.184,258.894c0,0-15.043-4.928-47.672,1.059
c0,0,15.946-3.669,49.085,0.353C212.783,262.513,193.184,258.894,193.184,258.894z"/>
<path id="path658" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M196.889,258.768c0,0-14.56-6.211-47.586-3.067
c0,0,16.205-2.276,48.871,4.596C216.103,264.068,196.889,258.768,196.889,258.768z"/>
<path id="path662" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M200.045,258.932c0,0-14.058-7.276-47.226-6.596
c0,0,16.329-1.066,48.395,8.217C218.811,265.647,200.045,258.932,200.045,258.932z"/>
<path id="path666" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M202.288,259.326c0,0-12.049-7.604-41.842-9.543
c0,0,14.724,0.3,42.764,11.086C218.599,266.789,202.288,259.326,202.288,259.326z"/>
<path id="path670" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M405.838,277.894c0,0-1.642,1.137-1.264-0.948
c0.38-2.085,50.185-25.339,56.564-24.897C461.14,252.048,407.732,275.365,405.838,277.894z"/>
<path id="path674" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M399.846,279.021c0,0-1.547,1.263-1.333-0.846
c0.214-2.108,48.04-29.202,54.436-29.262C452.947,248.914,401.537,276.354,399.846,279.021z"/>
<path id="path678" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M394.044,281.449c0,0-1.462,1.363-1.388-0.755
c0.074-2.117,35.063-29.479,52.389-32.788C445.045,247.906,413.21,262.255,394.044,281.449z"/>
<path id="path682" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M388.966,284.739c0,0-1.314,1.226-1.248-0.68
c0.066-1.907,31.557-26.532,47.147-29.509C434.865,254.55,406.216,267.464,388.966,284.739z"/>
<path id="path686" fill="#CCCCCC" d="M333.023,545.988c0,0-26.838-4.237,2.824-7.063c0,0,31.781-3.531,38.845-12.712
c0,0,24.013-16.244,28.956-16.95c4.943-0.707,33.899-7.063,34.606-11.301c0.706-4.237,11.3-8.475,14.125-7.063
c2.825,1.413,2.825,17.655-2.119,19.068c-4.942,1.412-38.138,14.125-49.438,16.244c-11.301,2.118-31.782,15.537-40.257,17.656
C352.092,545.988,333.023,545.988,333.023,545.988z"/>
<path id="path690" d="M461.915,479.953c0,0-5.297,2.825-7.416,7.416c0,0-11.3,18.716-36.372,24.366c0,0-40.609,15.891-54.382,19.422
c0,0-23.659,8.828-36.727,7.416c0,0-12.358,0.353-1.411,3.178c0,0,35.666-3.531,41.669-6.709c0,0,27.544-9.182,32.841-13.772
c5.297-4.59,37.432-13.419,41.315-16.949C445.317,500.789,462.621,485.957,461.915,479.953z"/>
<path id="path694" d="M358.24,535.589c0,0,9.231-0.398,7.195,2.336c-2.034,2.737-6.356,1.193-6.356,1.193L358.24,535.589z"/>
<path id="path698" d="M345.523,537.977c0,0,9.23-0.398,7.196,2.336c-2.036,2.736-6.357,1.195-6.357,1.195L345.523,537.977z"/>
<path id="path702" d="M327.11,540.18c0,0,9.231-0.399,7.195,2.336c-2.034,2.735-6.356,1.193-6.356,1.193L327.11,540.18z"/>
<path id="path706" d="M313.631,541.141c0,0,9.232-0.398,7.197,2.336c-2.036,2.736-6.358,1.193-6.358,1.193L313.631,541.141z"/>
<path id="path710" d="M387.432,522.526c0,0,12.289-0.531,9.578,3.108c-2.708,3.642-8.463,1.59-8.463,1.59L387.432,522.526z"/>
<path id="path714" d="M405.645,514.714c0,0,10.521-5.828,9.578,3.109c-0.477,4.513-8.463,1.589-8.463,1.589L405.645,514.714z"/>
<path id="path718" d="M421.768,509.745c0,0,12.642-6.534,9.579,3.108c-1.374,4.326-8.465,1.59-8.465,1.59L421.768,509.745z"/>
<path id="path722" d="M438.566,501.226c0,0,7.695-8.652,9.578,3.109c0.717,4.481-8.464,1.59-8.464,1.59L438.566,501.226z"/>
<path id="path726" d="M372.28,530.444c0,0,9.23-0.401,7.196,2.336c-2.035,2.733-6.359,1.192-6.359,1.192L372.28,530.444z"/>
<path id="path730" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M435.138,316.105c0,0-1.282,1.174-1.284-0.717
c0-1.889,30.871-25.309,46.484-27.752C480.338,287.636,451.913,299.517,435.138,316.105z"/>
<path id="path734" d="M440.374,428.748c0,0,38.847,39.553,55.09,45.908c0,0,16.244,19.774,9.183,65.683
c0,0-5.65,13.419-11.301-23.307c0,0,5.649-44.494-14.125-16.244c0,0-14.834-17.479-3.533-16.95c0,0,5.651,3.531,6.357,0.706
c0.707-2.825-13.42-26.838-43.789-52.265C407.887,406.854,440.374,428.748,440.374,428.748z"/>
<path id="path738" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M337.261,497.257c0,0-0.354-3.178,2.825-1.766
c3.178,1.412,169.503,12.358,225.298,54.734C565.384,550.227,485.576,509.264,337.261,497.257z"/>
<path id="path742" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M355.623,489.488c0,0-0.354-3.18,2.825-1.767
c3.179,1.412,244.367-0.354,286.036,56.854C644.484,544.576,605.641,500.082,355.623,489.488z"/>
<path id="path746" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M376.104,482.426c0,0-0.353-3.179,2.825-1.766
c3.18,1.412,309.343-21.541,351.013,35.666C729.941,516.326,712.991,471.125,376.104,482.426z"/>
<path id="path750" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M393.762,473.95c0,0-0.354-3.178,2.824-1.767
c3.179,1.413,218.941-66.742,260.611-9.533C657.197,462.65,633.537,419.214,393.762,473.95z"/>
<path id="path754" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M291.354,514.207c0,0-0.353-3.178,2.825-1.766
c3.178,1.412,34.606,5.297,38.138,73.804C332.317,586.245,319.604,512.088,291.354,514.207z"/>
<path id="path758" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M275.816,517.032c0,0-0.353-3.18,2.825-1.767
c3.178,1.412,28.25-6.71,23.306,61.797C301.948,577.063,304.066,514.913,275.816,517.032z"/>
<path id="path762" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M261.691,517.738c0,0-0.354-3.179,2.825-1.767
c3.179,1.412,30.369,2.473,8.475,42.022C272.991,557.995,289.941,515.619,261.691,517.738z"/>
<path id="path766" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M345.252,439.457c0,0-0.784,3.529,1.951,1.381
c28.37-22.292,85.65-126.292,183.971-136.239C531.174,304.599,463.536,283.217,345.252,439.457z"/>
<path id="path770" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M365.027,436.278c0,0-2.406-2.106,0.892-3.21
c3.298-1.104,201.831-129.115,271.194-115.05C637.113,318.018,589.252,304.758,365.027,436.278z"/>
<path id="path774" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M328.229,447.053c0,0-0.897,2.823,2.122,1.101
c15.848-9.04,22.229-110.054,99.171-112.271C429.521,335.882,372.297,309.903,328.229,447.053z"/>
<path id="path778" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M293.053,466.521c0,0-1.902,2.271,1.546,1.821
c18.091-2.352,55.884-75.222,134.348-66.254C428.947,402.089,372.507,376.759,293.053,466.521z"/>
<path id="path782" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M312.895,455.704c0,0-1.432,2.594,1.868,1.49
c17.303-5.78,40.403-84.549,119.13-90.813C433.893,366.382,373.639,352.357,312.895,455.704z"/>
<path id="path786" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M280.623,475.559c0,0-1.542,1.841,1.252,1.478
c14.653-1.905,45.265-60.929,108.822-53.665C390.696,423.37,344.979,402.854,280.623,475.559z"/>
<path id="path790" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M267.206,485.992c0,0-1.775,1.845,1.035,1.637
c7.359-0.546,61.455-58.951,94.063-31.58C362.303,456.049,341.089,422.99,267.206,485.992z"/>
<path id="path794" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M389.974,429.627c0,0-2.12-2.392,1.291-3.071
c3.411-0.679,216.529-102.579,283.56-79.862C674.823,346.693,629.021,327.494,389.974,429.627z"/>
<path id="path798" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M330.904,543.164c0,0-0.354-3.179,2.824-1.768
c3.179,1.413,30.369,2.474,8.476,42.022C342.204,583.42,359.154,541.045,330.904,543.164z"/>
<path id="path802" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M349.268,540.339c0,0-0.354-3.179,2.824-1.766
c3.18,1.412,34.607,5.297,38.14,73.804C390.23,612.377,377.518,538.22,349.268,540.339z"/>
<path id="path806" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M361.273,537.514c0,0-0.354-3.179,2.824-1.766
c3.179,1.412,46.613,7.416,88.282,64.622C452.381,600.37,389.523,535.395,361.273,537.514z"/>
<path id="path810" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M374.736,533.931c0,0-0.771-3.104,2.564-2.125
c3.337,0.979,39.416-2.375,106.684,57.969C483.984,589.773,402.455,528.076,374.736,533.931z"/>
<path id="path814" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M393.1,526.162c0,0-0.771-3.104,2.565-2.126
c3.337,0.979,64.841,8.926,156.119,70.681C551.784,594.717,420.818,520.308,393.1,526.162z"/>
<path id="path818" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M321.723,505.732c0,0-0.353-3.18,2.825-1.767
c3.179,1.412,97.464,6.003,151.14,53.322C475.688,557.289,414.064,513.545,321.723,505.732z"/>
<path id="path822" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M304.066,512.795c0,0-0.353-3.179,2.825-1.766
c3.179,1.412,46.613,7.415,88.282,64.622C395.174,575.651,332.317,510.676,304.066,512.795z"/>
<path id="path826" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M412.306,518.021c0,0-0.997-3.037,2.403-2.308
s65.321,4.147,160.88,59.049C575.589,574.764,438.462,514.036,412.306,518.021z"/>
<path id="path830" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M427.138,513.785c0,0-0.998-3.039,2.402-2.309
c3.401,0.729,65.322,4.147,160.88,59.049C590.42,570.525,454.354,509.092,427.138,513.785z"/>
<path id="path834" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M444.088,504.957c0,0-0.998-3.039,2.402-2.308
c3.399,0.729,79.447,8.385,237.863,68.936C684.354,571.585,471.303,500.264,444.088,504.957z"/>
<path id="path838" d="M247.566,517.032c0,0,9.182-0.706,7.063,2.118s-6.356,1.412-6.356,1.412L247.566,517.032z"/>
<path id="path842" d="M301.948,541.751c0,0,9.181-0.706,7.063,2.119c-2.119,2.825-6.356,1.412-6.356,1.412L301.948,541.751z"/>
<path id="path846" d="M286.41,541.045c0,0,9.182-0.706,7.063,2.119c-2.119,2.824-6.356,1.412-6.356,1.412L286.41,541.045z"/>
<path id="path850" d="M118.022,520.177c0,0,8.908,2.336,5.98,4.313c-2.926,1.978-6.469-0.745-6.469-0.745L118.022,520.177z"/>
<path id="path854" d="M121.554,503.227c0,0,8.908,2.336,5.98,4.313c-2.926,1.978-6.469-0.745-6.469-0.745L121.554,503.227z"/>
<path id="path858" d="M108.841,495.458c0,0,8.908,2.336,5.98,4.312c-2.925,1.979-6.469-0.744-6.469-0.744L108.841,495.458z"/>
<path id="path862" fill="#CCCCCC" d="M249.685,627.914c0,0-2.825,0-9.888,3.531c-3.531,0-23.307,6.355-33.194,24.013
C206.603,655.458,228.497,638.508,249.685,627.914z"/>
<path id="path866" fill="#CCCCCC" d="M404.56,791.494c0.249,0.456,0.348,1.197,0.862,1.228c1.161,0.07,3.339,0.603,3.118-0.521
c-1.497-7.604-3.041-16.319-10.338-19.51c-1.129-0.493-3.675,0.235-3.806,1.797c-0.225,2.69-0.432,5.072,0.114,7.661
c0.529,2.509,4.34,2.525,5.959,0.083C402.123,785.184,402.886,788.438,404.56,791.494z"/>
<path id="path870" fill="#CCCCCC" d="M385,799.854c1.321,2.494,1.097,5.776,3.595,6.771c1.308,0.519,4.573-1.202,3.835-3.099
c-1.416-3.64-2.101-7.594-4.554-10.79c-0.353-0.463,0.071-1.403-0.212-1.982c-1.048-2.154-3.07-3.452-5.556-2.871
c-1.97,3.891,0.058,7.648,2.744,10.666C385.094,798.816,384.801,799.48,385,799.854z"/>
<path id="path874" fill="#CCCCCC" d="M315.077,790.689c-0.19-0.666-0.258-1.483,0.033-2.052c0.938-1.822,2.338-3.805,1.742-5.608
c-0.613-1.864-2.585-1.543-3.731-0.538c-2.004,1.755-2.091,4.979-3.312,7.379c-0.347,0.682-0.256,1.692-1.034,2.383
c-0.838,0.744-1.613,3.435-1.444,4.442c0.094,0.553-0.229,18.047,0.163,17.583c1.093-1.295,6.478-18.481,6.6-20.058
C314.194,792.932,315.487,792.11,315.077,790.689z"/>
<path id="path878" fill="#CCCCCC" d="M269.81,778.697c4.651-4.413,9.577-9.642,8.796-16.195c-0.205-1.723-3.339-0.792-3.669,0.701
c-1.416,6.4-5.016,11.099-9.55,15.322c-3.877,3.613-7.165,14.814-7.58,15.713C264.334,784.958,268.319,780.109,269.81,778.697z"/>
<path id="path882" fill="#CCCCCC" d="M245.843,768.167c0.923-0.653,0.39-1.521,0.773-2.106c1.683-2.574,3.979-4.773,4.012-7.844
c0.005-0.489-0.662-1.034-1.254-0.639c-0.489,0.324-1.093,0.555-1.284,0.784c-3.584,4.322-6.056,9.04-8.604,14.005
c-0.323,0.63-2.343,8.56-1.79,8.756c0.422,0.148,3.459-7.232,3.83-7.434C243.756,772.479,243.777,769.627,245.843,768.167z"/>
<path id="path886" fill="#CCCCCC" d="M275.387,802.674c0.784-1.534,3.567-3.656,3.367-5.226c-0.208-1.64,0.618-4.188-0.992-2.973
c-2.22,1.675-8.309,4.057-8.786,14.312C268.93,809.795,274.182,805.04,275.387,802.674z"/>
<path id="path890" fill="#CCCCCC" d="M300.889,772.344c0.706-1.179,1.956-0.344,2.767-0.809c1.144-0.656,2.223-1.643,2.738-2.788
c1.713-3.794,4.836-7.008,5.089-11.234c-2.634-2.479-3.831,1.121-4.944,2.825c-2.336-2.908-4.1,0.4-6.395,1.316
c-0.124,0.05-0.5-0.563-0.632-0.516c-2.078,0.776-3.279,2.687-5.041,4.064c-0.302,0.236-1.017-0.082-1.276,0.158
c-1.151,1.064-2.869,1.639-3.364,2.843c-1.959,4.78-7.504,8.479-10.835,21.795c0.672,1.604,7.966-11.728,8.826-12.959
c1.476-2.112,1.685,2.933,3.938,1.757c0.09-0.048,0.418,0.372,0.655,0.608c0.342-0.494,0.727-0.898,1.413-0.706
c0-0.706-0.237-1.688,0.118-1.969c2.184-1.726,2.036-3.61,3.413-5.801C298.166,772.324,300.039,771.055,300.889,772.344z"/>
<path id="path894" fill="#CCCCCC" d="M406.474,868.395c0,0,13.066-36.019,5.298-55.794c0,0,20.129,38.139,12.007,57.913
c0,0-0.706-18.361-7.77-27.189C416.009,843.323,408.946,865.923,406.474,868.395z"/>
<path id="path898" fill="#CCCCCC" d="M380.343,863.805c0,0,9.534-15.538-4.591-48.024c0,0-1.413,36.019-13.419,55.439
C362.333,871.22,387.405,835.554,380.343,863.805z"/>
<path id="path902" fill="#CCCCCC" d="M362.686,860.273c0,0-0.353-35.313,0.354-40.61c0,0-6.709,29.31-24.719,46.26
C338.32,865.923,363.745,844.735,362.686,860.273z"/>
<path id="path906" fill="#CCCCCC" d="M345.736,803.771c0,0,10.594,24.014-7.063,56.502c0,0,11.301-21.541,2.825-33.9
C341.498,826.373,346.089,820.369,345.736,803.771z"/>
<path id="path910" fill="#CCCCCC" d="M311.836,859.566c0,0-1.766-27.545,1.412-31.429c0,0,0.354-11.301-0.354-13.065
c0,0,7.063-10.946,7.416,2.119c0,0,2.473,13.771,7.416,21.894c0,0,6.356,9.535,6.003,20.835
C333.729,859.92,316.073,806.598,311.836,859.566z"/>
<path id="path914" fill="#CCCCCC" d="M305.479,810.835c0,0-11.653,19.069-14.831,52.616c0,0-2.472-10.947,4.237-36.372
C294.885,827.079,302.301,799.888,305.479,810.835z"/>
<path id="path918" fill="#CCCCCC" d="M266.988,845.795c0,0,8.828-9.535,11.3-18.363c0,0,6.356-27.896-4.943-12.712
c0,0,0.353,14.125-14.125,27.19C259.219,841.91,267.694,837.673,266.988,845.795z"/>
<path id="path922" fill="#CCCCCC" d="M256.748,836.967c0,0,6.003-30.723,7.416-32.135c0,0,3.178-6.003-1.766-0.354
c0,0-15.538,33.9-22.6,45.555C239.797,850.032,253.922,833.788,256.748,836.967z"/>
<path id="path926" fill="#CCCCCC" d="M246.507,807.657c0,0,20.481-39.552-18.01,6.003
C228.497,813.66,247.919,796.356,246.507,807.657z"/>
<path id="path930" fill="#CCCCCC" d="M219.316,781.879c0,0,8.475-33.193,13.065-32.842c0,0,14.479-15.891,2.825,2.825
c0,0-10.594,16.95-9.535,34.254C225.672,786.116,224.613,769.166,219.316,781.879z"/>
<path id="path934" fill="#CCCCCC" d="M802.508,761.748c0,0-21.188-17.656-25.602-23.836c0,0,23.836,32.664,23.836,45.023
C800.742,782.938,805.156,769.693,802.508,761.748z"/>
<path id="path938" fill="#CCCCCC" d="M812.219,722.904c0,0-37.078-26.484-43.259-39.728c0,0,46.79,52.086,46.79,60.031
C815.75,743.209,816.633,727.318,812.219,722.904z"/>
<path id="path942" fill="#CCCCCC" d="M842.234,450.995c0,0-21.188-14.125-23.836-10.594c0,0,18.539,11.477,22.952,26.483
C841.352,466.886,838.703,450.995,842.234,450.995z"/>
<path id="path946" fill="#CCCCCC" d="M857.242,593.13l-30.898-21.188c0,0,33.547,30.017,34.431,37.079L857.242,593.13z"/>
<path id="path950" stroke="#000000" d="M167.317,553.402l38.844,8.387"/>
<path id="path954" stroke="#000000" d="M256.041,839.438c0,0-0.883-6.181-16.773,12.358"/>
<path id="path958" stroke="#000000" d="M265.752,848.265c0,0,3.531-11.477-7.946-3.53"/>
<path id="path962" stroke="#000000" d="M361.097,863.271c0,0,2.648-19.422-17.655,3.531"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 84 KiB

29
data/elementary/objects/Makefile.am
View File

@ -1,29 +0,0 @@
EDJE_CC_FLAGS += -id $(top_srcdir)/data/elementary/objects -fd $(top_srcdir)/data/elementary/objects
EXTRA_DIST += \
elementary/objects/test.edc \
elementary/objects/test_external.edc \
elementary/objects/test_masking.edc \
elementary/objects/test_pager.edc \
elementary/objects/test_prefs.edc \
elementary/objects/test_prefs.epc \
elementary/objects/test_tab_pager.edc \
elementary/objects/multip.edc \
elementary/objects/cursors.edc \
elementary/objects/font_preview.edc \
elementary/objects/postit_ent.edc \
elementary/objects/multibuttonentry.edc \
elementary/objects/test_focus_style.edc \
elementary/objects/test_tooltip.edc \
elementary/objects/over.png \
elementary/objects/under.png \
elementary/objects/sky.jpg \
elementary/objects/clo.png \
elementary/objects/cross.png \
elementary/objects/border.png \
elementary/objects/border2.png \
elementary/objects/border3.png \
elementary/objects/border4.png \
elementary/objects/border5.png \
elementary/objects/border6.png \
elementary/objects/roundedrect.png

55
data/elementary/objects/test_masking.edc
View File

@ -13,7 +13,24 @@ collections {
}
}
}
group { "image";
parts {
image { "mask";
desc { "default";
image {
normal: "roundedrect.png";
border: 22 22 22 22;
}
}
}
}
}
group { "masking";
styles {
style { name: "textblock_style";
base: "font=Sans-Bold font_size=24 wrap=word color=#ffffffff";
}
}
parts {
rect { "clip"; norender; }
image { "mask";
@ -25,10 +42,36 @@ collections {
}
}
}
textblock { "textmask";
norender;
desc {
text {
style: "textblock_style";
ellipsis: -1;
text:
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, "
"sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. "
"Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris "
"nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in "
"reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla "
"pariatur. Excepteur sint occaecat cupidatat non proident, sunt in "
"culpa qui officia deserunt mollit anim id est laborum.";
}
}
}
swallow { "mask2";
norender;
}
swallow { "content";
desc { "default";
clip_to: "mask";
}
desc { "smartclip";
clip: "mask2";
}
desc { "textclip";
clip: "textmask";
}
desc { "unclipped";
clip_to: "clip";
}
@ -47,6 +90,18 @@ collections {
action: STATE_SET "default";
target: "content";
}
program {
signal: "smartclip";
source: "*";
action: STATE_SET "smartclip";
target: "content";
}
program {
signal: "textclip";
source: "*";
action: STATE_SET "textclip";
target: "content";
}
}
}
group { "text";

1530
data/elementary/themes/Makefile.am
View File

File diff suppressed because it is too large Load Diff

8
data/elementary/themes/default.edc
View File

@ -170,12 +170,12 @@ collections {
#include "edc/O/icons.edc"
// New efl ui themes
#include "edc/efl/macros.edc"
#include "edc/efl/bg.edc"
#include "edc/efl/button.edc"
#include "edc/efl/calendar.edc"
#include "edc/efl/navigation_bar.edc"
#include "edc/efl/navigation_layout.edc"
#include "edc/efl/nstate.edc"
// XXX: mobile mode needs invisible scrollers... make signals that do this
#include "edc/efl/scroller.edc"
#include "edc/efl/list.edc"
@ -193,7 +193,7 @@ collections {
#include "edc/efl/tags.edc"
#include "edc/efl/panel.edc"
#include "edc/efl/tooltip.edc"
#include "edc/efl/photocam.edc"
#include "edc/efl/image_zoomable.edc"
#include "edc/efl/progress.edc"
#include "edc/efl/border.edc"
#include "edc/efl/spin.edc"
@ -206,8 +206,10 @@ collections {
#include "edc/efl/textpath.edc"
#include "edc/efl/win.edc"
#include "edc/efl/uiclock.edc"
#include "edc/efl/pager.edc"
#include "edc/efl/spotlight.edc"
#include "edc/efl/tab_pager.edc"
#include "edc/efl/tab_bar.edc"
#include "edc/efl/tab_page.edc"
#include "edc/efl/collection.edc"
#include "edc/efl/group_item.edc"
}

21
data/elementary/themes/edc/efl/bg.edc
View File

@ -1,13 +1,18 @@
/* bg widget style information
Group: efl/bg (@since 1.23)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.rectangle (required)
[SWALLOW]
efl.rectangle: Used for elm_bg_color_set()
efl.background: Used for elm_bg_file_set()
efl.content: Used for elm_layout_part_content_set(bg, "overlay", content).
efl.rectangle: Used for efl_gfx_color_color_set()
efl.background: Used for efl_file_set()
efl.content: Used for storing the main object for which this is the background
*/
group { "efl/bg";
data.item: "version" "119";
data.item: "version" "123";
images.image: "bevel_dark_out.png" COMP;
parts {
part { name: "clipper"; type: RECT;
@ -20,11 +25,11 @@ group { "efl/bg";
color: 64 64 64 255;
}
}
part { name: "efl.rectangle"; type: SWALLOW;
part { name: "efl.rectangle"; type: SWALLOW; required;
description { state: "default" 0.0;
}
}
part { name: "efl.background"; type: SWALLOW;
part { name: "efl.background"; type: SWALLOW; required;
clip_to: "clipper";
description { state: "default" 0.0;
fixed: 1 1;
@ -38,9 +43,9 @@ group { "efl/bg";
fill.smooth: 0;
}
}
part { name: "efl.content"; type: SWALLOW;
part { name: "efl.content"; type: SWALLOW; required;
description { state: "default" 0.0;
}
}
}
}
}

13
data/elementary/themes/edc/efl/border.edc
View File

@ -7,7 +7,7 @@
* - virtual keyboard
*/
group { "efl/border";
group { "efl/border"; data.item: "version" "123";
images.image: "vgrad_med_lighter.png" COMP;
images.image: "vgrad_med_dark.png" COMP;
images.image: "bevel_out.png" COMP;
@ -30,7 +30,6 @@ group { "efl/border";
images.image: "screen_circular_shadow.png" COMP;
images.image: "win_shadow.png" COMP;
data.item: "shadow" "1";
data.item: "version" "119";
parts {
/* opaque region of the window, to inform the compositor */
spacer { "efl.spacer.opaque";
@ -130,7 +129,7 @@ group { "efl/border";
rel.to: "efl.menu";
}
}
swallow { "efl.menu";
swallow { "efl.menu"; required;
required: 1; // since 1.19
desc { "default";
rel.to: "indicator_spacer";
@ -162,7 +161,7 @@ group { "efl/border";
}
/* application contents */
swallow { "efl.client";
swallow { "efl.client"; required;
clip: "client_clip";
desc { "default";
rel.to: "client_spacer";
@ -308,7 +307,7 @@ group { "efl/border";
rel2.relative: 1.2 1.2;
}
}
swallow { "efl.icon"; nomouse;
swallow { "efl.icon"; nomouse; required;
clip_to: "top_clip";
desc { "default";
rel1.to: "icon";
@ -694,7 +693,7 @@ group { "efl/border";
color: 0 0 0 0;
}
}
swallow { "efl.indicator";
swallow { "efl.indicator"; required;
clip: "bg_clip";
desc { "default";
rel.to: "top_clip";
@ -1124,6 +1123,7 @@ group { "efl/border";
group { "efl/border/dialog";
inherit: "efl/border";
data.item: "version" "123";
parts {
text { "efl.text.title";
clip: "top_clip";
@ -1191,6 +1191,7 @@ group { "efl/border/dialog";
group { "efl/border/naviframe";
inherit: "efl/border";
data.item: "version" "123";
images.image: "sym_left_dark_normal.png" COMP;
images.image: "sym_left_glow_normal.png" COMP;
images.image: "sym_left_light_normal.png" COMP;

70
data/elementary/themes/edc/efl/button.edc
View File

@ -1,4 +1,32 @@
group { name: "efl/button";
/**
Group: efl/button (@since 1.23)
Part Text: efl.text (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Signal: efl,content,set
Signal: efl,content,unset
Signal: efl,state,animation,activated
Signal: efl,state,background,set
Signal: efl,state,background,unset
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,text,set
Signal: efl,text,unset
Group: efl/button:anchor (@since 1.23)
Part Text: efl.text
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Signal: efl,content,set
Signal: efl,content,unset
Signal: efl,state,animation,activated
Signal: efl,state,background,set
Signal: efl,state,background,unset
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,text,set
Signal: efl,text,unset
*/
group { name: "efl/button"; data.item: "version" "123";
images.image: "button_normal.png" COMP;
images.image: "button_clicked.png" COMP;
@ -296,9 +324,9 @@ group { name: "efl/button";
}
}
programs {
EFL_UI_CLICKABLE_PART_BIND("event")
program {
signal: "mouse,down,1"; source: "event";
action: SIGNAL_EMIT "efl,action,press" "efl";
after: "button_click_anim";
}
program { name: "button_click_anim";
@ -310,7 +338,6 @@ group { name: "efl/button";
}
program { name: "button_unclick";
signal: "mouse,up,1"; source: "event";
action: SIGNAL_EMIT "efl,action,unpress" "efl";
after: "button_unclick_anim";
}
program { name: "button_unclick_anim";
@ -321,7 +348,7 @@ group { name: "efl/button";
}
}
program { name: "buttonactivate";
signal: "efl,anim,activate"; source: "efl";
signal: "efl,state,animation,activated"; source: "efl";
action: STATE_SET "pressed" 0.0;
target: "base";
after: "button_unpressed_anim";
@ -331,12 +358,8 @@ group { name: "efl/button";
in: 0.5 0.0;
target: "base";
}
program {
signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "efl,action,click" "efl";
}
program { name: "button_text_visible";
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@ -344,7 +367,7 @@ group { name: "efl/button";
}
}
program { name: "button_text_hidden";
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@ -352,7 +375,7 @@ group { name: "efl/button";
}
}
program { name: "button_icon_visible";
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@ -360,7 +383,7 @@ group { name: "efl/button";
}
}
program { name: "button_icon_hidden";
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);
@ -408,7 +431,7 @@ group { name: "efl/button";
#undef BACKGROUND
}
group { name: "efl/button:anchor";
group { name: "efl/button:anchor"; data.item: "version" "123";
images.image: "horizontal_separated_bar_small_glow.png" COMP;
#define ICON 1
#define LABEL 2
@ -498,7 +521,7 @@ group { name: "efl/button:anchor";
color: 255 255 255 64;
}
}
swallow { "efl.background"; nomouse;
swallow { "efl.background"; nomouse; required;
desc { "default";
rel1.to: "base";
rel2.to: "base";
@ -509,7 +532,7 @@ group { name: "efl/button:anchor";
visible: 1;
}
}
swallow { "efl.content"; nomouse;
swallow { "efl.content"; nomouse; required;
clip_to: "icon_clip";
desc { "default";
fixed: 1 0;
@ -680,9 +703,9 @@ group { name: "efl/button:anchor";
}
}
programs {
EFL_UI_CLICKABLE_PART_BIND("event")
program {
signal: "mouse,down,1"; source: "event";
action: SIGNAL_EMIT "efl,action,press" "efl";
after: "button_click_anim";
}
program { name: "button_click_anim";
@ -692,7 +715,6 @@ group { name: "efl/button:anchor";
}
program {
signal: "mouse,up,1"; source: "event";
action: SIGNAL_EMIT "efl,action,unpress" "efl";
after: "button_unclick_anim";
}
program { name: "button_unclick_anim";
@ -701,7 +723,7 @@ group { name: "efl/button:anchor";
target: "text2";
}
program {
signal: "efl,anim,activate"; source: "efl";
signal: "efl,state,animation,activated"; source: "efl";
action: STATE_SET "clicked" 0.0;
target: "bar2";
target: "text2";
@ -713,12 +735,8 @@ group { name: "efl/button:anchor";
target: "bar2";
target: "text2";
}
program {
signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "efl,action,click" "efl";
}
program { name: "button_text_visible";
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@ -726,7 +744,7 @@ group { name: "efl/button:anchor";
}
}
program { name: "button_text_hidden";
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@ -734,7 +752,7 @@ group { name: "efl/button:anchor";
}
}
program { name: "button_icon_visible";
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@ -742,7 +760,7 @@ group { name: "efl/button:anchor";
}
}
program { name: "button_icon_hidden";
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);

7
data/elementary/themes/edc/efl/calendar.edc
View File

@ -420,7 +420,7 @@
} \
}
group { "efl/calendar";
group { "efl/calendar"; data.item: "version" "123";
images.image: "sym_left_light_normal.png" COMP;
images.image: "sym_right_light_normal.png" COMP;
images.image: "sym_left_glow_normal.png" COMP;
@ -541,7 +541,7 @@ group { "efl/calendar";
#undef CIT
#undef CH
group { name: "efl/calendar/inc_button";
group { name: "efl/calendar/inc_button"; data.item: "version" "123";
images.image: "sym_right_light_normal.png" COMP;
images.image: "sym_right_glow_normal.png" COMP;
images.image: "sym_right_dark_normal.png" COMP;
@ -647,7 +647,7 @@ group { "efl/calendar";
action: SIGNAL_EMIT "efl,action,click" "";
}
program { name: "access_pressed";
signal: "efl,action,anim,activate";
signal: "efl,state,animation,activated";
source: "efl";
action: STATE_SET "pressed" 0.0;
target: "arrow.image";
@ -693,6 +693,7 @@ group { "efl/calendar";
group { name: "efl/calendar/dec_button";
inherit: "efl/calendar/inc_button";
data.item: "version" "123";
images.image: "sym_left_light_normal.png" COMP;
images.image: "sym_left_glow_normal.png" COMP;
images.image: "sym_left_dark_normal.png" COMP;

72
data/elementary/themes/edc/efl/check.edc
View File

@ -1,4 +1,30 @@
group { "efl/check";
/**
Group: efl/check:toggle (@since 1.23)
Part Text: efl.offtext
Part Text: efl.ontext
Part Text: efl.text
Part Swallow: efl.content
Signal: efl,content,set
Signal: efl,content,unset
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,state,selected
Signal: efl,state,unselected
Signal: efl,text,set
Signal: efl,text,unset
Group: efl/check (@since 1.23)
Part Text: efl.text (required)
Part Swallow: efl.content (required)
Signal: efl,content,set
Signal: efl,content,unset
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,state,selected
Signal: efl,state,unselected
Signal: efl,text,set
Signal: efl,text,unset
*/
group { "efl/check"; data.item: "version" "123";
images.image: "inset_shadow_tiny.png" COMP;
images.image: "bevel_in.png" COMP;
images.image: "sym_check_alum.png" COMP;
@ -256,22 +282,19 @@ group { "efl/check";
}
}
programs {
EFL_UI_CLICKABLE_PART_BIND(event)
program {
signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "efl,action,check,toggle" "efl";
}
program {
signal: "efl,state,check,on"; source: "efl";
signal: "efl,state,selected"; source: "efl";
action: STATE_SET "selected" 0.0;
target: "indicator";
}
program {
signal: "efl,state,check,off"; source: "efl";
signal: "efl,state,unselected"; source: "efl";
action: STATE_SET "default" 0.0;
target: "indicator";
}
program {
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@ -279,7 +302,7 @@ group { "efl/check";
}
}
program {
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@ -287,7 +310,7 @@ group { "efl/check";
}
}
program {
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@ -295,7 +318,7 @@ group { "efl/check";
}
}
program {
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);
@ -325,7 +348,7 @@ group { "efl/check";
#undef DISABLE
}
group { "efl/check:toggle";
group { "efl/check:toggle"; data.item: "version" "123";
images.image: "inset_shadow_tiny.png" COMP;
images.image: "bevel_in.png" COMP;
images.image: "bevel_out.png" COMP;
@ -774,12 +797,9 @@ group { "efl/check:toggle";
}
}
programs {
EFL_UI_CLICKABLE_PART_BIND(event)
program {
signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "efl,action,check,toggle" "efl";
}
program {
signal: "efl,state,check,on"; source: "efl";
signal: "efl,state,selected"; source: "efl";
script {
new Float:drag;
if (get_int(is_rtl) == 0) {
@ -791,7 +811,7 @@ group { "efl/check:toggle";
}
}
program {
signal: "efl,state,check,off"; source: "efl";
signal: "efl,state,unselected"; source: "efl";
script {
new Float:drag;
if (get_int(is_rtl) == 0) {
@ -815,9 +835,9 @@ group { "efl/check:toggle";
}
if (((get_int(is_rtl) == 1) && (dx <= 0.5)) ||
(get_int(is_rtl) == 0) && (dx > 0.5)) {
emit("efl,action,check,off", "efl");
emit("efl,action,unselect", "efl");
} else {
emit("efl,action,check,on", "efl");
emit("efl,action,select", "efl");
}
}
}
@ -848,9 +868,9 @@ group { "efl/check:toggle";
}
if (((get_int(is_rtl) == 1) && (dx <= 0.5)) ||
(get_int(is_rtl) == 0) && (dx > 0.5)) {
emit("efl,action,check,on", "efl");
emit("efl,action,select", "efl");
} else {
emit("efl,action,check,off", "efl");
emit("efl,action,unselect", "efl");
}
set_int(was_drag, 1);
set_int(is_drag, 0);
@ -870,7 +890,7 @@ group { "efl/check:toggle";
target: "glow_but";
}
program {
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@ -878,7 +898,7 @@ group { "efl/check:toggle";
}
}
program {
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@ -886,7 +906,7 @@ group { "efl/check:toggle";
}
}
program {
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@ -894,7 +914,7 @@ group { "efl/check:toggle";
}
}
program {
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);

17
data/elementary/themes/edc/efl/collection.edc Normal file
View File

@ -0,0 +1,17 @@
/**
Group: efl/collection (@since 1.23)
Part Rectangle: efl.draggable.horizontal_bar (required)
Part Rectangle: efl.draggable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
Signal: efl,action,scroll
Signal: efl,horizontal_bar,visible,off
Signal: efl,horizontal_bar,visible,on
Signal: efl,vertical_bar,visible,off
Signal: efl,vertical_bar,visible,on
*/
group { "efl/collection";
inherit: "efl/scroller";
data.item: "version" "123";
}

5
data/elementary/themes/edc/efl/cursor.edc
View File

@ -78,7 +78,7 @@
// "watch"
// "xterm"
group { name: "efl/cursor/hand1";
group { name: "efl/cursor/hand1"; data.item: "version" "123";
images.image: "pointer_hand1.png" COMP;
parts {
part { name: "base"; mouse_events: 0; scale: 1;
@ -104,7 +104,7 @@ group { name: "efl/cursor/hand1";
}
}
group { name: "efl/cursor/blank";
group { name: "efl/cursor/blank"; data.item: "version" "123";
parts {
part { name: "efl.hotspot"; type: SWALLOW;
description { state: "default" 0.0;
@ -118,6 +118,7 @@ group { name: "efl/cursor/blank";
}
group { name: "efl/cursor/xterm";
data.item: "version" "123";
images.image: "pointer_entry.png" COMP;
parts {
part { name: "base"; mouse_events: 0; scale: 1;

45
data/elementary/themes/edc/efl/datepicker.edc
View File

@ -1,4 +1,23 @@
group { "efl/datepicker";
/**
Group: efl/datepicker (@since 1.23)
Part Swallow: efl.field0 (required)
Part Swallow: efl.field1 (required)
Part Swallow: efl.field2 (required)
Group: efl/datepicker/spin_button (@since 1.23)
Part Swallow: efl.dec_button (required)
Part Swallow: efl.entry (required)
Part Swallow: efl.inc_button (required)
Part Swallow: efl.text_button (required)
Signal: efl,button,visible,off
Signal: efl,button,visible,on
Signal: efl,entry,visible,off
Signal: efl,entry,visible,on
Signal: efl,state,access,active
Signal: efl,state,access,inactive
Signal: efl,state,disabled
Signal: efl,state,enabled
*/
group { "efl/datepicker"; data.item: "version" "123";
parts {
spacer { "base";
scale;
@ -97,7 +116,7 @@ group { "efl/datepicker";
align: 1.0 1.0;
}
}
swallow { "efl.field0";
swallow { "efl.field0"; required;
mouse;
scale;
desc { "default";
@ -125,7 +144,7 @@ group { "efl/datepicker";
align: 0.0 0.5;
}
}
swallow { "efl.field1";
swallow { "efl.field1"; required;
mouse;
scale;
desc { "default";
@ -156,7 +175,7 @@ group { "efl/datepicker";
align: 1.0 0.5;
}
}
swallow { "efl.field2";
swallow { "efl.field2"; required;
mouse;
scale;
desc { "default";
@ -182,7 +201,7 @@ group { "efl/datepicker";
}
}
group { "efl/datepicker/spin_button";
group { "efl/datepicker/spin_button"; data.item: "version" "123";
parts {
rect { "clip";
desc { "default";
@ -215,7 +234,7 @@ group { "efl/datepicker/spin_button";
vis;
}
}
swallow { "efl.inc_button";
swallow { "efl.inc_button"; required;
scale;
desc { "default";
align: 0.5 0.0;
@ -224,7 +243,7 @@ group { "efl/datepicker/spin_button";
fixed: 1 1;
}
}
swallow { "efl.dec_button";
swallow { "efl.dec_button"; required;
scale;
desc { "default";
align: 0.5 1.0;
@ -233,7 +252,7 @@ group { "efl/datepicker/spin_button";
fixed: 1 1;
}
}
swallow { "efl.entry";
swallow { "efl.entry"; required;
clip: "clip";
desc { "default";
fixed: 1 1;
@ -246,7 +265,7 @@ group { "efl/datepicker/spin_button";
vis;
}
}
swallow { "efl.text_button";
swallow { "efl.text_button"; required;
scale;
desc { "default";
rel.to_x: "base";
@ -282,25 +301,25 @@ group { "efl/datepicker/spin_button";
}
programs {
program { "entry_active";
signal: "efl,state,entry,active";
signal: "efl,entry,visible,on";
source: "efl";
action: STATE_SET "active";
target: "efl.entry";
}
program { "entry_inactive";
signal: "efl,state,entry,inactive";
signal: "efl,entry,visible,off";
source: "efl";
action: STATE_SET "default";
target: "efl.entry";
}
program { "text_button_active";
signal: "efl,state,button,active";
signal: "efl,button,visible,on";
source: "efl";
action: STATE_SET "default";
target: "efl.text_button";
}
program { "text_button_inactive";
signal: "efl,state,button,inactive";
signal: "efl,button,visible,off";
source: "efl";
action: STATE_SET "inactive";
target: "efl.text_button";

21
data/elementary/themes/edc/efl/focus.edc
View File

@ -1,4 +1,11 @@
group { name: "efl/focus_highlight/top";
/**
Group: efl/focus_highlight/top (@since 1.23)
Signal: efl,focus,visible,off
Signal: efl,focus,visible,on
Signal: efl,state,animating,stopped
Group: efl/focus_highlight/top:blank (@since 1.23)
*/
group { name: "efl/focus_highlight/top"; data.item: "version" "123";
images.image: "box_glow.png" COMP;
images.image: "box_outline.png" COMP;
data.item: "animate" "on";
@ -118,7 +125,7 @@ group { name: "efl/focus_highlight/top";
}
programs {
program {
signal: "efl,action,focus,show"; source: "efl";
signal: "efl,focus,visible,on"; source: "efl";
action: ACTION_STOP;
target: "pulse";
target: "pulse2";
@ -132,17 +139,17 @@ group { name: "efl/focus_highlight/top";
after: "go3";
}
program { name: "go3";
action: SIGNAL_EMIT "efl,action,focus,show,end" "efl";
action: SIGNAL_EMIT "efl,focus,visible,on,done" "efl";
}
program {
signal: "efl,action,focus,hide"; source: "efl";
signal: "efl,focus,visible,off"; source: "efl";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.4;
target: "clip";
after: "stop2";
}
program { name: "stop2";
action: SIGNAL_EMIT "efl,action,focus,hide,end" "efl";
action: SIGNAL_EMIT "efl,focus,visible,off,done" "efl";
after: "stop3";
}
program { name: "stop3";
@ -164,14 +171,14 @@ group { name: "efl/focus_highlight/top";
after: "pulse";
}
program {
signal: "efl,state,anim,stop"; source: "efl";
signal: "efl,state,animating,stopped"; source: "efl";
action: STATE_SET "default" 0.0;
target: "base";
}
}
}
group { name: "efl/focus_highlight/top:blank";
group { name: "efl/focus_highlight/top:blank"; data.item: "version" "123";
parts {
}
}

7
data/elementary/themes/edc/efl/frame.edc
View File

@ -1,4 +1,4 @@
group { name: "efl/frame";
group { name: "efl/frame"; data.item: "version" "123";
images.image: "shadow_square_tiny.png" COMP;
images.image: "vgrad_med_curved.png" COMP;
images.image: "bevel_out.png" COMP;
@ -131,10 +131,7 @@ group { name: "efl/frame";
transition: DECELERATE 0.3;
after: "signal";
}
program {
signal: "mouse,up,1"; source: "event";
action: SIGNAL_EMIT "efl,action,click" "efl";
}
EFL_UI_CLICKABLE_PART_BIND("event")
program {
signal: "efl,action,toggle"; source: "efl";
script {

39
data/elementary/themes/edc/efl/grid.edc
View File

@ -1,12 +1,47 @@
/**
Group: efl/grid (@since 1.23)
Part Rectangle: efl.draggable.horizontal_bar (required)
Part Rectangle: efl.draggable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
Signal: efl,action,scroll
Signal: efl,horizontal_bar,visible,off
Signal: efl,horizontal_bar,visible,on
Signal: efl,vertical_bar,visible,off
Signal: efl,vertical_bar,visible,on
Group: efl/grid_item (@since 1.23)
Part Text: efl.text
Part Swallow: efl.extra
Part Swallow: efl.icon
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,state,selected
Signal: efl,state,unselected
Group: efl/view_grid (@since 1.23)
Part Rectangle: efl.draggable.horizontal_bar (required)
Part Rectangle: efl.draggable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
Signal: efl,action,scroll
Signal: efl,horizontal_bar,visible,off
Signal: efl,horizontal_bar,visible,on
Signal: efl,vertical_bar,visible,off
Signal: efl,vertical_bar,visible,on
*/
group { "efl/grid";
inherit: "efl/scroller";
data.item: "version" "123";
}
group { "efl/view_grid";
inherit: "efl/grid";
data.item: "version" "123";
}
group { "efl/grid_item";
group { "efl/grid_item"; data.item: "version" "123";
data.item: "selectraise" "on";
data.item: "focusraise" "on";
images.image: "bevel_dark_out.png" COMP;
@ -180,7 +215,7 @@ group { "efl/grid_item";
rel2.to: "icon_area";
}
}
swallow { "efl.end";
swallow { "efl.extra";
clip_to: "icon_area";
desc { "default";
fixed: 1 1;

123
data/elementary/themes/edc/efl/group_item.edc Normal file
View File

@ -0,0 +1,123 @@
/**
Group: efl/group_item (@since 1.23)
Part Text: efl.text
Part Swallow: efl.extra
Part Swallow: efl.icon
Signal: efl,state,disabled
Signal: efl,state,enabled
*/
group { "efl/group_item"; data.item: "version" "123"; nomouse; program_source: "efl";
images.image: "shadow_square_tiny.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "horizontal_separated_bar_small_glow.png" COMP;
parts {
image { "shadow_vbar";
desc { "default";
rel1.offset: -3 -2;
rel1.to: "base_vbar";
rel2.offset: 2 4;
rel2.to: "base_vbar";
image.normal: "shadow_square_tiny.png";
image.border: 6 6 6 6;
fill.smooth: 0;
}
}
image { "base_vbar";
desc { "default";
image.normal: "vgrad_med_lighter.png";
fill.smooth: 0;
min: 5 13;
TILED_HORIZ(120)
}
}
image { "bevel_vbar";
desc { "default";
rel1.to: "base_vbar";
rel2.to: "base_vbar";
image.normal: "bevel_out.png";
image.border: 1 1 1 1;
image.middle: 0;
fill.smooth: 0;
min: 5 5;
}
}
text { "efl.text";
effect: SHADOW BOTTOM;
scale;
desc { "default";
rel1.offset: 2 3;
rel1.relative: 1.0 0.0;
rel1.to_x: "efl.icon";
rel2.offset: -3 -3;
rel2.relative: 0.0 1.0;
rel2.to_x: "efl.extra";
color: FN_COL_DEFAULT;
color_class: "list_group_item";
text { font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
align: 0.0 0.5;
text_class: "list_group_item";
}
link.base: "efl,state,enabled";
}
desc { "disabled";
inherit: "default";
color: FN_COL_DISABLE;
color_class: "list_group_item_disabled";
link.base: "efl,state,disabled";
}
}
swallow { "pad"; mouse;
desc { "default";
fixed: 1 0;
align: 0.0 0.5;
rel1.offset: 2 2;
rel2.relative: 0.0 1.0;
rel2.offset: 2 -3;
}
}
swallow { "efl.icon"; mouse;
desc { "default";
fixed: 1 0;
align: 0.0 0.5;
rel1.to_x: "pad";
rel1.relative: 1.0 0.0;
rel1.offset: -1 2;
rel2.to_x: "pad";
rel2.relative: 1.0 1.0;
rel2.offset: -1 -3;
}
}
swallow { "efl.extra"; mouse;
desc { "default";
fixed: 1 0;
align: 1.0 0.5;
rel1.offset: -3 2;
rel1.relative: 1.0 0.0;
rel2.offset: -3 -3;
}
}
image { "bar";
desc { "default";
image.normal: "horizontal_separated_bar_small_glow.png";
image.border: 4 4 4 4;
fill.smooth: 0;
fixed: 0 1;
rel1.relative: 0.0 1.0;
rel1.offset: -3 -6;
rel2.offset: 2 3;
link.base: "efl,state,enabled";
}
desc { "disabled";
inherit: "default";
color: 255 255 255 64;
link.base: "efl,state,disabled";
}
}
}
}

25
data/elementary/themes/edc/efl/photocam.edc → data/elementary/themes/edc/efl/image_zoomable.edc
View File

@ -1,5 +1,22 @@
group { name: "efl/photocam";
/**
Group: efl/image_zoomable (@since 1.23)
Part Rectangle: efl.draggable.horizontal_bar (required)
Part Rectangle: efl.draggable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
Signal: efl,action,scroll
Signal: efl,horizontal_bar,visible,off
Signal: efl,horizontal_bar,visible,on
Signal: efl,state,busy,started
Signal: efl,state,busy,stopped
Signal: efl,vertical_bar,visible,off
Signal: efl,vertical_bar,visible,on
*/
group { name: "efl/image_zoomable";
inherit: "efl/scroller";
data.item: "version" "123";
images.image: "knob_round_busy.png" COMP;
images.image: "glow_round_corners.png" COMP;
parts {
@ -45,7 +62,7 @@ group { name: "efl/photocam";
}
programs {
program { name: "spin";
signal: "efl,state,busy,start"; source: "efl";
signal: "efl,state,busy,started"; source: "efl";
action: ACTION_STOP;
target: "spin";
target: "spin0";
@ -73,14 +90,14 @@ group { name: "efl/photocam";
}
program {
signal: "efl,state,busy,start"; source: "efl";
signal: "efl,state,busy,started"; source: "efl";
action: STATE_SET "active" 0.0;
transition: SINUSOIDAL 0.25;
target: "busy_clip";
}
program {
signal: "efl,state,busy,stop"; source: "efl";
signal: "efl,state,busy,stopped"; source: "efl";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 1.0;
target: "busy_clip";

58
data/elementary/themes/edc/efl/list.edc
View File

@ -1,12 +1,62 @@
/**
Group: efl/list (@since 1.23)
Part Rectangle: efl.draggable.horizontal_bar (required)
Part Rectangle: efl.draggable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
Signal: efl,action,scroll
Signal: efl,horizontal_bar,visible,off
Signal: efl,horizontal_bar,visible,on
Signal: efl,vertical_bar,visible,off
Signal: efl,vertical_bar,visible,on
Group: efl/list_item (@since 1.23)
Part Text: efl.text
Part Swallow: efl.background
Part Swallow: efl.extra
Part Swallow: efl.icon
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,state,even
Signal: efl,state,odd
Signal: efl,state,pressed
Signal: efl,state,selected
Signal: efl,state,unpressed
Signal: efl,state,unselected
Group: efl/list_item:placeholder (@since 1.23)
Part Swallow: efl.background
Part Swallow: efl.content
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,state,even
Signal: efl,state,odd
Signal: efl,state,pressed
Signal: efl,state,selected
Signal: efl,state,unpressed
Signal: efl,state,unselected
Group: efl/list_view (@since 1.23)
Part Rectangle: efl.draggable.horizontal_bar (required)
Part Rectangle: efl.draggable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
Signal: efl,action,scroll
Signal: efl,horizontal_bar,visible,off
Signal: efl,horizontal_bar,visible,on
Signal: efl,vertical_bar,visible,off
Signal: efl,vertical_bar,visible,on
*/
group { "efl/list";
inherit: "efl/scroller";
data.item: "version" "123";
}
group { "efl/list_view";
inherit: "efl/list";
data.item: "version" "123";
}
group { "efl/list_item";
group { "efl/list_item"; data.item: "version" "123";
data.item: "selectraise" "on";
data.item: "focusraise" "on";
images.image: "bevel_curved_horiz_out.png" COMP;
@ -99,7 +149,7 @@ group { "efl/list_item";
rel1.to_x: "efl.icon";
rel2.offset: -3 -3;
rel2.relative: 0.0 1.0;
rel2.to_x: "efl.end";
rel2.to_x: "efl.extra";
color: FN_COL_DEFAULT;
color_class: "list_item";
text { font: FN; size: 10;
@ -179,7 +229,7 @@ group { "efl/list_item";
rel2.offset: 2 -3;
}
}
swallow { "efl.end";
swallow { "efl.extra";
desc { "default";
fixed: 1 0;
align: 1.0 0.5;
@ -293,7 +343,7 @@ group { "efl/list_item";
}
}
group { "efl/list_item:empty";
group { "efl/list_item:placeholder"; data.item: "version" "123";
data.item: "selectraise" "on";
data.item: "focusraise" "on";
images.image: "bevel_curved_horiz_out.png" COMP;

26
data/elementary/themes/edc/efl/macros.edc Normal file
View File

@ -0,0 +1,26 @@
/**
* A macro for defining the programms that are needed to redirect the mouse
* events of a part to the implementation of Efl.Ui.Clickable.
*
* The Widget using this has to call the method bind_to_theme of Efl.Ui.Clickable_Util
* in order to redirect the here called signals to real events that can be used in code.
* The resulting events on the widget will be from the Efl.Ui.Clickable class.
*/
#define EFL_UI_CLICKABLE_PART_BIND(PART) \
program { \
signal: "mouse,down,1"; source: PART; \
action: SIGNAL_EMIT "efl,action,press" "efl"; \
} \
program { \
signal: "mouse,down,1,*"; source: PART; \
action: SIGNAL_EMIT "efl,action,press" "efl"; \
} \
program { \
signal: "mouse,up,1"; source: PART; \
action: SIGNAL_EMIT "efl,action,unpress" "efl"; \
} \
program { \
signal: "mouse,pressed,out"; source: PART; \
action: SIGNAL_EMIT "efl,action,mouse_out" "efl"; \
}

3
data/elementary/themes/edc/efl/navigation_bar.edc
View File

@ -1,5 +1,5 @@
//Efl.Ui.Navigation_Bar Themes
group { "efl/navigation_bar";
group { "efl/navigation_bar"; data.item: "version" "123";
styles {
style { name: "navigation_bar_text";
base: "font="FNBD" font_size=10 text_class=label align=center color=#fff color_class=navigation_bar_text style=shadow,bottom shadow_color=#00000080 ellipsis=1.0 wrap=mixed";
@ -101,6 +101,7 @@ group { "efl/navigation_bar";
group { name: "efl/navigation_bar/back_button";
inherit: "efl/button";
data.item: "version" "123";
images.image: "icon_arrow_left.png" COMP;
parts {
image { name: "icon_arrow_left";

2
data/elementary/themes/edc/efl/navigation_layout.edc
View File

@ -1,5 +1,5 @@
//Efl.Ui.Navigation_Layout Themes
group { "efl/navigation_layout";
group { "efl/navigation_layout"; data.item: "version" "123";
parts {
spacer { "base";
desc { "default";

10
data/elementary/themes/edc/efl/nstate.edc
View File

@ -1,10 +0,0 @@
group { "efl/nstate";
inherit: "efl/button";
programs {
program {
signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "efl,action,state,changed" "efl";
}
}
}

15
data/elementary/themes/edc/efl/panel.edc
View File

@ -1,4 +1,4 @@
group { name: "efl/panel";
group { name: "efl/panel"; data.item: "version" "123";
data {
item: "handler_size" "30";
}
@ -10,7 +10,7 @@ group { name: "efl/panel";
}
}
}
group { name: "efl/panel/scrollable/left";
group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
parts {
part { name: "efl.panel_area";
type: SWALLOW;
@ -102,7 +102,7 @@ group { name: "efl/panel/scrollable/left";
}
}
group { name: "efl/panel/scrollable/right";
group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
parts {
part { name: "efl.event_area";
type: SWALLOW;
@ -194,7 +194,7 @@ group { name: "efl/panel/scrollable/right";
}
}
group { name: "efl/panel/scrollable/top";
group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
parts {
part { name: "efl.panel_area";
type: SWALLOW;
@ -286,7 +286,7 @@ group { name: "efl/panel/scrollable/top";
}
}
group { name: "efl/panel/scrollable/bottom";
group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
parts {
part { name: "efl.event_area";
type: SWALLOW;
@ -378,7 +378,7 @@ group { name: "efl/panel/scrollable/bottom";
}
}
group { name: "efl/panel/left";
group { name: "efl/panel/left"; data.item: "version" "123";
images.image: "bevel_out.png" COMP;
images.image: "shine.png" COMP;
images.image: "shadow_square_tiny.png" COMP;
@ -627,6 +627,7 @@ group { name: "efl/panel/left";
group { name: "efl/panel/right";
inherit: "efl/panel/left";
data.item: "version" "123";
parts {
part { name: "base";
description { state: "default" 0.0;
@ -681,6 +682,7 @@ group { name: "efl/panel/right";
group { name: "efl/panel/top";
inherit: "efl/panel/left";
data.item: "version" "123";
parts {
part { name: "base";
description { state: "default" 0.0;
@ -775,6 +777,7 @@ group { name: "efl/panel/top";
group { name: "efl/panel/bottom";
inherit: "efl/panel/top";
data.item: "version" "123";
parts {
part { name: "base";
description { state: "default" 0.0;

66
data/elementary/themes/edc/efl/panes.edc
View File

@ -5,8 +5,6 @@
efl,panes,unfixed: Used for elm_panes_fixed_set()
[SIGNAL EMIT]
efl,action,click: Used for "clicked" smart callback.
efl,action,click,double: Used for "clicked,double" smart callback.
efl,action,press: Used for "press" smart callback.
efl,action,unpress: Used for "unpress" smart callback.
*/
@ -15,7 +13,7 @@
#define PANEMIN2 16
#define PANEWID 32
group { name: "efl/panes/vertical";
group { name: "efl/panes/vertical"; data.item: "version" "123";
images.image: "holes_vert.png" COMP;
parts {
//TODO: remove left/right
@ -131,18 +129,7 @@ group { name: "efl/panes/vertical";
}
}
programs {
program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
action: SIGNAL_EMIT "efl,action,press" "efl";
}
program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
action: SIGNAL_EMIT "efl,action,unpress" "efl";
}
program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
action: SIGNAL_EMIT "efl,action,click" "efl";
}
program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
action: SIGNAL_EMIT "efl,action,click,double" "efl";
}
EFL_UI_CLICKABLE_PART_BIND("bar")
program { // for elm_panes_fixed_set()
signal: "efl,panes,fixed"; source: "efl";
action: STATE_SET "disabled" 0.0;
@ -156,7 +143,7 @@ group { name: "efl/panes/vertical";
}
}
group { name: "efl/panes/horizontal";
group { name: "efl/panes/horizontal"; data.item: "version" "123";
images.image: "holes_horiz.png" COMP;
parts {
//TODO: remove left/right
@ -272,18 +259,7 @@ group { name: "efl/panes/horizontal";
}
}
programs {
program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
action: SIGNAL_EMIT "efl,action,press" "efl";
}
program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
action: SIGNAL_EMIT "efl,action,unpress" "efl";
}
program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
action: SIGNAL_EMIT "efl,action,click" "efl";
}
program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
action: SIGNAL_EMIT "efl,action,click,double" "efl";
}
EFL_UI_CLICKABLE_PART_BIND("bar")
program { // for elm_panes_fixed_set()
signal: "efl,panes,fixed"; source: "efl";
action: STATE_SET "disabled" 0.0;
@ -297,7 +273,7 @@ group { name: "efl/panes/horizontal";
}
}
group { name: "efl/panes/vertical:flush";
group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
images.image: "downlight_glow_left.png" COMP;
images.image: "downlight_glow_right.png" COMP;
parts {
@ -472,18 +448,7 @@ group { name: "efl/panes/vertical:flush";
}
}
programs {
program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
action: SIGNAL_EMIT "efl,action,press" "efl";
}
program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
action: SIGNAL_EMIT "efl,action,unpress" "efl";
}
program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
action: SIGNAL_EMIT "efl,action,click" "efl";
}
program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
action: SIGNAL_EMIT "efl,action,click,double" "efl";
}
EFL_UI_CLICKABLE_PART_BIND("bar")
program { // for elm_panes_fixed_set()
signal: "efl,panes,fixed"; source: "efl";
action: STATE_SET "disabled" 0.0;
@ -525,7 +490,7 @@ group { name: "efl/panes/vertical:flush";
}
}
group { name: "efl/panes/horizontal:flush";
group { name: "efl/panes/horizontal:flush"; data.item: "version" "123";
images.image: "downlight_glow.png" COMP;
images.image: "downlight_glow_up.png" COMP;
parts {
@ -728,18 +693,7 @@ group { name: "efl/panes/horizontal:flush";
target: "glow2a";
target: "glow2b";
}
program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
action: SIGNAL_EMIT "efl,action,press" "efl";
}
program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
action: SIGNAL_EMIT "efl,action,unpress" "efl";
}
program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
action: SIGNAL_EMIT "efl,action,click" "efl";
}
program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
action: SIGNAL_EMIT "efl,action,click,double" "efl";
}
EFL_UI_CLICKABLE_PART_BIND("bar")
program { // for elm_panes_fixed_set()
signal: "efl,panes,fixed"; source: "efl";
action: STATE_SET "disabled" 0.0;
@ -755,6 +709,7 @@ group { name: "efl/panes/horizontal:flush";
group { name: "efl/panes/vertical:left-fold";
inherit: "efl/panes/vertical";
data.item: "version" "123";
images.image: "icon_arrow_left.png" COMP;
images.image: "icon_arrow_right.png" COMP;
script {
@ -818,6 +773,7 @@ group { name: "efl/panes/vertical:left-fold";
group { name: "efl/panes/vertical:right-fold";
inherit: "efl/panes/vertical";
data.item: "version" "123";
images.image: "icon_arrow_left.png" COMP;
images.image: "icon_arrow_right.png" COMP;
script {
@ -881,6 +837,7 @@ group { name: "efl/panes/vertical:right-fold";
group { name: "efl/panes/horizontal:up-fold";
inherit: "efl/panes/horizontal";
data.item: "version" "123";
images.image: "icon_arrow_up.png" COMP;
images.image: "icon_arrow_down.png" COMP;
script {
@ -944,6 +901,7 @@ group { name: "efl/panes/horizontal:up-fold";
group { name: "efl/panes/horizontal:down-fold";
inherit: "efl/panes/horizontal";
data.item: "version" "123";
images.image: "icon_arrow_up.png" COMP;
images.image: "icon_arrow_down.png" COMP;
script {

8
data/elementary/themes/edc/efl/pointer.edc
View File

@ -1,4 +1,4 @@
group { name: "efl/pointer";
group { name: "efl/pointer"; data.item: "version" "123";
images {
image: "pointer.png" COMP;
image: "pointer_glow.png" COMP;
@ -105,6 +105,7 @@ group { name: "efl/pointer";
group { name: "efl/pointer:bottom_right_corner";
inherit: "efl/pointer";
data.item: "version" "123";
images.image: "mini_box_glow.png" COMP;
parts {
part { name: "box";
@ -141,6 +142,7 @@ group { name: "efl/pointer:bottom_right_corner";
group { name: "efl/pointer:bottom_left_corner";
inherit: "efl/pointer:bottom_right_corner";
data.item: "version" "123";
parts {
part { name: "box";
description { state: "default" 0.0;
@ -158,6 +160,7 @@ group { name: "efl/pointer:bottom_left_corner";
group { name: "efl/pointer:bottom_side";
inherit: "efl/pointer:bottom_right_corner";
data.item: "version" "123";
parts {
part { name: "box";
description { state: "default" 0.0;
@ -174,6 +177,7 @@ group { name: "efl/pointer:bottom_side";
group { name: "efl/pointer:top_right_corner";
inherit: "efl/pointer:bottom_right_corner";
data.item: "version" "123";
parts {
part { name: "box";
description { state: "default" 0.0;
@ -190,6 +194,7 @@ group { name: "efl/pointer:top_right_corner";
group { name: "efl/pointer:top_left_corner";
inherit: "efl/pointer:bottom_right_corner";
data.item: "version" "123";
parts {
part { name: "box";
description { state: "default" 0.0;
@ -206,6 +211,7 @@ group { name: "efl/pointer:top_left_corner";
group { name: "efl/pointer:top_side";
inherit: "efl/pointer:bottom_right_corner";
data.item: "version" "123";
parts {
part { name: "box";
description { state: "default" 0.0;

183
data/elementary/themes/edc/efl/popup.edc
View File

@ -1,5 +1,76 @@
//Efl.Ui.Popup Themes
/**
Group: efl/popup (@since 1.23)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Group: efl/popup/backwall (@since 1.23)
Part Swallow: efl.content (required)
Signal: efl,content,set
Signal: efl,content,unset
Group: efl/alert_popup/backwall (@since 1.23)
Part Swallow: efl.content (required)
Signal: efl,content,set
Signal: efl,content,unset
Group: efl/alert_popup/button_layout2 (@since 1.23)
Part Swallow: efl.button1 (required)
Part Swallow: efl.button2 (required)
Group: efl/alert_popup/right_button (@since 1.23)
Part Text: efl.text (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Signal: efl,content,set
Signal: efl,content,unset
Signal: efl,state,animation,activated
Signal: efl,state,background,set
Signal: efl,state,background,unset
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,text,set
Signal: efl,text,unset
Group: efl/alert_popup (@since 1.23)
Part Swallow: efl.background (required)
Part Swallow: efl.buttons (required)
Part Swallow: efl.content (required)
Part Textblock: efl.text.title (required)
Signal: efl,buttons,visible,on
Signal: efl,title,visible,off
Signal: efl,title,visible,on
Group: efl/alert_popup/button_layout3 (@since 1.23)
Part Swallow: efl.button1 (required)
Part Swallow: efl.button2 (required)
Part Swallow: efl.button3 (required)
Group: efl/alert_popup/button (@since 1.23)
Part Text: efl.text (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Signal: efl,content,set
Signal: efl,content,unset
Signal: efl,state,animation,activated
Signal: efl,state,background,set
Signal: efl,state,background,unset
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,text,set
Signal: efl,text,unset
Group: efl/alert_popup/button_layout1 (@since 1.23)
Part Swallow: efl.button1 (required)
Group: efl/alert_popup/left_button (@since 1.23)
Part Text: efl.text (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Signal: efl,content,set
Signal: efl,content,unset
Signal: efl,state,animation,activated
Signal: efl,state,background,set
Signal: efl,state,background,unset
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,text,set
Signal: efl,text,unset
*/
group { "efl/popup";
data.item: "version" "123";
images.image: "rounded_square.png" COMP;
parts {
spacer { "base";
@ -15,7 +86,12 @@ group { "efl/popup";
image.normal: "rounded_square.png";
}
}
swallow { "efl.content";
swallow { "efl.background"; required;
desc { "default";
rel.to: "bg";
}
}
swallow { "efl.content"; required;
desc { "default";
rel.to: "base";
}
@ -23,18 +99,20 @@ group { "efl/popup";
}
}
group { "efl/alert_popup";
alias: "efl/scroll_alert_popup";
alias: "efl/text_alert_popup";
group { "efl/alert_popup"; data.item: "version" "123";
images.image: "rounded_square.png" COMP;
parts {
alias: "title" "efl.text.title";
image { "bg";
desc { "default";
min: 100 100;
image.border: 15 15 15 15;
image.normal: "rounded_square.png";
}
}
}
swallow { "efl.background"; required;
desc { "default";
rel.to: "bg";
}
}
spacer { "base";
desc { "default";
@ -57,7 +135,7 @@ group { "efl/alert_popup";
min: 0 20;
}
}
textblock { "efl.text.title";
textblock { "efl.text.title"; required;
scale;
desc { "default";
fixed: 1 1;
@ -72,7 +150,7 @@ group { "efl/alert_popup";
vis;
}
}
swallow { "efl.buttons";
swallow { "efl.buttons"; required;
desc { "default";
fixed: 0 1;
rel.to: "base";
@ -85,7 +163,7 @@ group { "efl/alert_popup";
min: 0 30;
}
}
swallow { "efl.content";
swallow { "efl.content"; required;
desc { "default";
rel1.to_x: "base";
rel1.to_y: "title_bg";
@ -98,28 +176,27 @@ group { "efl/alert_popup";
}
programs {
program {
signal: "efl,title,show"; source: "efl";
signal: "efl,title,visible,on"; source: "efl";
action: STATE_SET "title_visible" 0.0;
target: "title_bg";
target: "efl.text.title";
}
program {
signal: "efl,buttons,show"; source: "efl";
signal: "efl,title,visible,off"; source: "efl";
action: STATE_SET "default" 0.0;
target: "title_bg";
target: "efl.text.title";
}
program {
signal: "efl,buttons,visible,on"; source: "efl";
action: STATE_SET "button_visible" 0.0;
target: "efl.buttons";
}
}
}
group { "efl/anchor_popup";
inherit: "efl/popup";
}
group { "efl/popup/backwall";
group { "efl/popup/backwall"; data.item: "version" "123";
alias: "efl/alert_popup/backwall";
alias: "efl/scroll_alert_popup/backwall";
alias: "efl/text_alert_popup/backwall";
alias: "efl/anchor_popup/backwall";
parts {
rect { "base";
desc { "default";
@ -130,7 +207,7 @@ group { "efl/popup/backwall";
hid;
}
}
swallow { "efl.content";
swallow { "efl.content"; required;
desc { "default";
rel.to: "base";
hid;
@ -150,36 +227,32 @@ group { "efl/popup/backwall";
programs {
program {
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
action: STATE_SET "content_visible" 0.0;
target: "base";
target: "efl.content";
}
program {
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
action: STATE_SET "default" 0.0;
target: "base";
target: "efl.content";
}
program {
signal: "mouse,clicked,1"; source: "block";
action: SIGNAL_EMIT "efl,action,clicked" "efl";
action: SIGNAL_EMIT "efl,action,click" "efl";
}
}
}
group { "efl/alert_popup/button_layout1";
alias: "efl/scroll_alert_popup/button_layout1";
alias: "efl/text_alert_popup/button_layout1";
group { "efl/alert_popup/button_layout1"; data.item: "version" "123";
parts {
swallow { "efl.button1";
swallow { "efl.button1"; required;
}
}
}
group { "efl/alert_popup/button_layout2";
alias: "efl/scroll_alert_popup/button_layout2";
alias: "efl/text_alert_popup/button_layout2";
group { "efl/alert_popup/button_layout2"; data.item: "version" "123";
parts {
spacer { "div1";
desc { "default";
@ -188,13 +261,13 @@ group { "efl/alert_popup/button_layout2";
min: 5 5;
}
}
swallow { "efl.button1";
swallow { "efl.button1"; required;
desc { "default";
rel2.to_x: "div1";
rel2.relative: 0.0 1.0;
}
}
swallow { "efl.button2";
swallow { "efl.button2"; required;
desc { "default";
rel1.to_x: "div1";
rel1.relative: 1.0 0.0;
@ -203,9 +276,7 @@ group { "efl/alert_popup/button_layout2";
}
}
group { "efl/alert_popup/button_layout3";
alias: "efl/scroll_alert_popup/button_layout3";
alias: "efl/text_alert_popup/button_layout3";
group { "efl/alert_popup/button_layout3"; data.item: "version" "123";
parts {
spacer { "div1";
desc { "default";
@ -221,13 +292,13 @@ group { "efl/alert_popup/button_layout3";
min: 5 5;
}
}
swallow { "efl.button1";
swallow { "efl.button1"; required;
desc { "default";
rel2.to_x: "div1";
rel2.relative: 0.0 1.0;
}
}
swallow { "efl.button2";
swallow { "efl.button2"; required;
desc { "default";
rel1.to_x: "div1";
rel2.to_x: "div2";
@ -235,7 +306,7 @@ group { "efl/alert_popup/button_layout3";
rel2.relative: 0.0 1.0;
}
}
swallow { "efl.button3";
swallow { "efl.button3"; required;
desc { "default";
rel1.to_x: "div2";
rel1.relative: 1.0 0.0;
@ -246,45 +317,15 @@ group { "efl/alert_popup/button_layout3";
group { "efl/alert_popup/left_button";
inherit: "efl/button";
alias: "efl/scroll_alert_popup/left_button";
alias: "efl/text_alert_popup/left_button";
data.item: "version" "123";
}
group { "efl/alert_popup/right_button";
inherit: "efl/button";
alias: "efl/scroll_alert_popup/right_button";
alias: "efl/text_alert_popup/right_button";
data.item: "version" "123";
}
group { "efl/alert_popup/button";
inherit: "efl/button";
alias: "efl/scroll_alert_popup/button";
alias: "efl/text_alert_popup/button";
}
group { "efl/scroll_alert_popup/scroller";
inherit: "efl/scroller";
alias: "efl/text_alert_popup/scroller";
parts {
swallow { "efl.content";
desc { "default";
rel1.offset: 0 0;
rel2.offset: 0 0;
}
}
spacer { "inset";
desc { "default";
hid;
}
}
spacer { "shadow";
desc { "default";
hid;
}
}
}
}
group { "efl/text_alert_popup/text";
inherit: "efl/text";
data.item: "version" "123";
}

21
data/elementary/themes/edc/efl/progress.edc
View File

@ -1,4 +1,5 @@
group { "efl/progressbar/horizontal";
data.item: "version" "123";
images.image: "inset_bar_horiz_base.png" COMP;
images.image: "inset_bar_horiz_light.png" COMP;
images.image: "inset_bar_horiz_inside_base.png" COMP;
@ -504,7 +505,7 @@ group { "efl/progressbar/horizontal";
target: "efl.text.status";
}
program { name: "text-visible";
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(slmode);
m |= LABEL; set_int(slmode, m);
@ -512,7 +513,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "text-hidden";
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(slmode);
m &= ~LABEL; set_int(slmode, m);
@ -520,7 +521,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "icon-visible";
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
script {
new m = get_int(slmode);
m |= ICON; set_int(slmode, m);
@ -528,7 +529,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "icon-hidden";
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(slmode);
m &= ~ICON; set_int(slmode, m);
@ -559,6 +560,7 @@ group { "efl/progressbar/horizontal";
}
group { "efl/progressbar/vertical";
data.item: "version" "123";
images.image: "inset_bar_vert_base.png" COMP;
images.image: "inset_bar_vert_light.png" COMP;
images.image: "inset_bar_vert_inside_base.png" COMP;
@ -1077,7 +1079,7 @@ group { "efl/progressbar/vertical";
target: "efl.text.status";
}
program { name: "text-visible";
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(slmode);
m |= LABEL; set_int(slmode, m);
@ -1085,7 +1087,7 @@ group { "efl/progressbar/vertical";
}
}
program { name: "text-hidden";
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(slmode);
m &= ~LABEL; set_int(slmode, m);
@ -1093,7 +1095,7 @@ group { "efl/progressbar/vertical";
}
}
program { name: "icon-visible";
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
script {
new m = get_int(slmode);
m |= ICON; set_int(slmode, m);
@ -1101,7 +1103,7 @@ group { "efl/progressbar/vertical";
}
}
program { name: "icon-hidden";
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(slmode);
m &= ~ICON; set_int(slmode, m);
@ -1132,6 +1134,7 @@ group { "efl/progressbar/vertical";
}
group { "efl/progressbar/horizontal:wheel";
data.item: "version" "123";
alias: "efl/progressbar/vertical:wheel";
images.image: "knob_round_busy.png" COMP;
images.image: "glow_round_corners.png" COMP;
@ -1226,6 +1229,7 @@ group { "efl/progressbar/horizontal:wheel";
group { "efl/progressbar/horizontal:double";
inherit: "efl/progressbar/horizontal";
data.item: "version" "123";
images {
image: "inset_bar_horiz_glow_base_double.png" COMP;
image: "inset_bar_horiz_glow_inv_base_double.png" COMP;
@ -1315,6 +1319,7 @@ group { "efl/progressbar/horizontal:double";
group { "efl/progressbar/vertical:double";
inherit: "efl/progressbar/vertical";
data.item: "version" "123";
images {
image: "inset_bar_vert_glow_base_double.png" COMP;
image: "inset_bar_vert_glow_inv_base_double.png" COMP;

31
data/elementary/themes/edc/efl/radio.edc
View File

@ -1,4 +1,18 @@
/**
Group: efl/radio (@since 1.23)
Part Text: efl.text (required)
Part Swallow: efl.content (required)
Signal: efl,content,set
Signal: efl,content,unset
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,state,selected
Signal: efl,state,unselected
Signal: efl,text,set
Signal: efl,text,unset
*/
group { "efl/radio";
data.item: "version" "123";
images.image: "inset_shadow_circle_tiny.png" COMP;
images.image: "inset_circle_tiny.png" COMP;
images.image: "sym_radio_alum.png" COMP;
@ -222,22 +236,19 @@ group { "efl/radio";
}
}
programs {
EFL_UI_CLICKABLE_PART_BIND(event)
program {
signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "efl,action,radio,toggle" "efl";
}
program {
signal: "efl,state,radio,on"; source: "efl";
signal: "efl,state,selected"; source: "efl";
action: STATE_SET "selected" 0.0;
target: "indicator";
}
program {
signal: "efl,state,radio,off"; source: "efl";
signal: "efl,state,unselected"; source: "efl";
action: STATE_SET "default" 0.0;
target: "indicator";
}
program {
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@ -245,7 +256,7 @@ group { "efl/radio";
}
}
program {
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@ -253,7 +264,7 @@ group { "efl/radio";
}
}
program {
signal: "efl,state,content,set"; source: "efl";
signal: "efl,content,set"; source: "efl";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@ -261,7 +272,7 @@ group { "efl/radio";
}
}
program {
signal: "efl,state,content,unset"; source: "efl";
signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);

296
data/elementary/themes/edc/efl/scroller.edc
View File

@ -1,4 +1,40 @@
/**
Group: efl/scroller (@since 1.23)
Part Rectangle: efl.draggable.horizontal_bar (required)
Part Rectangle: efl.draggable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
Signal: efl,action,scroll
Signal: efl,horizontal_bar,visible,off
Signal: efl,horizontal_bar,visible,on
Signal: efl,vertical_bar,visible,off
Signal: efl,vertical_bar,visible,on
Group: efl/scroller:noclip (@since 1.23)
Part Rectangle: efl.draggable.horizontal_bar (required)
Part Rectangle: efl.draggable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
Signal: efl,action,scroll
Signal: efl,horizontal_bar,visible,off
Signal: efl,horizontal_bar,visible,on
Signal: efl,vertical_bar,visible,off
Signal: efl,vertical_bar,visible,on
Group: efl/scroller:popup/no_inset_shadow (@since 1.23)
Part Rectangle: efl.draggable.horizontal_bar (required)
Part Rectangle: efl.draggable.vertical_bar (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Part Swallow: efl.overlay (required)
Signal: efl,action,scroll
Signal: efl,horizontal_bar,visible,off
Signal: efl,horizontal_bar,visible,on
Signal: efl,vertical_bar,visible,off
Signal: efl,vertical_bar,visible,on
*/
group { name: "efl/scroller";
data.item: "version" "123";
images.image: "inset_shadow.png" COMP;
images.image: "bevel_in.png" COMP;
images.image: "bevel_out.png" COMP;
@ -155,7 +191,7 @@ group { name: "efl/scroller";
rel1.relative: 0.0 1.0;
rel1.to: "sb_vbar_a1";
rel2.relative: 1.0 0.0;
rel2.to: "efl.dragable.vbar";
rel2.to: "efl.draggable.vertical_bar";
fixed: 1 1;
}
}
@ -164,13 +200,13 @@ group { name: "efl/scroller";
description { state: "default" 0.0;
color: 0 0 0 0;
rel1.relative: 0.0 1.0;
rel1.to: "efl.dragable.vbar";
rel1.to: "efl.draggable.vertical_bar";
rel2.relative: 1.0 0.0;
rel2.to: "sb_vbar_a2";
fixed: 1 1;
}
}
part { name: "efl.dragable.vbar"; type: RECT;
part { name: "efl.draggable.vertical_bar"; type: RECT; required;
clip_to: "sb_vbar";
scale: 1;
dragable.x: 0 0 0;
@ -218,8 +254,8 @@ group { name: "efl/scroller";
max: 4 2;
fixed: 1 1;
align: 0.0 0.0;
rel1.to: "efl.dragable.vbar";
rel2.to: "efl.dragable.vbar";
rel1.to: "efl.draggable.vertical_bar";
rel2.to: "efl.draggable.vertical_bar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@ -252,8 +288,8 @@ group { name: "efl/scroller";
max: 4 2;
fixed: 1 1;
align: 0.0 1.0;
rel1.to: "efl.dragable.vbar";
rel2.to: "efl.dragable.vbar";
rel1.to: "efl.draggable.vertical_bar";
rel2.to: "efl.draggable.vertical_bar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@ -300,11 +336,11 @@ group { name: "efl/scroller";
}
}
program {
signal: "efl,action,show,vbar"; source: "efl";
signal: "efl,vertical_bar,visible,on"; source: "efl";
action: STATE_SET "default" 0.0;
target: "sb_vbar";
target: "sb_vbar_show";
target: "efl.dragable.vbar";
target: "efl.draggable.vertical_bar";
target: "sb_vbar_a1";
target: "sb_vbar_a2";
target: "y_vbar_up_mapper";
@ -313,14 +349,13 @@ group { name: "efl/scroller";
target: "y_vbar_down";
target: "arrow1_vbar_indent";
target: "arrow2_vbar_indent";
after: "check_pos_vbar";
}
program {
signal: "efl,action,hide,vbar"; source: "efl";
signal: "efl,vertical_bar,visible,off"; source: "efl";
action: STATE_SET "hidden" 0.0;
target: "sb_vbar";
target: "sb_vbar_show";
target: "efl.dragable.vbar";
target: "efl.draggable.vertical_bar";
target: "sb_vbar_a1";
target: "sb_vbar_a2";
target: "y_vbar_up_mapper";
@ -344,7 +379,7 @@ group { name: "efl/scroller";
}
program { name: "drag_up";
action: DRAG_VAL_STEP 0.0 -1.0;
target: "efl.dragable.vbar";
target: "efl.draggable.vertical_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_vbar_a2";//ok
@ -360,17 +395,17 @@ group { name: "efl/scroller";
}
program { name: "drag_down";
action: DRAG_VAL_STEP 0.0 1.0;
target: "efl.dragable.vbar";
target: "efl.draggable.vertical_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_vbar_p1";
action: DRAG_VAL_PAGE 0.0 -1.0;
target: "efl.dragable.vbar";
target: "efl.draggable.vertical_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_vbar_p2";
action: DRAG_VAL_PAGE 0.0 1.0;
target: "efl.dragable.vbar";
target: "efl.draggable.vertical_bar";
}
program {
signal: "efl,action,scroll"; source: "efl";
@ -378,25 +413,6 @@ group { name: "efl/scroller";
action_on_pos_vbar(10);
}
}
program { name: "check_pos_vbar";
script {
action_on_pos_vbar(10);
}
}
program { name: "loop_set_vbar";
signal: "efl,loop_y,set"; source: "efl";
script {
set_int(loop_y, 1);
action_on_pos_vbar(10);
}
}
program { name: "loop_unset_vbar";
signal: "efl,loop_y,unset"; source: "efl";
script {
set_int(loop_y, 0);
action_on_pos_vbar(10);
}
}
// horiz bar /////////////////////////////////////////////////////////////
part { name: "sb_hbar_show"; type: RECT;
@ -442,7 +458,7 @@ group { name: "efl/scroller";
rel1.relative: 1.0 0.0;
rel1.to: "sb_hbar_a1";
rel2.relative: 0.0 1.0;
rel2.to: "efl.dragable.hbar";
rel2.to: "efl.draggable.horizontal_bar";
fixed: 1 1;
}
}
@ -451,13 +467,13 @@ group { name: "efl/scroller";
description { state: "default" 0.0;
color: 0 0 0 0;
rel1.relative: 1.0 0.0;
rel1.to: "efl.dragable.hbar";
rel1.to: "efl.draggable.horizontal_bar";
rel2.relative: 0.0 1.0;
rel2.to: "sb_hbar_a2";
fixed: 1 1;
}
}
part { name: "efl.dragable.hbar"; type: RECT;
part { name: "efl.draggable.horizontal_bar"; type: RECT; required;
clip_to: "sb_hbar";
scale: 1;
dragable.x: 1 1 0;
@ -505,8 +521,8 @@ group { name: "efl/scroller";
max: 2 4;
fixed: 1 1;
align: 0.0 1.0;
rel1.to: "efl.dragable.hbar";
rel2.to: "efl.dragable.hbar";
rel1.to: "efl.draggable.horizontal_bar";
rel2.to: "efl.draggable.horizontal_bar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@ -539,8 +555,8 @@ group { name: "efl/scroller";
max: 2 4;
fixed: 1 1;
align: 1.0 1.0;
rel1.to: "efl.dragable.hbar";
rel2.to: "efl.dragable.hbar";
rel1.to: "efl.draggable.horizontal_bar";
rel2.to: "efl.draggable.horizontal_bar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@ -587,11 +603,11 @@ group { name: "efl/scroller";
}
}
program {
signal: "efl,action,show,hbar"; source: "efl";
signal: "efl,horizontal_bar,visible,on"; source: "efl";
action: STATE_SET "default" 0.0;
target: "sb_hbar";
target: "sb_hbar_show";
target: "efl.dragable.hbar";
target: "efl.draggable.horizontal_bar";
target: "sb_hbar_a1";
target: "sb_hbar_a2";
target: "x_hbar_left_mapper";
@ -600,14 +616,13 @@ group { name: "efl/scroller";
target: "x_hbar_right";
target: "arrow1_hbar_indent";
target: "arrow2_hbar_indent";
after: "check_pos_hbar";
}
program {
signal: "efl,action,hide,hbar"; source: "efl";
signal: "efl,horizontal_bar,visible,off"; source: "efl";
action: STATE_SET "hidden" 0.0;
target: "sb_hbar";
target: "sb_hbar_show";
target: "efl.dragable.hbar";
target: "efl.draggable.horizontal_bar";
target: "sb_hbar_a1";
target: "sb_hbar_a2";
target: "x_hbar_left_mapper";
@ -631,7 +646,7 @@ group { name: "efl/scroller";
}
program { name: "drag_left";
action: DRAG_VAL_STEP -1.0 0.0;
target: "efl.dragable.hbar";
target: "efl.draggable.horizontal_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_hbar_a2";
@ -647,19 +662,17 @@ group { name: "efl/scroller";
}
program { name: "drag_right";
action: DRAG_VAL_STEP 1.0 0.0;
target: "efl.dragable.hbar";
target: "efl.draggable.horizontal_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_hbar_p1";
action: DRAG_VAL_PAGE -1.0 0.0;
target: "efl.dragable.hbar";
after: "check_pos_hbar";
target: "efl.draggable.horizontal_bar";
}
program {
signal: "mouse,down,1*"; source: "sb_hbar_p2";
action: DRAG_VAL_PAGE 1.0 0.0;
target: "efl.dragable.hbar";
after: "check_pos_hbar";
target: "efl.draggable.horizontal_bar";
}
program {
signal: "efl,action,scroll"; source: "efl";
@ -667,25 +680,6 @@ group { name: "efl/scroller";
action_on_pos_hbar(10);
}
}
program { name: "check_pos_hbar";
script {
action_on_pos_hbar(10);
}
}
program { name: "loop_set_hbar";
signal: "efl,loop_x,set"; source: "efl";
script {
set_int(loop_x, 1);
action_on_pos_hbar(10);
}
}
program { name: "loop_unset_hbar";
signal: "efl,loop_x,unset"; source: "efl";
script {
set_int(loop_x, 0);
action_on_pos_hbar(10);
}
}
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
rel1.to: "efl.background";
@ -701,7 +695,7 @@ group { name: "efl/scroller";
rel2.to: "efl.background";
}
}
part { name: "efl.background"; type: SWALLOW;
part { name: "efl.background"; type: SWALLOW; required;
clip_to: "clipper";
description { state: "default" 0.0;
rel1.offset: 1 1;
@ -711,7 +705,7 @@ group { name: "efl/scroller";
rel2.to_y: "sb_hbar";
}
}
part { name: "efl.content"; type: SWALLOW;
part { name: "efl.content"; type: SWALLOW; required;
clip_to: "clipper";
description { state: "default" 0.0;
rel1.offset: 1 1;
@ -744,7 +738,7 @@ group { name: "efl/scroller";
color: 255 255 255 128;
}
}
part { name: "efl.overlay"; type: SWALLOW;
part { name: "efl.overlay"; type: SWALLOW; required;
clip_to: "clipper";
description { state: "default" 0.0;
rel1.to: "efl.content";
@ -915,9 +909,9 @@ group { name: "efl/scroller";
description { state: "default" 0.0;
fixed: 1 1;
rel1.offset: 2 0;
rel1.to: "efl.dragable.vbar";
rel1.to: "efl.draggable.vertical_bar";
rel2.offset: -3 -1;
rel2.to: "efl.dragable.vbar";
rel2.to: "efl.draggable.vertical_bar";
image.normal: "vgrad_med_lighter.png";
fill.smooth: 0;
min: 3 13;
@ -1076,9 +1070,9 @@ group { name: "efl/scroller";
description { state: "default" 0.0;
fixed: 1 1;
rel1.offset: 0 2;
rel1.to: "efl.dragable.hbar";
rel1.to: "efl.draggable.horizontal_bar";
rel2.offset: -1 -3;
rel2.to: "efl.dragable.hbar";
rel2.to: "efl.draggable.horizontal_bar";
image.normal: "vgrad_med_lighter.png";
fill.smooth: 0;
min: 13 3;
@ -1133,122 +1127,59 @@ group { name: "efl/scroller";
}
programs {
program {
signal: "mouse,down,1*"; source: "efl.dragable.vbar";
signal: "mouse,down,1*"; source: "efl.draggable.vertical_bar";
action: STATE_SET "clicked" 0.0;
target: "efl.dragable.vbar";
target: "efl.draggable.vertical_bar";
target: "shadow_vbar";
target: "glow_vbar";
target: "center_glow_vbar";
}
program {
signal: "mouse,down,*"; source: "efl.dragable.vbar";
action: SIGNAL_EMIT "efl,vbar,press" "efl";
signal: "mouse,down,*"; source: "efl.draggable.vertical_bar";
action: SIGNAL_EMIT "efl,vertical_bar,press" "efl";
}
program {
signal: "mouse,up,1"; source: "efl.dragable.vbar";
signal: "mouse,up,1"; source: "efl.draggable.vertical_bar";
action: STATE_SET "default" 0.0;
target: "efl.dragable.vbar";
target: "efl.draggable.vertical_bar";
target: "shadow_vbar";
target: "glow_vbar";
target: "center_glow_vbar";
}
program {
signal: "mouse,up,*"; source: "efl.dragable.vbar";
signal: "mouse,up,*"; source: "efl.draggable.vertical_bar";
action: SIGNAL_EMIT "efl,vbar,unpress" "efl";
}
program {
signal: "mouse,down,1*"; source: "efl.dragable.hbar";
signal: "mouse,down,1*"; source: "efl.draggable.horizontal_bar";
action: STATE_SET "clicked" 0.0;
target: "efl.dragable.hbar";
target: "efl.draggable.horizontal_bar";
target: "shadow_hbar";
target: "glow_hbar";
target: "center_glow_hbar";
}
program {
signal: "mouse,down,*"; source: "efl.dragable.hbar";
action: SIGNAL_EMIT "efl,hbar,press" "efl";
signal: "mouse,down,*"; source: "efl.draggable.horizontal_bar";
action: SIGNAL_EMIT "efl,horizontal_bar,press" "efl";
}
program {
signal: "mouse,up,1"; source: "efl.dragable.hbar";
signal: "mouse,up,1"; source: "efl.draggable.horizontal_bar";
action: STATE_SET "default" 0.0;
target: "efl.dragable.hbar";
target: "efl.draggable.horizontal_bar";
target: "shadow_hbar";
target: "glow_hbar";
target: "center_glow_hbar";
}
program {
signal: "mouse,up,*"; source: "efl.dragable.hbar";
action: SIGNAL_EMIT "efl,hbar,unpress" "efl";
}
program {
signal: "efl,action,looping,left"; source: "efl";
action: STATE_SET "effect" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
after: "looping,left,done";
}
program { name: "looping,left,done";
action: SIGNAL_EMIT "efl,looping,left,done" "efl";
}
program {
signal: "efl,action,looping,left,end"; source: "efl";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
}
program {
signal: "efl,action,looping,right"; source: "efl";
action: STATE_SET "effect" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
after: "looping,right,done";
}
program { name: "looping,right,done";
action: SIGNAL_EMIT "efl,looping,right,done" "efl";
}
program {
signal: "efl,action,looping,right,end"; source: "efl";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
}
program {
signal: "efl,action,looping,up"; source: "efl";
action: STATE_SET "effect" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
after: "looping,up,done";
}
program { name: "looping,up,done";
action: SIGNAL_EMIT "efl,looping,up,done" "efl";
}
program {
signal: "efl,action,looping,up,end"; source: "efl";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
}
program {
signal: "efl,action,looping,down"; source: "efl";
action: STATE_SET "effect" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
after: "looping,down,done";
}
program { name: "looping,down,done";
action: SIGNAL_EMIT "efl,looping,down,done" "efl";
}
program {
signal: "efl,action,looping,down,end"; source: "efl";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.3;
target: "dim_effect";
signal: "mouse,up,*"; source: "efl.draggable.horizontal_bar";
action: SIGNAL_EMIT "efl,horizontal_bar,unpress" "efl";
}
}
}
group { name: "efl/scroller:noclip";
inherit: "efl/scroller";
data.item: "version" "123";
parts {
part { name: "clipper";
description { state: "default" 0.0;
@ -1281,53 +1212,18 @@ group { name: "efl/scroller:noclip";
}
}
group { name: "efl/scroller/contents";
group { name: "efl/scroller:popup/no_inset_shadow";
inherit: "efl/scroller";
data.item: "version" "123";
parts {
part { name: "efl.content";
type: SWALLOW;
part { name: "inset";
description { state: "default" 0.0;
visible: 0;
}
}
part { name: "efl.content_r";
type: SWALLOW;
part { name: "shadow";
description { state: "default" 0.0;
fixed: 1 1;
rel1 {
relative: 1.0 0.0;
to: "efl.content";
}
rel2 {
relative: 2.0 1.0;
to: "efl.content";
}
}
}
part { name: "efl.content_b";
type: SWALLOW;
description { state: "default" 0.0;
fixed: 1 1;
rel1 {
relative: 0.0 1.0;
to: "efl.content";
}
rel2 {
relative: 1.0 2.0;
to: "efl.content";
}
}
}
part { name: "efl.content_rb";
type: SWALLOW;
description { state: "default" 0.0;
fixed: 1 1;
rel1 {
relative: 1.0 1.0;
to: "efl.content";
}
rel2 {
relative: 2.0 2.0;
to: "efl.content";
}
visible: 0;
}
}
}

182
data/elementary/themes/edc/efl/slider.edc
View File

@ -1,5 +1,21 @@
/**
Group: efl/slider/horizontal (@since 1.23)
Part Rectangle: efl.draggable.slider
Part Swallow: efl.bar
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,state,inverted,off
Signal: efl,state,inverted,on
Group: efl/slider/vertical (@since 1.23)
Part Rectangle: efl.draggable.slider
Part Swallow: efl.bar
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,state,inverted,off
Signal: efl,state,inverted,on
*/
group { "efl/slider/horizontal";
alias: "efl/slider/horizontal:disabled";
data.item: "version" "123";
images.image: "slider_run_base_horiz.png" COMP;
images.image: "slider_run_bevel_horiz.png" COMP;
images.image: "slider_run_base_light_horiz.png" COMP;
@ -89,7 +105,7 @@ group { "efl/slider/horizontal";
rel1.to: "base";
rel2.relative: 0.5 1.0;
rel2.offset: -1 -2;
rel2.to_x: "efl.dragable.slider";
rel2.to_x: "efl.draggable.slider";
rel2.to_y: "base";
image.border: 0 4 0 0;
}
@ -101,7 +117,7 @@ group { "efl/slider/horizontal";
image.normal: "horiz_glow_run_rev.png";
rel1.relative: 0.5 0.0;
rel1.offset: 0 1;
rel1.to_x: "efl.dragable.slider";
rel1.to_x: "efl.draggable.slider";
rel1.to_y: "base";
rel2.offset: -2 -2;
rel2.to: "base";
@ -121,7 +137,7 @@ group { "efl/slider/horizontal";
fill.smooth: 0;
}
}
part { name: "efl.dragable.slider"; type: RECT;
part { name: "efl.draggable.slider"; type: RECT;
nomouse;
scale: 1;
dragable.x: 1 1 0;
@ -146,9 +162,9 @@ group { "efl/slider/horizontal";
min: 12 12;
step: 2 2;
max: 32 32; // XXX allow bigger sizes with more knob images
rel1.to: "efl.dragable.slider";
rel1.to: "efl.draggable.slider";
rel1.offset: -4 -4;
rel2.to: "efl.dragable.slider";
rel2.to: "efl.draggable.slider";
rel2.offset: 3 3;
}
description { state: "clicked" 0.0;
@ -159,21 +175,14 @@ group { "efl/slider/horizontal";
nomouse;
scale: 1;
ignore_flags: ON_HOLD;
dragable.events: "efl.dragable.slider";
dragable.events: "efl.draggable.slider";
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "efl.dragable.slider";
rel2.to: "efl.dragable.slider";
rel1.to: "efl.draggable.slider";
rel2.to: "efl.draggable.slider";
color: 0 0 0 0;
}
}
part { name: "efl.track.slider"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
max: 0 0;
rel1.to: "efl.dragable.slider";
rel2.to: "efl.dragable.slider";
}
}
part { name: "event"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
@ -187,12 +196,12 @@ group { "efl/slider/horizontal";
}
programs {
program {
signal: "mouse,down,1"; source: "efl.dragable.slider";
signal: "mouse,down,1"; source: "efl.draggable.slider";
action: STATE_SET "clicked" 0.0;
target: "knob";
}
program {
signal: "mouse,up,1"; source: "efl.dragable.slider";
signal: "mouse,up,1"; source: "efl.draggable.slider";
action: STATE_SET "default" 0.0;
target: "knob";
}
@ -235,7 +244,7 @@ group { "efl/slider/horizontal";
}
group { "efl/slider/vertical";
alias: "efl/slider/vertical:disabled";
data.item: "version" "123";
images.image: "slider_run_base_vert.png" COMP;
images.image: "slider_run_bevel_vert.png" COMP;
images.image: "slider_run_base_light_vert.png" COMP;
@ -323,7 +332,7 @@ group { "efl/slider/vertical";
image.normal: "vert_glow_run.png";
rel1.relative: 0.0 0.5;
rel1.offset: 1 0;
rel1.to_y: "efl.dragable.slider";
rel1.to_y: "efl.draggable.slider";
rel1.to_x: "base";
rel2.offset: -2 -2;
rel2.to: "base";
@ -339,7 +348,7 @@ group { "efl/slider/vertical";
rel1.to: "base";
rel2.relative: 1.0 0.5;
rel2.offset: -2 -1;
rel2.to_y: "efl.dragable.slider";
rel2.to_y: "efl.draggable.slider";
rel2.to_x: "base";
image.border: 0 0 0 4;
}
@ -357,7 +366,7 @@ group { "efl/slider/vertical";
fill.smooth: 0;
}
}
part { name: "efl.dragable.slider"; type: RECT;
part { name: "efl.draggable.slider"; type: RECT;
nomouse;
scale: 1;
dragable.x: 0 0 0;
@ -382,9 +391,9 @@ group { "efl/slider/vertical";
min: 12 12;
step: 2 2;
max: 32 32; // XXX allow bigger sizes with more knob images
rel1.to: "efl.dragable.slider";
rel1.to: "efl.draggable.slider";
rel1.offset: -4 -4;
rel2.to: "efl.dragable.slider";
rel2.to: "efl.draggable.slider";
rel2.offset: 3 3;
}
description { state: "clicked" 0.0;
@ -395,21 +404,14 @@ group { "efl/slider/vertical";
nomouse;
scale: 1;
ignore_flags: ON_HOLD;
dragable.events: "efl.dragable.slider";
dragable.events: "efl.draggable.slider";
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "efl.dragable.slider";
rel2.to: "efl.dragable.slider";
rel1.to: "efl.draggable.slider";
rel2.to: "efl.draggable.slider";
color: 0 0 0 0;
}
}
part { name: "efl.track.slider"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
max: 0 0;
rel1.to: "efl.dragable.slider";
rel2.to: "efl.dragable.slider";
}
}
part { name: "event"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
@ -423,12 +425,12 @@ group { "efl/slider/vertical";
}
programs {
program {
signal: "mouse,down,1"; source: "efl.dragable.slider";
signal: "mouse,down,1"; source: "efl.draggable.slider";
action: STATE_SET "clicked" 0.0;
target: "knob";
}
program {
signal: "mouse,up,1"; source: "efl.dragable.slider";
signal: "mouse,up,1"; source: "efl.draggable.slider";
action: STATE_SET "default" 0.0;
target: "knob";
}
@ -473,7 +475,7 @@ group { "efl/slider/vertical";
//Range
group { "efl/slider_interval/horizontal";
alias: "efl/slider/horizontal:disabled";
data.item: "version" "123";
images.image: "slider_run_base_horiz.png" COMP;
images.image: "slider_run_bevel_horiz.png" COMP;
images.image: "slider_run_base_light_horiz.png" COMP;
@ -566,11 +568,11 @@ group { "efl/slider_interval/horizontal";
image.normal: "horiz_glow_range.png";
rel1.relative: 0.5 1.0;
rel1.offset: -1 -2;
rel1.to_x: "efl.dragable.slider";
rel1.to_x: "efl.draggable.slider";
rel1.to_y: "base";
rel2.relative: 0.5 1.0;
rel2.offset: -1 -2;
rel2.to_x: "efl.dragable2.slider";
rel2.to_x: "efl.draggable2.slider";
rel2.to_y: "base";
fixed: 0 1;
image.border: 0 4 0 0;
@ -581,8 +583,8 @@ group { "efl/slider_interval/horizontal";
}
description { state: "range_reverse" 0.0;
inherit: "default" 0.0;
rel1.to_x: "efl.dragable2.slider";
rel2.to_x: "efl.dragable.slider";
rel1.to_x: "efl.draggable2.slider";
rel2.to_x: "efl.draggable.slider";
}
description { state: "disabled_range_reverse" 0.0;
inherit: "range_reverse" 0.0;
@ -598,7 +600,7 @@ group { "efl/slider_interval/horizontal";
fill.smooth: 0;
}
}
part { name: "efl.dragable.slider"; type: RECT;
part { name: "efl.draggable.slider"; type: RECT;
nomouse;
scale: 1;
dragable.x: 1 1 0;
@ -623,9 +625,9 @@ group { "efl/slider_interval/horizontal";
min: 12 12;
step: 2 2;
max: 32 32; // XXX allow bigger sizes with more knob images
rel1.to: "efl.dragable.slider";
rel1.to: "efl.draggable.slider";
rel1.offset: -4 -4;
rel2.to: "efl.dragable.slider";
rel2.to: "efl.draggable.slider";
rel2.offset: 3 3;
}
description { state: "clicked" 0.0;
@ -636,22 +638,15 @@ group { "efl/slider_interval/horizontal";
nomouse;
scale: 1;
ignore_flags: ON_HOLD;
dragable.events: "efl.dragable.slider";
dragable.events: "efl.draggable.slider";
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "efl.dragable.slider";
rel2.to: "efl.dragable.slider";
rel1.to: "efl.draggable.slider";
rel2.to: "efl.draggable.slider";
color: 0 0 0 0;
}
}
part { name: "efl.track.slider"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
max: 0 0;
rel1.to: "efl.dragable.slider";
rel2.to: "efl.dragable.slider";
}
}
part { name: "efl.dragable2.slider"; type: RECT;
part { name: "efl.draggable2.slider"; type: RECT;
nomouse;
scale: 1;
dragable.x: 1 1 0;
@ -676,9 +671,9 @@ group { "efl/slider_interval/horizontal";
min: 12 12;
step: 2 2;
max: 32 32; // XXX allow bigger sizes with more knob images
rel1.to: "efl.dragable2.slider";
rel1.to: "efl.draggable2.slider";
rel1.offset: -4 -4;
rel2.to: "efl.dragable2.slider";
rel2.to: "efl.draggable2.slider";
rel2.offset: 3 3;
}
description { state: "clicked" 0.0;
@ -689,21 +684,14 @@ group { "efl/slider_interval/horizontal";
nomouse;
scale: 1;
ignore_flags: ON_HOLD;
dragable.events: "efl.dragable2.slider";
dragable.events: "efl.draggable2.slider";
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "efl.dragable2.slider";
rel2.to: "efl.dragable2.slider";
rel1.to: "efl.draggable2.slider";
rel2.to: "efl.draggable2.slider";
color: 0 0 0 0;
}
}
part { name: "efl.track2.slider"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
max: 0 0;
rel1.to: "efl.dragable2.slider";
rel2.to: "efl.dragable2.slider";
}
}
part { name: "event"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
@ -717,18 +705,18 @@ group { "efl/slider_interval/horizontal";
}
programs {
program {
signal: "mouse,down,1"; source: "efl.dragable.slider";
signal: "mouse,down,1"; source: "efl.draggable.slider";
action: STATE_SET "clicked" 0.0;
target: "knob";
}
program {
signal: "mouse,up,1"; source: "efl.dragable.slider";
signal: "mouse,up,1"; source: "efl.draggable.slider";
action: STATE_SET "default" 0.0;
target: "knob";
}
program {
signal: "drag";
source: "efl.dragable*";
source: "efl.draggable*";
script {
update_glow();
}
@ -755,7 +743,7 @@ group { "efl/slider_interval/horizontal";
}
group { "efl/slider_interval/vertical";
alias: "efl/slider/vertical:disabled";
data.item: "version" "123";
images.image: "slider_run_base_vert.png" COMP;
images.image: "slider_run_bevel_vert.png" COMP;
images.image: "slider_run_base_light_vert.png" COMP;
@ -849,11 +837,11 @@ group { "efl/slider_interval/vertical";
rel1.relative: 0.5 1.0;
rel1.offset: -1 -2;
rel1.to_x: "base";
rel1.to_y: "efl.dragable.slider";
rel1.to_y: "efl.draggable.slider";
rel2.relative: 0.5 1.0;
rel2.offset: -1 -2;
rel2.to_x: "base";
rel2.to_y: "efl.dragable2.slider";
rel2.to_y: "efl.draggable2.slider";
fixed: 1 0;
image.border: 0 4 0 0;
}
@ -863,8 +851,8 @@ group { "efl/slider_interval/vertical";
}
description { state: "range_reverse" 0.0;
inherit: "default" 0.0;
rel1.to_y: "efl.dragable2.slider";
rel2.to_y: "efl.dragable.slider";
rel1.to_y: "efl.draggable2.slider";
rel2.to_y: "efl.draggable.slider";
}
description { state: "disabled_range_reverse" 0.0;
inherit: "range_reverse" 0.0;
@ -880,7 +868,7 @@ group { "efl/slider_interval/vertical";
fill.smooth: 0;
}
}
part { name: "efl.dragable.slider"; type: RECT;
part { name: "efl.draggable.slider"; type: RECT;
nomouse;
scale: 1;
dragable.x: 0 0 0;
@ -905,9 +893,9 @@ group { "efl/slider_interval/vertical";
min: 12 12;
step: 2 2;
max: 32 32; // XXX allow bigger sizes with more knob images
rel1.to: "efl.dragable.slider";
rel1.to: "efl.draggable.slider";
rel1.offset: -4 -4;
rel2.to: "efl.dragable.slider";
rel2.to: "efl.draggable.slider";
rel2.offset: 3 3;
}
description { state: "clicked" 0.0;
@ -918,22 +906,15 @@ group { "efl/slider_interval/vertical";
nomouse;
scale: 1;
ignore_flags: ON_HOLD;
dragable.events: "efl.dragable.slider";
dragable.events: "efl.draggable.slider";
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "efl.dragable.slider";
rel2.to: "efl.dragable.slider";
rel1.to: "efl.draggable.slider";
rel2.to: "efl.draggable.slider";
color: 0 0 0 0;
}
}
part { name: "efl.track.slider"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
max: 0 0;
rel1.to: "efl.dragable.slider";
rel2.to: "efl.dragable.slider";
}
}
part { name: "efl.dragable2.slider"; type: RECT;
part { name: "efl.draggable2.slider"; type: RECT;
nomouse;
scale: 1;
dragable.x: 0 0 0;
@ -958,9 +939,9 @@ group { "efl/slider_interval/vertical";
min: 12 12;
step: 2 2;
max: 32 32; // XXX allow bigger sizes with more knob images
rel1.to: "efl.dragable2.slider";
rel1.to: "efl.draggable2.slider";
rel1.offset: -4 -4;
rel2.to: "efl.dragable2.slider";
rel2.to: "efl.draggable2.slider";
rel2.offset: 3 3;
}
description { state: "clicked" 0.0;
@ -971,21 +952,14 @@ group { "efl/slider_interval/vertical";
nomouse;
scale: 1;
ignore_flags: ON_HOLD;
dragable.events: "efl.dragable2.slider";
dragable.events: "efl.draggable2.slider";
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "efl.dragable2.slider";
rel2.to: "efl.dragable2.slider";
rel1.to: "efl.draggable2.slider";
rel2.to: "efl.draggable2.slider";
color: 0 0 0 0;
}
}
part { name: "efl.track2.slider"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
max: 0 0;
rel1.to: "efl.dragable2.slider";
rel2.to: "efl.dragable2.slider";
}
}
part { name: "event"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
@ -999,18 +973,18 @@ group { "efl/slider_interval/vertical";
}
programs {
program {
signal: "mouse,down,1"; source: "efl.dragable.slider";
signal: "mouse,down,1"; source: "efl.draggable.slider";
action: STATE_SET "clicked" 0.0;
target: "knob";
}
program {
signal: "mouse,up,1"; source: "efl.dragable.slider";
signal: "mouse,up,1"; source: "efl.draggable.slider";
action: STATE_SET "default" 0.0;
target: "knob";
}
program {
signal: "drag";
source: "efl.dragable*";
source: "efl.draggable*";
script {
update_glow();
}

1
data/elementary/themes/edc/efl/spin.edc
View File

@ -1,4 +1,5 @@
group { "efl/spin";
data.item: "version" "123";
parts {
rect { "bg";
scale;

116
data/elementary/themes/edc/efl/spin_button.edc
View File

@ -1,4 +1,75 @@
/**
Group: efl/spin_button/vertical (@since 1.23)
Part Swallow: efl.dec_button (required)
Part Swallow: efl.entry (required)
Part Swallow: efl.inc_button (required)
Part Swallow: efl.text_button (required)
Signal: efl,button,visible,off
Signal: efl,button,visible,on
Signal: efl,entry,visible,off
Signal: efl,entry,visible,on
Signal: efl,state,access,active
Signal: efl,state,access,inactive
Signal: efl,state,disabled
Signal: efl,state,enabled
Group: efl/spin_button/horizontal/dec_button (@since 1.23)
Signal: efl,action,multi,down
Signal: efl,action,multi,up
Signal: efl,action,pressed
Signal: efl,action,unpressed
Signal: efl,state,animation,activated
Signal: efl,state,disabled
Signal: efl,state,enabled
Group: efl/spin_button/horizontal (@since 1.23)
Part Swallow: efl.dec_button (required)
Part Swallow: efl.entry (required)
Part Swallow: efl.inc_button (required)
Part Swallow: efl.text_button (required)
Signal: efl,button,visible,off
Signal: efl,button,visible,on
Signal: efl,entry,visible,off
Signal: efl,entry,visible,on
Signal: efl,state,access,active
Signal: efl,state,access,inactive
Signal: efl,state,disabled
Signal: efl,state,enabled
Group: efl/spin_button/vertical/text_button (@since 1.23)
Part Text: efl.text
Signal: efl,state,disabled
Signal: efl,state,enabled
Group: efl/spin (@since 1.23)
Part Text: efl.text
Group: efl/spin_button/horizontal/inc_button (@since 1.23)
Signal: efl,action,multi,down
Signal: efl,action,multi,up
Signal: efl,action,pressed
Signal: efl,action,unpressed
Signal: efl,state,animation,activated
Signal: efl,state,disabled
Signal: efl,state,enabled
Group: efl/spin_button/horizontal/text_button (@since 1.23)
Part Text: efl.text
Signal: efl,state,disabled
Signal: efl,state,enabled
Group: efl/spin_button/vertical/dec_button (@since 1.23)
Signal: efl,action,multi,down
Signal: efl,action,multi,up
Signal: efl,action,pressed
Signal: efl,action,unpressed
Signal: efl,state,animation,activated
Signal: efl,state,disabled
Signal: efl,state,enabled
Group: efl/spin_button/vertical/inc_button (@since 1.23)
Signal: efl,action,multi,down
Signal: efl,action,multi,up
Signal: efl,action,pressed
Signal: efl,action,unpressed
Signal: efl,state,animation,activated
Signal: efl,state,disabled
Signal: efl,state,enabled
*/
group { "efl/spin_button/horizontal";
data.item: "version" "123";
images.image: "vert_bar_inset.png" COMP;
parts {
rect { "clip";
@ -36,7 +107,7 @@ group { "efl/spin_button/horizontal";
vis;
}
}
swallow { "efl.entry";
swallow { "efl.entry"; required;
clip: "clip";
desc { "default";
fixed: 1 1;
@ -49,7 +120,7 @@ group { "efl/spin_button/horizontal";
vis;
}
}
swallow { "efl.dec_button";
swallow { "efl.dec_button"; required;
scale;
desc { "default";
fixed: 1 0;
@ -58,7 +129,7 @@ group { "efl/spin_button/horizontal";
aspect: 1.0 1.0; aspect_preference: VERTICAL;
}
}
swallow { "efl.inc_button";
swallow { "efl.inc_button"; required;
scale;
desc { "default";
fixed: 1 0;
@ -67,7 +138,7 @@ group { "efl/spin_button/horizontal";
aspect: 1.0 1.0; aspect_preference: VERTICAL;
}
}
swallow { "efl.text_button";
swallow { "efl.text_button"; required;
scale;
desc { "default";
vis;
@ -100,25 +171,25 @@ group { "efl/spin_button/horizontal";
}
programs {
program { "entry_active";
signal: "efl,state,entry,active";
signal: "efl,entry,visible,on";
source: "efl";
action: STATE_SET "active";
target: "efl.entry";
}
program { "entry_inactive";
signal: "efl,state,entry,inactive";
signal: "efl,entry,visible,off";
source: "efl";
action: STATE_SET "default";
target: "efl.entry";
}
program { "text_button_active";
signal: "efl,state,button,active";
signal: "efl,button,visible,on";
source: "efl";
action: STATE_SET "default";
target: "efl.text_button";
}
program { "text_button_inactive";
signal: "efl,state,button,inactive";
signal: "efl,button,visible,off";
source: "efl";
action: STATE_SET "inactive";
target: "efl.text_button";
@ -152,13 +223,14 @@ group { "efl/spin_button/horizontal";
group { "efl/spin_button/vertical";
inherit: "efl/spin_button/horizontal";
data.item: "version" "123";
parts {
image { "inset"; nomouse;
desc { "default";
min: 40 150;
}
}
swallow { "efl.inc_button";
swallow { "efl.inc_button"; required;
scale;
desc { "default";
rel.to: "inset";
@ -168,7 +240,7 @@ group { "efl/spin_button/vertical";
fixed: 1 1;
}
}
swallow { "efl.dec_button";
swallow { "efl.dec_button"; required;
scale;
desc { "default";
rel.to: "inset";
@ -178,7 +250,7 @@ group { "efl/spin_button/vertical";
fixed: 1 1;
}
}
swallow { "efl.text_button";
swallow { "efl.text_button"; required;
scale;
desc { "default";
rel.to_x: "inset";
@ -202,7 +274,8 @@ group { "efl/spin_button/vertical";
}
}
group { "efl/spin_button/inc_button";
group { "efl/spin_button/horizontal/inc_button";
data.item: "version" "123";
images.image: "sym_right_light_normal.png" COMP;
images.image: "sym_right_glow_normal.png" COMP;
images.image: "sym_right_dark_normal.png" COMP;
@ -308,7 +381,7 @@ group { "efl/spin_button/inc_button";
action: SIGNAL_EMIT "efl,action,click" "";
}
program { name: "access_pressed";
signal: "efl,action,anim,activate";
signal: "efl,state,animation,activated";
source: "efl";
action: STATE_SET "pressed" 0.0;
target: "arrow.image";
@ -352,13 +425,15 @@ group { "efl/spin_button/inc_button";
}
}
group { "efl/spin_button/entry";
group { "efl/spin_button/horizontal/entry";
alias: "efl/spin_button/vertical/entry";
inherit: "efl/text";
data.item: "version" "123";
}
group { "efl/spin_button/dec_button";
inherit: "efl/spin_button/inc_button";
group { "efl/spin_button/horizontal/dec_button";
inherit: "efl/spin_button/horizontal/inc_button";
data.item: "version" "123";
images.image: "sym_left_light_normal.png" COMP;
images.image: "sym_left_glow_normal.png" COMP;
images.image: "sym_left_dark_normal.png" COMP;
@ -382,8 +457,9 @@ group { "efl/spin_button/dec_button";
}
}
group { "efl/spin_button/text_button";
group { "efl/spin_button/horizontal/text_button";
alias: "efl/spin_button/vertical/text_button";
data.item: "version" "123";
parts {
part { name: "bg";
type: SPACER;
@ -460,7 +536,8 @@ group { "efl/spin_button/text_button";
}
group { "efl/spin_button/vertical/inc_button";
inherit: "efl/spin_button/inc_button";
inherit: "efl/spin_button/horizontal/inc_button";
data.item: "version" "123";
images.image: "sym_up_light_normal.png" COMP;
images.image: "sym_up_glow_normal.png" COMP;
images.image: "sym_up_dark_normal.png" COMP;
@ -485,7 +562,8 @@ group { "efl/spin_button/vertical/inc_button";
}
group { "efl/spin_button/vertical/dec_button";
inherit: "efl/spin_button/dec_button";
inherit: "efl/spin_button/horizontal/dec_button";
data.item: "version" "123";
images.image: "sym_down_light_normal.png" COMP;
images.image: "sym_down_glow_normal.png" COMP;
images.image: "sym_down_dark_normal.png" COMP;

29
data/elementary/themes/edc/efl/pager.edc → data/elementary/themes/edc/efl/spotlight.edc
View File

@ -1,20 +1,5 @@
group { "efl/pager";
group { "efl/spotlight"; data.item: "version" "123";
parts {
spacer { "base";
scale;
desc { "default";
}
}
swallow { "efl.background";
scale;
desc { "default";
}
}
swallow { "efl.page_root";
scale;
desc { "default";
}
}
swallow { "efl.indicator";
scale;
desc { "default";
@ -23,16 +8,22 @@ group { "efl/pager";
min: 0 50;
}
}
swallow { "efl.event";
}
}
group { "efl/spotlight/indicator_holder"; data.item: "version" "123";
parts {
swallow { "efl.indicator";
scale;
repeat_events: 1;
desc { "default";
rel2.relative: 1.0 0.0;
align: 0.5 0.0;
min: 0 50;
}
}
}
}
group { "efl/pager/indicator";
group { "efl/spotlight/indicator"; data.item: "version" "123";
images {
image: "ring_white_middle.png" COMP;
}

40
data/elementary/themes/edc/efl/tab_bar.edc
View File

@ -1,4 +1,5 @@
group { "efl/tab_bar";
data.item: "version" "123";
images.image: "vgrad_med_lighter.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "shine.png" COMP;
@ -60,6 +61,7 @@ group { "efl/tab_bar";
}
group { "efl/tab_bar/tab";
data.item: "version" "123";
images.image: "shadow_inset_bevels.png" COMP;
images.image: "shadow_angled_in_sides.png" COMP;
images.image: "horizontal_separated_bar_small_glow.png" COMP;
@ -70,7 +72,7 @@ group { "efl/tab_bar/tab";
#define LABEL 2
#define MASK 3
#define DISABLE 4
script {
script {
public btmode;
public eval_mode(m) {
new m1 = m & MASK;
@ -216,10 +218,10 @@ group { "efl/tab_bar/tab";
desc { "default";
align: 0.5 0.5;
rel1.relative: 0.0 0.0;
rel1.offset: 2 2;
rel1.offset: 5 5;
rel2.to_y: "efl.text";
rel2.relative: 1.0 0.0;
rel2.offset: -3 -1;
rel2.offset: -6 -4;
}
desc { "noicon";
inherit: "default" 0.0;
@ -417,20 +419,30 @@ group { "efl/tab_bar/tab";
}
}
rect { "event";
ignore_flags: ON_HOLD;
desc { "default";
color: 0 0 0 0;
}
}
swallow { "efl.extra";
desc { "default";
fixed: 1 1;
align: 1.0 0.0;
rel1.relative: 1.0 0.0;
rel1.offset: -3 2;
rel2.relative: 1.0 0.0;
rel2.offset: -3 2;
}
}
programs {
EFL_UI_CLICKABLE_PART_BIND(event)
program {
signal: "efl,orient,horizontal"; source: "efl";
signal: "efl,state,horizontal"; source: "efl";
action: STATE_SET "default" 0.0;
target: "base";
target: "bend_clip";
}
program {
signal: "efl,orient,vertical"; source: "efl";
signal: "efl,state,vertical"; source: "efl";
action: STATE_SET "vert" 0.0;
target: "base";
target: "bend_clip";
@ -461,10 +473,6 @@ group { "efl/tab_bar/tab";
target: "bar";
target: "bend";
}
program {
signal: "mouse,up,1"; source: "event";
action: SIGNAL_EMIT "efl,action,click" "efl";
}
program {
signal: "efl,highlight,on"; source: "efl";
action: STATE_SET "selected" 0.0;
@ -475,16 +483,8 @@ group { "efl/tab_bar/tab";
action: STATE_SET "default" 0.0;
target: "highlight";
}
program {
signal: "mouse,in"; source: "event";
action: SIGNAL_EMIT "efl,mouse,in" "efl";
}
program { name: "mouse,out";
signal: "mouse,out"; source: "event";
action: SIGNAL_EMIT "efl,mouse,out" "efl";
}
program { name: "st1";
signal: "efl,state,text,unset"; source: "efl";
signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@ -492,7 +492,7 @@ group { "efl/tab_bar/tab";
}
}
program { name: "st2";
signal: "efl,state,text,set"; source: "efl";
signal: "efl,text,set"; source: "efl";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);

1
data/elementary/themes/edc/efl/tab_page.edc
View File

@ -1,4 +1,5 @@
group { "efl/tab_page";
data.item: "version" "123";
parts {
spacer { "base";
scale;

7
data/elementary/themes/edc/efl/tab_pager.edc
View File

@ -1,11 +1,12 @@
group { "efl/tab_pager";
data.item: "version" "123";
parts {
spacer { "base";
scale;
desc { "default";
}
}
swallow { "efl.tab_root";
swallow { "efl.tab_root"; required;
scale;
desc { "default";
rel.to: "base";
@ -15,7 +16,7 @@ group { "efl/tab_pager";
fixed: 0 1;
}
}
swallow { "efl.page_root";
swallow { "efl.page_root"; required;
scale;
desc { "default";
rel1.to: "efl.tab_root";
@ -23,7 +24,7 @@ group { "efl/tab_pager";
rel1.relative: 0 1;
}
}
swallow { "efl.event";
swallow { "efl.event"; required;
scale;
repeat_events: 1;
desc { "default";

4
data/elementary/themes/edc/efl/tags.edc
View File

@ -1,4 +1,5 @@
group { "efl/tags";
data.item: "version" "123";
data.item: "horizontal_pad" 0;
data.item: "vertical_pad" 0;
data.item: "closed_height" 0;
@ -24,6 +25,7 @@ group { "efl/tags";
}
group { "efl/tags/label";
data.item: "version" "123";
parts {
text { "efl.text";
nomouse;
@ -46,6 +48,7 @@ group { "efl/tags/label";
}
group { "efl/tags/btn";
data.item: "version" "123";
images.image: "button_normal.png" COMP;
images.image: "button_clicked.png" COMP;
images.image: "sym_close_dark_normal.png" COMP;
@ -289,6 +292,7 @@ group { "efl/tags/btn";
}
group { "efl/tags/number";
data.item: "version" "123";
parts {
text { "efl.text";
nomouse;

110
data/elementary/themes/edc/efl/text.edc
View File

@ -1,5 +1,6 @@
group { "efl/text/scroller";
inherit: "efl/scroller";
data.item: "version" "123";
image: "bg_glow_in.png" COMP;
parts {
part { name: "bg";
@ -80,7 +81,7 @@ group { "efl/text/scroller";
rel1.to: "efl.icon";
rel1.relative: 1.0 0.0;
rel1.offset: 0 0;
rel2.to: "efl.end";
rel2.to: "efl.extra";
rel2.relative: 0.0 1.0;
rel2.offset: -1 -1;
}
@ -113,7 +114,7 @@ group { "efl/text/scroller";
action: STATE_SET "default" 0.0;
target: "efl.icon";
}
part { name: "efl.end"; type: SWALLOW;
part { name: "efl.extra"; type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
fixed: 1 1;
@ -134,17 +135,18 @@ group { "efl/text/scroller";
program {
signal: "efl,action,show,end"; source: "efl";
action: STATE_SET "visible" 0.0;
target: "efl.end";
target: "efl.extra";
}
program {
signal: "efl,action,hide,end"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.end";
target: "efl.extra";
}
}
}
group { "efl/text/single/scroller";
data.item: "version" "123";
images.image: "bevel_in.png" COMP;
images.image: "inset_shadow.png" COMP;
image: "bg_glow_in.png" COMP;
@ -171,7 +173,7 @@ group { "efl/text/single/scroller";
visible: 0;
}
}
part { name: "efl.dragable.vbar"; type: RECT;
part { name: "efl.draggable.vertical_bar"; type: RECT;
dragable.x: 0 0 0;
dragable.y: 1 1 0;
dragable.confine: "sb_vbar_base";
@ -191,7 +193,7 @@ group { "efl/text/single/scroller";
visible: 0;
}
}
part { name: "efl.dragable.hbar"; type: RECT;
part { name: "efl.draggable.horizontal_bar"; type: RECT;
dragable.x: 1 1 0;
dragable.y: 0 0 0;
dragable.confine: "sb_hbar_base";
@ -230,7 +232,7 @@ group { "efl/text/single/scroller";
description { state: "default" 0.0;
rel1.to: "efl.icon";
rel1.relative: 1.0 0.0;
rel2.to: "efl.end";
rel2.to: "efl.extra";
rel2.relative: 0.0 1.0;
}
}
@ -260,7 +262,7 @@ group { "efl/text/single/scroller";
action: STATE_SET "default" 0.0;
target: "efl.icon";
}
part { name: "efl.end"; type: SWALLOW;
part { name: "efl.extra"; type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
fixed: 1 1;
@ -279,12 +281,12 @@ group { "efl/text/single/scroller";
program {
signal: "efl,action,show,end"; source: "efl";
action: STATE_SET "visible" 0.0;
target: "efl.end";
target: "efl.extra";
}
program {
signal: "efl,action,hide,end"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.end";
target: "efl.extra";
}
part { name: "inset"; mouse_events: 0;
description { state: "default" 0.0;
@ -377,6 +379,7 @@ group { "efl/text/single/scroller";
}
group { "efl/text/cursor";
data.item: "version" "123";
min: 1 0;
images.image: "white_bar_vert_glow.png" COMP;
parts {
@ -479,6 +482,7 @@ group { "efl/text/cursor";
}
group { "efl/text/selection";
data.item: "version" "123";
parts {
part { name: "base"; type: RECT;
description { state: "default" 0.0;
@ -489,6 +493,7 @@ group { "efl/text/selection";
}
group { "efl/text/anchor";
data.item: "version" "123";
images.image: "horizontal_separated_bar_small_glow.png" COMP;
parts {
part { name: "bar";
@ -506,10 +511,12 @@ group { "efl/text/anchor";
}
group { "efl/text";
data.item: "version" "123";
data {
item: "font.name" "Sans";
item: "font.size" "10";
item: "style.color" "#fff";
item: "style.color_disabled" "#151515";
item: "guide.font.name" "Sans";
item: "guide.font.size" "10";
@ -624,6 +631,7 @@ group { "efl/text";
}
group { "efl/text/magnifier";
data.item: "version" "123";
images.image: "frame_rounded.png" COMP;
parts {
part { name: "bg"; type: RECT; mouse_events: 0;
@ -686,6 +694,7 @@ group { "efl/text/magnifier";
}
group { "efl/text/handler/start";
data.item: "version" "123";
images.image: "handle_pick_up_left.png" COMP;
parts {
part { name: "base"; mouse_events: 0;
@ -734,6 +743,7 @@ group { "efl/text/handler/start";
}
group { "efl/text/handler/end";
data.item: "version" "123";
images.image: "handle_pick_up_right.png" COMP;
parts {
part { name: "base"; mouse_events: 0;
@ -787,124 +797,124 @@ group { "efl/text/handler/end";
// Tanya - Latvia
// http://lazycrazy.deviantart.com/
// http://lazycrazy.deviantart.com/art/Very-Emotional-Emoticons-144461621
group { "efl/text/emoticon/angry"; images.image:
group { "efl/text/emoticon/angry"; data.item: "version" "123"; images.image:
"emo-angry.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-angry.png"; } } } }
group { "efl/text/emoticon/angry-shout"; images.image:
group { "efl/text/emoticon/angry-shout"; data.item: "version" "123"; images.image:
"emo-angry-shout.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-angry-shout.png"; } } } }
group { "efl/text/emoticon/crazy-laugh"; images.image:
group { "efl/text/emoticon/crazy-laugh"; data.item: "version" "123"; images.image:
"emo-crazy-laugh.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-crazy-laugh.png"; } } } }
group { "efl/text/emoticon/evil-laugh"; images.image:
group { "efl/text/emoticon/evil-laugh"; data.item: "version" "123"; images.image:
"emo-evil-laugh.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-evil-laugh.png"; } } } }
group { "efl/text/emoticon/evil"; images.image:
group { "efl/text/emoticon/evil"; data.item: "version" "123"; images.image:
"emo-evil.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-evil.png"; } } } }
group { "efl/text/emoticon/goggle-smile"; images.image:
group { "efl/text/emoticon/goggle-smile"; data.item: "version" "123"; images.image:
"emo-goggle-smile.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-goggle-smile.png"; } } } }
group { "efl/text/emoticon/grumpy"; images.image:
group { "efl/text/emoticon/grumpy"; data.item: "version" "123"; images.image:
"emo-grumpy.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-grumpy.png"; } } } }
group { "efl/text/emoticon/grumpy-smile"; images.image:
group { "efl/text/emoticon/grumpy-smile"; data.item: "version" "123"; images.image:
"emo-grumpy-smile.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-grumpy-smile.png"; } } } }
group { "efl/text/emoticon/guilty"; images.image:
group { "efl/text/emoticon/guilty"; data.item: "version" "123"; images.image:
"emo-guilty.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-guilty.png"; } } } }
group { "efl/text/emoticon/guilty-smile"; images.image:
group { "efl/text/emoticon/guilty-smile"; data.item: "version" "123"; images.image:
"emo-guilty-smile.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-guilty-smile.png"; } } } }
group { "efl/text/emoticon/haha"; images.image:
group { "efl/text/emoticon/haha"; data.item: "version" "123"; images.image:
"emo-haha.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-haha.png"; } } } }
group { "efl/text/emoticon/half-smile"; images.image:
group { "efl/text/emoticon/half-smile"; data.item: "version" "123"; images.image:
"emo-half-smile.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-half-smile.png"; } } } }
group { "efl/text/emoticon/happy-panting"; images.image:
group { "efl/text/emoticon/happy-panting"; data.item: "version" "123"; images.image:
"emo-happy-panting.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-happy-panting.png"; } } } }
group { "efl/text/emoticon/happy"; images.image:
group { "efl/text/emoticon/happy"; data.item: "version" "123"; images.image:
"emo-happy.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-happy.png"; } } } }
group { "efl/text/emoticon/indifferent"; images.image:
group { "efl/text/emoticon/indifferent"; data.item: "version" "123"; images.image:
"emo-indifferent.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-indifferent.png"; } } } }
group { "efl/text/emoticon/kiss"; images.image:
group { "efl/text/emoticon/kiss"; data.item: "version" "123"; images.image:
"emo-kiss.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-kiss.png"; } } } }
group { "efl/text/emoticon/knowing-grin"; images.image:
group { "efl/text/emoticon/knowing-grin"; data.item: "version" "123"; images.image:
"emo-knowing-grin.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-knowing-grin.png"; } } } }
group { "efl/text/emoticon/laugh"; images.image:
group { "efl/text/emoticon/laugh"; data.item: "version" "123"; images.image:
"emo-laugh.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-laugh.png"; } } } }
group { "efl/text/emoticon/little-bit-sorry"; images.image:
group { "efl/text/emoticon/little-bit-sorry"; data.item: "version" "123"; images.image:
"emo-little-bit-sorry.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-little-bit-sorry.png"; } } } }
group { "efl/text/emoticon/love-lots"; images.image:
group { "efl/text/emoticon/love-lots"; data.item: "version" "123"; images.image:
"emo-love-lots.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-love-lots.png"; } } } }
group { "efl/text/emoticon/love"; images.image:
group { "efl/text/emoticon/love"; data.item: "version" "123"; images.image:
"emo-love.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-love.png"; } } } }
group { "efl/text/emoticon/minimal-smile"; images.image:
group { "efl/text/emoticon/minimal-smile"; data.item: "version" "123"; images.image:
"emo-minimal-smile.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-minimal-smile.png"; } } } }
group { "efl/text/emoticon/not-happy"; images.image:
group { "efl/text/emoticon/not-happy"; data.item: "version" "123"; images.image:
"emo-not-happy.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-not-happy.png"; } } } }
group { "efl/text/emoticon/not-impressed"; images.image:
group { "efl/text/emoticon/not-impressed"; data.item: "version" "123"; images.image:
"emo-not-impressed.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-not-impressed.png"; } } } }
group { "efl/text/emoticon/omg"; images.image:
group { "efl/text/emoticon/omg"; data.item: "version" "123"; images.image:
"emo-omg.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-omg.png"; } } } }
group { "efl/text/emoticon/opensmile"; images.image:
group { "efl/text/emoticon/opensmile"; data.item: "version" "123"; images.image:
"emo-opensmile.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-opensmile.png"; } } } }
group { "efl/text/emoticon/smile"; images.image:
group { "efl/text/emoticon/smile"; data.item: "version" "123"; images.image:
"emo-smile.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-smile.png"; } } } }
group { "efl/text/emoticon/sorry"; images.image:
group { "efl/text/emoticon/sorry"; data.item: "version" "123"; images.image:
"emo-sorry.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-sorry.png"; } } } }
group { "efl/text/emoticon/squint-laugh"; images.image:
group { "efl/text/emoticon/squint-laugh"; data.item: "version" "123"; images.image:
"emo-squint-laugh.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-squint-laugh.png"; } } } }
group { "efl/text/emoticon/surprised"; images.image:
group { "efl/text/emoticon/surprised"; data.item: "version" "123"; images.image:
"emo-surprised.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-surprised.png"; } } } }
group { "efl/text/emoticon/suspicious"; images.image:
group { "efl/text/emoticon/suspicious"; data.item: "version" "123"; images.image:
"emo-suspicious.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-suspicious.png"; } } } }
group { "efl/text/emoticon/tongue-dangling"; images.image:
group { "efl/text/emoticon/tongue-dangling"; data.item: "version" "123"; images.image:
"emo-tongue-dangling.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-tongue-dangling.png"; } } } }
group { "efl/text/emoticon/tongue-poke"; images.image:
group { "efl/text/emoticon/tongue-poke"; data.item: "version" "123"; images.image:
"emo-tongue-poke.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-tongue-poke.png"; } } } }
group { "efl/text/emoticon/uh"; images.image:
group { "efl/text/emoticon/uh"; data.item: "version" "123"; images.image:
"emo-uh.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-uh.png"; } } } }
group { "efl/text/emoticon/unhappy"; images.image:
group { "efl/text/emoticon/unhappy"; data.item: "version" "123"; images.image:
"emo-unhappy.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-unhappy.png"; } } } }
group { "efl/text/emoticon/very-sorry"; images.image:
group { "efl/text/emoticon/very-sorry"; data.item: "version" "123"; images.image:
"emo-very-sorry.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-very-sorry.png"; } } } }
group { "efl/text/emoticon/what"; images.image:
group { "efl/text/emoticon/what"; data.item: "version" "123"; images.image:
"emo-what.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-what.png"; } } } }
group { "efl/text/emoticon/wink"; images.image:
group { "efl/text/emoticon/wink"; data.item: "version" "123"; images.image:
"emo-wink.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-wink.png"; } } } }
group { "efl/text/emoticon/worried"; images.image:
group { "efl/text/emoticon/worried"; data.item: "version" "123"; images.image:
"emo-worried.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-worried.png"; } } } }
group { "efl/text/emoticon/wtf"; images.image:
group { "efl/text/emoticon/wtf"; data.item: "version" "123"; images.image:
"emo-wtf.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
"emo-wtf.png"; } } } }
//------------------------------------------------------------

1
data/elementary/themes/edc/efl/textpath.edc
View File

@ -1,4 +1,5 @@
group { name: "efl/textpath";
data.item: "version" "123";
styles {
style { name: "textpath_style2";
base: "font="FN" font_size=16 text_class=tb_plain wrap=none align=left color=#ffffffff style=shadow,bottom shadow_color=#00000080";

46
data/elementary/themes/edc/efl/timepicker.edc
View File

@ -1,4 +1,31 @@
/**
Group: efl/timepicker/button (@since 1.23)
Part Text: efl.text (required)
Part Swallow: efl.background (required)
Part Swallow: efl.content (required)
Signal: efl,content,set
Signal: efl,content,unset
Signal: efl,state,animation,activated
Signal: efl,state,background,set
Signal: efl,state,background,unset
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,text,set
Signal: efl,text,unset
Group: efl/timepicker (@since 1.23)
Part Swallow: efl.field0 (required)
Part Swallow: efl.field1 (required)
Part Swallow: efl.field2 (required)
Signal: efl,ampm,visible,off
Signal: efl,ampm,visible,on
Signal: efl,colon_field0,visible,off
Signal: efl,colon_field0,visible,on
Signal: efl,colon_field1,visible,off
Signal: efl,colon_field1,visible,on
*/
group { "efl/timepicker";
data.item: "version" "123";
nomouse;
parts {
spacer { "base";
@ -105,7 +132,7 @@ group { "efl/timepicker";
align: 1.0 1.0;
}
}
swallow { "efl.field0";
swallow { "efl.field0"; required;
mouse;
scale;
desc { "default";
@ -197,7 +224,7 @@ group { "efl/timepicker";
max: 0 0;
}
}
swallow { "efl.field1";
swallow { "efl.field1"; required;
mouse;
scale;
desc { "default";
@ -289,7 +316,7 @@ group { "efl/timepicker";
max: 0 0;
}
}
swallow { "efl.field2";
swallow { "efl.field2"; required;
mouse;
scale;
desc { "default";
@ -321,7 +348,7 @@ group { "efl/timepicker";
}
programs {
program { "visible_ampm";
signal: "efl,state,ampm,visible";
signal: "efl,ampm,visible,on";
source: "efl";
script {
set_state(PART:"base", "default", 0.0);
@ -330,7 +357,7 @@ group { "efl/timepicker";
}
}
program { "invisible_ampm";
signal: "efl,state,ampm,invisible";
signal: "efl,ampm,visible,off";
source: "efl";
script {
set_state(PART:"base", "24layout", 0.0);
@ -339,7 +366,7 @@ group { "efl/timepicker";
}
}
program { "visible_colon_field0";
signal: "efl,state,colon,visible,field0";
signal: "efl,colon_field0,visible,on";
source: "efl";
action: STATE_SET "default";
target: "padding_center1";
@ -348,7 +375,7 @@ group { "efl/timepicker";
target: "padding_center2";
}
program { "invisible_colon_field0";
signal: "efl,state,colon,invisible,field0";
signal: "efl,colon_field0,visible,off";
source: "efl";
action: STATE_SET "invisible";
target: "padding_center1";
@ -357,7 +384,7 @@ group { "efl/timepicker";
target: "padding_center2";
}
program { "visible_colon_field1";
signal: "efl,state,colon,visible,field1";
signal: "efl,colon_field1,visible,on";
source: "efl";
action: STATE_SET "default";
target: "padding_center3";
@ -366,7 +393,7 @@ group { "efl/timepicker";
target: "padding_center4";
}
program { "invisible_colon_field1";
signal: "efl,state,colon,invisible,field1";
signal: "efl,colon_field1,visible,off";
source: "efl";
action: STATE_SET "invisible";
target: "padding_center3";
@ -379,6 +406,7 @@ group { "efl/timepicker";
group { "efl/timepicker/button";
inherit: "efl/button";
data.item: "version" "123";
parts {
image { "base";
desc { "default";

4
data/elementary/themes/edc/efl/uiclock.edc
View File

@ -103,6 +103,7 @@
}
group { "efl/uiclock";
data.item: "version" "123";
parts {
rect { "bg";
desc { "default";
@ -213,15 +214,18 @@ group { "efl/uiclock";
// AM_PM_BUTTON
group { "efl/uiclock/ampm"
data.item: "version" "123";
inherit: "efl/button";
}
//ENTRY
group { "efl/uiclock/text"
data.item: "version" "123";
inherit: "efl/text";
alias: "efl/uiclock/text/single";
alias: "efl/uiclock/text/single-noedit";
}
group { "efl/uiclock/text/selection"
data.item: "version" "123";
inherit: "efl/text/selection";
}

1
data/elementary/themes/edc/efl/video.edc
View File

@ -1,4 +1,5 @@
group { name: "efl/video";
data.item: "version" "123";
parts {
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;

2
data/elementary/themes/edc/efl/win.edc
View File

@ -1,5 +1,5 @@
group { "efl/win";
data.item: "version" "119";
data.item: "version" "123";
parts {
rect { "client_clip"; nomouse; }
swallow { "efl.menu";

2
data/elementary/themes/edc/elm/fileselector.edc
View File

@ -41,7 +41,9 @@ group { name: "elm/fileselector/base/default";
}
swallow { "elm.swallow.search";
desc { "default";
align: 0.0 0.5;
min: 65 0;
fixed: 0 1;
rel1 {
to: "elm.swallow.home";
relative: 1.0 0.0;

Some files were not shown because too many files have changed in this diff Show More