Diff of /trunk/src/main.c

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

revision 19 by harbaum, Mon Jun 29 12:44:57 2009 UTC revision 237 by harbaum, Thu Dec 10 21:24:43 2009 UTC
# Line 15  Line 15 
15   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
16   */   */
17    
18  #include <stdio.h>  #define __USE_GNU
19  #include <string.h>  #include <string.h>
20    
21    #include <stdio.h>
22  #include <math.h>  #include <math.h>
23    
24    #include <curl/curl.h>
25    
26  #include <time.h>  #include <time.h>
27  #include <sys/time.h>  #include <sys/time.h>
28    
# Line 29  Line 33 
33    
34  #ifdef USE_MAEMO  #ifdef USE_MAEMO
35  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
36    #if MAEMO_VERSION_MAJOR >= 5
37    #include <hildon/hildon-note.h>
38    #include <hildon/hildon-entry.h>
39    #endif
40  #endif  #endif
41    
42  #include <locale.h>  #include <locale.h>
43    
44  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
45    
46  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
47  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
48                        gpointer user_data);                        gpointer user_data);
49    
# Line 92  void errorf(const char *fmt, ...) { Line 100  void errorf(const char *fmt, ...) {
100      }      }
101    }    }
102    
103    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
104    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
105                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
106                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
107                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,                             GTK_MESSAGE_ERROR,
108                             buf);                             GTK_BUTTONS_CLOSE, buf);
109    
110    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
111    #else
112      GtkWidget *dialog =
113        hildon_note_new_information(GTK_WINDOW(NULL), buf);
114    #endif
115    
116    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
117    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 151  gpx_t *choose_file(appdata_t *appdata, g
151    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
152    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
153      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
154    
155        if(filename) {
156          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
157    
158      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
159            gpx = gpx_parse(dialog, filename, appdata->username);
160      if(!whole_dir)        else {
161        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
162      else {          if(strlastchr(filename) == '/')
163        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
164        if(strlastchr(filename) == '/')  
165          filename[strlen(filename)] = 0;          gpx = gpx_parse_dir(dialog, filename, appdata->username);
   
       gpx = gpx_parse_dir(dialog, filename);  
     }  
   
     gpx_busy_dialog_destroy(dialog);  
   
     /* save path if gpx was successfully loaded */  
     if(gpx) {  
       char *r = strrchr(filename, '/');  
   
       /* there is a delimiter, use everything left of it as path */  
       if(r && !whole_dir) {  
         *r = 0;  
         if(appdata->path) free(appdata->path);  
         appdata->path = strdup(filename);  
         /* restore path ... just in case ... */  
         *r = '/';  
166        }        }
167    
168        if(whole_dir)        gpx_busy_dialog_destroy(dialog);
169          appdata->path = strdup(filename);  
170      }        /* save path if gpx was successfully loaded */
171          if(gpx) {
172            char *r = strrchr(filename, '/');
173    
174            /* there is a delimiter, use everything left of it as path */
175            if(r && !whole_dir) {
176              *r = 0;
177              if(appdata->path) free(appdata->path);
178              appdata->path = strdup(filename);
179              /* restore path ... just in case ... */
180              *r = '/';
181            }
182    
183            if(whole_dir)
184              appdata->path = strdup(filename);
185          } else
186            errorf(_("Load error"));
187    
188      g_free (filename);        g_free (filename);
189        } else {
190    #ifndef USE_MAEMO
191          errorf(_("Error accessing the file."));
192    #else
193          errorf(_("Error accessing the file. This may happen if the file "
194                   "resides on a remote file system. Please copy the file onto "
195                   "the device (e.g. onto the memory card) and try again."));
196    #endif
197        }
198    }    }
199    
200    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 194  enum { Line 218  enum {
218    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
219  } ;  } ;
220    
221  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
222    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
223        cache_dialog(appdata, cache);
224    #else
225        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
226    
227        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
228        appdata->cur_view = cache_view(appdata, cache);
229        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
230        gtk_widget_show_all(appdata->vbox);
231    #endif
232    }
233    
234    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
235                                     GtkTreePath        *path,                                     GtkTreePath        *path,
236                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
237                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 239  void cachelist_view_onRowActivated(GtkTr
239    GtkTreeIter   iter;    GtkTreeIter   iter;
240    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
241    
242    #ifdef USE_MAEMO
243      /* check if a cache is already selected and ignore click if yes */
244      /* (was probably a double click) */
245      if(appdata->cur_cache) return;
246    #endif
247    
248    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
249      cache_t *cache;      cache_t *cache;
250      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
251  #ifndef USE_BREAD_CRUMB_TRAIL      cachelist_goto_cache(appdata, cache);
     cache_dialog(appdata, cache);  
 #else  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = cache_view(appdata, cache);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
 #endif  
252    }    }
253  }  }
254    
# Line 257  static GtkWidget *cachelist_create(appda Line 291  static GtkWidget *cachelist_create(appda
291                                     cache_t *sel_cache);                                     cache_t *sel_cache);
292    
293  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
 #ifndef USE_MAEMO  
   //  gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
   //  appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
   //  gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
   // gtk_widget_show_all(appdata->vbox);  
 #else  
   
