Diff of /trunk/src/map-tool.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 33 by harbaum, Tue Jul 28 13:21:40 2009 UTC revision 77 by harbaum, Tue Aug 25 12:49:03 2009 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2008 Till Harbaum <till@harbaum.org>.   * Copyright (C) 2008-2009 Till Harbaum <till@harbaum.org>.
3   *   *
4   * This file is part of GPXView.   * This file is part of GPXView.
5   *   *
# Line 18  Line 18 
18   */   */
19    
20  #include "gpxview.h"  #include "gpxview.h"
21    #include "converter.h"
22    #include <math.h>    // for isnan
23    
24  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
25  #include "osm-gps-map.h"  #include "osm-gps-map.h"
26    #include "osm-gps-map-osd-classic.h"
27  #endif  #endif
28    
29  typedef struct {  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
30    GtkWidget *widget;  #include <gdk/gdkx.h>
31    GtkWidget *zoomin, *zoomout, *gps;  #include <X11/Xatom.h>
32    gint handler_id;  #endif
33  } map_context_t;  
34    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
35    #define GPS_DEFAULT_ZOOM 13
36    
37  static const char *get_proxy_uri(void) {  #define PROXY_KEY  "/system/http_proxy/"
38    static char proxy_buffer[64];  
39    static const char *get_proxy_uri(appdata_t *appdata) {
40      static char proxy_buffer[64] = "";
41    
42    /* use environment settings if preset */    /* use environment settings if preset */
43    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
# Line 39  static const char *get_proxy_uri(void) { Line 46  static const char *get_proxy_uri(void) {
46      return proxy;      return proxy;
47    }    }
48    
49  #if 0    /* ------------- get proxy settings -------------------- */
50    /* otherwise try settings */    if(gconf_client_get_bool(appdata->gconf_client,
51    if(!settings || !settings->proxy ||                             PROXY_KEY "use_http_proxy", NULL)) {
52       !settings->proxy->host) return NULL;  
53        /* we can savely ignore things like "ignore_hosts" since we */
54        /* are pretty sure not inside the net of one of our map renderers */
55        /* (unless the user works at google :-) */
56    
57        /* get basic settings */
58        char *host =
59          gconf_client_get_string(appdata->gconf_client, PROXY_KEY "host", NULL);
60        if(host) {
61          int port =
62            gconf_client_get_int(appdata->gconf_client, PROXY_KEY "port", NULL);
63    
64          snprintf(proxy_buffer, sizeof(proxy_buffer),
65                   "http://%s:%u", host, port);
66    
67          g_free(host);
68        }
69        return proxy_buffer;
70      }
71    
72    snprintf(proxy_buffer, sizeof(proxy_buffer), "%s%s:%u",    return NULL;
73             strncmp(settings->proxy->host, "http://", 7)?"http://":"",  }
            settings->proxy->host, settings->proxy->port);  
