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

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

revision 55 by harbaum, Thu Aug 13 12:01:52 2009 UTC revision 56 by harbaum, Fri Aug 14 12:19:45 2009 UTC
# Line 33  Line 33 
33  #define RAD2DEG(a)  (((a)*180.0)/M_PI)  #define RAD2DEG(a)  (((a)*180.0)/M_PI)
34  #define DEG2RAD(a)  (((a)*M_PI)/180.0)  #define DEG2RAD(a)  (((a)*M_PI)/180.0)
35    
 typedef struct {  
   appdata_t *appdata;  
   GtkWidget *widget;  
   GtkWidget *zoomin, *zoomout, *gps;  
   gint handler_id;  
   cache_t *press_on;  
 #if MAEMO_VERSION_MAJOR == 5  
   GtkWidget *old_view;  
 #endif  
 } map_context_t;  
   
36  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
37    
38  static const char *get_proxy_uri(appdata_t *appdata) {  static const char *get_proxy_uri(appdata_t *appdata) {
# Line 94  static void map_zoom(map_context_t *cont Line 83  static void map_zoom(map_context_t *cont
83    gtk_widget_set_sensitive(context->zoomout,    gtk_widget_set_sensitive(context->zoomout,
84             zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));             zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));
85    
86      /* hmm ... this doesn't really work */
87      osm_gps_map_osd_speed(map, zoom);
88    
89    /* save new zoom */    /* save new zoom */
90    context->appdata->map.zoom = zoom;    context->appdata->map.zoom = zoom;
91  }  }
# Line 478  void cache_popup(map_context_t *mcontext Line 470  void cache_popup(map_context_t *mcontext
470      gtk_box_pack_start_defaults(GTK_BOX(hbox),      gtk_box_pack_start_defaults(GTK_BOX(hbox),
471                                  gtk_label_big_left_new(cache->id));                                  gtk_label_big_left_new(cache->id));
472    
473    #if 0
474    GtkWidget *button = gtk_button_new();    GtkWidget *button = gtk_button_new();
475    gtk_button_set_image(GTK_BUTTON(button), icon_get_widget(ICON_MISC, 12));    gtk_button_set_image(GTK_BUTTON(button), icon_get_widget(ICON_MISC, 12));
476    g_signal_connect(button, "clicked",    g_signal_connect(button, "clicked",
477                     G_CALLBACK(on_cache_button_clicked), &pcontext);                     G_CALLBACK(on_cache_button_clicked), &pcontext);
478    gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
479    #endif
480    
481    gtk_box_pack_start_defaults(GTK_BOX(vbox), hbox);    gtk_box_pack_start_defaults(GTK_BOX(vbox), hbox);
482    
# Line 640  on_map_button_release_event(GtkWidget *w Line 634  on_map_button_release_event(GtkWidget *w
634    return FALSE;    return FALSE;
635  }  }
636    
637  static void save_map_state(map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
638      appdata_t *appdata = context->appdata;
639    
640      printf("destroy map window\n");
641    
642    /* save map parameters */    /* save map parameters */
643    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
644    gint zoom;    gint zoom;
# Line 651  static void save_map_state(map_context_t Line 649  static void save_map_state(map_context_t
649    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
650    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
651    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
 }  
652    
653  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
 static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  
   printf("destroy map view\n");  
   
   save_map_state(context);  
   
654    /* restore cur_view */    /* restore cur_view */
655    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
656    #endif
657    
658    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
659    
660    g_free(context);    g_free(context);
661      appdata->map.context = NULL;
662  }  }
 #endif  
663    
664  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
665    map_context_t *context = g_new0(map_context_t, 1);    map_context_t *context = NULL;
666    
667      /* if the map window already exists, just raise it */
668      if(appdata->map.context) {
669        gtk_window_present(GTK_WINDOW(appdata->map.context->window));
670        return;
671      }
672    
673      context = appdata->map.context = g_new0(map_context_t, 1);
674    context->appdata = appdata;    context->appdata = appdata;
675    
676    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
# Line 708  void map(appdata_t *appdata) { Line 710  void map(appdata_t *appdata) {
710    char *title = g_strdup_printf(_("Map - %s"), name);    char *title = g_strdup_printf(_("Map - %s"), name);
711    g_free(name);    g_free(name);
712    
713  #if MAEMO_VERSION_MAJOR == 5  #ifdef USE_MAEMO
714    GtkWidget *window = hildon_stackable_window_new();  #ifdef USE_STACKABLE_WINDOW
715    gtk_window_set_title(GTK_WINDOW(window), title);    context->window = hildon_stackable_window_new();
716  #else  #else
717    GtkWidget *dialog = gtk_dialog_new_with_buttons(title,    context->window = hildon_window_new();
718                            GTK_WINDOW(appdata->window),  #endif
                           GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,  
                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,  
                           NULL);  
   
 #ifndef USE_MAEMO  
   gtk_window_set_default_size(GTK_WINDOW(dialog), 640, 480);  
719  #else  #else
720    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
721  #endif  #endif
722    
723      gtk_window_set_title(GTK_WINDOW(context->window), title);
724    
725    #ifndef USE_MAEMO
726      gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
727  #endif  #endif
728    
729    g_free(title);    g_free(title);
# Line 754  void map(appdata_t *appdata) { Line 755  void map(appdata_t *appdata) {
755      map_add_button(9, G_CALLBACK(cb_map_gps),      map_add_button(9, G_CALLBACK(cb_map_gps),
756                     context, _("Jump to GPS position"));                     context, _("Jump to GPS position"));
757    gtk_widget_set_sensitive(context->gps, FALSE);    gtk_widget_set_sensitive(context->gps, FALSE);
758    
759    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
760    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
761    gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0);
# Line 764  void map(appdata_t *appdata) { Line 766  void map(appdata_t *appdata) {
766    /* prevent some of the main screen things */    /* prevent some of the main screen things */
767    context->old_view = appdata->cur_view;    context->old_view = appdata->cur_view;
768    appdata->cur_view = NULL;    appdata->cur_view = NULL;
769    #endif
770    
771    g_signal_connect(G_OBJECT(window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
772                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
773    
774    gtk_container_add(GTK_CONTAINER(window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), hbox);
775    gtk_widget_show_all(GTK_WIDGET(window));    gtk_widget_show_all(GTK_WIDGET(context->window));
   
 #else  
   gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);  
   gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);  
   gtk_widget_show_all(dialog);  
   gtk_dialog_run(GTK_DIALOG(dialog));  
   save_map_state(context);  
   gtk_timeout_remove(context->handler_id);  
   gtk_widget_destroy(dialog);  
   g_free(context);  
 #endif  
776  }  }
Legend:
Removed from v.55  
changed lines
  Added in v.56