Diff of /trunk/src/main.c

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

revision 214 by harbaum, Thu Nov 26 10:05:23 2009 UTC revision 246 by harbaum, Tue Jan 19 20:26:37 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    free(user_data);    gpointer *ce =
294        g_object_get_data(G_OBJECT(user_data), "ce");
295      g_assert(ce);
296    
297      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    
416      /* we don't want a runnign timer yet */
417      if(!g_object_get_data(G_OBJECT(data), "handler_id")) {
418        printf("focus received: restarting cachelist timer\n");
419    
420        appdata_t *appdata =
421          (appdata_t*)g_object_get_data(G_OBJECT(data), "appdata");
422        g_assert(appdata);
423    
424        g_object_set_data(G_OBJECT(data), "handler_id", (gpointer)
425          gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, data));
426      }
427    
428      return FALSE;
429    }
430    
431    static gboolean on_cachelist_focus_out(GtkWidget *widget, GdkEventFocus *event,
432                                           gpointer data) {
433    
434      guint handler_id =
435        (guint)g_object_get_data(G_OBJECT(data), "handler_id");
436      g_assert(handler_id);
437    
438      gtk_timeout_remove(handler_id);
439      g_object_set_data(G_OBJECT(data), "handler_id", NULL);
440    
441      printf("focus lost: cachelist timer removed\n");
442    
443      return FALSE;
444    }
445    
446  static GtkWidget *cachelist_create(appdata_t *appdata, gpx_t *gpx,  static GtkWidget *cachelist_create(appdata_t *appdata, gpx_t *gpx,
447                                     cache_t *sel_cache) {                                     cache_t *sel_cache) {
448    GtkCellRenderer *renderer;    GtkCellRenderer *renderer;
# Line 524  static GtkWidget *cachelist_create(appda Line 588  static GtkWidget *cachelist_create(appda
588    g_signal_connect(view, "row-activated",    g_signal_connect(view, "row-activated",
589                     (GCallback)cachelist_view_onRowActivated, appdata);                     (GCallback)cachelist_view_onRowActivated, appdata);
590    
591    cachelist_expose_t *ce = malloc(sizeof(cachelist_expose_t));    cachelist_context_t *ce = g_new0(cachelist_context_t, 1);
592    ce->appdata = appdata;    ce->appdata = appdata;
593    ce->path = path;    ce->path = path;
594    ce->done = FALSE;    ce->done = FALSE;
595    
596    g_signal_connect(view, "expose-event",    g_signal_connect(view, "expose-event",
597                     (GCallback)cachelist_expose, ce);                     (GCallback)cachelist_expose, ce);
   g_signal_connect(view, "destroy",  
                    (GCallback)cachelist_destroy, ce);  
598    
599    /* put this inside a scrolled view */    /* put this inside a scrolled view */
600  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
601    GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);    GtkWidget *container = gtk_scrolled_window_new (NULL, NULL);
602    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(container),
603                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
604    gtk_container_add(GTK_CONTAINER(scrolled_window), view);    gtk_container_add(GTK_CONTAINER(container), view);
605  #else  #else
606    GtkWidget *pannable_area = hildon_pannable_area_new();    GtkWidget *container = hildon_pannable_area_new();
607      gtk_container_add(GTK_CONTAINER(container), view);
   gtk_container_add(GTK_CONTAINER(pannable_area), view);  
608  #endif  #endif
609    
610    /* add a timer for automatic update */    g_signal_connect(view, "destroy",
611    g_assert(!appdata->cachelist_handler_id);                     (GCallback)cachelist_destroy, container);
   appdata->cachelist_handler_id =  
     gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, appdata);  
