summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorBruno Dilly <bdilly@profusion.mobi>2012-10-08 22:46:29 +0000
committerBruno Dilly <bdilly@profusion.mobi>2012-10-08 22:46:29 +0000
commit5e2b7efe13fd34ae2520acfb849c182e2a7b9ecd (patch)
tree0c05a2b61ba6127187c69a6688beee520479e411 /legacy
parent8bd4f13b0d0fd40c99e420d4819aa41e149d974f (diff)
ephysics: separate test and sandbox themes
SVN revision: 77593
Diffstat (limited to 'legacy')
-rw-r--r--legacy/ephysics/.gitignore2
-rw-r--r--legacy/ephysics/data/themes/Makefile.am28
-rw-r--r--legacy/ephysics/data/themes/ephysics_sandbox.edc8
-rw-r--r--legacy/ephysics/data/themes/ephysics_test.edc1
-rw-r--r--legacy/ephysics/data/themes/sandbox_misc.edc (renamed from legacy/ephysics/data/themes/sandbox.edc)0
-rw-r--r--legacy/ephysics/src/bin/ephysics_sandbox.c10
6 files changed, 36 insertions, 13 deletions
diff --git a/legacy/ephysics/.gitignore b/legacy/ephysics/.gitignore
index 6ce725f..18cfac5 100644
--- a/legacy/ephysics/.gitignore
+++ b/legacy/ephysics/.gitignore
@@ -35,8 +35,10 @@ m4/ltsugar.m4
35m4/ltversion.m4 35m4/ltversion.m4
36m4/lt~obsolete.m4 36m4/lt~obsolete.m4
37data/themes/ephysics_test.edj 37data/themes/ephysics_test.edj
38data/themes/ephysics_sandbox.edj
38src/bin/ephysics_test 39src/bin/ephysics_test
39src/bin/ephysics_logo 40src/bin/ephysics_logo
41src/bin/ephysics_sandbox
40doc/html/ 42doc/html/
41doc/latex/ 43doc/latex/
42doc/man/ 44doc/man/
diff --git a/legacy/ephysics/data/themes/Makefile.am b/legacy/ephysics/data/themes/Makefile.am
index c9075a5..d772309 100644
--- a/legacy/ephysics/data/themes/Makefile.am
+++ b/legacy/ephysics/data/themes/Makefile.am
@@ -8,9 +8,9 @@ EDJE_FLAGS = $(EDJE_FLAGS_$(V)) -id $(top_srcdir)/data/themes/images -fd $(top_s
8 8
9filesdir = $(datadir)/ephysics/ 9filesdir = $(datadir)/ephysics/
10 10
11files_DATA = ephysics_test.edj 11files_DATA = ephysics_test.edj ephysics_sandbox.edj
12 12
13EXTRA_DIST = \ 13TEST_FILES = \
14 ephysics_test.edc \ 14 ephysics_test.edc \
15 balls.edc \ 15 balls.edc \
16 buttons.edc \ 16 buttons.edc \
@@ -20,7 +20,6 @@ EXTRA_DIST = \
20 frame.edc \ 20 frame.edc \
21 list.edc \ 21 list.edc \
22 loading_bar.edc \ 22 loading_bar.edc \
23 sandbox.edc \
24 shadows.edc \ 23 shadows.edc \
25 shapes.edc \ 24 shapes.edc \
26 spinner.edc \ 25 spinner.edc \
@@ -33,6 +32,7 @@ EXTRA_DIST = \
33 images/ball-red.png \ 32 images/ball-red.png \
34 images/ball-red70.png \ 33 images/ball-red70.png \
35 images/bg_floor.jpg \ 34 images/bg_floor.jpg \
35 images/brown-pole.png \
36 images/bt_jump.png \ 36 images/bt_jump.png \
37 images/bt_jump_pressed.png \ 37 images/bt_jump_pressed.png \
38 images/bt_restart.png \ 38 images/bt_restart.png \
@@ -44,6 +44,7 @@ EXTRA_DIST = \
44 images/collisionL.png \ 44 images/collisionL.png \
45 images/cube-blue.png \ 45 images/cube-blue.png \
46 images/cube-purple.png \ 46 images/cube-purple.png \
47 images/green-flag.png \
47 images/hexagon.png \ 48 images/hexagon.png \
48 images/list-item.png \ 49 images/list-item.png \
49 images/list-item-corner.png \ 50 images/list-item-corner.png \
@@ -59,9 +60,13 @@ EXTRA_DIST = \
59 images/spinner_bt_left_pressed.png \ 60 images/spinner_bt_left_pressed.png \
60 images/spinner_bt_right.png \ 61 images/spinner_bt_right.png \
61 images/spinner_bt_right_pressed.png \ 62 images/spinner_bt_right_pressed.png \
62 images/star.png \ 63 images/star.png
63 images/green-flag.png \ 64
64 images/brown-pole.png \ 65SANDBOX_FILES = \
66 ephysics_sandbox.edc \
67 sandbox_misc.edc \
68 images/background.jpg \
69 images/ball-blue70.png \
65 images/ball-custom.png \ 70 images/ball-custom.png \
66 images/ball-concrete.png \ 71 images/ball-concrete.png \
67 images/ball-iron.png \ 72 images/ball-iron.png \
@@ -70,10 +75,19 @@ EXTRA_DIST = \
70 images/ball-rubber.png \ 75 images/ball-rubber.png \
71 images/ball-wood.png 76 images/ball-wood.png
72 77
73ephysics_test.edj: Makefile $(EXTRA_DIST) 78EXTRA_DIST = \
79 $(TEST_FILES) \
80 $(SANDBOX_FILES)
81
82ephysics_test.edj: Makefile $(TEST_FILES)
74 $(EDJE_CC) $(EDJE_FLAGS) \ 83 $(EDJE_CC) $(EDJE_FLAGS) \
75 $(top_srcdir)/data/themes/ephysics_test.edc \ 84 $(top_srcdir)/data/themes/ephysics_test.edc \
76 $(top_builddir)/data/themes/ephysics_test.edj 85 $(top_builddir)/data/themes/ephysics_test.edj
77 86
87ephysics_sandbox.edj: Makefile $(SANDBOX_FILES)
88 $(EDJE_CC) $(EDJE_FLAGS) \
89 $(top_srcdir)/data/themes/ephysics_sandbox.edc \
90 $(top_builddir)/data/themes/ephysics_sandbox.edj
91
78clean-local: 92clean-local:
79 rm -f *.edj 93 rm -f *.edj
diff --git a/legacy/ephysics/data/themes/ephysics_sandbox.edc b/legacy/ephysics/data/themes/ephysics_sandbox.edc
new file mode 100644
index 0000000..239b5bf
--- /dev/null
+++ b/legacy/ephysics/data/themes/ephysics_sandbox.edc
@@ -0,0 +1,8 @@
1externals {
2 external: "elm";
3}
4
5collections {
6#include "balls.edc"
7#include "sandbox_misc.edc"
8}
diff --git a/legacy/ephysics/data/themes/ephysics_test.edc b/legacy/ephysics/data/themes/ephysics_test.edc
index 87594cd..f0bec3e 100644
--- a/legacy/ephysics/data/themes/ephysics_test.edc
+++ b/legacy/ephysics/data/themes/ephysics_test.edc
@@ -10,7 +10,6 @@ collections {
10#include "frame.edc" 10#include "frame.edc"
11#include "list.edc" 11#include "list.edc"
12#include "loading_bar.edc" 12#include "loading_bar.edc"
13#include "sandbox.edc"
14#include "shadows.edc" 13#include "shadows.edc"
15#include "shapes.edc" 14#include "shapes.edc"
16#include "spinner.edc" 15#include "spinner.edc"
diff --git a/legacy/ephysics/data/themes/sandbox.edc b/legacy/ephysics/data/themes/sandbox_misc.edc
index b4795dd..b4795dd 100644
--- a/legacy/ephysics/data/themes/sandbox.edc
+++ b/legacy/ephysics/data/themes/sandbox_misc.edc
diff --git a/legacy/ephysics/src/bin/ephysics_sandbox.c b/legacy/ephysics/src/bin/ephysics_sandbox.c
index a47232f..78a91da 100644
--- a/legacy/ephysics/src/bin/ephysics_sandbox.c
+++ b/legacy/ephysics/src/bin/ephysics_sandbox.c
@@ -8,7 +8,7 @@
8#include<Elementary.h> 8#include<Elementary.h>
9#include<EPhysics.h> 9#include<EPhysics.h>
10 10
11#define EPHYSICS_TEST_THEME "ephysics_test" 11#define SANDBOX_THEME "ephysics_sandbox"
12#define WIDTH (1280) 12#define WIDTH (1280)
13#define HEIGHT (720) 13#define HEIGHT (720)
14 14
@@ -151,7 +151,7 @@ _body_material_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
151 151
152 body_image = elm_image_add(evas_object_data_get(obj, "win")); 152 body_image = elm_image_add(evas_object_data_get(obj, "win"));
153 elm_image_file_set( 153 elm_image_file_set(
154 body_image, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj", img_name); 154 body_image, PACKAGE_DATA_DIR "/" SANDBOX_THEME ".edj", img_name);
155 evas_object_resize(body_image, 70, 70); 155 evas_object_resize(body_image, 70, 70);
156 evas_object_move(body_image, 150, 150);//FIX! 156 evas_object_move(body_image, 150, 150);//FIX!
157 evas_object_show(body_image); 157 evas_object_show(body_image);
@@ -681,7 +681,7 @@ _sandie_body_add(Evas_Object *win, EPhysics_World *world, int x, int y)
681 681
682 body_image = elm_image_add(win); 682 body_image = elm_image_add(win);
683 elm_image_file_set( 683 elm_image_file_set(
684 body_image, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj", "big-blue-ball"); 684 body_image, PACKAGE_DATA_DIR "/" SANDBOX_THEME ".edj", "big-blue-ball");
685 evas_object_resize(body_image, 70, 70); 685 evas_object_resize(body_image, 70, 70);
686 evas_object_move(body_image, x, y); 686 evas_object_move(body_image, x, y);
687 evas_object_show(body_image); 687 evas_object_show(body_image);
@@ -838,7 +838,7 @@ elm_main()
838 return r; 838 return r;
839 } 839 }
840 840
841 elm_theme_extension_add(NULL, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj"); 841 elm_theme_extension_add(NULL, PACKAGE_DATA_DIR "/" SANDBOX_THEME ".edj");
842 842
843 sandie->win = elm_win_add(NULL, "Sandbox", ELM_WIN_BASIC); 843 sandie->win = elm_win_add(NULL, "Sandbox", ELM_WIN_BASIC);
844 844
@@ -851,7 +851,7 @@ elm_main()
851 layout = elm_layout_add(sandie->win); 851 layout = elm_layout_add(sandie->win);
852 evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 852 evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
853 elm_win_resize_object_add(sandie->win, layout); 853 elm_win_resize_object_add(sandie->win, layout);
854 elm_layout_file_set(layout, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj", 854 elm_layout_file_set(layout, PACKAGE_DATA_DIR "/" SANDBOX_THEME ".edj",
855 "sandbox"); 855 "sandbox");
856 evas_object_show(layout); 856 evas_object_show(layout);
857 evas_object_data_set(sandie->win, "layout", layout); 857 evas_object_data_set(sandie->win, "layout", layout);