Diff of /trunk/src/main.c

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

revision 7 by harbaum, Thu Jun 25 15:24:24 2009 UTC revision 244 by harbaum, Tue Dec 15 19:54:04 2009 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 29  Line 33 
33    
34  #ifdef USE_MAEMO  #ifdef USE_MAEMO
35  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
36    #if MAEMO_VERSION_MAJOR >= 5
37    #include <hildon/hildon-note.h>
38    #include <hildon/hildon-entry.h>
39    #endif
40  #endif  #endif
41    
42  #include <locale.h>  #include <locale.h>
43    
44  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
45    
46  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
47  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
48                        gpointer user_data);                        gpointer user_data);
49    
# Line 92  void errorf(const char *fmt, ...) { Line 100  void errorf(const char *fmt, ...) {
100      }      }
101    }    }
102    
103    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
104    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
105                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
106                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
107                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,                             GTK_MESSAGE_ERROR,
108                             buf);                             GTK_BUTTONS_CLOSE, buf);
109    
110    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
111    #else
112      GtkWidget *dialog =
113        hildon_note_new_information(GTK_WINDOW(NULL), buf);
114    #endif
115    
116    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
117    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 120  gpx_t *choose_file(appdata_t *appdata, g Line 133  gpx_t *choose_file(appdata_t *appdata, g
133                   HELP_ID_IMPORT, appdata->osso_context);                   HELP_ID_IMPORT, appdata->osso_context);
134  #endif  #endif
135  #else  #else
136    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Open Directory"):    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Import directory"):
137                                          _("Open File"),                                          _("Import file"),
138                          GTK_WINDOW(appdata->window),                          GTK_WINDOW(appdata->window),
139                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :
140                                          GTK_FILE_CHOOSER_ACTION_OPEN,                                          GTK_FILE_CHOOSER_ACTION_OPEN,
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 151  gpx_t *choose_file(appdata_t *appdata, g
151    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
152    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
153      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
154    
155        if(filename) {
156          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
157    
158      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
159            gpx = gpx_parse(dialog, filename, appdata->username);
160      if(!whole_dir)        else {
161        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
162      else {          if(strlastchr(filename) == '/')
163        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
164        if(strlastchr(filename) == '/')  
165          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 = '/';  
166        }        }
167    
168        if(whole_dir)        gpx_busy_dialog_destroy(dialog);
169          appdata->path = strdup(filename);  
170      }        /* save path if gpx was successfully loaded */
171          if(gpx) {
172            char *r = strrchr(filename, '/');
173    
174            /* there is a delimiter, use everything left of it as path */
175            if(r && !whole_dir) {
176              *r = 0;
177              if(appdata->path) free(appdata->path);
178              appdata->path = strdup(filename);
179              /* restore path ... just in case ... */
180              *r = '/';
181            }
182    
183            if(whole_dir)
184              appdata->path = strdup(filename);
185          } else
186            errorf(_("Load error"));
187    
188      g_free (filename);        g_free (filename);
189        } else {
190    #ifndef USE_MAEMO
191          errorf(_("Error accessing the file."));
192    #else
193          errorf(_("Error accessing the file. This may happen if the file "
194                   "resides on a remote file system. Please copy the file onto "
195                   "the device (e.g. onto the memory card) and try again."));
196    #endif
197        }
198    }    }
199    
200    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 194  enum { Line 218  enum {
218    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
219  } ;  } ;
220    
221  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
222    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
223        cache_dialog(appdata, cache);
224    #else
225        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
226    
227        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
228        appdata->cur_view = cache_view(appdata, cache);
229        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
230        gtk_widget_show_all(appdata->vbox);
231    #endif
232    }
233    
234    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
235                                     GtkTreePath        *path,                                     GtkTreePath        *path,
236                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
237                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 239  void cachelist_view_onRowActivated(GtkTr
239    GtkTreeIter   iter;    GtkTreeIter   iter;
240    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
241    
242    #ifdef USE_MAEMO
243      /* check if a cache is already selected and ignore click if yes */
244      /* (was probably a double click) */
245      if(appdata->cur_cache) return;
246    #endif
247    
248    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
249      cache_t *cache;      cache_t *cache;
250      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
251  #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  
252    }    }
253  }  }
254    
# Line 222  typedef struct { Line 256  typedef struct {
256    appdata_t *appdata;    appdata_t *appdata;
257    GtkTreePath *path;    GtkTreePath *path;
258    gboolean done;    gboolean done;
259  } cachelist_expose_t;  } cachelist_context_t;
260    
261  static gboolean cachelist_expose(GtkWidget *widget, GdkEventExpose *event,  static gboolean cachelist_expose(GtkWidget *widget, GdkEventExpose *event,
262                                   gpointer user_data) {                                   gpointer user_data) {
263    cachelist_expose_t *ce = (cachelist_expose_t*)user_data;    cachelist_context_t *ce = (cachelist_context_t*)user_data;
264    
265    if(event->type == GDK_EXPOSE) {    if(event->type == GDK_EXPOSE) {
266      if(ce->path && !ce->done) {      if(ce->path && !ce->done) {
# Line 241  static gboolean cachelist_expose(GtkWidg Line 275  static gboolean cachelist_expose(GtkWidg
275  }  }
276    
277  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;  
278    
279    printf("cachelist timer removed\n");    guint handler_id =
280    g_assert(ce->appdata->cachelist_handler_id);      (guint)g_object_get_data(G_OBJECT(user_data), "handler_id");
281    gtk_timeout_remove(ce->appdata->cachelist_handler_id);  
282    ce->appdata->cachelist_handler_id = 0;    if(handler_id) {
283        gtk_timeout_remove(handler_id);
284        g_object_set_data(G_OBJECT(user_data), "handler_id", NULL);
285    
286        printf("cachelist timer removed\n");
287      }
288    
289      gpointer *ce =
290        g_object_get_data(G_OBJECT(user_data), "ce");
291      g_assert(ce);
292    
293    free(user_data);    free(ce);
294  }  }
295    
296  #define CACHELIST_UPDATE_TIMEOUT (30000)  #define CACHELIST_UPDATE_TIMEOUT (30000)
# Line 257  static GtkWidget *cachelist_create(appda Line 299  static GtkWidget *cachelist_create(appda
299                                     cache_t *sel_cache);                                     cache_t *sel_cache);
300    
301  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
302  #ifndef USE_MAEMO    printf("redrawing cachelist\n");
303    //  gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
304    //  appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);    if(!appdata->cur_view) {
305    //  gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);      printf("cachelist redraw: no active view\n");
306    // gtk_widget_show_all(appdata->vbox);      return;
307  #else    }
308    
309    g_assert(!appdata->cur_cache);    g_assert(!appdata->cur_cache);
310    int redraw = 0;    int redraw = 0;
# Line 274  void cachelist_redraw(appdata_t *appdata Line 316  void cachelist_redraw(appdata_t *appdata
316    }    }
317    
318    if(redraw) {    if(redraw) {
319      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
320        HildonWindowStack *stack = hildon_window_stack_get_default();
321        GtkWidget *container = hildon_window_stack_peek(stack);
322    #else
323        GtkWidget *container = appdata->vbox;
324    #endif
325    
326        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
327      switch(redraw) {      switch(redraw) {
328      case 1:      case 1:
329        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 286  void cachelist_redraw(appdata_t *appdata Line 335  void cachelist_redraw(appdata_t *appdata
335        break;        break;
336      }      }
337    
338      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
339      gtk_widget_show_all(appdata->vbox);      gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
340    }  #else
341        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
342  #endif  #endif
343    
344        gtk_widget_show_all(container);
345      }
346  }  }
347    
348    
349  static gboolean cachelist_update(gpointer data) {  static gboolean cachelist_update(gpointer data) {
350      appdata_t *appdata =
351        (appdata_t*)g_object_get_data(G_OBJECT(data), "appdata");
352      g_assert(appdata);
353    
354    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
355    
356  #ifdef USE_MAEMO    /* check if the widget the timer fired for is the currently */
357    appdata_t *appdata = (appdata_t*)data;    /* visible one (if a search result is being shown, a cachlist */
358      /* may also be present below it) */
359      if(appdata->cur_view != data) {
360        printf("-> widget is not the one currently on top, don't redraw\n");
361        return TRUE;
362      }
363    
364      if(appdata->cur_cache)
365        return TRUE;
366    
367    #ifdef USE_MAEMO
368    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
369      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
370        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
371    #endif
372    
373    if(appdata->cachelist_update)    if(appdata->cachelist_update)
374      cachelist_redraw(appdata);      cachelist_redraw(appdata);
375  #endif    else
376        printf("update disabled\n");
377    
378    return TRUE;    return TRUE;
379  }  }
380    
381  static void cachelist_timer_reset(appdata_t *appdata) {  static void cachelist_timer_reset(GtkWidget *widget) {
382    g_assert(appdata->cachelist_handler_id);    guint handler_id =
383    gtk_timeout_remove(appdata->cachelist_handler_id);      (guint)g_object_get_data(G_OBJECT(widget), "handler_id");
384    appdata->cachelist_handler_id =    g_assert(handler_id);
385      gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, appdata);  
386      appdata_t *appdata =
387        (appdata_t*)g_object_get_data(G_OBJECT(widget), "appdata");
388      g_assert(appdata);
389    
390      printf("cachelist timer reset\n");
391      gtk_timeout_remove(handler_id);
392      g_object_set_data(G_OBJECT(widget), "handler_id", (gpointer)
393        gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, widget));
394  }  }
395    
396  static gboolean cachelist_update_reset0(GtkWidget *widget,  static gboolean cachelist_update_reset0(GtkWidget *widget,
397                                          GdkEventButton *event,                                          GdkEventButton *event,
398                                          gpointer user_data) {                                          gpointer user_data) {
399    cachelist_timer_reset((appdata_t*)user_data);    cachelist_timer_reset(GTK_WIDGET(user_data));
400    return FALSE;    return FALSE;
401  }  }
402    
403  static void cachelist_update_reset1(GtkAdjustment *adj,  static void cachelist_update_reset1(GtkAdjustment *adj,
404                                      gpointer user_data) {                                      gpointer user_data) {
405    cachelist_timer_reset((appdata_t*)user_data);    cachelist_timer_reset(GTK_WIDGET(user_data));
406  }  }
407    
408    static gboolean on_cachelist_focus_in(GtkWidget *widget, GdkEventFocus *event,
409                                          gpointer data) {
410    
411    
412      /* we don't want a runnign timer yet */
413      if(!g_object_get_data(G_OBJECT(data), "handler_id")) {
414        printf("focus received: restarting cachelist timer\n");
415    
416        appdata_t *appdata =
417          (appdata_t*)g_object_get_data(G_OBJECT(data), "appdata");
418        g_assert(appdata);
419    
420        g_object_set_data(G_OBJECT(data), "handler_id", (gpointer)
421          gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, data));
422      }
423    
424      return FALSE;
425    }
426    
427    static gboolean on_cachelist_focus_out(GtkWidget *widget, GdkEventFocus *event,
428                                           gpointer data) {
429    
430      guint handler_id =
431        (guint)g_object_get_data(G_OBJECT(data), "handler_id");
432      g_assert(handler_id);
433    
434      gtk_timeout_remove(handler_id);
435      g_object_set_data(G_OBJECT(data), "handler_id", NULL);
436    
437      printf("focus lost: cachelist timer removed\n");
438    
439      return FALSE;
440    }
441    
442  static GtkWidget *cachelist_create(appdata_t *appdata, gpx_t *gpx,  static GtkWidget *cachelist_create(appdata_t *appdata, gpx_t *gpx,
443                                     cache_t *sel_cache) {                                     cache_t *sel_cache) {
444    GtkCellRenderer *renderer;    GtkCellRenderer *renderer;
# Line 427  static GtkWidget *cachelist_create(appda Line 536  static GtkWidget *cachelist_create(appda
536      if(tint > 8) tint = 8;      if(tint > 8) tint = 8;
537    
538      /* cache type includes "solved" flag in lowest bit */      /* cache type includes "solved" flag in lowest bit */
539      int type = (cache->type<<8) +      int type = cache->type<<8;
540        (cache->notes?4:0) +      if(cache->notes) type |= 4;
541        ((cache->notes && cache->notes->override)?1:0) +      if(cache->notes && cache->notes->override) type |= 1;
542        ((cache->notes && cache->notes->found)?2:0);      if(cache->notes && cache->notes->found) type |= 2;
543        if(cache->found) type |= 2;
544        if(cache->mine) type |= 8;
545    
546      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
547    
# Line 473  static GtkWidget *cachelist_create(appda Line 584  static GtkWidget *cachelist_create(appda
584    g_signal_connect(view, "row-activated",    g_signal_connect(view, "row-activated",
585                     (GCallback)cachelist_view_onRowActivated, appdata);                     (GCallback)cachelist_view_onRowActivated, appdata);
586    
587    cachelist_expose_t *ce = malloc(sizeof(cachelist_expose_t));    cachelist_context_t *ce = g_new0(cachelist_context_t, 1);
588    ce->appdata = appdata;    ce->appdata = appdata;
589    ce->path = path;    ce->path = path;
590    ce->done = FALSE;    ce->done = FALSE;
591    
592    g_signal_connect(view, "expose-event",    g_signal_connect(view, "expose-event",
593                     (GCallback)cachelist_expose, ce);                     (GCallback)cachelist_expose, ce);
   g_signal_connect(view, "destroy",  
                    (GCallback)cachelist_destroy, ce);  
594    
595    /* put this inside a scrolled view */    /* put this inside a scrolled view */
596  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
597    GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);    GtkWidget *container = gtk_scrolled_window_new (NULL, NULL);
598    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(container),
599                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
600    gtk_container_add(GTK_CONTAINER(scrolled_window), view);    gtk_container_add(GTK_CONTAINER(container), view);
601  #else  #else
602    GtkWidget *pannable_area = hildon_pannable_area_new();    GtkWidget *container = hildon_pannable_area_new();
603      gtk_container_add(GTK_CONTAINER(container), view);
   gtk_container_add(GTK_CONTAINER(pannable_area), view);  
604  #endif  #endif
605    
606    /* add a timer for automatic update */    g_signal_connect(view, "destroy",
607    g_assert(!appdata->cachelist_handler_id);                     (GCallback)cachelist_destroy, container);
   appdata->cachelist_handler_id =  
     gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, appdata);  