294    if(!appdata->cur_view) {    if(!appdata->cur_view) {
295      printf("cachelist redraw: no active view\n");      printf("cachelist redraw: no active view\n");
296      return;      return;
# Line 279  void cachelist_redraw(appdata_t *appdata Line 306  void cachelist_redraw(appdata_t *appdata
306    }    }
307    
308    if(redraw) {    if(redraw) {
     GtkWidget *container = appdata->vbox;  
   
     printf("redraw %d\n", redraw);  
   
309  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
310      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
311      container = hildon_window_stack_peek(stack);      GtkWidget *container = hildon_window_stack_peek(stack);
312    #else
313        GtkWidget *container = appdata->vbox;
314  #endif  #endif
315    
316      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
# Line 301  void cachelist_redraw(appdata_t *appdata Line 326  void cachelist_redraw(appdata_t *appdata
326      }      }
327    
328  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
329      if(container != appdata->vbox)      gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
330        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);  #else
331      else      gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
332  #endif  #endif
       gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);  
333    
334      gtk_widget_show_all(container);      gtk_widget_show_all(container);
335    }    }
 #endif  
336  }  }
337    
338    
# Line 317  static gboolean cachelist_update(gpointe Line 340  static gboolean cachelist_update(gpointe
340    
341    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
342    
 #ifdef USE_MAEMO  
343    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
344    
345    if(appdata->cur_cache)    if(appdata->cur_cache)
346      return TRUE;      return TRUE;
347    
348    #ifdef USE_MAEMO
349    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
350      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
351        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
352    #endif
353    
354    if(appdata->cachelist_update)    if(appdata->cachelist_update)
355      cachelist_redraw(appdata);      cachelist_redraw(appdata);
 #endif  
356    
357    return TRUE;    return TRUE;
358  }  }
# Line 451  static GtkWidget *cachelist_create(appda Line 474  static GtkWidget *cachelist_create(appda
474      if(tint > 8) tint = 8;      if(tint > 8) tint = 8;
475    
476      /* cache type includes "solved" flag in lowest bit */      /* cache type includes "solved" flag in lowest bit */
477      int type = (cache->type<<8) +      int type = cache->type<<8;
478        (cache->notes?4:0) +      if(cache->notes) type |= 4;
479        ((cache->notes && cache->notes->override)?1:0) +      if(cache->notes && cache->notes->override) type |= 1;
480        ((cache->notes && cache->notes->found)?2:0);      if(cache->notes && cache->notes->found) type |= 2;
481        if(cache->found) type |= 2;
482        if(cache->mine) type |= 8;
483    
484      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
485    
# Line 570  void cachelist_dialog(appdata_t *appdata Line 595  void cachelist_dialog(appdata_t *appdata
595  static void search_result_free(gpx_t *result);  static void search_result_free(gpx_t *result);
596    
597  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
598      printf("cachelist destroy\n");
599    
600      HildonWindowStack *stack = hildon_window_stack_get_default();
601      appdata->window = HILDON_WINDOW(hildon_window_stack_peek(stack));
602    
603    if(appdata->search_results) {    if(appdata->search_results) {
604      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
605      appdata->search_results = NULL;      appdata->search_results = NULL;
606    }    }
607    appdata->cur_gpx = NULL;    appdata->cur_gpx = NULL;
608    
609    #ifdef ENABLE_OSM_GPS_MAP
610      map_update(appdata);
611    #endif
612    
613    /* restore cur_view */    /* restore cur_view */
614    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
615  }  }
616    
617  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
618    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
619      appdata->window = HILDON_WINDOW(window);
620    
621    /* store last "cur_view" in window */    /* store last "cur_view" in window */
622    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
623    
624    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
625    char *title = g_strdup_printf("GPXView - %s", gpx->name);    gtk_window_set_title(GTK_WINDOW(window), gpx->name);
   gtk_window_set_title(GTK_WINDOW(window), title);  
   g_free(title);  
