Diff of /trunk/src/main.c

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

revision 45 by harbaum, Tue Aug 4 19:27:39 2009 UTC revision 249 by harbaum, Thu Jan 21 21:18:33 2010 UTC
# Line 15  Line 15 
15   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
16   */   */
17    
18  #include <stdio.h>  #define __USE_GNU
19  #include <string.h>  #include <string.h>
20    
21    #include <stdio.h>
22  #include <math.h>  #include <math.h>
23    
24    #include <curl/curl.h>
25    
26  #include <time.h>  #include <time.h>
27  #include <sys/time.h>  #include <sys/time.h>
28    
# Line 27  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
41    #include <hildon/hildon-note.h>
42    #include <hildon/hildon-entry.h>
43    #endif
44  #endif  #endif
45    
46  #include <locale.h>  #include <locale.h>
47    
48  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
49    
50  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
51  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
52                        gpointer user_data);                        gpointer user_data);
53    
# Line 92  void errorf(const char *fmt, ...) { Line 104  void errorf(const char *fmt, ...) {
104      }      }
105    }    }
106    
107    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
108    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
109                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
110                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
111                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,                             GTK_MESSAGE_ERROR,
112                             buf);                             GTK_BUTTONS_CLOSE, buf);
113    
114    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
115    #else
116      GtkWidget *dialog =
117        hildon_note_new_information(GTK_WINDOW(NULL), buf);
118    #endif
119    
120    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
121    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 155  gpx_t *choose_file(appdata_t *appdata, g
155    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
156    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
157      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
158    
159        if(filename) {
160          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
161    
162      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
163            gpx = gpx_parse(dialog, filename, appdata->username);
164      if(!whole_dir)        else {
165        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
166      else {          if(strlastchr(filename) == '/')
167        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
168        if(strlastchr(filename) == '/')  
169          filename[strlen(filename)] = 0;          gpx = gpx_parse_dir(dialog, filename, appdata->username);
   
       gpx = gpx_parse_dir(dialog, filename);  
     }  
   
     gpx_busy_dialog_destroy(dialog);  
   
     /* save path if gpx was successfully loaded */  
     if(gpx) {  
       char *r = strrchr(filename, '/');  
   
       /* there is a delimiter, use everything left of it as path */  
       if(r && !whole_dir) {  
         *r = 0;  
         if(appdata->path) free(appdata->path);  
         appdata->path = strdup(filename);  
         /* restore path ... just in case ... */  
         *r = '/';  
170        }        }
171    
172        if(whole_dir)        gpx_busy_dialog_destroy(dialog);
173          appdata->path = strdup(filename);  
174      }        /* save path if gpx was successfully loaded */
175          if(gpx) {
176            char *r = strrchr(filename, '/');
177    
178            /* there is a delimiter, use everything left of it as path */
179            if(r && !whole_dir) {
180              *r = 0;
181              if(appdata->path) free(appdata->path);
182              appdata->path = strdup(filename);
183              /* restore path ... just in case ... */
184              *r = '/';
185            }
186    
187            if(whole_dir)
188              appdata->path = strdup(filename);
189          } else
190            errorf(_("Load error"));
191    
192      g_free (filename);        g_free (filename);
193        } else {
194    #ifndef USE_MAEMO
195          errorf(_("Error accessing the file."));
196    #else
197          errorf(_("Error accessing the file. This may happen if the file "
198                   "resides on a remote file system. Please copy the file onto "
199                   "the device (e.g. onto the memory card) and try again."));
200    #endif
201        }
202    }    }
203    
204    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 194  enum { Line 222  enum {
222    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
223  } ;  } ;
224    
225  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
226    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
227        cache_dialog(appdata, cache);
228    #else
229        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
230    
231        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
232        appdata->cur_view = cache_view(appdata, cache);
233        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
234        gtk_widget_show_all(appdata->vbox);
235    #endif
236    }
237    
238    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
239                                     GtkTreePath        *path,                                     GtkTreePath        *path,
240                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
241                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 211  void cachelist_view_onRowActivated(GtkTr Line 252  void cachelist_view_onRowActivated(GtkTr
252    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
253      cache_t *cache;      cache_t *cache;
254      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
255  #ifndef USE_BREAD_CRUMB_TRAIL      cachelist_goto_cache(appdata, cache);
     cache_dialog(appdata, cache);  
 #else  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = cache_view(appdata, cache);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
 #endif  
256    }    }
257  }  }
258    
# Line 228  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 247  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 263  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  #ifndef USE_MAEMO    printf("redrawing cachelist\n");
   //  gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
   //  appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
   //  gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
   // gtk_widget_show_all(appdata->vbox);  
 #else  
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");
# Line 285  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;  
   
     printf("redraw %d\n", redraw);  
   
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 307  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    }    }
 #endif  
