diff --git a/legacy/edje/Makefile.am b/legacy/edje/Makefile.am index 253fa0479a..e223175542 100644 --- a/legacy/edje/Makefile.am +++ b/legacy/edje/Makefile.am @@ -7,12 +7,30 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ ltconfig ltmain.sh missing mkinstalldirs \ stamp-h.in edje_docs.tar edje_docs.tar.gz edje.c +install-data-local: + @$(NORMAL_INSTALL) + if test -d $(srcdir)/data; then \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \ + for d in $(srcdir)/data/*; do \ + cp -pR $$d $(DESTDIR)$(pkgdatadir)/data; \ + done \ + fi + dist-hook: ./gendoc; \ - tar cvf edje_docs.tar doc; \ + tar cvf edje_docs.tar doc/html doc/latex doc/man; \ rm -f edje_docs.tar.gz; \ - gzip -9 edje_docs.tar; + gzip -9 edje_docs.tar; \ + if test -d data; then \ + mkdir $(distdir)/data; \ + for file in data/*; do \ + if test -f $$file; then \ + cp -p $$file $(distdir)/data; \ + fi \ + done \ + fi bin_SCRIPTS = edje-config EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN edje.spec edje.c.in gendoc Doxyfile edje_docs.tar.gz + diff --git a/legacy/edje/data/images/bg.png b/legacy/edje/data/images/bg.png new file mode 100644 index 0000000000..8415d46c1f Binary files /dev/null and b/legacy/edje/data/images/bg.png differ diff --git a/legacy/edje/data/images/e.png b/legacy/edje/data/images/e.png new file mode 100644 index 0000000000..47597a8d44 Binary files /dev/null and b/legacy/edje/data/images/e.png differ diff --git a/legacy/edje/data/src/test.edc b/legacy/edje/data/src/test.edc new file mode 100644 index 0000000000..5577e17b67 --- /dev/null +++ b/legacy/edje/data/src/test.edc @@ -0,0 +1,202 @@ +// Images in the image database for the output file +images +{ + // image "filename.png" STORAGE_MEOTHD [option to storage method]; + // STORAGE_METHOD can be: + // COMP = compressed, no loss + // RAW = uncompressed, no loss + // LOSSY = compressed with quality loss, next param is quality level (0-100) + image, "bg.png" LOSSY 80; /* raw pixels */ + image, "e.png" COMP; /* compressed */ +} + +collections +{ + group + { + name, "test"; + parts + { + part + { + name, "background"; +// IMAGE, RECTANGLE, TEXT +// type, IMAGE; + mouse_events, 0; +// color_class, "default"; + description + { +// state, "name" (float value 0.0 - 1.0) + state, "default" 0.0; + visible, 1; +// dragable +// { +// direction, on/off stepping count +// x, 0 1 2; +// y, 0 1 2; +// confine, "p2"; +// } +// align, 0.5 0.5; +// min, 0 0; +// max, 0 0; +// step 1 1; +// aspect 0.0 999999.0; + rel1 + { + relative, 0.0 0.0; + offset, 0 0; +// if not defined assumed to be -1 (relative to all) +// to, "p2"; + } + rel2 + { + relative, 1.0 1.0; + offset, -1 -1; + } + image + { + normal, "bg.png"; +// tween images are images that are looped thru when graduating TO normal +// tween, "test2.png"; +// tween, "test3.png"; + } + border, 12 12 12 12; +// fill +// { +// origin +// { +// relative, 0.0 0.0; +// offset, 0 0; +// } +// size +// { +// relative, 1.0 1.0; +// offset, 0 0; +// } +// } +// only useful if its a rect or text object +// color 255, 255, 255, 255; +// only useful if its a text object +// color2 255, 255, 255, 255; +// color3 255, 255, 255, 255; +// text +// { +// text, "test text"; +// font, "Vera"; +// size, 12; +// effect, PLAIN; +// fit, 0 0; +// min, 1 1; +// align 0.5 0.5; +// } + } + } + part + { + name, "logo"; + description + { + state, "default" 0.0; + visible, 1; + max, 64 64; + rel1 + { + relative, 0.0 0.0; + offset, 16 16; + } + rel2 + { + relative, 1.0 1.0; + offset, -17 -17; + } + image + { + normal, "e.png"; + } + } + description + { + state, "clicked" 0.0; + visible, 1; + align, 0.5 0.5; + max, 64 64; + rel1 + { + relative, 0.0 0.0; + offset, 16 16; + } + rel2 + { + relative, 1.0 1.0; + offset, -17 -17; + } + image + { + normal, "e.png"; + } + } + } + } + programs + { + program + { + name, "logo_click"; + signal, "mouse-down-1"; + source, "logo"; +// STATE_SET ot ACTION_STOP here + action, STATE_SET "clicked" 0.0; +// LINEAR, SINUSOIDAL, ACCELERATE, DECELERATE, + seconds to transition over +// transition, LINEAR 0.0; +// who to apply this state to, can be multiple targets + target, "logo"; +// after, "p1_fade_1"; + } + program + { + name, "logo_unclick"; + signal, "mouse-up-1"; + source, "logo"; + action, STATE_SET "default" 0.0; + target, "logo"; + } +/* + program + { + name, "p1_fade_2"; + signal, "action-end"; + source, "p1_fade_1"; + action, STATE_SET "clicked" 0.0; + transition, LINEAR 1.0; + target, "p1"; + after, "p1_fade_1"; + } + program + { + name, "p1_unclicked"; + signal, "mouse-up-1"; + source, "p1"; + action, STATE_SET "default" 0.0; + transition, LINEAR 0.0; + target, "p1"; + } + */ + } + } +/* + group + { + name, "test2"; + parts + { + part + { + name, "p1"; + } + } + programs + { + } + } + */ +} diff --git a/legacy/edje/src/bin/edje_cc_handlers.c b/legacy/edje/src/bin/edje_cc_handlers.c index 2c7b322eef..83258e6c59 100644 --- a/legacy/edje/src/bin/edje_cc_handlers.c +++ b/legacy/edje/src/bin/edje_cc_handlers.c @@ -297,6 +297,8 @@ ob_collections_group_parts_part(void) pc = evas_list_data(evas_list_last(edje_collections)); pc->parts = evas_list_append(pc->parts, ep); ep->id = evas_list_count(pc->parts) - 1; + ep->type = EDJE_PART_TYPE_IMAGE; + ep->mouse_events = 1; } static void @@ -362,6 +364,31 @@ ob_collections_group_parts_part_description(void) ep->default_desc = ed; else ep->other_desc = evas_list_append(ep->other_desc, ed); + ed->visible = 1; + ed->dragable.confine_id = -1; + ed->clip_to_id = -1; + ed->align.x = 0.5; + ed->align.y = 0.5; + ed->fill.pos_rel_x = 0.0; + ed->fill.pos_abs_x = 0; + ed->fill.rel_x = 1.0; + ed->fill.abs_x = 0; + ed->fill.pos_rel_y = 0.0; + ed->fill.pos_abs_y = 0; + ed->fill.rel_y = 1.0; + ed->fill.abs_y = 0; + ed->color.r = 255; + ed->color.g = 255; + ed->color.b = 255; + ed->color.a = 255; + ed->color2.r = 0; + ed->color2.g = 0; + ed->color2.b = 0; + ed->color2.a = 255; + ed->color3.r = 0; + ed->color3.g = 0; + ed->color3.b = 0; + ed->color3.a = 128; } static void @@ -914,6 +941,8 @@ ob_collections_group_programs_program(void) ep = mem_alloc(SZ(Edje_Program)); pc->programs = evas_list_append(pc->programs, ep); ep->id = evas_list_count(pc->programs) - 1; + ep->tween.mode = EDJE_TWEEN_MODE_LINEAR; + ep->after = -1; } static void