626    
627    appdata->cur_view = cachelist_create(appdata, gpx, NULL);    appdata->cur_view = cachelist_create(appdata, gpx, NULL);
628    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
# Line 602  void cachelist_dialog(appdata_t *appdata Line 635  void cachelist_dialog(appdata_t *appdata
635                     G_CALLBACK(on_cachelist_destroy), appdata);                     G_CALLBACK(on_cachelist_destroy), appdata);
636    
637    gtk_widget_show_all(window);    gtk_widget_show_all(window);
638    
639    #ifdef ENABLE_OSM_GPS_MAP
640      map_update(appdata);
641    #endif
642  }  }
643  #endif  #endif
644  #endif  #endif
# Line 634  static GdkPixbuf *gpx_icon_get(gpx_t *gp Line 671  static GdkPixbuf *gpx_icon_get(gpx_t *gp
671    return icon_get(ICON_FILE, 0);    return icon_get(ICON_FILE, 0);
672  }  }
673    
674  static void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {  void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {
675    char date_str[32], cnum[32];    char date_str[32], cnum[32];
676    
677    if(gpx->year && gpx->month && gpx->day) {    if(gpx->year && gpx->month && gpx->day) {
# Line 659  static void gpxlist_set(GtkListStore *st Line 696  static void gpxlist_set(GtkListStore *st
696                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
697                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
698  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
699                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 2),
700  #endif  #endif
701                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
702                       -1);                       -1);
# Line 705  static void gpxlist_close(appdata_t *app Line 742  static void gpxlist_close(appdata_t *app
742    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
743  }  }
744    
745    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
746    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
747    #ifdef USE_STACKABLE_WINDOW
748      if(!appdata->cur_gpx)
749    #endif
750        cachelist_dialog(appdata, gpx);
751    #ifdef USE_STACKABLE_WINDOW
752      else
753        printf("selected gpx, but cachelist window already present\n");
754    #endif
755    #else
756      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
757      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
758      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
759      gtk_widget_show_all(appdata->vbox);
760    
761      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
762    #endif
763    }
764    
765  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
766                            GtkTreePath        *path,                            GtkTreePath        *path,
767                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 713  static void gpxlist_view_onRowActivated( Line 770  static void gpxlist_view_onRowActivated(
770    GtkTreeIter   iter;    GtkTreeIter   iter;
771    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
772    
773    #ifdef USE_MAEMO
774      /* check if a cache is already selected and ignore click if yes */
775      /* (was probably a double click) */
776      if(appdata->cur_gpx) return;
777    #endif
778    
779    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
780      gpx_t *gpx;      gpx_t *gpx;
781      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 725  static void gpxlist_view_onRowActivated( Line 788  static void gpxlist_view_onRowActivated(
788      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
789        printf("clicked delete\n");        printf("clicked delete\n");
790    
791    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
792        /* ask user what he wants */        /* ask user what he wants */
793        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
794                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
795                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
796                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   GTK_MESSAGE_QUESTION,
797                     GTK_BUTTONS_CANCEL,
798                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
799                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
800    
# Line 738  static void gpxlist_view_onRowActivated( Line 803  static void gpxlist_view_onRowActivated(
803                               _("Close"), 2,                               _("Close"), 2,
804                               NULL);                               NULL);
805    
806          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
807    #else
808    
809          GtkWidget *dialog =
810            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
811                                GTK_WINDOW(appdata->window),
812                                GTK_DIALOG_DESTROY_WITH_PARENT,
813                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
814                                _("Remove"), 1,
815                                _("Close"), 2,
816                                NULL);
817    
818          GtkWidget *content_area =
819            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
820    
821          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
822    
823          gtk_box_pack_start(GTK_BOX(hbox),
824             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
825                                       GTK_ICON_SIZE_DIALOG),
826                             FALSE, FALSE, 0);
827    
828          GtkWidget *label = gtk_label_new(
829                      _("Do you want to close this entry only or do "
830                        "you want to remove it completely from the list?"));
831    
832          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
833          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
834    
835          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
836          gtk_container_add (GTK_CONTAINER (content_area), hbox);
837    
838          gtk_widget_show_all (dialog);
839    #endif
840    
841        if(gpx->closed)        if(gpx->closed)
842          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
843    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));  
   
