summaryrefslogtreecommitdiffstats
path: root/friendfinder
diff options
context:
space:
mode:
authorPatrick Hornecker2009-12-28 17:49:24 +0100
committerPatrick Hornecker2009-12-28 17:49:24 +0100
commita19a962cf794624389b593bbc8e2672b7eca9211 (patch)
tree3bbd5be1fcd93545de45bbeef0ec8f57d3613ee3 /friendfinder
parentchanges in receiver, sender and gui (diff)
downloadfriendfinder-a19a962cf794624389b593bbc8e2672b7eca9211.tar.gz
friendfinder-a19a962cf794624389b593bbc8e2672b7eca9211.tar.xz
friendfinder-a19a962cf794624389b593bbc8e2672b7eca9211.zip
new files for drawing of the map
Diffstat (limited to 'friendfinder')
-rw-r--r--friendfinder/gui.c27
-rw-r--r--friendfinder/map.c0
-rw-r--r--friendfinder/map.h0
-rw-r--r--friendfinder/themes/Makefile8
-rw-r--r--friendfinder/themes/fonts/Vera.ttfbin0 -> 65932 bytes
-rw-r--r--friendfinder/themes/images/here.pngbin0 -> 1187 bytes
-rw-r--r--friendfinder/themes/images/kbd.pngbin0 -> 1504 bytes
-rw-r--r--friendfinder/themes/images/quit.pngbin0 -> 2487 bytes
-rw-r--r--friendfinder/themes/images/zoom.pngbin0 -> 2215 bytes
-rw-r--r--friendfinder/themes/images/zoom_bg.pngbin0 -> 285 bytes
-rw-r--r--friendfinder/themes/kbd.edc28
-rw-r--r--friendfinder/themes/map.edc123
-rw-r--r--friendfinder/themes/map.edjbin0 -> 51979 bytes
13 files changed, 179 insertions, 7 deletions
diff --git a/friendfinder/gui.c b/friendfinder/gui.c
index 647ef28..19a24e9 100644
--- a/friendfinder/gui.c
+++ b/friendfinder/gui.c
@@ -5,6 +5,8 @@
#include "Ecore.h"
#include "Elementary.h"
+#include "render/line.h"
+
#include "msg_sender.h"
#include "receiver.h"
#include "gui.h"
@@ -350,7 +352,10 @@ void init_options()
void init_map()
{
Evas_Object *bg, *bx, *bx2, *bx3, *bt;
-
+ struct polyline *pl = polyline_empty();
+ polyline_set_color(pl, 255, 0, 0, 50);
+ polyline_set_width(pl, 10);
+
/* add a standard bg */
bg = elm_bg_add(win);
/* not not allow bg to expand. let's limit dialog size to contents */
@@ -382,18 +387,26 @@ void init_map()
evas_object_show(bx3);
map = e_smart_map_add(win, "data/maps/fr_map.eet");
- e_smart_map_set_pos(map, 47.996578,7.840171);
+ e_smart_map_set_theme(map, "themes/map.edj", "main");
+ e_smart_map_set_pos(map, 47.996578, 7.840171);
evas_object_size_hint_min_set(map, w-2*8, h-10*8-60);
evas_object_size_hint_max_set(map, w-2*8, h-10*8-120);
// evas_object_resize(map, w, h*0.7);
elm_box_pack_end(bx2, map);
-// evas_object_show(map);
+ evas_object_show(map);
- Evas_Object *ic;
- elm_icon_add(map);
- elm_icon_file_set(ic, "data/sl_bt_0.png", NULL);
-// evas_object_show(ic);
+ struct point p, p2;
+
+ p.lat = 47.996578;
+ p.lon = 7.840171;
+
+ p2.lat = 47.996593;
+ p2.lon = 7.840201;
+
+ polyline_add_point(pl, p);
+ polyline_add_point(pl, p2);
+ e_smart_map_add_path(map, pl);
bt = elm_button_add(win);
elm_button_label_set(bt, "Exit");
diff --git a/friendfinder/map.c b/friendfinder/map.c
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/friendfinder/map.c
diff --git a/friendfinder/map.h b/friendfinder/map.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/friendfinder/map.h
diff --git a/friendfinder/themes/Makefile b/friendfinder/themes/Makefile
new file mode 100644
index 0000000..b63bab9
--- /dev/null
+++ b/friendfinder/themes/Makefile
@@ -0,0 +1,8 @@
+
+
+all:
+ edje_cc -id images -fd fonts map.edc
+# edje_cc -id images -fd fonts kbd.edc
+
+clean:
+ rm -rf map.edj
diff --git a/friendfinder/themes/fonts/Vera.ttf b/friendfinder/themes/fonts/Vera.ttf
new file mode 100644
index 0000000..58cd6b5
--- /dev/null
+++ b/friendfinder/themes/fonts/Vera.ttf
Binary files differ
diff --git a/friendfinder/themes/images/here.png b/friendfinder/themes/images/here.png
new file mode 100644
index 0000000..dce3f15
--- /dev/null
+++ b/friendfinder/themes/images/here.png
Binary files differ
diff --git a/friendfinder/themes/images/kbd.png b/friendfinder/themes/images/kbd.png
new file mode 100644
index 0000000..5bb1298
--- /dev/null
+++ b/friendfinder/themes/images/kbd.png
Binary files differ
diff --git a/friendfinder/themes/images/quit.png b/friendfinder/themes/images/quit.png
new file mode 100644
index 0000000..62694a0
--- /dev/null
+++ b/friendfinder/themes/images/quit.png
Binary files differ
diff --git a/friendfinder/themes/images/zoom.png b/friendfinder/themes/images/zoom.png
new file mode 100644
index 0000000..950d792
--- /dev/null
+++ b/friendfinder/themes/images/zoom.png
Binary files differ
diff --git a/friendfinder/themes/images/zoom_bg.png b/friendfinder/themes/images/zoom_bg.png
new file mode 100644
index 0000000..63899ca
--- /dev/null
+++ b/friendfinder/themes/images/zoom_bg.png
Binary files differ
diff --git a/friendfinder/themes/kbd.edc b/friendfinder/themes/kbd.edc
new file mode 100644
index 0000000..35c1a21
--- /dev/null
+++ b/friendfinder/themes/kbd.edc
@@ -0,0 +1,28 @@
+fonts {
+ font: "Vera.ttf" "key";
+}
+
+collections {
+ group {
+ name: "main";
+ min: 240 240;
+
+ parts {
+ part {
+ name: "background";
+ type: RECT;
+ description {
+ color: 15 15 15 15;
+ state: "default" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/friendfinder/themes/map.edc b/friendfinder/themes/map.edc
new file mode 100644
index 0000000..f46decb
--- /dev/null
+++ b/friendfinder/themes/map.edc
@@ -0,0 +1,123 @@
+images {
+ image: "zoom.png" COMP;
+ image: "here.png" COMP;
+ image: "zoom_bg.png" COMP;
+}
+
+fonts {
+ font: "Vera.ttf" "vera";
+}
+
+collections {
+ group {
+ name: "main";
+ min: 240 240;
+ parts {
+ part {
+ name: "position";
+ type: TEXT;
+ effect: SOFT_SHADOW;
+ description {
+ state: "default" 0.0;
+ align: 0.25 0.0;
+ color: 255 255 255 255;
+ color2: 0 0 0 255;
+ text {
+ font: "vera";
+ size: 12;
+ text: "Pos: n/a";
+ align: 0.0 0.0;
+ }
+ rel1 {
+ relative: 0.0 0.01;
+ }
+ rel2 {
+ relative: 0.98 0.01;
+ }
+ }
+ }
+
+ part {
+ name: "here";
+ type: IMAGE;
+ description
+ {
+ fixed: 1 1;
+ min: 32 32;
+ max: 32 23;
+ state: "default" 0.0;
+ rel1 {
+ relative: 0 0;
+ offset: -16 -16;
+ }
+ image {
+ normal: "here.png";
+ }
+ fill {}
+ }
+ } // here
+
+ part {
+ name: "zoom_bg";
+ type: IMAGE;
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ min: 25 0;
+ align: 0.0 0.5;
+ rel1 {
+ offset: 10 28;
+ }
+ rel2 {
+ relative: 0.0 0.9;
+ offset: 0 -1;
+ }
+ image.normal: "zoom_bg.png";
+ }
+ }
+
+ part {
+ name: "zoom";
+ type: IMAGE;
+ mouse_events: 1;
+ dragable {
+ x: 0 0 0;
+ y: 1 1 0;
+ confine: "zoom_bg";
+ }
+
+ description {
+ fixed: 1 1;
+ min: 32 32;
+ state: "default" 0;
+ rel1 {
+ relative: 0.5 0.5;
+ offset: 5 0;
+ to: "zoom_bg";
+ }
+ rel2 {
+ relative: 0.5 0.5;
+ offset: 0 0;
+ to: "zoom_bg";
+ }
+ image normal: "zoom.png";
+ }
+ }
+ } // end parts
+
+ programs {
+ program {
+ name: "p_quit";
+ signal: "mouse,clicked,1";
+ source: "b_quit";
+ action: SIGNAL_EMIT "done" "quit_button";
+ }
+ program {
+ name: "p_kbd";
+ signal: "mouse,clicked,1";
+ source: "b_kbd";
+ action: SIGNAL_EMIT "kbd" "show";
+ }
+ } // end programs
+ } // end group
+}
diff --git a/friendfinder/themes/map.edj b/friendfinder/themes/map.edj
new file mode 100644
index 0000000..3e6d723
--- /dev/null
+++ b/friendfinder/themes/map.edj
Binary files differ