summaryrefslogtreecommitdiffstats
path: root/friendfinder/gui.c
diff options
context:
space:
mode:
authorPatrick Hornecker2009-12-23 12:56:08 +0100
committerPatrick Hornecker2009-12-23 12:56:08 +0100
commit413534ec2e24d4552f05d7560e1a713a0223b214 (patch)
tree711eb701fc8f5d710a125e0c3bb77a7c19e2898a /friendfinder/gui.c
parent...clean up...again and again... (diff)
downloadfriendfinder-413534ec2e24d4552f05d7560e1a713a0223b214.tar.gz
friendfinder-413534ec2e24d4552f05d7560e1a713a0223b214.tar.xz
friendfinder-413534ec2e24d4552f05d7560e1a713a0223b214.zip
receiver and sender added to handler, nearly clean exit, map added
Diffstat (limited to 'friendfinder/gui.c')
-rw-r--r--friendfinder/gui.c84
1 files changed, 36 insertions, 48 deletions
diff --git a/friendfinder/gui.c b/friendfinder/gui.c
index 868b4c1..62b35ff 100644
--- a/friendfinder/gui.c
+++ b/friendfinder/gui.c
@@ -3,7 +3,6 @@
#include "Evas.h"
#include "Ecore.h"
-#include "Ecore_Evas.h"
#include "Elementary.h"
#include "msg_sender.h"
@@ -28,44 +27,40 @@ static Evas_Object *win, *bbx;
static void on_cancel(void *data, Evas_Object *obj, void *event_info)
{
- /* cleanly exit */
- elm_exit();
+ /* cleanly exit */
+ elm_exit();
+ elm_shutdown();
+ disconnect_receiver();
+ disconnect_sender();
+ disconnect_msg_sender();
+ shutdown_ecore_handler();
}
static void on_chat(void *data, Evas_Object *obj, void *event_info)
{
-
init_window_parts();
init_buttons(obj);
init_toolbar(obj);
-
}
static void on_map(void *data, Evas_Object *obj, void *event_info)
{
-
init_map();
-
}
static void on_options(void *data, Evas_Object *obj, void *event_info)
{
-
init_options();
-
}
static void on_message(void *data, Evas_Object *obj, void *event_info)
{
-
msg_text = elm_entry_entry_get(obj);
elm_entry_context_menu_clear(obj);
-
}
static void on_send_message(void *data, Evas_Object *bx3, void *event_info)
{
-
printf("on_send_message: %s\n", msg_text);
set_txt_msg(msg_text);
Evas_Object *bb1, *bb2, *bb3;
@@ -163,19 +158,16 @@ void show_message(char *current_msg)
/* returns the current system time */
char* get_current_time()
{
-
time_t now;
time(&now);
char *text = ctime(&now);
return text;
-
}
/* sets the username, time-text and the text in the bubble */
void set_bubble_text(Evas_Object *bb, char *username, char *text)
{
-
Evas_Object *cn;
/* sets the username */
@@ -198,12 +190,10 @@ void set_bubble_text(Evas_Object *bb, char *username, char *text)
evas_object_move(bb, 0, bubble_pos);
elm_bubble_content_set(bb, cn);
evas_object_show(bb);
-
}
void init_window_parts()
{
-
Evas_Object *bg, *bx, *bx2, *bx3, *sc, *en;
/* add a standard bg */
@@ -261,7 +251,6 @@ void init_window_parts()
void init_toolbar()
{
-
Evas_Object *tb, *ic, *bx;
/* add box for toolbar */
@@ -289,7 +278,7 @@ void init_toolbar()
elm_toolbar_item_add(tb, ic, "Map", on_map, NULL);
evas_object_show(ic);
-// evas_object_show(ic);
+ evas_object_show(ic);
elm_box_pack_end(bx, tb);
evas_object_show(tb);
@@ -297,7 +286,6 @@ void init_toolbar()
void init_options()
{
-
Evas_Object *bg, *bx, *bx2, *bt;
/* add a standard bg */
@@ -323,18 +311,17 @@ void init_options()
evas_object_show(bx2);
bt = elm_button_add(win);
- elm_button_label_set(bt, "Stell mich ein");
+ elm_button_label_set(bt, "fiend friends");
evas_object_size_hint_weight_set(bt, 1.0, 0.0);
evas_object_size_hint_align_set(bt, -1.0, -1.0);
- elm_box_pack_end(bx2, bt);
+ elm_box_pack_end(bx, bt);
evas_object_smart_callback_add(bt, "clicked", NULL, NULL);
evas_object_show(bt);
}
void init_map()
{
-
- Evas_Object *bg, *bx, *bx2, *bx3, *map, *bt1, *bt2;
+ Evas_Object *bg, *bx, *bx2, *bx3, *map, *bt1, *bt2, *bt3;
/* add a standard bg */
bg = elm_bg_add(win);
@@ -388,44 +375,47 @@ void init_map()
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_show(bt2);
+
+ 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);
}
void init_buttons(Evas_Object *box)
{
-
- Evas_Object *bt;
+ Evas_Object *bt1, *bt2;
/* add ok button to box - fill and expand */
- bt = elm_button_add(win);
- elm_button_label_set(bt, "Send Message");
- 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(box, bt);
- evas_object_show(bt);
+ bt1 = elm_button_add(win);
+ elm_button_label_set(bt1, "Send Message");
+ 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(box, bt1);
+ evas_object_show(bt1);
/* and when clicked - run "on_ok" */
- bbx = box;
- evas_object_smart_callback_add(bt, "clicked", on_send_message, NULL);
+ evas_object_smart_callback_add(bt1, "clicked", on_send_message, NULL);
/* add cancel button to box - fill and expand */
- bt = elm_button_add(win);
- elm_button_label_set(bt, "Cancel");
- 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(box, bt);
- evas_object_show(bt);
+ bt2 = elm_button_add(win);
+ elm_button_label_set(bt2, "Cancel");
+ 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(box, bt2);
+ evas_object_show(bt2);
/* and when clicked - run "on_cancel" */
- evas_object_smart_callback_add(bt, "clicked", on_cancel, NULL);
-
+ evas_object_smart_callback_add(bt2, "clicked", on_cancel, NULL);
}
void elm_main ()
{
-
/* new window - do the usual and give it a name, title and delete handler */
win = elm_win_add(NULL, "Main", ELM_WIN_BASIC);
elm_win_title_set(win, "Main");
@@ -442,11 +432,10 @@ void elm_main ()
init_ecore_handler(from, to);
/* get going and draw/respond to the user */
- // elm_run();
+ elm_run();
/* standard shutdown */
elm_exit();
-
}
int main (int argc, char **argv)
@@ -470,5 +459,4 @@ int main (int argc, char **argv)
elm_shutdown();
return 0;
-
}