Diff of /trunk/src/main.c

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

revision 74 by harbaum, Mon Aug 24 09:23:36 2009 UTC revision 212 by harbaum, Wed Nov 25 13:52:17 2009 UTC
# Line 15  Line 15 
15   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
16   */   */
17    
18  #include <stdio.h>  #define __USE_GNU
19  #include <string.h>  #include <string.h>
20    
21    #include <stdio.h>
22  #include <math.h>  #include <math.h>
23    
24    #include <curl/curl.h>
25    
26  #include <time.h>  #include <time.h>
27  #include <sys/time.h>  #include <sys/time.h>
28    
# Line 29  Line 33 
33    
34  #ifdef USE_MAEMO  #ifdef USE_MAEMO
35  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
36    #if MAEMO_VERSION_MAJOR >= 5
37    #include <hildon/hildon-note.h>
38    #include <hildon/hildon-entry.h>
39    #include <hildon/hildon-check-button.h>
40    #endif
41  #endif  #endif
42    
43  #include <locale.h>  #include <locale.h>
44    
45  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
46    
47  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
48  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
49                        gpointer user_data);                        gpointer user_data);
50    
# Line 92  void errorf(const char *fmt, ...) { Line 101  void errorf(const char *fmt, ...) {
101      }      }
102    }    }
103    
104    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
105    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
106                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
107                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
108                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,                             GTK_MESSAGE_ERROR,
109                             buf);                             GTK_BUTTONS_CLOSE, buf);
110    
111    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
112    #else
113      GtkWidget *dialog =
114        hildon_note_new_information(GTK_WINDOW(NULL), buf);
115    #endif
116    
117    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
118    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 152  gpx_t *choose_file(appdata_t *appdata, g
152    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
153    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
154      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
155    
156        if(filename) {
157          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
158    
159      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
160            gpx = gpx_parse(dialog, filename, appdata->username);
161      if(!whole_dir)        else {
162        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
163      else {          if(strlastchr(filename) == '/')
164        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
165        if(strlastchr(filename) == '/')  
166          filename[strlen(filename)] = 0;          gpx = gpx_parse_dir(dialog, filename, appdata->username);
   
       gpx = gpx_parse_dir(dialog, filename);  
     }  
   
     gpx_busy_dialog_destroy(dialog);  
   
     /* save path if gpx was successfully loaded */  
     if(gpx) {  
       char *r = strrchr(filename, '/');  
   
       /* there is a delimiter, use everything left of it as path */  
       if(r && !whole_dir) {  
         *r = 0;  
         if(appdata->path) free(appdata->path);  
         appdata->path = strdup(filename);  
         /* restore path ... just in case ... */  
         *r = '/';  
167        }        }
168    
169        if(whole_dir)        gpx_busy_dialog_destroy(dialog);
170          appdata->path = strdup(filename);  
171      } else        /* save path if gpx was successfully loaded */
172        errorf(_("Load error"));        if(gpx) {
173            char *r = strrchr(filename, '/');
174    
175            /* there is a delimiter, use everything left of it as path */
176            if(r && !whole_dir) {
177              *r = 0;
178              if(appdata->path) free(appdata->path);
179              appdata->path = strdup(filename);
180              /* restore path ... just in case ... */
181              *r = '/';
182            }
183    
184            if(whole_dir)
185              appdata->path = strdup(filename);
186          } else
187            errorf(_("Load error"));
188    
189      g_free (filename);        g_free (filename);
190        } else {
191    #ifndef USE_MAEMO
192          errorf(_("Error accessing the file."));
193    #else
194          errorf(_("Error accessing the file. This may happen if the file "
195                   "resides on a remote file system. Please copy the file onto "
196                   "the device (e.g. onto the memory card) and try again."));
197    #endif
198        }
199    }    }
200    
201    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 195  enum { Line 219  enum {
219    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
220  } ;  } ;
221    
222  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
223    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
224        cache_dialog(appdata, cache);
225    #else
226        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
227        appdata->cur_view = cache_view(appdata, cache);
228        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
229        gtk_widget_show_all(appdata->vbox);
230    
231        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
232    #endif
233    }
234    
235    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
236                                     GtkTreePath        *path,                                     GtkTreePath        *path,
237                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
238                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 212  void cachelist_view_onRowActivated(GtkTr Line 249  void cachelist_view_onRowActivated(GtkTr
249    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
250      cache_t *cache;      cache_t *cache;
251      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
252  #ifndef USE_BREAD_CRUMB_TRAIL      cachelist_goto_cache(appdata, cache);
     cache_dialog(appdata, cache);  
 #else  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = cache_view(appdata, cache);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
 #endif  
253    }    }
254  }  }
255    
# Line 264  static GtkWidget *cachelist_create(appda Line 292  static GtkWidget *cachelist_create(appda
292                                     cache_t *sel_cache);                                     cache_t *sel_cache);
293    
294  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
 #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  
   
