Diff of /trunk/src/main.c

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

revision 226 by harbaum, Wed Dec 2 20:05:52 2009 UTC revision 294 by harbaum, Wed Aug 18 18:24:19 2010 UTC
# Line 31  Line 31 
31  #include "custom_rating_renderer.h"  #include "custom_rating_renderer.h"
32  #include "custom_type_renderer.h"  #include "custom_type_renderer.h"
33    
34    #ifdef ESPEAK
35    #include <espeak/speak_lib.h>
36    #endif
37    
38  #ifdef USE_MAEMO  #ifdef USE_MAEMO
39  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
40  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
41  #include <hildon/hildon-note.h>  #include <hildon/hildon-note.h>
42  #include <hildon/hildon-entry.h>  #include <hildon/hildon-entry.h>
 #include <hildon/hildon-check-button.h>  
43  #endif  #endif
44  #endif  #endif
45    
# Line 120  void errorf(const char *fmt, ...) { Line 123  void errorf(const char *fmt, ...) {
123    free(buf);    free(buf);
124  }  }
125    
126    /* ------------ app specific gps helper functions, not part -------------- */
127    /* ---------------------  of the generic gps.[ch] ------------------------ */
128    
129    void gps_change_state(appdata_t *appdata) {
130      gps_enable(appdata->gps_state, appdata->use_gps);
131    }
132    
133    pos_t *gps_get_pos(appdata_t *appdata) {
134      static pos_t pos;
135    
136      if(appdata->gps.set & FIX_LATLON_SET) {
137        pos.lat = appdata->gps.fix.latitude;
138        pos.lon = appdata->gps.fix.longitude;
139        return &pos;
140      }
141    
142      return NULL;
143    }
144    
145    float gps_get_heading(appdata_t *appdata) {
146      if(appdata->gps.set & FIX_TRACK_SET)
147        return appdata->gps.fix.track;
148    
149      return NAN;
150    }
151    
152    gint gps_get_satnum(appdata_t *appdata) {
153      printf("set = %x/%x (snum = %d)\n",
154             appdata->gps.set, FIX_SATELLITE_SET,
155             appdata->gps.fix.sat_num);
156    
157      if(appdata->gps.set & FIX_SATELLITE_SET)
158        return appdata->gps.fix.sat_num;
159    
160      return 0;
161    }
162    
163    gps_sat_t *gps_get_sats(appdata_t *appdata) {
164      if(appdata->gps.set & FIX_SATELLITE_SET)
165        return appdata->gps.fix.sat_data;
166    
167      return NULL;
168    }
169    
170    float gps_get_eph(appdata_t *appdata) {
171      if(appdata->gps.set & FIX_HERR_SET)
172        return appdata->gps.fix.eph;
173    
174      return NAN;
175    }
176    
177    static void
178    main_gps_cb(gps_mask_t set, struct gps_t *fix, void *data) {
179      appdata_t *appdata = (appdata_t*)data;
180    
181      appdata->gps.set = set;
182      memcpy(&appdata->gps.fix, fix, sizeof(struct gps_t));
183    }
184    
185  gpx_t *choose_file(appdata_t *appdata, gboolean whole_dir) {  gpx_t *choose_file(appdata_t *appdata, gboolean whole_dir) {
186    GtkWidget *dialog;    GtkWidget *dialog;
187    gpx_t *gpx = NULL;    gpx_t *gpx = NULL;
# Line 257  typedef struct { Line 319  typedef struct {
319    appdata_t *appdata;    appdata_t *appdata;
320    GtkTreePath *path;    GtkTreePath *path;
321    gboolean done;    gboolean done;
322  } cachelist_expose_t;  } cachelist_context_t;
323    
324  static gboolean cachelist_expose(GtkWidget *widget, GdkEventExpose *event,  static gboolean cachelist_expose(GtkWidget *widget, GdkEventExpose *event,
325                                   gpointer user_data) {                                   gpointer user_data) {
326    cachelist_expose_t *ce = (cachelist_expose_t*)user_data;    cachelist_context_t *ce = (cachelist_context_t*)user_data;
327    
328    if(event->type == GDK_EXPOSE) {    if(event->type == GDK_EXPOSE) {
329      if(ce->path && !ce->done) {      if(ce->path && !ce->done) {
# Line 276  static gboolean cachelist_expose(GtkWidg Line 338  static gboolean cachelist_expose(GtkWidg
338  }  }
339    
340  static void cachelist_destroy(GtkWidget *widget, gpointer user_data) {  static void cachelist_destroy(GtkWidget *widget, gpointer user_data) {
   cachelist_expose_t *ce = (cachelist_expose_t*)user_data;  
341    
342    printf("cachelist timer removed\n");    guint handler_id =
343    g_assert(ce->appdata->cachelist_handler_id);      (guint)g_object_get_data(G_OBJECT(user_data), "handler_id");
344    gtk_timeout_remove(ce->appdata->cachelist_handler_id);  
345    ce->appdata->cachelist_handler_id = 0;    if(handler_id) {
346        gtk_timeout_remove(handler_id);
347        g_object_set_data(G_OBJECT(user_data), "handler_id", NULL);
348    
349        printf("cachelist timer removed\n");
350      }
351    
352      gpointer *ce =
353        g_object_get_data(G_OBJECT(user_data), "ce");
354      g_assert(ce);
355    
356    free(user_data);    free(ce);
357  }  }
358    
359  #define CACHELIST_UPDATE_TIMEOUT (30000)  #define CACHELIST_UPDATE_TIMEOUT (30000)
# Line 292  static GtkWidget *cachelist_create(appda Line 362  static GtkWidget *cachelist_create(appda
362                                     cache_t *sel_cache);                                     cache_t *sel_cache);
363    
364  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
365      printf("redrawing cachelist\n");
366    
367    if(!appdata->cur_view) {    if(!appdata->cur_view) {
368      printf("cachelist redraw: no active view\n");      printf("cachelist redraw: no active view\n");
369      return;      return;
# Line 307  void cachelist_redraw(appdata_t *appdata Line 379  void cachelist_redraw(appdata_t *appdata
379    }    }
380    
381    if(redraw) {    if(redraw) {
     GtkWidget *container = appdata->vbox;  
   
382  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
383      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
384      container = hildon_window_stack_peek(stack);      GtkWidget *container = hildon_window_stack_peek(stack);
385    #else
386        GtkWidget *container = appdata->vbox;
387  #endif  #endif
388    
389      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
# Line 327  void cachelist_redraw(appdata_t *appdata Line 399  void cachelist_redraw(appdata_t *appdata
399      }      }
400    
401  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
402      if(container != appdata->vbox)      gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
403        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);  #else
404      else      gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
405  #endif  #endif
       gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);  