844        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
845        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
846    
# Line 772  static void gpxlist_view_onRowActivated( Line 870  static void gpxlist_view_onRowActivated(
870          gpx_t *new = NULL;          gpx_t *new = NULL;
871    
872          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
873            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
874          else          else
875            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
876    
877          if(new) {          if(new) {
878            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 810  static void gpxlist_view_onRowActivated( Line 908  static void gpxlist_view_onRowActivated(
908    
909          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
910        }        }
911  #ifndef USE_BREAD_CRUMB_TRAIL  
912  #ifdef USE_STACKABLE_WINDOW        gpxlist_goto_cachelist(appdata, gpx);
       if(!appdata->cur_gpx)  
 #endif  
         cachelist_dialog(appdata, gpx);  
 #ifdef USE_STACKABLE_WINDOW  
       else  
         printf("selected gpx, but cachelist window already present\n");  
 #endif  
 #else  
       gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
       appdata->cur_view = cachelist_create(appdata, gpx, NULL);  
       gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
       gtk_widget_show_all(appdata->vbox);  
   
       crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);  
 #endif  
913      }      }
914    }    }
915  }  }
916    
917    /* search gpx file in gpx list */
918    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx) {
919      GtkTreeModel *model =
920        gtk_tree_view_get_model(GTK_TREE_VIEW(appdata->gpxview));
921    
922      gboolean found =
923        gtk_tree_model_get_iter_first(model, iter);
924    
925      while(found) {
926        gpx_t *this_gpx;
927        gtk_tree_model_get(model, iter, GPXLIST_COL_DATA, &this_gpx, -1);
928    
929        if(gpx == this_gpx)
930          return TRUE;
931    
932        found = gtk_tree_model_iter_next(model, iter);
933      }
934    
935      return FALSE;
936    }
937    
938    
939  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
940  static gboolean  static gboolean
941  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
# Line 869  static GtkWidget *gpxlist_create_view_an Line 974  static GtkWidget *gpxlist_create_view_an
974    
975    appdata->gpxview = gtk_tree_view_new ();    appdata->gpxview = gtk_tree_view_new ();
976    
977      printf("building gpx list, items = %d\n", appdata->gpxlist_items);
978    
979    GtkTreeSelection *selection =    GtkTreeSelection *selection =
980      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
981  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
# Line 881  static GtkWidget *gpxlist_create_view_an Line 988  static GtkWidget *gpxlist_create_view_an
988    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
989                    -1, "Icon", renderer,                    -1, "Icon", renderer,
990                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
991                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
992            /* at least one entry needs to be sensitive. */
993            /* This is the delete icon if the PANNABLE_AREA is used */
994                      "sensitive", GPXLIST_COL_OPEN,
995    #endif
996                    NULL);                    NULL);
997    
998    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 937  static GtkWidget *gpxlist_create_view_an Line 1048  static GtkWidget *gpxlist_create_view_an
1048    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1049                    -1, "Del", renderer,                    -1, "Del", renderer,
1050                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
1051                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
1052                    NULL);                    NULL);
1053  #endif  #endif
1054    
# Line 957  static GtkWidget *gpxlist_create_view_an Line 1068  static GtkWidget *gpxlist_create_view_an
1068      GtkTreeIter         iter;      GtkTreeIter         iter;
1069      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1070      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1071    
1072      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1073        sel_iter = iter;        sel_iter = iter;
1074        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 1001  static GtkWidget *gpxlist_create_view_an Line 1112  static GtkWidget *gpxlist_create_view_an
1112  }  }
1113    
1114  /* add last entry in gpx list to visual representation */  /* add last entry in gpx list to visual representation */
1115  static void gpxlist_add(appdata_t *appdata, gpx_t *new) {  void gpxlist_add(appdata_t *appdata, gpx_t *new) {
1116    GtkTreeIter         iter;    GtkTreeIter         iter;
1117    
1118    gtk_list_store_append(appdata->gpxstore, &iter);    gtk_list_store_append(appdata->gpxstore, &iter);
# Line 1011  static void gpxlist_add(appdata_t *appda Line 1122  static void gpxlist_add(appdata_t *appda
1122    gpx_t **gpx = &appdata->gpx;    gpx_t **gpx = &appdata->gpx;
1123    while(*gpx) gpx = &((*gpx)->next);    while(*gpx) gpx = &((*gpx)->next);
1124    *gpx = new;    *gpx = new;
1125    
1126      /* select new iter */
1127      GtkTreeSelection *selection =
1128        gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1129      gtk_tree_selection_select_iter(selection, &iter);
1130      GtkTreePath *path =
1131        gtk_tree_model_get_path(GTK_TREE_MODEL(appdata->gpxstore), &iter);
1132      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(appdata->gpxview),
1133                                   path, NULL, TRUE, 0.0, 0.0);
1134      gtk_tree_path_free(path);
1135  }  }
1136    
1137  /******************** end of gpxlist ********************/  /******************** end of gpxlist ********************/
# Line 1019  static void gpxlist_add(appdata_t *appda Line 1140  static void gpxlist_add(appdata_t *appda
1140    
1141  static void  static void
1142  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1143    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_box((appdata_t*)data);
   
   gtk_about_dialog_set_name(about, "GPXView");  
   gtk_about_dialog_set_version(about, VERSION);  
   
 #ifdef ENABLE_LIBLOCATION  
   char *uses = "uses liblocation";  
 #elif defined(ENABLE_GPSBT)  
   char *uses = "uses gpsbt and gpsd";  
 #else  
   char *uses = "uses gpsd";  
 #endif  
   
   char *str = g_strdup_printf("%s\n\n(%s)",  
                       _("GPXView (c) 2008-2009 by\n"  
                         "Till Harbaum <till@harbaum.org>\n"  
                         "Mailing list: gpxview-users@garage.maemo.org"  
                       _(uses)  
                       );  
   
   gtk_about_dialog_set_copyright(about, str);  
   g_free(str);  
   
   gtk_about_dialog_set_website(about,  
        _("http://www.harbaum.org/till/maemo"));  
   
   gtk_about_dialog_set_comments(about,  
        _("Geocaching.com GPX file viewer"));  
   
   gtk_widget_show_all(GTK_WIDGET(about));  
   gtk_dialog_run(GTK_DIALOG(about));  
   gtk_widget_destroy(GTK_WIDGET(about));  
1144  }  }
1145    
1146  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1222  gpx_t *search_do(appdata_t *appdata, gpx Line 1312  gpx_t *search_do(appdata_t *appdata, gpx
1312        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1313                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1314          hit = 1;          hit = 1;
1315        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1316                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1317          hit = 1;          hit = 1;
1318    
1319        if(hit) {        if(hit) {
# Line 1252  typedef struct { Line 1342  typedef struct {
1342    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1343  } search_context_t;  } search_context_t;
1344    
1345    
1346  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1347    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1348    
1349    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1350    
1351    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1352    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1286  cb_menu_search(GtkWidget *window, gpoint Line 1376  cb_menu_search(GtkWidget *window, gpoint
1376    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1377    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1378    
1379    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1380    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);  
1381    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);
1382    
1383    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1384    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);  
1385    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);
1386    
1387    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1388    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);  
1389    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);
1390    
1391    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1392    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);  
1393    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);
1394    
1395    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 1312  cb_menu_search(GtkWidget *window, gpoint Line 1398  cb_menu_search(GtkWidget *window, gpoint
1398    
1399    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1400                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1401      context.entry = entry_new();
1402    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1403                                context.entry = gtk_entry_new());                                context.entry);
1404    
1405    if(appdata->search_str)    if(appdata->search_str)
1406      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1407    
# Line 1324  cb_menu_search(GtkWidget *window, gpoint Line 1412  cb_menu_search(GtkWidget *window, gpoint
1412    
1413    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1414    
1415    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1416    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);  
1417    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1418    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1419                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1366  cb_menu_search(GtkWidget *window, gpoint Line 1453  cb_menu_search(GtkWidget *window, gpoint
1453                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1454  #endif  #endif
1455    
1456      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1457        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1458      else      else
1459        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1460    
1461      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1462        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1463      else      else
1464        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1465    
1466      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1467        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1468      else      else
1469        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1470    
1471      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1472        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1473      else      else
1474        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1475    
1476      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1477        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1478      else      else
1479        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1399  cb_menu_search(GtkWidget *window, gpoint Line 1486  cb_menu_search(GtkWidget *window, gpoint
1486    
1487        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1488    
1489  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1490        gpx_t *found =        gpx_t *found =
1491          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1492    
# Line 1433  cb_menu_search(GtkWidget *window, gpoint Line 1520  cb_menu_search(GtkWidget *window, gpoint
1520      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1521  }  }
1522    
1523  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1524    
1525  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1526  static void  static void
# Line 1495  cb_menu_export_log(GtkWidget *widget, gp Line 1582  cb_menu_export_log(GtkWidget *widget, gp
1582    notes_log_export(appdata);    notes_log_export(appdata);
1583  }  }
1584    
1585  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1586  static void  static void
1587  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1588    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1509  cb_menu_export_garmin(GtkWidget *widget, Line 1596  cb_menu_export_garmin(GtkWidget *widget,
1596    garmin_export(appdata);    garmin_export(appdata);
1597  }  }
1598    
1599    #ifdef ENABLE_OSM_GPS_MAP
1600    static void
1601    cb_menu_map(GtkWidget *window, gpointer data) {
1602      map((appdata_t *)data);
1603    }
1604    #endif
1605    
1606  static void  static void
1607  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1608    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
# Line 1524  cb_menu_precpos(GtkWidget *window, gpoin Line 1618  cb_menu_precpos(GtkWidget *window, gpoin
1618    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1619  }  }
1620    
1621  #ifdef USE_STACKABLE_WINDOW  static void
1622  static void on_export_destroy(GtkWidget *widget, appdata_t *appdata) {  cb_menu_geotoad(GtkWidget *window, gpointer data) {
1623    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    geotoad((appdata_t *)data);
1624  }  }
1625    
1626  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  #ifdef USE_STACKABLE_WINDOW
1627    HildonStackableWindow *view_window;  typedef struct {
1628    GtkWidget *but;    char *label, *desc;
1629      GtkSignalFunc activate_cb;
1630    } menu_entry_t;
1631    
1632    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());  typedef struct {
1633    gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Export");    const char *title;
1634      const menu_entry_t *menu;
1635      int len;
1636    } submenu_t;
1637    
1638     /* store last "cur_view" in window */  #define COLUMNS  1
   g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);  
   appdata->cur_view = NULL;  