608    
609    /* update timer is being reset if the user scrolls or selects */    /* update timer is being reset if the user scrolls or selects */
610    g_signal_connect(view, "button-press-event",    g_signal_connect(view, "button-press-event",
611                     (GCallback)cachelist_update_reset0, appdata);                     (GCallback)cachelist_update_reset0, container);
612    
613      /* add a timer for automatic update */
614      g_object_set_data(G_OBJECT(container), "handler_id", (gpointer)
615        gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, container));
616    
617      printf("cachelist timer created\n");
618    
619      g_object_set_data(G_OBJECT(container), "appdata", (gpointer)appdata);
620    
621      g_object_set_data(G_OBJECT(container), "ce", (gpointer)ce);
622    
623      /* the timer is removed and re-enabled on every focus change event */
624      /* for the main top window */
625      //  GtkWidget *root = gtk_widget_get_toplevel(GTK_WIDGET(button)))
626    
627      g_signal_connect(G_OBJECT(view), "focus-in-event",
628                       G_CALLBACK(on_cachelist_focus_in), container);
629    
630      g_signal_connect(G_OBJECT(view), "focus-out-event",
631                       G_CALLBACK(on_cachelist_focus_out), container);
632    
633  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
634    g_signal_connect(gtk_scrolled_window_get_vadjustment(    g_signal_connect(gtk_scrolled_window_get_vadjustment(
635                         GTK_SCROLLED_WINDOW(scrolled_window)),                 GTK_SCROLLED_WINDOW(container)),
636                             "value-changed",                 "value-changed",
637                             (GCallback)cachelist_update_reset1, appdata);                 (GCallback)cachelist_update_reset1, container);
   
   return scrolled_window;  
