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 206 by harbaum, Tue Nov 24 12:42:31 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      if(appdata->search_results) {
601        search_result_free(appdata->search_results);
602        appdata->search_results = NULL;
603      }
604      appdata->cur_gpx = NULL;
605    
606    #ifdef ENABLE_OSM_GPS_MAP
607      map_update(appdata);
608    #endif
609    
610      /* restore cur_view */
611      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
612    }
613    
614  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
615    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
616    
617    gtk_window_set_title(GTK_WINDOW(window), gpx->name);    /* store last "cur_view" in window */
618      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
619    
620    gtk_container_add(GTK_CONTAINER(window),    appdata->cur_gpx = gpx;
621                      cachelist_create(appdata, gpx, NULL));    char *title = g_strdup_printf("%s - GPXView", gpx->name);
622      gtk_window_set_title(GTK_WINDOW(window), title);
623      g_free(title);
624    
625      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
626      gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
627    
628    
629    hildon_window_set_app_menu(HILDON_WINDOW(window),    hildon_window_set_app_menu(HILDON_WINDOW(window),
630                               menu_create(appdata, MENU_CACHELIST));                               menu_create(appdata, MENU_CACHELIST));
631    
632      g_signal_connect(G_OBJECT(window), "destroy",
633                       G_CALLBACK(on_cachelist_destroy), appdata);
634    
635    gtk_widget_show_all(window);    gtk_widget_show_all(window);
636    
637    #ifdef ENABLE_OSM_GPS_MAP
638      map_update(appdata);
639    #endif
640  }  }
641  #endif  #endif
642  #endif  #endif
# Line 612  static void gpxlist_set(GtkListStore *st Line 694  static void gpxlist_set(GtkListStore *st
694                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
695                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
696  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
697                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),
698  #endif  #endif
699                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
700                       -1);                       -1);
# Line 658  static void gpxlist_close(appdata_t *app Line 740  static void gpxlist_close(appdata_t *app
740    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
741  }  }
742    
743    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
744    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
745    #ifdef USE_STACKABLE_WINDOW
746      if(!appdata->cur_gpx)
747    #endif
748        cachelist_dialog(appdata, gpx);
749    #ifdef USE_STACKABLE_WINDOW
750      else
751        printf("selected gpx, but cachelist window already present\n");
752    #endif
753    #else
754      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
755      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
756      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
757      gtk_widget_show_all(appdata->vbox);
758    
759      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
760    #endif
761    }
762    
763  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
764                            GtkTreePath        *path,                            GtkTreePath        *path,
765                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 666  static void gpxlist_view_onRowActivated( Line 768  static void gpxlist_view_onRowActivated(
768    GtkTreeIter   iter;    GtkTreeIter   iter;
769    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
770    
771    #ifdef USE_MAEMO
772      /* check if a cache is already selected and ignore click if yes */
773      /* (was probably a double click) */
774      if(appdata->cur_gpx) return;
775    #endif
776    
777    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
778      gpx_t *gpx;      gpx_t *gpx;
779      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 786  static void gpxlist_view_onRowActivated(
786      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
787        printf("clicked delete\n");        printf("clicked delete\n");
788    
789    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
790        /* ask user what he wants */        /* ask user what he wants */
791        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
792                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
793                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
794                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   GTK_MESSAGE_QUESTION,
795                     GTK_BUTTONS_CANCEL,
796                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
797                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
798    
# Line 691  static void gpxlist_view_onRowActivated( Line 801  static void gpxlist_view_onRowActivated(
801                               _("Close"), 2,                               _("Close"), 2,
802                               NULL);                               NULL);
803    
804          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
805    #else
806    
807          GtkWidget *dialog =
808            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
809                                GTK_WINDOW(appdata->window),
810                                GTK_DIALOG_DESTROY_WITH_PARENT,
811                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
812                                _("Remove"), 1,
813                                _("Close"), 2,
814                                NULL);
815    
816          GtkWidget *content_area =
817            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
818    
819          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
820    
821          gtk_box_pack_start(GTK_BOX(hbox),
822             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
823                                       GTK_ICON_SIZE_DIALOG),
824                             FALSE, FALSE, 0);
825    
826          GtkWidget *label = gtk_label_new(
827                      _("Do you want to close this entry only or do "
828                        "you want to remove it completely from the list?"));
829    
830          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
831          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
832    
833          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
834          gtk_container_add (GTK_CONTAINER (content_area), hbox);
835    
836          gtk_widget_show_all (dialog);
837    #endif
838    
839        if(gpx->closed)        if(gpx->closed)
840          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
841    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));  
   