74    
75    proxy_buffer[sizeof(proxy_buffer)-1] = 0;  static void
76    printf("gconf_proxy: %s\n", proxy_buffer);  cb_map_gps(osd_button_t but, map_context_t *context) {
77  #endif    if(but == OSD_GPS) {
78        pos_t *refpos = get_pos(context->appdata);
79        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
80          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
81                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
82          /* re-enable centering */
83          g_object_set(context->widget, "auto-center", TRUE, NULL);
84        } else {
85          /* no coordinates given: display the entire world */
86          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
87                                    0.0, 0.0, 1);
88        }
89      }
90    }
91    
92    return proxy_buffer;  static int dist2pixel(map_context_t *context, float km, float lat) {
93      return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));
94  }  }
95    
96  static void map_zoom(map_context_t *context, int step) {  static gboolean map_gps_update(gpointer data) {
97    int zoom;    map_context_t *context = (map_context_t*)data;
   OsmGpsMap *map = OSM_GPS_MAP(context->widget);  
   g_object_get(map, "zoom", &zoom, NULL);  
   zoom = osm_gps_map_set_zoom(map, zoom+step);  
98    
99    /* enable/disable zoom buttons as required */    /* get reference position ... */
100    gtk_widget_set_sensitive(context->zoomin, zoom<17);    pos_t *refpos = get_pos(context->appdata);
101    gtk_widget_set_sensitive(context->zoomout, zoom>1);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
102    
103      /* ... and enable "goto" button if it's valid */
104      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
105                     OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
106    
107      if(ok) {
108        float heading = NAN;
109        int radius = 0;
110    
111        if(context->appdata->use_gps) {
112          heading = gps_get_heading(context->appdata);
113    
114          /* get error */
115          float eph = gps_get_eph(context->appdata);
116          if(!isnan(eph))
117            radius = dist2pixel(context, eph/1000, refpos->lat);
118        }
119    
120        g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
121        osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
122                             refpos->lat, refpos->lon, heading);
123      } else
124        osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
125    
126      return TRUE;
127  }  }
128    
129  static gboolean  static gboolean on_map_configure(GtkWidget *widget,
130  cb_map_zoomin(GtkButton *button, map_context_t *context) {                                   GdkEventConfigure *event,
131    map_zoom(context, +1);                                   map_context_t *context) {
132    
133      /* set default values if they are invalid */
134      if(!context->appdata->map.zoom ||
135         isnan(context->appdata->map.pos.lat) ||
136         isnan(context->appdata->map.pos.lon)) {
137        printf("no valid map position found\n");
138    
139        pos_t *refpos = get_pos(context->appdata);
140        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
141          /* use gps position if present */
142          context->appdata->map.pos = *refpos;
143          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
144        } else {
145          /* use world map otherwise */
146          context->appdata->map.pos.lat = 0.0;
147          context->appdata->map.pos.lon = 0.0;
148          context->appdata->map.zoom = 1;
149        }
150      }
151    
152      /* jump to initial position */
153      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
154                                context->appdata->map.pos.lat,
155                                context->appdata->map.pos.lon,
156                                context->appdata->map.zoom);
157    
158    return FALSE;    return FALSE;
159  }  }
160    
161  static gboolean  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {
162  cb_map_zoomout(GtkButton *button, map_context_t *context) {    while(cache) {
163    map_zoom(context, -1);      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
164    return FALSE;  
165        osm_gps_map_add_image(OSM_GPS_MAP(map),
166                              cache->pos.lat, cache->pos.lon, icon);
167    
168        cache = cache->next;
169      }
170    }
171    
172    static void
173    map_cachelist_nearest(cache_t *cache, pos_t *pos,
174                          cache_t **result, float *distance) {
175      while(cache) {
176        float dist =
177          pow(cache->pos.lat - pos->lat, 2) +
178          pow(cache->pos.lon - pos->lon, 2);
179    
180        if(!(dist > *distance)) {
181          *result = cache;
182          *distance = dist;
183        }
184    
185        cache = cache->next;
186      }
187    }
188    
189    static cache_t *map_closest(map_context_t *context, pos_t *pos) {
190      cache_t *result = NULL;
191      float distance = NAN;
192    
193    #ifdef USE_MAEMO
194      if(!context->appdata->cur_gpx) {
195    #endif
196        /* search all geocaches */
197        gpx_t *gpx = context->appdata->gpx;
198        while(gpx) {
199          map_cachelist_nearest(gpx->cache, pos, &result, &distance);
200          gpx = gpx->next;
201        }
202    #ifdef USE_MAEMO
203      } else {
204        map_cachelist_nearest(context->appdata->cur_gpx->cache,
205                              pos, &result, &distance);
206      }
207    #endif
208    
209      return result;
210  }  }
211    
212    /* translate between osm-gps-map positions and gpxview ones */
213    pos_t coord2pos(coord_t coo) {
214      pos_t pos;
215      pos.lat = rad2deg(coo.rlat);
216      pos.lon = rad2deg(coo.rlon);
217      return pos;
218    }
219    
220    #define CLICK_FUZZ (24)
221    
222  static gboolean  static gboolean
223  cb_map_gps(GtkButton *button, map_context_t *context) {  on_map_button_press_event(GtkWidget *widget,
224                                GdkEventButton *event, map_context_t *context) {
225      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
226    
227    //  osm_gps_map_set_center(OSM_GPS_MAP(context->widget),    /* got a press event without release event? eat it! */
228    //                     DEG2RAD(pos.lat), DEG2RAD(pos.lon));    if(context->press_on != NULL) {
229        printf("PRESS: already\n");
230        return TRUE;
231      }
232    
233      pos_t pos =
234        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
235    
236      cache_t *nearest = map_closest(context, &pos);
237      if(nearest) {
238        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
239        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)
240          context->press_on = nearest;
241      }
242    
243    return FALSE;    return FALSE;
244  }  }
245    
246  static GtkWidget  static void
247  *map_add_button(const gchar *icon, GCallback cb, gpointer data,  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
248                  char *tooltip) {    /* convert the pixbuf into something cairo can handle */
249    GtkWidget *button = gtk_button_new();  
250    gtk_button_set_image(GTK_BUTTON(button),    // Create a new ImageSurface
251                         gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU));    cairo_surface_t *image_surface =
252    g_signal_connect(button, "clicked", cb, data);      cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
253  #ifndef USE_MAEMO                                 gdk_pixbuf_get_width(buf),
254    gtk_widget_set_tooltip_text(button, tooltip);                                 gdk_pixbuf_get_height(buf));
255    
256      // Create the new Context for the ImageSurface
257      cairo_t *context = cairo_create(image_surface);
258    
259      // Draw the image on the new Context
260      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
261      cairo_paint(context);
262    
263      // now draw this onto the original context
264      cairo_set_source_surface(cr, image_surface, x, y);
265    
266      cairo_paint(cr);
267    }
268    
269    #ifndef BIG_BALLOONS
270    #define LINE_SKIP  7
271    #else
272    #define LINE_SKIP  12
273    #endif
274    
275    static void
276    balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
277      cache_t *cache = (cache_t*)data;
278    
279    #if 0
280      /* draw pink background to check clipping */
281      cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
282      cairo_set_source_rgba (cr, 1, 0, 0, 0.3);
283      cairo_fill_preserve (cr);
284      cairo_set_line_width (cr, 0);
285      cairo_stroke (cr);
286    #endif
287    
288      /* leave a little border top and left */
289      gint x = rect->x, y = rect->y;
290    
291      /* draw the cache type icon ... */
292      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
293      cairo_draw_pixbuf(cr, icon, x, y);
294    
295      /* ... and right of it the waypoint id */
296      cairo_text_extents_t extents;
297    
298      if(cache->id) {
299        cairo_select_font_face (cr, "Sans",
300                                CAIRO_FONT_SLANT_NORMAL,
301                                CAIRO_FONT_WEIGHT_BOLD);
302    
303    #ifndef BIG_BALLOONS
304        cairo_set_font_size (cr, 20.0);
305    #else
306        cairo_set_font_size (cr, 36.0);
307    #endif
308    
309        cairo_text_extents (cr, cache->id, &extents);
310    
311        /* display id right of icon vertically centered */
312        x += gdk_pixbuf_get_width(icon) + 5;
313        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
314        cairo_move_to (cr, x, y);
315        cairo_set_source_rgba (cr, 0, 0, 0, 1);
316        cairo_show_text (cr, cache->id);
317        cairo_stroke (cr);
318    
319        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
320      } else
321        y += gdk_pixbuf_get_height(icon);
322    
323      /* return to the left border and below icon/text */
324      x = rect->x;
325    
326      /* everything from here uses the same font */
327      cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
328                              CAIRO_FONT_WEIGHT_NORMAL);
329    #ifndef BIG_BALLOONS
330      cairo_set_font_size (cr, 14.0);
331    #else
332      cairo_set_font_size (cr, 22.0);
333  #endif  #endif
334    return button;  
335      if(cache->name) {
336        /* draw cache name */
337        cairo_text_extents (cr, cache->name, &extents);
338        y += extents.height;
339        cairo_move_to (cr, x, y);
340        cairo_set_source_rgba (cr, 0, 0, 0, 1);
341        cairo_show_text (cr, cache->name);
342        cairo_stroke (cr);
343    
344        /* return to the left border and below text */
345        y += LINE_SKIP;
346        x = rect->x;
347      }
348    
349      if(cache->terrain) {
350        /* draw cache rating */
351        const char *terrain = "Terrain:";
352        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
353        cairo_text_extents (cr, _(terrain), &extents);
354        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
355    
356        /* draw "Terrain:" string */
357        cairo_move_to (cr, x, y);
358        cairo_set_source_rgba (cr, 0, 0, 0, 1);
359        cairo_show_text (cr, _(terrain));
360        cairo_stroke (cr);
361        x += extents.width + 2;
362    
363        /* draw terrain stars */
364        cairo_draw_pixbuf(cr, icon, x, y -
365                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
366    
367        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
368        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
369      }
370    
371      if(cache->difficulty) {
372        const char *difficulty = "Difficulty:";
373        cairo_text_extents (cr, _(difficulty), &extents);
374        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
375    
376        /* draw "Difficulty:" string */
377        cairo_move_to (cr, x, y);
378        cairo_set_source_rgba (cr, 0, 0, 0, 1);
379        cairo_show_text (cr, _(difficulty));
380        cairo_stroke (cr);
381        x += extents.width + 2;
382    
383        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
384        cairo_draw_pixbuf(cr, icon, x, y -
385                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
386      }
387  }  }
388    
389  static gboolean map_gps_update(gpointer data) {  static gboolean
390    map_context_t *context = (map_context_t*)data;  on_map_button_release_event(GtkWidget *widget,
391                                GdkEventButton *event, map_context_t *context) {
392      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
393    
394      if(context->press_on) {
395        coord_t coo;
396        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
397    
398        pos_t pos =
399          coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
400    
401        cache_t *nearest = map_closest(context, &pos);
402        if(nearest && nearest == context->press_on) {
403          float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
404          if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {
405    
406            osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,
407                                     balloon_draw_cb, nearest);
408          }
409        }
410        context->press_on = NULL;
411      } else {
412        /* save new map position */
413        gfloat lat, lon;
414        g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
415        context->appdata->map.pos.lat = lat;
416        context->appdata->map.pos.lon = lon;
417      }
418    
419    //  gtk_widget_set_sensitive(context->map.gps, gps_fix);    return FALSE;
420    }
421    
422    return TRUE;  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
423      appdata_t *appdata = context->appdata;
424    
425      printf("destroy map window\n");
426    
427      /* save map parameters */
428      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
429      gint zoom;
430      g_object_get(map, "zoom", &zoom, NULL);
431      context->appdata->map.zoom = zoom;
432    
433      gfloat lat, lon;
434      g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
435      context->appdata->map.pos.lat = lat;
436      context->appdata->map.pos.lon = lon;
437    
438    #if MAEMO_VERSION_MAJOR == 5
439      /* restore cur_view */
440      context->appdata->cur_view = context->old_view;
441    #endif
442    
443      gtk_timeout_remove(context->handler_id);
444    
445      g_free(context);
446      appdata->map.context = NULL;
447  }  }
448    
449    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
450    /* get access to zoom buttons */
451    static void
452    on_window_realize(GtkWidget *widget, gpointer data) {
453      if (widget->window) {
454        unsigned char value = 1;
455        Atom hildon_zoom_key_atom =
456          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
457          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
458        Display *dpy =
459          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
460        Window w = GDK_WINDOW_XID(widget->window);
461    
462        XChangeProperty(dpy, w, hildon_zoom_key_atom,
463                        integer_atom, 8, PropModeReplace, &value, 1);
464      }
465    }
466    #endif
467    
468  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
469    map_context_t context;    map_context_t *context = NULL;
470    
471      /* if the map window already exists, just raise it */
472      if(appdata->map.context) {
473        gtk_window_present(GTK_WINDOW(appdata->map.context->window));
474        return;
475      }
476    
477    GtkWidget *dialog = gtk_dialog_new_with_buttons(_("Map"),    context = appdata->map.context = g_new0(map_context_t, 1);
478                            GTK_WINDOW(appdata->window),    context->appdata = appdata;
                           GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,  
                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,  
                           NULL);  
