Diff of /trunk/src/main.c

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

revision 1 by harbaum, Sat Jun 20 11:08:47 2009 UTC revision 205 by harbaum, Mon Nov 23 20:12:22 2009 UTC
# Line 19  Line 19 
19  #include <string.h>  #include <string.h>
20  #include <math.h>  #include <math.h>
21    
22    #include <curl/curl.h>
23    
24  #include <time.h>  #include <time.h>
25  #include <sys/time.h>  #include <sys/time.h>
26    
# Line 29  Line 31 
31    
32  #ifdef USE_MAEMO  #ifdef USE_MAEMO
33  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
34    #if MAEMO_VERSION_MAJOR >= 5
35    #include <hildon/hildon-note.h>
36    #include <hildon/hildon-entry.h>
37    #include <hildon/hildon-check-button.h>
38    #endif
39  #endif  #endif
40    
41  #include <locale.h>  #include <locale.h>
42    
43  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
44    
45  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
46  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
47                        gpointer user_data);                        gpointer user_data);
48    
# Line 92  void errorf(const char *fmt, ...) { Line 99  void errorf(const char *fmt, ...) {
99      }      }
100    }    }
101    
102    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
103    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
104                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
105                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
106                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,                             GTK_MESSAGE_ERROR,
107                             buf);                             GTK_BUTTONS_CLOSE, buf);
108    
109    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
110    #else
111      GtkWidget *dialog =
112        hildon_note_new_information(GTK_WINDOW(NULL), buf);
113    #endif
114    
115    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
116    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 120  gpx_t *choose_file(appdata_t *appdata, g Line 132  gpx_t *choose_file(appdata_t *appdata, g
132                   HELP_ID_IMPORT, appdata->osso_context);                   HELP_ID_IMPORT, appdata->osso_context);
133  #endif  #endif
134  #else  #else
135    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Open Directory"):    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Import directory"):
136                                          _("Open File"),                                          _("Import file"),
137                          GTK_WINDOW(appdata->window),                          GTK_WINDOW(appdata->window),
138                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :
139                                          GTK_FILE_CHOOSER_ACTION_OPEN,                                          GTK_FILE_CHOOSER_ACTION_OPEN,
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 150  gpx_t *choose_file(appdata_t *appdata, g
150    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
151    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
152      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
153    
154        if(filename) {
155          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
156    
157      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
158            gpx = gpx_parse(dialog, filename, appdata->username);
159      if(!whole_dir)        else {
160        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
161      else {          if(strlastchr(filename) == '/')
162        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
163        if(strlastchr(filename) == '/')  
164          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 = '/';  
165        }        }
166    
167        if(whole_dir)        gpx_busy_dialog_destroy(dialog);
168          appdata->path = strdup(filename);  
169      }        /* save path if gpx was successfully loaded */
170          if(gpx) {
171            char *r = strrchr(filename, '/');
172    
173            /* there is a delimiter, use everything left of it as path */
174            if(r && !whole_dir) {
175              *r = 0;
176              if(appdata->path) free(appdata->path);
177              appdata->path = strdup(filename);
178              /* restore path ... just in case ... */
179              *r = '/';
180            }
181    
182            if(whole_dir)
183              appdata->path = strdup(filename);
184          } else
185            errorf(_("Load error"));
186    
187      g_free (filename);        g_free (filename);
188        } else {
189    #ifndef USE_MAEMO
190          errorf(_("Error accessing the file."));
191    #else
192          errorf(_("Error accessing the file. This may happen if the file "
193                   "resides on a remote file system. Please copy the file onto "
194                   "the device (e.g. onto the memory card) and try again."));
195    #endif
196        }
197    }    }
198    
199    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 194  enum { Line 217  enum {
217    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
218  } ;  } ;
219    
220  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
221    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
222        cache_dialog(appdata, cache);
223    #else
224        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
225        appdata->cur_view = cache_view(appdata, cache);
226        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
227        gtk_widget_show_all(appdata->vbox);
228    
229        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
230    #endif
231    }
232    
233    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
234                                     GtkTreePath        *path,                                     GtkTreePath        *path,
235                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
236                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 238  void cachelist_view_onRowActivated(GtkTr
238    GtkTreeIter   iter;    GtkTreeIter   iter;
239    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
240    
241    #ifdef USE_MAEMO
242      /* check if a cache is already selected and ignore click if yes */
243      /* (was probably a double click) */
244      if(appdata->cur_cache) return;
245    #endif
246    
247    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
248      cache_t *cache;      cache_t *cache;
249      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
250  #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  
251    }    }
252  }  }
253    
# Line 257  static GtkWidget *cachelist_create(appda Line 290  static GtkWidget *cachelist_create(appda
290                                     cache_t *sel_cache);                                     cache_t *sel_cache);
291    
292  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
293  #ifndef USE_MAEMO    if(!appdata->cur_view) {
294    //  gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      printf("cachelist redraw: no active view\n");
295    //  appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);      return;
296    //  gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);    }
   // gtk_widget_show_all(appdata->vbox);  
 #else  