295    if(!appdata->cur_view) {    if(!appdata->cur_view) {
296      printf("cachelist redraw: no active view\n");      printf("cachelist redraw: no active view\n");
297      return;      return;
# Line 288  void cachelist_redraw(appdata_t *appdata Line 309  void cachelist_redraw(appdata_t *appdata
309    if(redraw) {    if(redraw) {
310      GtkWidget *container = appdata->vbox;      GtkWidget *container = appdata->vbox;
311    
     printf("redraw %d\n", redraw);  
   
312  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
313      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
314      container = hildon_window_stack_peek(stack);      container = hildon_window_stack_peek(stack);
# Line 316  void cachelist_redraw(appdata_t *appdata Line 335  void cachelist_redraw(appdata_t *appdata
335    
336      gtk_widget_show_all(container);      gtk_widget_show_all(container);
337    }    }
 #endif  
338  }  }
339    
340    
# Line 324  static gboolean cachelist_update(gpointe Line 342  static gboolean cachelist_update(gpointe
342    
343    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
344    
 #ifdef USE_MAEMO  
345    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
346    
347    if(appdata->cur_cache)    if(appdata->cur_cache)
348      return TRUE;      return TRUE;
349    
350    #ifdef USE_MAEMO
351    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
352      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
353        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
354    #endif
355    
356    if(appdata->cachelist_update)    if(appdata->cachelist_update)
357      cachelist_redraw(appdata);      cachelist_redraw(appdata);
 #endif  