350  }  }
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  #ifdef USE_MAEMO    /* check if the widget the timer fired for is the currently */
361    appdata_t *appdata = (appdata_t*)data;    /* 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;
370    
371    #ifdef USE_MAEMO
372    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
373      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
374        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
375    #endif
376    
377    if(appdata->cachelist_update)    if(appdata->cachelist_update)
378      cachelist_redraw(appdata);      cachelist_redraw(appdata);
379  #endif    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 457  static GtkWidget *cachelist_create(appda Line 542  static GtkWidget *cachelist_create(appda
542      if(tint > 8) tint = 8;      if(tint > 8) tint = 8;
543    
544      /* cache type includes "solved" flag in lowest bit */      /* cache type includes "solved" flag in lowest bit */
545      int type = (cache->type<<8) +      int type = cache->type<<8;
546        (cache->notes?4:0) +      if(cache->notes) type |= 4;
547        ((cache->notes && cache->notes->override)?1:0) +      if(cache->notes && cache->notes->override) type |= 1;
548        ((cache->notes && cache->notes->found)?2:0);      if(cache->notes && cache->notes->found) type |= 2;
549        if(cache->found) type |= 2;
550        if(cache->mine) type |= 8;
551    
552      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
553    
# Line 503  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 576  void cachelist_dialog(appdata_t *appdata Line 675  void cachelist_dialog(appdata_t *appdata
675  static void search_result_free(gpx_t *result);  static void search_result_free(gpx_t *result);
676    
677  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
678      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;
686    }    }
687    appdata->cur_gpx = NULL;    appdata->cur_gpx = NULL;
688    
689    #ifdef ENABLE_OSM_GPS_MAP
690      map_update(appdata);
691    #endif
692    
693    /* restore cur_view */    /* restore cur_view */
694    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
695  }  }
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 608  void cachelist_dialog(appdata_t *appdata Line 715  void cachelist_dialog(appdata_t *appdata
715                     G_CALLBACK(on_cachelist_destroy), appdata);                     G_CALLBACK(on_cachelist_destroy), appdata);
716    
717    gtk_widget_show_all(window);    gtk_widget_show_all(window);
718    
719    #ifdef ENABLE_OSM_GPS_MAP
720      map_update(appdata);
721    #endif
722  }  }
723  #endif  #endif
724  #endif  #endif
# Line 640  static GdkPixbuf *gpx_icon_get(gpx_t *gp Line 751  static GdkPixbuf *gpx_icon_get(gpx_t *gp
751    return icon_get(ICON_FILE, 0);    return icon_get(ICON_FILE, 0);
752  }  }
753    
754  static void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {  void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {
755    char date_str[32], cnum[32];    char date_str[32], cnum[32];
756    
757    if(gpx->year && gpx->month && gpx->day) {    if(gpx->year && gpx->month && gpx->day) {
# Line 665  static void gpxlist_set(GtkListStore *st Line 776  static void gpxlist_set(GtkListStore *st
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, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 2),
780  #endif  #endif
781                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
782                       -1);                       -1);
# Line 711  static void gpxlist_close(appdata_t *app Line 822  static void gpxlist_close(appdata_t *app
822    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
823  }  }
824    
825    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
826    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
827    #ifdef USE_STACKABLE_WINDOW
828      if(!appdata->cur_gpx)
829    #endif
830        cachelist_dialog(appdata, gpx);
831    #ifdef USE_STACKABLE_WINDOW
832      else
833        printf("selected gpx, but cachelist window already present\n");
834    #endif
835    #else
836      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
837      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
838      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
839      gtk_widget_show_all(appdata->vbox);
840    
841      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
842    #endif
843    }
844    
845  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
846                            GtkTreePath        *path,                            GtkTreePath        *path,
847                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 737  static void gpxlist_view_onRowActivated( Line 868  static void gpxlist_view_onRowActivated(
868      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
869        printf("clicked delete\n");        printf("clicked delete\n");
870    
871    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
872        /* ask user what he wants */        /* ask user what he wants */
873        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
874                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
875                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
876                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   GTK_MESSAGE_QUESTION,
877                     GTK_BUTTONS_CANCEL,
878                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
879                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
880    
# Line 750  static void gpxlist_view_onRowActivated( Line 883  static void gpxlist_view_onRowActivated(
883                               _("Close"), 2,                               _("Close"), 2,
884                               NULL);                               NULL);
885    
886          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
887    #else
888    
889          GtkWidget *dialog =
890            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
891                                GTK_WINDOW(appdata->window),
892                                GTK_DIALOG_DESTROY_WITH_PARENT,
893                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
894                                _("Remove"), 1,
895                                _("Close"), 2,
896                                NULL);
897    
898          GtkWidget *content_area =
899            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
900    
901          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
902    
903          GtkWidget *label = gtk_label_new(
904                      _("Do you want to close this entry only or do "
905                        "you want to remove it completely from the list?"));
906    
907          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
908          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
909    
910          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
911          gtk_container_add (GTK_CONTAINER (content_area), hbox);
912    
913          gtk_widget_show_all (dialog);
914    #endif
915    
916        if(gpx->closed)        if(gpx->closed)
917          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
918    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));  
   
