summaryrefslogtreecommitdiffstats
path: root/friendfinder/gui.c
diff options
context:
space:
mode:
authorPatrick Hornecker2010-01-04 17:05:27 +0100
committerPatrick Hornecker2010-01-04 17:05:27 +0100
commit0ff5700527431d9372ae56179f541bcea2a72f97 (patch)
treebfa8e354e860327520bc5a25f76104c837734a96 /friendfinder/gui.c
parentdrawing of user positions (diff)
downloadfriendfinder-0ff5700527431d9372ae56179f541bcea2a72f97.tar.gz
friendfinder-0ff5700527431d9372ae56179f541bcea2a72f97.tar.xz
friendfinder-0ff5700527431d9372ae56179f541bcea2a72f97.zip
more position features
Diffstat (limited to 'friendfinder/gui.c')
-rw-r--r--friendfinder/gui.c48
1 files changed, 37 insertions, 11 deletions
diff --git a/friendfinder/gui.c b/friendfinder/gui.c
index 6680937..8a5629c 100644
--- a/friendfinder/gui.c
+++ b/friendfinder/gui.c
@@ -12,6 +12,7 @@
#include "gui.h"
#include "handler.h"
#include "sender.h"
+#include "draw_user.h"
int h= 600;
int w = 450;
@@ -37,6 +38,13 @@ static void on_own_position(void *data, Evas_Object *obj, void *event_info)
init_sender_thread(from);
}
+static void set_distance(void *data, Evas_Object *obj, void *event_info)
+{
+ set_dist((int) data);
+ get_own_position(map);
+
+}
+
static void on_show_users(void *data, Evas_Object *obj, void *event_info)
{
init_receiver_thread(from);
@@ -44,6 +52,7 @@ static void on_show_users(void *data, Evas_Object *obj, void *event_info)
static void on_chat(void *data, Evas_Object *obj, void *event_info)
{
+ disable_map_bubbles();
init_window_parts();
init_buttons(obj);
init_toolbar(obj);
@@ -52,12 +61,13 @@ static void on_chat(void *data, Evas_Object *obj, void *event_info)
static void on_map(void *data, Evas_Object *obj, void *event_info)
{
init_map();
- /* init user drawing on map */
+ enable_map_bubbles();
init_draw_user(win, map);
}
static void on_options(void *data, Evas_Object *obj, void *event_info)
{
+ disable_map_bubbles();
init_options();
}
@@ -317,15 +327,31 @@ void init_options()
evas_object_size_hint_align_set(bx2, -1.0, -1.0);
elm_box_pack_end(bx, bx2);
evas_object_show(bx2);
-/*
+
bt = elm_button_add(win);
- elm_button_label_set(bt, "Find friends");
- evas_object_size_hint_weight_set(bt, 1.0, 0.2);
+ elm_button_label_set(bt, "Distance = 100 m");
+ evas_object_size_hint_weight_set(bt, 1.0, 1.0);
evas_object_size_hint_align_set(bt, -1.0, -1.0);
elm_box_pack_end(bx, bt);
- evas_object_smart_callback_add(bt, "clicked", NULL, NULL);
+ evas_object_smart_callback_add(bt, "clicked", set_distance, 100);
evas_object_show(bt);
-*/
+
+ bt2 = elm_button_add(win);
+ elm_button_label_set(bt2, "Distance = 250 m");
+ evas_object_size_hint_weight_set(bt2, 1.0, 1.0);
+ evas_object_size_hint_align_set(bt2, -1.0, -1.0);
+ elm_box_pack_end(bx, bt2);
+ evas_object_smart_callback_add(bt2, "clicked", set_distance, 250);
+ evas_object_show(bt2);
+
+ bt3 = elm_button_add(win);
+ elm_button_label_set(bt3, "Distance = 1000 m");
+ evas_object_size_hint_weight_set(bt3, 1.0, 1.0);
+ evas_object_size_hint_align_set(bt3, -1.0, -1.0);
+ elm_box_pack_end(bx, bt3);
+ evas_object_smart_callback_add(bt3, "clicked", set_distance, 1000);
+ evas_object_show(bt3);
+
}
void init_map()
@@ -360,16 +386,16 @@ void init_map()
map = e_smart_map_add(win, "data/maps/fr_map.eet");
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);
+ evas_object_size_hint_min_set(map, w-2, h-115);//h-10*8-60);
+// evas_object_size_hint_max_set(map, w-2, h-100);//-10*8-120);
+ evas_object_resize(map, w, h*0.65);
elm_box_pack_end(bx2, map);
evas_object_show(map);
bt = elm_button_add(win);
elm_button_label_set(bt, "Send own position");
- evas_object_size_hint_weight_set(bt2, 1.0, 1.0);
- evas_object_size_hint_align_set(bt2, -1.0, -1.0);
+ evas_object_size_hint_weight_set(bt, 1.0, 1.0);
+ evas_object_size_hint_align_set(bt, -1.0, -1.0);
elm_box_pack_end(bx, bt);
evas_object_smart_callback_add(bt, "clicked", on_own_position, NULL);
evas_object_show(bt);