297    
298    g_assert(!appdata->cur_cache);    g_assert(!appdata->cur_cache);
299    int redraw = 0;    int redraw = 0;
# Line 274  void cachelist_redraw(appdata_t *appdata Line 305  void cachelist_redraw(appdata_t *appdata
305    }    }
306    
307    if(redraw) {    if(redraw) {
308      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
309    
310    #ifdef USE_STACKABLE_WINDOW
311        HildonWindowStack *stack = hildon_window_stack_get_default();
312        container = hildon_window_stack_peek(stack);
313    #endif
314    
315        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
316      switch(redraw) {      switch(redraw) {
317      case 1:      case 1:
318        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 286  void cachelist_redraw(appdata_t *appdata Line 324  void cachelist_redraw(appdata_t *appdata
324        break;        break;
325      }      }
326    
327      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
328      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
329    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
330        else
331  #endif  #endif
332          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
333    
334        gtk_widget_show_all(container);
335      }
336  }  }
337    
338    
# Line 297  static gboolean cachelist_update(gpointe Line 340  static gboolean cachelist_update(gpointe
340    
341    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
342    
 #ifdef USE_MAEMO  
343    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
344    
345      if(appdata->cur_cache)
346        return TRUE;
347    
348    #ifdef USE_MAEMO
349    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
350      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
351        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
352    #endif
353    
354    if(appdata->cachelist_update)    if(appdata->cachelist_update)
355      cachelist_redraw(appdata);      cachelist_redraw(appdata);
 #endif  
356    
357    return TRUE;    return TRUE;
358  }  }
359    
360  static void cachelist_timer_reset(appdata_t *appdata) {  static void cachelist_timer_reset(appdata_t *appdata) {
361      printf("cachelist timer reset\n");
362    g_assert(appdata->cachelist_handler_id);    g_assert(appdata->cachelist_handler_id);
363    gtk_timeout_remove(appdata->cachelist_handler_id);    gtk_timeout_remove(appdata->cachelist_handler_id);
364    appdata->cachelist_handler_id =    appdata->cachelist_handler_id =
# Line 427  static GtkWidget *cachelist_create(appda Line 474  static GtkWidget *cachelist_create(appda
474      if(tint > 8) tint = 8;      if(tint > 8) tint = 8;
475    
476      /* cache type includes "solved" flag in lowest bit */      /* cache type includes "solved" flag in lowest bit */
477      int type = (cache->type<<8) +      int type = cache->type<<8;
478        (cache->notes?4:0) +      if(cache->notes) type |= 4;
479        ((cache->notes && cache->notes->override)?1:0) +      if(cache->notes && cache->notes->override) type |= 1;
480        ((cache->notes && cache->notes->found)?2:0);      if(cache->notes && cache->notes->found) type |= 2;
481        if(cache->found) type |= 2;
482        if(cache->mine) type |= 8;
483    
484      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
485    
# Line 543  void cachelist_dialog(appdata_t *appdata Line 592  void cachelist_dialog(appdata_t *appdata
592  }  }
593  #else  #else
594  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
595    static void search_result_free(gpx_t *result);
596    
597    void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
598      if(appdata->search_results) {
599        search_result_free(appdata->search_results);
600        appdata->search_results = NULL;
601      }
602      appdata->cur_gpx = NULL;
603    
604    #ifdef ENABLE_OSM_GPS_MAP
605      map_update(appdata);
606    #endif
607    
608      /* restore cur_view */
609      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
610    }
611    
612  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
613    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
614    
615    gtk_window_set_title(GTK_WINDOW(window), gpx->name);    /* store last "cur_view" in window */
616      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
617    
618    gtk_container_add(GTK_CONTAINER(window),    appdata->cur_gpx = gpx;
619                      cachelist_create(appdata, gpx, NULL));    char *title = g_strdup_printf("%s - GPXView", gpx->name);
620      gtk_window_set_title(GTK_WINDOW(window), title);
621      g_free(title);
622    
623      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
624      gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
625    
626    
627      hildon_window_set_app_menu(HILDON_WINDOW(window),
628                                 menu_create(appdata, MENU_CACHELIST));
629    
630      g_signal_connect(G_OBJECT(window), "destroy",
631                       G_CALLBACK(on_cachelist_destroy), appdata);
632    
633    gtk_widget_show_all(window);    gtk_widget_show_all(window);
634    
635    #ifdef ENABLE_OSM_GPS_MAP
636      map_update(appdata);
637    #endif
638  }  }
639  #endif  #endif
640  #endif  #endif
# Line 609  static void gpxlist_set(GtkListStore *st Line 692  static void gpxlist_set(GtkListStore *st
692                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
693                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
694  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
695                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),
696  #endif  #endif
697                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
698                       -1);                       -1);
# Line 655  static void gpxlist_close(appdata_t *app Line 738  static void gpxlist_close(appdata_t *app
738    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
739  }  }
740    
741    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
742    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
743    #ifdef USE_STACKABLE_WINDOW
744      if(!appdata->cur_gpx)
745    #endif
746        cachelist_dialog(appdata, gpx);
747    #ifdef USE_STACKABLE_WINDOW
748      else
749        printf("selected gpx, but cachelist window already present\n");
750    #endif
751    #else
752      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
753      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
754      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
755      gtk_widget_show_all(appdata->vbox);
756    
757      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
758    #endif
759    }
760    
761  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
762                            GtkTreePath        *path,                            GtkTreePath        *path,
763                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 663  static void gpxlist_view_onRowActivated( Line 766  static void gpxlist_view_onRowActivated(
766    GtkTreeIter   iter;    GtkTreeIter   iter;
767    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
768    
769    #ifdef USE_MAEMO
770      /* check if a cache is already selected and ignore click if yes */
771      /* (was probably a double click) */
772      if(appdata->cur_gpx) return;
773    #endif
774    
775    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
776      gpx_t *gpx;      gpx_t *gpx;
777      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 675  static void gpxlist_view_onRowActivated( Line 784  static void gpxlist_view_onRowActivated(
784      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
785        printf("clicked delete\n");        printf("clicked delete\n");
786    
787    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
788        /* ask user what he wants */        /* ask user what he wants */
789        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
790                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
791                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
792                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   GTK_MESSAGE_QUESTION,
793                     GTK_BUTTONS_CANCEL,
794                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
795                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
796    
# Line 688  static void gpxlist_view_onRowActivated( Line 799  static void gpxlist_view_onRowActivated(
799                               _("Close"), 2,                               _("Close"), 2,
800                               NULL);                               NULL);
801    
802          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
803    #else
804    
805          GtkWidget *dialog =
806            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
807                                GTK_WINDOW(appdata->window),
808                                GTK_DIALOG_DESTROY_WITH_PARENT,
809                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
810                                _("Remove"), 1,
811                                _("Close"), 2,
812                                NULL);
813    
814          GtkWidget *content_area =
815            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
816    
817          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
818    
819          gtk_box_pack_start(GTK_BOX(hbox),
820             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
821                                       GTK_ICON_SIZE_DIALOG),
822                             FALSE, FALSE, 0);
823    
824          GtkWidget *label = gtk_label_new(
825                      _("Do you want to close this entry only or do "
826                        "you want to remove it completely from the list?"));
827    
828          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
829          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
830    
831          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
832          gtk_container_add (GTK_CONTAINER (content_area), hbox);
833    
834          gtk_widget_show_all (dialog);
835    #endif
836    
837        if(gpx->closed)        if(gpx->closed)
838          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
839    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));  
   
