Diff of /trunk/src/main.c

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

revision 223 by harbaum, Tue Dec 1 20:03:51 2009 UTC revision 249 by harbaum, Thu Jan 21 21:18:33 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 257  typedef struct { Line 260  typedef struct {
260    appdata_t *appdata;    appdata_t *appdata;
261    GtkTreePath *path;    GtkTreePath *path;
262    gboolean done;    gboolean done;
263  } cachelist_expose_t;  } cachelist_context_t;
264    
265  static gboolean cachelist_expose(GtkWidget *widget, GdkEventExpose *event,  static gboolean cachelist_expose(GtkWidget *widget, GdkEventExpose *event,
266                                   gpointer user_data) {                                   gpointer user_data) {
267    cachelist_expose_t *ce = (cachelist_expose_t*)user_data;    cachelist_context_t *ce = (cachelist_context_t*)user_data;
268    
269    if(event->type == GDK_EXPOSE) {    if(event->type == GDK_EXPOSE) {
270      if(ce->path && !ce->done) {      if(ce->path && !ce->done) {
# Line 276  static gboolean cachelist_expose(GtkWidg Line 279  static gboolean cachelist_expose(GtkWidg
279  }  }
280    
281  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;  
282    
283    printf("cachelist timer removed\n");    guint handler_id =
284    g_assert(ce->appdata->cachelist_handler_id);      (guint)g_object_get_data(G_OBJECT(user_data), "handler_id");
285    gtk_timeout_remove(ce->appdata->cachelist_handler_id);  
286    ce->appdata->cachelist_handler_id = 0;    if(handler_id) {
287        gtk_timeout_remove(handler_id);
288        g_object_set_data(G_OBJECT(user_data), "handler_id", NULL);
289    
290        printf("cachelist timer removed\n");
291      }
292    
293      gpointer *ce =
294        g_object_get_data(G_OBJECT(user_data), "ce");
295      g_assert(ce);
296    
297    free(user_data);    free(ce);
298  }  }
299    
300  #define CACHELIST_UPDATE_TIMEOUT (30000)  #define CACHELIST_UPDATE_TIMEOUT (30000)
# Line 292  static GtkWidget *cachelist_create(appda Line 303  static GtkWidget *cachelist_create(appda
303                                     cache_t *sel_cache);                                     cache_t *sel_cache);
304    
305  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
306      printf("redrawing cachelist\n");
307    
308    if(!appdata->cur_view) {    if(!appdata->cur_view) {
309      printf("cachelist redraw: no active view\n");      printf("cachelist redraw: no active view\n");
310      return;      return;
# Line 307  void cachelist_redraw(appdata_t *appdata Line 320  void cachelist_redraw(appdata_t *appdata
320    }    }
321    
322    if(redraw) {    if(redraw) {
     GtkWidget *container = appdata->vbox;  
   
323  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
324      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
325      container = hildon_window_stack_peek(stack);      GtkWidget *container = hildon_window_stack_peek(stack);
326    #else
327        GtkWidget *container = appdata->vbox;
328  #endif  #endif
329    
330      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 340  void cachelist_redraw(appdata_t *appdata
340      }      }
341    
342  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
343      if(container != appdata->vbox)      gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
344        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);  #else
345      else      gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
346  #endif  #endif
       gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);  
347    
348      gtk_widget_show_all(container);      gtk_widget_show_all(container);
349    }    }
# Line 339  void cachelist_redraw(appdata_t *appdata Line 351  void cachelist_redraw(appdata_t *appdata
351    
352    
353  static gboolean cachelist_update(gpointer data) {  static gboolean cachelist_update(gpointer data) {
354      appdata_t *appdata =
355        (appdata_t*)g_object_get_data(G_OBJECT(data), "appdata");
356      g_assert(appdata);
357    
358    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
359    
360    appdata_t *appdata = (appdata_t*)data;    /* check if the widget the timer fired for is the currently */
361      /* visible one (if a search result is being shown, a cachlist */
362      /* may also be present below it) */
363      if(appdata->cur_view != data) {
364        printf("-> widget is not the one currently on top, don't redraw\n");
365        return TRUE;
366      }
367    
368    if(appdata->cur_cache)    if(appdata->cur_cache)
369      return TRUE;      return TRUE;
# Line 355  static gboolean cachelist_update(gpointe Line 376  static gboolean cachelist_update(gpointe
376    
377    if(appdata->cachelist_update)    if(appdata->cachelist_update)
378      cachelist_redraw(appdata);      cachelist_redraw(appdata);
379      else
380        printf("update disabled\n");
381    
382    return TRUE;    return TRUE;
383  }  }
384    
385  static void cachelist_timer_reset(appdata_t *appdata) {  static void cachelist_timer_reset(GtkWidget *widget) {
386      guint handler_id =
387        (guint)g_object_get_data(G_OBJECT(widget), "handler_id");
388      g_assert(handler_id);
389    
390      appdata_t *appdata =
391        (appdata_t*)g_object_get_data(G_OBJECT(widget), "appdata");
392      g_assert(appdata);
393    
394    printf("cachelist timer reset\n");    printf("cachelist timer reset\n");
395    g_assert(appdata->cachelist_handler_id);    gtk_timeout_remove(handler_id);
396    gtk_timeout_remove(appdata->cachelist_handler_id);    g_object_set_data(G_OBJECT(widget), "handler_id", (gpointer)
397    appdata->cachelist_handler_id =      gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, widget));
     gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, appdata);  