406    
407      gtk_widget_show_all(container);      gtk_widget_show_all(container);
408    }    }
# Line 339  void cachelist_redraw(appdata_t *appdata Line 410  void cachelist_redraw(appdata_t *appdata
410    
411    
412  static gboolean cachelist_update(gpointer data) {  static gboolean cachelist_update(gpointer data) {
413      appdata_t *appdata =
414        (appdata_t*)g_object_get_data(G_OBJECT(data), "appdata");
415      g_assert(appdata);
416    
417    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
418    
419    appdata_t *appdata = (appdata_t*)data;    /* check if the widget the timer fired for is the currently */
420      /* visible one (if a search result is being shown, a cachlist */
421      /* may also be present below it) */
422      if(appdata->cur_view != data) {
423        printf("-> widget is not the one currently on top, don't redraw\n");
424        return TRUE;
425      }
426    
427    if(appdata->cur_cache)    if(appdata->cur_cache)
428      return TRUE;      return TRUE;
# Line 355  static gboolean cachelist_update(gpointe Line 435  static gboolean cachelist_update(gpointe
435    
436    if(appdata->cachelist_update)    if(appdata->cachelist_update)
437      cachelist_redraw(appdata);      cachelist_redraw(appdata);
438      else
439        printf("update disabled\n");
440    
441    return TRUE;    return TRUE;
442  }  }
443    
444  static void cachelist_timer_reset(appdata_t *appdata) {  static void cachelist_timer_reset(GtkWidget *widget) {
445      guint handler_id =
446        (guint)g_object_get_data(G_OBJECT(widget), "handler_id");
447      g_assert(handler_id);
448    
449      appdata_t *appdata =
450        (appdata_t*)g_object_get_data(G_OBJECT(widget), "appdata");
451      g_assert(appdata);
452    
453    printf("cachelist timer reset\n");    printf("cachelist timer reset\n");
454    g_assert(appdata->cachelist_handler_id);    gtk_timeout_remove(handler_id);
455    gtk_timeout_remove(appdata->cachelist_handler_id);    g_object_set_data(G_OBJECT(widget), "handler_id", (gpointer)
456    appdata->cachelist_handler_id =      gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, widget));
     gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, appdata);  