842        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
843        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
844    
# Line 725  static void gpxlist_view_onRowActivated( Line 868  static void gpxlist_view_onRowActivated(
868          gpx_t *new = NULL;          gpx_t *new = NULL;
869    
870          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
871            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
872          else          else
873            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
874    
875          if(new) {          if(new) {
876            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 763  static void gpxlist_view_onRowActivated( Line 906  static void gpxlist_view_onRowActivated(
906    
907          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
908        }        }
909  #ifndef USE_BREAD_CRUMB_TRAIL  
910        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  
911      }      }
912    }    }
913  }  }
# Line 827  static GtkWidget *gpxlist_create_view_an Line 962  static GtkWidget *gpxlist_create_view_an
962    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
963                    -1, "Icon", renderer,                    -1, "Icon", renderer,
964                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
965                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
966            /* at least one entry needs to be sensitive. */
967            /* This is the delete icon if the PANNABLE_AREA is used */
968                      "sensitive", GPXLIST_COL_OPEN,
969    #endif
970                    NULL);                    NULL);
971    
972    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 883  static GtkWidget *gpxlist_create_view_an Line 1022  static GtkWidget *gpxlist_create_view_an
1022    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1023                    -1, "Del", renderer,                    -1, "Del", renderer,
1024                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
1025                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
1026                    NULL);                    NULL);
1027  #endif  #endif
1028    
# Line 903  static GtkWidget *gpxlist_create_view_an Line 1042  static GtkWidget *gpxlist_create_view_an
1042      GtkTreeIter         iter;      GtkTreeIter         iter;
1043      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1044      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1045    
1046      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1047        sel_iter = iter;        sel_iter = iter;
1048        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 963  static void gpxlist_add(appdata_t *appda Line 1102  static void gpxlist_add(appdata_t *appda
1102    
1103  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1104    
1105    typedef struct {
1106      appdata_t *appdata;
1107      GtkWidget *dialog;
1108    } about_context_t;
1109    
1110    #ifdef ENABLE_BROWSER_INTERFACE
1111    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1112      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1113      browser_url(context->appdata,
1114                  "https://www.paypal.com/cgi-bin/webscr"
1115                  "?cmd=_s-xclick&hosted_button_id=7400558");
1116    }
1117    #endif
1118    
1119  static void  static void
1120  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1121    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1122    
1123      context.appdata = (appdata_t *)data;
1124    
1125    #ifdef ENABLE_LIBLOCATION
1126      char *uses = "uses liblocation";
1127    #elif defined(ENABLE_GPSBT)
1128      char *uses = "uses gpsbt and gpsd";
1129    #else
1130      char *uses = "uses gpsd";
1131    #endif
1132    
1133      const gchar *authors[] = {
1134        "Till Harbaum <till@harbaum.org>",
1135        "John Stowers <john.stowers@gmail.com>",
1136        "GCVote: Guido Wegener <guido.wegener@gmx.de>",
1137        NULL };
1138    
1139      context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1140                            "name", "GPXView",
1141                            "version", VERSION,
1142                            "copyright", _("Copyright 2008-2009"),
1143                            "authors", authors,
1144                            "website", _("http://www.harbaum.org/till/maemo"),
1145                            "comments", _(uses),
1146                            NULL);
1147    
1148    gtk_about_dialog_set_name(about, "GPXView");  #ifdef ENABLE_BROWSER_INTERFACE
1149    gtk_about_dialog_set_version(about, VERSION);    /* add a way to donate to the project */
1150    gtk_about_dialog_set_copyright(about,    GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1151           _("GPXView (c) 2008 by\n"  
1152           "Till Harbaum <till@harbaum.org>\n"    GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1153           "Geocaching.com: Tantil"));    gtk_box_pack_start(GTK_BOX(hbox),
1154                         gtk_label_new(_("Do you like GPXView?")),
1155    gtk_about_dialog_set_website(about,                       FALSE, FALSE, 0);
1156         _("http://www.harbaum.org/till/maemo"));  
1157      GtkWidget *button = gtk_button_new();
1158    gtk_about_dialog_set_comments(about,    gtk_button_set_image(GTK_BUTTON(button),
1159         _("Geocaching.com GPX file viewer"));                         icon_get_widget(ICON_MISC, 5));
1160      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1161    gtk_widget_show_all(GTK_WIDGET(about));    g_signal_connect(button, "clicked",
1162    gtk_dialog_run(GTK_DIALOG(about));                     G_CALLBACK(on_paypal_button_clicked), &context);
1163    gtk_widget_destroy(GTK_WIDGET(about));    gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1164    
1165      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1166      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1167                                  alignment);
1168    
1169      gtk_widget_show_all(alignment);
1170    #endif
1171    
1172      gtk_dialog_run(GTK_DIALOG(context.dialog));
1173      gtk_widget_destroy(context.dialog);
1174  }  }
1175    
1176  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1010  cb_menu_adddir(GtkWidget *window, gpoint Line 1198  cb_menu_adddir(GtkWidget *window, gpoint
1198    if(new) gpxlist_add(appdata, new);    if(new) gpxlist_add(appdata, new);
1199  }  }
1200    
 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);  
 }  
   
