From: Daniel Juyung Seo Date: Fri, 8 Jul 2011 11:46:38 +0000 (+0900) Subject: [SLP Merge] Thu Jul 7 13:20:56 2011 +0900 X-Git-Tag: REL_F_I9200_20110722_1~8^2~45 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79b028f2b9cbfeff4c2470c4fa82613c1acd8e7c;hp=6f45229b59410746d0475429f7cd4840e1616731;p=framework%2Fuifw%2Felementary.git [SLP Merge] Thu Jul 7 13:20:56 2011 +0900 --- diff --git a/.gitignore b/.gitignore index 7ca98dc..c145b5e 100644 --- a/.gitignore +++ b/.gitignore @@ -34,7 +34,7 @@ elementary_testql /missing /stamp-h1 core -cscope.out +cscope.* doc/elementary.dox elementary.spec m4/libtool.m4 @@ -42,7 +42,7 @@ m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 -src/lib/Elementary.h +/src/lib/Elementary.h tags /ABOUT-NLS /config.rpath @@ -53,3 +53,38 @@ tags /mkinstalldirs /config.cache *.gmo +/config.cache-env +/m4/codeset.m4 +/m4/gettext.m4 +/m4/glibc21.m4 +/m4/iconv.m4 +/m4/intdiv0.m4 +/m4/inttypes-pri.m4 +/m4/inttypes.m4 +/m4/inttypes_h.m4 +/m4/isc-posix.m4 +/m4/lcmessage.m4 +/m4/lib-ld.m4 +/m4/lib-link.m4 +/m4/lib-prefix.m4 +/m4/nls.m4 +/m4/po.m4 +/m4/progtest.m4 +/m4/stdint_h.m4 +/m4/uintmax_t.m4 +/m4/ulonglong.m4 +/po/Makefile.in.in +/po/Makevars.template +/po/POTFILES +/po/Rules-quot +/po/boldquot.sed +/po/elementary.pot +/po/en@boldquot.header +/po/en@quot.header +/po/insert-header.sin +/po/quot.sed +/po/remove-potcdate.sed +/po/remove-potcdate.sin +/po/stamp-po +/doc/Doxyfile +/src/examples/actionslider_example_01 diff --git a/AUTHORS b/AUTHORS index 469cf70..cc75c17 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,7 +16,7 @@ Samsung SAIT Brett Nash Bruno Dilly Rafael Fonseca -Hermet (Chuneon Park) +Hermet (Chuneon Park) Woohyun Jung Jaehwan Kim Wonguk Jeong @@ -36,4 +36,9 @@ Jihoon Kim Jeonghyun Yun (arosis) Tom Hacohen Aharon Hillel -Jonathan Atton (Watchwolf) +Shinwoo Kim +Govindaraju SM +Prince Kumar Dubey +Sung W. Park +Thierry el Borgi +Shilpa Singh diff --git a/autogen.sh b/autogen.sh index d7c60f8..b814903 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,6 +4,7 @@ rm -rf autom4te.cache rm -f aclocal.m4 ltmain.sh touch README +touch ABOUT-NLS echo "Running autopoint..." ; autopoint -f || : echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 @@ -12,6 +13,28 @@ echo "Running autoconf..." ; autoconf || exit 1 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 +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 ./configure -C "$@" fi diff --git a/config/default/Makefile.am b/config/default/Makefile.am index ba2bc96..03113bb 100644 --- a/config/default/Makefile.am +++ b/config/default/Makefile.am @@ -20,4 +20,4 @@ files_DATA = \ clean-local: rm -rf *.cfg *~ - + diff --git a/config/illume/base.src b/config/illume/base.src index 5f85da8..4c44144 100644 --- a/config/illume/base.src +++ b/config/illume/base.src @@ -13,6 +13,10 @@ group "Elm_Config" struct { value "zoom_friction" double: 0.5; value "thumbscroll_border_friction" double: 0.5; value "scroll_smooth_time_interval" double: 0.008; + value "scroll_smooth_amount" double: 1.0; + value "scroll_smooth_history_weight" double: 0.3; + value "scroll_smooth_future_time" double: 0.0; + value "scroll_smooth_time_window" double: 0.2; value "scale" double: 1.0; value "bgpixmap" int: 0; value "compositing" int: 1; diff --git a/config/slp/base.src b/config/slp/base.src index e842c73..dfbbabb 100644 --- a/config/slp/base.src +++ b/config/slp/base.src @@ -12,6 +12,10 @@ group "Elm_Config" struct { value "bring_in_scroll_friction" double: 0.5; value "zoom_friction" double: 0.5; value "thumbscroll_border_friction" double: 0.5; + value "scroll_smooth_amount" double: 0.0; + value "scroll_smooth_history_weight" double: 0.3; + value "scroll_smooth_future_time" double: 0.0; + value "scroll_smooth_time_window" double: 0.2; value "scroll_smooth_time_interval" double: 0.008; value "scale" double: 1.0; value "bgpixmap" int: 0; diff --git a/config/standard/Makefile.am b/config/standard/Makefile.am index 88cae80..60ce44b 100644 --- a/config/standard/Makefile.am +++ b/config/standard/Makefile.am @@ -20,4 +20,4 @@ files_DATA = \ clean-local: rm -rf *.cfg *~ - + diff --git a/config/standard/base.src b/config/standard/base.src index 469f7ac..f0e8565 100644 --- a/config/standard/base.src +++ b/config/standard/base.src @@ -12,6 +12,10 @@ group "Elm_Config" struct { value "bring_in_scroll_friction" double: 0.5; value "zoom_friction" double: 0.5; value "thumbscroll_border_friction" double: 0.5; + value "scroll_smooth_amount" double: 0.0; + value "scroll_smooth_history_weight" double: 0.3; + value "scroll_smooth_future_time" double: 0.0; + value "scroll_smooth_time_window" double: 0.2; value "scale" double: 1.0; value "bgpixmap" int: 0; value "compositing" int: 1; diff --git a/configure.ac b/configure.ac index 8f2a5c0..0f3c609 100755 --- a/configure.ac +++ b/configure.ac @@ -177,6 +177,12 @@ dnl managed by evil esac AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"]) +m4_ifdef([v_mic], + [ + EFL_COMPILER_FLAG([-Wall]) + EFL_COMPILER_FLAG([-W]) + ]) + have_fork="no" want_quicklaunch="auto" AC_ARG_ENABLE([quick-launch], @@ -201,7 +207,7 @@ AM_CONDITIONAL([ELEMENTARY_WINDOWS_BUILD], [test "x${have_windows}" = "xyes"]) PKG_CHECK_MODULES([ELEMENTARY], [ - eina >= 1.0.0 + eina >= 1.0.999 eet >= 1.4.0 evas >= 1.0.999 ecore >= 1.0.0 @@ -212,6 +218,28 @@ PKG_CHECK_MODULES([ELEMENTARY], ] ) +PKG_CHECK_MODULES([EIO], + [eio], + [ + have_eio="yes" + AC_DEFINE(HAVE_EIO, 1, [Use EIO for asynchronous file access]) + requirement_elm="eio ${requirement_elm}" + ], + [have_eio="no"]) + +AM_CONDITIONAL([HAVE_EIO], [test "x${have_eio}" = "xyes"]) + +PKG_CHECK_MODULES([EMOTION], + [emotion], + [ + have_emotion="yes" + AC_DEFINE(HAVE_EMOTION, 1, [Use Emotion for asynchronous file access]) + requirement_elm="emotion ${requirement_elm}" + ], + [have_emotion="no"]) + +AM_CONDITIONAL([HAVE_EMOTION], [test "x${have_emotion}" = "xyes"]) + requirement_elm="edje >= 1.0.0 ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_elm}" have_elementary_x="no" @@ -363,13 +391,12 @@ if test "x$want_elementary_edbus" != "xno"; then PKG_CHECK_MODULES([ELEMENTARY_EDBUS], [ edbus >= 1.0.0 - ehal >= 1.0.0 ], [ AC_DEFINE(HAVE_ELEMENTARY_EDBUS, 1, [EDBus support for Elementary]) have_elementary_edbus="yes" ELM_EDBUS_DEF="#define" - requirement_elm="ehal >= 1.0.0 edbus >= 1.0.0 ${requirement_elm}" + requirement_elm="edbus >= 1.0.0 ${requirement_elm}" ], [have_elementary_edbus="no"] ) @@ -377,7 +404,7 @@ else have_elementary_edbus="no" fi if test "x$want_elementary_edbus" = "xyes" -a "x$have_elementary_edbus" = "xno"; then - AC_MSG_ERROR([E_DBus support requested, but no edbus/ehal found by pkg-config.]) + AC_MSG_ERROR([E_DBus support requested, but no e_dbus found by pkg-config.]) fi AC_SUBST(ELM_EDBUS_DEF) @@ -439,6 +466,36 @@ if test "x$want_elementary_eweather" = "xyes" -a "x$have_elementary_eweather" = fi AC_SUBST(ELM_EWEATHER_DEF) +ELM_EMAP_DEF="#undef" +have_elementary_emap="no" +want_elementary_emap="auto" +AC_ARG_ENABLE([emap], + [AC_HELP_STRING([--disable-emap], [disable emap support. @<:@default=detect@:>@])], + [want_elementary_emap=$enableval], []) + +if test "x$want_elementary_emap" != "xno"; then + PKG_CHECK_MODULES([ELEMENTARY_EMAP], + [ + emap + ], + [ + AC_DEFINE(HAVE_ELEMENTARY_EMAP, 1, [EMap support for Elementary]) + have_elementary_emap="yes" + ELM_EMAP_DEF="#define" + requirement_elm="emap ${requirement_elm}" + ], + [have_elementary_emap="no"] + ) +else + have_elementary_emap="no" +fi +if test "x$want_elementary_emap" = "xyes" -a "x$have_elementary_emap" = "xno"; then + AC_MSG_ERROR([Emap support requested, but no emap found by pkg-config.]) +fi +AC_SUBST(ELM_EMAP_DEF) + + + ELM_ETHUMB_DEF="#undef" have_elementary_ethumb="no" want_elementary_ethumb="auto" @@ -555,8 +612,8 @@ config/Makefile config/default/Makefile config/standard/Makefile config/illume/Makefile -$po_makefile_in config/slp/Makefile +$po_makefile_in ]) ##################################################################### @@ -582,8 +639,11 @@ echo " Features:" echo " EDBus..................: ${have_elementary_edbus}" echo " EFreet.................: ${have_elementary_efreet}" echo " EWeather...............: ${have_elementary_eweather}" +echo " EMap...................: ${have_elementary_emap}" echo " Ethumb.................: ${have_elementary_ethumb}" echo " Quick Launch...........: ${have_fork}" +echo " EIO....................: ${have_eio}" +echo " Emotion................: ${have_emotion}" echo echo " eet......................: ${eet_eet}" echo " edje_cc..................: ${edje_cc}" diff --git a/data/edje_externals/Makefile.am b/data/edje_externals/Makefile.am index 02a4d6e..99c684c 100644 --- a/data/edje_externals/Makefile.am +++ b/data/edje_externals/Makefile.am @@ -2,7 +2,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in EDJE_CC = @edje_cc@ -EDJE_FLAGS = -v -id $(top_srcdir)/data/edje_externals -fd $(top_srcdir)/data/edje_externals +EDJE_FLAGS_VERBOSE_ = +EDJE_FLAGS_VERBOSE_0 = +EDJE_FLAGS_VERBOSE_1 = -v +EDJE_FLAGS = $(EDJE_FLAGS_$(V)) -id $(top_srcdir)/data/edje_externals -fd $(top_srcdir)/data/edje_externals filesdir = $(datadir)/elementary/edje_externals files_DATA = icons.edj diff --git a/data/images/Makefile.am b/data/images/Makefile.am index 6b56b58..cbcf747 100644 --- a/data/images/Makefile.am +++ b/data/images/Makefile.am @@ -5,6 +5,9 @@ filesdir = $(datadir)/elementary/images files_DATA = \ panel_01.jpg \ plant_01.jpg \ +pol_shadow.png \ +pol_sky.png \ +pol_twofish.png \ rock_01.jpg \ rock_02.jpg \ sky_01.jpg \ @@ -45,6 +48,8 @@ copypaste_icon_clipboard.png \ copypaste_icon_search.png \ copypaste_icon_share.png \ mystrale.jpg \ -mystrale_2.jpg +mystrale_2.jpg \ +twofish.jpg \ +pt.png EXTRA_DIST = $(files_DATA) diff --git a/data/images/pol_shadow.png b/data/images/pol_shadow.png new file mode 100644 index 0000000..9038699 Binary files /dev/null and b/data/images/pol_shadow.png differ diff --git a/data/images/pol_sky.png b/data/images/pol_sky.png new file mode 100644 index 0000000..99251c7 Binary files /dev/null and b/data/images/pol_sky.png differ diff --git a/data/images/pol_twofish.png b/data/images/pol_twofish.png new file mode 100644 index 0000000..2520ba0 Binary files /dev/null and b/data/images/pol_twofish.png differ diff --git a/data/images/pt.png b/data/images/pt.png new file mode 100644 index 0000000..612d117 Binary files /dev/null and b/data/images/pt.png differ diff --git a/data/images/twofish.jpg b/data/images/twofish.jpg new file mode 100644 index 0000000..e6024d4 Binary files /dev/null and b/data/images/twofish.jpg differ diff --git a/data/objects/Makefile.am b/data/objects/Makefile.am index 0f80b6c..a2b8bde 100644 --- a/data/objects/Makefile.am +++ b/data/objects/Makefile.am @@ -2,11 +2,14 @@ AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in EDJE_CC = @edje_cc@ -EDJE_FLAGS = -v -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects +EDJE_FLAGS_VERBOSE_ = +EDJE_FLAGS_VERBOSE_0 = +EDJE_FLAGS_VERBOSE_1 = -v +EDJE_FLAGS = $(EDJE_FLAGS_$(V)) -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects filesdir = $(datadir)/elementary/objects -files_DATA = test.edj multip.edj colorpreview.edj cursors.edj font_preview.edj +files_DATA = test.edj multip.edj colorpreview.edj cursors.edj font_preview.edj postit_ent.edj EXTRA_DIST = \ test.edc \ @@ -14,6 +17,7 @@ multip.edc \ colorpreview.edc \ cursors.edc \ font_preview.edc \ +postit_ent.edc \ grid_bg.png \ over.png \ under.png \ @@ -46,5 +50,10 @@ font_preview.edj: Makefile $(EXTRA_DIST) $(top_srcdir)/data/objects/font_preview.edc \ $(top_builddir)/data/objects/font_preview.edj +postit_ent.edj: Makefile $(EXTRA_DIST) + $(EDJE_CC) $(EDJE_FLAGS) \ + $(top_srcdir)/data/objects/postit_ent.edc \ + $(top_builddir)/data/objects/postit_ent.edj + clean-local: rm -f *.edj diff --git a/data/objects/postit_ent.edc b/data/objects/postit_ent.edc new file mode 100644 index 0000000..9968907 --- /dev/null +++ b/data/objects/postit_ent.edc @@ -0,0 +1,26 @@ +collections { + group { + name: "main"; + images { +// image: "1.png" COMP; + } + parts { + part { + name: "bg"; + type: RECT; + description { + state: "default" 0.0; + color: 247 239 132 255; + } + } + part { + name: "ent"; + type: SWALLOW; + description { + state: "default" 0.0; + } + } + } + } +} + diff --git a/data/objects/test.edc b/data/objects/test.edc index e219a41..27e288c 100644 --- a/data/objects/test.edc +++ b/data/objects/test.edc @@ -13,7 +13,7 @@ collections { } } part { name: "sky"; - mouse_events: 0; + mouse_events: 1; clip_to: "clip"; description { state: "default" 0.0; aspect: 2.6225 2.6225; @@ -611,7 +611,7 @@ collections { } } } - group { name: "segment_test"; + group { name: "segment_test"; parts{ part { name: "bg"; @@ -632,12 +632,8 @@ collections { visible: 0; min : 250 30; //minimum size for gap filler fixed: 0 1; - rel1 { - relative: 0.0 0.0; - } - rel2 { - relative: 1.0 0.0; - } + rel1 { relative: 0 0; } + rel2 { relative: 1 0; } color: 0 0 0 0; align: 0 0; } @@ -648,15 +644,8 @@ collections { description { state: "default" 0.0; fixed: 1 1; - rel1 { - relative: 0.0 1.0; - to_x: "bg"; - to_y: "top_padding"; - } - rel2 { - relative: 1.0 0.25; - to: "bg"; - } + rel1 { relative: 0.0 1.0; to_x: "bg"; to_y: "top_padding"; } + rel2 { relative: 1.0 0.25; to: "bg"; } align: 0.5 0.0; } } @@ -670,14 +659,8 @@ collections { max : 250 10; fixed: 1 1; align: 0.5 0; - rel1 { - relative: 0 1.0; - to_y: "segment1"; - } - rel2 { - relative: 1 1.0; - to_y: "segment1"; - } + rel1 { relative: 0 1.0; to_y: "segment1"; } + rel2 { relative: 1 1.0; to_y: "segment1"; } color: 0 255 0 0; } } @@ -687,15 +670,8 @@ collections { description { state: "default" 0.0; fixed: 1 1; - rel1 { - relative: 0.1 1.0; - to_x: "bg"; - to_y: "segment1_bottom_padding"; - } - rel2 { - relative: 0.9 160/400; - to: "bg"; - } + rel1 { relative: 0.1 1.0; to_x: "bg"; to_y: "segment1_bottom_padding"; } + rel2 { relative: 0.9 160/400; to: "bg"; } align: 0.5 0.0; } } @@ -709,14 +685,9 @@ collections { max : 250 10; fixed: 1 1; align: 0.5 0; - rel1 { - relative: 0 1.0; - to_y: "segment2"; - } - rel2 { - relative: 1 1.0; - to_y: "segment2"; - } + rel1 { relative: 0 1.0; to_y: "segment2"; } + rel2 { relative: 1 1.0; to_y: "segment2"; } + color: 0 255 0 0; } } part { name: "segment3"; @@ -725,15 +696,8 @@ collections { description { state: "default" 0.0; fixed: 1 1; - rel1 { - relative: 0.2 1.0; - to_x: "bg"; - to_y: "segment2_bottom_padding"; - } - rel2 { - relative: 0.8 0.6; - to: "bg"; - } + rel1 { relative: 0.2 1.0; to_x: "bg"; to_y: "segment2_bottom_padding"; } + rel2 { relative: 0.8 0.6; to: "bg"; } align: 0.5 0.0; } } @@ -747,14 +711,9 @@ collections { max : 250 10; fixed: 1 1; align: 0.5 0; - rel1 { - relative: 0 1.0; - to_y: "segment3"; - } - rel2 { - relative: 1 1.0; - to_y: "segment3"; - } + rel1 { relative: 0 1.0; to_y: "segment3"; } + rel2 { relative: 1 1.0; to_y: "segment3"; } + color: 0 255 0 0; } } part { name: "segment4"; @@ -763,15 +722,8 @@ collections { description { state: "default" 0.0; fixed: 1 1; - rel1 { - relative: 0.3 1.0; - to_x: "bg"; - to_y: "segment3_bottom_padding"; - } - rel2 { - relative: 0.7 340/400; - to: "bg"; - } + rel1 { relative: 0.3 1.0; to_x: "bg"; to_y: "segment3_bottom_padding"; } + rel2 { relative: 0.7 340/400; to: "bg"; } align: 0.5 0.0; } } @@ -785,17 +737,12 @@ collections { max : 250 100; fixed: 1 1; align: 0.5 0; - rel1 { - relative: 0 1.0; - to_y: "segment4"; - } - rel2 { - relative: 1 1.0; - to_y: "segment4"; - } + rel1 { relative: 0 1.0; to_y: "segment4"; } + rel2 { relative: 1 1.0; to_y: "segment4"; } + color: 0 255 0 0; } } - } + } } group { name: "bg_overlay"; images { @@ -855,5 +802,29 @@ collections { } } } + group { + name: "test/layout"; + images { + image: "sky.jpg" LOSSY 80; + } + parts { + part { + name: "bg"; + description { + state: "default" 0.0; + color: 255 255 255 100; + image.normal: "sky.jpg"; + } + } + part { + name: "swallow"; + type: SWALLOW; + description { + state: "default" 0.0; + rel1.offset: 8 8; + rel2.offset: -7 -7; + } + } + } + } } - diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index 5f4b022..ba72890 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -67,6 +67,18 @@ flip_b.png \ head.png \ sb_runnerh.png \ sb_runnerv.png \ +seg_single_pressed.png \ +seg_single_selected.png \ +seg_single_normal.png \ +seg_left_pressed.png \ +seg_left_selected.png \ +seg_left_normal.png \ +seg_middle_pressed.png \ +seg_middle_selected.png \ +seg_middle_normal.png \ +seg_right_pressed.png \ +seg_right_selected.png \ +seg_right_normal.png \ shelf_inset.png \ tog_base_on.png \ tog_base_off.png \ diff --git a/data/themes/default.edc b/data/themes/default.edc index 28628c2..a61eaed 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -319,6 +319,7 @@ collections { alias: "elm/carousel/base/default"; alias: "elm/gengrid/base/default"; alias: "elm/scroller/base/map_bubble"; + alias: "elm/genscroller/base/default"; data { item: "focus_highlight" "on"; @@ -1397,7 +1398,7 @@ collections { data.item: "max_font_size" "60"; styles { style { name: "textblock_style"; - base: "font=Sans font_size=10 color=#000 wrap=word text_class=label"; + base: "font=Sans font_size=10 color=#000 text_class=label"; tag: "br" "\n"; tag: "ps" "ps"; tag: "hilight" "+ font=Sans:style=Bold"; @@ -1429,62 +1430,6 @@ collections { rel2.relative: 1.0 1.0; text { style: "textblock_style"; - min: 1 1; - } - } - } - } - } - - group { name: "elm/label/base_wrap/default"; - data.item: "default_font_size" "10"; - data.item: "min_font_size" "6"; - data.item: "max_font_size" "60"; - parts { - part { name: "label.swallow.background"; - type: SWALLOW; - description { state: "default" 0.0; - visible: 1; - rel1 { relative: 0 0; to: "elm.text"; } - rel2 { relative: 1 1; to: "elm.text"; } - } - } - part { name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - text { - style: "textblock_style"; - min: 0 1; - } - } - } - } - } - - group { name: "elm/label/base_wrap_ellipsis/default"; - data.item: "default_font_size" "10"; - data.item: "min_font_size" "6"; - data.item: "max_font_size" "60"; - parts { - part { name: "label.swallow.background"; - type: SWALLOW; - description { state: "default" 0.0; - visible: 1; - rel1 { relative: 0 0; to: "elm.text"; } - rel2 { relative: 1 1; to: "elm.text"; } - } - } - part { name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 0; - scale: 1; - multiline: 1; - description { state: "default" 0.0; - fixed: 0 1; - text { - style: "textblock_style"; min: 0 1; } } @@ -1529,33 +1474,6 @@ collections { } } - group { name: "elm/label/base_wrap/marker"; - data.item: "default_font_size" "10"; - data.item: "min_font_size" "6"; - data.item: "max_font_size" "60"; - parts { - part { name: "label.swallow.background"; - type: SWALLOW; - description { state: "default" 0.0; - visible: 1; - rel1 { relative: 0 0; to: "elm.text"; } - rel2 { relative: 1 1; to: "elm.text"; } - } - } - part { name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - text { - style: "textblock_style2"; - min: 0 1; - } - } - } - } - } - group { name: "elm/label/base/slide_long"; data.item: "default_font_size" "10"; data.item: "min_font_size" "6"; @@ -1567,7 +1485,7 @@ collections { public message(Msg_Type:type, id, ...) { if ((type == MSG_FLOAT_SET) && (id == 0)) { new Float:duration; - duration = getarg(2); + duration = getfarg(2); set_float(g_duration, duration); } } @@ -1693,7 +1611,7 @@ collections { public message(Msg_Type:type, id, ...) { if ((type == MSG_FLOAT_SET) && (id == 0)) { new Float:duration; - duration = getarg(2); + duration = getfarg(2); set_float(g_duration, duration); } } @@ -1818,7 +1736,7 @@ collections { public message(Msg_Type:type, id, ...) { if ((type == MSG_FLOAT_SET) && (id == 0)) { new Float:duration; - duration = getarg(2); + duration = getfarg(2); set_float(g_duration, duration); } } @@ -3373,7 +3291,6 @@ collections { else { emit("elm,action,toggle,off", ""); } - } } program { name: "toggle_on"; @@ -7829,7 +7746,7 @@ collections { action: STATE_SET "hidden" 0.0; transition: LINEAR 1.0; target: "sb_hbar_clip"; - } + } program { name: "scroll"; signal: "elm,action,scroll"; source: "elm"; @@ -7912,7 +7829,7 @@ collections { image: "bt_shine.png" COMP; } parts { - part { name: "arrow_area_left"; + part { name: "arrow_area_left"; type: RECT; mouse_events: 0; description { state: "default" 0.0; @@ -8081,7 +7998,7 @@ collections { rel1 { to:"base"; offset: 4 4; }; rel2 { to:"base"; offset: -5 -5; }; } - } + } } } /////////////////////////////////////////////////////////////////////////////// @@ -8200,7 +8117,7 @@ collections { align: 0 0.5; aspect: 1.0 1.0; rel1 { offset: 10 10; } - rel2 { offset: 0 -10; } + rel2 { offset: 0 -10; } } } part { name: "elm.text"; @@ -8226,7 +8143,7 @@ collections { color: 0 0 0 255; } } - part { name: "over1"; + part { name: "over1"; mouse_events: 1; repeat_events: 1; ignore_flags: ON_HOLD; @@ -8472,6 +8389,7 @@ collections { text { style: "entry_textblock_style"; min: 0 1; + align: 0.0 0.0; } } description { state: "disabled" 0.0; @@ -8505,11 +8423,11 @@ collections { } } - group { name: "elm/entry/base-charwrap/default"; + group { name: "elm/entry/base-mixedwrap/default"; styles { - style { name: "entry_textblock_style_charwrap"; - base: "font=Sans font_size=10 color=#000 wrap=char text_class=entry"; + style { name: "entry_textblock_style_mixedwrap"; + base: "font=Sans font_size=10 color=#000 wrap=mixed text_class=entry"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -8518,7 +8436,7 @@ collections { tag: "link" "+ color=#800 underline=on underline_color=#8008"; tag: "hilight" "+ font=Sans:style=Bold"; } - style { name: "entry_textblock_disabled_style_charwrap"; + style { name: "entry_textblock_disabled_style_mixedwrap"; base: "font=Sans font_size=10 color=#00000080 wrap=char text_class=entry"; tag: "br" "\n"; tag: "ps" "ps"; @@ -8546,14 +8464,15 @@ collections { description { state: "default" 0.0; fixed: 1 0; text { - style: "entry_textblock_style_charwrap"; + style: "entry_textblock_style_mixedwrap"; min: 0 1; + align: 0.0 0.0; } } description { state: "disabled" 0.0; inherit: "default" 0.0; text { - style: "entry_textblock_disabled_style_charwrap"; + style: "entry_textblock_disabled_style_mixedwrap"; min: 0 1; } } @@ -8581,90 +8500,11 @@ collections { } } - group { name: "elm/entry/base-nowrap/default"; - parts { - part { name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 1; - scale: 1; - entry_mode: EDITABLE; - select_mode: EXPLICIT; - multiline: 1; - source: "elm/entry/selection/default"; // selection under - source4: "elm/entry/cursor/default"; // cursorover - source5: "elm/entry/anchor/default"; // anchor under - description { state: "default" 0.0; - text { - style: "entry_textblock_style"; - min: 1 1; - } - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - text { - style: "entry_textblock_disabled_style"; - min: 0 1; - } - } - } -/* - part { name: "sel"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - align: 1.0 1.0; - max: 16 16; - aspect: 1.0 1.0; - color: 255 0 0 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - color: 255 0 0 50; - } - } - */ - } - programs { - program { name: "focus"; - signal: "load"; - source: ""; - action: FOCUS_SET; - target: "elm.text"; - } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "elm.text"; - } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; - } -/* - program { name: "selmode0"; - signal: "elm,state,select,on"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "sel"; - } - program { name: "selmode1"; - signal: "elm,state,select,off"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "sel"; - } - */ - } - } - - group { name: "elm/entry/base-single/default"; + group { name: "elm/entry/base-charwrap/default"; styles { - style { name: "entry_single_textblock_style"; - base: "font=Sans font_size=10 color=#000 wrap=none text_class=entry"; + style { name: "entry_textblock_style_charwrap"; + base: "font=Sans font_size=10 color=#000 wrap=char text_class=entry"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -8673,8 +8513,8 @@ collections { tag: "link" "+ color=#800 underline=on underline_color=#8008"; tag: "hilight" "+ font=Sans:style=Bold"; } - style { name: "entry_single_textblock_disabled_style"; - base: "font=Sans font_size=10 color=#00000080 wrap=none text_class=entry"; + style { name: "entry_textblock_disabled_style_charwrap"; + base: "font=Sans font_size=10 color=#00000080 wrap=char text_class=entry"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -8691,117 +8531,26 @@ collections { scale: 1; entry_mode: EDITABLE; select_mode: EXPLICIT; - multiline: 0; - source: "elm/entry/selection/default"; // selection under - source4: "elm/entry/cursor/default"; // cursorover - source5: "elm/entry/anchor/default"; // anchor under - description { state: "default" 0.0; - text { - style: "entry_single_textblock_style"; - min: 1 1; - max: 0 1; - } - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - text { - style: "entry_single_textblock_disabled_style"; - } - } - } - } - programs { - program { name: "focus"; - signal: "load"; - source: ""; - action: FOCUS_SET; - target: "elm.text"; - } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "elm.text"; - } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; - } - } - } - - group { name: "elm/entry/base-single-noedit/default"; - parts { - part { name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 1; - scale: 1; - entry_mode: PLAIN; - select_mode: EXPLICIT; - multiline: 0; - source: "elm/entry/selection/default"; // selection under - source5: "elm/entry/anchor/default"; // anchor under - description { state: "default" 0.0; - text { - style: "entry_single_textblock_style"; - min: 1 1; - max: 0 1; - } - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - text { - style: "entry_single_textblock_disabled_style"; - } - } - } - } - programs { - program { name: "focus"; - signal: "load"; - source: ""; - action: FOCUS_SET; - target: "elm.text"; - } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "elm.text"; - } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; - } - } - } - - group { name: "elm/entry/base-noedit/default"; - parts { - part { name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 1; - scale: 1; - entry_mode: PLAIN; - select_mode: EXPLICIT; multiline: 1; source: "elm/entry/selection/default"; // selection under +// source2: "X"; // selection over +// source3: "X"; // cursor under + source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under +// source6: "X"; // anchor over description { state: "default" 0.0; fixed: 1 0; text { - style: "entry_textblock_style"; + style: "entry_textblock_style_charwrap"; min: 0 1; + align: 0.0 0.0; } } description { state: "disabled" 0.0; inherit: "default" 0.0; text { - style: "entry_textblock_disabled_style"; + style: "entry_textblock_disabled_style_charwrap"; + min: 0 1; } } } @@ -8828,28 +8577,133 @@ collections { } } - group { name: "elm/entry/base-noedit-charwrap/default"; + group { name: "elm/entry/base-nowrap/default"; parts { part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; scale: 1; - entry_mode: PLAIN; + entry_mode: EDITABLE; select_mode: EXPLICIT; multiline: 1; source: "elm/entry/selection/default"; // selection under + source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under description { state: "default" 0.0; - fixed: 1 0; text { - style: "entry_textblock_style_charwrap"; + style: "entry_textblock_style"; + min: 1 1; + align: 0.0 0.0; + } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + text { + style: "entry_textblock_disabled_style"; min: 0 1; } } + } +/* + part { name: "sel"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + align: 1.0 1.0; + max: 16 16; + aspect: 1.0 1.0; + color: 255 0 0 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 0 0 50; + } + } + */ + } + programs { + program { name: "focus"; + signal: "load"; + source: ""; + action: FOCUS_SET; + target: "elm.text"; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "elm.text"; + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.text"; + } +/* + program { name: "selmode0"; + signal: "elm,state,select,on"; + source: "elm"; + action: STATE_SET "visible" 0.0; + target: "sel"; + } + program { name: "selmode1"; + signal: "elm,state,select,off"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "sel"; + } + */ + } + } + + group { name: "elm/entry/base-single/default"; + styles + { + style { name: "entry_single_textblock_style"; + base: "font=Sans font_size=10 color=#000 wrap=none text_class=entry"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + tag: "em" "+ font=Sans:style=Oblique"; + tag: "b" "+ font=Sans:style=Bold"; + tag: "link" "+ color=#800 underline=on underline_color=#8008"; + tag: "hilight" "+ font=Sans:style=Bold"; + } + style { name: "entry_single_textblock_disabled_style"; + base: "font=Sans font_size=10 color=#00000080 wrap=none text_class=entry"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + tag: "em" "+ font=Sans:style=Oblique"; + tag: "b" "+ font=Sans:style=Bold"; + tag: "link" "+ color=#00000080 underline=on underline_color=#00000080"; + tag: "hilight" "+ font=Sans:style=Bold"; + } + } + parts { + part { name: "elm.text"; + type: TEXTBLOCK; + mouse_events: 1; + scale: 1; + entry_mode: EDITABLE; + select_mode: EXPLICIT; + multiline: 0; + source: "elm/entry/selection/default"; // selection under + source4: "elm/entry/cursor/default"; // cursorover + source5: "elm/entry/anchor/default"; // anchor under + description { state: "default" 0.0; + text { + style: "entry_single_textblock_style"; + min: 1 1; + max: 0 0; + align: 0.0 0.5; + } + } description { state: "disabled" 0.0; inherit: "default" 0.0; text { - style: "entry_textblock_disabled_style_charwrap"; + style: "entry_single_textblock_disabled_style"; } } } @@ -8876,7 +8730,56 @@ collections { } } - group { name: "elm/entry/base-nowrap-noedit/default"; + group { name: "elm/entry/base-single-noedit/default"; + parts { + part { name: "elm.text"; + type: TEXTBLOCK; + mouse_events: 1; + scale: 1; + entry_mode: PLAIN; + select_mode: EXPLICIT; + multiline: 0; + source: "elm/entry/selection/default"; // selection under + source5: "elm/entry/anchor/default"; // anchor under + description { state: "default" 0.0; + text { + style: "entry_single_textblock_style"; + min: 1 1; + max: 0 0; + align: 0.0 0.5; + } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + text { + style: "entry_single_textblock_disabled_style"; + } + } + } + } + programs { + program { name: "focus"; + signal: "load"; + source: ""; + action: FOCUS_SET; + target: "elm.text"; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "elm.text"; + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.text"; + } + } + } + + group { name: "elm/entry/base-noedit/default"; parts { part { name: "elm.text"; type: TEXTBLOCK; @@ -8888,9 +8791,11 @@ collections { source: "elm/entry/selection/default"; // selection under source5: "elm/entry/anchor/default"; // anchor under description { state: "default" 0.0; + fixed: 1 0; text { style: "entry_textblock_style"; - min: 1 1; + min: 0 1; + align: 0.0 0.0; } } description { state: "disabled" 0.0; @@ -8923,30 +8828,126 @@ collections { } } - group { name: "elm/entry/base-password/default"; + group { name: "elm/entry/base-noedit-mixedwrap/default"; parts { part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 1; scale: 1; - entry_mode: PASSWORD; + entry_mode: PLAIN; select_mode: EXPLICIT; - multiline: 0; + multiline: 1; source: "elm/entry/selection/default"; // selection under - source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under description { state: "default" 0.0; + fixed: 1 0; text { - style: "entry_single_textblock_style"; - repch: "*"; + style: "entry_textblock_style_mixedwrap"; + min: 0 1; + align: 0.0 0.0; + } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + text { + style: "entry_textblock_disabled_style_mixedwrap"; + } + } + } + } + programs { + program { name: "focus"; + signal: "load"; + source: ""; + action: FOCUS_SET; + target: "elm.text"; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "elm.text"; + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.text"; + } + } + } + + group { name: "elm/entry/base-noedit-charwrap/default"; + parts { + part { name: "elm.text"; + type: TEXTBLOCK; + mouse_events: 1; + scale: 1; + entry_mode: PLAIN; + select_mode: EXPLICIT; + multiline: 1; + source: "elm/entry/selection/default"; // selection under + source5: "elm/entry/anchor/default"; // anchor under + description { state: "default" 0.0; + fixed: 1 0; + text { + style: "entry_textblock_style_charwrap"; + min: 0 1; + align: 0.0 0.0; + } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + text { + style: "entry_textblock_disabled_style_charwrap"; + } + } + } + } + programs { + program { name: "focus"; + signal: "load"; + source: ""; + action: FOCUS_SET; + target: "elm.text"; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "elm.text"; + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.text"; + } + } + } + + group { name: "elm/entry/base-nowrap-noedit/default"; + parts { + part { name: "elm.text"; + type: TEXTBLOCK; + mouse_events: 1; + scale: 1; + entry_mode: PLAIN; + select_mode: EXPLICIT; + multiline: 1; + source: "elm/entry/selection/default"; // selection under + source5: "elm/entry/anchor/default"; // anchor under + description { state: "default" 0.0; + text { + style: "entry_textblock_style"; min: 1 1; - max: 0 1; + align: 0.0 0.0; } } description { state: "disabled" 0.0; inherit: "default" 0.0; text { - style: "entry_single_textblock_disabled_style"; + style: "entry_textblock_disabled_style"; } } } @@ -10002,7 +10003,7 @@ collections { image.normal: "shadow.png"; } } - + part { name: "elm.swallow.content"; type: SWALLOW; @@ -10012,7 +10013,7 @@ collections { fixed: 1 1; } } - + part { name: "border"; type: IMAGE; @@ -10218,121 +10219,63 @@ collections { /////////////////////////////////////////////////////////////////////////////// - group { name: "elm/icon/home/default"; alias: "elm/icon/toolbar/home/default"; min: 32 32; - images.image: "icon_home.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_home.png"; } } } } - group { name: "elm/icon/close/default"; alias: "elm/icon/toolbar/close/default"; min: 32 32; - images.image: "icon_close.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_close.png"; } } } } - group { name: "elm/icon/apps/default"; alias: "elm/icon/toolbar/apps/default"; min: 32 32; - images.image: "icon_apps.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_apps.png"; } } } } - group { name: "elm/icon/arrow_up/default"; alias: "elm/icon/toolbar/arrow_up/default"; min: 32 32; - images.image: "icon_arrow_up.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_arrow_up.png"; } } } } +#define GROUP_ALIAS_ICON(Name, Alias, File, Min, Max) \ + group { name: "elm/icon/"##Name##"/default"; min: Min Min; max: Max Max; \ + alias: "elm/icon/"##Alias##"/default"; \ + images.image: File COMP; parts { part { name: "base"; \ + description { aspect: 1.0 1.0; aspect_preference: BOTH; \ + image.normal: File; } } } } + +#define GROUP_ICON(Name, File, Min, Max) \ + group { name: "elm/icon/"##Name##"/default"; min: Min Min; max: Max Max; \ + images.image: File COMP; parts { part { name: "base"; \ + description { aspect: 1.0 1.0; aspect_preference: BOTH; \ + image.normal: File; } } } } + group { name: "elm/icon/arrow_down/default"; alias: "elm/icon/toolbar/arrow_down/default"; alias: "elm/icon/toolbar/more_menu/default"; min: 32 32; images.image: "icon_arrow_down.png" COMP; parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; image.normal: "icon_arrow_down.png"; } } } } - group { name: "elm/icon/arrow_left/default"; alias: "elm/icon/toolbar/arrow_left/default"; min: 32 32; - images.image: "icon_arrow_left.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_arrow_left.png"; } } } } - group { name: "elm/icon/arrow_right/default"; alias: "elm/icon/toolbar/arrow_right/default"; min: 32 32; - images.image: "icon_arrow_right.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_arrow_right.png"; } } } } - group { name: "elm/icon/chat/default"; alias: "elm/icon/toolbar/chat/default"; min: 32 32; - images.image: "icon_chat.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_chat.png"; } } } } - group { name: "elm/icon/clock/default"; alias: "elm/icon/toolbar/clock/default"; min: 32 32; - images.image: "icon_clock.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_clock.png"; } } } } - group { name: "elm/icon/delete/default"; alias: "elm/icon/toolbar/delete/default"; min: 32 32; - images.image: "icon_delete.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_delete.png"; } } } } - group { name: "elm/icon/edit/default"; alias: "elm/icon/toolbar/edit/default"; min: 32 32; - images.image: "icon_edit.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_edit.png"; } } } } - group { name: "elm/icon/refresh/default"; alias: "elm/icon/toolbar/refresh/default"; min: 32 32; - images.image: "icon_refresh.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_refresh.png"; } } } } - group { name: "elm/icon/folder/default"; alias: "elm/icon/toolbar/folder/default"; min: 32 32; - images.image: "icon_folder.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_folder.png"; } } } } - group { name: "elm/icon/file/default"; alias: "elm/icon/toolbar/file/default"; min: 32 32; - images.image: "icon_file.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_file.png"; } } } } + + GROUP_ALIAS_ICON("home", "toolbar/home", "icon_home.png", 32, 0); + GROUP_ALIAS_ICON("close", "toolbar/close", "icon_close.png", 32, 0); + GROUP_ALIAS_ICON("apps", "toolbar/apps", "icon_apps.png", 32, 0); + GROUP_ALIAS_ICON("arrow_up", "toolbar/arrow_up", "icon_arrow_up.png", 32, 0); + GROUP_ALIAS_ICON("arrow_left", "toolbar/arrow_left", "icon_arrow_left.png", 32, 0); + GROUP_ALIAS_ICON("arrow_right", "toolbar/arrow_right", "icon_arrow_right.png", 32, 0); + GROUP_ALIAS_ICON("chat", "toolbar/chat", "icon_chat.png", 32, 0); + GROUP_ALIAS_ICON("clock", "toolbar/clock", "icon_clock.png", 32, 0); + GROUP_ALIAS_ICON("delete", "toolbar/delete", "icon_delete.png", 32, 0); + GROUP_ALIAS_ICON("edit", "toolbar/edit", "icon_edit.png", 32, 0); + GROUP_ALIAS_ICON("refresh", "toolbar/refresh", "icon_refresh.png", 32, 0); + GROUP_ALIAS_ICON("folder", "toolbar/folder", "icon_folder.png", 32, 0); + GROUP_ALIAS_ICON("file", "toolbar/file", "icon_file.png", 32, 0); /////////////////////////////////////////////////////////////////////////////// - group { name: "elm/icon/menu/home/default"; min: 24 24; max: 24 24; - images.image: "icon_home.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_home.png"; } } } } - group { name: "elm/icon/menu/close/default"; min: 24 24; max: 24 24; - images.image: "icon_close.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_close.png"; } } } } - group { name: "elm/icon/menu/apps/default"; min: 24 24; max: 24 24; - images.image: "icon_apps.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_apps.png"; } } } } - group { name: "elm/icon/menu/arrow_up/default"; min: 24 24; max: 24 24; - images.image: "icon_arrow_up.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_arrow_up.png"; } } } } - group { name: "elm/icon/menu/arrow_down/default"; min: 24 24; max: 24 24; - images.image: "icon_arrow_down.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_arrow_down.png"; } } } } - group { name: "elm/icon/menu/arrow_left/default"; min: 24 24; max: 24 24; - images.image: "icon_arrow_left.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_arrow_left.png"; } } } } - group { name: "elm/icon/menu/arrow_right/default"; min: 24 24; max: 24 24; - images.image: "icon_arrow_right.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_arrow_right.png"; } } } } - group { name: "elm/icon/menu/chat/default"; min: 24 24; max: 24 24; - images.image: "icon_chat.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_chat.png"; } } } } - group { name: "elm/icon/menu/clock/default"; min: 24 24; max: 24 24; - images.image: "icon_clock.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_clock.png"; } } } } - group { name: "elm/icon/menu/delete/default"; min: 24 24; max: 24 24; - images.image: "icon_delete.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_delete.png"; } } } } - group { name: "elm/icon/menu/edit/default"; min: 24 24; max: 24 24; - images.image: "icon_edit.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_edit.png"; } } } } - group { name: "elm/icon/menu/refresh/default"; min: 24 24; max: 24 24; - images.image: "icon_refresh.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_refresh.png"; } } } } - group { name: "elm/icon/menu/folder/default"; min: 24 24; max: 24 24; - images.image: "icon_folder.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_folder.png"; } } } } - group { name: "elm/icon/menu/file/default"; min: 24 24; max: 24 24; - images.image: "icon_file.png" COMP; parts { part { name: "base"; - description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "icon_file.png"; } } } } + GROUP_ICON("menu/home", "icon_home.png", 24, 24); + GROUP_ICON("menu/close", "icon_close.png", 24, 24); + GROUP_ICON("menu/apps", "icon_apps.png", 24, 24); + GROUP_ICON("menu/arrow_up", "icon_arrow_up.png", 24, 24); + GROUP_ICON("menu/arrow_down", "icon_arrow_down.png", 24, 24); + GROUP_ICON("menu/arrow_left", "icon_arrow_left.png", 24, 24); + GROUP_ICON("menu/arrow_right", "icon_arrow_right.png", 24, 24); + GROUP_ICON("menu/chat", "icon_chat.png", 24, 24); + GROUP_ICON("menu/clock", "icon_clock.png", 24, 24); + GROUP_ICON("menu/delete", "icon_delete.png", 24, 24); + GROUP_ICON("menu/edit", "icon_edit.png", 24, 24); + GROUP_ICON("menu/refresh", "icon_refresh.png", 24, 24); + GROUP_ICON("menu/folder", "icon_folder.png", 24, 24); + GROUP_ICON("menu/file", "icon_file.png", 24, 24); + + GROUP_ICON("media_player/forward", "mp_forward.png", 16, 0); + GROUP_ICON("media_player/info", "mp_info.png", 16, 0); + GROUP_ICON("media_player/next", "mp_next.png", 16, 0); + GROUP_ICON("media_player/pause", "mp_pause.png", 16, 0); + GROUP_ICON("media_player/play", "mp_play.png", 16, 0); + GROUP_ICON("media_player/prev", "mp_prev.png", 16, 0); + GROUP_ICON("media_player/rewind", "mp_rewind.png", 16, 0); + GROUP_ICON("media_player/stop", "mp_stop.png", 16, 0); /////////////////////////////////////////////////////////////////////////////// group { name: "elm/toolbar/base/default"; @@ -11803,6 +11746,7 @@ collections { } } part { name: "image_1_whole"; + type: RECT; description { state: "default" 0.0; color: 255 255 255 255; @@ -11869,6 +11813,7 @@ collections { } } part { name: "image_2_whole"; + type: RECT; description { state: "default" 0.0; visible: 1; @@ -14529,369 +14474,13 @@ collections { } } - group { name: "elm/slider/horizontal/indicator/default"; - alias: "elm/slider/horizontal/indicator/disabled"; - alias: "elm/slider/vertical/indicator/default"; - alias: "elm/slider/vertical/indicator/disabled"; - images { - image: "sl_bt_0.png" COMP; - image: "sl_bt_1.png" COMP; - image: "sl_bt_2.png" COMP; - image: "sl_bt_3.png" COMP; - image: "sl_bt2_0_0.png" COMP; - image: "sl_bt2_0_1.png" COMP; - image: "sl_bt2_0_2.png" COMP; - image: "sl_bt2_1.png" COMP; - image: "sl_bt2_2.png" COMP; - } - script { - public value_hide = 0; - public set_value_show() { - set_int(value_hide, 0); - } - public set_value_hide() { - set_int(value_hide, 1); - } - public thumb_down() { - if (get_int(value_hide) == 1) { - set_state(PART:"elm.indicator", "default", 0.0); - set_state(PART:"button3", "default", 0.0); - set_state(PART:"button4", "default", 0.0); - set_state(PART:"button5", "default", 0.0); - set_state(PART:"button6", "default", 0.0); - set_state(PART:"button7", "default", 0.0); - } else { - set_state(PART:"elm.indicator", "visible", 0.0); - set_state(PART:"button3", "visible", 0.0); - set_state(PART:"button4", "visible", 0.0); - set_state(PART:"button5", "visible", 0.0); - set_state(PART:"button6", "visible", 0.0); - set_state(PART:"button7", "visible", 0.0); - } - } - public thumb_up() { - set_state(PART:"elm.indicator", "default", 0.0); - set_state(PART:"button3", "default", 0.0); - set_state(PART:"button4", "default", 0.0); - set_state(PART:"button5", "default", 0.0); - set_state(PART:"button6", "default", 0.0); - set_state(PART:"button7", "default", 0.0); - } - } - parts { - part { name: "button_events"; - type: RECT; - mouse_events: 1; - description { state: "default" 0.0; - fixed: 1 1; - min: 16 16; - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - color: 0 0 0 0; - } - } - part { name: "button0"; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - max: 17 999; - min: 17 24; - image { - normal: "sl_bt_0.png"; - border: 5 5 5 10; - } - fill.smooth: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image { - normal: "sl_bt_3.png"; - border: 5 5 5 10; - } - } - } - part { name: "button1"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "button0"; - rel2 { - to: "button0"; - relative: 1.0 0.5; - offset: -1 -5; - } - image { - normal: "sl_bt_1.png"; - border: 5 5 5 0; - } - } - } - part { name: "button2"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "button0"; - rel2.to: "button0"; - image { - normal: "sl_bt_2.png"; - border: 5 5 5 10; - } - fill.smooth: 0; - } - } - part { name: "button3"; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - min: 8 32; - align: 1.0 0.5; - rel1 { - to_x: "elm.indicator"; - to_y: "button4"; - relative: 0.0 0.0; - offset: -7 0; - } - rel2 { - to: "button4"; - relative: 0.0 1.0; - offset: -1 -1; - } - image { - normal: "sl_bt2_0_0.png"; - border: 6 0 6 12; - } - fill.smooth: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "button4"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - max: 15 999; - min: 15 32; - rel1 { - to_x: "button0"; - to_y: "elm.indicator"; - offset: 0 0; - } - rel2.to: "button0"; - image { - normal: "sl_bt2_0_1.png"; - border: 0 0 6 12; - } - fill.smooth: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "button5"; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - min: 8 32; - align: 0.0 0.5; - rel1 { - to: "button4"; - relative: 1.0 0.0; - offset: 0 0; - } - rel2 { - to_x: "elm.indicator"; - to_y: "button4"; - relative: 1.0 1.0; - offset: 6 -1; - } - image { - normal: "sl_bt2_0_2.png"; - border: 0 6 6 12; - } - fill.smooth: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "elm.indicator"; - type: TEXT; - mouse_events: 0; - effect: SOFT_SHADOW; - scale: 1; - description { state: "default" 0.0; - visible: 0; - fixed: 1 1; - align: 0.5 1.0; - rel1 { - to: "button0"; - relative: 0.0 -0.25; - offset: 0 0; - } - rel2 { - to_x: "button0"; - relative: 1.0 -0.25; - offset: -1 0; - } - color: 224 224 224 255; - color3: 0 0 0 64; - text { - font: "Sans,Edje-Vera"; - size: 10; - min: 0 0; - align: 0.5 0.5; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - text.min: 1 1; - rel1.offset: 0 -1; - rel2.offset: -1 -1; - } - } - part { name: "button6"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - rel1.to: "button3"; - rel2 { - to: "button5"; - relative: 1.0 0.3; - offset: -1 -1; - } - image { - normal: "sl_bt2_1.png"; - border: 5 5 5 0; - } - fill.smooth: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "button7"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - rel1.to: "button3"; - rel2.to: "button5"; - image { - normal: "sl_bt2_2.png"; - border: 5 5 5 0; - middle: 0; - } - fill.smooth: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - } - programs { - program { name: "set_val_show"; - signal: "elm,state,val,show"; - source: "elm"; - script { - set_value_show(); - } - } - program { name: "set_val_hide"; - signal: "elm,state,val,hide"; - source: "elm"; - script { - set_value_hide(); - } - } - program { name: "val_show"; - signal: "mouse,down,*"; - source: "button_events"; - script { - thumb_down(); - } - - } - program { name: "val_hide"; - signal: "mouse,up,*"; - source: "button_events"; - script { - thumb_up(); - } - } - program { - name: "go_disabled"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "button0"; - } - program { - name: "go_enabled"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "button0"; - } - } - } - group { name: "elm/slider/vertical/default"; images { - image: "slv_bg.png" COMP; - image: "slv_bg_over.png" COMP; - - image: "sl_bt_0.png" COMP; - image: "sl_bt_1.png" COMP; - image: "sl_bt_2.png" COMP; - image: "sl_bt_3.png" COMP; - image: "sl_bt2_0_0.png" COMP; - image: "sl_bt2_0_1.png" COMP; - image: "sl_bt2_0_2.png" COMP; - image: "sl_bt2_1.png" COMP; - image: "sl_bt2_2.png" COMP; + image: "slv_bg.png" COMP; + image: "slv_bg_over.png" COMP; image: "slv_units.png" COMP; } - script { - public value_hide = 0; - public set_value_show() { - set_int(value_hide, 0); - } - public set_value_hide() { - set_int(value_hide, 1); - } - public thumb_down() { - if (get_int(value_hide) == 1) { - set_state(PART:"elm.indicator", "default", 0.0); - set_state(PART:"button3", "default", 0.0); - set_state(PART:"button4", "default", 0.0); - set_state(PART:"button5", "default", 0.0); - set_state(PART:"button6", "default", 0.0); - set_state(PART:"button7", "default", 0.0); - } else { - set_state(PART:"elm.indicator", "visible", 0.0); - set_state(PART:"button3", "visible", 0.0); - set_state(PART:"button4", "visible", 0.0); - set_state(PART:"button5", "visible", 0.0); - set_state(PART:"button6", "visible", 0.0); - set_state(PART:"button7", "visible", 0.0); - } - } - public thumb_up() { - set_state(PART:"elm.indicator", "default", 0.0); - set_state(PART:"button3", "default", 0.0); - set_state(PART:"button4", "default", 0.0); - set_state(PART:"button5", "default", 0.0); - set_state(PART:"button6", "default", 0.0); - set_state(PART:"button7", "default", 0.0); - } - } parts { part { name: "base"; mouse_events: 0; @@ -14978,129 +14567,129 @@ collections { } } part { name: "bg"; - type: RECT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - rel1.to: "elm.swallow.bar"; - rel2.to: "elm.swallow.bar"; - color: 0 0 0 0; - } - } - part { name: "elm.swallow.bar"; - type: SWALLOW; + type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + rel1.to: "elm.swallow.bar"; + rel2.to: "elm.swallow.bar"; + color: 0 0 0 0; + } + } + part { name: "elm.swallow.bar"; + type: SWALLOW; scale: 1; - description { state: "default" 0.0; - min: 24 48; - max: 24 9999; - align: 0.5 1.0; - rel1 { + description { state: "default" 0.0; + min: 24 48; + max: 24 9999; + align: 0.5 1.0; + rel1 { to_y: "elm.text"; relative: 0.0 1.0; offset: 0 10; } - rel2 { + rel2 { to_y: "elm.units"; relative: 1.0 0.0; offset: -1 -8; } - } - } - part { name: "elm.swallow.icon"; - type: SWALLOW; - description { state: "default" 0.0; - visible: 0; - align: 0.5 0.0; - rel1 { + } + } + part { name: "elm.swallow.icon"; + type: SWALLOW; + description { state: "default" 0.0; + visible: 0; + align: 0.5 0.0; + rel1 { offset: 0 4; to_x: "elm.swallow.bar"; } - rel2 { + rel2 { offset: -1 3; relative: 1.0 0.0; to_x: "elm.swallow.bar"; } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - aspect: 1.0 1.0; - aspect_preference: HORIZONTAL; - rel2.offset: -1 4; - } - } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + aspect: 1.0 1.0; + aspect_preference: HORIZONTAL; + rel2.offset: -1 4; + } + } part { name: "elm.text"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; + type: TEXT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; fixed: 0 1; align: 0.5 0.0; - rel1.to_y: "elm.swallow.icon"; - rel1.relative: 0.0 1.0; + rel1.to_y: "elm.swallow.icon"; + rel1.relative: 0.0 1.0; rel1.offset: 0 -1; - rel2.to_y: "elm.swallow.icon"; - rel2.relative: 1.0 1.0; - rel2.offset: -1 -1; - color: 0 0 0 255; - text { - font: "Sans,Edje-Vera"; - size: 10; - min: 0 0; - align: 0.5 0.0; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - text.min: 1 1; + rel2.to_y: "elm.swallow.icon"; + rel2.relative: 1.0 1.0; + rel2.offset: -1 -1; + color: 0 0 0 255; + text { + font: "Sans,Edje-Vera"; + size: 10; + min: 0 0; + align: 0.5 0.0; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + text.min: 1 1; rel1.offset: 4 0; rel2.offset: -5 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 255 128 128 128; - visible: 0; - } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - color: 0 0 0 128; - color3: 0 0 0 0; - visible: 1; - text.min: 1 1; - } - } - part { + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 255 128 128 128; + visible: 0; + } + description { state: "disabled_visible" 0.0; + inherit: "default" 0.0; + color: 0 0 0 128; + color3: 0 0 0 0; + visible: 1; + text.min: 1 1; + } + } + part { name: "elm.swallow.end"; type: SWALLOW; - description { + description { state: "default" 0.0; - visible: 0; - align: 0.5 1.0; - rel1 { + visible: 0; + align: 0.5 1.0; + rel1 { offset: 0 -4; relative: 0.0 1.0; to_x: "elm.swallow.bar"; } - rel2 { + rel2 { offset: -1 -3; to_x: "elm.swallow.bar"; } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - aspect: 1.0 1.0; - aspect_preference: HORIZONTAL; - rel2.offset: -1 -4; - } - } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + aspect: 1.0 1.0; + aspect_preference: HORIZONTAL; + rel2.offset: -1 -4; + } + } part { name: "units"; mouse_events: 0; description { state: "default" 0.0; - visible: 0; + visible: 0; rel1 { to: "elm.units"; offset: -8 0; @@ -15115,61 +14704,63 @@ collections { } fill.smooth: 0; } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; } } part { name: "elm.units"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; + type: TEXT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + fixed: 1 1; + align: 0.5 1.0; + rel1.relative: 0.0 0.0; + rel1.to_y: "elm.swallow.end"; + rel1.offset: 8 0; + rel2.relative: 1.0 0.0; + rel2.to_y: "elm.swallow.end"; + rel2.offset: -9 0; + color: 0 0 0 255; + text { + font: "Sans,Edje-Vera"; + size: 10; + min: 0 0; + align: 0.5 0.0; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; fixed: 1 1; - align: 0.5 1.0; - rel1.relative: 0.0 0.0; - rel1.to_y: "elm.swallow.end"; - rel1.offset: 8 0; - rel2.relative: 1.0 0.0; - rel2.to_y: "elm.swallow.end"; - rel2.offset: -9 0; - color: 0 0 0 255; - text { - font: "Sans,Edje-Vera"; - size: 10; - min: 0 0; - align: 0.5 0.0; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; + visible: 1; + text.min: 1 1; + rel1.offset: 8 -9; + rel2.offset: -9 -9; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 0 0 0 128; + color3: 0 0 0 0; + visible: 0; + } + description { state: "disabled_visible" 0.0; + inherit: "default" 0.0; fixed: 1 1; - visible: 1; - text.min: 1 1; - rel1.offset: 8 -9; - rel2.offset: -9 -9; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 0 0 0 128; - color3: 0 0 0 0; - visible: 0; - } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - fixed: 1 1; - visible: 1; - text.min: 1 1; - rel1.offset: 8 -9; - rel2.offset: -9 -9; - color: 0 0 0 128; - color3: 0 0 0 0; - } - } + visible: 1; + text.min: 1 1; + rel1.offset: 8 -9; + rel2.offset: -9 -9; + color: 0 0 0 128; + color3: 0 0 0 0; + } + } part { name: "elm.dragable.slider"; - type: RECT; - mouse_events: 0; + type: GROUP; + source: "elm/slider/vertical/indicator/default"; + mouse_events: 1; + repeat_events: 1; scale: 1; dragable { x: 0 0 0; @@ -15191,30 +14782,240 @@ collections { color: 0 0 0 0; } } + part { name: "disabler"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + visible: 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + } + + programs { + program { name: "text_show"; + signal: "elm,state,text,visible"; + source: "elm"; + action: STATE_SET "visible" 0.0; + target: "elm.text"; + } + program { name: "text_hide"; + signal: "elm,state,text,hidden"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.text"; + } + program { name: "icon_show"; + signal: "elm,state,icon,visible"; + source: "elm"; + action: STATE_SET "visible" 0.0; + target: "elm.swallow.icon"; + } + program { name: "icon_hide"; + signal: "elm,state,icon,hidden"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.icon"; + } + program { name: "end_show"; + signal: "elm,state,end,visible"; + source: "elm"; + action: STATE_SET "visible" 0.0; + target: "elm.swallow.end"; + } + program { name: "end_hide"; + signal: "elm,state,end,hidden"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.end"; + } + program { name: "units_show"; + signal: "elm,state,units,visible"; + source: "elm"; + action: STATE_SET "visible" 0.0; + target: "elm.units"; + target: "units"; + } + program { name: "units_hide"; + signal: "elm,state,units,hidden"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.units"; + target: "units"; + } + program { name: "invert_on"; + signal: "elm,state,inverted,on"; + source: "elm"; + action: STATE_SET "inverted" 0.0; + target: "level"; + target: "level2"; + } + program { name: "invert_off"; + signal: "elm,state,inverted,off"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "level"; + target: "level2"; + } + program { + name: "go_disabled"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; +// target: "button0"; + target: "disabler"; + after: "disable_text"; + after: "disable_ind"; + } + + program { name: "disable_ind"; + action: SIGNAL_EMIT "elm.dragable.slider:elm,state,disabled" "elm"; + } + + program { name: "disable_text"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"elm.text", "disabled_visible", 0.0); + else + set_state(PART:"elm.text", "disabled", 0.0); + + get_state(PART:"elm.units", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"elm.units", "disabled_visible", 0.0); + else + set_state(PART:"elm.units", "disabled", 0.0); + + get_state(PART:"level2", st, 30, vl); + if (!strcmp(st, "inverted")) + { + set_state(PART:"level", "disabled_inverted", 0.0); + set_state(PART:"level2", "disabled_inverted", 0.0); + } + else + { + set_state(PART:"level", "disabled", 0.0); + set_state(PART:"level2", "disabled", 0.0); + } + } + } + + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; +// target: "button0"; + target: "disabler"; + after: "enable_text"; + after: "enable_ind"; + } + + program { name: "enable_ind"; + action: SIGNAL_EMIT "elm.dragable.slider:elm,state,enabled" "elm"; + } + program { name: "enable_text"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "disabled_visible")) + set_state(PART:"elm.text", "visible", 0.0); + else + set_state(PART:"elm.text", "default", 0.0); + + get_state(PART:"elm.units", st, 30, vl); + if (!strcmp(st, "disabled_visible")) + set_state(PART:"elm.units", "visible", 0.0); + else + set_state(PART:"elm.units", "default", 0.0); + + get_state(PART:"level2", st, 30, vl); + if (!strcmp(st, "disabled_inverted")) + { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "inverted", 0.0); + } + else + { + set_state(PART:"level", "default", 0.0); + set_state(PART:"level2", "default", 0.0); + } + } + } + } + } + group { name: "elm/slider/horizontal/indicator/default"; + alias: "elm/slider/horizontal/indicator/disabled"; + alias: "elm/slider/vertical/indicator/default"; + alias: "elm/slider/vertical/indicator/disabled"; + images { + image: "sl_bt_0.png" COMP; + image: "sl_bt_1.png" COMP; + image: "sl_bt_2.png" COMP; + image: "sl_bt_3.png" COMP; + image: "sl_bt2_0_0.png" COMP; + image: "sl_bt2_0_1.png" COMP; + image: "sl_bt2_0_2.png" COMP; + image: "sl_bt2_1.png" COMP; + image: "sl_bt2_2.png" COMP; + } + script { + public value_hide = 0; + public set_value_show() { + set_int(value_hide, 0); + } + public set_value_hide() { + set_int(value_hide, 1); + } + public thumb_down() { + if (get_int(value_hide) == 1) { + set_state(PART:"elm.indicator", "default", 0.0); + set_state(PART:"button3", "default", 0.0); + set_state(PART:"button4", "default", 0.0); + set_state(PART:"button5", "default", 0.0); + set_state(PART:"button6", "default", 0.0); + set_state(PART:"button7", "default", 0.0); + } else { + set_state(PART:"elm.indicator", "visible", 0.0); + set_state(PART:"button3", "visible", 0.0); + set_state(PART:"button4", "visible", 0.0); + set_state(PART:"button5", "visible", 0.0); + set_state(PART:"button6", "visible", 0.0); + set_state(PART:"button7", "visible", 0.0); + } + } + public thumb_up() { + set_state(PART:"elm.indicator", "default", 0.0); + set_state(PART:"button3", "default", 0.0); + set_state(PART:"button4", "default", 0.0); + set_state(PART:"button5", "default", 0.0); + set_state(PART:"button6", "default", 0.0); + set_state(PART:"button7", "default", 0.0); + } + } + parts { part { name: "button_events"; - type: RECT; - dragable { - events: "elm.dragable.slider"; - } + type: RECT; mouse_events: 1; - description { state: "default" 0.0; + description { state: "default" 0.0; fixed: 1 1; min: 16 16; aspect: 1.0 1.0; - aspect_preference: HORIZONTAL; - rel1.to_y: "elm.dragable.slider"; - rel2.to_y: "elm.dragable.slider"; - color: 0 0 0 0; - } - } + aspect_preference: VERTICAL; + color: 0 0 0 0; + } + } part { name: "button0"; mouse_events: 0; description { state: "default" 0.0; fixed: 1 1; max: 17 999; min: 17 24; - rel1.to: "elm.dragable.slider"; - rel2.to: "elm.dragable.slider"; image { normal: "sl_bt_0.png"; border: 5 5 5 10; @@ -15259,7 +15060,8 @@ collections { part { name: "button3"; mouse_events: 0; description { state: "default" 0.0; - visible: 0; + fixed: 1 1; + visible: 0; min: 8 32; align: 1.0 0.5; rel1 { @@ -15279,22 +15081,21 @@ collections { } fill.smooth: 0; } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; } } part { name: "button4"; mouse_events: 0; description { state: "default" 0.0; - visible: 0; + visible: 0; max: 15 999; min: 15 32; - fixed: 1 1; rel1 { to_x: "button0"; to_y: "elm.indicator"; - offset: 0 -7; + offset: 0 0; } rel2.to: "button0"; image { @@ -15303,15 +15104,16 @@ collections { } fill.smooth: 0; } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; } } part { name: "button5"; mouse_events: 0; description { state: "default" 0.0; - visible: 0; + fixed: 1 1; + visible: 0; min: 8 32; align: 0.0 0.5; rel1 { @@ -15331,51 +15133,51 @@ collections { } fill.smooth: 0; } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; } } part { name: "elm.indicator"; - type: TEXT; - mouse_events: 0; + type: TEXT; + mouse_events: 0; effect: SOFT_SHADOW; - scale: 1; - description { state: "default" 0.0; - visible: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; fixed: 1 1; align: 0.5 1.0; - rel1 { + rel1 { to: "button0"; - relative: 0.0 -1.0; + relative: 0.0 -0.25; offset: 0 0; } - rel2 { - to: "button0"; - relative: 1.0 -1.0; + rel2 { + to_x: "button0"; + relative: 1.0 -0.25; offset: -1 0; } - color: 224 224 224 255; - color3: 0 0 0 64; - text { - font: "Sans,Edje-Vera"; - size: 10; - min: 0 0; - align: 0.5 0.5; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - text.min: 1 1; + color: 224 224 224 255; + color3: 0 0 0 64; + text { + font: "Sans,Edje-Vera"; + size: 10; + min: 0 0; + align: 0.5 0.5; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + text.min: 1 1; rel1.offset: 0 -1; rel2.offset: -1 -1; - } - } + } + } part { name: "button6"; mouse_events: 0; description { state: "default" 0.0; - visible: 0; + visible: 0; rel1.to: "button3"; rel2 { to: "button5"; @@ -15388,15 +15190,15 @@ collections { } fill.smooth: 0; } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; } } part { name: "button7"; mouse_events: 0; description { state: "default" 0.0; - visible: 0; + visible: 0; rel1.to: "button3"; rel2.to: "button5"; image { @@ -15406,193 +15208,56 @@ collections { } fill.smooth: 0; } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; } } - part { name: "disabler"; - type: RECT; - description { state: "default" 0.0; - color: 0 0 0 0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - } - + } programs { - program { name: "text_show"; - signal: "elm,state,text,visible"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.text"; - } - program { name: "text_hide"; - signal: "elm,state,text,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; - } - program { name: "icon_show"; - signal: "elm,state,icon,visible"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.swallow.icon"; - } - program { name: "icon_hide"; - signal: "elm,state,icon,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; - } - program { name: "end_show"; - signal: "elm,state,end,visible"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.swallow.end"; - } - program { name: "end_hide"; - signal: "elm,state,end,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.end"; - } - program { name: "units_show"; - signal: "elm,state,units,visible"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.units"; - target: "units"; - } - program { name: "units_hide"; - signal: "elm,state,units,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.units"; - target: "units"; - } - program { name: "invert_on"; - signal: "elm,state,inverted,on"; - source: "elm"; - action: STATE_SET "inverted" 0.0; - target: "level"; - target: "level2"; - } - program { name: "invert_off"; - signal: "elm,state,inverted,off"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "level"; - target: "level2"; - } - program { name: "set_val_show"; - signal: "elm,state,val,show"; - source: "elm"; - script { + program { name: "set_val_show"; + signal: "elm,state,val,show"; + source: "elm"; + script { set_value_show(); - } - } - program { name: "set_val_hide"; - signal: "elm,state,val,hide"; - source: "elm"; - script { + } + } + program { name: "set_val_hide"; + signal: "elm,state,val,hide"; + source: "elm"; + script { set_value_hide(); - } - } - program { name: "val_show"; - signal: "mouse,down,*"; - source: "elm.dragable.slider"; - script { + } + } + program { name: "val_show"; + signal: "mouse,down,*"; + source: "button_events"; + script { thumb_down(); - } - } - program { name: "val_hide"; - signal: "mouse,up,*"; - source: "elm.dragable.slider"; - script { + } + + } + program { name: "val_hide"; + signal: "mouse,up,*"; + source: "button_events"; + script { thumb_up(); - } - } - program { - name: "go_disabled"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "button0"; - target: "disabler"; - after: "disable_text"; - } - program { name: "disable_text"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "visible")) - set_state(PART:"elm.text", "disabled_visible", 0.0); - else - set_state(PART:"elm.text", "disabled", 0.0); - - get_state(PART:"elm.units", st, 30, vl); - if (!strcmp(st, "visible")) - set_state(PART:"elm.units", "disabled_visible", 0.0); - else - set_state(PART:"elm.units", "disabled", 0.0); - - get_state(PART:"level2", st, 30, vl); - if (!strcmp(st, "inverted")) - { - set_state(PART:"level", "disabled_inverted", 0.0); - set_state(PART:"level2", "disabled_inverted", 0.0); - } - else - { - set_state(PART:"level", "disabled", 0.0); - set_state(PART:"level2", "disabled", 0.0); - } - } - } - - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "button0"; - target: "disabler"; - after: "enable_text"; - } - program { name: "enable_text"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "disabled_visible")) - set_state(PART:"elm.text", "visible", 0.0); - else - set_state(PART:"elm.text", "default", 0.0); - - get_state(PART:"elm.units", st, 30, vl); - if (!strcmp(st, "disabled_visible")) - set_state(PART:"elm.units", "visible", 0.0); - else - set_state(PART:"elm.units", "default", 0.0); - - get_state(PART:"level2", st, 30, vl); - if (!strcmp(st, "disabled_inverted")) - { - set_state(PART:"level", "inverted", 0.0); - set_state(PART:"level2", "inverted", 0.0); - } - else - { - set_state(PART:"level", "default", 0.0); - set_state(PART:"level2", "default", 0.0); - } - } - } + } + } + program { + name: "go_disabled"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "button0"; + } + program { + name: "go_enabled"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "button0"; + } } } @@ -16031,6 +15696,7 @@ collections { } /////////////////////////////////////////////////////////////////////////////// + group { name: "elm/genlist/item/default/default"; data.item: "stacking" "above"; data.item: "selectraise" "on"; @@ -23915,7 +23581,7 @@ collections { font: "Sans,Edje-Vera"; size: 10; min: 0 1; - align: 0.0 0.5; + align: -1.0 0.5; } } description { state: "visible" 0.0; @@ -24059,6 +23725,7 @@ collections { } } } + /////////////////////////////////////////////////////////////////////////////// group { name: "elm/radio/base/default"; images { @@ -24143,7 +23810,7 @@ collections { font: "Sans,Edje-Vera"; size: 10; min: 0 0; - align: 0.0 0.5; + align: -1.0 0.5; } } description { state: "visible" 0.0; @@ -24275,6 +23942,7 @@ collections { } } } + group { name: "elm/genlist/tree_compress_odd/double_label/default"; data.item: "stacking" "below"; data.item: "selectraise" "on"; @@ -26392,6 +26060,7 @@ collections { } } + /////////////////////////////////////////////////////////////////////////////// group { name: "elm/pager/base/default"; data.item: "onshow" "raise"; @@ -27476,6 +27145,7 @@ collections { } parts { part { name: "elm.background.progressbar"; + type: RECT; mouse_events: 0; description { state: "default" 0.0; @@ -27743,6 +27413,7 @@ collections { } } part { name: "progress-rect"; + type: RECT; mouse_events: 0; description { state: "default" 0.0; @@ -29573,7 +29244,6 @@ collections { relative: 0.0 0.0; offset: 0 0; } - color: 0 0 255 128; } } part { name: "elm.swallow.event.0"; @@ -29808,6 +29478,30 @@ collections { color: 0 0 0 0; } } + part { name: "reorder_bg"; + mouse_events: 0; + description { state: "default" 0.0; + visible: 0; + color: 255 255 255 0; + rel1 { + relative: 0.0 0.0; + offset: -10 -10; + } + rel2 { + relative: 1.0 1.0; + offset: 12 12; + } + image { + normal: "bt_bases.png"; + border: 6 6 6 6; + } + } + description { state: "enabled" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + } + } part { name: "base_sh"; mouse_events: 0; description { state: "default" 0.0; @@ -30044,6 +29738,20 @@ collections { action: STATE_SET "default" 0.0; target: "disclip"; } + program { name: "go_reorder_disabled"; + signal: "elm,state,reorder,disabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "reorder_bg"; + transition: DECELERATE 0.5; + } + program { name: "go_reorder_enabled"; + signal: "elm,state,reorder,enabled"; + source: "elm"; + action: STATE_SET "enabled" 0.0; + target: "reorder_bg"; + transition: DECELERATE 0.5; + } } } group { name: "elm/gengrid/item/default_style/default"; @@ -32194,20 +31902,20 @@ collections { ///////////////////////////////////////////////////////////////////////////// group { name: "elm/panes/vertical/default"; - images { - image: "bt_base1.png" COMP; - image: "bt_base2.png" COMP; - image: "bt_hilight.png" COMP; - image: "bt_shine.png" COMP; - image: "bt_glow.png" COMP; - image: "bt_dis_base.png" COMP; - image: "bt_dis_hilight.png" COMP; - image: "arrow_right.png" COMP; - image: "arrow_left.png" COMP; - } - script { - public state_pair = 0; //0:both content are not set, 1:both content are set - } + images { + image: "bt_base1.png" COMP; + image: "bt_base2.png" COMP; + image: "bt_hilight.png" COMP; + image: "bt_shine.png" COMP; + image: "bt_glow.png" COMP; + image: "bt_dis_base.png" COMP; + image: "bt_dis_hilight.png" COMP; + image: "arrow_right.png" COMP; + image: "arrow_left.png" COMP; + } + script { + public state_pair = 0; //0:both content are not set, 1:both content are set + } parts { part @@ -32494,7 +32202,6 @@ collections { visible: 1; } } - } programs { program { @@ -32744,17 +32451,17 @@ collections { group { name: "elm/panes/horizontal/default"; - images { - image: "bt_base1.png" COMP; - image: "bt_base2.png" COMP; - image: "bt_hilight.png" COMP; - image: "bt_shine.png" COMP; - image: "bt_glow.png" COMP; - image: "bt_dis_base.png" COMP; - image: "bt_dis_hilight.png" COMP; - image: "arrow_up.png" COMP; - image: "arrow_down.png" COMP; - } + images { + image: "bt_base1.png" COMP; + image: "bt_base2.png" COMP; + image: "bt_hilight.png" COMP; + image: "bt_shine.png" COMP; + image: "bt_glow.png" COMP; + image: "bt_dis_base.png" COMP; + image: "bt_dis_hilight.png" COMP; + image: "arrow_up.png" COMP; + image: "arrow_down.png" COMP; + } script { public state_pair = 0; //0:both content are not set, 1:both content are set } @@ -33009,7 +32716,6 @@ collections { visible: 1; } } - } programs { program { @@ -33158,8 +32864,6 @@ collections { } } - - ///////////////////////////////////////////////////////////////////////////// // PANEL ///////////////////////////////////////////////////////////////////////////// @@ -33801,7 +33505,7 @@ collections { part { name: "elm.swallow.shelf"; type: SWALLOW; description { state: "default" 0.0; - fixed: 1 1; + fixed: 0 1; align: 0.0 0.0; rel2.relative: 1.0 0.0; } @@ -33809,6 +33513,7 @@ collections { part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; + fixed: 0 1; align: 0.5 0.5; rel1.relative: 0.0 1.0; rel1.to_y: "elm.swallow.shelf"; @@ -33821,8 +33526,6 @@ collections { description { state: "default" 0.0; fixed: 0 1; align: 0.0 1.0; - rel1.relative: 0.0 0.0; - rel1.to_y: "elm.swallow.panel"; rel2.relative: 1.0 0.0; rel2.to_y: "elm.swallow.panel"; } @@ -33830,7 +33533,7 @@ collections { part { name: "elm.swallow.panel"; type: SWALLOW; description { state: "default" 0.0; - fixed: 1 1; + fixed: 0 1; align: 0.0 1.0; rel1.relative: 0.0 1.0; } @@ -35636,6 +35339,9 @@ collections { data { item: "len_threshold" "14"; + item: "display_item_num" "3"; + item: "min_height" "-1"; + item: "min_width" "-1"; } parts { @@ -37338,8 +37044,253 @@ collections { } } } -} + group { + name: "elm/player/base/default"; + min: 290 26; + parts { + part { + type: SWALLOW; + name: "media_player/slider"; + description { + rel2 { + relative: 1.0 0.0; + to_x: "media_player/forward"; + } + } + } + part { + type: SWALLOW; + name: "media_player/rewind"; + + description { + rel1 { + to_y: "media_player/slider"; + offset: 42 0; + relative: 0.0 1.0; + } + rel2 { + relative: 0.0 1.0; + } + } + } + part { + type: SWALLOW; + name: "media_player/prev"; + + description { + rel1 { + to: "media_player/rewind"; + relative: 1.0 0.0; + } + rel2 { + to: "media_player/rewind"; + relative: 2.0 1.0; + } + } + } + part { + type: SWALLOW; + name: "media_player/play"; + + description { + rel1 { + to: "media_player/prev"; + relative: 1.0 0.0; + } + rel2 { + to: "media_player/prev"; + relative: 2.0 1.0; + } + } + description { + state: hidden 0.0; + inherit: default 0.0; + visible: 0; + } + } + part { + type: SWALLOW; + name: "media_player/pause"; + description { + rel1.to: "media_player/play"; + rel2.to: "media_player/play"; + } + description { + state: hidden 0.0; + inherit: default 0.0; + visible: 0; + } + } + part { + type: SWALLOW; + name: "media_player/info"; + description { + rel1 { + to: "media_player/play"; + relative: 1.0 0.0; + } + rel2 { + to: "media_player/play"; + relative: 2.0 1.0; + } + } + } + + part { + type: SWALLOW; + name: "media_player/stop"; + description { + rel1 { + to: "media_player/info"; + relative: 3.0 0.0; + } + rel2 { + to: "media_player/info"; + relative: 4.0 1.0; + } + } + } + part { + type: SWALLOW; + name: "media_player/next"; + description { + rel1 { + to: "media_player/stop"; + relative: 1.0 0.0; + } + rel2 { + to: "media_player/stop"; + relative: 2.0 1.0; + } + } + } + part { + type: SWALLOW; + name: "media_player/forward"; + description { + rel1 { + to: "media_player/next"; + relative: 1.0 0.0; + } + rel2 { + to: "media_player/next"; + relative: 2.0 1.0; + } + } + } + } + programs { + program { + signal: "show"; + source: ""; + after: "pause/0"; + } + program { + signal: "elm,player,play"; + source: "elm"; + after: "play/0"; + } + program { + signal: "elm,player,pause"; + source: "elm"; + after: "pause/0"; + } + program { + name: "play/0"; + + action: STATE_SET "hidden" 0.0; + target: "media_player/play"; + + after: "play/1"; + } + program { + name: "play/1"; + + action: STATE_SET "default" 0.0; + target: "media_player/pause"; + } + program { + name: "pause/0"; + + action: STATE_SET "hidden" 0.0; + target: "media_player/pause"; + + after: "pause/1"; + } + program { + name: "pause/1"; + + action: STATE_SET "default" 0.0; + target: "media_player/play"; + } + } + } + + group { + name: "elm/video/base/default"; + + parts { + part { + name: "clipper"; + type: RECT; + + description { + color: 255 255 255 255; + } + description { + state: "darker" 0.0; + color: 128 128 128 255; + } + } + part { + name: "elm.swallow.video"; + type: SWALLOW; + + clip_to: "clipper"; + mouse_events: 1; + repeat_events: 1; + + description { + aspect_preference: BOTH; + aspect: 1 1; + } + } + } + + programs { + program { + signal: "elm,video,load"; + source: "elm"; + + action: STATE_SET "darker" 0.0; + target: "clipper"; + } + program { + signal: "elm,video,play"; + source: "elm"; + + action: STATE_SET "default" 0.0; + target: "clipper"; + } + program { + signal: "elm,video,end"; + source: "elm"; + + action: STATE_SET "darker" 0.0; + target: "clipper"; + transition: LINEAR 0.5; + } + program { + signal: "elm,video,pause"; + source: "elm"; + + action: STATE_SET "darker" 0.0; + target: "clipper"; + } + } + } +} diff --git a/data/themes/mp_forward.png b/data/themes/mp_forward.png new file mode 100644 index 0000000..eaf3619 Binary files /dev/null and b/data/themes/mp_forward.png differ diff --git a/data/themes/mp_info.png b/data/themes/mp_info.png new file mode 100644 index 0000000..67e3ead Binary files /dev/null and b/data/themes/mp_info.png differ diff --git a/data/themes/mp_next.png b/data/themes/mp_next.png new file mode 100644 index 0000000..c8aadcc Binary files /dev/null and b/data/themes/mp_next.png differ diff --git a/data/themes/mp_pause.png b/data/themes/mp_pause.png new file mode 100644 index 0000000..211ddf6 Binary files /dev/null and b/data/themes/mp_pause.png differ diff --git a/data/themes/mp_play.png b/data/themes/mp_play.png new file mode 100644 index 0000000..8abaf2e Binary files /dev/null and b/data/themes/mp_play.png differ diff --git a/data/themes/mp_prev.png b/data/themes/mp_prev.png new file mode 100644 index 0000000..543ec0e Binary files /dev/null and b/data/themes/mp_prev.png differ diff --git a/data/themes/mp_rewind.png b/data/themes/mp_rewind.png new file mode 100644 index 0000000..703d5d6 Binary files /dev/null and b/data/themes/mp_rewind.png differ diff --git a/data/themes/mp_stop.png b/data/themes/mp_stop.png new file mode 100644 index 0000000..e09dd1f Binary files /dev/null and b/data/themes/mp_stop.png differ diff --git a/debian/rules b/debian/rules index ee2cb03..25280bd 100755 --- a/debian/rules +++ b/debian/rules @@ -12,4 +12,4 @@ CFLAGS += -fPIC -W -Wall -Wextra LDFLAGS += -Wl,--hash-style=both -Wl,--as-needed clean:: - [ ! -f Makefile ] || make distclean + [ ! -f Makefile ] || make distclean || true diff --git a/doc/Doxyfile b/doc/Doxyfile deleted file mode 100644 index 50df6f8..0000000 --- a/doc/Doxyfile +++ /dev/null @@ -1,139 +0,0 @@ -PROJECT_NAME = Elementary -PROJECT_NUMBER = -OUTPUT_DIRECTORY = . -INPUT = ./elementary.dox ./examples.dox ../src/lib/Elementary.h.in ../src/lib -IMAGE_PATH = ./img -OUTPUT_LANGUAGE = English -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = ./head.html -HTML_FOOTER = ./foot.html -HTML_STYLESHEET = ./e.css -HTML_ALIGN_MEMBERS = YES -ENUM_VALUES_PER_LINE = 1 -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = YES -EXTRACT_ALL = NO -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = NO -EXTRACT_LOCAL_CLASSES = NO -HIDE_UNDOC_MEMBERS = YES -HIDE_UNDOC_CLASSES = YES -HIDE_FRIEND_COMPOUNDS = YES -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -INTERNAL_DOCS = NO -STRIP_CODE_COMMENTS = YES -CASE_SENSE_NAMES = YES -SHORT_NAMES = NO -HIDE_SCOPE_NAMES = NO -VERBATIM_HEADERS = NO -SHOW_INCLUDE_FILES = NO -JAVADOC_AUTOBRIEF = YES -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -DISTRIBUTE_GROUP_DOC = NO -TAB_SIZE = 2 -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ALIASES = -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -OPTIMIZE_OUTPUT_FOR_C = YES -OPTIMIZE_OUTPUT_JAVA = NO -SHOW_USED_FILES = NO -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -FILE_PATTERNS = -RECURSIVE = NO -EXCLUDE = ../src/lib/Elementary.h -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = ../src/examples -EXAMPLE_PATTERNS = -EXAMPLE_RECURSIVE = NO -INPUT_FILTER = -FILTER_SOURCE_FILES = NO -SOURCE_BROWSER = NO -INLINE_SOURCES = NO -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 2 -IGNORE_PREFIX = -GENERATE_TREEVIEW = NO -TREEVIEW_WIDTH = 250 -GENERATE_LATEX = YES -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = YES -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -GENERATE_MAN = YES -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = YES -GENERATE_XML = NO -XML_SCHEMA = -XML_DTD = -GENERATE_AUTOGEN_DEF = NO -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = YES -SEARCH_INCLUDES = NO -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = __UNUSED__= EINA_ARG_NONNULL()= EINA_MALLOC= EINA_WARN_UNUSED_RESULT= EAPI= -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -TAGFILES = -GENERATE_TAGFILE = -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -CLASS_DIAGRAMS = NO -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO -CLASS_GRAPH = NO -COLLABORATION_GRAPH = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = NO -INCLUDED_BY_GRAPH = NO -GRAPHICAL_HIERARCHY = NO -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 512 -MAX_DOT_GRAPH_HEIGHT = 512 -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -SEARCHENGINE = NO diff --git a/doc/Makefile.am b/doc/Makefile.am index f954592..3411f66 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,10 +6,43 @@ PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc if EFL_BUILD_DOC +AM_CPPFLAGS = \ +-I$(top_srcdir) \ +-I$(top_srcdir)/src/lib \ +-I$(top_builddir)/src/lib \ +-I$(top_srcdir)/src/bin \ +-DPACKAGE_BIN_DIR=\"$(bindir)\" \ +-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +@ELEMENTARY_CFLAGS@ \ +@ELEMENTARY_X_CFLAGS@ \ +@ELEMENTARY_FB_CFLAGS@ \ +@ELEMENTARY_WIN32_CFLAGS@ \ +@ELEMENTARY_WINCE_CFLAGS@ \ +@ELEMENTARY_EDBUS_CFLAGS@ \ +@ELEMENTARY_EFREET_CFLAGS@ \ +@ELEMENTARY_EWEATHER_CFLAGS@ \ +@ELEMENTARY_ETHUMB_CFLAGS@ \ +@EIO_CFLAGS@ + +noinst_PROGRAMS = \ +widget_preview_button1 \ +widget_preview_button2 \ +widget_preview_button3 + +widget_preview_button1_SOURCES = widget_preview_button1.c +widget_preview_button1_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@ +widget_preview_button2_SOURCES = widget_preview_button2.c +widget_preview_button2_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@ +widget_preview_button3_SOURCES = widget_preview_button3.c +widget_preview_button3_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@ + doc-clean: - rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar* + rm -rf img/widget html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar* doc: all doc-clean + $(top_srcdir)/doc/shot.sh ./img/widget/button preview-00.png $(top_builddir)/doc/widget_preview_button1 160 50 + $(top_srcdir)/doc/shot.sh ./img/widget/button preview-01.png $(top_builddir)/doc/widget_preview_button2 160 50 + $(top_srcdir)/doc/shot.sh ./img/widget/button preview-02.png $(top_builddir)/doc/widget_preview_button3 160 50 $(efl_doxygen) cp -r $(srcdir)/img/* html/ cp -r $(srcdir)/img/* latex/ diff --git a/doc/elementary.dox.in b/doc/elementary.dox.in index 992d14b..8b13789 100644 --- a/doc/elementary.dox.in +++ b/doc/elementary.dox.in @@ -1,70 +1 @@ -/** -@file elementary.dox -@brief Elementary Widget Library -*/ -/** -@mainpage Elementary -@image html elementary.png -@version @PACKAGE_VERSION@ -@author Carsten Haitzler -@author Gustavo Sverzut Barbieri -@author Cedric Bail -@author Vincent Torri -@author Daniel Kolesa -@author Jaime Thomas -@author Swisscom - http://www.swisscom.ch/ -@author Christopher Michael -@author Marco Trevisan (Treviño) -@author Michael Bouchaud -@author Jonathan Atton (Watchwolf) -@author Brian Wang -@author Mike Blumenkrantz (zmike) -@author Samsung Electronics -@author Samsung SAIT -@author Brett Nash -@author Bruno Dilly -@author Rafael Fonseca -@author Chuneon Park -@author Woohyun Jung -@author Jaehwan Kim -@author Wonguk Jeong -@author Leandro A. F. Pereira -@author Helen Fornazier -@author Gustavo Lima Chaves -@author Fabiano Fidêncio -@author Tiago Falcão -@author Otavio Pontes -@author Viktor Kojouharov -@author Daniel Juyung Seo (SeoZ) -@author Sangho Park -@author Rajeev Ranjan (Rajeev) -@author Seunggyun Kim -@author Sohyun Kim -@author Jihoon Kim -@author Jeonghyun Yun (arosis) -@author Tom Hacohen -@author Aharon Hillel -@date 2008-2011 - -@section intro What is Elementary? - -This is a VERY SIMPLE toolkit. It is not meant for writing extensive desktop -applications (yet). Small simple ones with simple needs. - -It is meant to make the programmers work almost brainless but give them lots -of flexibility. - -License: LGPL v2 (see COPYING in the base of Elementary's source). This -applies to all files in the source here. - -Acknowledgements: There is a lot that goes into making a widget set, and -they don't happen out of nothing. It's like trying to make everyone -everywhere happy, regardless of age, gender, race or nationality - and -that is really tough. So thanks to people and organisations behind this, -aslisted in the Authors section above. - -@verbatim -Pants -@endverbatim -*/ diff --git a/doc/foot.html b/doc/foot.html index d43cf8f..3a96978 100644 --- a/doc/foot.html +++ b/doc/foot.html @@ -8,6 +8,8 @@