Diff of /trunk/src/main.c

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

revision 4 by harbaum, Mon Jun 22 14:25:59 2009 UTC revision 226 by harbaum, Wed Dec 2 20:05:52 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        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
227    
228        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
229        appdata->cur_view = cache_view(appdata, cache);
230        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
231        gtk_widget_show_all(appdata->vbox);
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      HildonWindowStack *stack = hildon_window_stack_get_default();
603      appdata->window = HILDON_WINDOW(hildon_window_stack_peek(stack));
604    
605      if(appdata->search_results) {
606        search_result_free(appdata->search_results);
607        appdata->search_results = NULL;
608      }
609      appdata->cur_gpx = NULL;
610    
611    #ifdef ENABLE_OSM_GPS_MAP
612      map_update(appdata);
613    #endif
614    
615      /* restore cur_view */
616      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
617    }
618    
619  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
620    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
621      appdata->window = HILDON_WINDOW(window);
622    
623      /* store last "cur_view" in window */
624      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
625    
626    gtk_window_set_title(GTK_WINDOW(window), gpx->name);    appdata->cur_gpx = gpx;
627      char *title = g_strdup_printf("%s - GPXView", gpx->name);
628    gtk_container_add(GTK_CONTAINER(window),    gtk_window_set_title(GTK_WINDOW(window), title);
629                      cachelist_create(appdata, gpx, NULL));    g_free(title);
630    
631      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
632      gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
633    
634    
635    hildon_window_set_app_menu(HILDON_WINDOW(window),    hildon_window_set_app_menu(HILDON_WINDOW(window),
636                               menu_create(appdata, MENU_CACHELIST));                               menu_create(appdata, MENU_CACHELIST));
637    
638      g_signal_connect(G_OBJECT(window), "destroy",
639                       G_CALLBACK(on_cachelist_destroy), appdata);
640    
641    gtk_widget_show_all(window);    gtk_widget_show_all(window);
642    
643    #ifdef ENABLE_OSM_GPS_MAP
644      map_update(appdata);
645    #endif
646  }  }
647  #endif  #endif
648  #endif  #endif
# Line 587  static GdkPixbuf *gpx_icon_get(gpx_t *gp Line 675  static GdkPixbuf *gpx_icon_get(gpx_t *gp
675    return icon_get(ICON_FILE, 0);    return icon_get(ICON_FILE, 0);
676  }  }
677    
678  static void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {  void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {
679    char date_str[32], cnum[32];    char date_str[32], cnum[32];
680    
681    if(gpx->year && gpx->month && gpx->day) {    if(gpx->year && gpx->month && gpx->day) {
# Line 612  static void gpxlist_set(GtkListStore *st Line 700  static void gpxlist_set(GtkListStore *st
700                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
701                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
702  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
703                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),
704  #endif  #endif
705                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
706                       -1);                       -1);
# Line 658  static void gpxlist_close(appdata_t *app Line 746  static void gpxlist_close(appdata_t *app
746    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
747  }  }
748    
749    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
750    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
751    #ifdef USE_STACKABLE_WINDOW
752      if(!appdata->cur_gpx)
753    #endif
754        cachelist_dialog(appdata, gpx);
755    #ifdef USE_STACKABLE_WINDOW
756      else
757        printf("selected gpx, but cachelist window already present\n");
758    #endif
759    #else
760      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
761      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
762      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
763      gtk_widget_show_all(appdata->vbox);
764    
765      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
766    #endif
767    }
768    
769  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
770                            GtkTreePath        *path,                            GtkTreePath        *path,
771                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 666  static void gpxlist_view_onRowActivated( Line 774  static void gpxlist_view_onRowActivated(
774    GtkTreeIter   iter;    GtkTreeIter   iter;
775    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
776    
777    #ifdef USE_MAEMO
778      /* check if a cache is already selected and ignore click if yes */
779      /* (was probably a double click) */
780      if(appdata->cur_gpx) return;
781    #endif
782    
783    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
784      gpx_t *gpx;      gpx_t *gpx;
785      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 792  static void gpxlist_view_onRowActivated(
792      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
793        printf("clicked delete\n");        printf("clicked delete\n");
794    
795    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
796        /* ask user what he wants */        /* ask user what he wants */
797        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
798                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
799                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
800                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   GTK_MESSAGE_QUESTION,
801                     GTK_BUTTONS_CANCEL,
802                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
803                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
804    
# Line 691  static void gpxlist_view_onRowActivated( Line 807  static void gpxlist_view_onRowActivated(
807                               _("Close"), 2,                               _("Close"), 2,
808                               NULL);                               NULL);
809    
810          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
811    #else
812    
813          GtkWidget *dialog =
814            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
815                                GTK_WINDOW(appdata->window),
816                                GTK_DIALOG_DESTROY_WITH_PARENT,
817                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
818                                _("Remove"), 1,
819                                _("Close"), 2,
820                                NULL);
821    
822          GtkWidget *content_area =
823            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
824    
825          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
826    
827          gtk_box_pack_start(GTK_BOX(hbox),
828             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
829                                       GTK_ICON_SIZE_DIALOG),
830                             FALSE, FALSE, 0);
831    
832          GtkWidget *label = gtk_label_new(
833                      _("Do you want to close this entry only or do "
834                        "you want to remove it completely from the list?"));
835    
836          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
837          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
838    
839          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
840          gtk_container_add (GTK_CONTAINER (content_area), hbox);
841    
842          gtk_widget_show_all (dialog);
843    #endif
844    
845        if(gpx->closed)        if(gpx->closed)
846          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
847    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));  
   
