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

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

revision 61 by harbaum, Tue Aug 18 14:32:45 2009 UTC revision 65 by harbaum, Wed Aug 19 14:21:14 2009 UTC
# Line 66  static const char *get_proxy_uri(appdata Line 66  static const char *get_proxy_uri(appdata
66    return NULL;    return NULL;
67  }  }
68    
69  static void map_zoom(map_context_t *context, int step) {  /* TODO: This needs to be wired to the GPS button in osm_gps_map */
70    gint zoom;  #if 0
   OsmGpsMap *map = OSM_GPS_MAP(context->widget);  
   g_object_get(map, "zoom", &zoom, NULL);  
   zoom = osm_gps_map_set_zoom(map, zoom+step);  
   
   /* enable/disable zoom buttons as required */  
   gtk_widget_set_sensitive(context->zoomin,  
            zoom < osm_gps_map_source_get_max_zoom(MAP_SOURCE));  
   gtk_widget_set_sensitive(context->zoomout,  
            zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));  
   
   /* save new zoom */  
   context->appdata->map.zoom = zoom;  
 }  
   
 static gboolean  
 cb_map_zoomin(GtkButton *button, map_context_t *context) {  
   map_zoom(context, +1);  
   return FALSE;  
 }  
   
 static gboolean  
 cb_map_zoomout(GtkButton *button, map_context_t *context) {  
   map_zoom(context, -1);  
   return FALSE;  
 }  
   
71  static gboolean  static gboolean
72  cb_map_gps(GtkButton *button, map_context_t *context) {  cb_map_gps(GtkButton *button, map_context_t *context) {
73    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
# Line 108  cb_map_gps(GtkButton *button, map_contex Line 82  cb_map_gps(GtkButton *button, map_contex
82    
83    return FALSE;    return FALSE;
84  }  }
   
 static GtkWidget  
 *map_add_button(int icon, GCallback cb, gpointer data,  
                 char *tooltip) {  
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button), icon_get_widget(ICON_MISC, icon));  
   g_signal_connect(button, "clicked", cb, data);  
 #ifndef USE_MAEMO  
   gtk_widget_set_tooltip_text(button, tooltip);  
85  #endif  #endif
   return button;  
 }  
86    
87  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
88    return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));    return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));
# Line 133  static gboolean map_gps_update(gpointer Line 96  static gboolean map_gps_update(gpointer
96    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
97    
98    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
99    gtk_widget_set_sensitive(context->gps, ok);    /* TODO: gtk_widget_set_sensitive(context->gps, ok); */
100    
101    if(ok) {    if(ok) {
102      float heading = NAN;      float heading = NAN;
# Line 297  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 260  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
260    cairo_paint(cr);    cairo_paint(cr);
261  }  }
262    
263    #ifndef BIG_BALLOONS
264  #define LINE_SKIP  7  #define LINE_SKIP  7
265    #else
266    #define LINE_SKIP  12
267    #endif
268    
269  static void  static void
270  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
# Line 329  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe Line 296  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
296                              CAIRO_FONT_SLANT_NORMAL,                              CAIRO_FONT_SLANT_NORMAL,
297                              CAIRO_FONT_WEIGHT_BOLD);                              CAIRO_FONT_WEIGHT_BOLD);
298    
299    #ifndef BIG_BALLOONS
300      cairo_set_font_size (cr, 20.0);      cairo_set_font_size (cr, 20.0);
301    #else
302        cairo_set_font_size (cr, 36.0);
303    #endif
304    
305      cairo_text_extents (cr, cache->id, &extents);      cairo_text_extents (cr, cache->id, &extents);
306    
307      /* display id right of icon vertically centered */      /* display id right of icon vertically centered */
# Line 350  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe Line 322  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
322    /* everything from here uses the same font */    /* everything from here uses the same font */
323    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
324                            CAIRO_FONT_WEIGHT_NORMAL);                            CAIRO_FONT_WEIGHT_NORMAL);
325    #ifndef BIG_BALLOONS
326    cairo_set_font_size (cr, 14.0);    cairo_set_font_size (cr, 14.0);
327    #else
328      cairo_set_font_size (cr, 24.0);
329    #endif
330    
331    if(cache->name) {    if(cache->name) {
332      /* draw cache name */      /* draw cache name */
# Line 478  void map(appdata_t *appdata) { Line 454  void map(appdata_t *appdata) {
454    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
455    context->appdata = appdata;    context->appdata = appdata;
456    
   GtkWidget *hbox = gtk_hbox_new(FALSE, 0);  
   
457    char *path = g_strdup_printf("%s/map/", appdata->image_path);    char *path = g_strdup_printf("%s/map/", appdata->image_path);
458    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
459    
# Line 542  void map(appdata_t *appdata) { Line 516  void map(appdata_t *appdata) {
516    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
517                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
518    
519    gtk_box_pack_start_defaults(GTK_BOX(hbox), context->widget);    /* TODO: gtk_widget_set_sensitive(context->gps, FALSE); */
   /* zoom button box */  
   GtkWidget *vbox = gtk_vbox_new(FALSE,0);  
   
   context->zoomin =  
     map_add_button(10, G_CALLBACK(cb_map_zoomin),  
                    context, _("Zoom in"));  
   gtk_box_pack_start(GTK_BOX(vbox), context->zoomin, FALSE, FALSE, 0);  
   
   context->zoomout =  
     map_add_button(11, G_CALLBACK(cb_map_zoomout),  
                    context, _("Zoom out"));  
   gtk_box_pack_start(GTK_BOX(vbox), context->zoomout, FALSE, FALSE, 0);  
   
   context->gps =  
     map_add_button(9, G_CALLBACK(cb_map_gps),  
                    context, _("Jump to GPS position"));  
   gtk_widget_set_sensitive(context->gps, FALSE);  
520    
521    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
522    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
   gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0);  
   
   gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);  
523    
524  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
525    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 576  void map(appdata_t *appdata) { Line 530  void map(appdata_t *appdata) {
530    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
531                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
532    
533    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
534    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
535  }  }
Legend:
Removed from v.61  
changed lines
  Added in v.65