Diff of /trunk/src/main.c

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

revision 40 by harbaum, Sun Aug 2 19:05:24 2009 UTC revision 233 by harbaum, Wed Dec 9 19:45:36 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 281  void cachelist_redraw(appdata_t *appdata Line 308  void cachelist_redraw(appdata_t *appdata
308    if(redraw) {    if(redraw) {
309      GtkWidget *container = appdata->vbox;      GtkWidget *container = appdata->vbox;
310    
     printf("redraw %d\n", redraw);  
   
311  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
312      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
313      container = hildon_window_stack_peek(stack);      container = hildon_window_stack_peek(stack);
# Line 309  void cachelist_redraw(appdata_t *appdata Line 334  void cachelist_redraw(appdata_t *appdata
334    
335      gtk_widget_show_all(container);      gtk_widget_show_all(container);
336    }    }
 #endif  
337  }  }
338    
339    
# Line 317  static gboolean cachelist_update(gpointe Line 341  static gboolean cachelist_update(gpointe
341    
342    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
343    
 #ifdef USE_MAEMO  
344    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
345    
346    if(appdata->cur_cache)    if(appdata->cur_cache)
347      return TRUE;      return TRUE;
348    
349    #ifdef USE_MAEMO
350    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
351      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
352        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
353    #endif
354    
355    if(appdata->cachelist_update)    if(appdata->cachelist_update)
356      cachelist_redraw(appdata);      cachelist_redraw(appdata);
 #endif  
357    
358    return TRUE;    return TRUE;
359  }  }
# Line 451  static GtkWidget *cachelist_create(appda Line 475  static GtkWidget *cachelist_create(appda
475      if(tint > 8) tint = 8;      if(tint > 8) tint = 8;
476    
477      /* cache type includes "solved" flag in lowest bit */      /* cache type includes "solved" flag in lowest bit */
478      int type = (cache->type<<8) +      int type = cache->type<<8;
479        (cache->notes?4:0) +      if(cache->notes) type |= 4;
480        ((cache->notes && cache->notes->override)?1:0) +      if(cache->notes && cache->notes->override) type |= 1;
481        ((cache->notes && cache->notes->found)?2:0);      if(cache->notes && cache->notes->found) type |= 2;
482        if(cache->found) type |= 2;
483        if(cache->mine) type |= 8;
484    
485      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
486    
# Line 570  void cachelist_dialog(appdata_t *appdata Line 596  void cachelist_dialog(appdata_t *appdata
596  static void search_result_free(gpx_t *result);  static void search_result_free(gpx_t *result);
597    
598  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
599      printf("cachelist destroy\n");
600    
601      HildonWindowStack *stack = hildon_window_stack_get_default();
602      appdata->window = HILDON_WINDOW(hildon_window_stack_peek(stack));
603    
604    if(appdata->search_results) {    if(appdata->search_results) {
605      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
606      appdata->search_results = NULL;      appdata->search_results = NULL;
607    }    }
608    appdata->cur_gpx = NULL;    appdata->cur_gpx = NULL;
609    
610    #ifdef ENABLE_OSM_GPS_MAP
611      map_update(appdata);
612    #endif
613    
614    /* restore cur_view */    /* restore cur_view */
615    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
616  }  }
617    
618  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
619    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
620      appdata->window = HILDON_WINDOW(window);
621    
622    /* store last "cur_view" in window */    /* store last "cur_view" in window */
623    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
624    
625    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
626    char *title = g_strdup_printf("%s - GPXView", gpx->name);    gtk_window_set_title(GTK_WINDOW(window), gpx->name);
   gtk_window_set_title(GTK_WINDOW(window), title);  
   g_free(title);  