840        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
841        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
842    
# Line 722  static void gpxlist_view_onRowActivated( Line 866  static void gpxlist_view_onRowActivated(
866          gpx_t *new = NULL;          gpx_t *new = NULL;
867    
868          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
869            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
870          else          else
871            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
872    
873          if(new) {          if(new) {
874            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 760  static void gpxlist_view_onRowActivated( Line 904  static void gpxlist_view_onRowActivated(
904    
905          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
906        }        }
907  #ifndef USE_BREAD_CRUMB_TRAIL  
908        cachelist_dialog(appdata, gpx);        gpxlist_goto_cachelist(appdata, gpx);
 #else  
       gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
       appdata->cur_view = cachelist_create(appdata, gpx, NULL);  
       gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
       gtk_widget_show_all(appdata->vbox);  
   
       crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);  
 #endif  
909      }      }
910    }    }
911  }  }
# Line 824  static GtkWidget *gpxlist_create_view_an Line 960  static GtkWidget *gpxlist_create_view_an
960    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
961                    -1, "Icon", renderer,                    -1, "Icon", renderer,
962                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
963                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
964            /* at least one entry needs to be sensitive. */
965            /* This is the delete icon if the PANNABLE_AREA is used */
966                      "sensitive", GPXLIST_COL_OPEN,
967    #endif
968                    NULL);                    NULL);
969    
970    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 880  static GtkWidget *gpxlist_create_view_an Line 1020  static GtkWidget *gpxlist_create_view_an
1020    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1021                    -1, "Del", renderer,                    -1, "Del", renderer,
1022                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
1023                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
1024                    NULL);                    NULL);
1025  #endif  #endif
1026    
# Line 900  static GtkWidget *gpxlist_create_view_an Line 1040  static GtkWidget *gpxlist_create_view_an
1040      GtkTreeIter         iter;      GtkTreeIter         iter;
1041      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1042      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1043    
1044      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1045        sel_iter = iter;        sel_iter = iter;
1046        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 960  static void gpxlist_add(appdata_t *appda Line 1100  static void gpxlist_add(appdata_t *appda
1100    
1101  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1102    
1103    typedef struct {
1104      appdata_t *appdata;
1105      GtkWidget *dialog;
1106    } about_context_t;
1107    
1108    #ifdef ENABLE_BROWSER_INTERFACE
1109    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1110      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1111      browser_url(context->appdata,
1112                  "https://www.paypal.com/cgi-bin/webscr"
1113                  "?cmd=_s-xclick&hosted_button_id=7400558");
1114    }
1115    #endif
1116    
1117  static void  static void
1118  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1119    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1120    
1121    gtk_about_dialog_set_name(about, "GPXView");    context.appdata = (appdata_t *)data;
1122    gtk_about_dialog_set_version(about, VERSION);  
1123    gtk_about_dialog_set_copyright(about,  #ifdef ENABLE_LIBLOCATION
1124           _("GPXView (c) 2008 by\n"    char *uses = "uses liblocation";
1125           "Till Harbaum <till@harbaum.org>\n"  #elif defined(ENABLE_GPSBT)
1126           "Geocaching.com: Tantil"));    char *uses = "uses gpsbt and gpsd";
1127    #else
1128    gtk_about_dialog_set_website(about,    char *uses = "uses gpsd";
1129         _("http://www.harbaum.org/till/maemo"));  #endif
1130    
1131    gtk_about_dialog_set_comments(about,    const gchar *authors[] = {
1132         _("Geocaching.com GPX file viewer"));      "Till Harbaum <till@harbaum.org>",
1133        "John Stowers <john.stowers@gmail.com>",
1134    gtk_widget_show_all(GTK_WIDGET(about));      "GCVote: Guido Wegener <guido.wegener@gmx.de>",
1135    gtk_dialog_run(GTK_DIALOG(about));      NULL };
1136    gtk_widget_destroy(GTK_WIDGET(about));  
1137      context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1138                            "name", "GPXView",
1139                            "version", VERSION,
1140                            "copyright", _("Copyright 2008-2009"),
1141                            "authors", authors,
1142                            "website", _("http://www.harbaum.org/till/maemo"),
1143                            "comments", _(uses),
1144                            NULL);
1145    
1146    #ifdef ENABLE_BROWSER_INTERFACE
1147      /* add a way to donate to the project */
1148      GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1149    
1150      GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1151      gtk_box_pack_start(GTK_BOX(hbox),
1152                         gtk_label_new(_("Do you like GPXView?")),
1153                         FALSE, FALSE, 0);
1154    
1155      GtkWidget *button = gtk_button_new();
1156      gtk_button_set_image(GTK_BUTTON(button),
1157                           icon_get_widget(ICON_MISC, 5));
1158      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1159      g_signal_connect(button, "clicked",
1160                       G_CALLBACK(on_paypal_button_clicked), &context);
1161      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1162    
1163      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1164      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1165                                  alignment);
1166    
1167      gtk_widget_show_all(alignment);
1168    #endif
1169    
1170      gtk_dialog_run(GTK_DIALOG(context.dialog));
1171      gtk_widget_destroy(context.dialog);
1172  }  }
1173    
1174  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1007  cb_menu_adddir(GtkWidget *window, gpoint Line 1196  cb_menu_adddir(GtkWidget *window, gpoint
1196    if(new) gpxlist_add(appdata, new);    if(new) gpxlist_add(appdata, new);
1197  }  }
1198    
 static void  
 cb_menu_geomath(GtkWidget *window, gpointer data) {  
   geomath_dialog((appdata_t *)data);  
 }  
   
 static void  
 cb_menu_geotext(GtkWidget *window, gpointer data) {  
   geotext_dialog((appdata_t *)data);  
 }  
   
 static void  
 cb_menu_precpos(GtkWidget *window, gpointer data) {  
   precise_position((appdata_t *)data);  
 }  
   
