Diff of /trunk/src/main.c

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

revision 3 by harbaum, Mon Jun 22 13:05:30 2009 UTC revision 211 by harbaum, Wed Nov 25 10:13:26 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    #include <hildon/hildon-check-button.h>
40    #endif
41  #endif  #endif
42    
43  #include <locale.h>  #include <locale.h>
44    
45  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
46    
47  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
48  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
49                        gpointer user_data);                        gpointer user_data);
50    
# Line 92  void errorf(const char *fmt, ...) { Line 101  void errorf(const char *fmt, ...) {
101      }      }
102    }    }
103    
104    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
105    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
106                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
107                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
108                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,                             GTK_MESSAGE_ERROR,
109                             buf);                             GTK_BUTTONS_CLOSE, buf);
110    
111    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
112    #else
113      GtkWidget *dialog =
114        hildon_note_new_information(GTK_WINDOW(NULL), buf);
115    #endif
116    
117    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
118    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 120  gpx_t *choose_file(appdata_t *appdata, g Line 134  gpx_t *choose_file(appdata_t *appdata, g
134                   HELP_ID_IMPORT, appdata->osso_context);                   HELP_ID_IMPORT, appdata->osso_context);
135  #endif  #endif
136  #else  #else
137    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Open Directory"):    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Import directory"):
138                                          _("Open File"),                                          _("Import file"),
139                          GTK_WINDOW(appdata->window),                          GTK_WINDOW(appdata->window),
140                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :
141                                          GTK_FILE_CHOOSER_ACTION_OPEN,                                          GTK_FILE_CHOOSER_ACTION_OPEN,
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 152  gpx_t *choose_file(appdata_t *appdata, g
152    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
153    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
154      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
155    
156        if(filename) {
157          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
158    
159      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
160            gpx = gpx_parse(dialog, filename, appdata->username);
161      if(!whole_dir)        else {
162        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
163      else {          if(strlastchr(filename) == '/')
164        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
165        if(strlastchr(filename) == '/')  
166          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 = '/';  
167        }        }
168    
169        if(whole_dir)        gpx_busy_dialog_destroy(dialog);
170          appdata->path = strdup(filename);  
171      }        /* save path if gpx was successfully loaded */
172          if(gpx) {
173            char *r = strrchr(filename, '/');
174    
175            /* there is a delimiter, use everything left of it as path */
176            if(r && !whole_dir) {
177              *r = 0;
178              if(appdata->path) free(appdata->path);
179              appdata->path = strdup(filename);
180              /* restore path ... just in case ... */
181              *r = '/';
182            }
183    
184            if(whole_dir)
185              appdata->path = strdup(filename);
186          } else
187            errorf(_("Load error"));
188    
189      g_free (filename);        g_free (filename);
190        } else {
191    #ifndef USE_MAEMO
192          errorf(_("Error accessing the file."));
193    #else
194          errorf(_("Error accessing the file. This may happen if the file "
195                   "resides on a remote file system. Please copy the file onto "
196                   "the device (e.g. onto the memory card) and try again."));
197    #endif
198        }
199    }    }
200    
201    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 194  enum { Line 219  enum {
219    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
220  } ;  } ;
221    
222  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
223    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
224        cache_dialog(appdata, cache);
225    #else
226        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
227        appdata->cur_view = cache_view(appdata, cache);
228        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
229        gtk_widget_show_all(appdata->vbox);
230    
231        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
232    #endif
233    }
234    
235    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
236                                     GtkTreePath        *path,                                     GtkTreePath        *path,
237                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
238                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 240  void cachelist_view_onRowActivated(GtkTr
240    GtkTreeIter   iter;    GtkTreeIter   iter;
241    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
242    
243    #ifdef USE_MAEMO
244      /* check if a cache is already selected and ignore click if yes */
245      /* (was probably a double click) */
246      if(appdata->cur_cache) return;
247    #endif
248    
249    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
250      cache_t *cache;      cache_t *cache;
251      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
252  #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  
253    }    }
254  }  }
255    
# Line 257  static GtkWidget *cachelist_create(appda Line 292  static GtkWidget *cachelist_create(appda
292                                     cache_t *sel_cache);                                     cache_t *sel_cache);
293    
294  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
295  #ifndef USE_MAEMO    if(!appdata->cur_view) {
296    //  gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      printf("cachelist redraw: no active view\n");
297    //  appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);      return;
298    //  gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);    }
   // gtk_widget_show_all(appdata->vbox);  
 #else  