398  }  }
399    
400  static gboolean cachelist_update_reset0(GtkWidget *widget,  static gboolean cachelist_update_reset0(GtkWidget *widget,
401                                          GdkEventButton *event,                                          GdkEventButton *event,
402                                          gpointer user_data) {                                          gpointer user_data) {
403    cachelist_timer_reset((appdata_t*)user_data);    cachelist_timer_reset(GTK_WIDGET(user_data));
404    return FALSE;    return FALSE;
405  }  }
406    
407  static void cachelist_update_reset1(GtkAdjustment *adj,  static void cachelist_update_reset1(GtkAdjustment *adj,
408                                      gpointer user_data) {                                      gpointer user_data) {
409    cachelist_timer_reset((appdata_t*)user_data);    cachelist_timer_reset(GTK_WIDGET(user_data));
410  }  }
411    
412    static gboolean on_cachelist_focus_in(GtkWidget *widget, GdkEventFocus *event,
413                                          gpointer data) {
414    
415      /* we don't want a runnign timer yet */
416      if(!g_object_get_data(G_OBJECT(data), "handler_id")) {
417        printf("focus received: restarting cachelist timer\n");
418    
419        appdata_t *appdata =
420          (appdata_t*)g_object_get_data(G_OBJECT(data), "appdata");
421        g_assert(appdata);
422    
423        g_object_set_data(G_OBJECT(data), "handler_id", (gpointer)
424          gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, data));
425    
426        /* and redo list immediately */
427        cachelist_redraw(appdata);
428      }
429    
430      return FALSE;
431    }
432    
433    static gboolean on_cachelist_focus_out(GtkWidget *widget, GdkEventFocus *event,
434                                           gpointer data) {
435    
436      guint handler_id =
437        (guint)g_object_get_data(G_OBJECT(data), "handler_id");
438      g_assert(handler_id);
439    
440      gtk_timeout_remove(handler_id);
441      g_object_set_data(G_OBJECT(data), "handler_id", NULL);
442    
443      printf("focus lost: cachelist timer removed\n");
444    
445      return FALSE;
446    }
447    
448  static GtkWidget *cachelist_create(appdata_t *appdata, gpx_t *gpx,  static GtkWidget *cachelist_create(appdata_t *appdata, gpx_t *gpx,
449                                     cache_t *sel_cache) {                                     cache_t *sel_cache) {
450    GtkCellRenderer *renderer;    GtkCellRenderer *renderer;
# Line 524  static GtkWidget *cachelist_create(appda Line 590  static GtkWidget *cachelist_create(appda
590    g_signal_connect(view, "row-activated",    g_signal_connect(view, "row-activated",
591                     (GCallback)cachelist_view_onRowActivated, appdata);                     (GCallback)cachelist_view_onRowActivated, appdata);
592    
593    cachelist_expose_t *ce = malloc(sizeof(cachelist_expose_t));    cachelist_context_t *ce = g_new0(cachelist_context_t, 1);
594    ce->appdata = appdata;    ce->appdata = appdata;
595    ce->path = path;    ce->path = path;
596    ce->done = FALSE;    ce->done = FALSE;
597    
598    g_signal_connect(view, "expose-event",    g_signal_connect(view, "expose-event",
599                     (GCallback)cachelist_expose, ce);                     (GCallback)cachelist_expose, ce);
   g_signal_connect(view, "destroy",  
                    (GCallback)cachelist_destroy, ce);  
600    
601    /* put this inside a scrolled view */    /* put this inside a scrolled view */
602  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
603    GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);    GtkWidget *container = gtk_scrolled_window_new (NULL, NULL);
604    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(container),
605                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
606    gtk_container_add(GTK_CONTAINER(scrolled_window), view);    gtk_container_add(GTK_CONTAINER(container), view);
607  #else  #else
608    GtkWidget *pannable_area = hildon_pannable_area_new();    GtkWidget *container = hildon_pannable_area_new();
609      gtk_container_add(GTK_CONTAINER(container), view);
   gtk_container_add(GTK_CONTAINER(pannable_area), view);  
610  #endif  #endif
611    
612    /* add a timer for automatic update */    g_signal_connect(view, "destroy",
613    g_assert(!appdata->cachelist_handler_id);                     (GCallback)cachelist_destroy, container);
   appdata->cachelist_handler_id =  
     gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, appdata);  