457  }  }
458    
459  static gboolean cachelist_update_reset0(GtkWidget *widget,  static gboolean cachelist_update_reset0(GtkWidget *widget,
460                                          GdkEventButton *event,                                          GdkEventButton *event,
461                                          gpointer user_data) {                                          gpointer user_data) {
462    cachelist_timer_reset((appdata_t*)user_data);    cachelist_timer_reset(GTK_WIDGET(user_data));
463    return FALSE;    return FALSE;
464  }  }
465    
466  static void cachelist_update_reset1(GtkAdjustment *adj,  static void cachelist_update_reset1(GtkAdjustment *adj,
467                                      gpointer user_data) {                                      gpointer user_data) {
468    cachelist_timer_reset((appdata_t*)user_data);    cachelist_timer_reset(GTK_WIDGET(user_data));
469    }
470    
471    static gboolean on_cachelist_focus_in(GtkWidget *widget, GdkEventFocus *event,
472                                          gpointer data) {
473    
474      /* we don't want a runnign timer yet */
475      if(!g_object_get_data(G_OBJECT(data), "handler_id")) {
476        printf("focus received: restarting cachelist timer\n");
477    
478        appdata_t *appdata =
479          (appdata_t*)g_object_get_data(G_OBJECT(data), "appdata");
480        g_assert(appdata);
481    
482        g_object_set_data(G_OBJECT(data), "handler_id", (gpointer)
483          gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, data));
484    
485        /* and redo list immediately */
486        cachelist_redraw(appdata);
487      }
488    
489      return FALSE;
490    }
491    
492    static gboolean on_cachelist_focus_out(GtkWidget *widget, GdkEventFocus *event,
493                                           gpointer data) {
494    
495      guint handler_id =
496        (guint)g_object_get_data(G_OBJECT(data), "handler_id");
497      g_assert(handler_id);
498    
499      gtk_timeout_remove(handler_id);
500      g_object_set_data(G_OBJECT(data), "handler_id", NULL);
501    
502      printf("focus lost: cachelist timer removed\n");
503    
504      return FALSE;
505    }
506    
507    gboolean on_main_focus_change(GtkWidget *widget, GdkEventFocus *event,
508                                    gpointer user_data) {
509      appdata_t *appdata = (appdata_t*)user_data;
510      g_assert(appdata->gps_state);
511    
512      printf("main/cachelist focus-%s event\n", event->in?"in":"out");
513    
514      /* disconnect from gps if map looses focus */
515      /* this is to save energy if maep runs in background */
516    
517      if(event->in) {
518        /* request all GPS information required for map display */
519        gps_register_callback(appdata->gps_state,
520              LATLON_CHANGED | TRACK_CHANGED | HERR_CHANGED | SATELLITE_CHANGED,
521              main_gps_cb, appdata);
522      } else
523        gps_unregister_callback(appdata->gps_state, main_gps_cb);
524    
525      return FALSE;
526  }  }
527    
528  static GtkWidget *cachelist_create(appdata_t *appdata, gpx_t *gpx,  static GtkWidget *cachelist_create(appdata_t *appdata, gpx_t *gpx,
# Line 524  static GtkWidget *cachelist_create(appda Line 670  static GtkWidget *cachelist_create(appda
670    g_signal_connect(view, "row-activated",    g_signal_connect(view, "row-activated",
671                     (GCallback)cachelist_view_onRowActivated, appdata);                     (GCallback)cachelist_view_onRowActivated, appdata);
672    
673    cachelist_expose_t *ce = malloc(sizeof(cachelist_expose_t));    cachelist_context_t *ce = g_new0(cachelist_context_t, 1);
674    ce->appdata = appdata;    ce->appdata = appdata;
675    ce->path = path;    ce->path = path;
676    ce->done = FALSE;    ce->done = FALSE;
677    
678    g_signal_connect(view, "expose-event",    g_signal_connect(view, "expose-event",
679                     (GCallback)cachelist_expose, ce);                     (GCallback)cachelist_expose, ce);
   g_signal_connect(view, "destroy",  
                    (GCallback)cachelist_destroy, ce);  
680    
681    /* put this inside a scrolled view */    /* put this inside a scrolled view */
682  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
683    GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);    GtkWidget *container = gtk_scrolled_window_new (NULL, NULL);
684    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(container),
685                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
686    gtk_container_add(GTK_CONTAINER(scrolled_window), view);    gtk_container_add(GTK_CONTAINER(container), view);
687  #else  #else
688    GtkWidget *pannable_area = hildon_pannable_area_new();    GtkWidget *container = hildon_pannable_area_new();
689      gtk_container_add(GTK_CONTAINER(container), view);
   gtk_container_add(GTK_CONTAINER(pannable_area), view);  
690  #endif  #endif
691    
692    /* add a timer for automatic update */    g_signal_connect(view, "destroy",
693    g_assert(!appdata->cachelist_handler_id);                     (GCallback)cachelist_destroy, container);
   appdata->cachelist_handler_id =  
     gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, appdata);  
