Diff of /trunk/src/main.c

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

revision 45 by harbaum, Tue Aug 4 19:27:39 2009 UTC revision 223 by harbaum, Tue Dec 1 20:03:51 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      }        /* save path if gpx was successfully loaded */
172          if(gpx) {
173            char *r = strrchr(filename, '/');
174    
175            /* there is a delimiter, use everything left of it as path */
176            if(r && !whole_dir) {
177              *r = 0;
178              if(appdata->path) free(appdata->path);
179              appdata->path = strdup(filename);
180              /* restore path ... just in case ... */
181              *r = '/';
182            }
183    
184            if(whole_dir)
185              appdata->path = strdup(filename);
186          } else
187            errorf(_("Load error"));
188    
189      g_free (filename);        g_free (filename);
190        } else {
191    #ifndef USE_MAEMO
192          errorf(_("Error accessing the file."));
193    #else
194          errorf(_("Error accessing the file. This may happen if the file "
195                   "resides on a remote file system. Please copy the file onto "
196                   "the device (e.g. onto the memory card) and try again."));
197    #endif
198        }
199    }    }
200    
201    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 194  enum { Line 219  enum {
219    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
220  } ;  } ;
221    
222  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
223    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
224        cache_dialog(appdata, cache);
225    #else
226        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
227    
228        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
229        appdata->cur_view = cache_view(appdata, cache);
230        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
231        gtk_widget_show_all(appdata->vbox);
232    #endif
233    }
234    
235    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
236                                     GtkTreePath        *path,                                     GtkTreePath        *path,
237                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
238                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 211  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 263  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 287  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 315  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 323  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 457  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 576  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 608  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 640  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 665  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 711  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 737  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 750  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 784  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 822  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 893  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 949  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 969  static GtkWidget *gpxlist_create_view_an Line 1066  static GtkWidget *gpxlist_create_view_an
1066      GtkTreeIter         iter;      GtkTreeIter         iter;
1067      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1068      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1069    
1070      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1071        sel_iter = iter;        sel_iter = iter;
1072        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 1013  static GtkWidget *gpxlist_create_view_an Line 1110  static GtkWidget *gpxlist_create_view_an
1110  }  }
1111    
1112  /* add last entry in gpx list to visual representation */  /* add last entry in gpx list to visual representation */
1113  static void gpxlist_add(appdata_t *appdata, gpx_t *new) {  void gpxlist_add(appdata_t *appdata, gpx_t *new) {
1114    GtkTreeIter         iter;    GtkTreeIter         iter;
1115    
1116    gtk_list_store_append(appdata->gpxstore, &iter);    gtk_list_store_append(appdata->gpxstore, &iter);
# Line 1023  static void gpxlist_add(appdata_t *appda Line 1120  static void gpxlist_add(appdata_t *appda
1120    gpx_t **gpx = &appdata->gpx;    gpx_t **gpx = &appdata->gpx;
1121    while(*gpx) gpx = &((*gpx)->next);    while(*gpx) gpx = &((*gpx)->next);
1122    *gpx = new;    *gpx = new;
1123    
1124      /* select new iter */
1125      GtkTreeSelection *selection =
1126        gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1127      gtk_tree_selection_select_iter(selection, &iter);
1128      GtkTreePath *path =
1129        gtk_tree_model_get_path(GTK_TREE_MODEL(appdata->gpxstore), &iter);
1130      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(appdata->gpxview),
1131                                   path, NULL, TRUE, 0.0, 0.0);
1132      gtk_tree_path_free(path);
1133  }  }
1134    
1135  /******************** end of gpxlist ********************/  /******************** end of gpxlist ********************/
1136    
1137  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1138    
1139    typedef struct {
1140      appdata_t *appdata;
1141      GtkWidget *dialog;
1142    } about_context_t;
1143    
1144    #ifdef ENABLE_BROWSER_INTERFACE
1145    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1146      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1147      browser_url(context->appdata,
1148                  "https://www.paypal.com/cgi-bin/webscr"
1149                  "?cmd=_s-xclick&hosted_button_id=7400558");
1150    }
1151    #endif
1152    
1153  static void  static void
1154  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1155    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1156    
1157    gtk_about_dialog_set_name(about, "GPXView");    context.appdata = (appdata_t *)data;
   gtk_about_dialog_set_version(about, VERSION);  