358    
359    return TRUE;    return TRUE;
360  }  }
# Line 458  static GtkWidget *cachelist_create(appda Line 476  static GtkWidget *cachelist_create(appda
476      if(tint > 8) tint = 8;      if(tint > 8) tint = 8;
477    
478      /* cache type includes "solved" flag in lowest bit */      /* cache type includes "solved" flag in lowest bit */
479      int type = (cache->type<<8) +      int type = cache->type<<8;
480        (cache->notes?4:0) +      if(cache->notes) type |= 4;
481        ((cache->notes && cache->notes->override)?1:0) +      if(cache->notes && cache->notes->override) type |= 1;
482        ((cache->notes && cache->notes->found)?2:0);      if(cache->notes && cache->notes->found) type |= 2;
483        if(cache->found) type |= 2;
484        if(cache->mine) type |= 8;
485    
486      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
487    
# Line 577  void cachelist_dialog(appdata_t *appdata Line 597  void cachelist_dialog(appdata_t *appdata
597  static void search_result_free(gpx_t *result);  static void search_result_free(gpx_t *result);
598    
599  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
600      printf("cachelist destroy\n");
601    
602    if(appdata->search_results) {    if(appdata->search_results) {
603      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
604      appdata->search_results = NULL;      appdata->search_results = NULL;
605    }    }
606    appdata->cur_gpx = NULL;    appdata->cur_gpx = NULL;
607    
608    #ifdef ENABLE_OSM_GPS_MAP
609      map_update(appdata);
610    #endif
611    
612    /* restore cur_view */    /* restore cur_view */
613    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
614  }  }
# Line 609  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 641  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 666  static void gpxlist_set(GtkListStore *st Line 696  static void gpxlist_set(GtkListStore *st
696                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
697                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
698  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
699                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),
700  #endif  #endif
701                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
702                       -1);                       -1);
# Line 712  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 738  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 751  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 785  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 823  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 894  static GtkWidget *gpxlist_create_view_an Line 986  static GtkWidget *gpxlist_create_view_an
986    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
987                    -1, "Icon", renderer,                    -1, "Icon", renderer,
988                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
989                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
990            /* at least one entry needs to be sensitive. */
991            /* This is the delete icon if the PANNABLE_AREA is used */
992                      "sensitive", GPXLIST_COL_OPEN,
993    #endif
994                    NULL);                    NULL);
995    
996    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 950  static GtkWidget *gpxlist_create_view_an Line 1046  static GtkWidget *gpxlist_create_view_an
1046    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1047                    -1, "Del", renderer,                    -1, "Del", renderer,
1048                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
1049                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
1050                    NULL);                    NULL);
1051  #endif  #endif
1052    
# Line 967  static GtkWidget *gpxlist_create_view_an Line 1063  static GtkWidget *gpxlist_create_view_an
1063    GtkTreeIter sel_iter;    GtkTreeIter sel_iter;
1064    gboolean sel_iter_valid = FALSE;    gboolean sel_iter_valid = FALSE;
1065    while(gpx) {    while(gpx) {
1066      /* don't display entries that failed at load */      GtkTreeIter         iter;
1067      if(!gpx->failed) {      gtk_list_store_append(appdata->gpxstore, &iter);
1068        GtkTreeIter         iter;      gpxlist_set(appdata->gpxstore, &iter, gpx);
1069        gtk_list_store_append(appdata->gpxstore, &iter);  
1070        gpxlist_set(appdata->gpxstore, &iter, gpx);      if(gpx == sel_gpx) {
1071          sel_iter = iter;
1072        if(gpx == sel_gpx) {        sel_iter_valid = TRUE;
         sel_iter = iter;  
         sel_iter_valid = TRUE;  
       }  
1073      }      }
1074    
1075      gpx = gpx->next;      gpx = gpx->next;
# Line 1064  cb_menu_about(GtkWidget *window, gpointe Line 1157  cb_menu_about(GtkWidget *window, gpointe
1157    const gchar *authors[] = {    const gchar *authors[] = {
1158      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
1159      "John Stowers <john.stowers@gmail.com>",      "John Stowers <john.stowers@gmail.com>",
1160        "GCVote: Guido Wegener <guido.wegener@gmx.de>",
1161      NULL };      NULL };
1162    
1163    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
# Line 1086  cb_menu_about(GtkWidget *window, gpointe Line 1180  cb_menu_about(GtkWidget *window, gpointe
1180    
1181    GtkWidget *button = gtk_button_new();    GtkWidget *button = gtk_button_new();
1182    gtk_button_set_image(GTK_BUTTON(button),    gtk_button_set_image(GTK_BUTTON(button),
1183                         icon_get_widget(ICON_MISC, 8));                         icon_get_widget(ICON_MISC, 5));
1184    gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);    gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1185    g_signal_connect(button, "clicked",    g_signal_connect(button, "clicked",
1186                     G_CALLBACK(on_paypal_button_clicked), &context);                     G_CALLBACK(on_paypal_button_clicked), &context);
# Line 1272  gpx_t *search_do(appdata_t *appdata, gpx Line 1366  gpx_t *search_do(appdata_t *appdata, gpx
1366        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1367                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1368          hit = 1;          hit = 1;
1369        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1370                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1371          hit = 1;          hit = 1;
1372    
1373        if(hit) {        if(hit) {
# Line 1302  typedef struct { Line 1396  typedef struct {
1396    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1397  } search_context_t;  } search_context_t;
1398    
1399    
1400    static GtkWidget *check_button_new_with_label(char *label) {
1401    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1402      return gtk_check_button_new_with_label(label);
1403    #else
1404      GtkWidget *cbut =
1405        hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
1406      gtk_button_set_label(GTK_BUTTON(cbut), label);
1407      return cbut;
1408    #endif
1409    }
1410    
1411    static void check_button_set_active(GtkWidget *button, gboolean active) {
1412    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1413      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
1414    #else
1415      hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
1416    #endif
1417    }
1418    
1419    static gboolean check_button_get_active(GtkWidget *button) {
1420    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1421      return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
1422    #else
1423      return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));
1424    #endif
1425    }
1426    
1427  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1428    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1429    
1430    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1431    
1432    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1433    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1336  cb_menu_search(GtkWidget *window, gpoint Line 1457  cb_menu_search(GtkWidget *window, gpoint
1457    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1458    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1459    
1460    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1461    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_id),    check_button_set_active(context.in_id, appdata->search & SEARCH_ID);
                                appdata->search & SEARCH_ID);  
1462    gtk_table_attach_defaults(GTK_TABLE(table), context.in_id, 0, 1, 0, 1);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_id, 0, 1, 0, 1);
1463    
1464    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1465    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_name),    check_button_set_active(context.in_name, appdata->search & SEARCH_NAME);
                                appdata->search & SEARCH_NAME);  
1466    gtk_table_attach_defaults(GTK_TABLE(table), context.in_name, 1, 2, 0, 1);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_name, 1, 2, 0, 1);
1467    
1468    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1469    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_desc),    check_button_set_active(context.in_desc, appdata->search & SEARCH_DESC);
                                appdata->search & SEARCH_DESC);  