694    
695    /* update timer is being reset if the user scrolls or selects */    /* update timer is being reset if the user scrolls or selects */
696    g_signal_connect(view, "button-press-event",    g_signal_connect(view, "button-press-event",
697                     (GCallback)cachelist_update_reset0, appdata);                     (GCallback)cachelist_update_reset0, container);
698    
699      /* add a timer for automatic update */
700      g_object_set_data(G_OBJECT(container), "handler_id", (gpointer)
701        gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, container));
702    
703      printf("cachelist timer created\n");
704    
705      g_object_set_data(G_OBJECT(container), "appdata", (gpointer)appdata);
706    
707      g_object_set_data(G_OBJECT(container), "ce", (gpointer)ce);
708    
709      /* the timer is removed and re-enabled on every focus change event */
710      /* for the main top window */
711      //  GtkWidget *root = gtk_widget_get_toplevel(GTK_WIDGET(button)))
712    
713      g_signal_connect(G_OBJECT(view), "focus-in-event",
714                       G_CALLBACK(on_cachelist_focus_in), container);
715    
716      g_signal_connect(G_OBJECT(view), "focus-out-event",
717                       G_CALLBACK(on_cachelist_focus_out), container);
718    
719  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
720    g_signal_connect(gtk_scrolled_window_get_vadjustment(    g_signal_connect(gtk_scrolled_window_get_vadjustment(
721                         GTK_SCROLLED_WINDOW(scrolled_window)),                 GTK_SCROLLED_WINDOW(container)),
722                             "value-changed",                 "value-changed",
723                             (GCallback)cachelist_update_reset1, appdata);                 (GCallback)cachelist_update_reset1, container);
   
   return scrolled_window;  
724  #else  #else
725    g_signal_connect(hildon_pannable_area_get_vadjustment(    g_signal_connect(hildon_pannable_area_get_vadjustment(
726                         HILDON_PANNABLE_AREA(pannable_area)),                 HILDON_PANNABLE_AREA(container)),
727                             "value-changed",                 "value-changed",
728                             (GCallback)cachelist_update_reset1, appdata);                 (GCallback)cachelist_update_reset1, container);
   