848        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
849        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
850    
# Line 725  static void gpxlist_view_onRowActivated( Line 874  static void gpxlist_view_onRowActivated(
874          gpx_t *new = NULL;          gpx_t *new = NULL;
875    
876          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
877            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
878          else          else
879            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
880    
881          if(new) {          if(new) {
882            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 763  static void gpxlist_view_onRowActivated( Line 912  static void gpxlist_view_onRowActivated(
912    
913          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
914        }        }
915  #ifndef USE_BREAD_CRUMB_TRAIL  
916        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  
917      }      }
918    }    }
919  }  }
920    
921    /* search gpx file in gpx list */
922    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx) {
923      GtkTreeModel *model =
924        gtk_tree_view_get_model(GTK_TREE_VIEW(appdata->gpxview));
925    
926      gboolean found =
927        gtk_tree_model_get_iter_first(model, iter);
928    
929      while(found) {
930        gpx_t *this_gpx;
931        gtk_tree_model_get(model, iter, GPXLIST_COL_DATA, &this_gpx, -1);
932    
933        if(gpx == this_gpx)
934          return TRUE;
935    
936        found = gtk_tree_model_iter_next(model, iter);
937      }
938    
939      return FALSE;
940    }
941    
942    
943  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
944  static gboolean  static gboolean
945  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
# Line 827  static GtkWidget *gpxlist_create_view_an Line 990  static GtkWidget *gpxlist_create_view_an
990    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
991                    -1, "Icon", renderer,                    -1, "Icon", renderer,
992                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
993                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
994            /* at least one entry needs to be sensitive. */
995            /* This is the delete icon if the PANNABLE_AREA is used */
996                      "sensitive", GPXLIST_COL_OPEN,
997    #endif
998                    NULL);                    NULL);
999    
1000    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 883  static GtkWidget *gpxlist_create_view_an Line 1050  static GtkWidget *gpxlist_create_view_an
1050    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1051                    -1, "Del", renderer,                    -1, "Del", renderer,
1052                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
1053                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
1054                    NULL);                    NULL);
1055  #endif  #endif
1056    
# Line 903  static GtkWidget *gpxlist_create_view_an Line 1070  static GtkWidget *gpxlist_create_view_an
1070      GtkTreeIter         iter;      GtkTreeIter         iter;
1071      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1072      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1073    
1074      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1075        sel_iter = iter;        sel_iter = iter;
1076        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 947  static GtkWidget *gpxlist_create_view_an Line 1114  static GtkWidget *gpxlist_create_view_an
1114  }  }
1115    
1116  /* add last entry in gpx list to visual representation */  /* add last entry in gpx list to visual representation */
1117  static void gpxlist_add(appdata_t *appdata, gpx_t *new) {  void gpxlist_add(appdata_t *appdata, gpx_t *new) {
1118    GtkTreeIter         iter;    GtkTreeIter         iter;
1119    
1120    gtk_list_store_append(appdata->gpxstore, &iter);    gtk_list_store_append(appdata->gpxstore, &iter);
# Line 957  static void gpxlist_add(appdata_t *appda Line 1124  static void gpxlist_add(appdata_t *appda
1124    gpx_t **gpx = &appdata->gpx;    gpx_t **gpx = &appdata->gpx;
1125    while(*gpx) gpx = &((*gpx)->next);    while(*gpx) gpx = &((*gpx)->next);
1126    *gpx = new;    *gpx = new;
1127    
1128      /* select new iter */
1129      GtkTreeSelection *selection =
1130        gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1131      gtk_tree_selection_select_iter(selection, &iter);
1132      GtkTreePath *path =
1133        gtk_tree_model_get_path(GTK_TREE_MODEL(appdata->gpxstore), &iter);
1134      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(appdata->gpxview),
1135                                   path, NULL, TRUE, 0.0, 0.0);
1136      gtk_tree_path_free(path);
1137  }  }
1138    
1139  /******************** end of gpxlist ********************/  /******************** end of gpxlist ********************/
1140    
1141  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1142    
1143    typedef struct {
1144      appdata_t *appdata;
1145      GtkWidget *dialog;
1146    } about_context_t;
1147    
1148    #ifdef ENABLE_BROWSER_INTERFACE
1149    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1150      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1151      browser_url(context->appdata,
1152                  "https://www.paypal.com/cgi-bin/webscr"
1153                  "?cmd=_s-xclick&hosted_button_id=7400558");
1154    }
1155    #endif
1156    
1157  static void  static void
1158  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1159    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1160    
1161      context.appdata = (appdata_t *)data;
1162    
1163    gtk_about_dialog_set_name(about, "GPXView");  #ifdef ENABLE_LIBLOCATION
1164    gtk_about_dialog_set_version(about, VERSION);    char *uses = "uses liblocation";
1165    gtk_about_dialog_set_copyright(about,  #elif defined(ENABLE_GPSBT)
1166           _("GPXView (c) 2008 by\n"    char *uses = "uses gpsbt and gpsd";
1167           "Till Harbaum <till@harbaum.org>\n"  #else
1168           "Geocaching.com: Tantil"));    char *uses = "uses gpsd";
1169    #endif
1170    gtk_about_dialog_set_website(about,  
1171         _("http://www.harbaum.org/till/maemo"));    const gchar *authors[] = {
1172        "Till Harbaum <till@harbaum.org>",
1173    gtk_about_dialog_set_comments(about,      "John Stowers <john.stowers@gmail.com>",
1174         _("Geocaching.com GPX file viewer"));      "GCVote: Guido Wegener <guido.wegener@gmx.de>",
1175        NULL };
1176    gtk_widget_show_all(GTK_WIDGET(about));  
1177    gtk_dialog_run(GTK_DIALOG(about));    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1178    gtk_widget_destroy(GTK_WIDGET(about));                          "name", "GPXView",
1179                            "version", VERSION,
1180                            "copyright", _("Copyright 2008-2009"),
1181                            "authors", authors,
1182                            "website", _("http://www.harbaum.org/till/maemo"),
1183                            "comments", _(uses),
1184                            NULL);
1185    
1186    #ifdef ENABLE_BROWSER_INTERFACE
1187      /* add a way to donate to the project */
1188      GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1189    
1190      GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1191      gtk_box_pack_start(GTK_BOX(hbox),
1192                         gtk_label_new(_("Do you like GPXView?")),
1193                         FALSE, FALSE, 0);
1194    
1195      GtkWidget *button = gtk_button_new();
1196      gtk_button_set_image(GTK_BUTTON(button),
1197                           icon_get_widget(ICON_MISC, 5));
1198      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1199      g_signal_connect(button, "clicked",
1200                       G_CALLBACK(on_paypal_button_clicked), &context);
1201      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1202    
1203      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1204      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1205                                  alignment);
1206    
1207      gtk_widget_show_all(alignment);
1208    #endif
1209    
1210      gtk_dialog_run(GTK_DIALOG(context.dialog));
1211      gtk_widget_destroy(context.dialog);
1212  }  }
1213    
1214  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1010  cb_menu_adddir(GtkWidget *window, gpoint Line 1236  cb_menu_adddir(GtkWidget *window, gpoint
1236    if(new) gpxlist_add(appdata, new);    if(new) gpxlist_add(appdata, new);
1237  }  }
1238    
 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);  
 }  
   