1639    
1640    g_signal_connect(G_OBJECT(view_window), "destroy",  void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
                    G_CALLBACK(on_export_destroy), appdata);  
1641    
1642    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));    /* force closing of submenu dialog */
1643      gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1644      gtk_widget_hide(menu);
1645    
1646      /* let gtk clean up */
1647      while(gtk_events_pending())
1648        gtk_main_iteration();
1649    }
1650    
1651    but = hildon_button_new_with_text(  static GtkWidget *app_submenu_create(appdata_t *appdata,
1652              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,                                       const submenu_t *submenu) {
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Export to Maemo Mapper"),  
             _("Save a Maemo Mapper POI file"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_export_mmpoi), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1653    
1654      /* create a oridinary dialog box */
1655      GtkWidget *dialog = gtk_dialog_new();
1656      gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1657      gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1658      gtk_window_set_transient_for(GTK_WINDOW(dialog),
1659                                   GTK_WINDOW(appdata->window));
1660      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1661    
1662      GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1663      int x = 0, y = 0;
1664    
1665      const menu_entry_t *menu_entries = submenu->menu;
1666      while(menu_entries->label) {
1667        GtkWidget *button = NULL;
1668    
1669    but = hildon_button_new_with_text(      button = hildon_button_new_with_text(
1670              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1671              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1672              _("Export Field Notes"),              _(menu_entries->label), _(menu_entries->desc));
             _("Save a Garmin Field Notes file"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_export_log), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
   
1673    
1674    but = hildon_button_new_with_text(      /* try to center both texts */
1675              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,      hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1676              HILDON_BUTTON_ARRANGEMENT_VERTICAL,      hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
             _("Export Garmin GPX"),  
             _("Save a GPX file containing modified waypoints"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_export_garmin), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1677    
1678    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));      g_signal_connect(button, "clicked",
1679    gtk_widget_show_all (GTK_WIDGET (view_window));                       G_CALLBACK(on_submenu_entry_clicked), dialog);
1680  }  
1681        g_signal_connect(button, "clicked",
1682                         menu_entries->activate_cb, appdata);
1683    
1684        gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1685    
1686        x++;
1687        if(x == COLUMNS) { x = 0; y++; }
1688    
1689  static void on_tools_destroy(GtkWidget *widget, appdata_t *appdata) {      menu_entries++;
1690    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    }
1691    
1692      gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1693    
1694      return dialog;
1695  }  }
1696    
1697  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  /* popup the dialog shaped submenu */
1698    HildonStackableWindow *view_window;  static void submenu_popup(GtkWidget *menu) {
1699    GtkWidget *but;    gtk_widget_show_all(menu);
1700      gtk_dialog_run(GTK_DIALOG(menu));
1701      gtk_widget_hide(menu);
1702    }
1703    
1704    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());  static void submenu_cleanup(GtkWidget *menu) {
1705    gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Tools");    gtk_widget_destroy(menu);
1706    }
1707    
1708     /* store last "cur_view" in window */  static const menu_entry_t submenu_export_entries[] = {
1709    g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);  #ifdef ENABLE_MAEMO_MAPPER
1710    appdata->cur_view = NULL;    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1711        G_CALLBACK(cb_menu_export_mmpoi)  },
1712    #endif
1713      { "Export Field Notes",      "Save a Garmin Field Notes file",
1714        G_CALLBACK(cb_menu_export_log)    },
1715      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1716        G_CALLBACK(cb_menu_export_garmin) },
1717      { NULL, NULL, NULL }
1718    };
1719    
1720    g_signal_connect(G_OBJECT(view_window), "destroy",  static const submenu_t submenu_export = {
1721                     G_CALLBACK(on_tools_destroy), appdata);    "Export", submenu_export_entries,
1722      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1723    };
1724    
1725    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));  /* the export submenu */
1726    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1727      if(!appdata->export_menu)
1728        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1729    
1730    but = hildon_button_new_with_text(    submenu_popup(appdata->export_menu);
1731              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  }
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Geomath"),  
             _("Geocoordinate calculation"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_geomath), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1732    