638  #else  #else
639    g_signal_connect(hildon_pannable_area_get_vadjustment(    g_signal_connect(hildon_pannable_area_get_vadjustment(
640                         HILDON_PANNABLE_AREA(pannable_area)),                 HILDON_PANNABLE_AREA(container)),
641                             "value-changed",                 "value-changed",
642                             (GCallback)cachelist_update_reset1, appdata);                 (GCallback)cachelist_update_reset1, container);
   
643    
   return pannable_area;  
644  #endif  #endif
645      return container;
646  }  }
647    
648  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 543  void cachelist_dialog(appdata_t *appdata Line 666  void cachelist_dialog(appdata_t *appdata
666  }  }
667  #else  #else
668  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
669    static void search_result_free(gpx_t *result);
670    
671    void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
672      printf("cachelist destroy\n");
673    
674      HildonWindowStack *stack = hildon_window_stack_get_default();
675      appdata->window = HILDON_WINDOW(hildon_window_stack_peek(stack));
676    
677      if(appdata->search_results) {
678        search_result_free(appdata->search_results);
679        appdata->search_results = NULL;
680      }
681      appdata->cur_gpx = NULL;
682    
683    #ifdef ENABLE_OSM_GPS_MAP
684      map_update(appdata);
685    #endif
686    
687      /* restore cur_view */
688      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
689    }
690    
691  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
692    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
693      appdata->window = HILDON_WINDOW(window);
694    
695      /* store last "cur_view" in window */
696      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
697    
698      appdata->cur_gpx = gpx;
699    gtk_window_set_title(GTK_WINDOW(window), gpx->name);    gtk_window_set_title(GTK_WINDOW(window), gpx->name);
700    
701    gtk_container_add(GTK_CONTAINER(window),    appdata->cur_view = cachelist_create(appdata, gpx, NULL);
702                      cachelist_create(appdata, gpx, NULL));    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
703    
704    
705    hildon_window_set_app_menu(HILDON_WINDOW(window),    hildon_window_set_app_menu(HILDON_WINDOW(window),
706                               menu_create(appdata, MENU_CACHELIST));                               menu_create(appdata, MENU_CACHELIST));
707    
708      g_signal_connect(G_OBJECT(window), "destroy",
709                       G_CALLBACK(on_cachelist_destroy), appdata);
710    
711    gtk_widget_show_all(window);    gtk_widget_show_all(window);
712    
713    #ifdef ENABLE_OSM_GPS_MAP
714      map_update(appdata);
715    #endif
716  }  }
717  #endif  #endif
718  #endif  #endif
# Line 587  static GdkPixbuf *gpx_icon_get(gpx_t *gp Line 745  static GdkPixbuf *gpx_icon_get(gpx_t *gp
745    return icon_get(ICON_FILE, 0);    return icon_get(ICON_FILE, 0);
746  }  }
747    
748  static void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {  void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {
749    char date_str[32], cnum[32];    char date_str[32], cnum[32];
750    
751    if(gpx->year && gpx->month && gpx->day) {    if(gpx->year && gpx->month && gpx->day) {
# Line 612  static void gpxlist_set(GtkListStore *st Line 770  static void gpxlist_set(GtkListStore *st
770                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
771                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
772  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
773                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 2),
774  #endif  #endif
775                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
776                       -1);                       -1);
# Line 658  static void gpxlist_close(appdata_t *app Line 816  static void gpxlist_close(appdata_t *app
816    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
817  }  }
818    
819    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
820    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
821    #ifdef USE_STACKABLE_WINDOW
822      if(!appdata->cur_gpx)
823    #endif
824        cachelist_dialog(appdata, gpx);
825    #ifdef USE_STACKABLE_WINDOW
826      else
827        printf("selected gpx, but cachelist window already present\n");
828    #endif
829    #else
830      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
831      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
832      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
833      gtk_widget_show_all(appdata->vbox);
834    
835      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
836    #endif
837    }
838    
839  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
840                            GtkTreePath        *path,                            GtkTreePath        *path,
841                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 666  static void gpxlist_view_onRowActivated( Line 844  static void gpxlist_view_onRowActivated(
844    GtkTreeIter   iter;    GtkTreeIter   iter;
845    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
846    
847    #ifdef USE_MAEMO
848      /* check if a cache is already selected and ignore click if yes */
849      /* (was probably a double click) */
850      if(appdata->cur_gpx) return;
851    #endif
852    
853    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
854      gpx_t *gpx;      gpx_t *gpx;
855      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 678  static void gpxlist_view_onRowActivated( Line 862  static void gpxlist_view_onRowActivated(
862      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
863        printf("clicked delete\n");        printf("clicked delete\n");
864    
865    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
866        /* ask user what he wants */        /* ask user what he wants */
867        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
868                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
869                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
870                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   GTK_MESSAGE_QUESTION,
871                     GTK_BUTTONS_CANCEL,
872                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
873                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
874    
# Line 691  static void gpxlist_view_onRowActivated( Line 877  static void gpxlist_view_onRowActivated(
877                               _("Close"), 2,                               _("Close"), 2,
878                               NULL);                               NULL);
879    
880          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
881    #else
882    
883          GtkWidget *dialog =
884            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
885                                GTK_WINDOW(appdata->window),
886                                GTK_DIALOG_DESTROY_WITH_PARENT,
887                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
888                                _("Remove"), 1,
889                                _("Close"), 2,
890                                NULL);
891    
892          GtkWidget *content_area =
893            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
894    
895          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
896    
897          GtkWidget *label = gtk_label_new(
898                      _("Do you want to close this entry only or do "
899                        "you want to remove it completely from the list?"));
900    
901          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
902          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
903    
904          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
905          gtk_container_add (GTK_CONTAINER (content_area), hbox);
906    
907          gtk_widget_show_all (dialog);
908    #endif
909    
910        if(gpx->closed)        if(gpx->closed)
911          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
912    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));  
   