479    
480  #ifndef USE_MAEMO    /* cleanup old (pre 0.8.7) path if it exists */
481    gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 350);    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
482      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
483        printf("old file path %s exists\n", old_path);
484        rmdir_recursive(old_path);
485      }
486    
487      /* It is recommanded that all applications share these same */
488      /* map path, so data is only cached once. The path should be: */
489      /* ~/.osm-gps-map on standard PC     (users home) */
490      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
491      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
492    #if !defined(USE_MAEMO)
493      char *p = getenv("HOME");
494      if(!p) p = "/tmp";
495      char *path = g_strdup_printf("%s/.osm-gps-map", p);
496  #else  #else
497    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);  #if MAEMO_VERSION_MAJOR == 5
498      char *path = g_strdup("/home/user/.osm-gps-map");
499    #else
500      char *path = g_strdup("/media/mmc2/osm-gps-map");
501    #endif
502  #endif  #endif
503    
504    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    const char *proxy = get_proxy_uri(appdata);
   
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
505    
506    context.widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
507                  "repo-uri", MAP_SOURCE_OPENSTREETMAP,                   "map-source",               MAP_SOURCE,
508                  "proxy-uri", get_proxy_uri(),                   "tile-cache",               path,
509                  "tile-cache", path,                   "auto-center",              FALSE,
510                     "record-trip-history",      FALSE,
511                     "show-trip-history",        FALSE,
512                     proxy?"proxy-uri":NULL,     proxy,
513                   NULL);                   NULL);
514    
515    g_free(path);    g_free(path);
516    
517  #if 0    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
518    g_signal_connect(G_OBJECT(context.widget), "button-release-event",  
519                     G_CALLBACK(on_map_button_release_event), &context);    char *name = NULL;
520    #ifdef USE_MAEMO
521      if(!appdata->cur_gpx) {
522    #endif
523        /* draw all geocaches */
524        gpx_t *gpx = appdata->gpx;
525        while(gpx) {
526          map_draw_cachelist(context->widget, gpx->cache);
527          gpx = gpx->next;
528        }
529        name = g_strdup(_("all geocaches"));
530    #ifdef USE_MAEMO
531      } else {
532        map_draw_cachelist(context->widget, appdata->cur_gpx->cache);
533        name = g_strdup(appdata->cur_gpx->name);
534      }
535  #endif  #endif
536    
537    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.widget);    char *title = g_strdup_printf(_("Map - %s"), name);
538    /* zoom button box */    g_free(name);
539    GtkWidget *vbox = gtk_vbox_new(FALSE,0);  
540    #ifdef USE_MAEMO
541    context.zoomin =  #ifdef USE_STACKABLE_WINDOW
542      map_add_button(GTK_STOCK_ZOOM_IN, G_CALLBACK(cb_map_zoomin),    context->window = hildon_stackable_window_new();
543                     &context, _("Zoom in"));    /* try to enable the zoom buttons. don't do this on x86 as it breaks */
544    gtk_box_pack_start(GTK_BOX(vbox), context.zoomin, FALSE, FALSE, 0);    /* at runtime with cygwin x */
545    #ifndef __i386__
546    context.zoomout =    g_signal_connect(G_OBJECT(context->window), "realize",
547      map_add_button(GTK_STOCK_ZOOM_OUT, G_CALLBACK(cb_map_zoomout),                     G_CALLBACK(on_window_realize), NULL);
548                     &context, _("Zoom out"));  #endif // MAEMO_VERSION
549    gtk_box_pack_start(GTK_BOX(vbox), context.zoomout, FALSE, FALSE, 0);  #else
550      context->window = hildon_window_new();
551    context.gps =  #endif
552      map_add_button(GTK_STOCK_HOME, G_CALLBACK(cb_map_gps),  #else
553                     &context, _("Jump to GPS position"));    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
554    gtk_widget_set_sensitive(context.gps, FALSE);  #endif
   /* install handler for timed updates of the gps button */  
   context.handler_id = gtk_timeout_add(1000, map_gps_update, &context);  
   gtk_box_pack_start(GTK_BOX(vbox), context.gps, FALSE, FALSE, 0);  