1158    
1159  #ifdef ENABLE_LIBLOCATION  #ifdef ENABLE_LIBLOCATION
1160    char *uses = "uses liblocation";    char *uses = "uses liblocation";
# Line 1044  cb_menu_about(GtkWidget *window, gpointe Line 1164  cb_menu_about(GtkWidget *window, gpointe
1164    char *uses = "uses gpsd";    char *uses = "uses gpsd";
1165  #endif  #endif
1166    
1167    char *str = g_strdup_printf("%s\n\n(%s)",    const gchar *authors[] = {
1168                        _("GPXView (c) 2008-2009 by\n"      "Till Harbaum <till@harbaum.org>",
1169                          "Till Harbaum <till@harbaum.org>\n"      "John Stowers <john.stowers@gmail.com>",
1170                          "Mailing list: gpxview-users@garage.maemo.org"),      "GCVote: Guido Wegener <guido.wegener@gmx.de>",
1171                        _(uses)      NULL };
1172                        );  
1173      context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1174    gtk_about_dialog_set_copyright(about, str);                          "name", "GPXView",
1175    g_free(str);                          "version", VERSION,
1176                            "copyright", _("Copyright 2008-2009"),
1177    gtk_about_dialog_set_website(about,                          "authors", authors,
1178         _("http://www.harbaum.org/till/maemo"));                          "website", _("http://www.harbaum.org/till/maemo"),
1179                            "comments", _(uses),
1180    gtk_about_dialog_set_comments(about,                          NULL);
1181         _("Geocaching.com GPX file viewer"));  
1182    #ifdef ENABLE_BROWSER_INTERFACE
1183    gtk_widget_show_all(GTK_WIDGET(about));    /* add a way to donate to the project */
1184    gtk_dialog_run(GTK_DIALOG(about));    GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1185    gtk_widget_destroy(GTK_WIDGET(about));  
1186      GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1187      gtk_box_pack_start(GTK_BOX(hbox),
1188                         gtk_label_new(_("Do you like GPXView?")),
1189                         FALSE, FALSE, 0);
1190    
1191      GtkWidget *button = gtk_button_new();
1192      gtk_button_set_image(GTK_BUTTON(button),
1193                           icon_get_widget(ICON_MISC, 5));
1194      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1195      g_signal_connect(button, "clicked",
1196                       G_CALLBACK(on_paypal_button_clicked), &context);
1197      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1198    
1199      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1200      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1201                                  alignment);
1202    
1203      gtk_widget_show_all(alignment);
1204    #endif
1205    
1206      gtk_dialog_run(GTK_DIALOG(context.dialog));
1207      gtk_widget_destroy(context.dialog);
1208  }  }
1209    
1210  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1234  gpx_t *search_do(appdata_t *appdata, gpx Line 1376  gpx_t *search_do(appdata_t *appdata, gpx
1376        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1377                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1378          hit = 1;          hit = 1;
1379        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1380                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1381          hit = 1;          hit = 1;
1382    
1383        if(hit) {        if(hit) {
# Line 1264  typedef struct { Line 1406  typedef struct {
1406    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1407  } search_context_t;  } search_context_t;
1408    
1409    
1410    static GtkWidget *check_button_new_with_label(char *label) {
1411    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1412      return gtk_check_button_new_with_label(label);
1413    #else
1414      GtkWidget *cbut =
1415        hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
1416      gtk_button_set_label(GTK_BUTTON(cbut), label);
1417      return cbut;
1418    #endif
1419    }
1420    
1421    static void check_button_set_active(GtkWidget *button, gboolean active) {
1422    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1423      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
1424    #else
1425      hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
1426    #endif
1427    }
1428    
1429    static gboolean check_button_get_active(GtkWidget *button) {
1430    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1431      return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
1432    #else
1433      return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));
1434    #endif
1435    }
1436    
1437  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1438    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1439    
1440    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1441    
1442    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1443    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1298  cb_menu_search(GtkWidget *window, gpoint Line 1467  cb_menu_search(GtkWidget *window, gpoint
1467    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1468    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1469    
1470    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1471    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);  
1472    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);
1473    
1474    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1475    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);  
1476    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);
1477    
1478    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1479    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);  
1480    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);
1481    
1482    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1483    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);  
1484    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);
1485    
1486    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 1324  cb_menu_search(GtkWidget *window, gpoint Line 1489  cb_menu_search(GtkWidget *window, gpoint
1489    
1490    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1491                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1492      context.entry = entry_new();
1493    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1494                                context.entry = gtk_entry_new());                                context.entry);
1495    
1496    if(appdata->search_str)    if(appdata->search_str)
1497      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1498    
# Line 1336  cb_menu_search(GtkWidget *window, gpoint Line 1503  cb_menu_search(GtkWidget *window, gpoint
1503    
1504    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1505    
1506    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1507    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);  
1508    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1509    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1510                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1378  cb_menu_search(GtkWidget *window, gpoint Line 1544  cb_menu_search(GtkWidget *window, gpoint
1544                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1545  #endif  #endif
1546    
1547      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1548        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1549      else      else
1550        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1551    
1552      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1553        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1554      else      else
1555        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1556    
1557      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1558        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1559      else      else
1560        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1561    
1562      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1563        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1564      else      else
1565        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1566    
1567      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1568        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1569      else      else
1570        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1411  cb_menu_search(GtkWidget *window, gpoint Line 1577  cb_menu_search(GtkWidget *window, gpoint
1577    
1578        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1579    
1580  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1581        gpx_t *found =        gpx_t *found =
1582          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1583    
# Line 1507  cb_menu_export_log(GtkWidget *widget, gp Line 1673  cb_menu_export_log(GtkWidget *widget, gp
1673    notes_log_export(appdata);    notes_log_export(appdata);
1674  }  }
1675    
1676  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1677  static void  static void
1678  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1679    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1543  cb_menu_precpos(GtkWidget *window, gpoin Line 1709  cb_menu_precpos(GtkWidget *window, gpoin
1709    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1710  }  }
1711    
1712    static void
1713    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1714      geotoad((appdata_t *)data);
1715    }
1716    
1717  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1718  typedef struct {  typedef struct {
1719    char *label, *desc;    char *label, *desc;
# Line 1626  static void submenu_cleanup(GtkWidget *m Line 1797  static void submenu_cleanup(GtkWidget *m
1797  }  }
1798    
1799  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1800    #ifdef ENABLE_MAEMO_MAPPER
1801    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1802      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1803    #endif
1804    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1805      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1806    { "Export Garmin GPX",       "Save modified waypoints in GPX file",    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
# Line 1655  static const menu_entry_t submenu_tools_ Line 1828  static const menu_entry_t submenu_tools_
1828      G_CALLBACK(cb_menu_geotext) },      G_CALLBACK(cb_menu_geotext) },
1829    { "Precise Position", "Calculate a precise GPS position",    { "Precise Position", "Calculate a precise GPS position",
1830      G_CALLBACK(cb_menu_precpos) },      G_CALLBACK(cb_menu_precpos) },
1831      { "GeoToad",          "Use GeoToad online downloader",
1832        G_CALLBACK(cb_menu_geotoad) },
1833    { NULL, NULL, NULL }    { NULL, NULL, NULL }
1834  };  };
1835    
# Line 1714  HildonAppMenu *menu_create(appdata_t *ap Line 1889  HildonAppMenu *menu_create(appdata_t *ap
1889    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1890    
1891  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
   if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {  
1892      button = gtk_button_new_with_label(_("Map"));      button = gtk_button_new_with_label(_("Map"));
1893      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1894                             G_CALLBACK(cb_menu_map), appdata);                             G_CALLBACK(cb_menu_map), appdata);
1895      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1896  #endif  #endif
1897    
1898  #ifdef HILDON_HELP  #ifdef HILDON_HELP
# Line 1739  void menu_create(appdata_t *appdata) { Line 1912  void menu_create(appdata_t *appdata) {
1912    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1913    menu = gtk_menu_new();    menu = gtk_menu_new();
1914    
1915  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1916    appdata->menu_import =    appdata->menu_import =
1917  #endif  #endif
1918    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1769  void menu_create(appdata_t *appdata) { Line 1942  void menu_create(appdata_t *appdata) {
1942    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1943  #endif  #endif
1944    
1945  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1946    appdata->menu_export =    appdata->menu_export =
1947  #endif  #endif
1948      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1777  void menu_create(appdata_t *appdata) { Line 1950  void menu_create(appdata_t *appdata) {
1950    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1951    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1952    
1953  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1954    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1955    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1956    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1794  void menu_create(appdata_t *appdata) { Line 1967  void menu_create(appdata_t *appdata) {
1967    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1968                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1969    
1970  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1971    appdata->menu_search =    appdata->menu_search =
1972  #endif  #endif
1973    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1803  void menu_create(appdata_t *appdata) { Line 1976  void menu_create(appdata_t *appdata) {
1976    
1977    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1978    
 #ifndef NO_COPY_N_PASTE  
1979    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1980    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1981    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1982    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1983    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1834  void menu_create(appdata_t *appdata) { Line 2004  void menu_create(appdata_t *appdata) {
2004    
2005    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2006    
   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);  
   
2007  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
2008    item = gtk_menu_item_new_with_label( _("Map") );    item = gtk_menu_item_new_with_label( _("Map") );
2009    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
2010    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2011                     GTK_SIGNAL_FUNC(cb_menu_map), appdata);                     GTK_SIGNAL_FUNC(cb_menu_map), appdata);
2012  #endif  #endif
2013    
2014      item = gtk_menu_item_new_with_label(_("Tools"));
2015      gtk_menu_append(GTK_MENU_SHELL(menu), item);
2016      submenu = gtk_menu_new();
2017      gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
2018    
2019    item = gtk_menu_item_new_with_label( _("Geomath") );    item = gtk_menu_item_new_with_label( _("Geomath") );
2020    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2021    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1861  void menu_create(appdata_t *appdata) { Line 2031  void menu_create(appdata_t *appdata) {
2031    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2032                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2033    
2034      item = gtk_menu_item_new_with_label( _("GeoToad") );
2035      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2036      g_signal_connect(item, "activate",
2037                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2038    
2039    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2040    
2041  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1900  void menu_create(appdata_t *appdata) { Line 2075  void menu_create(appdata_t *appdata) {
2075  /********************* end of menu **********************/  /********************* end of menu **********************/
2076    
2077  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2078      gconf_save_state(appdata);
2079    
2080    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);  
2081    
2082  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2083    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
# Line 1941  void cleanup(appdata_t *appdata) { Line 2115  void cleanup(appdata_t *appdata) {
2115  static void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2116    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2117    
   gconf_save_state(appdata);  
2118    gtk_main_quit();    gtk_main_quit();
2119    appdata->window = NULL;    appdata->window = NULL;
2120  }  }
# Line 2001  gboolean on_window_key_press(GtkWidget * Line 2174  gboolean on_window_key_press(GtkWidget *
2174    return handled;    return handled;
2175  }  }
2176    
2177  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2178  typedef struct {  typedef struct {
2179    int level;    int level;
2180    appdata_t *appdata;    appdata_t *appdata;
# Line 2093  crumb_back(gpointer data) { Line 2266  crumb_back(gpointer data) {
2266    
2267    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2268    g_free(data);    g_free(data);
2269    
2270    #ifdef ENABLE_OSM_GPS_MAP
2271      map_update(crumb->appdata);
2272    #endif
2273  }  }
2274    
2275  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 2133  static void crumb_add(appdata_t *appdata Line 2310  static void crumb_add(appdata_t *appdata
2310  #endif  #endif
2311    }    }
2312    
2313    #ifdef USE_BREAD_CRUMB_TRAIL
2314    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2315                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2316    #else
2317      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2318    #endif
2319    
2320    #ifdef ENABLE_OSM_GPS_MAP
2321      map_update(appdata);
2322    #endif
2323  }  }
2324  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2325    
# Line 2146  void main_after_settings_redraw(appdata_ Line 2331  void main_after_settings_redraw(appdata_
2331      return;      return;
2332    }    }
2333    
 #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  
2334    /* 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 */
2335    /* need to be redrawn */    /* need to be redrawn */
2336    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2212  void main_after_settings_redraw(appdata_ Line 2385  void main_after_settings_redraw(appdata_
2385    
2386      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2387    }    }
 #endif // USE_MAEMO  
2388  }  }
2389    
2390  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2233  int main(int argc, char *argv[]) { Line 2405  int main(int argc, char *argv[]) {
2405    
2406    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2407    
2408      misc_init();
2409    
2410      curl_global_init(CURL_GLOBAL_ALL);
2411    
2412  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2413    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2414    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2241  int main(int argc, char *argv[]) { Line 2417  int main(int argc, char *argv[]) {
2417      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2418    }    }
2419    
2420    #ifdef ENABLE_MAEMO_MAPPER
2421    dbus_register(&appdata);    dbus_register(&appdata);
2422  #endif  #endif
2423    #endif
2424    
2425    icons_init();    icons_init();
2426    
# Line 2266  int main(int argc, char *argv[]) { Line 2444  int main(int argc, char *argv[]) {
2444    /* Create a Window. */    /* Create a Window. */
2445    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2446    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2447    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2448  #endif  #endif
2449    
2450  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2279  int main(int argc, char *argv[]) { Line 2457  int main(int argc, char *argv[]) {
2457    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2458                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2459    
2460      /* prepare clipboard */
2461      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2462      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2463    
2464    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2465    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2466  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
# Line 2294  int main(int argc, char *argv[]) { Line 2476  int main(int argc, char *argv[]) {
2476    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);
2477    
2478    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2479    #else
2480    #ifdef BCT
2481      /* on non-hildon machines we use some custom made breadcrumbtrail */
2482      /* replacement */
2483      appdata.bct = bct_new();
2484      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2485    #endif
2486    #endif
2487    
2488    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2489    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2490  #endif  #endif
2491    
Legend:
Removed from v.45  
changed lines
  Added in v.223