913        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
914        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
915    
# Line 725  static void gpxlist_view_onRowActivated( Line 939  static void gpxlist_view_onRowActivated(
939          gpx_t *new = NULL;          gpx_t *new = NULL;
940    
941          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
942            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
943          else          else
944            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
945    
946          if(new) {          if(new) {
947            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 763  static void gpxlist_view_onRowActivated( Line 977  static void gpxlist_view_onRowActivated(
977    
978          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
979        }        }
980  #ifndef USE_BREAD_CRUMB_TRAIL  
981        cachelist_dialog(appdata, gpx);        gpxlist_goto_cachelist(appdata, gpx);
 #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  
982      }      }
983    }    }
984  }  }
985    
986    /* search gpx file in gpx list */
987    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx) {
988      GtkTreeModel *model =
989        gtk_tree_view_get_model(GTK_TREE_VIEW(appdata->gpxview));
990    
991      gboolean found =
992        gtk_tree_model_get_iter_first(model, iter);
993    
994      while(found) {
995        gpx_t *this_gpx;
996        gtk_tree_model_get(model, iter, GPXLIST_COL_DATA, &this_gpx, -1);
997    
998        if(gpx == this_gpx)
999          return TRUE;
1000    
1001        found = gtk_tree_model_iter_next(model, iter);
1002      }
1003    
1004      return FALSE;
1005    }
1006    
1007    
1008  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
1009  static gboolean  static gboolean
1010  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
# Line 815  static GtkWidget *gpxlist_create_view_an Line 1043  static GtkWidget *gpxlist_create_view_an
1043    
1044    appdata->gpxview = gtk_tree_view_new ();    appdata->gpxview = gtk_tree_view_new ();
1045    
1046      printf("building gpx list, items = %d\n", appdata->gpxlist_items);
1047    
1048    GtkTreeSelection *selection =    GtkTreeSelection *selection =
1049      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1050  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
# Line 827  static GtkWidget *gpxlist_create_view_an Line 1057  static GtkWidget *gpxlist_create_view_an
1057    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1058                    -1, "Icon", renderer,                    -1, "Icon", renderer,
1059                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
1060                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
1061            /* at least one entry needs to be sensitive. */
1062            /* This is the delete icon if the PANNABLE_AREA is used */
1063                      "sensitive", GPXLIST_COL_OPEN,
1064    #endif
1065                    NULL);                    NULL);
1066    
1067    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 883  static GtkWidget *gpxlist_create_view_an Line 1117  static GtkWidget *gpxlist_create_view_an
1117    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1118                    -1, "Del", renderer,                    -1, "Del", renderer,
1119                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
1120                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
1121                    NULL);                    NULL);
1122  #endif  #endif
1123    
# Line 903  static GtkWidget *gpxlist_create_view_an Line 1137  static GtkWidget *gpxlist_create_view_an
1137      GtkTreeIter         iter;      GtkTreeIter         iter;
1138      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1139      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1140    
1141      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1142        sel_iter = iter;        sel_iter = iter;
1143        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 947  static GtkWidget *gpxlist_create_view_an Line 1181  static GtkWidget *gpxlist_create_view_an
1181  }  }
1182    
1183  /* add last entry in gpx list to visual representation */  /* add last entry in gpx list to visual representation */
1184  static void gpxlist_add(appdata_t *appdata, gpx_t *new) {  void gpxlist_add(appdata_t *appdata, gpx_t *new) {
1185    GtkTreeIter         iter;    GtkTreeIter         iter;
1186    
1187    gtk_list_store_append(appdata->gpxstore, &iter);    gtk_list_store_append(appdata->gpxstore, &iter);
# Line 957  static void gpxlist_add(appdata_t *appda Line 1191  static void gpxlist_add(appdata_t *appda
1191    gpx_t **gpx = &appdata->gpx;    gpx_t **gpx = &appdata->gpx;
1192    while(*gpx) gpx = &((*gpx)->next);    while(*gpx) gpx = &((*gpx)->next);
1193    *gpx = new;    *gpx = new;
1194    
1195      /* select new iter */
1196      GtkTreeSelection *selection =
1197        gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1198      gtk_tree_selection_select_iter(selection, &iter);
1199      GtkTreePath *path =
1200        gtk_tree_model_get_path(GTK_TREE_MODEL(appdata->gpxstore), &iter);
1201      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(appdata->gpxview),
1202                                   path, NULL, TRUE, 0.0, 0.0);
1203      gtk_tree_path_free(path);
1204  }  }
1205    
1206  /******************** end of gpxlist ********************/  /******************** end of gpxlist ********************/
# Line 965  static void gpxlist_add(appdata_t *appda Line 1209  static void gpxlist_add(appdata_t *appda
1209    
1210  static void  static void
1211  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1212    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);  
   gtk_about_dialog_set_copyright(about,  
          _("GPXView (c) 2008 by\n"  
          "Till Harbaum <till@harbaum.org>\n"  
          "Geocaching.com: Tantil"));  
   
   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));  