729    
   return pannable_area;  
730  #endif  #endif
731      return container;
732  }  }
733    
734  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 624  void cachelist_dialog(appdata_t *appdata Line 782  void cachelist_dialog(appdata_t *appdata
782    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
783    
784    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
785    char *title = g_strdup_printf("%s - GPXView", gpx->name);    gtk_window_set_title(GTK_WINDOW(window), gpx->name);
   gtk_window_set_title(GTK_WINDOW(window), title);  
   g_free(title);  
786    
787    appdata->cur_view = cachelist_create(appdata, gpx, NULL);    appdata->cur_view = cachelist_create(appdata, gpx, NULL);
788    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
# Line 635  void cachelist_dialog(appdata_t *appdata Line 791  void cachelist_dialog(appdata_t *appdata
791    hildon_window_set_app_menu(HILDON_WINDOW(window),    hildon_window_set_app_menu(HILDON_WINDOW(window),
792                               menu_create(appdata, MENU_CACHELIST));                               menu_create(appdata, MENU_CACHELIST));
793    
794      /* make sure window can control gps */
795      g_signal_connect(G_OBJECT(window), "focus-in-event",
796                       G_CALLBACK(on_main_focus_change), appdata);
797    
798      g_signal_connect(G_OBJECT(window), "focus-out-event",
799                       G_CALLBACK(on_main_focus_change), appdata);
800    
801    g_signal_connect(G_OBJECT(window), "destroy",    g_signal_connect(G_OBJECT(window), "destroy",
802                     G_CALLBACK(on_cachelist_destroy), appdata);                     G_CALLBACK(on_cachelist_destroy), appdata);
803    
# Line 700  void gpxlist_set(GtkListStore *store, Gt Line 863  void gpxlist_set(GtkListStore *store, Gt
863                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
864                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
865  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
866                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 2),
867  #endif  #endif
868                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
869                       -1);                       -1);
# Line 824  static void gpxlist_view_onRowActivated( Line 987  static void gpxlist_view_onRowActivated(
987    
988        GtkWidget *hbox = gtk_hbox_new(FALSE, 0);        GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
989    
       gtk_box_pack_start(GTK_BOX(hbox),  
          gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,  
                                    GTK_ICON_SIZE_DIALOG),  
                          FALSE, FALSE, 0);  
   
990        GtkWidget *label = gtk_label_new(        GtkWidget *label = gtk_label_new(
991                    _("Do you want to close this entry only or do "                    _("Do you want to close this entry only or do "
992                      "you want to remove it completely from the list?"));                      "you want to remove it completely from the list?"));
# Line 978  static GtkWidget *gpxlist_create_view_an Line 1136  static GtkWidget *gpxlist_create_view_an
1136    
1137    appdata->gpxview = gtk_tree_view_new ();    appdata->gpxview = gtk_tree_view_new ();
1138    
1139      printf("building gpx list, items = %d\n", appdata->gpxlist_items);
1140    
1141    GtkTreeSelection *selection =    GtkTreeSelection *selection =
1142      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1143  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
# Line 1140  void gpxlist_add(appdata_t *appdata, gpx Line 1300  void gpxlist_add(appdata_t *appdata, gpx
1300    
1301  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1302    
 typedef struct {  
   appdata_t *appdata;  
   GtkWidget *dialog;  
 } about_context_t;  
   
 #ifdef ENABLE_BROWSER_INTERFACE  
 void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {  
   gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);  
   browser_url(context->appdata,  
               "https://www.paypal.com/cgi-bin/webscr"  
               "?cmd=_s-xclick&hosted_button_id=7400558");  
 }  
 #endif  
   