627    
628    appdata->cur_view = cachelist_create(appdata, gpx, NULL);    appdata->cur_view = cachelist_create(appdata, gpx, NULL);
629    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 636  void cachelist_dialog(appdata_t *appdata
636                     G_CALLBACK(on_cachelist_destroy), appdata);                     G_CALLBACK(on_cachelist_destroy), appdata);
637    
638    gtk_widget_show_all(window);    gtk_widget_show_all(window);
639    
640    #ifdef ENABLE_OSM_GPS_MAP
641      map_update(appdata);
642    #endif
643  }  }
644  #endif  #endif
645  #endif  #endif
# Line 634  static GdkPixbuf *gpx_icon_get(gpx_t *gp Line 672  static GdkPixbuf *gpx_icon_get(gpx_t *gp
672    return icon_get(ICON_FILE, 0);    return icon_get(ICON_FILE, 0);
673  }  }
674    
675  static void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {  void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {
676    char date_str[32], cnum[32];    char date_str[32], cnum[32];
677    
678    if(gpx->year && gpx->month && gpx->day) {    if(gpx->year && gpx->month && gpx->day) {
# Line 659  static void gpxlist_set(GtkListStore *st Line 697  static void gpxlist_set(GtkListStore *st
697                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
698                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
699  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
700                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 2),
701  #endif  #endif
702                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
703                       -1);                       -1);
# Line 705  static void gpxlist_close(appdata_t *app Line 743  static void gpxlist_close(appdata_t *app
743    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
744  }  }
745    
746    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
747    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
748    #ifdef USE_STACKABLE_WINDOW
749      if(!appdata->cur_gpx)
750    #endif
751        cachelist_dialog(appdata, gpx);
752    #ifdef USE_STACKABLE_WINDOW
753      else
754        printf("selected gpx, but cachelist window already present\n");
755    #endif
756    #else
757      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
758      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
759      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
760      gtk_widget_show_all(appdata->vbox);
761    
762      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
763    #endif
764    }
765    
766  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
767                            GtkTreePath        *path,                            GtkTreePath        *path,
768                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 713  static void gpxlist_view_onRowActivated( Line 771  static void gpxlist_view_onRowActivated(
771    GtkTreeIter   iter;    GtkTreeIter   iter;
772    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
773    
774    #ifdef USE_MAEMO
775      /* check if a cache is already selected and ignore click if yes */
776      /* (was probably a double click) */
777      if(appdata->cur_gpx) return;
778    #endif
779    
780    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
781      gpx_t *gpx;      gpx_t *gpx;
782      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 789  static void gpxlist_view_onRowActivated(
789      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
790        printf("clicked delete\n");        printf("clicked delete\n");
791    
792    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
793        /* ask user what he wants */        /* ask user what he wants */
794        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
795                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
796                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
797                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   GTK_MESSAGE_QUESTION,
798                     GTK_BUTTONS_CANCEL,
799                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
800                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
801    
# Line 738  static void gpxlist_view_onRowActivated( Line 804  static void gpxlist_view_onRowActivated(
804                               _("Close"), 2,                               _("Close"), 2,
805                               NULL);                               NULL);
806    
807          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
808    #else
809    
810          GtkWidget *dialog =
811            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
812                                GTK_WINDOW(appdata->window),
813                                GTK_DIALOG_DESTROY_WITH_PARENT,
814                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
815                                _("Remove"), 1,
816                                _("Close"), 2,
817                                NULL);
818    
819          GtkWidget *content_area =
820            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
821    
822          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
823    
824          gtk_box_pack_start(GTK_BOX(hbox),
825             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
826                                       GTK_ICON_SIZE_DIALOG),
827                             FALSE, FALSE, 0);
828    
829          GtkWidget *label = gtk_label_new(
830                      _("Do you want to close this entry only or do "
831                        "you want to remove it completely from the list?"));
832    
833          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
834          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
835    
836          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
837          gtk_container_add (GTK_CONTAINER (content_area), hbox);
838    
839          gtk_widget_show_all (dialog);
840    #endif
841    
842        if(gpx->closed)        if(gpx->closed)
843          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
844    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));  
   