612    
613    /* update timer is being reset if the user scrolls or selects */    /* update timer is being reset if the user scrolls or selects */
614    g_signal_connect(view, "button-press-event",    g_signal_connect(view, "button-press-event",
615                     (GCallback)cachelist_update_reset0, appdata);                     (GCallback)cachelist_update_reset0, container);
616    
617      /* add a timer for automatic update */
618      g_object_set_data(G_OBJECT(container), "handler_id", (gpointer)
619        gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, container));
620    
621      printf("cachelist timer created\n");
622    
623      g_object_set_data(G_OBJECT(container), "appdata", (gpointer)appdata);
624    
625      g_object_set_data(G_OBJECT(container), "ce", (gpointer)ce);
626    
627      /* the timer is removed and re-enabled on every focus change event */
628      /* for the main top window */
629      //  GtkWidget *root = gtk_widget_get_toplevel(GTK_WIDGET(button)))
630    
631      g_signal_connect(G_OBJECT(view), "focus-in-event",
632                       G_CALLBACK(on_cachelist_focus_in), container);
633    
634      g_signal_connect(G_OBJECT(view), "focus-out-event",
635                       G_CALLBACK(on_cachelist_focus_out), container);
636    
637  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
638    g_signal_connect(gtk_scrolled_window_get_vadjustment(    g_signal_connect(gtk_scrolled_window_get_vadjustment(
639                         GTK_SCROLLED_WINDOW(scrolled_window)),                 GTK_SCROLLED_WINDOW(container)),
640                             "value-changed",                 "value-changed",
641                             (GCallback)cachelist_update_reset1, appdata);                 (GCallback)cachelist_update_reset1, container);
   
   return scrolled_window;  
642  #else  #else
643    g_signal_connect(hildon_pannable_area_get_vadjustment(    g_signal_connect(hildon_pannable_area_get_vadjustment(
644                         HILDON_PANNABLE_AREA(pannable_area)),                 HILDON_PANNABLE_AREA(container)),
645                             "value-changed",                 "value-changed",
646                             (GCallback)cachelist_update_reset1, appdata);                 (GCallback)cachelist_update_reset1, container);
   
647    
   return pannable_area;  
648  #endif  #endif
649      return container;
650  }  }
651    
652  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 599  static void search_result_free(gpx_t *re Line 675  static void search_result_free(gpx_t *re
675  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
676    printf("cachelist destroy\n");    printf("cachelist destroy\n");
677    
678      HildonWindowStack *stack = hildon_window_stack_get_default();
679      appdata->window = HILDON_WINDOW(hildon_window_stack_peek(stack));
680    
681    if(appdata->search_results) {    if(appdata->search_results) {
682      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
683      appdata->search_results = NULL;      appdata->search_results = NULL;
# Line 615  void on_cachelist_destroy(GtkWidget *wid Line 694  void on_cachelist_destroy(GtkWidget *wid
694    
695  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
696    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
697      appdata->window = HILDON_WINDOW(window);
698    
699    /* store last "cur_view" in window */    /* store last "cur_view" in window */
700    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
701    
702    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
703    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);  
704    
705    appdata->cur_view = cachelist_create(appdata, gpx, NULL);    appdata->cur_view = cachelist_create(appdata, gpx, NULL);
706    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 774  void gpxlist_set(GtkListStore *store, Gt
774                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
775                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
776  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
777                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 2),
778  #endif  #endif
779                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
780                       -1);                       -1);
# Line 820  static void gpxlist_view_onRowActivated( Line 898  static void gpxlist_view_onRowActivated(
898    
899        GtkWidget *hbox = gtk_hbox_new(FALSE, 0);        GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
900    
       gtk_box_pack_start(GTK_BOX(hbox),  
          gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,  
                                    GTK_ICON_SIZE_DIALOG),  
                          FALSE, FALSE, 0);  
   
901        GtkWidget *label = gtk_label_new(        GtkWidget *label = gtk_label_new(
902                    _("Do you want to close this entry only or do "                    _("Do you want to close this entry only or do "
903                      "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 1047  static GtkWidget *gpxlist_create_view_an
1047    
1048    appdata->gpxview = gtk_tree_view_new ();    appdata->gpxview = gtk_tree_view_new ();
1049    
1050      printf("building gpx list, items = %d\n", appdata->gpxlist_items);
1051    
1052    GtkTreeSelection *selection =    GtkTreeSelection *selection =
1053      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1054  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
# Line 1110  static GtkWidget *gpxlist_create_view_an Line 1185  static GtkWidget *gpxlist_create_view_an
1185  }  }
1186    
1187  /* add last entry in gpx list to visual representation */  /* add last entry in gpx list to visual representation */
1188  static void gpxlist_add(appdata_t *appdata, gpx_t *new) {  void gpxlist_add(appdata_t *appdata, gpx_t *new) {
1189    GtkTreeIter         iter;    GtkTreeIter         iter;
1190    
1191    gtk_list_store_append(appdata->gpxstore, &iter);    gtk_list_store_append(appdata->gpxstore, &iter);
# Line 1120  static void gpxlist_add(appdata_t *appda Line 1195  static void gpxlist_add(appdata_t *appda
1195    gpx_t **gpx = &appdata->gpx;    gpx_t **gpx = &appdata->gpx;
1196    while(*gpx) gpx = &((*gpx)->next);    while(*gpx) gpx = &((*gpx)->next);
1197    *gpx = new;    *gpx = new;
1198    
1199      /* select new iter */
1200      GtkTreeSelection *selection =
1201        gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1202      gtk_tree_selection_select_iter(selection, &iter);
1203      GtkTreePath *path =
1204        gtk_tree_model_get_path(GTK_TREE_MODEL(appdata->gpxstore), &iter);
1205      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(appdata->gpxview),
1206                                   path, NULL, TRUE, 0.0, 0.0);
1207      gtk_tree_path_free(path);
1208  }  }
1209    
1210  /******************** end of gpxlist ********************/  /******************** end of gpxlist ********************/
1211    
1212  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1213    
 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  
   
1214  static void  static void
1215  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1216    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);  
1217  }  }
1218    
1219  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1397  typedef struct { Line 1416  typedef struct {
1416  } search_context_t;  } search_context_t;
1417    
1418    
 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  
 }  
   