919        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
920        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
921    
# Line 784  static void gpxlist_view_onRowActivated( Line 945  static void gpxlist_view_onRowActivated(
945          gpx_t *new = NULL;          gpx_t *new = NULL;
946    
947          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
948            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
949          else          else
950            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
951    
952          if(new) {          if(new) {
953            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 822  static void gpxlist_view_onRowActivated( Line 983  static void gpxlist_view_onRowActivated(
983    
984          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
985        }        }
986  #ifndef USE_BREAD_CRUMB_TRAIL  
987  #ifdef USE_STACKABLE_WINDOW        gpxlist_goto_cachelist(appdata, gpx);
       if(!appdata->cur_gpx)  
 #endif  
         cachelist_dialog(appdata, gpx);  
 #ifdef USE_STACKABLE_WINDOW  
       else  
         printf("selected gpx, but cachelist window already present\n");  
 #endif  
 #else  
       gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
       appdata->cur_view = cachelist_create(appdata, gpx, NULL);  
       gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
       gtk_widget_show_all(appdata->vbox);  
   
       crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);  
 #endif  
988      }      }
989    }    }
990  }  }
991    
992    /* search gpx file in gpx list */
993    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx) {
994      GtkTreeModel *model =
995        gtk_tree_view_get_model(GTK_TREE_VIEW(appdata->gpxview));
996    
997      gboolean found =
998        gtk_tree_model_get_iter_first(model, iter);
999    
1000      while(found) {
1001        gpx_t *this_gpx;
1002        gtk_tree_model_get(model, iter, GPXLIST_COL_DATA, &this_gpx, -1);
1003    
1004        if(gpx == this_gpx)
1005          return TRUE;
1006    
1007        found = gtk_tree_model_iter_next(model, iter);
1008      }
1009    
1010      return FALSE;
1011    }
1012    
1013    
1014  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
1015  static gboolean  static gboolean
1016  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
# Line 881  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 893  static GtkWidget *gpxlist_create_view_an Line 1063  static GtkWidget *gpxlist_create_view_an
1063    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1064                    -1, "Icon", renderer,                    -1, "Icon", renderer,
1065                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
1066                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
1067            /* at least one entry needs to be sensitive. */
1068            /* This is the delete icon if the PANNABLE_AREA is used */
1069                      "sensitive", GPXLIST_COL_OPEN,
1070    #endif
1071                    NULL);                    NULL);
1072    
1073    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 949  static GtkWidget *gpxlist_create_view_an Line 1123  static GtkWidget *gpxlist_create_view_an
1123    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1124                    -1, "Del", renderer,                    -1, "Del", renderer,
1125                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
1126                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
1127                    NULL);                    NULL);
1128  #endif  #endif
1129    
# Line 969  static GtkWidget *gpxlist_create_view_an Line 1143  static GtkWidget *gpxlist_create_view_an
1143      GtkTreeIter         iter;      GtkTreeIter         iter;
1144      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1145      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1146    
1147      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1148        sel_iter = iter;        sel_iter = iter;
1149        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 1013  static GtkWidget *gpxlist_create_view_an Line 1187  static GtkWidget *gpxlist_create_view_an
1187  }  }
1188    
1189  /* add last entry in gpx list to visual representation */  /* add last entry in gpx list to visual representation */
1190  static void gpxlist_add(appdata_t *appdata, gpx_t *new) {  void gpxlist_add(appdata_t *appdata, gpx_t *new) {
1191    GtkTreeIter         iter;    GtkTreeIter         iter;
1192    
1193    gtk_list_store_append(appdata->gpxstore, &iter);    gtk_list_store_append(appdata->gpxstore, &iter);
# Line 1023  static void gpxlist_add(appdata_t *appda Line 1197  static void gpxlist_add(appdata_t *appda
1197    gpx_t **gpx = &appdata->gpx;    gpx_t **gpx = &appdata->gpx;
1198    while(*gpx) gpx = &((*gpx)->next);    while(*gpx) gpx = &((*gpx)->next);
1199    *gpx = new;    *gpx = new;
1200    
1201      /* select new iter */
1202      GtkTreeSelection *selection =
1203        gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1204      gtk_tree_selection_select_iter(selection, &iter);
1205      GtkTreePath *path =
1206        gtk_tree_model_get_path(GTK_TREE_MODEL(appdata->gpxstore), &iter);
1207      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(appdata->gpxview),
1208                                   path, NULL, TRUE, 0.0, 0.0);
1209      gtk_tree_path_free(path);
1210  }  }
1211    
1212  /******************** end of gpxlist ********************/  /******************** end of gpxlist ********************/
# Line 1031  static void gpxlist_add(appdata_t *appda Line 1215  static void gpxlist_add(appdata_t *appda
1215    
1216  static void  static void
1217  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1218    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_box((appdata_t*)data);
   
   gtk_about_dialog_set_name(about, "GPXView");  
   gtk_about_dialog_set_version(about, VERSION);  
   
 #ifdef ENABLE_LIBLOCATION  
   char *uses = "uses liblocation";  
 #elif defined(ENABLE_GPSBT)  
   char *uses = "uses gpsbt and gpsd";  
 #else  
   char *uses = "uses gpsd";  
 #endif  
   
   char *str = g_strdup_printf("%s\n\n(%s)",  
                       _("GPXView (c) 2008-2009 by\n"  
                         "Till Harbaum <till@harbaum.org>\n"  
                         "Mailing list: gpxview-users@garage.maemo.org"),  
                       _(uses)  
                       );  
   
   gtk_about_dialog_set_copyright(about, str);  
   g_free(str);  
   
   gtk_about_dialog_set_website(about,  
        _("http://www.harbaum.org/till/maemo"));  
   
   gtk_about_dialog_set_comments(about,  
        _("Geocaching.com GPX file viewer"));  
   
   gtk_widget_show_all(GTK_WIDGET(about));  
   gtk_dialog_run(GTK_DIALOG(about));  
   gtk_widget_destroy(GTK_WIDGET(about));  