1239  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
1240  static void  static void
1241  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 1380  gpx_t *search_do(appdata_t *appdata, gpx
1380        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1381                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1382          hit = 1;          hit = 1;
1383        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1384                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1385          hit = 1;          hit = 1;
1386    
1387        if(hit) {        if(hit) {
# Line 1199  typedef struct { Line 1410  typedef struct {
1410    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1411  } search_context_t;  } search_context_t;
1412    
1413    
1414    static GtkWidget *check_button_new_with_label(char *label) {
1415    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1416      return gtk_check_button_new_with_label(label);
1417    #else
1418      GtkWidget *cbut =
1419        hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
1420      gtk_button_set_label(GTK_BUTTON(cbut), label);
1421      return cbut;
1422    #endif
1423    }
1424    
1425    static void check_button_set_active(GtkWidget *button, gboolean active) {
1426    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1427      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
1428    #else
1429      hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
1430    #endif
1431    }
1432    
1433    static gboolean check_button_get_active(GtkWidget *button) {
1434    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1435      return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
1436    #else
1437      return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));
1438    #endif
1439    }
1440    
1441  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1442    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1443    
1444    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1445    
1446    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1447    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 1471  cb_menu_search(GtkWidget *window, gpoint
1471    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1472    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1473    
1474    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1475    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);  
1476    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);
1477    
1478    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1479    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);  
1480    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);
1481    
1482    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1483    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);  
1484    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);
1485    
1486    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1487    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);  
1488    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);
1489    
1490    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 1493  cb_menu_search(GtkWidget *window, gpoint
1493    
1494    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1495                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1496      context.entry = entry_new();
1497    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1498                                context.entry = gtk_entry_new());                                context.entry);
1499    
1500    if(appdata->search_str)    if(appdata->search_str)
1501      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1502    
# Line 1271  cb_menu_search(GtkWidget *window, gpoint Line 1507  cb_menu_search(GtkWidget *window, gpoint
1507    
1508    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1509    
1510    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1511    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);  
1512    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1513    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1514                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1313  cb_menu_search(GtkWidget *window, gpoint Line 1548  cb_menu_search(GtkWidget *window, gpoint
1548                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1549  #endif  #endif
1550    
1551      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1552        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1553      else      else
1554        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1555    
1556      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1557        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1558      else      else
1559        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1560    
1561      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1562        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1563      else      else
1564        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1565    
1566      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1567        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1568      else      else
1569        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1570    
1571      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1572        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1573      else      else
1574        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1343  cb_menu_search(GtkWidget *window, gpoint Line 1578  cb_menu_search(GtkWidget *window, gpoint
1578      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1579      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1580          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1581    
1582        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1583    
1584  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1585        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        gpx_t *found =
1586            search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1587    
1588        /* do search result dialog here ... */        /* do search result dialog here ... */
1589        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, found);
1590    #ifndef USE_STACKABLE_WINDOW
1591        search_result_free(found);        search_result_free(found);
1592  #else  #else
1593          appdata->search_results = found;
1594    #endif
1595    #else
1596          gpx_t *found = NULL;
1597    
1598        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1599          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1600        else        else
# Line 1374  cb_menu_search(GtkWidget *window, gpoint Line 1615  cb_menu_search(GtkWidget *window, gpoint
1615      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1616  }  }
1617    
1618  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1619    
1620  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1621  static void  static void
# Line 1436  cb_menu_export_log(GtkWidget *widget, gp Line 1677  cb_menu_export_log(GtkWidget *widget, gp
1677    notes_log_export(appdata);    notes_log_export(appdata);
1678  }  }
1679    
1680  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1681  static void  static void
1682  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1683    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1450  cb_menu_export_garmin(GtkWidget *widget, Line 1691  cb_menu_export_garmin(GtkWidget *widget,
1691    garmin_export(appdata);    garmin_export(appdata);
1692  }  }
1693    
1694    #ifdef ENABLE_OSM_GPS_MAP
1695    static void
1696    cb_menu_map(GtkWidget *window, gpointer data) {
1697      map((appdata_t *)data);
1698    }
1699    #endif
1700    
1701    static void
1702    cb_menu_geomath(GtkWidget *window, gpointer data) {
1703      geomath_dialog((appdata_t *)data);
1704    }
1705    
1706    static void
1707    cb_menu_geotext(GtkWidget *window, gpointer data) {
1708      geotext_dialog((appdata_t *)data);
1709    }
1710    
1711    static void
1712    cb_menu_precpos(GtkWidget *window, gpointer data) {
1713      precise_position((appdata_t *)data);
1714    }
1715    
1716    static void
1717    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1718      geotoad((appdata_t *)data);
1719    }
1720    
1721  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1722  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  typedef struct {
1723    GtkWidget *but, *dialog = gtk_dialog_new();    char *label, *desc;
1724      GtkSignalFunc activate_cb;
1725    } menu_entry_t;
1726    
1727    typedef struct {
1728      const char *title;
1729      const menu_entry_t *menu;
1730      int len;
1731    } submenu_t;
1732    
1733    gtk_window_set_title(GTK_WINDOW(dialog), _("Export"));  #define COLUMNS  1
1734    
1735    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,  void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
                                     HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
                                     _("Export to Maemo Mapper"),  
                                     _("Write a Maemo Mapper POI file"));  
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), but);  
   