1470    gtk_table_attach_defaults(GTK_TABLE(table), context.in_desc, 0, 1, 1, 2);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_desc, 0, 1, 1, 2);
1471    
1472    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1473    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_owner),    check_button_set_active(context.in_owner, appdata->search & SEARCH_OWNER);
                                appdata->search & SEARCH_OWNER);  
1474    gtk_table_attach_defaults(GTK_TABLE(table), context.in_owner, 1, 2, 1, 2);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_owner, 1, 2, 1, 2);
1475    
1476    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
# Line 1362  cb_menu_search(GtkWidget *window, gpoint Line 1479  cb_menu_search(GtkWidget *window, gpoint
1479    
1480    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1481                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1482      context.entry = entry_new();
1483    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1484                                context.entry = gtk_entry_new());                                context.entry);
1485    
1486    if(appdata->search_str)    if(appdata->search_str)
1487      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1488    
# Line 1374  cb_menu_search(GtkWidget *window, gpoint Line 1493  cb_menu_search(GtkWidget *window, gpoint
1493    
1494    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1495    
1496    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1497    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);  
1498    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1499    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1500                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1416  cb_menu_search(GtkWidget *window, gpoint Line 1534  cb_menu_search(GtkWidget *window, gpoint
1534                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1535  #endif  #endif
1536    
1537      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1538        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1539      else      else
1540        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1541    
1542      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1543        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1544      else      else
1545        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1546    
1547      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1548        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1549      else      else
1550        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1551    
1552      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1553        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1554      else      else
1555        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1556    
1557      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1558        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1559      else      else
1560        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1449  cb_menu_search(GtkWidget *window, gpoint Line 1567  cb_menu_search(GtkWidget *window, gpoint
1567    
1568        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1569    
1570  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1571        gpx_t *found =        gpx_t *found =
1572          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1573    
# Line 1545  cb_menu_export_log(GtkWidget *widget, gp Line 1663  cb_menu_export_log(GtkWidget *widget, gp
1663    notes_log_export(appdata);    notes_log_export(appdata);
1664  }  }
1665    
1666  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1667  static void  static void
1668  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1669    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1581  cb_menu_precpos(GtkWidget *window, gpoin Line 1699  cb_menu_precpos(GtkWidget *window, gpoin
1699    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1700  }  }
1701    
1702    static void
1703    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1704      geotoad((appdata_t *)data);
1705    }
1706    
1707  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1708  typedef struct {  typedef struct {
1709    char *label, *desc;    char *label, *desc;
# Line 1664  static void submenu_cleanup(GtkWidget *m Line 1787  static void submenu_cleanup(GtkWidget *m
1787  }  }
1788    
1789  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1790    #ifdef ENABLE_MAEMO_MAPPER
1791    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1792      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1793    #endif
1794    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1795      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1796    { "Export Garmin GPX",       "Save modified waypoints in GPX file",    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
# Line 1693  static const menu_entry_t submenu_tools_ Line 1818  static const menu_entry_t submenu_tools_
1818      G_CALLBACK(cb_menu_geotext) },      G_CALLBACK(cb_menu_geotext) },
1819    { "Precise Position", "Calculate a precise GPS position",    { "Precise Position", "Calculate a precise GPS position",
1820      G_CALLBACK(cb_menu_precpos) },      G_CALLBACK(cb_menu_precpos) },
1821      { "GeoToad",          "Use GeoToad online downloader",
1822        G_CALLBACK(cb_menu_geotoad) },
1823    { NULL, NULL, NULL }    { NULL, NULL, NULL }
1824  };  };
1825    
# Line 1752  HildonAppMenu *menu_create(appdata_t *ap Line 1879  HildonAppMenu *menu_create(appdata_t *ap
1879    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1880    
1881  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
   if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {  
1882      button = gtk_button_new_with_label(_("Map"));      button = gtk_button_new_with_label(_("Map"));
1883      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1884                             G_CALLBACK(cb_menu_map), appdata);                             G_CALLBACK(cb_menu_map), appdata);
1885      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1886  #endif  #endif
1887    
1888  #ifdef HILDON_HELP  #ifdef HILDON_HELP
# Line 1777  void menu_create(appdata_t *appdata) { Line 1902  void menu_create(appdata_t *appdata) {
1902    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1903    menu = gtk_menu_new();    menu = gtk_menu_new();
1904    
1905  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1906    appdata->menu_import =    appdata->menu_import =
1907  #endif  #endif
1908    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1807  void menu_create(appdata_t *appdata) { Line 1932  void menu_create(appdata_t *appdata) {
1932    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1933  #endif  #endif
1934    
1935  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1936    appdata->menu_export =    appdata->menu_export =
1937  #endif  #endif
1938      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1815  void menu_create(appdata_t *appdata) { Line 1940  void menu_create(appdata_t *appdata) {
1940    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1941    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1942    
1943  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1944    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1945    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1946    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1832  void menu_create(appdata_t *appdata) { Line 1957  void menu_create(appdata_t *appdata) {
1957    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1958                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1959    
1960  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1961    appdata->menu_search =    appdata->menu_search =
1962  #endif  #endif
1963    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1841  void menu_create(appdata_t *appdata) { Line 1966  void menu_create(appdata_t *appdata) {
1966    
1967    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1968    
 #ifndef NO_COPY_N_PASTE  
1969    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1970    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1971    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1972    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1973    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1899  void menu_create(appdata_t *appdata) { Line 2021  void menu_create(appdata_t *appdata) {
2021    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2022                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2023    
2024      item = gtk_menu_item_new_with_label( _("GeoToad") );
2025      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2026      g_signal_connect(item, "activate",
2027                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2028    
2029    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2030    
2031  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 2039  gboolean on_window_key_press(GtkWidget * Line 2166  gboolean on_window_key_press(GtkWidget *
2166    return handled;    return handled;
2167  }  }
2168    
2169  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2170  typedef struct {  typedef struct {
2171    int level;    int level;
2172    appdata_t *appdata;    appdata_t *appdata;
# Line 2131  crumb_back(gpointer data) { Line 2258  crumb_back(gpointer data) {
2258    
2259    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2260    g_free(data);    g_free(data);
2261    
2262    #ifdef ENABLE_OSM_GPS_MAP
2263      map_update(crumb->appdata);
2264    #endif
2265  }  }
2266    
2267  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 2171  static void crumb_add(appdata_t *appdata Line 2302  static void crumb_add(appdata_t *appdata
2302  #endif  #endif
2303    }    }
2304    
2305    #ifdef USE_BREAD_CRUMB_TRAIL
2306    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2307                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2308    #else
2309      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2310    #endif
2311    
2312    #ifdef ENABLE_OSM_GPS_MAP
2313      map_update(appdata);
2314    #endif
2315  }  }
2316  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2317    
# Line 2184  void main_after_settings_redraw(appdata_ Line 2323  void main_after_settings_redraw(appdata_
2323      return;      return;
2324    }    }
2325    
 #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  
2326    /* 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 */
2327    /* need to be redrawn */    /* need to be redrawn */
2328    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2250  void main_after_settings_redraw(appdata_ Line 2377  void main_after_settings_redraw(appdata_
2377    
2378      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2379    }    }
 #endif // USE_MAEMO  
2380  }  }
2381    
2382  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2271  int main(int argc, char *argv[]) { Line 2397  int main(int argc, char *argv[]) {
2397    
2398    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2399    
2400      curl_global_init(CURL_GLOBAL_ALL);
2401    
2402  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2403    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2404    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2279  int main(int argc, char *argv[]) { Line 2407  int main(int argc, char *argv[]) {
2407      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2408    }    }
2409    
2410    #ifdef ENABLE_MAEMO_MAPPER
2411    dbus_register(&appdata);    dbus_register(&appdata);
2412  #endif  #endif
2413    #endif
2414    
2415    icons_init();    icons_init();
2416    
# Line 2304  int main(int argc, char *argv[]) { Line 2434  int main(int argc, char *argv[]) {
2434    /* Create a Window. */    /* Create a Window. */
2435    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2436    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2437    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2438  #endif  #endif
2439    
2440  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2317  int main(int argc, char *argv[]) { Line 2447  int main(int argc, char *argv[]) {
2447    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2448                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2449    
2450      /* prepare clipboard */
2451      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2452      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2453    
2454    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2455    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2456  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
# Line 2332  int main(int argc, char *argv[]) { Line 2466  int main(int argc, char *argv[]) {
2466    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);
2467    
2468    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2469    #else
2470    #ifdef BCT
2471      /* on non-hildon machines we use some custom made breadcrumbtrail */
2472      /* replacement */
2473      appdata.bct = bct_new();
2474      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2475    #endif
2476    #endif
2477    
2478    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2479    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2480  #endif  #endif
2481    
Legend:
Removed from v.74  
changed lines
  Added in v.212