1303  static void  static void
1304  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1305    about_context_t context;    about_box((appdata_t*)data);
   
   context.appdata = (appdata_t *)data;  
   
 #ifdef ENABLE_LIBLOCATION  
   char *uses = "uses liblocation";  
 #elif defined(ENABLE_GPSBT)  
   char *uses = "uses gpsbt and gpsd";  
 #else  
   char *uses = "uses gpsd";  
 #endif  
   
   const gchar *authors[] = {  
     "Till Harbaum <till@harbaum.org>",  
     "John Stowers <john.stowers@gmail.com>",  
     "GCVote: Guido Wegener <guido.wegener@gmx.de>",  
     NULL };  
   
   context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,  
                         "name", "GPXView",  
                         "version", VERSION,  
                         "copyright", _("Copyright 2008-2009"),  
                         "authors", authors,  
                         "website", _("http://www.harbaum.org/till/maemo"),  
                         "comments", _(uses),  
                         NULL);  
   
 #ifdef ENABLE_BROWSER_INTERFACE  
   /* add a way to donate to the project */  
   GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);  
   
   GtkWidget *hbox = gtk_hbox_new(FALSE, 8);  
   gtk_box_pack_start(GTK_BOX(hbox),  
                      gtk_label_new(_("Do you like GPXView?")),  
                      FALSE, FALSE, 0);  
   
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button),  
                        icon_get_widget(ICON_MISC, 5));  
   gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(on_paypal_button_clicked), &context);  
   gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);  
   
   gtk_container_add(GTK_CONTAINER(alignment), hbox);  
   gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),  
                               alignment);  
   
   gtk_widget_show_all(alignment);  
 #endif  
   
   gtk_dialog_run(GTK_DIALOG(context.dialog));  
   gtk_widget_destroy(context.dialog);  
1306  }  }
1307    
1308  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1411  typedef struct { Line 1505  typedef struct {
1505  } search_context_t;  } search_context_t;
1506    
1507    
 static GtkWidget *check_button_new_with_label(char *label) {  
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   return gtk_check_button_new_with_label(label);  
 #else  
   GtkWidget *cbut =  
     hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);  
   gtk_button_set_label(GTK_BUTTON(cbut), label);  
   return cbut;  
 #endif  
 }  
   
 static void check_button_set_active(GtkWidget *button, gboolean active) {  
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);  
 #else  
   hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);  
 #endif  
 }  
   
 static gboolean check_button_get_active(GtkWidget *button) {  
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));  
 #else  
   return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));  
 #endif  
 }  
   
1508  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1509    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1510    
# Line 1513  cb_menu_search(GtkWidget *window, gpoint Line 1580  cb_menu_search(GtkWidget *window, gpoint
1580    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1581                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
1582    
1583  #ifndef USE_MAEMO    context.spinner = number_editor_new(appdata->search_days, 0, 99);
   GtkObject *adj = gtk_adjustment_new(appdata->search_days, 0, 99, 1, 10, 10);  
   context.spinner = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1, 0);  
 #else  
   context.spinner = hildon_number_editor_new(0, 99);  
   hildon_number_editor_set_value(HILDON_NUMBER_EDITOR(context.spinner),  
                                  appdata->search_days);  
 #endif  
1584    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.spinner);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.spinner);
1585    
1586    gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_label_new(_("days")));    gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_label_new(_("days")));
1587    
1588    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);
# Line 1540  cb_menu_search(GtkWidget *window, gpoint Line 1600  cb_menu_search(GtkWidget *window, gpoint
1600      if(strlen(p) > 0)      if(strlen(p) > 0)
1601        appdata->search_str = strdup(p);        appdata->search_str = strdup(p);
1602    
1603  #ifndef USE_MAEMO      appdata->search_days = number_editor_get_value(context.spinner);
     appdata->search_days = gtk_spin_button_get_value_as_int(  
                     GTK_SPIN_BUTTON(context.spinner));  
 #else  
     appdata->search_days = hildon_number_editor_get_value(  
                     HILDON_NUMBER_EDITOR(context.spinner));  
 #endif  