1199  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
1200  static void  static void
1201  cb_menu_close(GtkWidget *window, gpointer data) {  cb_menu_close(GtkWidget *window, gpointer data) {
# Line 1166  gpx_t *search_do(appdata_t *appdata, gpx Line 1340  gpx_t *search_do(appdata_t *appdata, gpx
1340        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1341                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1342          hit = 1;          hit = 1;
1343        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1344                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1345          hit = 1;          hit = 1;
1346    
1347        if(hit) {        if(hit) {
# Line 1196  typedef struct { Line 1370  typedef struct {
1370    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1371  } search_context_t;  } search_context_t;
1372    
1373    
1374    static GtkWidget *check_button_new_with_label(char *label) {
1375    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1376      return gtk_check_button_new_with_label(label);
1377    #else
1378      GtkWidget *cbut =
1379        hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
1380      gtk_button_set_label(GTK_BUTTON(cbut), label);
1381      return cbut;
1382    #endif
1383    }
1384    
1385    static void check_button_set_active(GtkWidget *button, gboolean active) {
1386    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1387      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
1388    #else
1389      hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
1390    #endif
1391    }
1392    
1393    static gboolean check_button_get_active(GtkWidget *button) {
1394    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1395      return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
1396    #else
1397      return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));
1398    #endif
1399    }
1400    
1401  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1402    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1403    
1404    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1405    
1406    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1407    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1230  cb_menu_search(GtkWidget *window, gpoint Line 1431  cb_menu_search(GtkWidget *window, gpoint
1431    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1432    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1433    
1434    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1435    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);  
1436    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);
1437    
1438    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1439    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);  
1440    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);
1441    
1442    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1443    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);  
1444    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);
1445    
1446    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1447    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);  
1448    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);
1449    
1450    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 1256  cb_menu_search(GtkWidget *window, gpoint Line 1453  cb_menu_search(GtkWidget *window, gpoint
1453    
1454    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1455                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1456    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1457      context.entry = gtk_entry_new();
1458    #else
1459      context.entry = hildon_entry_new(HILDON_SIZE_AUTO);
1460    #endif
1461    
1462    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1463                                context.entry = gtk_entry_new());                                context.entry);
1464    
1465    if(appdata->search_str)    if(appdata->search_str)
1466      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1467    
# Line 1268  cb_menu_search(GtkWidget *window, gpoint Line 1472  cb_menu_search(GtkWidget *window, gpoint
1472    
1473    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1474    
1475    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1476    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);  
1477    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1478    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1479                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1310  cb_menu_search(GtkWidget *window, gpoint Line 1513  cb_menu_search(GtkWidget *window, gpoint
1513                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1514  #endif  #endif
1515    
1516      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1517        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1518      else      else
1519        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1520    
1521      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1522        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1523      else      else
1524        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1525    
1526      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1527        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1528      else      else
1529        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1530    
1531      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1532        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1533      else      else
1534        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1535    
1536      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1537        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1538      else      else
1539        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1340  cb_menu_search(GtkWidget *window, gpoint Line 1543  cb_menu_search(GtkWidget *window, gpoint
1543      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1544      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1545          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1546    
1547        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1548    
1549  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1550        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        gpx_t *found =
1551            search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1552    
1553        /* do search result dialog here ... */        /* do search result dialog here ... */
1554        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, found);
1555    #ifndef USE_STACKABLE_WINDOW
1556        search_result_free(found);        search_result_free(found);
1557  #else  #else
1558          appdata->search_results = found;
1559    #endif
1560    #else
1561          gpx_t *found = NULL;
1562    
1563        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1564          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1565        else        else
# Line 1371  cb_menu_search(GtkWidget *window, gpoint Line 1580  cb_menu_search(GtkWidget *window, gpoint
1580      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1581  }  }
1582    
1583  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1584    
1585  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1586  static void  static void
# Line 1380  cb_menu_quit(GtkWidget *window, gpointer Line 1589  cb_menu_quit(GtkWidget *window, gpointer
1589  }  }
1590  #endif  #endif
1591    
1592    #ifndef NO_COPY_N_PASTE
1593  static void  static void
1594  cb_menu_cut(GtkWidget *widget, gpointer data) {  cb_menu_cut(GtkWidget *widget, gpointer data) {
1595    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1424  cb_menu_paste(GtkWidget *widget, gpointe Line 1634  cb_menu_paste(GtkWidget *widget, gpointe
1634    } else    } else
1635      printf("paste: ERROR, no active buffer\n");      printf("paste: ERROR, no active buffer\n");
1636  }  }
1637    #endif
1638    
1639  static void  static void
1640  cb_menu_export_log(GtkWidget *widget, gpointer data) {  cb_menu_export_log(GtkWidget *widget, gpointer data) {
# Line 1431  cb_menu_export_log(GtkWidget *widget, gp Line 1642  cb_menu_export_log(GtkWidget *widget, gp
1642    notes_log_export(appdata);    notes_log_export(appdata);
1643  }  }
1644    
1645  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1646  static void  static void
1647  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1648    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1445  cb_menu_export_garmin(GtkWidget *widget, Line 1656  cb_menu_export_garmin(GtkWidget *widget,
1656    garmin_export(appdata);    garmin_export(appdata);
1657  }  }
1658    
1659    #ifdef ENABLE_OSM_GPS_MAP
1660    static void
1661    cb_menu_map(GtkWidget *window, gpointer data) {
1662      map((appdata_t *)data);
1663    }
1664    #endif
1665    
1666    static void
1667    cb_menu_geomath(GtkWidget *window, gpointer data) {
1668      geomath_dialog((appdata_t *)data);
1669    }
1670    
1671    static void
1672    cb_menu_geotext(GtkWidget *window, gpointer data) {
1673      geotext_dialog((appdata_t *)data);
1674    }
1675    
1676    static void
1677    cb_menu_precpos(GtkWidget *window, gpointer data) {
1678      precise_position((appdata_t *)data);
1679    }
1680    
1681    static void
1682    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1683      geotoad((appdata_t *)data);
1684    }
1685    
1686    #ifdef USE_STACKABLE_WINDOW
1687    typedef struct {
1688      char *label, *desc;
1689      GtkSignalFunc activate_cb;
1690    } menu_entry_t;
1691    
1692    typedef struct {
1693      const char *title;
1694      const menu_entry_t *menu;
1695      int len;
1696    } submenu_t;
1697    
1698    #define COLUMNS  1
1699    
1700    void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1701    
1702      /* force closing of submenu dialog */
1703      gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1704      gtk_widget_hide(menu);
1705    
1706      /* let gtk clean up */
1707      while(gtk_events_pending())
1708        gtk_main_iteration();
1709    }
1710    
1711    static GtkWidget *app_submenu_create(appdata_t *appdata,
1712                                         const submenu_t *submenu) {
1713    
1714      /* create a oridinary dialog box */
1715      GtkWidget *dialog = gtk_dialog_new();
1716      gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1717      gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1718      gtk_window_set_transient_for(GTK_WINDOW(dialog),
1719                                   GTK_WINDOW(appdata->window));
1720      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1721    
1722      GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1723      int x = 0, y = 0;
1724    
1725      const menu_entry_t *menu_entries = submenu->menu;
1726      while(menu_entries->label) {
1727        GtkWidget *button = NULL;
1728    
1729        button = hildon_button_new_with_text(
1730                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1731                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1732                _(menu_entries->label), _(menu_entries->desc));
1733    
1734        /* try to center both texts */
1735        hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1736        hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1737    
1738        g_signal_connect(button, "clicked",
1739                         G_CALLBACK(on_submenu_entry_clicked), dialog);
1740    
1741        g_signal_connect(button, "clicked",
1742                         menu_entries->activate_cb, appdata);
1743    
1744        gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1745    
1746        x++;
1747        if(x == COLUMNS) { x = 0; y++; }
1748    
1749        menu_entries++;
1750      }
1751    
1752      gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1753    
1754      return dialog;
1755    }
1756    
1757    /* popup the dialog shaped submenu */
1758    static void submenu_popup(GtkWidget *menu) {
1759      gtk_widget_show_all(menu);
1760      gtk_dialog_run(GTK_DIALOG(menu));
1761      gtk_widget_hide(menu);
1762    }
1763    
1764    static void submenu_cleanup(GtkWidget *menu) {
1765      gtk_widget_destroy(menu);
1766    }
1767    
1768    static const menu_entry_t submenu_export_entries[] = {
1769    #ifdef ENABLE_MAEMO_MAPPER
1770      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1771        G_CALLBACK(cb_menu_export_mmpoi)  },
1772    #endif
1773      { "Export Field Notes",      "Save a Garmin Field Notes file",
1774        G_CALLBACK(cb_menu_export_log)    },
1775      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1776        G_CALLBACK(cb_menu_export_garmin) },
1777      { NULL, NULL, NULL }
1778    };
1779    
1780    static const submenu_t submenu_export = {
1781      "Export", submenu_export_entries,
1782      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1783    };
1784    
1785    /* the export submenu */
1786    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1787      if(!appdata->export_menu)
1788        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1789    
1790      submenu_popup(appdata->export_menu);
1791    }
1792    
1793    static const menu_entry_t submenu_tools_entries[] = {
1794      { "Geomath",          "Geocoordinate calculation",
1795        G_CALLBACK(cb_menu_geomath) },
1796      { "Geotext",          "Text analysis",
1797        G_CALLBACK(cb_menu_geotext) },
1798      { "Precise Position", "Calculate a precise GPS position",
1799        G_CALLBACK(cb_menu_precpos) },
1800      { "GeoToad",          "Use GeoToad online downloader",
1801        G_CALLBACK(cb_menu_geotoad) },
1802      { NULL, NULL, NULL }
1803    };
1804    
1805    static const submenu_t submenu_tools = {
1806      "Tools", submenu_tools_entries,
1807      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1808    };
1809    
1810    /* the tools submenu */
1811    void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1812      if(!appdata->tools_menu)
1813        appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1814    
1815      submenu_popup(appdata->tools_menu);
1816    }
1817    
1818    HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
1819      GtkWidget *button;
1820      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1821    
1822      /* ------- */
1823      button = gtk_button_new_with_label(_("About"));
1824      g_signal_connect_after(button, "clicked",
1825                             G_CALLBACK(cb_menu_about), appdata);
1826      hildon_app_menu_append(menu, GTK_BUTTON(button));
1827    
1828      button = gtk_button_new_with_label(_("Settings"));
1829      g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1830                             appdata);
1831      hildon_app_menu_append(menu, GTK_BUTTON(button));
1832    
1833      if(mode == MENU_GPXLIST) {
1834        button = gtk_button_new_with_label(_("Import file"));
1835        g_signal_connect_after(button, "clicked",
1836                               G_CALLBACK(cb_menu_add), appdata);
1837        hildon_app_menu_append(menu, GTK_BUTTON(button));
1838    
1839        button = gtk_button_new_with_label(_("Import directory"));
1840        g_signal_connect_after(button, "clicked",
1841                               G_CALLBACK(cb_menu_adddir), appdata);
1842        hildon_app_menu_append(menu, GTK_BUTTON(button));
1843    
1844        button = gtk_button_new_with_label(_("Export"));
1845        g_signal_connect_after(button, "clicked",
1846                               G_CALLBACK(on_export_clicked), appdata);
1847        hildon_app_menu_append(menu, GTK_BUTTON(button));
1848    
1849        button = gtk_button_new_with_label(_("Search"));
1850        g_signal_connect_after(button, "clicked",
1851                               G_CALLBACK(cb_menu_search), appdata);
1852        hildon_app_menu_append(menu, GTK_BUTTON(button));
1853      }
1854    
1855      button = gtk_button_new_with_label(_("Tools"));
1856      g_signal_connect_after(button, "clicked",
1857                             G_CALLBACK(on_tools_clicked), appdata);
1858      hildon_app_menu_append(menu, GTK_BUTTON(button));
1859    
1860    #ifdef ENABLE_OSM_GPS_MAP
1861        button = gtk_button_new_with_label(_("Map"));
1862        g_signal_connect_after(button, "clicked",
1863                               G_CALLBACK(cb_menu_map), appdata);
1864        hildon_app_menu_append(menu, GTK_BUTTON(button));
1865    #endif
1866    
1867    #ifdef HILDON_HELP
1868      button = gtk_button_new_with_label(_("Help"));
1869      g_signal_connect_after(button, "clicked",
1870                             G_CALLBACK(cb_menu_help), appdata);
1871      hildon_app_menu_append(menu, GTK_BUTTON(button));
1872    #endif
1873    
1874      gtk_widget_show_all(GTK_WIDGET(menu));
1875    
1876      return menu;
1877    }
1878    #else
1879    
1880  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1881    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1882    menu = gtk_menu_new();    menu = gtk_menu_new();
1883    
1884  #ifdef USE_MAEMO  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1885    appdata->menu_import =    appdata->menu_import =
1886  #endif  #endif
1887    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1457  void menu_create(appdata_t *appdata) { Line 1889  void menu_create(appdata_t *appdata) {
1889    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1890    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1891    
1892    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1893    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1894    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1895    
1896    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1897    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1898    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1899    
# Line 1479  void menu_create(appdata_t *appdata) { Line 1911  void menu_create(appdata_t *appdata) {
1911    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1912  #endif  #endif
1913    
1914  #ifdef USE_MAEMO  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1915    appdata->menu_export =    appdata->menu_export =
1916  #endif  #endif
1917      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1487  void menu_create(appdata_t *appdata) { Line 1919  void menu_create(appdata_t *appdata) {
1919    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1920    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1921    
1922  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1923    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1924    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1925    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1926                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1927  #endif  #endif
1928    
1929    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1930    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1931    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1932                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1933    
1934    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1935    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1936    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1937                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1938    
1939  #ifdef USE_MAEMO  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1940    appdata->menu_search =    appdata->menu_search =
1941  #endif  #endif
1942    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1943    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1944    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1945    
1946    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1947    
1948    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1949    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1950    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1951    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1952    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1534  void menu_create(appdata_t *appdata) { Line 1964  void menu_create(appdata_t *appdata) {
1964    gtk_widget_set_sensitive(item, FALSE);    gtk_widget_set_sensitive(item, FALSE);
1965    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1966    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_paste), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_paste), appdata);
1967    #endif
1968    
1969    item = gtk_menu_item_new_with_label( _("Settings...") );    item = gtk_menu_item_new_with_label( _("Settings") );
1970    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1971    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_settings),    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_settings),
1972                     appdata);                     appdata);
1973    
1974    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1975    
1976    #ifdef ENABLE_OSM_GPS_MAP
1977      item = gtk_menu_item_new_with_label( _("Map") );
1978      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1979      g_signal_connect(item, "activate",
1980                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1981    #endif
1982    
1983    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1984    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1985    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1986    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1987    
1988    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1989    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1990    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1991                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1992    
1993    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1994    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1995    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1996                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1997    
1998    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
1999    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2000    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2001                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2002    
2003      item = gtk_menu_item_new_with_label( _("GeoToad") );
2004      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2005      g_signal_connect(item, "activate",
2006                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2007    
2008    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2009    
2010  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
2011    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
2012    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
2013    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
2014  #endif  #endif
2015    
2016    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
2017    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
2018    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
2019    
# Line 1596  void menu_create(appdata_t *appdata) { Line 2039  void menu_create(appdata_t *appdata) {
2039    gtk_box_pack_start(GTK_BOX(appdata->vbox), menu_bar, 0, 0, 0);    gtk_box_pack_start(GTK_BOX(appdata->vbox), menu_bar, 0, 0, 0);
2040  #endif  #endif
2041  }  }
2042    #endif
2043    
2044  /********************* end of menu **********************/  /********************* end of menu **********************/
2045    
# Line 1605  void cleanup(appdata_t *appdata) { Line 2049  void cleanup(appdata_t *appdata) {
2049    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
2050    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
2051    
2052    #ifdef USE_STACKABLE_WINDOW
2053      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
2054      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
2055    #endif
2056    
2057    gnome_vfs_shutdown();    gnome_vfs_shutdown();
2058    icons_free();    icons_free();
2059    gps_release(appdata);    gps_release(appdata);
# Line 1633  void cleanup(appdata_t *appdata) { Line 2082  void cleanup(appdata_t *appdata) {
2082    puts("everything is gone");    puts("everything is gone");
2083  }  }
2084    
2085  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2086    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2087    
2088    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 1642  void on_window_destroy (GtkWidget *widge Line 2091  void on_window_destroy (GtkWidget *widge
2091  }  }
2092    
2093  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
2094                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
2095    int handled = FALSE;    int handled = FALSE;
2096    
2097    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1651  gboolean on_window_key_press(GtkWidget * Line 2099  gboolean on_window_key_press(GtkWidget *
2099    switch(event->keyval) {    switch(event->keyval) {
2100  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2101    
 #if 0  /* don't do this as it interferes with gtkentry fields */  
   case HILDON_HARDKEY_SELECT:  
     /* remove as long as we haven't reached the main gpx list */  
     if(appdata->cur_gpx)  
       hildon_bread_crumb_trail_pop(HILDON_BREAD_CRUMB_TRAIL(appdata->bct));  
     handled = TRUE;  
     break;  
 #endif  
   
2102  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
2103    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
2104      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1706  gboolean on_window_key_press(GtkWidget * Line 2145  gboolean on_window_key_press(GtkWidget *
2145    return handled;    return handled;
2146  }  }
2147    
2148  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2149  typedef struct {  typedef struct {
2150    int level;    int level;
2151    appdata_t *appdata;    appdata_t *appdata;
# Line 1798  crumb_back(gpointer data) { Line 2237  crumb_back(gpointer data) {
2237    
2238    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2239    g_free(data);    g_free(data);
2240    
2241    #ifdef ENABLE_OSM_GPS_MAP
2242      map_update(crumb->appdata);
2243    #endif
2244  }  }
2245    
2246  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 1838  static void crumb_add(appdata_t *appdata Line 2281  static void crumb_add(appdata_t *appdata
2281  #endif  #endif
2282    }    }
2283    
2284    #ifdef USE_BREAD_CRUMB_TRAIL
2285    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2286                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2287    #else
2288      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2289    #endif
2290    
2291    #ifdef ENABLE_OSM_GPS_MAP
2292      map_update(appdata);
2293    #endif
2294  }  }
2295  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2296    
2297  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2298  #ifndef USE_MAEMO    printf("main after settings redraw\n");
2299    // in non-maemo setup this can only affect the main screen as  
2300    // the menu is blocked while a dialog is open. also the main    if(!appdata->cur_view) {
2301    // screen is always present      printf("no active view\n");
2302    if(appdata->gpxlist_items != appdata->cur_items) {      return;
     /* re-do the main screen */  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
2303    }    }
2304  #else  
2305    /* 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 */
2306    /* need to be redrawn */    /* need to be redrawn */
2307    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 1879  void main_after_settings_redraw(appdata_ Line 2325  void main_after_settings_redraw(appdata_
2325    }    }
2326    
2327    if(redraw) {    if(redraw) {
2328      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2329    
2330    #ifdef USE_STACKABLE_WINDOW
2331        HildonWindowStack *stack = hildon_window_stack_get_default();
2332        container = hildon_window_stack_peek(stack);
2333    #endif
2334    
2335        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2336      switch(redraw) {      switch(redraw) {
2337      case 1:      case 1:
2338        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 1894  void main_after_settings_redraw(appdata_ Line 2347  void main_after_settings_redraw(appdata_
2347        break;        break;
2348      }      }
2349    
2350      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2351      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2352    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2353        else
2354  #endif  #endif
2355          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2356    
2357        gtk_widget_show_all(container);
2358      }
2359  }  }
2360    
2361  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 1918  int main(int argc, char *argv[]) { Line 2376  int main(int argc, char *argv[]) {
2376    
2377    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2378    
2379      curl_global_init(CURL_GLOBAL_ALL);
2380    
2381  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2382    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2383    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 1926  int main(int argc, char *argv[]) { Line 2386  int main(int argc, char *argv[]) {
2386      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2387    }    }
2388    
2389    #ifdef ENABLE_MAEMO_MAPPER
2390    dbus_register(&appdata);    dbus_register(&appdata);
2391  #endif  #endif
2392    #endif
2393    
2394    icons_init();    icons_init();
2395    
# Line 1951  int main(int argc, char *argv[]) { Line 2413  int main(int argc, char *argv[]) {
2413    /* Create a Window. */    /* Create a Window. */
2414    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2415    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2416    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2417  #endif  #endif
2418    
2419    #if MAEMO_VERSION_MAJOR == 5
2420    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2421    #endif
2422    
2423    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2424                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2425    
2426    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2427                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2428    
2429      /* prepare clipboard */
2430      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2431      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2432    
2433    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2434    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2435    #ifndef USE_STACKABLE_WINDOW
2436    menu_create(&appdata);    menu_create(&appdata);
2437    #else
2438      hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),
2439                                 menu_create(&appdata, MENU_GPXLIST));
2440    #endif
2441    
2442  #ifdef USE_BREAD_CRUMB_TRAIL  #ifdef USE_BREAD_CRUMB_TRAIL
2443    appdata.bct = hildon_bread_crumb_trail_new();    appdata.bct = hildon_bread_crumb_trail_new();
# Line 1972  int main(int argc, char *argv[]) { Line 2445  int main(int argc, char *argv[]) {
2445    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);
2446    
2447    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2448    #else
2449    #ifdef BCT
2450      /* on non-hildon machines we use some custom made breadcrumbtrail */
2451      /* replacement */
2452      appdata.bct = bct_new();
2453      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2454    #endif
2455    #endif
2456    
2457    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2458    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2459  #endif  #endif
2460    
Legend:
Removed from v.1  
changed lines
  Added in v.205