1419  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1420    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1421    
# Line 1499  cb_menu_search(GtkWidget *window, gpoint Line 1491  cb_menu_search(GtkWidget *window, gpoint
1491    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1492                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
1493    
1494  #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  
1495    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.spinner);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.spinner);
1496    
1497    gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_label_new(_("days")));    gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_label_new(_("days")));
1498    
1499    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 1526  cb_menu_search(GtkWidget *window, gpoint Line 1511  cb_menu_search(GtkWidget *window, gpoint
1511      if(strlen(p) > 0)      if(strlen(p) > 0)
1512        appdata->search_str = strdup(p);        appdata->search_str = strdup(p);
1513    
1514  #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  
1515    
1516      if(check_button_get_active(context.in_finds))      if(check_button_get_active(context.in_finds))
1517        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
# Line 1568  cb_menu_search(GtkWidget *window, gpoint Line 1547  cb_menu_search(GtkWidget *window, gpoint
1547        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1548    
1549  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1550        gpx_t *found =  
1551          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        if(appdata->cur_gpx)
1552            appdata->search_results =
1553              search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1554          else
1555            appdata->search_results =
1556              search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1557    
1558        /* do search result dialog here ... */        /* do search result dialog here ... */
1559        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, appdata->search_results);
1560    
1561  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
1562        search_result_free(found);        search_result_free(appdata->search_results);
1563  #else        appdata->search_results = NULL;
       appdata->search_results = found;  
1564  #endif  #endif
1565  #else  #else
1566        gpx_t *found = NULL;        gpx_t *found = NULL;
# Line 1866  HildonAppMenu *menu_create(appdata_t *ap Line 1850  HildonAppMenu *menu_create(appdata_t *ap
1850      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1851                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
1852      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1853      }
1854    
1855      /* if search results exist, don't allow another search */
1856      if(!appdata->search_results &&
1857         ((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST))) {
1858      button = gtk_button_new_with_label(_("Search"));      button = gtk_button_new_with_label(_("Search"));
1859      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1860                             G_CALLBACK(cb_menu_search), appdata);                             G_CALLBACK(cb_menu_search), appdata);
# Line 2065  void menu_create(appdata_t *appdata) { Line 2053  void menu_create(appdata_t *appdata) {
2053  /********************* end of menu **********************/  /********************* end of menu **********************/
2054    
2055  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2056      gconf_save_state(appdata);
2057    
2058    gpx_free_all(appdata->gpx);    gpx_free_all(appdata->gpx);
2059    if(appdata->path) free(appdata->path);  
2060    if(appdata->image_path) free(appdata->image_path);  #ifdef ESPEAK
2061    if(appdata->search_str) free(appdata->search_str);    espeak_Terminate();
2062    #endif
2063    
2064  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2065    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
# Line 2079  void cleanup(appdata_t *appdata) { Line 2070  void cleanup(appdata_t *appdata) {
2070    icons_free();    icons_free();
2071    gps_release(appdata);    gps_release(appdata);
2072    
 #ifdef USE_MAEMO  
