merge ethumb.

This one was a painful bitch. The edbus2 port was quite broken, mainly
leaking eina_stringshare and also not adding the '\0' to the strings
that are represented as bytearray (paths cannot be utf8 to avoid
translations).

Emotion plugin was also quite bogus and the video thumbnail as edje
(animated) is not working yet due bug in Edje_Edit api -- someone
needs to investigate this, seems strange.

Emotion plugin also had a bug that it was deleting the object from
inside object callback.

Now it seems to work. Please report if it does not.



SVN revision: 82675

5 files changed, 78 insertions, 1 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 5104f31b1b..be0a463aa9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -60,9 +60,38 @@ edje/vim/snippets/edc.snippets \
 edje/vim/syntax/edc.vim \
 edje/vim/syntax/embryo.vim
 
+# Helper for people using EDJ
+EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
+EDJE_CC_FLAGS_VERBOSE_0 =
+EDJE_CC_FLAGS_VERBOSE_1 = -v
+EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V))
+
+AM_V_EDJ = $(am__v_EDJ_$(V))
+am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
+am__v_EDJ_0 = @echo "  EDJ   " $@;
+
 
 ########################################################################
 # Emotion
 emotionfilesdir = $(datadir)/emotion
 emotionfiles_DATA = emotion/checkme
 EXTRA_DIST += $(emotionfiles_DATA)
+
+########################################################################
+# Ethumb
+ethumbfilesdir = $(datadir)/ethumb
+ethumbfiles_DATA = ethumb/checkme
+EXTRA_DIST += $(ethumbfiles_DATA)
+
+ethumbframesdir = $(datadir)/ethumb/frames
+ethumbframes_DATA = \
+ethumb/frames/default.edj
+
+ethumb/frames/default.edj: ethumb/frames/default.edc
+	@$(MKDIR_P) ethumb/frames/
+	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/ethumb/frames/ $< $@
+
+
+EXTRA_DIST += \
+ethumb/frames/default.edc \
+ethumb/frames/border-0.jpg
diff --git a/data/emotion/checkme b/data/emotion/checkme
index e2f46e1c27..f1e0637423 100644
--- a/data/emotion/checkme
+++ b/data/emotion/checkme
@@ -1,2 +1,2 @@
-This is just a test file used to help emotion determine its prefix
+This is just a test file used to help ethumb determine its prefix
 location.
diff --git a/data/ethumb/checkme b/data/ethumb/checkme
new file mode 100644
index 0000000000..987063d4cb
--- /dev/null
+++ b/data/ethumb/checkme
@@ -0,0 +1,2 @@
+This is just a test file used to help evas determine its prefix
+location.
diff --git a/data/ethumb/frames/border-0.jpg b/data/ethumb/frames/border-0.jpg
new file mode 100644
index 0000000000..ee66879b21
--- /dev/null
+++ b/data/ethumb/frames/border-0.jpg
diff --git a/data/ethumb/frames/default.edc b/data/ethumb/frames/default.edc
new file mode 100644
index 0000000000..53412632c4
--- /dev/null
+++ b/data/ethumb/frames/default.edc
@@ -0,0 +1,46 @@
+collections {
+   images {
+      image: "border-0.jpg" COMP;
+   }
+
+   group {
+      name: "frame/default";
+
+      parts {
+         part {
+            name: "img";
+            type: SWALLOW;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+            }
+         } // img
+
+         part {
+            name: "border";
+            type: IMAGE;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 224 224 224 255;
+               rel1 {
+                  to: "img";
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "img";
+                  relative: 1.0 1.0;
+                  offset: -1 -1;
+               }
+               image {
+                  normal: "border-0.jpg";
+                  border: 2 2 2 2;
+                  middle: 0;
+               }
+            }
+         } // border
+
+      }
+   }
+}