845        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
846        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
847    
# Line 772  static void gpxlist_view_onRowActivated( Line 871  static void gpxlist_view_onRowActivated(
871          gpx_t *new = NULL;          gpx_t *new = NULL;
872    
873          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
874            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
875          else          else
876            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
877    
878          if(new) {          if(new) {
879            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 810  static void gpxlist_view_onRowActivated( Line 909  static void gpxlist_view_onRowActivated(
909    
910          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
911        }        }
912  #ifndef USE_BREAD_CRUMB_TRAIL  
913  #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  
914      }      }
915    }    }
916  }  }
917    
918    /* search gpx file in gpx list */
919    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx) {
920      GtkTreeModel *model =
921        gtk_tree_view_get_model(GTK_TREE_VIEW(appdata->gpxview));
922    
923      gboolean found =
924        gtk_tree_model_get_iter_first(model, iter);
925    
926      while(found) {
927        gpx_t *this_gpx;
928        gtk_tree_model_get(model, iter, GPXLIST_COL_DATA, &this_gpx, -1);
929    
930        if(gpx == this_gpx)
931          return TRUE;
932    
933        found = gtk_tree_model_iter_next(model, iter);
934      }
935    
936      return FALSE;
937    }
938    
939    
940  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
941  static gboolean  static gboolean
942  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
# Line 881  static GtkWidget *gpxlist_create_view_an Line 987  static GtkWidget *gpxlist_create_view_an
987    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
988                    -1, "Icon", renderer,                    -1, "Icon", renderer,
989                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
990                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
991            /* at least one entry needs to be sensitive. */
992            /* This is the delete icon if the PANNABLE_AREA is used */
993                      "sensitive", GPXLIST_COL_OPEN,
994    #endif
995                    NULL);                    NULL);
996    
997    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 937  static GtkWidget *gpxlist_create_view_an Line 1047  static GtkWidget *gpxlist_create_view_an
1047    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1048                    -1, "Del", renderer,                    -1, "Del", renderer,
1049                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
1050                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
1051                    NULL);                    NULL);
1052  #endif  #endif
1053    
# Line 957  static GtkWidget *gpxlist_create_view_an Line 1067  static GtkWidget *gpxlist_create_view_an
1067      GtkTreeIter         iter;      GtkTreeIter         iter;
1068      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1069      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1070    
1071      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1072        sel_iter = iter;        sel_iter = iter;
1073        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 1001  static GtkWidget *gpxlist_create_view_an Line 1111  static GtkWidget *gpxlist_create_view_an
1111  }  }
1112    
1113  /* add last entry in gpx list to visual representation */  /* add last entry in gpx list to visual representation */
1114  static void gpxlist_add(appdata_t *appdata, gpx_t *new) {  void gpxlist_add(appdata_t *appdata, gpx_t *new) {
1115    GtkTreeIter         iter;    GtkTreeIter         iter;
1116    
1117    gtk_list_store_append(appdata->gpxstore, &iter);    gtk_list_store_append(appdata->gpxstore, &iter);
# Line 1011  static void gpxlist_add(appdata_t *appda Line 1121  static void gpxlist_add(appdata_t *appda
1121    gpx_t **gpx = &appdata->gpx;    gpx_t **gpx = &appdata->gpx;
1122    while(*gpx) gpx = &((*gpx)->next);    while(*gpx) gpx = &((*gpx)->next);
1123    *gpx = new;    *gpx = new;
1124    
1125      /* select new iter */
1126      GtkTreeSelection *selection =
1127        gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1128      gtk_tree_selection_select_iter(selection, &iter);
1129      GtkTreePath *path =
1130        gtk_tree_model_get_path(GTK_TREE_MODEL(appdata->gpxstore), &iter);
1131      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(appdata->gpxview),
1132                                   path, NULL, TRUE, 0.0, 0.0);
1133      gtk_tree_path_free(path);
1134  }  }
1135    
1136  /******************** end of gpxlist ********************/  /******************** end of gpxlist ********************/
# Line 1019  static void gpxlist_add(appdata_t *appda Line 1139  static void gpxlist_add(appdata_t *appda
1139    
1140  static void  static void
1141  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1142    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));  
1143  }  }
1144    
1145  #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 1311  gpx_t *search_do(appdata_t *appdata, gpx
1311        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1312                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1313          hit = 1;          hit = 1;
1314        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1315                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1316          hit = 1;          hit = 1;
1317    
1318        if(hit) {        if(hit) {
# Line 1252  typedef struct { Line 1341  typedef struct {
1341    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1342  } search_context_t;  } search_context_t;
1343    
1344    
1345  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1346    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1347    
1348    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1349    
1350    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1351    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 1375  cb_menu_search(GtkWidget *window, gpoint
1375    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1376    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1377    
1378    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1379    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);  
1380    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);
1381    
1382    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1383    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);  
1384    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);
1385    
1386    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1387    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);  
1388    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);
1389    
1390    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1391    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);  
1392    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);
1393    
1394    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 1397  cb_menu_search(GtkWidget *window, gpoint
1397    
1398    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1399                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1400      context.entry = entry_new();
1401    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1402                                context.entry = gtk_entry_new());                                context.entry);
1403    
1404    if(appdata->search_str)    if(appdata->search_str)
1405      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1406    
# Line 1324  cb_menu_search(GtkWidget *window, gpoint Line 1411  cb_menu_search(GtkWidget *window, gpoint
1411    
1412    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1413    
1414    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1415    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);  
1416    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1417    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1418                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1366  cb_menu_search(GtkWidget *window, gpoint Line 1452  cb_menu_search(GtkWidget *window, gpoint
1452                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1453  #endif  #endif
1454    
1455      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1456        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1457      else      else
1458        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1459    
1460      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1461        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1462      else      else
1463        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1464    
1465      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1466        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1467      else      else
1468        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1469    
1470      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1471        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1472      else      else
1473        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1474    
1475      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1476        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1477      else      else
1478        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1399  cb_menu_search(GtkWidget *window, gpoint Line 1485  cb_menu_search(GtkWidget *window, gpoint
1485    
1486        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1487    
1488  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1489        gpx_t *found =        gpx_t *found =
1490          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1491    
# Line 1495  cb_menu_export_log(GtkWidget *widget, gp Line 1581  cb_menu_export_log(GtkWidget *widget, gp
1581    notes_log_export(appdata);    notes_log_export(appdata);
1582  }  }
1583    
1584  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1585  static void  static void
1586  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1587    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1531  cb_menu_precpos(GtkWidget *window, gpoin Line 1617  cb_menu_precpos(GtkWidget *window, gpoin
1617    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1618  }  }
1619    
1620    static void
1621    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1622      geotoad((appdata_t *)data);
1623    }
1624    
1625  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1626  typedef struct {  typedef struct {
1627    char *label, *desc;    char *label, *desc;
# Line 1614  static void submenu_cleanup(GtkWidget *m Line 1705  static void submenu_cleanup(GtkWidget *m
1705  }  }
1706    
1707  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1708    #ifdef ENABLE_MAEMO_MAPPER
1709    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1710      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1711    #endif
1712    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1713      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1714    { "Export Garmin GPX",       "Save modified waypoints in GPX file",    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
# Line 1637  void on_export_clicked(GtkButton *button Line 1730  void on_export_clicked(GtkButton *button
1730  }  }
1731    
1732  static const menu_entry_t submenu_tools_entries[] = {  static const menu_entry_t submenu_tools_entries[] = {
 #ifdef ENABLE_OSM_GPS_MAP  
   { "Map",              "Display an interactive world map",  
     G_CALLBACK(cb_menu_map) },  
 #endif  
1733    { "Geomath",          "Geocoordinate calculation",    { "Geomath",          "Geocoordinate calculation",
1734      G_CALLBACK(cb_menu_geomath) },      G_CALLBACK(cb_menu_geomath) },
1735    { "Geotext",          "Text analysis",    { "Geotext",          "Text analysis",
1736      G_CALLBACK(cb_menu_geotext) },      G_CALLBACK(cb_menu_geotext) },
1737    { "Precise Position", "Calculate a precise GPS position",    { "Precise Position", "Calculate a precise GPS position",
1738      G_CALLBACK(cb_menu_precpos) },      G_CALLBACK(cb_menu_precpos) },
1739      { "GeoToad",          "Use GeoToad online downloader",
1740        G_CALLBACK(cb_menu_geotoad) },
1741    { NULL, NULL, NULL }    { NULL, NULL, NULL }
1742  };  };
1743    
# Line 1688  HildonAppMenu *menu_create(appdata_t *ap Line 1779  HildonAppMenu *menu_create(appdata_t *ap
1779      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1780                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1781      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1782    
   if(mode == MENU_GPXLIST) {  
1783      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1784      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1785                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1707  HildonAppMenu *menu_create(appdata_t *ap Line 1796  HildonAppMenu *menu_create(appdata_t *ap
1796                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1797    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1798    
1799    #ifdef ENABLE_OSM_GPS_MAP
1800        button = gtk_button_new_with_label(_("Map"));
1801        g_signal_connect_after(button, "clicked",
1802                               G_CALLBACK(cb_menu_map), appdata);
1803        hildon_app_menu_append(menu, GTK_BUTTON(button));
1804    #endif
1805    
1806  #ifdef HILDON_HELP  #ifdef HILDON_HELP
1807    button = gtk_button_new_with_label(_("Help"));    button = gtk_button_new_with_label(_("Help"));
1808    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
# Line 1724  void menu_create(appdata_t *appdata) { Line 1820  void menu_create(appdata_t *appdata) {
1820    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1821    menu = gtk_menu_new();    menu = gtk_menu_new();
1822    
1823  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1824    appdata->menu_import =    appdata->menu_import =
1825  #endif  #endif
1826    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1754  void menu_create(appdata_t *appdata) { Line 1850  void menu_create(appdata_t *appdata) {
1850    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1851  #endif  #endif
1852    
1853  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1854    appdata->menu_export =    appdata->menu_export =
1855  #endif  #endif
1856      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1762  void menu_create(appdata_t *appdata) { Line 1858  void menu_create(appdata_t *appdata) {
1858    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1859    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1860    
1861  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1862    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1863    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1864    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1779  void menu_create(appdata_t *appdata) { Line 1875  void menu_create(appdata_t *appdata) {
1875    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1876                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1877    
1878  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1879    appdata->menu_search =    appdata->menu_search =
1880  #endif  #endif
1881    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1788  void menu_create(appdata_t *appdata) { Line 1884  void menu_create(appdata_t *appdata) {
1884    
1885    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1886    
 #ifndef NO_COPY_N_PASTE  
1887    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1888    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1889    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1890    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1891    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1819  void menu_create(appdata_t *appdata) { Line 1912  void menu_create(appdata_t *appdata) {
1912    
1913    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1914    
   item = gtk_menu_item_new_with_label(_("Tools"));  
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
   submenu = gtk_menu_new();  
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);  
   
1915  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
1916    item = gtk_menu_item_new_with_label( _("Map") );    item = gtk_menu_item_new_with_label( _("Map") );
1917    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1918    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1919                     GTK_SIGNAL_FUNC(cb_menu_map), appdata);                     GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1920  #endif  #endif
1921    
1922      item = gtk_menu_item_new_with_label(_("Tools"));
1923      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1924      submenu = gtk_menu_new();
1925      gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1926    
1927    item = gtk_menu_item_new_with_label( _("Geomath") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1928    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1929    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1846  void menu_create(appdata_t *appdata) { Line 1939  void menu_create(appdata_t *appdata) {
1939    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1940                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
1941    
1942      item = gtk_menu_item_new_with_label( _("GeoToad") );
1943      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1944      g_signal_connect(item, "activate",
1945                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
1946    
1947    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1948    
1949  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1885  void menu_create(appdata_t *appdata) { Line 1983  void menu_create(appdata_t *appdata) {
1983  /********************* end of menu **********************/  /********************* end of menu **********************/
1984    
1985  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
1986      gconf_save_state(appdata);
1987    
1988    gpx_free_all(appdata->gpx);    gpx_free_all(appdata->gpx);
   if(appdata->path) free(appdata->path);  
   if(appdata->image_path) free(appdata->image_path);  
   if(appdata->search_str) free(appdata->search_str);  
1989    
1990  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1991    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
# Line 1926  void cleanup(appdata_t *appdata) { Line 2023  void cleanup(appdata_t *appdata) {
2023  static void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2024    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2025    
   gconf_save_state(appdata);  
2026    gtk_main_quit();    gtk_main_quit();
2027    appdata->window = NULL;    appdata->window = NULL;
2028  }  }
# Line 1986  gboolean on_window_key_press(GtkWidget * Line 2082  gboolean on_window_key_press(GtkWidget *
2082    return handled;    return handled;
2083  }  }
2084    
2085  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2086  typedef struct {  typedef struct {
2087    int level;    int level;
2088    appdata_t *appdata;    appdata_t *appdata;
# Line 2078  crumb_back(gpointer data) { Line 2174  crumb_back(gpointer data) {
2174    
2175    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2176    g_free(data);    g_free(data);
2177    
2178    #ifdef ENABLE_OSM_GPS_MAP
2179      map_update(crumb->appdata);
2180    #endif
2181  }  }
2182    
2183  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 2118  static void crumb_add(appdata_t *appdata Line 2218  static void crumb_add(appdata_t *appdata
2218  #endif  #endif
2219    }    }
2220    
2221    #ifdef USE_BREAD_CRUMB_TRAIL
2222    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2223                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2224    #else
2225      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2226    #endif
2227    
2228    #ifdef ENABLE_OSM_GPS_MAP
2229      map_update(appdata);
2230    #endif
2231  }  }
2232  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2233    
# Line 2131  void main_after_settings_redraw(appdata_ Line 2239  void main_after_settings_redraw(appdata_
2239      return;      return;
2240    }    }
2241    
 #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  
2242    /* 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 */
2243    /* need to be redrawn */    /* need to be redrawn */
2244    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2197  void main_after_settings_redraw(appdata_ Line 2293  void main_after_settings_redraw(appdata_
2293    
2294      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2295    }    }
 #endif // USE_MAEMO  
2296  }  }
2297    
2298  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2218  int main(int argc, char *argv[]) { Line 2313  int main(int argc, char *argv[]) {
2313    
2314    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2315    
2316      misc_init();
2317    
2318      curl_global_init(CURL_GLOBAL_ALL);
2319    
2320  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2321    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2322    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2226  int main(int argc, char *argv[]) { Line 2325  int main(int argc, char *argv[]) {
2325      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2326    }    }
2327    
2328    #ifdef ENABLE_MAEMO_MAPPER
2329    dbus_register(&appdata);    dbus_register(&appdata);
2330  #endif  #endif
2331    #endif
2332    
2333    icons_init();    icons_init();
2334    
# Line 2251  int main(int argc, char *argv[]) { Line 2352  int main(int argc, char *argv[]) {
2352    /* Create a Window. */    /* Create a Window. */
2353    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2354    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2355    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2356  #endif  #endif
2357    
2358  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2264  int main(int argc, char *argv[]) { Line 2365  int main(int argc, char *argv[]) {
2365    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2366                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2367    
2368      /* prepare clipboard */
2369      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2370      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2371    
2372    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2373    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2374  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
# Line 2279  int main(int argc, char *argv[]) { Line 2384  int main(int argc, char *argv[]) {
2384    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);
2385    
2386    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2387    #else
2388    #ifdef BCT
2389      /* on non-hildon machines we use some custom made breadcrumbtrail */
2390      /* replacement */
2391      appdata.bct = bct_new();
2392      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2393    #endif
2394    #endif
2395    
2396    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2397    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2398  #endif  #endif
2399    
Legend:
Removed from v.40  
changed lines
  Added in v.233