1604    
1605      if(check_button_get_active(context.in_finds))      if(check_button_get_active(context.in_finds))
1606        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
# Line 1582  cb_menu_search(GtkWidget *window, gpoint Line 1636  cb_menu_search(GtkWidget *window, gpoint
1636        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1637    
1638  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1639        gpx_t *found =  
1640          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        if(appdata->cur_gpx)
1641            appdata->search_results =
1642              search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1643          else
1644            appdata->search_results =
1645              search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1646    
1647        /* do search result dialog here ... */        /* do search result dialog here ... */
1648        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, appdata->search_results);
1649    
1650  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
1651        search_result_free(found);        search_result_free(appdata->search_results);
1652  #else        appdata->search_results = NULL;
       appdata->search_results = found;  
1653  #endif  #endif
1654  #else  #else
1655        gpx_t *found = NULL;        gpx_t *found = NULL;
# Line 1880  HildonAppMenu *menu_create(appdata_t *ap Line 1939  HildonAppMenu *menu_create(appdata_t *ap
1939      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1940                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
1941      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1942      }
1943    
1944      /* if search results exist, don't allow another search */
1945      if(!appdata->search_results &&
1946         ((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST))) {
1947      button = gtk_button_new_with_label(_("Search"));      button = gtk_button_new_with_label(_("Search"));
1948      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1949                             G_CALLBACK(cb_menu_search), appdata);                             G_CALLBACK(cb_menu_search), appdata);
# Line 2080  void menu_create(appdata_t *appdata) { Line 2143  void menu_create(appdata_t *appdata) {
2143    
2144  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2145    gconf_save_state(appdata);    gconf_save_state(appdata);
2146    
2147    gpx_free_all(appdata->gpx);    gpx_free_all(appdata->gpx);
2148    
2149    #ifdef ESPEAK
2150      espeak_Terminate();
2151    #endif
2152    
2153  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2154    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
2155    if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);    if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
# Line 2090  void cleanup(appdata_t *appdata) { Line 2157  void cleanup(appdata_t *appdata) {
2157    
2158    gnome_vfs_shutdown();    gnome_vfs_shutdown();
2159    icons_free();    icons_free();
   gps_release(appdata);  
2160    
2161  #ifdef USE_MAEMO    gps_release(appdata->gps_state);
2162      appdata->gps_state = NULL;
2163    
2164    if(appdata->search_results) {    if(appdata->search_results) {
2165      printf("freeing pending search\n");      printf("freeing pending search\n");
2166      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
2167    }    }
2168    
2169    #ifdef USE_MAEMO
2170    if(appdata->osso_context)    if(appdata->osso_context)
2171      osso_deinitialize(appdata->osso_context);      osso_deinitialize(appdata->osso_context);
2172    
# Line 2278  crumb_back(gpointer data) { Line 2347  crumb_back(gpointer data) {
2347    
2348  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
2349                        gpointer user_data) {                        gpointer user_data) {
2350    crumb_t *crumb = malloc(sizeof(crumb_t));    crumb_t *crumb = g_new0(crumb_t, 1);
2351    crumb->level = level;    crumb->level = level;
2352    crumb->appdata = appdata;    crumb->appdata = appdata;
2353    crumb->data = user_data;    crumb->data = user_data;
# Line 2358  void main_after_settings_redraw(appdata_ Line 2427  void main_after_settings_redraw(appdata_
2427    }    }
2428    
2429    if(redraw) {    if(redraw) {
     GtkWidget *container = appdata->vbox;  
2430    
2431  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2432      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
2433      container = hildon_window_stack_peek(stack);      GtkWidget *container = hildon_window_stack_peek(stack);
2434    #else
2435        GtkWidget *container = appdata->vbox;
2436  #endif  #endif
2437    
2438      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
# Line 2381  void main_after_settings_redraw(appdata_ Line 2451  void main_after_settings_redraw(appdata_
2451      }      }
2452    
2453  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
     if(container != appdata->vbox)  
2454        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2455      else  #else
 #endif  
