summaryrefslogtreecommitdiffstats
path: root/friendfinder/gui.c
diff options
context:
space:
mode:
Diffstat (limited to 'friendfinder/gui.c')
-rw-r--r--friendfinder/gui.c61
1 files changed, 33 insertions, 28 deletions
diff --git a/friendfinder/gui.c b/friendfinder/gui.c
index a4fc013..87d2523 100644
--- a/friendfinder/gui.c
+++ b/friendfinder/gui.c
@@ -19,6 +19,7 @@ int w = 450;
int first = 0;
int bubble_pos = 100;
+int enable_chat = 0;
double current_lat = 47.996578;
double current_lon = 7.840171;
@@ -37,7 +38,10 @@ static void on_cancel(void *data, Evas_Object *obj, void *event_info)
static void on_own_position(void *data, Evas_Object *obj, void *event_info)
{
- init_sender_thread(from);
+ if (nickname != NULL)
+ {
+ init_sender_thread(from);
+ }
}
static void set_distance(void *data, Evas_Object *obj, void *event_info)
@@ -75,7 +79,10 @@ static void set_nickname(void *data, Evas_Object *obj, void *event_info)
static void on_show_users(void *data, Evas_Object *obj, void *event_info)
{
- init_receiver_thread(from);
+ if (nickname != NULL)
+ {
+ init_receiver_thread(from);
+ }
}
static void on_partner_nickname(void *data, Evas_Object *obj, void *event_info)
@@ -95,8 +102,8 @@ static void set_partner_nickname(void *data, Evas_Object *obj, void *event_info)
}
static void on_chat(void *data, Evas_Object *obj, void *event_info)
-{
- bubble_pos = 100;
+{
+ enable_chat = 1;
disable_map_bubbles();
init_window_parts();
init_toolbar(obj);
@@ -104,6 +111,7 @@ static void on_chat(void *data, Evas_Object *obj, void *event_info)
static void on_map(void *data, Evas_Object *obj, void *event_info)
{
+ enable_chat = 0;
init_map();
enable_map_bubbles();
init_draw_user(win, map);
@@ -112,6 +120,7 @@ static void on_map(void *data, Evas_Object *obj, void *event_info)
static void on_options(void *data, Evas_Object *obj, void *event_info)
{
+ enable_chat = 0;
disable_map_bubbles();
init_options();
}
@@ -131,10 +140,10 @@ static void on_send_message(void *data, Evas_Object *bx3, void *event_info)
if (msg_text != NULL)
{
- if (first == 0)
+ if (first == 0 && enable_chat == 1)
{
bb1 = elm_bubble_add(bx3);
- evas_object_resize(bb1, w, h/7);
+ evas_object_resize(bb1, w, h/6);
evas_object_move(bb1, 0, 0);
evas_object_show(bb1);
set_bubble_text(bb1, from, msg_text);
@@ -144,7 +153,7 @@ static void on_send_message(void *data, Evas_Object *bx3, void *event_info)
return;
}
- if (first == 1)
+ if (first == 1 && enable_chat == 1)
{
bb2 = elm_bubble_add(bx3);
evas_object_resize(bb2, w, h/6);
@@ -158,7 +167,7 @@ static void on_send_message(void *data, Evas_Object *bx3, void *event_info)
return;
}
- if (first == 2)
+ if (first == 2 && enable_chat == 1)
{
bb3 = elm_bubble_add(bx3);
evas_object_resize(bb3, w, h/6);
@@ -168,7 +177,7 @@ static void on_send_message(void *data, Evas_Object *bx3, void *event_info)
first = 0;
bubble_pos = 100;
-
+
return;
}
}
@@ -181,18 +190,20 @@ void show_message(char *current_msg)
if (current_msg != NULL)
{
- if (first == 0)
+ if (first == 0 && enable_chat == 1)
{
bb1 = elm_bubble_add(bbx);
- evas_object_resize(bb1, w, h/7);
+ evas_object_resize(bb1, w, h/6);
evas_object_move(bb1, 0, 0);
evas_object_show(bb1);
set_bubble_text(bb1, to, current_msg);
first = 1;
bubble_pos = bubble_pos + h/6;
+
+ return;
}
- if (first == 1);
+ if (first == 1 && enable_chat == 1);
{
bb2 = elm_bubble_add(bbx);
evas_object_resize(bb2, w, h/6);
@@ -202,8 +213,10 @@ void show_message(char *current_msg)
first = 2;
bubble_pos = bubble_pos + h/6;
+
+ return;
}
- if (first == 2)
+ if (first == 2 && enable_chat == 1)
{
bb3 = elm_bubble_add(bbx);
evas_object_resize(bb3, w, h/6);
@@ -212,7 +225,9 @@ void show_message(char *current_msg)
set_bubble_text(bb3, to, current_msg);
first = 0;
- bubble_pos = bubble_pos + h/6;
+ bubble_pos = 100;
+
+ return;
}
}
}
@@ -221,7 +236,9 @@ void show_message(char *current_msg)
void set_bubble_text(Evas_Object *bb, char *username, char *text)
{
Evas_Object *cn;
-
+
+ printf("%s \n", text);
+
/* sets the username */
elm_entry_entry_set(bb, username);
@@ -591,7 +608,7 @@ void init_buttons(Evas_Object *bx)
/* add cancel button to box - fill and expand */
bt2 = elm_button_add(win);
- elm_button_label_set(bt2, "Cancel");
+ elm_button_label_set(bt2, "Exit");
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);
@@ -629,18 +646,6 @@ void elm_main ()
int main (int argc, char **argv)
{
- /* if (argv[1] == NULL || argv[2] == NULL)
- {
- printf("no nick and no receiver set");
- from = NULL;
- to = NULL;
- }
- else
- {
- from = argv[1];
- to = argv[2];
- }*/
-
elm_init(argc, argv);
elm_main();