1736    
1737    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,    /* force closing of submenu dialog */
1738                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,    gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1739                                      _("Export Field Notes"),    gtk_widget_hide(menu);
                                     _("Write a Garmin Field Notes file"));  
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), but);  
1740    
1741      /* let gtk clean up */
1742      while(gtk_events_pending())
1743        gtk_main_iteration();
1744    }
1745    
1746    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,  static GtkWidget *app_submenu_create(appdata_t *appdata,
1747                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,                                       const submenu_t *submenu) {
1748                                      _("Export Garmin GPX"),  
1749                                      _("Write GPX file of modified points"));    /* create a oridinary dialog box */
1750    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), but);    GtkWidget *dialog = gtk_dialog_new();
1751      gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1752      gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1753      gtk_window_set_transient_for(GTK_WINDOW(dialog),
1754                                   GTK_WINDOW(appdata->window));
1755      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1756    
1757  #if 0    GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1758     g_signal_connect_swapped (dialog,    int x = 0, y = 0;
1759                               "response",  
1760                               G_CALLBACK (gtk_widget_destroy),    const menu_entry_t *menu_entries = submenu->menu;
1761                               dialog);    while(menu_entries->label) {
1762        GtkWidget *button = NULL;
1763    
1764        button = hildon_button_new_with_text(
1765                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1766                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1767                _(menu_entries->label), _(menu_entries->desc));
1768    
1769        /* try to center both texts */
1770        hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1771        hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1772    
1773        g_signal_connect(button, "clicked",
1774                         G_CALLBACK(on_submenu_entry_clicked), dialog);
1775    
1776        g_signal_connect(button, "clicked",
1777                         menu_entries->activate_cb, appdata);
1778    
1779        gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1780    
1781        x++;
1782        if(x == COLUMNS) { x = 0; y++; }
1783    
1784        menu_entries++;
1785      }
1786    
1787      gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1788    
1789      return dialog;
1790    }
1791    
1792    /* popup the dialog shaped submenu */
1793    static void submenu_popup(GtkWidget *menu) {
1794      gtk_widget_show_all(menu);
1795      gtk_dialog_run(GTK_DIALOG(menu));
1796      gtk_widget_hide(menu);
1797    }
1798    
1799    static void submenu_cleanup(GtkWidget *menu) {
1800      gtk_widget_destroy(menu);
1801    }
1802    
1803    static const menu_entry_t submenu_export_entries[] = {
1804    #ifdef ENABLE_MAEMO_MAPPER
1805      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1806        G_CALLBACK(cb_menu_export_mmpoi)  },
1807  #endif  #endif
1808      { "Export Field Notes",      "Save a Garmin Field Notes file",
1809        G_CALLBACK(cb_menu_export_log)    },
1810      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1811        G_CALLBACK(cb_menu_export_garmin) },
1812      { NULL, NULL, NULL }
1813    };
1814    
1815    static const submenu_t submenu_export = {
1816      "Export", submenu_export_entries,
1817      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1818    };
1819    
1820     gtk_widget_show_all (dialog);  /* the export submenu */
1821     gint result = gtk_dialog_run(GTK_DIALOG(dialog));  void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1822     gtk_widget_destroy(dialog);    if(!appdata->export_menu)
1823        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1824    
1825      submenu_popup(appdata->export_menu);
1826    }
1827    
1828    static const menu_entry_t submenu_tools_entries[] = {
1829      { "Geomath",          "Geocoordinate calculation",
1830        G_CALLBACK(cb_menu_geomath) },
1831      { "Geotext",          "Text analysis",
1832        G_CALLBACK(cb_menu_geotext) },
1833      { "Precise Position", "Calculate a precise GPS position",
1834        G_CALLBACK(cb_menu_precpos) },
1835      { "GeoToad",          "Use GeoToad online downloader",
1836        G_CALLBACK(cb_menu_geotoad) },
1837      { NULL, NULL, NULL }
1838    };
1839    
1840    static const submenu_t submenu_tools = {
1841      "Tools", submenu_tools_entries,
1842      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1843    };
1844    
1845    /* the tools submenu */
1846    void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1847      if(!appdata->tools_menu)
1848        appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1849    
1850      submenu_popup(appdata->tools_menu);
1851  }  }
1852    
1853  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
# Line 1494  HildonAppMenu *menu_create(appdata_t *ap Line 1855  HildonAppMenu *menu_create(appdata_t *ap
1855    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1856    
1857    /* ------- */    /* ------- */
1858      button = gtk_button_new_with_label(_("About"));
1859      g_signal_connect_after(button, "clicked",
1860                             G_CALLBACK(cb_menu_about), appdata);
1861      hildon_app_menu_append(menu, GTK_BUTTON(button));
1862    
1863    button = gtk_button_new_with_label(_("Settings"));    button = gtk_button_new_with_label(_("Settings"));
1864    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1865                           appdata);                           appdata);
# Line 1505  HildonAppMenu *menu_create(appdata_t *ap Line 1871  HildonAppMenu *menu_create(appdata_t *ap
1871                             G_CALLBACK(cb_menu_add), appdata);                             G_CALLBACK(cb_menu_add), appdata);
1872      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1873    
1874      button = gtk_button_new_with_label(_("Import dir"));      button = gtk_button_new_with_label(_("Import directory"));
1875      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1876                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1877      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
   
 #if 0  
   if(mode == MENU_GPXLIST || mode == MENU_CACHELIST) {  
     button = gtk_button_new_with_label(_("Export to Mapper"));  
     g_signal_connect_after(button, "clicked",  
                            G_CALLBACK(cb_menu_export_mmpoi), appdata);  
     hildon_app_menu_append(menu, GTK_BUTTON(button));  
   }  
   
   if(mode == MENU_GPXLIST) {  
     button = gtk_button_new_with_label(_("Export Field Notes"));  
     g_signal_connect_after(button, "clicked",  
                            G_CALLBACK(cb_menu_export_log), appdata);  
     hildon_app_menu_append(menu, GTK_BUTTON(button));  
1878    
1879      button = gtk_button_new_with_label(_("Export Garmin GPX"));      button = gtk_button_new_with_label(_("Export"));
1880      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1881                             G_CALLBACK(cb_menu_export_garmin), appdata);                             G_CALLBACK(on_export_clicked), appdata);
1882      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1883    
1884      button = gtk_button_new_with_label(_("Search"));      button = gtk_button_new_with_label(_("Search"));
# Line 1535  HildonAppMenu *menu_create(appdata_t *ap Line 1886  HildonAppMenu *menu_create(appdata_t *ap
1886                             G_CALLBACK(cb_menu_search), appdata);                             G_CALLBACK(cb_menu_search), appdata);
1887      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1888    }    }
 #else  