614    
615    /* update timer is being reset if the user scrolls or selects */    /* update timer is being reset if the user scrolls or selects */
616    g_signal_connect(view, "button-press-event",    g_signal_connect(view, "button-press-event",
617                     (GCallback)cachelist_update_reset0, appdata);                     (GCallback)cachelist_update_reset0, container);
618    
619      /* add a timer for automatic update */
620      g_object_set_data(G_OBJECT(container), "handler_id", (gpointer)
621        gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, container));
622    
623      printf("cachelist timer created\n");
624    
625      g_object_set_data(G_OBJECT(container), "appdata", (gpointer)appdata);
626    
627      g_object_set_data(G_OBJECT(container), "ce", (gpointer)ce);
628    
629      /* the timer is removed and re-enabled on every focus change event */
630      /* for the main top window */
631      //  GtkWidget *root = gtk_widget_get_toplevel(GTK_WIDGET(button)))
632    
633      g_signal_connect(G_OBJECT(view), "focus-in-event",
634                       G_CALLBACK(on_cachelist_focus_in), container);
635    
636      g_signal_connect(G_OBJECT(view), "focus-out-event",
637                       G_CALLBACK(on_cachelist_focus_out), container);
638    
639  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
640    g_signal_connect(gtk_scrolled_window_get_vadjustment(    g_signal_connect(gtk_scrolled_window_get_vadjustment(
641                         GTK_SCROLLED_WINDOW(scrolled_window)),                 GTK_SCROLLED_WINDOW(container)),
642                             "value-changed",                 "value-changed",
643                             (GCallback)cachelist_update_reset1, appdata);                 (GCallback)cachelist_update_reset1, container);
   
   return scrolled_window;  
644  #else  #else
645    g_signal_connect(hildon_pannable_area_get_vadjustment(    g_signal_connect(hildon_pannable_area_get_vadjustment(
646                         HILDON_PANNABLE_AREA(pannable_area)),                 HILDON_PANNABLE_AREA(container)),
647                             "value-changed",                 "value-changed",
648                             (GCallback)cachelist_update_reset1, appdata);                 (GCallback)cachelist_update_reset1, container);
   
649    
   return pannable_area;  
650  #endif  #endif
651      return container;
652  }  }
653    
654  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 599  static void search_result_free(gpx_t *re Line 677  static void search_result_free(gpx_t *re
677  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
678    printf("cachelist destroy\n");    printf("cachelist destroy\n");
679    
680      HildonWindowStack *stack = hildon_window_stack_get_default();
681      appdata->window = HILDON_WINDOW(hildon_window_stack_peek(stack));
682    
683    if(appdata->search_results) {    if(appdata->search_results) {
684      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
685      appdata->search_results = NULL;      appdata->search_results = NULL;
# Line 615  void on_cachelist_destroy(GtkWidget *wid Line 696  void on_cachelist_destroy(GtkWidget *wid
696    
697  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
698    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
699      appdata->window = HILDON_WINDOW(window);
700    
701    /* store last "cur_view" in window */    /* store last "cur_view" in window */
702    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
703    
704    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
705    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);  
706    
707    appdata->cur_view = cachelist_create(appdata, gpx, NULL);    appdata->cur_view = cachelist_create(appdata, gpx, NULL);
708    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
# Line 696  void gpxlist_set(GtkListStore *store, Gt Line 776  void gpxlist_set(GtkListStore *store, Gt
776                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
777                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
778  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
779                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 2),
780  #endif  #endif
781                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
782                       -1);                       -1);
# Line 820  static void gpxlist_view_onRowActivated( Line 900  static void gpxlist_view_onRowActivated(
900    
901        GtkWidget *hbox = gtk_hbox_new(FALSE, 0);        GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
902    
       gtk_box_pack_start(GTK_BOX(hbox),  
          gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,  
                                    GTK_ICON_SIZE_DIALOG),  
                          FALSE, FALSE, 0);  
   
