summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-12 01:15:45 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-12 01:15:45 +0000
commit34f53151414bcdf44ec81e582b007f74da595694 (patch)
tree863058f0d94e9d39998774a375aa6d242d8714a4 /data
parentae51833bac7ba5f72bd40a96beb13081c8d573f6 (diff)
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
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am29
-rw-r--r--data/emotion/checkme2
-rw-r--r--data/ethumb/checkme2
-rw-r--r--data/ethumb/frames/border-0.jpgbin0 -> 542 bytes
-rw-r--r--data/ethumb/frames/default.edc46
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 \
60edje/vim/syntax/edc.vim \ 60edje/vim/syntax/edc.vim \
61edje/vim/syntax/embryo.vim 61edje/vim/syntax/embryo.vim
62 62
63# Helper for people using EDJ
64EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
65EDJE_CC_FLAGS_VERBOSE_0 =
66EDJE_CC_FLAGS_VERBOSE_1 = -v
67EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V))
68
69AM_V_EDJ = $(am__v_EDJ_$(V))
70am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
71am__v_EDJ_0 = @echo " EDJ " $@;
72
63 73
64######################################################################## 74########################################################################
65# Emotion 75# Emotion
66emotionfilesdir = $(datadir)/emotion 76emotionfilesdir = $(datadir)/emotion
67emotionfiles_DATA = emotion/checkme 77emotionfiles_DATA = emotion/checkme
68EXTRA_DIST += $(emotionfiles_DATA) 78EXTRA_DIST += $(emotionfiles_DATA)
79
80########################################################################
81# Ethumb
82ethumbfilesdir = $(datadir)/ethumb
83ethumbfiles_DATA = ethumb/checkme
84EXTRA_DIST += $(ethumbfiles_DATA)
85
86ethumbframesdir = $(datadir)/ethumb/frames
87ethumbframes_DATA = \
88ethumb/frames/default.edj
89
90ethumb/frames/default.edj: ethumb/frames/default.edc
91 @$(MKDIR_P) ethumb/frames/
92 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/ethumb/frames/ $< $@
93
94
95EXTRA_DIST += \
96ethumb/frames/default.edc \
97ethumb/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 @@
1This is just a test file used to help emotion determine its prefix 1This is just a test file used to help ethumb determine its prefix
2location. 2location.
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 @@
1This is just a test file used to help evas determine its prefix
2location.
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
Binary files differ
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 @@
1collections {
2 images {
3 image: "border-0.jpg" COMP;
4 }
5
6 group {
7 name: "frame/default";
8
9 parts {
10 part {
11 name: "img";
12 type: SWALLOW;
13 mouse_events: 0;
14 description {
15 state: "default" 0.0;
16 }
17 } // img
18
19 part {
20 name: "border";
21 type: IMAGE;
22 mouse_events: 0;
23 description {
24 state: "default" 0.0;
25 color: 224 224 224 255;
26 rel1 {
27 to: "img";
28 relative: 0.0 0.0;
29 offset: 0 0;
30 }
31 rel2 {
32 to: "img";
33 relative: 1.0 1.0;
34 offset: -1 -1;
35 }
36 image {
37 normal: "border-0.jpg";
38 border: 2 2 2 2;
39 middle: 0;
40 }
41 }
42 } // border
43
44 }
45 }
46}