299    
300    g_assert(!appdata->cur_cache);    g_assert(!appdata->cur_cache);
301    int redraw = 0;    int redraw = 0;
# Line 274  void cachelist_redraw(appdata_t *appdata Line 307  void cachelist_redraw(appdata_t *appdata
307    }    }
308    
309    if(redraw) {    if(redraw) {
310      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
311    
312    #ifdef USE_STACKABLE_WINDOW
313        HildonWindowStack *stack = hildon_window_stack_get_default();
314        container = hildon_window_stack_peek(stack);
315    #endif
316    
317        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
318      switch(redraw) {      switch(redraw) {
319      case 1:      case 1:
320        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 286  void cachelist_redraw(appdata_t *appdata Line 326  void cachelist_redraw(appdata_t *appdata
326        break;        break;
327      }      }
328    
329      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
330      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
331    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
332        else
333  #endif  #endif
334          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
335    
336        gtk_widget_show_all(container);
337      }
338  }  }
339    
340    
# Line 297  static gboolean cachelist_update(gpointe Line 342  static gboolean cachelist_update(gpointe
342    
343    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
344    
 #ifdef USE_MAEMO  
345    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
346    
347      if(appdata->cur_cache)
348        return TRUE;
349    
350    #ifdef USE_MAEMO
351    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
352      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
353        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
354    #endif
355    
356    if(appdata->cachelist_update)    if(appdata->cachelist_update)
357      cachelist_redraw(appdata);      cachelist_redraw(appdata);
 #endif  
358    
359    return TRUE;    return TRUE;
360  }  }
361    
362  static void cachelist_timer_reset(appdata_t *appdata) {  static void cachelist_timer_reset(appdata_t *appdata) {
363      printf("cachelist timer reset\n");
364    g_assert(appdata->cachelist_handler_id);    g_assert(appdata->cachelist_handler_id);
365    gtk_timeout_remove(appdata->cachelist_handler_id);    gtk_timeout_remove(appdata->cachelist_handler_id);
366    appdata->cachelist_handler_id =    appdata->cachelist_handler_id =
# Line 427  static GtkWidget *cachelist_create(appda Line 476  static GtkWidget *cachelist_create(appda
476      if(tint > 8) tint = 8;      if(tint > 8) tint = 8;
477    
478      /* cache type includes "solved" flag in lowest bit */      /* cache type includes "solved" flag in lowest bit */
479      int type = (cache->type<<8) +      int type = cache->type<<8;
480        (cache->notes?4:0) +      if(cache->notes) type |= 4;
481        ((cache->notes && cache->notes->override)?1:0) +      if(cache->notes && cache->notes->override) type |= 1;
482        ((cache->notes && cache->notes->found)?2:0);      if(cache->notes && cache->notes->found) type |= 2;
483        if(cache->found) type |= 2;
484        if(cache->mine) type |= 8;
485    
486      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
487    
# Line 543  void cachelist_dialog(appdata_t *appdata Line 594  void cachelist_dialog(appdata_t *appdata
594  }  }
595  #else  #else
596  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
597    static void search_result_free(gpx_t *result);
598    
599    void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
600      printf("cachelist destroy\n");
601    
602      if(appdata->search_results) {
603        search_result_free(appdata->search_results);
604        appdata->search_results = NULL;
605      }
606      appdata->cur_gpx = NULL;
607    
608    #ifdef ENABLE_OSM_GPS_MAP
609      map_update(appdata);
610    #endif
611    
612      /* restore cur_view */
613      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
614    }
615    
616  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
617    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
618    
619    gtk_window_set_title(GTK_WINDOW(window), gpx->name);    /* store last "cur_view" in window */
620      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
621    
622    gtk_container_add(GTK_CONTAINER(window),    appdata->cur_gpx = gpx;
623                      cachelist_create(appdata, gpx, NULL));    char *title = g_strdup_printf("%s - GPXView", gpx->name);
624      gtk_window_set_title(GTK_WINDOW(window), title);
625      g_free(title);
626    
627      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
628      gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
629    
630    
631    hildon_window_set_app_menu(HILDON_WINDOW(window),    hildon_window_set_app_menu(HILDON_WINDOW(window),
632                               menu_create(appdata, MENU_CACHELIST));                               menu_create(appdata, MENU_CACHELIST));
633    
634      g_signal_connect(G_OBJECT(window), "destroy",
635                       G_CALLBACK(on_cachelist_destroy), appdata);
636    
637    gtk_widget_show_all(window);    gtk_widget_show_all(window);
638    
639    #ifdef ENABLE_OSM_GPS_MAP
640      map_update(appdata);
641    #endif
642  }  }
643  #endif  #endif
644  #endif  #endif
# Line 587  static GdkPixbuf *gpx_icon_get(gpx_t *gp Line 671  static GdkPixbuf *gpx_icon_get(gpx_t *gp
671    return icon_get(ICON_FILE, 0);    return icon_get(ICON_FILE, 0);
672  }  }
673    
674  static void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {  void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {
675    char date_str[32], cnum[32];    char date_str[32], cnum[32];
676    
677    if(gpx->year && gpx->month && gpx->day) {    if(gpx->year && gpx->month && gpx->day) {
# Line 612  static void gpxlist_set(GtkListStore *st Line 696  static void gpxlist_set(GtkListStore *st
696                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
697                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
698  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
699                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),
700  #endif  #endif
701                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
702                       -1);                       -1);
# Line 658  static void gpxlist_close(appdata_t *app Line 742  static void gpxlist_close(appdata_t *app
742    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
743  }  }
744    
745    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
746    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
747    #ifdef USE_STACKABLE_WINDOW
748      if(!appdata->cur_gpx)
749    #endif
750        cachelist_dialog(appdata, gpx);
751    #ifdef USE_STACKABLE_WINDOW
752      else
753        printf("selected gpx, but cachelist window already present\n");
754    #endif
755    #else
756      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
757      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
758      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
759      gtk_widget_show_all(appdata->vbox);
760    
761      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
762    #endif
763    }
764    
765  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
766                            GtkTreePath        *path,                            GtkTreePath        *path,
767                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 666  static void gpxlist_view_onRowActivated( Line 770  static void gpxlist_view_onRowActivated(
770    GtkTreeIter   iter;    GtkTreeIter   iter;
771    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
772    
773    #ifdef USE_MAEMO
774      /* check if a cache is already selected and ignore click if yes */
775      /* (was probably a double click) */
776      if(appdata->cur_gpx) return;
777    #endif
778    
779    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
780      gpx_t *gpx;      gpx_t *gpx;
781      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 788  static void gpxlist_view_onRowActivated(
788      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
789        printf("clicked delete\n");        printf("clicked delete\n");
790    
791    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
792        /* ask user what he wants */        /* ask user what he wants */
793        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
794                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
795                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
796                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   GTK_MESSAGE_QUESTION,
797                     GTK_BUTTONS_CANCEL,
798                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
799                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
800    
# Line 691  static void gpxlist_view_onRowActivated( Line 803  static void gpxlist_view_onRowActivated(
803                               _("Close"), 2,                               _("Close"), 2,
804                               NULL);                               NULL);
805    
806          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
807    #else
808    
809          GtkWidget *dialog =
810            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
811                                GTK_WINDOW(appdata->window),
812                                GTK_DIALOG_DESTROY_WITH_PARENT,
813                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
814                                _("Remove"), 1,
815                                _("Close"), 2,
816                                NULL);
817    
818          GtkWidget *content_area =
819            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
820    
821          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
822    
823          gtk_box_pack_start(GTK_BOX(hbox),
824             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
825                                       GTK_ICON_SIZE_DIALOG),
826                             FALSE, FALSE, 0);
827    
828          GtkWidget *label = gtk_label_new(
829                      _("Do you want to close this entry only or do "
830                        "you want to remove it completely from the list?"));
831    
832          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
833          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
834    
835          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
836          gtk_container_add (GTK_CONTAINER (content_area), hbox);
837    
838          gtk_widget_show_all (dialog);
839    #endif
840    
841        if(gpx->closed)        if(gpx->closed)
842          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
843    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));  
   
