summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2013-09-30 16:59:50 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2013-09-30 16:59:50 +0200
commit5d4d24fe101e3a2bbe888460da0124e73f59a007 (patch)
tree94bd438f1eee2c3ac7eee007ed0cb347853794d6
parent4f6e24e86e63b135e8e4c065ecf7aa5781ade206 (diff)
app: add data/images and data/themes and build default theme
-rw-r--r--app/Makefile.am2
-rw-r--r--app/TODO4
-rw-r--r--app/configure.ac3
-rw-r--r--app/data/Makefile.am3
-rw-r--r--app/data/images/Makefile.am6
-rw-r--r--app/data/images/frame.pngbin0 -> 260468 bytes
-rw-r--r--app/data/images/left_door.pngbin0 -> 310308 bytes
-rw-r--r--app/data/images/right_door.pngbin0 -> 274734 bytes
-rw-r--r--app/data/images/tunnel.pngbin0 -> 275176 bytes
-rw-r--r--app/data/themes/Makefile.am20
-rw-r--r--app/data/themes/default/default.edc95
11 files changed, 130 insertions, 3 deletions
diff --git a/app/Makefile.am b/app/Makefile.am
index 8318e35..68fc2bc 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -3,7 +3,7 @@ AM_MAKEFLAGS = --no-print-directory
3AM_DISTCHECK_CONFIGURE_FLAGS = \ 3AM_DISTCHECK_CONFIGURE_FLAGS = \
4 --with-tests=regular 4 --with-tests=regular
5 5
6SUBDIRS = src 6SUBDIRS = src data
7 7
8MAINTAINERCLEANFILES = \ 8MAINTAINERCLEANFILES = \
9 Makefile.in \ 9 Makefile.in \
diff --git a/app/TODO b/app/TODO
index 38b1757..a59158e 100644
--- a/app/TODO
+++ b/app/TODO
@@ -6,9 +6,9 @@
6- lcov 6- lcov
7- eina_log_level 7- eina_log_level
8- ecore_getpot 8- ecore_getpot
9+ data/themes 9- data/images
10- data/themes
10+ data/desktop 11+ data/desktop
11+ data/fonts 12+ data/fonts
12+ data/icons 13+ data/icons
13+ data/images
14+ elm_skel.spec.in 14+ elm_skel.spec.in
diff --git a/app/configure.ac b/app/configure.ac
index 6c61a2c..015ffa9 100644
--- a/app/configure.ac
+++ b/app/configure.ac
@@ -224,6 +224,9 @@ AC_OUTPUT([
224 elm-skel.pc 224 elm-skel.pc
225 Makefile 225 Makefile
226 src/Makefile 226 src/Makefile
227 data/Makefile
228 data/images/Makefile
229 data/themes//Makefile
227]) 230])
228 231
229AC_OUTPUT 232AC_OUTPUT
diff --git a/app/data/Makefile.am b/app/data/Makefile.am
new file mode 100644
index 0000000..333aba6
--- /dev/null
+++ b/app/data/Makefile.am
@@ -0,0 +1,3 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3SUBDIRS = images themes
diff --git a/app/data/images/Makefile.am b/app/data/images/Makefile.am
new file mode 100644
index 0000000..5842c2a
--- /dev/null
+++ b/app/data/images/Makefile.am
@@ -0,0 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3EXTRA_DIST = frame.png \
4 tunnel.png \
5 left_door.png \
6 right_door.png
diff --git a/app/data/images/frame.png b/app/data/images/frame.png
new file mode 100644
index 0000000..1b22956
--- /dev/null
+++ b/app/data/images/frame.png
Binary files differ
diff --git a/app/data/images/left_door.png b/app/data/images/left_door.png
new file mode 100644
index 0000000..126bb2c
--- /dev/null
+++ b/app/data/images/left_door.png
Binary files differ
diff --git a/app/data/images/right_door.png b/app/data/images/right_door.png
new file mode 100644
index 0000000..ddcc01d
--- /dev/null
+++ b/app/data/images/right_door.png
Binary files differ
diff --git a/app/data/images/tunnel.png b/app/data/images/tunnel.png
new file mode 100644
index 0000000..304cfa0
--- /dev/null
+++ b/app/data/images/tunnel.png
Binary files differ
diff --git a/app/data/themes/Makefile.am b/app/data/themes/Makefile.am
new file mode 100644
index 0000000..5c381a1
--- /dev/null
+++ b/app/data/themes/Makefile.am
@@ -0,0 +1,20 @@
1MAINTAINERCLEANFILES = Makefile.in
2EXTRA_DIST = default/default.edc
3
4EDJE_CC = @edje_cc@
5AM_V_EDJ = $(am__v_EDJ_@AM_V@)
6am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
7am__v_EDJ_0 = @echo " EDJ " $@;
8EDJE_CC_FLAGS = \
9 -id $(top_srcdir)/data/images
10
11filesdir = $(datadir)/$(PACKAGE)/themes
12files_DATA = $(top_builddir)/data/themes/default.edj
13
14$(top_builddir)/data/themes/default.edj: $(top_srcdir)/data/themes/default/default.edc
15 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
16
17clean-local:
18 rm -f *.edj
19 rm -rf autom4te.cache
20
diff --git a/app/data/themes/default/default.edc b/app/data/themes/default/default.edc
new file mode 100644
index 0000000..47406ae
--- /dev/null
+++ b/app/data/themes/default/default.edc
@@ -0,0 +1,95 @@
1collections {
2 images {
3 image: "tunnel.png" COMP;
4 image: "frame.png" COMP;
5 image: "left_door.png" COMP;
6 image: "right_door.png" COMP;
7 }
8 group { name: "layout";
9 data {
10 item: "title" "Elm Layout";
11 }
12 parts {
13 part { name: "tunnel";
14 type: IMAGE;
15 description { state: "default" 0.0;
16 rel1.relative: 0.0 0.0;
17 rel2.relative: 1.0 1.0;
18 image.normal: "tunnel.png";
19 aspect: 1 1;
20 aspect_preference: BOTH;
21 }
22 }
23 part { name: "left_door";
24 type: IMAGE;
25 clip_to: "clip_rect";
26 description { state: "default" 0.0;
27 rel1.relative: 0.0 0.0;
28 rel2.relative: 1.0 1.0;
29 image.normal: "left_door.png";
30 aspect: 1 1;
31 aspect_preference: BOTH;
32 }
33 description { state: "open" 0.0;
34 inherit: "default" 0.0;
35 rel1.relative: -1.0 0.0;
36 rel2.relative: 0.0 1.0;
37 }
38 }
39 part { name: "right_door";
40 type: IMAGE;
41 clip_to: "clip_rect";
42 description { state: "default" 0.0;
43 rel1.relative: 0.0 0.0;
44 rel2.relative: 1.0 1.0;
45 image.normal: "right_door.png";
46 aspect: 1 1;
47 aspect_preference: BOTH;
48 }
49 description { state: "open" 0.0;
50 inherit: "default" 0.0;
51 rel1.relative: 1.0 0.0;
52 rel2.relative: 2.0 1.0;
53 }
54 }
55 part { name: "clip_rect";
56 type: RECT;
57 description { state: "default" 0.0;
58 rel1.relative: 0.0 0.0;
59 rel1.to: "frame";
60 rel2.relative: 1.0 1.0;
61 rel2.to: "frame";
62 }
63 }
64 part { name: "frame";
65 type: IMAGE;
66 description { state: "default" 0.0;
67 rel1.relative: 0.0 0.0;
68 rel2.relative: 1.0 1.0;
69 image.normal: "frame.png";
70 aspect: 1 1;
71 aspect_preference: BOTH;
72 }
73 }
74 }
75 programs {
76 program { name: "open_door";
77 signal: "mouse,down,1";
78 source: "frame";
79 action: STATE_SET "open" 0.0;
80 target: "left_door";
81 target: "right_door";
82 transition: LINEAR 3.0;
83 after: "close_door";
84 }
85 }
86 programs {
87 program { name: "close_door";
88 action: STATE_SET "default" 0.0;
89 target: "left_door";
90 target: "right_door";
91 transition: SINUSOIDAL 1.0;
92 }
93 }
94 }
95}