2073    if(appdata->search_results) {    if(appdata->search_results) {
2074      printf("freeing pending search\n");      printf("freeing pending search\n");
2075      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
2076    }    }
2077    
2078    #ifdef USE_MAEMO
2079    if(appdata->osso_context)    if(appdata->osso_context)
2080      osso_deinitialize(appdata->osso_context);      osso_deinitialize(appdata->osso_context);
2081    
# Line 2106  void cleanup(appdata_t *appdata) { Line 2097  void cleanup(appdata_t *appdata) {
2097  static void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2098    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2099    
   gconf_save_state(appdata);  
2100    gtk_main_quit();    gtk_main_quit();
2101    appdata->window = NULL;    appdata->window = NULL;
2102  }  }
# Line 2266  crumb_back(gpointer data) { Line 2256  crumb_back(gpointer data) {
2256    
2257  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
2258                        gpointer user_data) {                        gpointer user_data) {
2259    crumb_t *crumb = malloc(sizeof(crumb_t));    crumb_t *crumb = g_new0(crumb_t, 1);
2260    crumb->level = level;    crumb->level = level;
2261    crumb->appdata = appdata;    crumb->appdata = appdata;
2262    crumb->data = user_data;    crumb->data = user_data;
# Line 2346  void main_after_settings_redraw(appdata_ Line 2336  void main_after_settings_redraw(appdata_
2336    }    }
2337    
2338    if(redraw) {    if(redraw) {
     GtkWidget *container = appdata->vbox;  
2339    
2340  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2341      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
2342      container = hildon_window_stack_peek(stack);      GtkWidget *container = hildon_window_stack_peek(stack);
2343    #else
2344        GtkWidget *container = appdata->vbox;
2345  #endif  #endif
2346    
2347      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
# Line 2369  void main_after_settings_redraw(appdata_ Line 2360  void main_after_settings_redraw(appdata_
2360      }      }
2361    
2362  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
     if(container != appdata->vbox)  
2363        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2364      else  #else
 #endif  
2365        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2366    #endif
2367    
2368      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2369    }    }
# Line 2397  int main(int argc, char *argv[]) { Line 2387  int main(int argc, char *argv[]) {
2387    
2388    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2389    
2390      misc_init();
2391    
2392    curl_global_init(CURL_GLOBAL_ALL);    curl_global_init(CURL_GLOBAL_ALL);
2393    
2394    #ifdef ESPEAK
2395    #if ESPEAK_API_REVISION == 1
2396      appdata.espeak.sample_rate =
2397        espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 512, NULL);
2398    #else
2399      appdata.espeak.sample_rate =
2400        espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 512, NULL, 0);
2401    #endif
2402      if(appdata.espeak.sample_rate < 0)
2403        printf("espeak: init error\n");
2404      else
2405        printf("espeak: running at %dhz\n", appdata.espeak.sample_rate);
2406    
2407      /* set language */
2408      espeak_VOICE voice_spec;
2409      voice_spec.name = NULL;
2410      voice_spec.languages = _("en");
2411      voice_spec.gender = 0;
2412      voice_spec.age = 0;
2413      voice_spec.variant = 0;
2414      if(EE_OK != espeak_SetVoiceByProperties(&voice_spec)) {
2415        printf("failed to set voice spec for %s\n", voice_spec.languages);
2416        appdata.espeak.sample_rate = -1;
2417      }
2418    #endif
2419    
2420  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2421    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2422    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2451  int main(int argc, char *argv[]) { Line 2469  int main(int argc, char *argv[]) {
2469    appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);    appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2470    gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);    gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2471    
2472    #ifndef USE_STACKABLE_WINDOW
2473    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2474    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
 #ifndef USE_STACKABLE_WINDOW  
2475    menu_create(&appdata);    menu_create(&appdata);
2476  #else  #else
2477    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),
# Line 2486  int main(int argc, char *argv[]) { Line 2504  int main(int argc, char *argv[]) {
2504    
2505    appdata.gconf_client = gconf_client_get_default();    appdata.gconf_client = gconf_client_get_default();
2506    gconf_load_state(&appdata);    gconf_load_state(&appdata);
2507    
2508    gps_init(&appdata);    gps_init(&appdata);
2509    
2510    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);
2511    #ifndef USE_STACKABLE_WINDOW
2512    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);
2513    #else
2514      gtk_container_add(GTK_CONTAINER(appdata.window), appdata.cur_view);
2515    #endif
2516    
2517    gtk_widget_show_all(GTK_WIDGET(appdata.window));    gtk_widget_show_all(GTK_WIDGET(appdata.window));
2518    gtk_main();    gtk_main();
Legend:
Removed from v.214  
changed lines
  Added in v.246