1889    
1890    if(mode == MENU_GPXLIST) {    button = gtk_button_new_with_label(_("Tools"));
1891      button = gtk_button_new_with_label(_("Export"));    g_signal_connect_after(button, "clicked",
1892      g_signal_connect_after(button, "clicked",                           G_CALLBACK(on_tools_clicked), appdata);
1893                             G_CALLBACK(on_export_clicked), appdata);    hildon_app_menu_append(menu, GTK_BUTTON(button));
     hildon_app_menu_append(menu, GTK_BUTTON(button));  
1894    
1895      button = gtk_button_new_with_label(_("Search"));  #ifdef ENABLE_OSM_GPS_MAP
1896        button = gtk_button_new_with_label(_("Map"));
1897      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1898                             G_CALLBACK(cb_menu_search), appdata);                             G_CALLBACK(cb_menu_map), appdata);
1899      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
   
1900  #endif  #endif
1901    
1902    button = gtk_button_new_with_label(_("About"));  #ifdef HILDON_HELP
1903      button = gtk_button_new_with_label(_("Help"));
1904    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
1905                           G_CALLBACK(cb_menu_about), appdata);                           G_CALLBACK(cb_menu_help), appdata);
1906    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1907    #endif
1908    
1909    gtk_widget_show(GTK_WIDGET(menu));    gtk_widget_show_all(GTK_WIDGET(menu));
1910    
1911    return menu;    return menu;
1912  }  }
1913  #else  #else
1914    
1915  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1916    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1917    menu = gtk_menu_new();    menu = gtk_menu_new();
1918    
1919  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1920    appdata->menu_import =    appdata->menu_import =
1921  #endif  #endif
1922    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1573  void menu_create(appdata_t *appdata) { Line 1924  void menu_create(appdata_t *appdata) {
1924    GtkWidget *submenu = gtk_menu_new();    GtkWidget *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    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1928    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1929    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1930    
1931    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1932    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1933    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1934    
# Line 1595  void menu_create(appdata_t *appdata) { Line 1946  void menu_create(appdata_t *appdata) {
1946    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1947  #endif  #endif
1948    
1949  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1950    appdata->menu_export =    appdata->menu_export =
1951  #endif  #endif
1952      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1603  void menu_create(appdata_t *appdata) { Line 1954  void menu_create(appdata_t *appdata) {
1954    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1955    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1956    
1957  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1958    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1959    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1960    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1961                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1962  #endif  #endif
1963    
1964    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1965    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1966    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1967                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1968    
1969    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1970    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1971    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1972                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1973    
1974  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1975    appdata->menu_search =    appdata->menu_search =
1976  #endif  #endif
1977    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1978    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1979    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1980    
1981    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1982    
 #ifndef NO_COPY_N_PASTE  
1983    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1984    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1985    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1986    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1987    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1660  void menu_create(appdata_t *appdata) { Line 2008  void menu_create(appdata_t *appdata) {
2008    
2009    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2010    
2011    #ifdef ENABLE_OSM_GPS_MAP
2012      item = gtk_menu_item_new_with_label( _("Map") );
2013      gtk_menu_append(GTK_MENU_SHELL(menu), item);
2014      g_signal_connect(item, "activate",
2015                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
2016    #endif
2017    
2018    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
2019    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
2020    submenu = gtk_menu_new();    submenu = gtk_menu_new();
2021    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
2022    
2023    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
2024    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2025    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2026                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
2027    
2028    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
2029    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2030    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2031                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
2032    
2033    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
2034    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2035    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2036                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2037    
2038      item = gtk_menu_item_new_with_label( _("GeoToad") );
2039      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2040      g_signal_connect(item, "activate",
2041                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2042    
2043    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2044    
2045  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
2046    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
2047    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
2048    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
2049  #endif  #endif
2050    
2051    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
2052    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
2053    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
2054    
# Line 1719  void menu_create(appdata_t *appdata) { Line 2079  void menu_create(appdata_t *appdata) {
2079  /********************* end of menu **********************/  /********************* end of menu **********************/
2080    
2081  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2082      gconf_save_state(appdata);
2083    
2084    gpx_free_all(appdata->gpx);    gpx_free_all(appdata->gpx);
2085    if(appdata->path) free(appdata->path);  
2086    if(appdata->image_path) free(appdata->image_path);  #ifdef USE_STACKABLE_WINDOW
2087    if(appdata->search_str) free(appdata->search_str);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
2088      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
2089    #endif
2090    
2091    gnome_vfs_shutdown();    gnome_vfs_shutdown();
2092    icons_free();    icons_free();
# Line 1752  void cleanup(appdata_t *appdata) { Line 2116  void cleanup(appdata_t *appdata) {
2116    puts("everything is gone");    puts("everything is gone");
2117  }  }
2118    
2119  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2120    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2121    
   gconf_save_state(appdata);  
2122    gtk_main_quit();    gtk_main_quit();
2123    appdata->window = NULL;    appdata->window = NULL;
2124  }  }
2125    
2126  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
2127                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
2128    int handled = FALSE;    int handled = FALSE;
2129    
2130    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1770  gboolean on_window_key_press(GtkWidget * Line 2132  gboolean on_window_key_press(GtkWidget *
2132    switch(event->keyval) {    switch(event->keyval) {
2133  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2134    
 #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  
   
2135  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
2136    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
2137      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1825  gboolean on_window_key_press(GtkWidget * Line 2178  gboolean on_window_key_press(GtkWidget *
2178    return handled;    return handled;
2179  }  }
2180    
2181  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2182  typedef struct {  typedef struct {
2183    int level;    int level;
2184    appdata_t *appdata;    appdata_t *appdata;
# Line 1917  crumb_back(gpointer data) { Line 2270  crumb_back(gpointer data) {
2270    
2271    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2272    g_free(data);    g_free(data);
2273    
2274    #ifdef ENABLE_OSM_GPS_MAP
2275      map_update(crumb->appdata);
2276    #endif
2277  }  }
2278    
2279  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 1957  static void crumb_add(appdata_t *appdata Line 2314  static void crumb_add(appdata_t *appdata
2314  #endif  #endif
2315    }    }
2316    
2317    #ifdef USE_BREAD_CRUMB_TRAIL
2318    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2319                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2320    #else
2321      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2322    #endif
2323    
2324    #ifdef ENABLE_OSM_GPS_MAP
2325      map_update(appdata);
2326    #endif
2327  }  }
2328  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2329    
2330  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2331  #ifndef USE_MAEMO    printf("main after settings redraw\n");
2332    // in non-maemo setup this can only affect the main screen as  
2333    // the menu is blocked while a dialog is open. also the main    if(!appdata->cur_view) {
2334    // screen is always present      printf("no active view\n");
2335    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);  
2336    }    }
2337  #else  
2338    /* 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 */
2339    /* need to be redrawn */    /* need to be redrawn */
2340    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 1998  void main_after_settings_redraw(appdata_ Line 2358  void main_after_settings_redraw(appdata_
2358    }    }
2359    
2360    if(redraw) {    if(redraw) {
2361      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2362    
2363    #ifdef USE_STACKABLE_WINDOW
2364        HildonWindowStack *stack = hildon_window_stack_get_default();
2365        container = hildon_window_stack_peek(stack);
2366    #endif
2367    
2368        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2369      switch(redraw) {      switch(redraw) {
2370      case 1:      case 1:
2371        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 2013  void main_after_settings_redraw(appdata_ Line 2380  void main_after_settings_redraw(appdata_
2380        break;        break;
2381      }      }
2382    
2383      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2384      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2385    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2386        else
2387  #endif  #endif
2388          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2389    
2390        gtk_widget_show_all(container);
2391      }
2392  }  }
2393    
2394  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2037  int main(int argc, char *argv[]) { Line 2409  int main(int argc, char *argv[]) {
2409    
2410    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2411    
2412      misc_init();
2413    
2414      curl_global_init(CURL_GLOBAL_ALL);
2415    
2416  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2417    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2418    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2045  int main(int argc, char *argv[]) { Line 2421  int main(int argc, char *argv[]) {
2421      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2422    }    }
2423    
2424    #ifdef ENABLE_MAEMO_MAPPER
2425    dbus_register(&appdata);    dbus_register(&appdata);
2426  #endif  #endif
2427    #endif
2428    
2429    icons_init();    icons_init();
2430    
# Line 2070  int main(int argc, char *argv[]) { Line 2448  int main(int argc, char *argv[]) {
2448    /* Create a Window. */    /* Create a Window. */
2449    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2450    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2451    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2452  #endif  #endif
2453    
2454    #if MAEMO_VERSION_MAJOR == 5
2455    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2456    #endif
2457    
2458    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2459                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2460    
2461    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2462                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2463    
2464      /* prepare clipboard */
2465      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2466      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2467    
2468    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2469    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2470  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2471    menu_create(&appdata);    menu_create(&appdata);
2472  #else  #else
# Line 2096  int main(int argc, char *argv[]) { Line 2480  int main(int argc, char *argv[]) {
2480    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);
2481    
2482    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2483    #else
2484    #ifdef BCT
2485      /* on non-hildon machines we use some custom made breadcrumbtrail */
2486      /* replacement */
2487      appdata.bct = bct_new();
2488      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2489    #endif
2490    #endif
2491    
2492    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2493    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2494  #endif  #endif
2495    
Legend:
Removed from v.4  
changed lines
  Added in v.226