summaryrefslogtreecommitdiffstats
path: root/friendfinder/gui.c
diff options
context:
space:
mode:
Diffstat (limited to 'friendfinder/gui.c')
-rw-r--r--friendfinder/gui.c76
1 files changed, 37 insertions, 39 deletions
diff --git a/friendfinder/gui.c b/friendfinder/gui.c
index 0a39335..647ef28 100644
--- a/friendfinder/gui.c
+++ b/friendfinder/gui.c
@@ -6,9 +6,9 @@
#include "Elementary.h"
#include "msg_sender.h"
+#include "receiver.h"
#include "gui.h"
#include "handler.h"
-#include "receiver.h"
#include "sender.h"
int h= 600;
@@ -20,7 +20,7 @@ time_t now;
const char* msg_text;
char *from, *to, *current_msg, *last_msg;
-static Evas_Object *win, *bbx;
+static Evas_Object *win, *bbx, *map;
static void on_cancel(void *data, Evas_Object *obj, void *event_info)
{
@@ -168,6 +168,14 @@ char* get_current_time()
return text;
}
+void print_users(struct position *pos)
+{
+ Evas_Object *ic;
+
+ elm_icon_add(map);
+ elm_icon_file_set(ic, "data/sl_bt_0.png", NULL);
+ evas_object_show(ic);
+}
/* sets the username, time-text and the text in the bubble */
void set_bubble_text(Evas_Object *bb, char *username, char *text)
@@ -302,29 +310,29 @@ void init_options()
init_toolbar(bg);
bx = elm_box_add(win);
- evas_object_size_hint_weight_set(bx, 1.0, 1.0);
+ evas_object_size_hint_weight_set(bx, 1.0, 0.2);
evas_object_size_hint_align_set(bx, -1.0, -1.0);
evas_object_resize(bx, w, h);
evas_object_show(bx);
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, 1);
- evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
+ evas_object_size_hint_weight_set(bx2, 1.0, 1.0);
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.0);
+ evas_object_size_hint_weight_set(bt, 1.0, 0.2);
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_show(bt);
-
+*/
bt2 = elm_button_add(win);
elm_button_label_set(bt2, "Send own position");
- evas_object_size_hint_weight_set(bt2, 1.0, 0.0);
+ evas_object_size_hint_weight_set(bt2, 1.0, 0.2);
evas_object_size_hint_align_set(bt2, -1.0, -1.0);
elm_box_pack_end(bx, bt2);
evas_object_smart_callback_add(bt2, "clicked", on_own_position, NULL);
@@ -332,7 +340,7 @@ void init_options()
bt3 = elm_button_add(win);
elm_button_label_set(bt3, "Show other users");
- evas_object_size_hint_weight_set(bt3, 1.0, 0.0);
+ evas_object_size_hint_weight_set(bt3, 1.0, 0.2);
evas_object_size_hint_align_set(bt3, -1.0, -1.0);
elm_box_pack_end(bx, bt3);
evas_object_smart_callback_add(bt3, "clicked", on_show_users, NULL);
@@ -341,7 +349,7 @@ void init_options()
void init_map()
{
- Evas_Object *bg, *bx, *bx2, *bx3, *map, *bt1, *bt2, *bt3;
+ Evas_Object *bg, *bx, *bx2, *bx3, *bt;
/* add a standard bg */
bg = elm_bg_add(win);
@@ -359,9 +367,9 @@ void init_map()
evas_object_show(bx);
bx2 = elm_box_add(win);
- evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
+ evas_object_size_hint_weight_set(bx2, 0.5, 0.2);
evas_object_size_hint_align_set(bx2, -1.0, -1.0);
- evas_object_resize(bx2, w*1.3, h*0.7);
+ evas_object_resize(bx2, w*1.3, h*0.5);
elm_box_pack_end(bx, bx2);
evas_object_show(bx2);
@@ -369,41 +377,31 @@ void init_map()
elm_box_horizontal_set(bx2, 1);
evas_object_size_hint_weight_set(bx3, 1.0, 0.0);
evas_object_size_hint_align_set(bx3, -1.0, 0.0);
- evas_object_resize(bx3, w*0.9, h*0.2);
+ evas_object_resize(bx3, w*0.9, h*0.1);
elm_box_pack_end(bx, bx3);
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);
- evas_object_size_hint_min_set(map, w-2*8, h-10*8-40);
- evas_object_size_hint_max_set(map, w-2*8, h-10*8-40);
- //evas_object_resize(map, w*0.92, h*0.7);
+ 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);
- bt1 = elm_button_add(win);
- elm_button_label_set(bt1, "Show friends");
- evas_object_size_hint_weight_set(bt1, 1.0, 1.0);
- evas_object_size_hint_align_set(bt1, -1.0, -1.0);
- elm_box_pack_end(bx3, bt1);
- evas_object_smart_callback_add(bt1, "clicked", NULL, NULL);
- evas_object_show(bt1);
-
- bt2 = elm_button_add(win);
- elm_button_label_set(bt2, "Hide friends");
- 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(bx3, bt2);
- evas_object_smart_callback_add(bt2, "clicked", NULL, NULL);
- evas_object_show(bt2);
+ Evas_Object *ic;
- bt3 = elm_button_add(win);
- elm_button_label_set(bt3, "Exit");
- 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(bx3, bt3);
- evas_object_smart_callback_add(bt3, "clicked", on_cancel, NULL);
- evas_object_show(bt3);
+ elm_icon_add(map);
+ elm_icon_file_set(ic, "data/sl_bt_0.png", NULL);
+// evas_object_show(ic);
+
+ bt = elm_button_add(win);
+ elm_button_label_set(bt, "Exit");
+ 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(bx3, bt);
+ evas_object_smart_callback_add(bt, "clicked", on_cancel, NULL);
+ evas_object_show(bt);
}
void init_buttons(Evas_Object *box)