844        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
845        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
846    
# Line 725  static void gpxlist_view_onRowActivated( Line 870  static void gpxlist_view_onRowActivated(
870          gpx_t *new = NULL;          gpx_t *new = NULL;
871    
872          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
873            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
874          else          else
875            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
876    
877          if(new) {          if(new) {
878            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 763  static void gpxlist_view_onRowActivated( Line 908  static void gpxlist_view_onRowActivated(
908    
909          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
910        }        }
911  #ifndef USE_BREAD_CRUMB_TRAIL  
912        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  
913      }      }
914    }    }
915  }  }
916    
917    /* search gpx file in gpx list */
918    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx) {
919      GtkTreeModel *model =
920        gtk_tree_view_get_model(GTK_TREE_VIEW(appdata->gpxview));
921    
922      gboolean found =
923        gtk_tree_model_get_iter_first(model, iter);
924    
925      while(found) {
926        gpx_t *this_gpx;
927        gtk_tree_model_get(model, iter, GPXLIST_COL_DATA, &this_gpx, -1);
928    
929        if(gpx == this_gpx)
930          return TRUE;
931    
932        found = gtk_tree_model_iter_next(model, iter);
933      }
934    
935      return FALSE;
936    }
937    
938    
939  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
940  static gboolean  static gboolean
941  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
# Line 827  static GtkWidget *gpxlist_create_view_an Line 986  static GtkWidget *gpxlist_create_view_an
986    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
987                    -1, "Icon", renderer,                    -1, "Icon", renderer,
988                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
989                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
990            /* at least one entry needs to be sensitive. */
991            /* This is the delete icon if the PANNABLE_AREA is used */
992                      "sensitive", GPXLIST_COL_OPEN,
993    #endif
994                    NULL);                    NULL);
995    
996    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 883  static GtkWidget *gpxlist_create_view_an Line 1046  static GtkWidget *gpxlist_create_view_an
1046    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1047                    -1, "Del", renderer,                    -1, "Del", renderer,
1048                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
1049                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
1050                    NULL);                    NULL);
1051  #endif  #endif
1052    
# Line 903  static GtkWidget *gpxlist_create_view_an Line 1066  static GtkWidget *gpxlist_create_view_an
1066      GtkTreeIter         iter;      GtkTreeIter         iter;
1067      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1068      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1069    
1070      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1071        sel_iter = iter;        sel_iter = iter;
1072        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 963  static void gpxlist_add(appdata_t *appda Line 1126  static void gpxlist_add(appdata_t *appda
1126    
1127  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1128    
1129    typedef struct {
1130      appdata_t *appdata;
1131      GtkWidget *dialog;
1132    } about_context_t;
1133    
1134    #ifdef ENABLE_BROWSER_INTERFACE
1135    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1136      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1137      browser_url(context->appdata,
1138                  "https://www.paypal.com/cgi-bin/webscr"
1139                  "?cmd=_s-xclick&hosted_button_id=7400558");
1140    }
1141    #endif
1142    
1143  static void  static void
1144  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1145    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1146    
1147    gtk_about_dialog_set_name(about, "GPXView");    context.appdata = (appdata_t *)data;
1148    gtk_about_dialog_set_version(about, VERSION);  
1149    gtk_about_dialog_set_copyright(about,  #ifdef ENABLE_LIBLOCATION
1150           _("GPXView (c) 2008 by\n"    char *uses = "uses liblocation";
1151           "Till Harbaum <till@harbaum.org>\n"  #elif defined(ENABLE_GPSBT)
1152           "Geocaching.com: Tantil"));    char *uses = "uses gpsbt and gpsd";
1153    #else
1154    gtk_about_dialog_set_website(about,    char *uses = "uses gpsd";
1155         _("http://www.harbaum.org/till/maemo"));  #endif
1156    
1157    gtk_about_dialog_set_comments(about,    const gchar *authors[] = {
1158         _("Geocaching.com GPX file viewer"));      "Till Harbaum <till@harbaum.org>",
1159        "John Stowers <john.stowers@gmail.com>",
1160    gtk_widget_show_all(GTK_WIDGET(about));      "GCVote: Guido Wegener <guido.wegener@gmx.de>",
1161    gtk_dialog_run(GTK_DIALOG(about));      NULL };
1162    gtk_widget_destroy(GTK_WIDGET(about));  
1163      context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1164                            "name", "GPXView",
1165                            "version", VERSION,
1166                            "copyright", _("Copyright 2008-2009"),
1167                            "authors", authors,
1168                            "website", _("http://www.harbaum.org/till/maemo"),
1169                            "comments", _(uses),
1170                            NULL);
1171    
1172    #ifdef ENABLE_BROWSER_INTERFACE
1173      /* add a way to donate to the project */
1174      GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1175    
1176      GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1177      gtk_box_pack_start(GTK_BOX(hbox),
1178                         gtk_label_new(_("Do you like GPXView?")),
1179                         FALSE, FALSE, 0);
1180    
1181      GtkWidget *button = gtk_button_new();
1182      gtk_button_set_image(GTK_BUTTON(button),
1183                           icon_get_widget(ICON_MISC, 5));
1184      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1185      g_signal_connect(button, "clicked",
1186                       G_CALLBACK(on_paypal_button_clicked), &context);
1187      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1188    
1189      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1190      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1191                                  alignment);
1192    
1193      gtk_widget_show_all(alignment);
1194    #endif
1195    
1196      gtk_dialog_run(GTK_DIALOG(context.dialog));
1197      gtk_widget_destroy(context.dialog);
1198  }  }
1199    
1200  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1010  cb_menu_adddir(GtkWidget *window, gpoint Line 1222  cb_menu_adddir(GtkWidget *window, gpoint
1222    if(new) gpxlist_add(appdata, new);    if(new) gpxlist_add(appdata, new);
1223  }  }
1224    
 static void  
 cb_menu_geomath(GtkWidget *window, gpointer data) {  
   geomath_dialog((appdata_t *)data);  
 }  
   
 static void  
 cb_menu_geotext(GtkWidget *window, gpointer data) {  
   geotext_dialog((appdata_t *)data);  
 }  
   
 static void  
 cb_menu_precpos(GtkWidget *window, gpointer data) {  
   precise_position((appdata_t *)data);  
 }  
   