1213  }  }
1214    
1215  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1154  gpx_t *search_do(appdata_t *appdata, gpx Line 1381  gpx_t *search_do(appdata_t *appdata, gpx
1381        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1382                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1383          hit = 1;          hit = 1;
1384        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1385                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1386          hit = 1;          hit = 1;
1387    
1388        if(hit) {        if(hit) {
# Line 1184  typedef struct { Line 1411  typedef struct {
1411    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1412  } search_context_t;  } search_context_t;
1413    
1414    
1415  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1416    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1417    
1418    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1419    
1420    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1421    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1218  cb_menu_search(GtkWidget *window, gpoint Line 1445  cb_menu_search(GtkWidget *window, gpoint
1445    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1446    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1447    
1448    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1449    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);  
1450    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);
1451    
1452    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1453    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);  
1454    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);
1455    
1456    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1457    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);  
1458    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);
1459    
1460    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1461    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);  
1462    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);
1463    
1464    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 1244  cb_menu_search(GtkWidget *window, gpoint Line 1467  cb_menu_search(GtkWidget *window, gpoint
1467    
1468    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1469                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1470      context.entry = entry_new();
1471    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1472                                context.entry = gtk_entry_new());                                context.entry);
1473    
1474    if(appdata->search_str)    if(appdata->search_str)
1475      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1476    
# Line 1256  cb_menu_search(GtkWidget *window, gpoint Line 1481  cb_menu_search(GtkWidget *window, gpoint
1481    
1482    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1483    
1484    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1485    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);  
1486    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1487    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1488                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
1489    
1490  #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  
1491    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.spinner);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.spinner);
1492    
1493    gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_label_new(_("days")));    gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_label_new(_("days")));
1494    
1495    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 1290  cb_menu_search(GtkWidget *window, gpoint Line 1507  cb_menu_search(GtkWidget *window, gpoint
1507      if(strlen(p) > 0)      if(strlen(p) > 0)
1508        appdata->search_str = strdup(p);        appdata->search_str = strdup(p);
1509    
1510  #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  
1511    
1512      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1513        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1514      else      else
1515        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1516    
1517      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1518        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1519      else      else
1520        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1521    
1522      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1523        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1524      else      else
1525        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1526    
1527      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1528        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1529      else      else
1530        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1531    
1532      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1533        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1534      else      else
1535        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1328  cb_menu_search(GtkWidget *window, gpoint Line 1539  cb_menu_search(GtkWidget *window, gpoint
1539      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1540      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1541          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1542    
1543        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1544    
1545  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1546        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);  
1547          if(appdata->cur_gpx)
1548            appdata->search_results =
1549              search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1550          else
1551            appdata->search_results =
1552              search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1553    
1554        /* do search result dialog here ... */        /* do search result dialog here ... */
1555        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, appdata->search_results);
1556        search_result_free(found);  
1557    #ifndef USE_STACKABLE_WINDOW
1558          search_result_free(appdata->search_results);
1559          appdata->search_results = NULL;
1560    #endif
1561  #else  #else
1562          gpx_t *found = NULL;
1563    
1564        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1565          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1566        else        else
# Line 1359  cb_menu_search(GtkWidget *window, gpoint Line 1581  cb_menu_search(GtkWidget *window, gpoint
1581      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1582  }  }
1583    
1584  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1585    
1586  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1587  static void  static void
# Line 1421  cb_menu_export_log(GtkWidget *widget, gp Line 1643  cb_menu_export_log(GtkWidget *widget, gp
1643    notes_log_export(appdata);    notes_log_export(appdata);
1644  }  }
1645    
1646  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1647  static void  static void
1648  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1649    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1435  cb_menu_export_garmin(GtkWidget *widget, Line 1657  cb_menu_export_garmin(GtkWidget *widget,
1657    garmin_export(appdata);    garmin_export(appdata);
1658  }  }
1659    
1660    #ifdef ENABLE_OSM_GPS_MAP
1661    static void
1662    cb_menu_map(GtkWidget *window, gpointer data) {
1663      map((appdata_t *)data);
1664    }
1665    #endif
1666    
1667  static void  static void
1668  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1669    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
# Line 1450  cb_menu_precpos(GtkWidget *window, gpoin Line 1679  cb_menu_precpos(GtkWidget *window, gpoin
1679    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1680  }  }
1681    
1682    static void
1683    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1684      geotoad((appdata_t *)data);
1685    }
1686    
1687  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1688    typedef struct {
1689      char *label, *desc;
1690      GtkSignalFunc activate_cb;
1691    } menu_entry_t;
1692    
1693  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  typedef struct {
1694    HildonStackableWindow *view_window;    const char *title;
1695    GtkWidget *but;    const menu_entry_t *menu;
1696      int len;
1697    } submenu_t;
1698    
1699    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());  #define COLUMNS  1
   gtk_window_set_title (GTK_WINDOW (view_window), "Export");  