555    
556    gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);    gtk_window_set_title(GTK_WINDOW(context->window), title);
557    
558    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);  #ifndef USE_MAEMO
559      gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
560    #endif
561    
562    gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);    g_free(title);
563    
564    gtk_widget_show_all(dialog);    g_signal_connect(G_OBJECT(context->widget), "configure-event",
565                       G_CALLBACK(on_map_configure), context);
566    
567    gtk_dialog_run(GTK_DIALOG(dialog));    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
568                       G_CALLBACK(on_map_button_press_event), context);
569    gtk_widget_destroy(dialog);  
570      g_signal_connect(G_OBJECT(context->widget), "button-release-event",
571                       G_CALLBACK(on_map_button_release_event), context);
572    
573      /* install handler for timed updates of the gps button */
574      context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
575    
576    #if MAEMO_VERSION_MAJOR == 5
577      /* prevent some of the main screen things */
578      context->old_view = appdata->cur_view;
579      appdata->cur_view = NULL;
580    #endif
581    
582      g_signal_connect(G_OBJECT(context->window), "destroy",
583                       G_CALLBACK(on_window_destroy), context);
584    
585      gtk_container_add(GTK_CONTAINER(context->window), context->widget);
586      gtk_widget_show_all(GTK_WIDGET(context->window));
587  }  }
Legend:
Removed from v.33  
changed lines
  Added in v.77