1219  }  }
1220    
1221  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1234  gpx_t *search_do(appdata_t *appdata, gpx Line 1387  gpx_t *search_do(appdata_t *appdata, gpx
1387        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1388                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1389          hit = 1;          hit = 1;
1390        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1391                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1392          hit = 1;          hit = 1;
1393    
1394        if(hit) {        if(hit) {
# Line 1264  typedef struct { Line 1417  typedef struct {
1417    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1418  } search_context_t;  } search_context_t;
1419    
1420    
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    
1424    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1425    
1426    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1427    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1298  cb_menu_search(GtkWidget *window, gpoint Line 1451  cb_menu_search(GtkWidget *window, gpoint
1451    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1452    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1453    
1454    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1455    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_id),    check_button_set_active(context.in_id, appdata->search & SEARCH_ID);
                                appdata->search & SEARCH_ID);  
1456    gtk_table_attach_defaults(GTK_TABLE(table), context.in_id, 0, 1, 0, 1);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_id, 0, 1, 0, 1);
1457    
1458    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1459    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_name),    check_button_set_active(context.in_name, appdata->search & SEARCH_NAME);
                                appdata->search & SEARCH_NAME);  
1460    gtk_table_attach_defaults(GTK_TABLE(table), context.in_name, 1, 2, 0, 1);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_name, 1, 2, 0, 1);
1461    
1462    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1463    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_desc),    check_button_set_active(context.in_desc, appdata->search & SEARCH_DESC);
                                appdata->search & SEARCH_DESC);  