903        GtkWidget *label = gtk_label_new(        GtkWidget *label = gtk_label_new(
904                    _("Do you want to close this entry only or do "                    _("Do you want to close this entry only or do "
905                      "you want to remove it completely from the list?"));                      "you want to remove it completely from the list?"));
# Line 974  static GtkWidget *gpxlist_create_view_an Line 1049  static GtkWidget *gpxlist_create_view_an
1049    
1050    appdata->gpxview = gtk_tree_view_new ();    appdata->gpxview = gtk_tree_view_new ();
1051    
1052      printf("building gpx list, items = %d\n", appdata->gpxlist_items);
1053    
1054    GtkTreeSelection *selection =    GtkTreeSelection *selection =
1055      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1056  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
# Line 1136  void gpxlist_add(appdata_t *appdata, gpx Line 1213  void gpxlist_add(appdata_t *appdata, gpx
1213    
1214  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1215    
 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  
   
1216  static void  static void
1217  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1218    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);  
1219  }  }
1220    
1221  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1407  typedef struct { Line 1418  typedef struct {
1418  } search_context_t;  } search_context_t;
1419    
1420    
 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  
 }  
   
1421  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1422    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1423    
# Line 1509  cb_menu_search(GtkWidget *window, gpoint Line 1493  cb_menu_search(GtkWidget *window, gpoint
1493    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1494                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
1495    
1496  #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  
1497    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.spinner);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.spinner);
1498    
1499    gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_label_new(_("days")));    gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_label_new(_("days")));
1500    
1501    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 1536  cb_menu_search(GtkWidget *window, gpoint Line 1513  cb_menu_search(GtkWidget *window, gpoint
1513      if(strlen(p) > 0)      if(strlen(p) > 0)
1514        appdata->search_str = strdup(p);        appdata->search_str = strdup(p);
1515    
1516  #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  
1517    
1518      if(check_button_get_active(context.in_finds))      if(check_button_get_active(context.in_finds))
1519        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
# Line 1578  cb_menu_search(GtkWidget *window, gpoint Line 1549  cb_menu_search(GtkWidget *window, gpoint
1549        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1550    
1551  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1552        gpx_t *found =  
1553          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        if(appdata->cur_gpx)
1554            appdata->search_results =
1555              search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1556          else
1557            appdata->search_results =
1558              search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1559    
1560        /* do search result dialog here ... */        /* do search result dialog here ... */
1561        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, appdata->search_results);
1562    
1563  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
1564        search_result_free(found);        search_result_free(appdata->search_results);
1565  #else        appdata->search_results = NULL;
       appdata->search_results = found;  
1566  #endif  #endif
1567  #else  #else
1568        gpx_t *found = NULL;        gpx_t *found = NULL;
# Line 1876  HildonAppMenu *menu_create(appdata_t *ap Line 1852  HildonAppMenu *menu_create(appdata_t *ap
1852      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1853                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
1854      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1855      }
1856    
1857      /* if search results exist, don't allow another search */
1858      if(!appdata->search_results &&
1859         ((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST))) {
1860      button = gtk_button_new_with_label(_("Search"));      button = gtk_button_new_with_label(_("Search"));
1861      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1862                             G_CALLBACK(cb_menu_search), appdata);                             G_CALLBACK(cb_menu_search), appdata);
# Line 2076  void menu_create(appdata_t *appdata) { Line 2056  void menu_create(appdata_t *appdata) {
2056    
2057  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2058    gconf_save_state(appdata);    gconf_save_state(appdata);
2059    
2060    gpx_free_all(appdata->gpx);    gpx_free_all(appdata->gpx);
2061    
2062    #ifdef ESPEAK
2063      espeak_Terminate();
2064    #endif
2065    
2066  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2067    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
2068    if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);    if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
# Line 2088  void cleanup(appdata_t *appdata) { Line 2072  void cleanup(appdata_t *appdata) {
2072    icons_free();    icons_free();
2073    gps_release(appdata);    gps_release(appdata);
2074    
 #ifdef USE_MAEMO  