1733    static const menu_entry_t submenu_tools_entries[] = {
1734      { "Geomath",          "Geocoordinate calculation",
1735        G_CALLBACK(cb_menu_geomath) },
1736      { "Geotext",          "Text analysis",
1737        G_CALLBACK(cb_menu_geotext) },
1738      { "Precise Position", "Calculate a precise GPS position",
1739        G_CALLBACK(cb_menu_precpos) },
1740      { "GeoToad",          "Use GeoToad online downloader",
1741        G_CALLBACK(cb_menu_geotoad) },
1742      { NULL, NULL, NULL }
1743    };
1744    
1745    but = hildon_button_new_with_text(  static const submenu_t submenu_tools = {
1746              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    "Tools", submenu_tools_entries,
1747              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1748              _("Geotext"),  };
             _("Text analysis, letter counting etc"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_geotext), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
   
1749    
1750    but = hildon_button_new_with_text(  /* the tools submenu */
1751              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1752              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    if(!appdata->tools_menu)
1753              _("Precise Position"),      appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
             _("Calculate a very precise GPS position"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_precpos), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1754    
1755    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));    submenu_popup(appdata->tools_menu);
   gtk_widget_show_all (GTK_WIDGET (view_window));  
1756  }  }
1757    
1758  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
# Line 1656  HildonAppMenu *menu_create(appdata_t *ap Line 1780  HildonAppMenu *menu_create(appdata_t *ap
1780      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1781                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1782      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1783    
   if(mode == MENU_GPXLIST) {  
1784      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1785      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1786                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1675  HildonAppMenu *menu_create(appdata_t *ap Line 1797  HildonAppMenu *menu_create(appdata_t *ap
1797                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1798    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1799    
1800    #ifdef ENABLE_OSM_GPS_MAP
1801        button = gtk_button_new_with_label(_("Map"));
1802        g_signal_connect_after(button, "clicked",
1803                               G_CALLBACK(cb_menu_map), appdata);
1804        hildon_app_menu_append(menu, GTK_BUTTON(button));
1805    #endif
1806    
1807  #ifdef HILDON_HELP  #ifdef HILDON_HELP
1808    button = gtk_button_new_with_label(_("Help"));    button = gtk_button_new_with_label(_("Help"));
1809    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
# Line 1692  void menu_create(appdata_t *appdata) { Line 1821  void menu_create(appdata_t *appdata) {
1821    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1822    menu = gtk_menu_new();    menu = gtk_menu_new();
1823    
1824  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1825    appdata->menu_import =    appdata->menu_import =
1826  #endif  #endif
1827    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1722  void menu_create(appdata_t *appdata) { Line 1851  void menu_create(appdata_t *appdata) {
1851    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1852  #endif  #endif
1853    
1854  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1855    appdata->menu_export =    appdata->menu_export =
1856  #endif  #endif
1857      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1730  void menu_create(appdata_t *appdata) { Line 1859  void menu_create(appdata_t *appdata) {
1859    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1860    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1861    
1862  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1863    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1864    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1865    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1747  void menu_create(appdata_t *appdata) { Line 1876  void menu_create(appdata_t *appdata) {
1876    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1877                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1878    
1879  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1880    appdata->menu_search =    appdata->menu_search =
1881  #endif  #endif
1882    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1756  void menu_create(appdata_t *appdata) { Line 1885  void menu_create(appdata_t *appdata) {
1885    
1886    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1887    
 #ifndef NO_COPY_N_PASTE  
1888    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1889    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1890    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1891    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1892    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1787  void menu_create(appdata_t *appdata) { Line 1913  void menu_create(appdata_t *appdata) {
1913    
1914    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1915    
1916    #ifdef ENABLE_OSM_GPS_MAP
1917      item = gtk_menu_item_new_with_label( _("Map") );
1918      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1919      g_signal_connect(item, "activate",
1920                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1921    #endif
1922    
1923    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1924    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1925    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1807  void menu_create(appdata_t *appdata) { Line 1940  void menu_create(appdata_t *appdata) {
1940    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1941                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
1942    
1943      item = gtk_menu_item_new_with_label( _("GeoToad") );
1944      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1945      g_signal_connect(item, "activate",
1946                       GTK_SIGNAL_FUNC(cb_menu_geotoad), 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    
1950  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1846  void menu_create(appdata_t *appdata) { Line 1984  void menu_create(appdata_t *appdata) {
1984  /********************* end of menu **********************/  /********************* end of menu **********************/
1985    
1986  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
1987      gconf_save_state(appdata);
1988    
1989    gpx_free_all(appdata->gpx);    gpx_free_all(appdata->gpx);
1990    if(appdata->path) free(appdata->path);  
1991    if(appdata->image_path) free(appdata->image_path);  #ifdef USE_STACKABLE_WINDOW
1992    if(appdata->search_str) free(appdata->search_str);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
1993      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
1994    #endif
1995    
1996    gnome_vfs_shutdown();    gnome_vfs_shutdown();
1997    icons_free();    icons_free();
# Line 1879  void cleanup(appdata_t *appdata) { Line 2021  void cleanup(appdata_t *appdata) {
2021    puts("everything is gone");    puts("everything is gone");
2022  }  }
2023    
2024  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2025    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2026    
   gconf_save_state(appdata);  
2027    gtk_main_quit();    gtk_main_quit();
2028    appdata->window = NULL;    appdata->window = NULL;
2029  }  }
# Line 1942  gboolean on_window_key_press(GtkWidget * Line 2083  gboolean on_window_key_press(GtkWidget *
2083    return handled;    return handled;
2084  }  }
2085    
2086  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2087  typedef struct {  typedef struct {
2088    int level;    int level;
2089    appdata_t *appdata;    appdata_t *appdata;
# Line 2034  crumb_back(gpointer data) { Line 2175  crumb_back(gpointer data) {
2175    
2176    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2177    g_free(data);    g_free(data);
2178    
2179    #ifdef ENABLE_OSM_GPS_MAP
2180      map_update(crumb->appdata);
2181    #endif
2182  }  }
2183    
2184  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 2074  static void crumb_add(appdata_t *appdata Line 2219  static void crumb_add(appdata_t *appdata
2219  #endif  #endif
2220    }    }
2221    
2222    #ifdef USE_BREAD_CRUMB_TRAIL
2223    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2224                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2225    #else
2226      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2227    #endif
2228    
2229    #ifdef ENABLE_OSM_GPS_MAP
2230      map_update(appdata);
2231    #endif
2232  }  }
2233  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2234    
# Line 2087  void main_after_settings_redraw(appdata_ Line 2240  void main_after_settings_redraw(appdata_
2240      return;      return;
2241    }    }
2242    
 #ifndef USE_MAEMO  
   // in non-maemo setup this can only affect the main screen as  
   // the menu is blocked while a dialog is open. also the main  
   // screen is always present  
   if(appdata->gpxlist_items != appdata->cur_items) {  
     /* re-do the main screen */  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   }  
 #else  
2243    /* 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 */
2244    /* need to be redrawn */    /* need to be redrawn */
2245    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2122  void main_after_settings_redraw(appdata_ Line 2263  void main_after_settings_redraw(appdata_
2263    }    }
2264    
2265    if(redraw) {    if(redraw) {
     GtkWidget *container = appdata->vbox;  
2266    
2267  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2268      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
2269      container = hildon_window_stack_peek(stack);      GtkWidget *container = hildon_window_stack_peek(stack);
2270    #else
2271        GtkWidget *container = appdata->vbox;
2272  #endif  #endif
2273    
2274      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
# Line 2145  void main_after_settings_redraw(appdata_ Line 2287  void main_after_settings_redraw(appdata_
2287      }      }
2288    
2289  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
     if(container != appdata->vbox)  
2290        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2291      else  #else
 #endif  
2292        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2293    #endif
2294    
2295      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2296    }    }
 #endif // USE_MAEMO  
2297  }  }
2298    
2299  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2174  int main(int argc, char *argv[]) { Line 2314  int main(int argc, char *argv[]) {
2314    
2315    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2316    
2317      misc_init();
2318    
2319      curl_global_init(CURL_GLOBAL_ALL);
2320    
2321  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2322    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2323    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2182  int main(int argc, char *argv[]) { Line 2326  int main(int argc, char *argv[]) {
2326      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2327    }    }
2328    
2329    #ifdef ENABLE_MAEMO_MAPPER
2330    dbus_register(&appdata);    dbus_register(&appdata);
2331  #endif  #endif
2332    #endif
2333    
2334    icons_init();    icons_init();
2335    
# Line 2207  int main(int argc, char *argv[]) { Line 2353  int main(int argc, char *argv[]) {
2353    /* Create a Window. */    /* Create a Window. */
2354    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2355    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2356    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2357  #endif  #endif
2358    
2359  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2220  int main(int argc, char *argv[]) { Line 2366  int main(int argc, char *argv[]) {
2366    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2367                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2368    
2369    appdata.vbox = gtk_vbox_new(FALSE, 2);    /* prepare clipboard */
2370    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2371      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2372    
2373  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2374      appdata.vbox = gtk_vbox_new(FALSE, 2);
2375      gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2376    menu_create(&appdata);    menu_create(&appdata);
2377  #else  #else
2378    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),
# Line 2236  int main(int argc, char *argv[]) { Line 2385  int main(int argc, char *argv[]) {
2385    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);
2386    
2387    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2388    #else
2389    #ifdef BCT
2390      /* on non-hildon machines we use some custom made breadcrumbtrail */
2391      /* replacement */
2392      appdata.bct = bct_new();
2393      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2394    #endif
2395    #endif
2396    
2397    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2398    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2399  #endif  #endif
2400    
# Line 2249  int main(int argc, char *argv[]) { Line 2408  int main(int argc, char *argv[]) {
2408    gps_init(&appdata);    gps_init(&appdata);
2409    
2410    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);
2411    #ifndef USE_STACKABLE_WINDOW
2412    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);
2413    #else
2414      gtk_container_add(GTK_CONTAINER(appdata.window), appdata.cur_view);
2415    #endif
2416    
2417    gtk_widget_show_all(GTK_WIDGET(appdata.window));    gtk_widget_show_all(GTK_WIDGET(appdata.window));
2418    gtk_main();    gtk_main();
Legend:
Removed from v.19  
changed lines
  Added in v.237