1464    gtk_table_attach_defaults(GTK_TABLE(table), context.in_desc, 0, 1, 1, 2);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_desc, 0, 1, 1, 2);
1465    
1466    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1467    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_owner),    check_button_set_active(context.in_owner, appdata->search & SEARCH_OWNER);
                                appdata->search & SEARCH_OWNER);  
1468    gtk_table_attach_defaults(GTK_TABLE(table), context.in_owner, 1, 2, 1, 2);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_owner, 1, 2, 1, 2);
1469    
1470    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
# Line 1324  cb_menu_search(GtkWidget *window, gpoint Line 1473  cb_menu_search(GtkWidget *window, gpoint
1473    
1474    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1475                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1476      context.entry = entry_new();
1477    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1478                                context.entry = gtk_entry_new());                                context.entry);
1479    
1480    if(appdata->search_str)    if(appdata->search_str)
1481      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1482    
# Line 1336  cb_menu_search(GtkWidget *window, gpoint Line 1487  cb_menu_search(GtkWidget *window, gpoint
1487    
1488    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1489    
1490    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1491    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_finds),    check_button_set_active(context.in_finds, appdata->search & SEARCH_FINDS);
                                appdata->search & SEARCH_FINDS);  
1492    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
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 1370  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(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1519        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1520      else      else
1521        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1522    
1523      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1524        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1525      else      else
1526        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1527    
1528      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1529        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1530      else      else
1531        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1532    
1533      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1534        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1535      else      else
1536        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1537    
1538      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1539        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1540      else      else
1541        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1411  cb_menu_search(GtkWidget *window, gpoint Line 1548  cb_menu_search(GtkWidget *window, gpoint
1548    
1549        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1550    
1551  #ifndef USE_BREAD_CRUMB_TRAIL  #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 1507  cb_menu_export_log(GtkWidget *widget, gp Line 1649  cb_menu_export_log(GtkWidget *widget, gp
1649    notes_log_export(appdata);    notes_log_export(appdata);
1650  }  }
1651    
1652  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1653  static void  static void
1654  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1655    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1543  cb_menu_precpos(GtkWidget *window, gpoin Line 1685  cb_menu_precpos(GtkWidget *window, gpoin
1685    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1686  }  }
1687    
1688    static void
1689    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1690      geotoad((appdata_t *)data);
1691    }
1692    
1693  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1694  typedef struct {  typedef struct {
1695    char *label, *desc;    char *label, *desc;
# Line 1626  static void submenu_cleanup(GtkWidget *m Line 1773  static void submenu_cleanup(GtkWidget *m
1773  }  }
1774    
1775  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1776    #ifdef ENABLE_MAEMO_MAPPER
1777    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1778      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1779    #endif
1780    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1781      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1782    { "Export Garmin GPX",       "Save modified waypoints in GPX file",    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
# Line 1655  static const menu_entry_t submenu_tools_ Line 1804  static const menu_entry_t submenu_tools_
1804      G_CALLBACK(cb_menu_geotext) },      G_CALLBACK(cb_menu_geotext) },
1805    { "Precise Position", "Calculate a precise GPS position",    { "Precise Position", "Calculate a precise GPS position",
1806      G_CALLBACK(cb_menu_precpos) },      G_CALLBACK(cb_menu_precpos) },
1807      { "GeoToad",          "Use GeoToad online downloader",
1808        G_CALLBACK(cb_menu_geotoad) },
1809    { NULL, NULL, NULL }    { NULL, NULL, NULL }
1810  };  };
1811    
# Line 1701  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 1714  HildonAppMenu *menu_create(appdata_t *ap Line 1869  HildonAppMenu *menu_create(appdata_t *ap
1869    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1870    
1871  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
   if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {  
1872      button = gtk_button_new_with_label(_("Map"));      button = gtk_button_new_with_label(_("Map"));
1873      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1874                             G_CALLBACK(cb_menu_map), appdata);                             G_CALLBACK(cb_menu_map), appdata);
1875      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1876  #endif  #endif
1877    
1878  #ifdef HILDON_HELP  #ifdef HILDON_HELP
# Line 1739  void menu_create(appdata_t *appdata) { Line 1892  void menu_create(appdata_t *appdata) {
1892    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1893    menu = gtk_menu_new();    menu = gtk_menu_new();
1894    
1895  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1896    appdata->menu_import =    appdata->menu_import =
1897  #endif  #endif
1898    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1769  void menu_create(appdata_t *appdata) { Line 1922  void menu_create(appdata_t *appdata) {
1922    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1923  #endif  #endif
1924    
1925  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1926    appdata->menu_export =    appdata->menu_export =
1927  #endif  #endif
1928      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1777  void menu_create(appdata_t *appdata) { Line 1930  void menu_create(appdata_t *appdata) {
1930    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1931    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1932    
1933  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1934    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1935    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1936    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1794  void menu_create(appdata_t *appdata) { Line 1947  void menu_create(appdata_t *appdata) {
1947    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1948                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1949    
1950  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1951    appdata->menu_search =    appdata->menu_search =
1952  #endif  #endif
1953    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1803  void menu_create(appdata_t *appdata) { Line 1956  void menu_create(appdata_t *appdata) {
1956    
1957    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1958    
 #ifndef NO_COPY_N_PASTE  
1959    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1960    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1961    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1962    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1963    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1834  void menu_create(appdata_t *appdata) { Line 1984  void menu_create(appdata_t *appdata) {
1984    
1985    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1986    
   item = gtk_menu_item_new_with_label(_("Tools"));  
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
   submenu = gtk_menu_new();  
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);  
   
1987  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
1988    item = gtk_menu_item_new_with_label( _("Map") );    item = gtk_menu_item_new_with_label( _("Map") );
1989    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1990    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1991                     GTK_SIGNAL_FUNC(cb_menu_map), appdata);                     GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1992  #endif  #endif
1993    
1994      item = gtk_menu_item_new_with_label(_("Tools"));
1995      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1996      submenu = gtk_menu_new();
1997      gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1998    
1999    item = gtk_menu_item_new_with_label( _("Geomath") );    item = gtk_menu_item_new_with_label( _("Geomath") );
2000    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2001    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1861  void menu_create(appdata_t *appdata) { Line 2011  void menu_create(appdata_t *appdata) {
2011    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2012                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2013    
2014      item = gtk_menu_item_new_with_label( _("GeoToad") );
2015      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2016      g_signal_connect(item, "activate",
2017                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2018    
2019    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2020    
2021  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1900  void menu_create(appdata_t *appdata) { Line 2055  void menu_create(appdata_t *appdata) {
2055  /********************* end of menu **********************/  /********************* end of menu **********************/
2056    
2057  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2058      gconf_save_state(appdata);
2059    
2060    gpx_free_all(appdata->gpx);    gpx_free_all(appdata->gpx);
2061    if(appdata->path) free(appdata->path);  
2062    if(appdata->image_path) free(appdata->image_path);  #ifdef ESPEAK
2063    if(appdata->search_str) free(appdata->search_str);    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);
# Line 1914  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 1941  void cleanup(appdata_t *appdata) { Line 2099  void cleanup(appdata_t *appdata) {
2099  static void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2100    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2101    
   gconf_save_state(appdata);  
2102    gtk_main_quit();    gtk_main_quit();
2103    appdata->window = NULL;    appdata->window = NULL;
2104  }  }
# Line 2001  gboolean on_window_key_press(GtkWidget * Line 2158  gboolean on_window_key_press(GtkWidget *
2158    return handled;    return handled;
2159  }  }
2160    
2161  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2162  typedef struct {  typedef struct {
2163    int level;    int level;
2164    appdata_t *appdata;    appdata_t *appdata;
# Line 2093  crumb_back(gpointer data) { Line 2250  crumb_back(gpointer data) {
2250    
2251    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2252    g_free(data);    g_free(data);
2253    
2254    #ifdef ENABLE_OSM_GPS_MAP
2255      map_update(crumb->appdata);
2256    #endif
2257  }  }
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 2133  static void crumb_add(appdata_t *appdata Line 2294  static void crumb_add(appdata_t *appdata
2294  #endif  #endif
2295    }    }
2296    
2297    #ifdef USE_BREAD_CRUMB_TRAIL
2298    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2299                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2300    #else
2301      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2302    #endif
2303    
2304    #ifdef ENABLE_OSM_GPS_MAP
2305      map_update(appdata);
2306    #endif
2307  }  }
2308  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2309    
# Line 2146  void main_after_settings_redraw(appdata_ Line 2315  void main_after_settings_redraw(appdata_
2315      return;      return;
2316    }    }
2317    
 #ifndef USE_MAEMO  
   // in non-maemo setup this can only affect the main screen as  
   // the menu is blocked while a dialog is open. also the main  
   // screen is always present  
   if(appdata->gpxlist_items != appdata->cur_items) {  
     /* re-do the main screen */  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   }  
 #else  
2318    /* a cache screen cannot be changed from the settings and thus doesn't */    /* a cache screen cannot be changed from the settings and thus doesn't */
2319    /* need to be redrawn */    /* need to be redrawn */
2320    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2181  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 2204  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    }    }
 #endif // USE_MAEMO  
2372  }  }
2373    
2374  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2233  int main(int argc, char *argv[]) { Line 2389  int main(int argc, char *argv[]) {
2389    
2390    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2391    
2392      misc_init();
2393    
2394      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 2241  int main(int argc, char *argv[]) { Line 2427  int main(int argc, char *argv[]) {
2427      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2428    }    }
2429    
2430    #ifdef ENABLE_MAEMO_MAPPER
2431    dbus_register(&appdata);    dbus_register(&appdata);
2432  #endif  #endif
2433    #endif
2434    
2435    icons_init();    icons_init();
2436    
# Line 2266  int main(int argc, char *argv[]) { Line 2454  int main(int argc, char *argv[]) {
2454    /* Create a Window. */    /* Create a Window. */
2455    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2456    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2457    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2458  #endif  #endif
2459    
2460  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2279  int main(int argc, char *argv[]) { Line 2467  int main(int argc, char *argv[]) {
2467    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2468                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2469    
2470      /* prepare clipboard */
2471      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2472      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 2294  int main(int argc, char *argv[]) { Line 2486  int main(int argc, char *argv[]) {
2486    gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2487    
2488    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2489    #else
2490    #ifdef BCT
2491      /* on non-hildon machines we use some custom made breadcrumbtrail */
2492      /* replacement */
2493      appdata.bct = bct_new();
2494      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2495    #endif
2496    #endif
2497    
2498    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2499    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2500  #endif  #endif
2501    
# Line 2304  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.45  
changed lines
  Added in v.249