1201  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
1202  static void  static void
1203  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 1342  gpx_t *search_do(appdata_t *appdata, gpx
1342        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1343                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1344          hit = 1;          hit = 1;
1345        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1346                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1347          hit = 1;          hit = 1;
1348    
1349        if(hit) {        if(hit) {
# Line 1199  typedef struct { Line 1372  typedef struct {
1372    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1373  } search_context_t;  } search_context_t;
1374    
1375    
1376    static GtkWidget *check_button_new_with_label(char *label) {
1377    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1378      return gtk_check_button_new_with_label(label);
1379    #else
1380      GtkWidget *cbut =
1381        hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
1382      gtk_button_set_label(GTK_BUTTON(cbut), label);
1383      return cbut;
1384    #endif
1385    }
1386    
1387    static void check_button_set_active(GtkWidget *button, gboolean active) {
1388    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1389      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
1390    #else
1391      hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
1392    #endif
1393    }
1394    
1395    static gboolean check_button_get_active(GtkWidget *button) {
1396    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1397      return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
1398    #else
1399      return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));
1400    #endif
1401    }
1402    
1403  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1404    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1405    
1406    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1407    
1408    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1409    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 1433  cb_menu_search(GtkWidget *window, gpoint
1433    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1434    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1435    
1436    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1437    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);  
1438    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);
1439    
1440    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1441    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);  
1442    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);
1443    
1444    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1445    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);  
1446    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);
1447    
1448    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1449    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);  
1450    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);
1451    
1452    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 1455  cb_menu_search(GtkWidget *window, gpoint
1455    
1456    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1457                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1458    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1459      context.entry = gtk_entry_new();
1460    #else
1461      context.entry = hildon_entry_new(HILDON_SIZE_AUTO);
1462    #endif
1463    
1464    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1465                                context.entry = gtk_entry_new());                                context.entry);
1466    
1467    if(appdata->search_str)    if(appdata->search_str)
1468      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1469    
# Line 1271  cb_menu_search(GtkWidget *window, gpoint Line 1474  cb_menu_search(GtkWidget *window, gpoint
1474    
1475    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1476    
1477    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1478    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);  
1479    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1480    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1481                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1313  cb_menu_search(GtkWidget *window, gpoint Line 1515  cb_menu_search(GtkWidget *window, gpoint
1515                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1516  #endif  #endif
1517    
1518      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1519        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1520      else      else
1521        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1522    
1523      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1524        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1525      else      else
1526        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1527    
1528      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1529        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1530      else      else
1531        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1532    
1533      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1534        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1535      else      else
1536        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1537    
1538      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1539        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1540      else      else
1541        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1343  cb_menu_search(GtkWidget *window, gpoint Line 1545  cb_menu_search(GtkWidget *window, gpoint
1545      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1546      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1547          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1548    
1549        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1550    
1551  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1552        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        gpx_t *found =
1553            search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1554    
1555        /* do search result dialog here ... */        /* do search result dialog here ... */
1556        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, found);
1557    #ifndef USE_STACKABLE_WINDOW
1558        search_result_free(found);        search_result_free(found);
1559  #else  #else
1560          appdata->search_results = found;
1561    #endif
1562    #else
1563          gpx_t *found = NULL;
1564    
1565        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1566          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1567        else        else
# Line 1374  cb_menu_search(GtkWidget *window, gpoint Line 1582  cb_menu_search(GtkWidget *window, gpoint
1582      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1583  }  }
1584    
1585  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1586    
1587  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1588  static void  static void
# Line 1436  cb_menu_export_log(GtkWidget *widget, gp Line 1644  cb_menu_export_log(GtkWidget *widget, gp
1644    notes_log_export(appdata);    notes_log_export(appdata);
1645  }  }
1646    
1647  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1648  static void  static void
1649  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1650    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1450  cb_menu_export_garmin(GtkWidget *widget, Line 1658  cb_menu_export_garmin(GtkWidget *widget,
1658    garmin_export(appdata);    garmin_export(appdata);
1659  }  }
1660    
1661    #ifdef ENABLE_OSM_GPS_MAP
1662    static void
1663    cb_menu_map(GtkWidget *window, gpointer data) {
1664      map((appdata_t *)data);
1665    }
1666    #endif
1667    
1668    static void
1669    cb_menu_geomath(GtkWidget *window, gpointer data) {
1670      geomath_dialog((appdata_t *)data);
1671    }
1672    
1673    static void
1674    cb_menu_geotext(GtkWidget *window, gpointer data) {
1675      geotext_dialog((appdata_t *)data);
1676    }
1677    
1678    static void
1679    cb_menu_precpos(GtkWidget *window, gpointer data) {
1680      precise_position((appdata_t *)data);
1681    }
1682    
1683    static void
1684    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1685      geotoad((appdata_t *)data);
1686    }
1687    
1688  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1689  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  typedef struct {
1690      char *label, *desc;
1691      GtkSignalFunc activate_cb;
1692    } menu_entry_t;
1693    
1694    typedef struct {
1695      const char *title;
1696      const menu_entry_t *menu;
1697      int len;
1698    } submenu_t;
1699    
1700    #define COLUMNS  1
1701    
1702    void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1703    
1704      /* force closing of submenu dialog */
1705      gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1706      gtk_widget_hide(menu);
1707    
1708      /* let gtk clean up */
1709      while(gtk_events_pending())
1710        gtk_main_iteration();
1711    }
1712    
1713    static GtkWidget *app_submenu_create(appdata_t *appdata,
1714                                         const submenu_t *submenu) {
1715    
1716      /* create a oridinary dialog box */
1717    GtkWidget *dialog = gtk_dialog_new();    GtkWidget *dialog = gtk_dialog_new();
1718      gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1719      gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1720      gtk_window_set_transient_for(GTK_WINDOW(dialog),
1721                                   GTK_WINDOW(appdata->window));
1722      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1723    
1724      GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1725      int x = 0, y = 0;
1726    
1727      const menu_entry_t *menu_entries = submenu->menu;
1728      while(menu_entries->label) {
1729        GtkWidget *button = NULL;
1730    
1731        button = hildon_button_new_with_text(
1732                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1733                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1734                _(menu_entries->label), _(menu_entries->desc));
1735    
1736        /* try to center both texts */
1737        hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1738        hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1739    
1740        g_signal_connect(button, "clicked",
1741                         G_CALLBACK(on_submenu_entry_clicked), dialog);
1742    
1743        g_signal_connect(button, "clicked",
1744                         menu_entries->activate_cb, appdata);
1745    
1746        gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1747    
1748        x++;
1749        if(x == COLUMNS) { x = 0; y++; }
1750    
1751    GtkWidget *but =      menu_entries++;
1752      hildon_button_new_with_text(HILDON_SIZE_AUTO,    }
1753                                  HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
1754                                  _("Export to Maemo Mapper"),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1755                                  _("Write a Maemo Mapper POI file"));  
1756      return dialog;
1757    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),  }
1758                      but);  
1759    /* popup the dialog shaped submenu */
1760    static void submenu_popup(GtkWidget *menu) {
1761  #if 0    gtk_widget_show_all(menu);
1762     g_signal_connect_swapped (dialog,    gtk_dialog_run(GTK_DIALOG(menu));
1763                               "response",    gtk_widget_hide(menu);
1764                               G_CALLBACK (gtk_widget_destroy),  }
1765                               dialog);  
1766  #endif  static void submenu_cleanup(GtkWidget *menu) {
1767      gtk_widget_destroy(menu);
1768     gtk_widget_show_all (dialog);  }
1769     gint result = gtk_dialog_run(GTK_DIALOG(dialog));  
1770     gtk_widget_destroy(dialog);  static const menu_entry_t submenu_export_entries[] = {
1771    #ifdef ENABLE_MAEMO_MAPPER
1772      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1773        G_CALLBACK(cb_menu_export_mmpoi)  },
1774    #endif
1775      { "Export Field Notes",      "Save a Garmin Field Notes file",
1776        G_CALLBACK(cb_menu_export_log)    },
1777      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1778        G_CALLBACK(cb_menu_export_garmin) },
1779      { NULL, NULL, NULL }
1780    };
1781    
1782    static const submenu_t submenu_export = {
1783      "Export", submenu_export_entries,
1784      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1785    };
1786    
1787    /* the export submenu */
1788    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1789      if(!appdata->export_menu)
1790        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1791    
1792      submenu_popup(appdata->export_menu);
1793    }
1794    
1795    static const menu_entry_t submenu_tools_entries[] = {
1796      { "Geomath",          "Geocoordinate calculation",
1797        G_CALLBACK(cb_menu_geomath) },
1798      { "Geotext",          "Text analysis",
1799        G_CALLBACK(cb_menu_geotext) },
1800      { "Precise Position", "Calculate a precise GPS position",
1801        G_CALLBACK(cb_menu_precpos) },
1802      { "GeoToad",          "Use GeoToad online downloader",
1803        G_CALLBACK(cb_menu_geotoad) },
1804      { NULL, NULL, NULL }
1805    };
1806    
1807    static const submenu_t submenu_tools = {
1808      "Tools", submenu_tools_entries,
1809      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1810    };
1811    
1812    /* the tools submenu */
1813    void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1814      if(!appdata->tools_menu)
1815        appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1816    
1817      submenu_popup(appdata->tools_menu);
1818  }  }
1819    
1820  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 1822  HildonAppMenu *menu_create(appdata_t *ap
1822    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1823    
1824    /* ------- */    /* ------- */
1825      button = gtk_button_new_with_label(_("About"));
1826      g_signal_connect_after(button, "clicked",
1827                             G_CALLBACK(cb_menu_about), appdata);
1828      hildon_app_menu_append(menu, GTK_BUTTON(button));
1829    
1830    button = gtk_button_new_with_label(_("Settings"));    button = gtk_button_new_with_label(_("Settings"));
1831    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1832                           appdata);                           appdata);
# Line 1492  HildonAppMenu *menu_create(appdata_t *ap Line 1838  HildonAppMenu *menu_create(appdata_t *ap
1838                             G_CALLBACK(cb_menu_add), appdata);                             G_CALLBACK(cb_menu_add), appdata);
1839      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1840    
1841      button = gtk_button_new_with_label(_("Import dir"));      button = gtk_button_new_with_label(_("Import directory"));
1842      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1843                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1844      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1845    
1846    if(mode == MENU_GPXLIST || mode == MENU_CACHELIST) {      button = gtk_button_new_with_label(_("Export"));
     button = gtk_button_new_with_label(_("Export to Mapper"));  
1847      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1848                             G_CALLBACK(cb_menu_export_mmpoi), appdata);                             G_CALLBACK(on_export_clicked), appdata);
1849      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1850    
1851    if(mode == MENU_GPXLIST) {      button = gtk_button_new_with_label(_("Search"));
     button = gtk_button_new_with_label(_("Export Field Notes"));  
1852      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1853                             G_CALLBACK(cb_menu_export_log), appdata);                             G_CALLBACK(cb_menu_search), appdata);
1854      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1855      }
1856    
1857      button = gtk_button_new_with_label(_("Export Garmin GPX"));    button = gtk_button_new_with_label(_("Tools"));
1858      g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
1859                             G_CALLBACK(cb_menu_export_garmin), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1860      hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1861    
1862      button = gtk_button_new_with_label(_("Search"));  #ifdef ENABLE_OSM_GPS_MAP
1863        button = gtk_button_new_with_label(_("Map"));
1864      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1865                             G_CALLBACK(cb_menu_search), appdata);                             G_CALLBACK(cb_menu_map), appdata);
1866      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1867    }  #endif
1868    
1869    button = gtk_button_new_with_label(_("About"));  #ifdef HILDON_HELP
1870      button = gtk_button_new_with_label(_("Help"));
1871    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
1872                           G_CALLBACK(cb_menu_about), appdata);                           G_CALLBACK(cb_menu_help), appdata);
1873    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1874    #endif
1875    
1876    gtk_widget_show(GTK_WIDGET(menu));    gtk_widget_show_all(GTK_WIDGET(menu));
1877    
1878    return menu;    return menu;
1879  }  }
1880  #else  #else
1881    
1882  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1883    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1884    menu = gtk_menu_new();    menu = gtk_menu_new();
1885    
1886  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1887    appdata->menu_import =    appdata->menu_import =
1888  #endif  #endif
1889    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 1891  void menu_create(appdata_t *appdata) {
1891    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1892    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1893    
1894    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1895    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1896    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1897    
1898    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1899    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1900    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1901    
# Line 1566  void menu_create(appdata_t *appdata) { Line 1913  void menu_create(appdata_t *appdata) {
1913    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1914  #endif  #endif
1915    
1916  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1917    appdata->menu_export =    appdata->menu_export =
1918  #endif  #endif
1919      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 1921  void menu_create(appdata_t *appdata) {
1921    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1922    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1923    
1924  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1925    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1926    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1927    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1928                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1929  #endif  #endif
1930    
1931    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1932    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1933    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1934                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1935    
1936    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1937    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1938    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1939                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1940    
1941  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1942    appdata->menu_search =    appdata->menu_search =
1943  #endif  #endif
1944    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1945    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1946    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1947    
1948    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1949    
 #ifndef NO_COPY_N_PASTE  
1950    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1951    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1952    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1953    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1954    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1631  void menu_create(appdata_t *appdata) { Line 1975  void menu_create(appdata_t *appdata) {
1975    
1976    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1977    
1978    #ifdef ENABLE_OSM_GPS_MAP
1979      item = gtk_menu_item_new_with_label( _("Map") );
1980      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1981      g_signal_connect(item, "activate",
1982                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1983    #endif
1984    
1985    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
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();
1988    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1989    
1990    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1991    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1992    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1993                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1994    
1995    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1996    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1997    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1998                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1999    
2000    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
2001    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2002    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2003                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2004    
2005      item = gtk_menu_item_new_with_label( _("GeoToad") );
2006      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2007      g_signal_connect(item, "activate",
2008                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2009    
2010    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2011    
2012  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
2013    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
2014    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
2015    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
2016  #endif  #endif
2017    
2018    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
2019    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
2020    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
2021    
# Line 1695  void cleanup(appdata_t *appdata) { Line 2051  void cleanup(appdata_t *appdata) {
2051    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
2052    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
2053    
2054    #ifdef USE_STACKABLE_WINDOW
2055      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
2056      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
2057    #endif
2058    
2059    gnome_vfs_shutdown();    gnome_vfs_shutdown();
2060    icons_free();    icons_free();
2061    gps_release(appdata);    gps_release(appdata);
# Line 1723  void cleanup(appdata_t *appdata) { Line 2084  void cleanup(appdata_t *appdata) {
2084    puts("everything is gone");    puts("everything is gone");
2085  }  }
2086    
2087  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2088    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2089    
2090    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 1732  void on_window_destroy (GtkWidget *widge Line 2093  void on_window_destroy (GtkWidget *widge
2093  }  }
2094    
2095  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
2096                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
2097    int handled = FALSE;    int handled = FALSE;
2098    
2099    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1741  gboolean on_window_key_press(GtkWidget * Line 2101  gboolean on_window_key_press(GtkWidget *
2101    switch(event->keyval) {    switch(event->keyval) {
2102  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2103    
 #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  
   
2104  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
2105    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
2106      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1796  gboolean on_window_key_press(GtkWidget * Line 2147  gboolean on_window_key_press(GtkWidget *
2147    return handled;    return handled;
2148  }  }
2149    
2150  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2151  typedef struct {  typedef struct {
2152    int level;    int level;
2153    appdata_t *appdata;    appdata_t *appdata;
# Line 1888  crumb_back(gpointer data) { Line 2239  crumb_back(gpointer data) {
2239    
2240    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2241    g_free(data);    g_free(data);
2242    
2243    #ifdef ENABLE_OSM_GPS_MAP
2244      map_update(crumb->appdata);
2245    #endif
2246  }  }
2247    
2248  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 2283  static void crumb_add(appdata_t *appdata
2283  #endif  #endif
2284    }    }
2285    
2286    #ifdef USE_BREAD_CRUMB_TRAIL
2287    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2288                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2289    #else
2290      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2291    #endif
2292    
2293    #ifdef ENABLE_OSM_GPS_MAP
2294      map_update(appdata);
2295    #endif
2296  }  }
2297  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2298    
2299  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2300  #ifndef USE_MAEMO    printf("main after settings redraw\n");
2301    // in non-maemo setup this can only affect the main screen as  
2302    // the menu is blocked while a dialog is open. also the main    if(!appdata->cur_view) {
2303    // screen is always present      printf("no active view\n");
2304    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);  
2305    }    }
2306  #else  
2307    /* 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 */
2308    /* need to be redrawn */    /* need to be redrawn */
2309    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 1969  void main_after_settings_redraw(appdata_ Line 2327  void main_after_settings_redraw(appdata_
2327    }    }
2328    
2329    if(redraw) {    if(redraw) {
2330      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2331    
2332    #ifdef USE_STACKABLE_WINDOW
2333        HildonWindowStack *stack = hildon_window_stack_get_default();
2334        container = hildon_window_stack_peek(stack);
2335    #endif
2336    
2337        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2338      switch(redraw) {      switch(redraw) {
2339      case 1:      case 1:
2340        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 1984  void main_after_settings_redraw(appdata_ Line 2349  void main_after_settings_redraw(appdata_
2349        break;        break;
2350      }      }
2351    
2352      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2353      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2354    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2355        else
2356  #endif  #endif
2357          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2358    
2359        gtk_widget_show_all(container);
2360      }
2361  }  }
2362    
2363  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2008  int main(int argc, char *argv[]) { Line 2378  int main(int argc, char *argv[]) {
2378    
2379    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2380    
2381      curl_global_init(CURL_GLOBAL_ALL);
2382    
2383  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2384    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2385    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 2388  int main(int argc, char *argv[]) {
2388      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2389    }    }
2390    
2391    #ifdef ENABLE_MAEMO_MAPPER
2392    dbus_register(&appdata);    dbus_register(&appdata);
2393  #endif  #endif
2394    #endif
2395    
2396    icons_init();    icons_init();
2397    
# Line 2041  int main(int argc, char *argv[]) { Line 2415  int main(int argc, char *argv[]) {
2415    /* Create a Window. */    /* Create a Window. */
2416    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2417    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2418    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2419  #endif  #endif
2420    
2421    #if MAEMO_VERSION_MAJOR == 5
2422    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2423    #endif
2424    
2425    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2426                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2427    
2428    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2429                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2430    
2431      /* prepare clipboard */
2432      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2433      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2434    
2435    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2436    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2437  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2438    menu_create(&appdata);    menu_create(&appdata);
2439  #else  #else
# Line 2067  int main(int argc, char *argv[]) { Line 2447  int main(int argc, char *argv[]) {
2447    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);
2448    
2449    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2450    #else
2451    #ifdef BCT
2452      /* on non-hildon machines we use some custom made breadcrumbtrail */
2453      /* replacement */
2454      appdata.bct = bct_new();
2455      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2456    #endif
2457    #endif
2458    
2459    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2460    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2461  #endif  #endif
2462    
Legend:
Removed from v.3  
changed lines
  Added in v.206