2075    if(appdata->search_results) {    if(appdata->search_results) {
2076      printf("freeing pending search\n");      printf("freeing pending search\n");
2077      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
2078    }    }
2079    
2080    #ifdef USE_MAEMO
2081    if(appdata->osso_context)    if(appdata->osso_context)
2082      osso_deinitialize(appdata->osso_context);      osso_deinitialize(appdata->osso_context);
2083    
# Line 2274  crumb_back(gpointer data) { Line 2258  crumb_back(gpointer data) {
2258    
2259  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
2260                        gpointer user_data) {                        gpointer user_data) {
2261    crumb_t *crumb = malloc(sizeof(crumb_t));    crumb_t *crumb = g_new0(crumb_t, 1);
2262    crumb->level = level;    crumb->level = level;
2263    crumb->appdata = appdata;    crumb->appdata = appdata;
2264    crumb->data = user_data;    crumb->data = user_data;
# Line 2354  void main_after_settings_redraw(appdata_ Line 2338  void main_after_settings_redraw(appdata_
2338    }    }
2339    
2340    if(redraw) {    if(redraw) {
     GtkWidget *container = appdata->vbox;  
2341    
2342  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2343      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
2344      container = hildon_window_stack_peek(stack);      GtkWidget *container = hildon_window_stack_peek(stack);
2345    #else
2346        GtkWidget *container = appdata->vbox;
2347  #endif  #endif
2348    
2349      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
# Line 2377  void main_after_settings_redraw(appdata_ Line 2362  void main_after_settings_redraw(appdata_
2362      }      }
2363    
2364  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
     if(container != appdata->vbox)  
2365        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2366      else  #else
 #endif  
2367        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2368    #endif
2369    
2370      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2371    }    }
# Line 2409  int main(int argc, char *argv[]) { Line 2393  int main(int argc, char *argv[]) {
2393    
2394    curl_global_init(CURL_GLOBAL_ALL);    curl_global_init(CURL_GLOBAL_ALL);
2395    
2396    #ifdef ESPEAK
2397    #if ESPEAK_API_REVISION == 1
2398      appdata.espeak.sample_rate =
2399        espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 512, NULL);
2400    #else
2401      appdata.espeak.sample_rate =
2402        espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 512, NULL, 0);
2403    #endif
2404      if(appdata.espeak.sample_rate < 0)
2405        printf("espeak: init error\n");
2406      else
2407        printf("espeak: running at %dhz\n", appdata.espeak.sample_rate);
2408    
2409      /* set language */
2410      espeak_VOICE voice_spec;
2411      voice_spec.name = NULL;
2412      voice_spec.languages = _("en");
2413      voice_spec.gender = 0;
2414      voice_spec.age = 0;
2415      voice_spec.variant = 0;
2416      if(EE_OK != espeak_SetVoiceByProperties(&voice_spec)) {
2417        printf("failed to set voice spec for %s\n", voice_spec.languages);
2418        appdata.espeak.sample_rate = -1;
2419      }
2420    #endif
2421    
2422  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2423    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2424    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2461  int main(int argc, char *argv[]) { Line 2471  int main(int argc, char *argv[]) {
2471    appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);    appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2472    gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);    gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2473    
2474    #ifndef USE_STACKABLE_WINDOW
2475    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2476    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
 #ifndef USE_STACKABLE_WINDOW  
2477    menu_create(&appdata);    menu_create(&appdata);
2478  #else  #else
2479    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),
# Line 2496  int main(int argc, char *argv[]) { Line 2506  int main(int argc, char *argv[]) {
2506    
2507    appdata.gconf_client = gconf_client_get_default();    appdata.gconf_client = gconf_client_get_default();
2508    gconf_load_state(&appdata);    gconf_load_state(&appdata);
2509    
2510    gps_init(&appdata);    gps_init(&appdata);
2511    
2512    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);
2513    #ifndef USE_STACKABLE_WINDOW
2514    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);
2515    #else
2516      gtk_container_add(GTK_CONTAINER(appdata.window), appdata.cur_view);
2517    #endif
2518    
2519    gtk_widget_show_all(GTK_WIDGET(appdata.window));    gtk_widget_show_all(GTK_WIDGET(appdata.window));
2520    gtk_main();    gtk_main();
Legend:
Removed from v.223  
changed lines
  Added in v.249