summaryrefslogtreecommitdiffstats
path: root/friendfinder
diff options
context:
space:
mode:
authorPatrick Hornecker2010-01-13 10:37:30 +0100
committerPatrick Hornecker2010-01-13 10:37:30 +0100
commita90d2beabbd2492510f7404bac45e699bd4cebb2 (patch)
tree0baec43d81921f80b7c822f7ed4d0af4759a679d /friendfinder
parentbug fixes (diff)
downloadfriendfinder-a90d2beabbd2492510f7404bac45e699bd4cebb2.tar.gz
friendfinder-a90d2beabbd2492510f7404bac45e699bd4cebb2.tar.xz
friendfinder-a90d2beabbd2492510f7404bac45e699bd4cebb2.zip
few bugs fixed, position drawing corrected...
Diffstat (limited to 'friendfinder')
-rw-r--r--friendfinder/draw_user.c7
-rw-r--r--friendfinder/gui.c38
2 files changed, 25 insertions, 20 deletions
diff --git a/friendfinder/draw_user.c b/friendfinder/draw_user.c
index 32f1baf..82c8837 100644
--- a/friendfinder/draw_user.c
+++ b/friendfinder/draw_user.c
@@ -70,7 +70,7 @@ void draw_user(struct position *pos)
int test_distance(double lat, double lon, int e, int n, double own_lat, double own_lon, int own_e, int own_n)
{
- project_latlon(lat, lon, &e, &n, PROJECTION_MERC);
+ project_latlon(lat, lon, &e, &n, PROJECTION_UTM);
project_latlon(own_lat, own_lon, &own_e, &own_n, PROJECTION_UTM);
printf("e %i \n", e);
@@ -78,6 +78,11 @@ int test_distance(double lat, double lon, int e, int n, double own_lat, double o
printf("n %i \n", n);
printf("own_n %i \n", own_n);
+ project_latlon_inv(e, n, &lat, &lon, PROJECTION_UTM);
+
+ printf("lat %f \n", lat);
+ printf("lon %f \n", lon);
+
if (e != NULL && n !=NULL && own_n != NULL && own_e != NULL)
{
double x = sqrt(((e - own_e) * (e - own_e)) + ((n - own_n) * (n - own_n)));
diff --git a/friendfinder/gui.c b/friendfinder/gui.c
index 87d2523..ba1ca75 100644
--- a/friendfinder/gui.c
+++ b/friendfinder/gui.c
@@ -271,6 +271,7 @@ void init_window_parts()
/* add a standard bg */
bg = elm_bg_add(win);
+
/* not not allow bg to expand. let's limit dialog size to contents */
elm_win_resize_object_add(win, bg);
evas_object_show(bg);
@@ -288,7 +289,6 @@ void init_window_parts()
elm_frame_content_set(bx, bx2);
evas_object_move(bx2, 0, h*0.93);
evas_object_resize(bx2, w, h*0.05);
- //elm_box_pack_end(bx, bx2);
evas_object_show(bx2);
/* add box for incoming messages */
@@ -297,15 +297,12 @@ void init_window_parts()
evas_object_move(bx3, 0, h*0.78);
evas_object_show(bx3);
-
sc = elm_scroller_add(win);
evas_object_size_hint_weight_set(sc, 1.0, 1.0);
evas_object_size_hint_align_set(sc, -1.0, -1.0);
elm_box_pack_end(bx3, sc);
en = elm_entry_add(win);
- //if (text) elm_entry_entry_set(en, text);
- //else elm_entry_entry_set(en, "");
evas_object_size_hint_weight_set(en, 1.0, 1.0);
evas_object_size_hint_align_set(en, 0.0, 0.0);
elm_scroller_content_set(sc, en);
@@ -364,6 +361,7 @@ void init_options()
/* add a standard bg */
bg = elm_bg_add(win);
+
/* not not allow bg to expand. let's limit dialog size to contents */
elm_win_resize_object_add(win, bg);
evas_object_show(bg);
@@ -374,7 +372,6 @@ void init_options()
bx = elm_box_add(win);
evas_object_size_hint_weight_set(bx, 1.0, 1.0);
evas_object_size_hint_align_set(bx, -1.0, -1.0);
- //evas_object_resize(bx, w, h);
evas_object_resize(bx, w*0.8, h*0.33);
evas_object_move(bx, w*0.1, h*0.65);
evas_object_show(bx);
@@ -385,7 +382,6 @@ void init_options()
evas_object_size_hint_align_set(bx2, -1.0, -1.0);
evas_object_resize(bx2, w*0.8, h*0.04);
evas_object_move(bx2, w*0.1, h*0.25);
- // elm_box_pack_end(bx, bx2);
evas_object_show(bx2);
bx3 = elm_box_add(win);
@@ -394,7 +390,6 @@ void init_options()
evas_object_size_hint_align_set(bx3, -1.0, -1.0);
evas_object_resize(bx3, w*0.8, h*0.04);
evas_object_move(bx3, w*0.1, h*0.35);
- // elm_box_pack_end(bx, bx2);
evas_object_show(bx3);
bx4 = elm_box_add(win);
@@ -403,7 +398,6 @@ void init_options()
evas_object_size_hint_align_set(bx4, -1.0, -1.0);
evas_object_resize(bx4, w*0.8, h*0.04);
evas_object_move(bx4, w*0.1, h*0.45);
- // elm_box_pack_end(bx, bx2);
evas_object_show(bx4);
bt = elm_button_add(win);
@@ -439,14 +433,18 @@ void init_options()
elm_box_pack_end(bx2, sc1);
en1 = elm_entry_add(win);
- //if (text) elm_entry_entry_set(en, text);
- //else elm_entry_entry_set(en, "");
+ elm_entry_entry_set(en1, "127.0.0.1");
evas_object_size_hint_weight_set(en1, 1.0, 1.0);
evas_object_size_hint_align_set(en1, 0.0, 0.0);
elm_scroller_content_set(sc1, en1);
evas_object_smart_callback_add(en1, "changed", on_ip, NULL);
evas_object_show(en1);
+ if (ip != NULL)
+ {
+ elm_entry_entry_set(en1, ip);
+ }
+
lb1 = elm_label_add(win);
elm_label_label_set(lb1, "Server IP");
elm_box_pack_end(bx2, lb1);
@@ -470,14 +468,17 @@ void init_options()
elm_box_pack_end(bx3, sc2);
en2 = elm_entry_add(win);
- //if (text) elm_entry_entry_set(en, text);
- //else elm_entry_entry_set(en, "");
evas_object_size_hint_weight_set(en2, 1.0, 1.0);
evas_object_size_hint_align_set(en2, 0.0, 0.0);
elm_scroller_content_set(sc2, en2);
evas_object_smart_callback_add(en2, "changed", on_nickname, NULL);
evas_object_show(en2);
+ if (from != NULL)
+ {
+ elm_entry_entry_set(en2, nickname);
+ }
+
lb2 = elm_label_add(win);
elm_label_label_set(lb2, "Nickname");
elm_box_pack_end(bx3, lb2);
@@ -501,14 +502,17 @@ void init_options()
elm_box_pack_end(bx4, sc3);
en3 = elm_entry_add(win);
- //if (text) elm_entry_entry_set(en, text);
- //else elm_entry_entry_set(en, "");
evas_object_size_hint_weight_set(en3, 1.0, 1.0);
evas_object_size_hint_align_set(en3, 0.0, 0.0);
elm_scroller_content_set(sc3, en3);
evas_object_smart_callback_add(en3, "changed", on_partner_nickname, NULL);
evas_object_show(en3);
+ if (to != NULL)
+ {
+ elm_entry_entry_set(en3, to);
+ }
+
lb3 = elm_label_add(win);
elm_label_label_set(lb3, "Buddy nickname");
elm_box_pack_end(bx4, lb3);
@@ -535,6 +539,7 @@ void init_map()
/* add a standard bg */
bg = elm_bg_add(win);
+
/* not not allow bg to expand. let's limit dialog size to contents */
elm_win_resize_object_add(win, bg);
evas_object_show(bg);
@@ -558,7 +563,6 @@ 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, current_lat, current_lon);
-// e_smart_map_set_pos(map, 47.996578, 7.840171);
evas_object_size_hint_min_set(map, w-2, h-10*8-80);
evas_object_size_hint_max_set(map, w-2, h-10*8-80);
evas_object_resize(map, w, h*0.65);
@@ -605,7 +609,6 @@ void init_buttons(Evas_Object *bx)
/* and when clicked - run "on_ok" */
evas_object_smart_callback_add(bt1, "clicked", on_send_message, NULL);
-
/* add cancel button to box - fill and expand */
bt2 = elm_button_add(win);
elm_button_label_set(bt2, "Exit");
@@ -634,9 +637,6 @@ void elm_main ()
/* show the window */
evas_object_show(win);
- /* start the message sender thread */
- //init_msg_thread(from, to);
-
/* get going and draw/respond to the user */
elm_run();