1225  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
1226  static void  static void
1227  cb_menu_close(GtkWidget *window, gpointer data) {  cb_menu_close(GtkWidget *window, gpointer data) {
# Line 1169  gpx_t *search_do(appdata_t *appdata, gpx Line 1366  gpx_t *search_do(appdata_t *appdata, gpx
1366        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1367                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1368          hit = 1;          hit = 1;
1369        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1370                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1371          hit = 1;          hit = 1;
1372    
1373        if(hit) {        if(hit) {
# Line 1199  typedef struct { Line 1396  typedef struct {
1396    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1397  } search_context_t;  } search_context_t;
1398    
1399    
1400    static GtkWidget *check_button_new_with_label(char *label) {
1401    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1402      return gtk_check_button_new_with_label(label);
1403    #else
1404      GtkWidget *cbut =
1405        hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
1406      gtk_button_set_label(GTK_BUTTON(cbut), label);
1407      return cbut;
1408    #endif
1409    }
1410    
1411    static void check_button_set_active(GtkWidget *button, gboolean active) {
1412    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1413      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
1414    #else
1415      hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
1416    #endif
1417    }
1418    
1419    static gboolean check_button_get_active(GtkWidget *button) {
1420    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1421      return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
1422    #else
1423      return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));
1424    #endif
1425    }
1426    
1427  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1428    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1429    
1430    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1431    
1432    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1433    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1233  cb_menu_search(GtkWidget *window, gpoint Line 1457  cb_menu_search(GtkWidget *window, gpoint
1457    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1458    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1459    
1460    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1461    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);  
1462    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);
1463    
1464    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1465    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);  
1466    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);
1467    
1468    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1469    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);  
1470    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);
1471    
1472    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1473    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);  
1474    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);
1475    
1476    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 1259  cb_menu_search(GtkWidget *window, gpoint Line 1479  cb_menu_search(GtkWidget *window, gpoint
1479    
1480    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1481                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1482    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1483      context.entry = gtk_entry_new();
1484    #else
1485      context.entry = hildon_entry_new(HILDON_SIZE_AUTO);
1486    #endif
1487    
1488    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1489                                context.entry = gtk_entry_new());                                context.entry);
1490    
1491    if(appdata->search_str)    if(appdata->search_str)
1492      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1493    
# Line 1271  cb_menu_search(GtkWidget *window, gpoint Line 1498  cb_menu_search(GtkWidget *window, gpoint
1498    
1499    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1500    
1501    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1502    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);  
1503    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1504    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1505                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1313  cb_menu_search(GtkWidget *window, gpoint Line 1539  cb_menu_search(GtkWidget *window, gpoint
1539                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1540  #endif  #endif
1541    
1542      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1543        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1544      else      else
1545        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1546    
1547      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1548        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1549      else      else
1550        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1551    
1552      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1553        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1554      else      else
1555        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1556    
1557      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1558        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1559      else      else
1560        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1561    
1562      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1563        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1564      else      else
1565        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1343  cb_menu_search(GtkWidget *window, gpoint Line 1569  cb_menu_search(GtkWidget *window, gpoint
1569      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1570      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1571          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1572    
1573        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1574    
1575  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1576        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        gpx_t *found =
1577            search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1578    
1579        /* do search result dialog here ... */        /* do search result dialog here ... */
1580        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, found);
1581    #ifndef USE_STACKABLE_WINDOW
1582        search_result_free(found);        search_result_free(found);
1583  #else  #else
1584          appdata->search_results = found;
1585    #endif
1586    #else
1587          gpx_t *found = NULL;
1588    
1589        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1590          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1591        else        else
# Line 1374  cb_menu_search(GtkWidget *window, gpoint Line 1606  cb_menu_search(GtkWidget *window, gpoint
1606      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1607  }  }
1608    
1609  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1610    
1611  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1612  static void  static void
# Line 1436  cb_menu_export_log(GtkWidget *widget, gp Line 1668  cb_menu_export_log(GtkWidget *widget, gp
1668    notes_log_export(appdata);    notes_log_export(appdata);
1669  }  }
1670    
1671  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1672  static void  static void
1673  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1674    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1450  cb_menu_export_garmin(GtkWidget *widget, Line 1682  cb_menu_export_garmin(GtkWidget *widget,
1682    garmin_export(appdata);    garmin_export(appdata);
1683  }  }
1684    
1685    #ifdef ENABLE_OSM_GPS_MAP
1686    static void
1687    cb_menu_map(GtkWidget *window, gpointer data) {
1688      map((appdata_t *)data);
1689    }
1690    #endif
1691    
1692    static void
1693    cb_menu_geomath(GtkWidget *window, gpointer data) {
1694      geomath_dialog((appdata_t *)data);
1695    }
1696    
1697    static void
1698    cb_menu_geotext(GtkWidget *window, gpointer data) {
1699      geotext_dialog((appdata_t *)data);
1700    }
1701    
1702    static void
1703    cb_menu_precpos(GtkWidget *window, gpointer data) {
1704      precise_position((appdata_t *)data);
1705    }
1706    
1707    static void
1708    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1709      geotoad((appdata_t *)data);
1710    }
1711    
1712  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1713  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  typedef struct {
1714      char *label, *desc;
1715      GtkSignalFunc activate_cb;
1716    } menu_entry_t;
1717    
1718    typedef struct {
1719      const char *title;
1720      const menu_entry_t *menu;
1721      int len;
1722    } submenu_t;
1723    
1724    #define COLUMNS  1
1725    
1726    void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1727    
1728      /* force closing of submenu dialog */
1729      gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1730      gtk_widget_hide(menu);
1731    
1732      /* let gtk clean up */
1733      while(gtk_events_pending())
1734        gtk_main_iteration();
1735    }
1736    
1737    static GtkWidget *app_submenu_create(appdata_t *appdata,
1738                                         const submenu_t *submenu) {
1739    
1740      /* create a oridinary dialog box */
1741    GtkWidget *dialog = gtk_dialog_new();    GtkWidget *dialog = gtk_dialog_new();
1742      gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1743      gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1744      gtk_window_set_transient_for(GTK_WINDOW(dialog),
1745                                   GTK_WINDOW(appdata->window));
1746      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1747    
1748      GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1749      int x = 0, y = 0;
1750    
1751      const menu_entry_t *menu_entries = submenu->menu;
1752      while(menu_entries->label) {
1753        GtkWidget *button = NULL;
1754    
1755        button = hildon_button_new_with_text(
1756                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1757                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1758                _(menu_entries->label), _(menu_entries->desc));
1759    
1760        /* try to center both texts */
1761        hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1762        hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1763    
1764    GtkWidget *but =      g_signal_connect(button, "clicked",
1765      hildon_button_new_with_text(HILDON_SIZE_AUTO,                       G_CALLBACK(on_submenu_entry_clicked), dialog);
1766                                  HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
1767                                  _("Export to Maemo Mapper"),      g_signal_connect(button, "clicked",
1768                                  _("Write a Maemo Mapper POI file"));                       menu_entries->activate_cb, appdata);
1769    
1770    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),      gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1771                      but);  
1772        x++;
1773        if(x == COLUMNS) { x = 0; y++; }
1774  #if 0  
1775     g_signal_connect_swapped (dialog,      menu_entries++;
1776                               "response",    }
1777                               G_CALLBACK (gtk_widget_destroy),  
1778                               dialog);    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1779  #endif  
1780      return dialog;
1781     gtk_widget_show_all (dialog);  }
1782     gint result = gtk_dialog_run(GTK_DIALOG(dialog));  
1783     gtk_widget_destroy(dialog);  /* popup the dialog shaped submenu */
1784    static void submenu_popup(GtkWidget *menu) {
1785      gtk_widget_show_all(menu);
1786      gtk_dialog_run(GTK_DIALOG(menu));
1787      gtk_widget_hide(menu);
1788    }
1789    
1790    static void submenu_cleanup(GtkWidget *menu) {
1791      gtk_widget_destroy(menu);
1792    }
1793    
1794    static const menu_entry_t submenu_export_entries[] = {
1795    #ifdef ENABLE_MAEMO_MAPPER
1796      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1797        G_CALLBACK(cb_menu_export_mmpoi)  },
1798    #endif
1799      { "Export Field Notes",      "Save a Garmin Field Notes file",
1800        G_CALLBACK(cb_menu_export_log)    },
1801      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1802        G_CALLBACK(cb_menu_export_garmin) },
1803      { NULL, NULL, NULL }
1804    };
1805    
1806    static const submenu_t submenu_export = {
1807      "Export", submenu_export_entries,
1808      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1809    };
1810    
1811    /* the export submenu */
1812    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1813      if(!appdata->export_menu)
1814        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1815    
1816      submenu_popup(appdata->export_menu);
1817    }
1818    
1819    static const menu_entry_t submenu_tools_entries[] = {
1820      { "Geomath",          "Geocoordinate calculation",
1821        G_CALLBACK(cb_menu_geomath) },
1822      { "Geotext",          "Text analysis",
1823        G_CALLBACK(cb_menu_geotext) },
1824      { "Precise Position", "Calculate a precise GPS position",
1825        G_CALLBACK(cb_menu_precpos) },
1826      { "GeoToad",          "Use GeoToad online downloader",
1827        G_CALLBACK(cb_menu_geotoad) },
1828      { NULL, NULL, NULL }
1829    };
1830    
1831    static const submenu_t submenu_tools = {
1832      "Tools", submenu_tools_entries,
1833      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1834    };
1835    
1836    /* the tools submenu */
1837    void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1838      if(!appdata->tools_menu)
1839        appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1840    
1841      submenu_popup(appdata->tools_menu);
1842  }  }
1843    
1844  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
# Line 1481  HildonAppMenu *menu_create(appdata_t *ap Line 1846  HildonAppMenu *menu_create(appdata_t *ap
1846    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1847    
1848    /* ------- */    /* ------- */
1849      button = gtk_button_new_with_label(_("About"));
1850      g_signal_connect_after(button, "clicked",
1851                             G_CALLBACK(cb_menu_about), appdata);
1852      hildon_app_menu_append(menu, GTK_BUTTON(button));
1853    
1854    button = gtk_button_new_with_label(_("Settings"));    button = gtk_button_new_with_label(_("Settings"));
1855    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1856                           appdata);                           appdata);
# Line 1492  HildonAppMenu *menu_create(appdata_t *ap Line 1862  HildonAppMenu *menu_create(appdata_t *ap
1862                             G_CALLBACK(cb_menu_add), appdata);                             G_CALLBACK(cb_menu_add), appdata);
1863      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1864    
1865      button = gtk_button_new_with_label(_("Import dir"));      button = gtk_button_new_with_label(_("Import directory"));
1866      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1867                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1868      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1869    
1870    if(mode == MENU_GPXLIST || mode == MENU_CACHELIST) {      button = gtk_button_new_with_label(_("Export"));
     button = gtk_button_new_with_label(_("Export to Mapper"));  
1871      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1872                             G_CALLBACK(cb_menu_export_mmpoi), appdata);                             G_CALLBACK(on_export_clicked), appdata);
1873      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1874    
1875    if(mode == MENU_GPXLIST) {      button = gtk_button_new_with_label(_("Search"));
     button = gtk_button_new_with_label(_("Export Field Notes"));  
1876      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1877                             G_CALLBACK(cb_menu_export_log), appdata);                             G_CALLBACK(cb_menu_search), appdata);
1878      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1879      }
1880    
1881      button = gtk_button_new_with_label(_("Export Garmin GPX"));    button = gtk_button_new_with_label(_("Tools"));
1882      g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
1883                             G_CALLBACK(cb_menu_export_garmin), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1884      hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1885    
1886      button = gtk_button_new_with_label(_("Search"));  #ifdef ENABLE_OSM_GPS_MAP
1887        button = gtk_button_new_with_label(_("Map"));
1888      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1889                             G_CALLBACK(cb_menu_search), appdata);                             G_CALLBACK(cb_menu_map), appdata);
1890      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1891    }  #endif
1892    
1893    button = gtk_button_new_with_label(_("About"));  #ifdef HILDON_HELP
1894      button = gtk_button_new_with_label(_("Help"));
1895    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
1896                           G_CALLBACK(cb_menu_about), appdata);                           G_CALLBACK(cb_menu_help), appdata);
1897    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1898    #endif
1899    
1900    gtk_widget_show(GTK_WIDGET(menu));    gtk_widget_show_all(GTK_WIDGET(menu));
1901    
1902    return menu;    return menu;
1903  }  }
1904  #else  #else
1905    
1906  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1907    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1908    menu = gtk_menu_new();    menu = gtk_menu_new();
1909    
1910  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1911    appdata->menu_import =    appdata->menu_import =
1912  #endif  #endif
1913    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1544  void menu_create(appdata_t *appdata) { Line 1915  void menu_create(appdata_t *appdata) {
1915    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1916    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1917    
1918    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1919    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1920    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1921    
1922    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1923    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1924    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1925    
# Line 1566  void menu_create(appdata_t *appdata) { Line 1937  void menu_create(appdata_t *appdata) {
1937    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1938  #endif  #endif
1939    
1940  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1941    appdata->menu_export =    appdata->menu_export =
1942  #endif  #endif
1943      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1574  void menu_create(appdata_t *appdata) { Line 1945  void menu_create(appdata_t *appdata) {
1945    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1946    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1947    
1948  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1949    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1950    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1951    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1952                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1953  #endif  #endif
1954    
1955    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1956    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1957    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1958                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1959    
1960    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1961    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1962    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1963                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1964    
1965  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1966    appdata->menu_search =    appdata->menu_search =
1967  #endif  #endif
1968    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1969    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1970    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1971    
1972    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1973    
 #ifndef NO_COPY_N_PASTE  
1974    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1975    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1976    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1977    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1978    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1631  void menu_create(appdata_t *appdata) { Line 1999  void menu_create(appdata_t *appdata) {
1999    
2000    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2001    
2002    #ifdef ENABLE_OSM_GPS_MAP
2003      item = gtk_menu_item_new_with_label( _("Map") );
2004      gtk_menu_append(GTK_MENU_SHELL(menu), item);
2005      g_signal_connect(item, "activate",
2006                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
2007    #endif
2008    
2009    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
2010    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
2011    submenu = gtk_menu_new();    submenu = gtk_menu_new();
2012    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
2013    
2014    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
2015    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2016    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2017                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
2018    
2019    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
2020    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2021    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2022                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
2023    
2024    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
2025    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2026    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2027                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2028    
2029      item = gtk_menu_item_new_with_label( _("GeoToad") );
2030      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2031      g_signal_connect(item, "activate",
2032                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2033    
2034    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2035    
2036  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
2037    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
2038    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
2039    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
2040  #endif  #endif
2041    
2042    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
2043    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
2044    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
2045    
# Line 1695  void cleanup(appdata_t *appdata) { Line 2075  void cleanup(appdata_t *appdata) {
2075    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
2076    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
2077    
2078    #ifdef USE_STACKABLE_WINDOW
2079      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
2080      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
2081    #endif
2082    
2083    gnome_vfs_shutdown();    gnome_vfs_shutdown();
2084    icons_free();    icons_free();
2085    gps_release(appdata);    gps_release(appdata);
# Line 1723  void cleanup(appdata_t *appdata) { Line 2108  void cleanup(appdata_t *appdata) {
2108    puts("everything is gone");    puts("everything is gone");
2109  }  }
2110    
2111  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2112    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2113    
2114    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 1732  void on_window_destroy (GtkWidget *widge Line 2117  void on_window_destroy (GtkWidget *widge
2117  }  }
2118    
2119  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
2120                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
2121    int handled = FALSE;    int handled = FALSE;
2122    
2123    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1741  gboolean on_window_key_press(GtkWidget * Line 2125  gboolean on_window_key_press(GtkWidget *
2125    switch(event->keyval) {    switch(event->keyval) {
2126  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2127    
 #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  
   
2128  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
2129    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
2130      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1796  gboolean on_window_key_press(GtkWidget * Line 2171  gboolean on_window_key_press(GtkWidget *
2171    return handled;    return handled;
2172  }  }
2173    
2174  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2175  typedef struct {  typedef struct {
2176    int level;    int level;
2177    appdata_t *appdata;    appdata_t *appdata;
# Line 1888  crumb_back(gpointer data) { Line 2263  crumb_back(gpointer data) {
2263    
2264    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2265    g_free(data);    g_free(data);
2266    
2267    #ifdef ENABLE_OSM_GPS_MAP
2268      map_update(crumb->appdata);
2269    #endif
2270  }  }
2271    
2272  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 1928  static void crumb_add(appdata_t *appdata Line 2307  static void crumb_add(appdata_t *appdata
2307  #endif  #endif
2308    }    }
2309    
2310    #ifdef USE_BREAD_CRUMB_TRAIL
2311    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2312                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2313    #else
2314      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2315    #endif
2316    
2317    #ifdef ENABLE_OSM_GPS_MAP
2318      map_update(appdata);
2319    #endif
2320  }  }
2321  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2322    
2323  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2324  #ifndef USE_MAEMO    printf("main after settings redraw\n");
2325    // in non-maemo setup this can only affect the main screen as  
2326    // the menu is blocked while a dialog is open. also the main    if(!appdata->cur_view) {
2327    // screen is always present      printf("no active view\n");
2328    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);  
2329    }    }
2330  #else  
2331    /* 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 */
2332    /* need to be redrawn */    /* need to be redrawn */
2333    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 1969  void main_after_settings_redraw(appdata_ Line 2351  void main_after_settings_redraw(appdata_
2351    }    }
2352    
2353    if(redraw) {    if(redraw) {
2354      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2355    
2356    #ifdef USE_STACKABLE_WINDOW
2357        HildonWindowStack *stack = hildon_window_stack_get_default();
2358        container = hildon_window_stack_peek(stack);
2359    #endif
2360    
2361        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2362      switch(redraw) {      switch(redraw) {
2363      case 1:      case 1:
2364        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 1984  void main_after_settings_redraw(appdata_ Line 2373  void main_after_settings_redraw(appdata_
2373        break;        break;
2374      }      }
2375    
2376      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2377      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2378    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2379        else
2380  #endif  #endif
2381          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2382    
2383        gtk_widget_show_all(container);
2384      }
2385  }  }
2386    
2387  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2008  int main(int argc, char *argv[]) { Line 2402  int main(int argc, char *argv[]) {
2402    
2403    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2404    
2405      curl_global_init(CURL_GLOBAL_ALL);
2406    
2407  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2408    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2409    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2016  int main(int argc, char *argv[]) { Line 2412  int main(int argc, char *argv[]) {
2412      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2413    }    }
2414    
2415    #ifdef ENABLE_MAEMO_MAPPER
2416    dbus_register(&appdata);    dbus_register(&appdata);
2417  #endif  #endif
2418    #endif
2419    
2420    icons_init();    icons_init();
2421    
# Line 2041  int main(int argc, char *argv[]) { Line 2439  int main(int argc, char *argv[]) {
2439    /* Create a Window. */    /* Create a Window. */
2440    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2441    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2442    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2443  #endif  #endif
2444    
2445    #if MAEMO_VERSION_MAJOR == 5
2446    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2447    #endif
2448    
2449    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2450                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2451    
2452    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2453                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2454    
2455      /* prepare clipboard */
2456      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2457      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2458    
2459    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2460    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2461  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2462    menu_create(&appdata);    menu_create(&appdata);
2463  #else  #else
# Line 2067  int main(int argc, char *argv[]) { Line 2471  int main(int argc, char *argv[]) {
2471    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);
2472    
2473    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2474    #else
2475    #ifdef BCT
2476      /* on non-hildon machines we use some custom made breadcrumbtrail */
2477      /* replacement */
2478      appdata.bct = bct_new();
2479      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2480    #endif
2481    #endif
2482    
2483    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2484    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2485  #endif  #endif
2486    
Legend:
Removed from v.3  
changed lines
  Added in v.211