1700    
1701    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));  void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1702    
1703    but = hildon_button_new_with_text(    /* force closing of submenu dialog */
1704              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1705              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    gtk_widget_hide(menu);
1706              _("Export to Maemo Mapper"),  
1707              _("Save a Maemo Mapper POI file"));    /* let gtk clean up */
1708    g_signal_connect(but, "clicked",    while(gtk_events_pending())
1709                     G_CALLBACK(cb_menu_export_mmpoi), appdata);      gtk_main_iteration();
1710    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  }
1711    
1712    static GtkWidget *app_submenu_create(appdata_t *appdata,
1713                                         const submenu_t *submenu) {
1714    
1715    but = hildon_button_new_with_text(    /* create a oridinary dialog box */
1716              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    GtkWidget *dialog = gtk_dialog_new();
1717              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1718              _("Export Field Notes"),    gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1719              _("Save a Garmin Field Notes file"));    gtk_window_set_transient_for(GTK_WINDOW(dialog),
1720    g_signal_connect(but, "clicked",                                 GTK_WINDOW(appdata->window));
1721                     G_CALLBACK(cb_menu_export_log), appdata);    gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1722    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1723      GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1724      int x = 0, y = 0;
1725    
1726      const menu_entry_t *menu_entries = submenu->menu;
1727      while(menu_entries->label) {
1728        GtkWidget *button = NULL;
1729    
1730    but = hildon_button_new_with_text(      button = hildon_button_new_with_text(
1731              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1732              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1733              _("Export Garmin GPX"),              _(menu_entries->label), _(menu_entries->desc));
1734              _("Save a GPX file containing modified waypoints"));  
1735    g_signal_connect(but, "clicked",      /* try to center both texts */
1736                     G_CALLBACK(cb_menu_export_garmin), appdata);      hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1737    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);      hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1738    
1739        g_signal_connect(button, "clicked",
1740                         G_CALLBACK(on_submenu_entry_clicked), dialog);
1741    
1742        g_signal_connect(button, "clicked",
1743                         menu_entries->activate_cb, appdata);
1744    
1745        gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1746    
1747        x++;
1748        if(x == COLUMNS) { x = 0; y++; }
1749    
1750        menu_entries++;
1751      }
1752    
1753    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1754    gtk_widget_show_all (GTK_WIDGET (view_window));  
1755      return dialog;
1756  }  }
1757    
1758  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  /* popup the dialog shaped submenu */
1759    HildonStackableWindow *view_window;  static void submenu_popup(GtkWidget *menu) {
1760    GtkWidget *but;    gtk_widget_show_all(menu);
1761      gtk_dialog_run(GTK_DIALOG(menu));
1762      gtk_widget_hide(menu);
1763    }
1764    
1765    static void submenu_cleanup(GtkWidget *menu) {
1766      gtk_widget_destroy(menu);
1767    }
1768    
1769    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());  static const menu_entry_t submenu_export_entries[] = {
1770    gtk_window_set_title (GTK_WINDOW (view_window), "Export");  #ifdef ENABLE_MAEMO_MAPPER
1771      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1772        G_CALLBACK(cb_menu_export_mmpoi)  },
1773    #endif
1774      { "Export Field Notes",      "Save a Garmin Field Notes file",
1775        G_CALLBACK(cb_menu_export_log)    },
1776      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1777        G_CALLBACK(cb_menu_export_garmin) },
1778      { NULL, NULL, NULL }
1779    };
1780    
1781    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));  static const submenu_t submenu_export = {
1782      "Export", submenu_export_entries,
1783      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1784    };
1785    
1786    but = hildon_button_new_with_text(  /* the export submenu */
1787              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1788              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    if(!appdata->export_menu)
1789              _("Geomath"),      appdata->export_menu = app_submenu_create(appdata, &submenu_export);
             _("Geocoordinate calculation"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_geomath), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1790    
1791      submenu_popup(appdata->export_menu);
1792    }
1793    
1794    but = hildon_button_new_with_text(  static const menu_entry_t submenu_tools_entries[] = {
1795              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    { "Geomath",          "Geocoordinate calculation",
1796              HILDON_BUTTON_ARRANGEMENT_VERTICAL,      G_CALLBACK(cb_menu_geomath) },
1797              _("Geotext"),    { "Geotext",          "Text analysis",
1798              _("Text analysis, letter counting etc"));      G_CALLBACK(cb_menu_geotext) },
1799    g_signal_connect(but, "clicked",    { "Precise Position", "Calculate a precise GPS position",
1800                     G_CALLBACK(cb_menu_geotext), appdata);      G_CALLBACK(cb_menu_precpos) },
1801    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);    { "GeoToad",          "Use GeoToad online downloader",
1802        G_CALLBACK(cb_menu_geotoad) },
1803      { NULL, NULL, NULL }
1804    };
1805    
1806    but = hildon_button_new_with_text(  static const submenu_t submenu_tools = {
1807              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    "Tools", submenu_tools_entries,
1808              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1809              _("Precise Position"),  };
             _("Calculate a very precise GPS position"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_precpos), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1810    
1811    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));  /* the tools submenu */
1812    gtk_widget_show_all (GTK_WIDGET (view_window));  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1813      if(!appdata->tools_menu)
1814        appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1815    
1816      submenu_popup(appdata->tools_menu);
1817  }  }
1818    
1819  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
# Line 1561  HildonAppMenu *menu_create(appdata_t *ap Line 1841  HildonAppMenu *menu_create(appdata_t *ap
1841      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1842                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1843      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1844    
   if(mode == MENU_GPXLIST) {  
1845      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1846      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1847                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
1848      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1849      }
1850    
1851      /* if search results exist, don't allow another search */
1852      if(!appdata->search_results &&
1853         ((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST))) {
1854      button = gtk_button_new_with_label(_("Search"));      button = gtk_button_new_with_label(_("Search"));
1855      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1856                             G_CALLBACK(cb_menu_search), appdata);                             G_CALLBACK(cb_menu_search), appdata);
# Line 1580  HildonAppMenu *menu_create(appdata_t *ap Line 1862  HildonAppMenu *menu_create(appdata_t *ap
1862                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1863    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1864    
1865    gtk_widget_show(GTK_WIDGET(menu));  #ifdef ENABLE_OSM_GPS_MAP
1866        button = gtk_button_new_with_label(_("Map"));
1867        g_signal_connect_after(button, "clicked",
1868                               G_CALLBACK(cb_menu_map), appdata);
1869        hildon_app_menu_append(menu, GTK_BUTTON(button));
1870    #endif
1871    
1872    #ifdef HILDON_HELP
1873      button = gtk_button_new_with_label(_("Help"));
1874      g_signal_connect_after(button, "clicked",
1875                             G_CALLBACK(cb_menu_help), appdata);
1876      hildon_app_menu_append(menu, GTK_BUTTON(button));
1877    #endif
1878    
1879      gtk_widget_show_all(GTK_WIDGET(menu));
1880    
1881    return menu;    return menu;
1882  }  }
# Line 1590  void menu_create(appdata_t *appdata) { Line 1886  void menu_create(appdata_t *appdata) {
1886    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1887    menu = gtk_menu_new();    menu = gtk_menu_new();
1888    
1889  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1890    appdata->menu_import =    appdata->menu_import =
1891  #endif  #endif
1892    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1620  void menu_create(appdata_t *appdata) { Line 1916  void menu_create(appdata_t *appdata) {
1916    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1917  #endif  #endif
1918    
1919  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1920    appdata->menu_export =    appdata->menu_export =
1921  #endif  #endif
1922      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1628  void menu_create(appdata_t *appdata) { Line 1924  void menu_create(appdata_t *appdata) {
1924    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1925    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1926    
1927  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1928    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1929    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1930    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1645  void menu_create(appdata_t *appdata) { Line 1941  void menu_create(appdata_t *appdata) {
1941    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1942                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1943    
1944  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1945    appdata->menu_search =    appdata->menu_search =
1946  #endif  #endif
1947    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1654  void menu_create(appdata_t *appdata) { Line 1950  void menu_create(appdata_t *appdata) {
1950    
1951    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1952    
 #ifndef NO_COPY_N_PASTE  
1953    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1954    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1955    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1956    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1957    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1685  void menu_create(appdata_t *appdata) { Line 1978  void menu_create(appdata_t *appdata) {
1978    
1979    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1980    
1981    #ifdef ENABLE_OSM_GPS_MAP
1982      item = gtk_menu_item_new_with_label( _("Map") );
1983      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1984      g_signal_connect(item, "activate",
1985                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1986    #endif
1987    
1988    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1989    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1990    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1705  void menu_create(appdata_t *appdata) { Line 2005  void menu_create(appdata_t *appdata) {
2005    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2006                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2007    
2008      item = gtk_menu_item_new_with_label( _("GeoToad") );
2009      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2010      g_signal_connect(item, "activate",
2011                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2012    
2013    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2014    
2015  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1744  void menu_create(appdata_t *appdata) { Line 2049  void menu_create(appdata_t *appdata) {
2049  /********************* end of menu **********************/  /********************* end of menu **********************/
2050    
2051  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2052      gconf_save_state(appdata);
2053    
2054    gpx_free_all(appdata->gpx);    gpx_free_all(appdata->gpx);
2055    if(appdata->path) free(appdata->path);  
2056    if(appdata->image_path) free(appdata->image_path);  #ifdef USE_STACKABLE_WINDOW
2057    if(appdata->search_str) free(appdata->search_str);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
2058      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
2059    #endif
2060    
2061    gnome_vfs_shutdown();    gnome_vfs_shutdown();
2062    icons_free();    icons_free();
2063    gps_release(appdata);    gps_release(appdata);
2064    
 #ifdef USE_MAEMO  
2065    if(appdata->search_results) {    if(appdata->search_results) {
2066      printf("freeing pending search\n");      printf("freeing pending search\n");
2067      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
2068    }    }
2069    
2070    #ifdef USE_MAEMO
2071    if(appdata->osso_context)    if(appdata->osso_context)
2072      osso_deinitialize(appdata->osso_context);      osso_deinitialize(appdata->osso_context);
2073    
# Line 1777  void cleanup(appdata_t *appdata) { Line 2086  void cleanup(appdata_t *appdata) {
2086    puts("everything is gone");    puts("everything is gone");
2087  }  }
2088    
2089  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2090    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2091    
   gconf_save_state(appdata);  
2092    gtk_main_quit();    gtk_main_quit();
2093    appdata->window = NULL;    appdata->window = NULL;
2094  }  }
2095    
2096  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
2097                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
2098    int handled = FALSE;    int handled = FALSE;
2099    
2100    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1795  gboolean on_window_key_press(GtkWidget * Line 2102  gboolean on_window_key_press(GtkWidget *
2102    switch(event->keyval) {    switch(event->keyval) {
2103  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2104    
 #if 0  /* don't do this as it interferes with gtkentry fields */  
   case HILDON_HARDKEY_SELECT:  
     /* remove as long as we haven't reached the main gpx list */  
     if(appdata->cur_gpx)  
       hildon_bread_crumb_trail_pop(HILDON_BREAD_CRUMB_TRAIL(appdata->bct));  
     handled = TRUE;  
     break;  
 #endif  
   
2105  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
2106    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
2107      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1850  gboolean on_window_key_press(GtkWidget * Line 2148  gboolean on_window_key_press(GtkWidget *
2148    return handled;    return handled;
2149  }  }
2150    
2151  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2152  typedef struct {  typedef struct {
2153    int level;    int level;
2154    appdata_t *appdata;    appdata_t *appdata;
# Line 1942  crumb_back(gpointer data) { Line 2240  crumb_back(gpointer data) {
2240    
2241    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2242    g_free(data);    g_free(data);
2243    
2244    #ifdef ENABLE_OSM_GPS_MAP
2245      map_update(crumb->appdata);
2246    #endif
2247  }  }
2248    
2249  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
2250                        gpointer user_data) {                        gpointer user_data) {
2251    crumb_t *crumb = malloc(sizeof(crumb_t));    crumb_t *crumb = g_new0(crumb_t, 1);
2252    crumb->level = level;    crumb->level = level;
2253    crumb->appdata = appdata;    crumb->appdata = appdata;
2254    crumb->data = user_data;    crumb->data = user_data;
# Line 1982  static void crumb_add(appdata_t *appdata Line 2284  static void crumb_add(appdata_t *appdata
2284  #endif  #endif
2285    }    }
2286    
2287    #ifdef USE_BREAD_CRUMB_TRAIL
2288    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2289                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2290    #else
2291      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2292    #endif
2293    
2294    #ifdef ENABLE_OSM_GPS_MAP
2295      map_update(appdata);
2296    #endif
2297  }  }
2298  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2299    
2300  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2301  #ifndef USE_MAEMO    printf("main after settings redraw\n");
2302    // in non-maemo setup this can only affect the main screen as  
2303    // the menu is blocked while a dialog is open. also the main    if(!appdata->cur_view) {
2304    // screen is always present      printf("no active view\n");
2305    if(appdata->gpxlist_items != appdata->cur_items) {      return;
     /* 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);  
2306    }    }
2307  #else  
2308    /* 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 */
2309    /* need to be redrawn */    /* need to be redrawn */
2310    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2023  void main_after_settings_redraw(appdata_ Line 2328  void main_after_settings_redraw(appdata_
2328    }    }
2329    
2330    if(redraw) {    if(redraw) {
2331      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
2332    #ifdef USE_STACKABLE_WINDOW
2333        HildonWindowStack *stack = hildon_window_stack_get_default();
2334        GtkWidget *container = hildon_window_stack_peek(stack);
2335    #else
2336        GtkWidget *container = appdata->vbox;
2337    #endif
2338    
2339        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2340      switch(redraw) {      switch(redraw) {
2341      case 1:      case 1:
2342        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 2038  void main_after_settings_redraw(appdata_ Line 2351  void main_after_settings_redraw(appdata_
2351        break;        break;
2352      }      }
2353    
2354      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2355      gtk_widget_show_all(appdata->vbox);        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2356    }  #else
2357          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2358  #endif  #endif
2359    
2360        gtk_widget_show_all(container);
2361      }
2362  }  }
2363    
2364  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2062  int main(int argc, char *argv[]) { Line 2379  int main(int argc, char *argv[]) {
2379    
2380    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2381    
2382      misc_init();
2383    
2384      curl_global_init(CURL_GLOBAL_ALL);
2385    
2386  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2387    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2388    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2070  int main(int argc, char *argv[]) { Line 2391  int main(int argc, char *argv[]) {
2391      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2392    }    }
2393    
2394    #ifdef ENABLE_MAEMO_MAPPER
2395    dbus_register(&appdata);    dbus_register(&appdata);
2396  #endif  #endif
2397    #endif
2398    
2399    icons_init();    icons_init();
2400    
# Line 2095  int main(int argc, char *argv[]) { Line 2418  int main(int argc, char *argv[]) {
2418    /* Create a Window. */    /* Create a Window. */
2419    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2420    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2421    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2422  #endif  #endif
2423    
2424    #if MAEMO_VERSION_MAJOR == 5
2425    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2426    #endif
2427    
2428    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2429                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2430    
2431    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2432                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2433    
2434    appdata.vbox = gtk_vbox_new(FALSE, 2);    /* prepare clipboard */
2435    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2436      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2437    
2438  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2439      appdata.vbox = gtk_vbox_new(FALSE, 2);
2440      gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2441    menu_create(&appdata);    menu_create(&appdata);
2442  #else  #else
2443    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),
# Line 2121  int main(int argc, char *argv[]) { Line 2450  int main(int argc, char *argv[]) {
2450    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);
2451    
2452    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2453    #else
2454    #ifdef BCT
2455      /* on non-hildon machines we use some custom made breadcrumbtrail */
2456      /* replacement */
2457      appdata.bct = bct_new();
2458      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2459    #endif
2460    #endif
2461    
2462    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2463    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2464  #endif  #endif
2465    
# Line 2134  int main(int argc, char *argv[]) { Line 2473  int main(int argc, char *argv[]) {
2473    gps_init(&appdata);    gps_init(&appdata);
2474    
2475    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);
2476    #ifndef USE_STACKABLE_WINDOW
2477    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);
2478    #else
2479      gtk_container_add(GTK_CONTAINER(appdata.window), appdata.cur_view);
2480    #endif
2481    
2482    gtk_widget_show_all(GTK_WIDGET(appdata.window));    gtk_widget_show_all(GTK_WIDGET(appdata.window));
2483    gtk_main();    gtk_main();
Legend:
Removed from v.7  
changed lines
  Added in v.244