2456        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2457    #endif
2458    
2459      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2460    }    }
2461  }  }
2462    
2463    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
2464    /* get access to zoom buttons */
2465    static void
2466    on_window_realize(GtkWidget *widget, gpointer data) {
2467      if (widget->window) {
2468        unsigned char value = 1;
2469        Atom hildon_zoom_key_atom =
2470          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
2471          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
2472        Display *dpy =
2473          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
2474        Window w = GDK_WINDOW_XID(widget->window);
2475    
2476        XChangeProperty(dpy, w, hildon_zoom_key_atom,
2477                        integer_atom, 8, PropModeReplace, &value, 1);
2478      }
2479    }
2480    #endif
2481    
2482  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
2483    appdata_t appdata;    appdata_t appdata;
2484    
# Line 2413  int main(int argc, char *argv[]) { Line 2501  int main(int argc, char *argv[]) {
2501    
2502    curl_global_init(CURL_GLOBAL_ALL);    curl_global_init(CURL_GLOBAL_ALL);
2503    
2504    #ifdef ESPEAK
2505    #if ESPEAK_API_REVISION == 1
2506      appdata.espeak.sample_rate =
2507        espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 512, NULL);
2508    #else
2509      appdata.espeak.sample_rate =
2510        espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 512, NULL, 0);
2511    #endif
2512      if(appdata.espeak.sample_rate < 0)
2513        printf("espeak: init error\n");
2514      else
2515        printf("espeak: running at %dhz\n", appdata.espeak.sample_rate);
2516    
2517      /* set language */
2518      espeak_VOICE voice_spec;
2519      voice_spec.name = NULL;
2520      voice_spec.languages = _("en");
2521      voice_spec.gender = 0;
2522      voice_spec.age = 0;
2523      voice_spec.variant = 0;
2524      if(EE_OK != espeak_SetVoiceByProperties(&voice_spec)) {
2525        printf("failed to set voice spec for %s\n", voice_spec.languages);
2526        appdata.espeak.sample_rate = -1;
2527      }
2528    #endif
2529    
2530  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2531    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2532    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2453  int main(int argc, char *argv[]) { Line 2567  int main(int argc, char *argv[]) {
2567    
2568  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
2569    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2570    #if !defined(__i386__)
2571      g_signal_connect(G_OBJECT(appdata.window), "realize",
2572                       G_CALLBACK(on_window_realize), NULL);
2573    #endif
2574  #endif  #endif
2575    
2576    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
# Line 2465  int main(int argc, char *argv[]) { Line 2583  int main(int argc, char *argv[]) {
2583    appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);    appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2584    gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);    gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2585    
2586    #ifndef USE_STACKABLE_WINDOW
2587    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2588    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
 #ifndef USE_STACKABLE_WINDOW  
2589    menu_create(&appdata);    menu_create(&appdata);
2590  #else  #else
2591    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),
# Line 2500  int main(int argc, char *argv[]) { Line 2618  int main(int argc, char *argv[]) {
2618    
2619    appdata.gconf_client = gconf_client_get_default();    appdata.gconf_client = gconf_client_get_default();
2620    gconf_load_state(&appdata);    gconf_load_state(&appdata);
2621    gps_init(&appdata);  
2622      appdata.gps_state = gps_init();
2623      gps_change_state(&appdata);
2624    
2625      gps_register_callback(appdata.gps_state,
2626              LATLON_CHANGED | TRACK_CHANGED | HERR_CHANGED | SATELLITE_CHANGED,
2627              main_gps_cb, &appdata);
2628    
2629      /* make sure window can control gps */
2630      g_signal_connect(G_OBJECT(appdata.window), "focus-in-event",
2631                       G_CALLBACK(on_main_focus_change), &appdata);
2632    
2633      g_signal_connect(G_OBJECT(appdata.window), "focus-out-event",
2634                       G_CALLBACK(on_main_focus_change), &appdata);
2635    
2636    
2637    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);
2638    #ifndef USE_STACKABLE_WINDOW
2639    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);
2640    #else
2641      gtk_container_add(GTK_CONTAINER(appdata.window), appdata.cur_view);
2642    #endif
2643    
2644    gtk_widget_show_all(GTK_WIDGET(appdata.window));    gtk_widget_show_all(GTK_WIDGET(appdata.window));
2645    gtk_main();    gtk_main();
Legend:
Removed from v.226  
changed lines
  Added in v.294