Diff of /trunk/src/main.c

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

revision 6 by harbaum, Wed Jun 24 19:20:21 2009 UTC revision 228 by harbaum, Thu Dec 3 20:07:13 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 120  gpx_t *choose_file(appdata_t *appdata, g Line 134  gpx_t *choose_file(appdata_t *appdata, g
134                   HELP_ID_IMPORT, appdata->osso_context);                   HELP_ID_IMPORT, appdata->osso_context);
135  #endif  #endif
136  #else  #else
137    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Open Directory"):    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Import directory"):
138                                          _("Open File"),                                          _("Import file"),
139                          GTK_WINDOW(appdata->window),                          GTK_WINDOW(appdata->window),
140                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :
141                                          GTK_FILE_CHOOSER_ACTION_OPEN,                                          GTK_FILE_CHOOSER_ACTION_OPEN,
# 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 202  void cachelist_view_onRowActivated(GtkTr Line 240  void cachelist_view_onRowActivated(GtkTr
240    GtkTreeIter   iter;    GtkTreeIter   iter;
241    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
242    
243    #ifdef USE_MAEMO
244      /* check if a cache is already selected and ignore click if yes */
245      /* (was probably a double click) */
246      if(appdata->cur_cache) return;
247    #endif
248    
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 257  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) {
295  #ifndef USE_MAEMO    if(!appdata->cur_view) {
296    //  gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      printf("cachelist redraw: no active view\n");
297    //  appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);      return;
298    //  gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);    }
   // gtk_widget_show_all(appdata->vbox);  
 #else  
299    
300    g_assert(!appdata->cur_cache);    g_assert(!appdata->cur_cache);
301    int redraw = 0;    int redraw = 0;
# Line 274  void cachelist_redraw(appdata_t *appdata Line 307  void cachelist_redraw(appdata_t *appdata
307    }    }
308    
309    if(redraw) {    if(redraw) {
310      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
311    
312    #ifdef USE_STACKABLE_WINDOW
313        HildonWindowStack *stack = hildon_window_stack_get_default();
314        container = hildon_window_stack_peek(stack);
315    #endif
316    
317        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
318      switch(redraw) {      switch(redraw) {
319      case 1:      case 1:
320        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 286  void cachelist_redraw(appdata_t *appdata Line 326  void cachelist_redraw(appdata_t *appdata
326        break;        break;
327      }      }
328    
329      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
330      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
331    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
332        else
333  #endif  #endif
334          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
335    
336        gtk_widget_show_all(container);
337      }
338  }  }
339    
340    
# Line 297  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)
348        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  }  }
361    
362  static void cachelist_timer_reset(appdata_t *appdata) {  static void cachelist_timer_reset(appdata_t *appdata) {
363      printf("cachelist timer reset\n");
364    g_assert(appdata->cachelist_handler_id);    g_assert(appdata->cachelist_handler_id);
365    gtk_timeout_remove(appdata->cachelist_handler_id);    gtk_timeout_remove(appdata->cachelist_handler_id);
366    appdata->cachelist_handler_id =    appdata->cachelist_handler_id =
# Line 427  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 543  void cachelist_dialog(appdata_t *appdata Line 594  void cachelist_dialog(appdata_t *appdata
594  }  }
595  #else  #else
596  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
597    static void search_result_free(gpx_t *result);
598    
599    void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
600      printf("cachelist destroy\n");
601    
602      HildonWindowStack *stack = hildon_window_stack_get_default();
603      appdata->window = HILDON_WINDOW(hildon_window_stack_peek(stack));
604    
605      if(appdata->search_results) {
606        search_result_free(appdata->search_results);
607        appdata->search_results = NULL;
608      }
609      appdata->cur_gpx = NULL;
610    
611    #ifdef ENABLE_OSM_GPS_MAP
612      map_update(appdata);
613    #endif
614    
615      /* restore cur_view */
616      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
617    }
618    
619  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
620    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
621      appdata->window = HILDON_WINDOW(window);
622    
623      /* store last "cur_view" in window */
624      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
625    
626    gtk_window_set_title(GTK_WINDOW(window), gpx->name);    appdata->cur_gpx = gpx;
627      char *title = g_strdup_printf("%s - GPXView", gpx->name);
628    gtk_container_add(GTK_CONTAINER(window),    gtk_window_set_title(GTK_WINDOW(window), title);
629                      cachelist_create(appdata, gpx, NULL));    g_free(title);
630    
631      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
632      gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
633    
634    
635    hildon_window_set_app_menu(HILDON_WINDOW(window),    hildon_window_set_app_menu(HILDON_WINDOW(window),
636                               menu_create(appdata, MENU_CACHELIST));                               menu_create(appdata, MENU_CACHELIST));
637    
638      g_signal_connect(G_OBJECT(window), "destroy",
639                       G_CALLBACK(on_cachelist_destroy), appdata);
640    
641    gtk_widget_show_all(window);    gtk_widget_show_all(window);
642    
643    #ifdef ENABLE_OSM_GPS_MAP
644      map_update(appdata);
645    #endif
646  }  }
647  #endif  #endif
648  #endif  #endif
# Line 587  static GdkPixbuf *gpx_icon_get(gpx_t *gp Line 675  static GdkPixbuf *gpx_icon_get(gpx_t *gp
675    return icon_get(ICON_FILE, 0);    return icon_get(ICON_FILE, 0);
676  }  }
677    
678  static void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {  void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {
679    char date_str[32], cnum[32];    char date_str[32], cnum[32];
680    
681    if(gpx->year && gpx->month && gpx->day) {    if(gpx->year && gpx->month && gpx->day) {
# Line 612  static void gpxlist_set(GtkListStore *st Line 700  static void gpxlist_set(GtkListStore *st
700                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
701                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
702  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
703                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),
704  #endif  #endif
705                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
706                       -1);                       -1);
# Line 658  static void gpxlist_close(appdata_t *app Line 746  static void gpxlist_close(appdata_t *app
746    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
747  }  }
748    
749    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
750    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
751    #ifdef USE_STACKABLE_WINDOW
752      if(!appdata->cur_gpx)
753    #endif
754        cachelist_dialog(appdata, gpx);
755    #ifdef USE_STACKABLE_WINDOW
756      else
757        printf("selected gpx, but cachelist window already present\n");
758    #endif
759    #else
760      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
761      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
762      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
763      gtk_widget_show_all(appdata->vbox);
764    
765      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
766    #endif
767    }
768    
769  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
770                            GtkTreePath        *path,                            GtkTreePath        *path,
771                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 666  static void gpxlist_view_onRowActivated( Line 774  static void gpxlist_view_onRowActivated(
774    GtkTreeIter   iter;    GtkTreeIter   iter;
775    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
776    
777    #ifdef USE_MAEMO
778      /* check if a cache is already selected and ignore click if yes */
779      /* (was probably a double click) */
780      if(appdata->cur_gpx) return;
781    #endif
782    
783    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
784      gpx_t *gpx;      gpx_t *gpx;
785      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 678  static void gpxlist_view_onRowActivated( Line 792  static void gpxlist_view_onRowActivated(
792      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
793        printf("clicked delete\n");        printf("clicked delete\n");
794    
795    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
796        /* ask user what he wants */        /* ask user what he wants */
797        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
798                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
799                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
800                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   GTK_MESSAGE_QUESTION,
801                     GTK_BUTTONS_CANCEL,
802                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
803                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
804    
# Line 691  static void gpxlist_view_onRowActivated( Line 807  static void gpxlist_view_onRowActivated(
807                               _("Close"), 2,                               _("Close"), 2,
808                               NULL);                               NULL);
809    
810          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
811    #else
812    
813          GtkWidget *dialog =
814            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
815                                GTK_WINDOW(appdata->window),
816                                GTK_DIALOG_DESTROY_WITH_PARENT,
817                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
818                                _("Remove"), 1,
819                                _("Close"), 2,
820                                NULL);
821    
822          GtkWidget *content_area =
823            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
824    
825          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
826    
827          gtk_box_pack_start(GTK_BOX(hbox),
828             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
829                                       GTK_ICON_SIZE_DIALOG),
830                             FALSE, FALSE, 0);
831    
832          GtkWidget *label = gtk_label_new(
833                      _("Do you want to close this entry only or do "
834                        "you want to remove it completely from the list?"));
835    
836          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
837          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
838    
839          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
840          gtk_container_add (GTK_CONTAINER (content_area), hbox);
841    
842          gtk_widget_show_all (dialog);
843    #endif
844    
845        if(gpx->closed)        if(gpx->closed)
846          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
847    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));  
   
848        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
849        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
850    
# Line 725  static void gpxlist_view_onRowActivated( Line 874  static void gpxlist_view_onRowActivated(
874          gpx_t *new = NULL;          gpx_t *new = NULL;
875    
876          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
877            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
878          else          else
879            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
880    
881          if(new) {          if(new) {
882            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 763  static void gpxlist_view_onRowActivated( Line 912  static void gpxlist_view_onRowActivated(
912    
913          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
914        }        }
915  #ifndef USE_BREAD_CRUMB_TRAIL  
916        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  
917      }      }
918    }    }
919  }  }
920    
921    /* search gpx file in gpx list */
922    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx) {
923      GtkTreeModel *model =
924        gtk_tree_view_get_model(GTK_TREE_VIEW(appdata->gpxview));
925    
926      gboolean found =
927        gtk_tree_model_get_iter_first(model, iter);
928    
929      while(found) {
930        gpx_t *this_gpx;
931        gtk_tree_model_get(model, iter, GPXLIST_COL_DATA, &this_gpx, -1);
932    
933        if(gpx == this_gpx)
934          return TRUE;
935    
936        found = gtk_tree_model_iter_next(model, iter);
937      }
938    
939      return FALSE;
940    }
941    
942    
943  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
944  static gboolean  static gboolean
945  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
# Line 827  static GtkWidget *gpxlist_create_view_an Line 990  static GtkWidget *gpxlist_create_view_an
990    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
991                    -1, "Icon", renderer,                    -1, "Icon", renderer,
992                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
993                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
994            /* at least one entry needs to be sensitive. */
995            /* This is the delete icon if the PANNABLE_AREA is used */
996                      "sensitive", GPXLIST_COL_OPEN,
997    #endif
998                    NULL);                    NULL);
999    
1000    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 883  static GtkWidget *gpxlist_create_view_an Line 1050  static GtkWidget *gpxlist_create_view_an
1050    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1051                    -1, "Del", renderer,                    -1, "Del", renderer,
1052                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
1053                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
1054                    NULL);                    NULL);
1055  #endif  #endif
1056    
# Line 903  static GtkWidget *gpxlist_create_view_an Line 1070  static GtkWidget *gpxlist_create_view_an
1070      GtkTreeIter         iter;      GtkTreeIter         iter;
1071      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1072      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1073    
1074      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1075        sel_iter = iter;        sel_iter = iter;
1076        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 947  static GtkWidget *gpxlist_create_view_an Line 1114  static GtkWidget *gpxlist_create_view_an
1114  }  }
1115    
1116  /* add last entry in gpx list to visual representation */  /* add last entry in gpx list to visual representation */
1117  static void gpxlist_add(appdata_t *appdata, gpx_t *new) {  void gpxlist_add(appdata_t *appdata, gpx_t *new) {
1118    GtkTreeIter         iter;    GtkTreeIter         iter;
1119    
1120    gtk_list_store_append(appdata->gpxstore, &iter);    gtk_list_store_append(appdata->gpxstore, &iter);
# Line 957  static void gpxlist_add(appdata_t *appda Line 1124  static void gpxlist_add(appdata_t *appda
1124    gpx_t **gpx = &appdata->gpx;    gpx_t **gpx = &appdata->gpx;
1125    while(*gpx) gpx = &((*gpx)->next);    while(*gpx) gpx = &((*gpx)->next);
1126    *gpx = new;    *gpx = new;
1127    
1128      /* select new iter */
1129      GtkTreeSelection *selection =
1130        gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1131      gtk_tree_selection_select_iter(selection, &iter);
1132      GtkTreePath *path =
1133        gtk_tree_model_get_path(GTK_TREE_MODEL(appdata->gpxstore), &iter);
1134      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(appdata->gpxview),
1135                                   path, NULL, TRUE, 0.0, 0.0);
1136      gtk_tree_path_free(path);
1137  }  }
1138    
1139  /******************** end of gpxlist ********************/  /******************** end of gpxlist ********************/
# Line 965  static void gpxlist_add(appdata_t *appda Line 1142  static void gpxlist_add(appdata_t *appda
1142    
1143  static void  static void
1144  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1145    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_box((appdata_t*)data);
   
   gtk_about_dialog_set_name(about, "GPXView");  
   gtk_about_dialog_set_version(about, VERSION);  
   gtk_about_dialog_set_copyright(about,  
          _("GPXView (c) 2008 by\n"  
          "Till Harbaum <till@harbaum.org>\n"  
          "Geocaching.com: Tantil"));  
   
   gtk_about_dialog_set_website(about,  
        _("http://www.harbaum.org/till/maemo"));  
   
   gtk_about_dialog_set_comments(about,  
        _("Geocaching.com GPX file viewer"));  
   
   gtk_widget_show_all(GTK_WIDGET(about));  
   gtk_dialog_run(GTK_DIALOG(about));  
   gtk_widget_destroy(GTK_WIDGET(about));  
1146  }  }
1147    
1148  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1154  gpx_t *search_do(appdata_t *appdata, gpx Line 1314  gpx_t *search_do(appdata_t *appdata, gpx
1314        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1315                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1316          hit = 1;          hit = 1;
1317        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1318                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1319          hit = 1;          hit = 1;
1320    
1321        if(hit) {        if(hit) {
# Line 1184  typedef struct { Line 1344  typedef struct {
1344    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1345  } search_context_t;  } search_context_t;
1346    
1347    
1348    static GtkWidget *check_button_new_with_label(char *label) {
1349    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1350      return gtk_check_button_new_with_label(label);
1351    #else
1352      GtkWidget *cbut =
1353        hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
1354      gtk_button_set_label(GTK_BUTTON(cbut), label);
1355      return cbut;
1356    #endif
1357    }
1358    
1359    static void check_button_set_active(GtkWidget *button, gboolean active) {
1360    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1361      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
1362    #else
1363      hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
1364    #endif
1365    }
1366    
1367    static gboolean check_button_get_active(GtkWidget *button) {
1368    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1369      return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
1370    #else
1371      return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));
1372    #endif
1373    }
1374    
1375  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1376    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1377    
1378    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1379    
1380    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1381    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1218  cb_menu_search(GtkWidget *window, gpoint Line 1405  cb_menu_search(GtkWidget *window, gpoint
1405    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1406    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1407    
1408    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1409    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);  
1410    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);
1411    
1412    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1413    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);  
1414    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);
1415    
1416    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1417    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);  
1418    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);
1419    
1420    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1421    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);  
1422    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);
1423    
1424    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 1244  cb_menu_search(GtkWidget *window, gpoint Line 1427  cb_menu_search(GtkWidget *window, gpoint
1427    
1428    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1429                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1430      context.entry = entry_new();
1431    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1432                                context.entry = gtk_entry_new());                                context.entry);
1433    
1434    if(appdata->search_str)    if(appdata->search_str)
1435      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1436    
# Line 1256  cb_menu_search(GtkWidget *window, gpoint Line 1441  cb_menu_search(GtkWidget *window, gpoint
1441    
1442    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1443    
1444    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1445    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);  
1446    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1447    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1448                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1298  cb_menu_search(GtkWidget *window, gpoint Line 1482  cb_menu_search(GtkWidget *window, gpoint
1482                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1483  #endif  #endif
1484    
1485      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1486        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1487      else      else
1488        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1489    
1490      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1491        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1492      else      else
1493        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1494    
1495      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1496        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1497      else      else
1498        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1499    
1500      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1501        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1502      else      else
1503        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1504    
1505      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1506        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1507      else      else
1508        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1328  cb_menu_search(GtkWidget *window, gpoint Line 1512  cb_menu_search(GtkWidget *window, gpoint
1512      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1513      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1514          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1515    
1516        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1517    
1518  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1519        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        gpx_t *found =
1520            search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1521    
1522        /* do search result dialog here ... */        /* do search result dialog here ... */
1523        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, found);
1524    #ifndef USE_STACKABLE_WINDOW
1525        search_result_free(found);        search_result_free(found);
1526  #else  #else
1527          appdata->search_results = found;
1528    #endif
1529    #else
1530          gpx_t *found = NULL;
1531    
1532        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1533          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1534        else        else
# Line 1359  cb_menu_search(GtkWidget *window, gpoint Line 1549  cb_menu_search(GtkWidget *window, gpoint
1549      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1550  }  }
1551    
1552  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1553    
1554  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1555  static void  static void
# Line 1421  cb_menu_export_log(GtkWidget *widget, gp Line 1611  cb_menu_export_log(GtkWidget *widget, gp
1611    notes_log_export(appdata);    notes_log_export(appdata);
1612  }  }
1613    
1614  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1615  static void  static void
1616  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1617    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1435  cb_menu_export_garmin(GtkWidget *widget, Line 1625  cb_menu_export_garmin(GtkWidget *widget,
1625    garmin_export(appdata);    garmin_export(appdata);
1626  }  }
1627    
1628    #ifdef ENABLE_OSM_GPS_MAP
1629    static void
1630    cb_menu_map(GtkWidget *window, gpointer data) {
1631      map((appdata_t *)data);
1632    }
1633    #endif
1634    
1635  static void  static void
1636  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1637    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
# Line 1450  cb_menu_precpos(GtkWidget *window, gpoin Line 1647  cb_menu_precpos(GtkWidget *window, gpoin
1647    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1648  }  }
1649    
1650    static void
1651    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1652      geotoad((appdata_t *)data);
1653    }
1654    
1655  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1656    typedef struct {
1657      char *label, *desc;
1658      GtkSignalFunc activate_cb;
1659    } menu_entry_t;
1660    
1661  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  typedef struct {
1662    HildonStackableWindow *view_window;    const char *title;
1663    GtkWidget *but;    const menu_entry_t *menu;
1664      int len;
1665    } submenu_t;
1666    
1667    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());  #define COLUMNS  1
   gtk_window_set_title (GTK_WINDOW (view_window), "Export");  
1668    
1669    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));  void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1670    
1671    but = hildon_button_new_with_text(    /* force closing of submenu dialog */
1672              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1673              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    gtk_widget_hide(menu);
1674              _("Export to Maemo Mapper"),  
1675              _("Save a Maemo Mapper POI file"));    /* let gtk clean up */
1676    g_signal_connect(but, "clicked",    while(gtk_events_pending())
1677                     G_CALLBACK(cb_menu_export_mmpoi), appdata);      gtk_main_iteration();
1678    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  }
1679    
1680    static GtkWidget *app_submenu_create(appdata_t *appdata,
1681                                         const submenu_t *submenu) {
1682    
1683    but = hildon_button_new_with_text(    /* create a oridinary dialog box */
1684              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    GtkWidget *dialog = gtk_dialog_new();
1685              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1686              _("Export Field Notes"),    gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1687              _("Save a Garmin Field Notes file"));    gtk_window_set_transient_for(GTK_WINDOW(dialog),
1688    g_signal_connect(but, "clicked",                                 GTK_WINDOW(appdata->window));
1689                     G_CALLBACK(cb_menu_export_log), appdata);    gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1690    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1691      GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1692      int x = 0, y = 0;
1693    
1694    but = hildon_button_new_with_text(    const menu_entry_t *menu_entries = submenu->menu;
1695      while(menu_entries->label) {
1696        GtkWidget *button = NULL;
1697    
1698        button = hildon_button_new_with_text(
1699              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1700              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1701              _("Export Garmin GPX"),              _(menu_entries->label), _(menu_entries->desc));
1702              _("Save a GPX file containing modified waypoints"));  
1703    g_signal_connect(but, "clicked",      /* try to center both texts */
1704                     G_CALLBACK(cb_menu_export_garmin), appdata);      hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1705    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);      hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1706    
1707        g_signal_connect(button, "clicked",
1708                         G_CALLBACK(on_submenu_entry_clicked), dialog);
1709    
1710        g_signal_connect(button, "clicked",
1711                         menu_entries->activate_cb, appdata);
1712    
1713        gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1714    
1715        x++;
1716        if(x == COLUMNS) { x = 0; y++; }
1717    
1718    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));      menu_entries++;
1719    gtk_widget_show_all (GTK_WIDGET (view_window));    }
1720    
1721      gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1722    
1723      return dialog;
1724  }  }
1725    
1726  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  /* popup the dialog shaped submenu */
1727    HildonStackableWindow *view_window;  static void submenu_popup(GtkWidget *menu) {
1728    GtkWidget *but;    gtk_widget_show_all(menu);
1729      gtk_dialog_run(GTK_DIALOG(menu));
1730      gtk_widget_hide(menu);
1731    }
1732    
1733    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());  static void submenu_cleanup(GtkWidget *menu) {
1734    gtk_window_set_title (GTK_WINDOW (view_window), "Export");    gtk_widget_destroy(menu);
1735    }
1736    
1737    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));  static const menu_entry_t submenu_export_entries[] = {
1738    #ifdef ENABLE_MAEMO_MAPPER
1739      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1740        G_CALLBACK(cb_menu_export_mmpoi)  },
1741    #endif
1742      { "Export Field Notes",      "Save a Garmin Field Notes file",
1743        G_CALLBACK(cb_menu_export_log)    },
1744      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1745        G_CALLBACK(cb_menu_export_garmin) },
1746      { NULL, NULL, NULL }
1747    };
1748    
1749    but = hildon_button_new_with_text(  static const submenu_t submenu_export = {
1750              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    "Export", submenu_export_entries,
1751              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1752              _("Geomath"),  };
             _("Geocoordinate calculation"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_geomath), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1753    
1754    /* the export submenu */
1755    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1756      if(!appdata->export_menu)
1757        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1758    
1759    but = hildon_button_new_with_text(    submenu_popup(appdata->export_menu);
1760              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  }
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Geotext"),  
             _("Text analysis, letter counting etc"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_geotext), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
   
1761    
1762    but = hildon_button_new_with_text(  static const menu_entry_t submenu_tools_entries[] = {
1763              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    { "Geomath",          "Geocoordinate calculation",
1764              HILDON_BUTTON_ARRANGEMENT_VERTICAL,      G_CALLBACK(cb_menu_geomath) },
1765              _("Precise Position"),    { "Geotext",          "Text analysis",
1766              _("Calculate a very precise GPS posotions"));      G_CALLBACK(cb_menu_geotext) },
1767    g_signal_connect(but, "clicked",    { "Precise Position", "Calculate a precise GPS position",
1768                     G_CALLBACK(cb_menu_precpos), appdata);      G_CALLBACK(cb_menu_precpos) },
1769    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);    { "GeoToad",          "Use GeoToad online downloader",
1770        G_CALLBACK(cb_menu_geotoad) },
1771      { NULL, NULL, NULL }
1772    };
1773    
1774    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));  static const submenu_t submenu_tools = {
1775    gtk_widget_show_all (GTK_WIDGET (view_window));    "Tools", submenu_tools_entries,
1776      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1777    };
1778    
1779    /* the tools submenu */
1780    void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1781      if(!appdata->tools_menu)
1782        appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1783    
1784      submenu_popup(appdata->tools_menu);
1785  }  }
1786    
1787  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
# Line 1541  HildonAppMenu *menu_create(appdata_t *ap Line 1789  HildonAppMenu *menu_create(appdata_t *ap
1789    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1790    
1791    /* ------- */    /* ------- */
1792      button = gtk_button_new_with_label(_("About"));
1793      g_signal_connect_after(button, "clicked",
1794                             G_CALLBACK(cb_menu_about), appdata);
1795      hildon_app_menu_append(menu, GTK_BUTTON(button));
1796    
1797    button = gtk_button_new_with_label(_("Settings"));    button = gtk_button_new_with_label(_("Settings"));
1798    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1799                           appdata);                           appdata);
# Line 1552  HildonAppMenu *menu_create(appdata_t *ap Line 1805  HildonAppMenu *menu_create(appdata_t *ap
1805                             G_CALLBACK(cb_menu_add), appdata);                             G_CALLBACK(cb_menu_add), appdata);
1806      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1807    
1808      button = gtk_button_new_with_label(_("Import dir"));      button = gtk_button_new_with_label(_("Import directory"));
1809      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1810                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1811      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1812    
   if(mode == MENU_GPXLIST) {  
1813      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1814      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1815                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1575  HildonAppMenu *menu_create(appdata_t *ap Line 1826  HildonAppMenu *menu_create(appdata_t *ap
1826                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1827    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1828    
1829    button = gtk_button_new_with_label(_("About"));  #ifdef ENABLE_OSM_GPS_MAP
1830        button = gtk_button_new_with_label(_("Map"));
1831        g_signal_connect_after(button, "clicked",
1832                               G_CALLBACK(cb_menu_map), appdata);
1833        hildon_app_menu_append(menu, GTK_BUTTON(button));
1834    #endif
1835    
1836    #ifdef HILDON_HELP
1837      button = gtk_button_new_with_label(_("Help"));
1838    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
1839                           G_CALLBACK(cb_menu_about), appdata);                           G_CALLBACK(cb_menu_help), appdata);
1840    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1841    #endif
1842    
1843    gtk_widget_show(GTK_WIDGET(menu));    gtk_widget_show_all(GTK_WIDGET(menu));
1844    
1845    return menu;    return menu;
1846  }  }
# Line 1590  void menu_create(appdata_t *appdata) { Line 1850  void menu_create(appdata_t *appdata) {
1850    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1851    menu = gtk_menu_new();    menu = gtk_menu_new();
1852    
1853  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1854    appdata->menu_import =    appdata->menu_import =
1855  #endif  #endif
1856    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1598  void menu_create(appdata_t *appdata) { Line 1858  void menu_create(appdata_t *appdata) {
1858    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1859    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1860    
1861    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1862    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1863    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1864    
1865    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1866    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1867    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1868    
# Line 1620  void menu_create(appdata_t *appdata) { Line 1880  void menu_create(appdata_t *appdata) {
1880    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1881  #endif  #endif
1882    
1883  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1884    appdata->menu_export =    appdata->menu_export =
1885  #endif  #endif
1886      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1628  void menu_create(appdata_t *appdata) { Line 1888  void menu_create(appdata_t *appdata) {
1888    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1889    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1890    
1891  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1892    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1893    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1894    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1895                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1896  #endif  #endif
1897    
1898    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1899    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1900    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1901                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1902    
1903    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1904    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1905    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1906                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1907    
1908  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1909    appdata->menu_search =    appdata->menu_search =
1910  #endif  #endif
1911    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1912    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1913    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1914    
1915    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1916    
 #ifndef NO_COPY_N_PASTE  
1917    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1918    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1919    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1920    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1921    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1685  void menu_create(appdata_t *appdata) { Line 1942  void menu_create(appdata_t *appdata) {
1942    
1943    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1944    
1945    #ifdef ENABLE_OSM_GPS_MAP
1946      item = gtk_menu_item_new_with_label( _("Map") );
1947      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1948      g_signal_connect(item, "activate",
1949                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1950    #endif
1951    
1952    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1953    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1954    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1955    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1956    
1957    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1958    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1959    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1960                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1961    
1962    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1963    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1964    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1965                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1966    
1967    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
1968    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1969    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1970                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
1971    
1972      item = gtk_menu_item_new_with_label( _("GeoToad") );
1973      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1974      g_signal_connect(item, "activate",
1975                       GTK_SIGNAL_FUNC(cb_menu_geotoad), 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    
1979  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
1980    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
1981    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1982    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
1983  #endif  #endif
1984    
1985    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
1986    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1987    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
1988    
# Line 1744  void menu_create(appdata_t *appdata) { Line 2013  void menu_create(appdata_t *appdata) {
2013  /********************* end of menu **********************/  /********************* end of menu **********************/
2014    
2015  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2016      gconf_save_state(appdata);
2017    
2018    gpx_free_all(appdata->gpx);    gpx_free_all(appdata->gpx);
2019    if(appdata->path) free(appdata->path);  
2020    if(appdata->image_path) free(appdata->image_path);  #ifdef USE_STACKABLE_WINDOW
2021    if(appdata->search_str) free(appdata->search_str);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
2022      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
2023    #endif
2024    
2025    gnome_vfs_shutdown();    gnome_vfs_shutdown();
2026    icons_free();    icons_free();
# Line 1777  void cleanup(appdata_t *appdata) { Line 2050  void cleanup(appdata_t *appdata) {
2050    puts("everything is gone");    puts("everything is gone");
2051  }  }
2052    
2053  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2054    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2055    
   gconf_save_state(appdata);  
2056    gtk_main_quit();    gtk_main_quit();
2057    appdata->window = NULL;    appdata->window = NULL;
2058  }  }
2059    
2060  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
2061                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
2062    int handled = FALSE;    int handled = FALSE;
2063    
2064    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1795  gboolean on_window_key_press(GtkWidget * Line 2066  gboolean on_window_key_press(GtkWidget *
2066    switch(event->keyval) {    switch(event->keyval) {
2067  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2068    
 #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  
   
2069  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
2070    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
2071      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1850  gboolean on_window_key_press(GtkWidget * Line 2112  gboolean on_window_key_press(GtkWidget *
2112    return handled;    return handled;
2113  }  }
2114    
2115  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2116  typedef struct {  typedef struct {
2117    int level;    int level;
2118    appdata_t *appdata;    appdata_t *appdata;
# Line 1942  crumb_back(gpointer data) { Line 2204  crumb_back(gpointer data) {
2204    
2205    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2206    g_free(data);    g_free(data);
2207    
2208    #ifdef ENABLE_OSM_GPS_MAP
2209      map_update(crumb->appdata);
2210    #endif
2211  }  }
2212    
2213  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 1982  static void crumb_add(appdata_t *appdata Line 2248  static void crumb_add(appdata_t *appdata
2248  #endif  #endif
2249    }    }
2250    
2251    #ifdef USE_BREAD_CRUMB_TRAIL
2252    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2253                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2254    #else
2255      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2256    #endif
2257    
2258    #ifdef ENABLE_OSM_GPS_MAP
2259      map_update(appdata);
2260    #endif
2261  }  }
2262  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2263    
2264  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2265  #ifndef USE_MAEMO    printf("main after settings redraw\n");
2266    // in non-maemo setup this can only affect the main screen as  
2267    // the menu is blocked while a dialog is open. also the main    if(!appdata->cur_view) {
2268    // screen is always present      printf("no active view\n");
2269    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);  
2270    }    }
2271  #else  
2272    /* 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 */
2273    /* need to be redrawn */    /* need to be redrawn */
2274    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2023  void main_after_settings_redraw(appdata_ Line 2292  void main_after_settings_redraw(appdata_
2292    }    }
2293    
2294    if(redraw) {    if(redraw) {
2295      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2296    
2297    #ifdef USE_STACKABLE_WINDOW
2298        HildonWindowStack *stack = hildon_window_stack_get_default();
2299        container = hildon_window_stack_peek(stack);
2300    #endif
2301    
2302        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2303      switch(redraw) {      switch(redraw) {
2304      case 1:      case 1:
2305        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 2038  void main_after_settings_redraw(appdata_ Line 2314  void main_after_settings_redraw(appdata_
2314        break;        break;
2315      }      }
2316    
2317      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2318      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2319    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2320        else
2321  #endif  #endif
2322          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2323    
2324        gtk_widget_show_all(container);
2325      }
2326  }  }
2327    
2328  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2062  int main(int argc, char *argv[]) { Line 2343  int main(int argc, char *argv[]) {
2343    
2344    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2345    
2346      misc_init();
2347    
2348      curl_global_init(CURL_GLOBAL_ALL);
2349    
2350  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2351    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2352    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2070  int main(int argc, char *argv[]) { Line 2355  int main(int argc, char *argv[]) {
2355      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2356    }    }
2357    
2358    #ifdef ENABLE_MAEMO_MAPPER
2359    dbus_register(&appdata);    dbus_register(&appdata);
2360  #endif  #endif
2361    #endif
2362    
2363    icons_init();    icons_init();
2364    
# Line 2095  int main(int argc, char *argv[]) { Line 2382  int main(int argc, char *argv[]) {
2382    /* Create a Window. */    /* Create a Window. */
2383    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2384    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2385    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2386  #endif  #endif
2387    
2388    #if MAEMO_VERSION_MAJOR == 5
2389    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2390    #endif
2391    
2392    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2393                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2394    
2395    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2396                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2397    
2398      /* prepare clipboard */
2399      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2400      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2401    
2402    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2403    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2404  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2405    menu_create(&appdata);    menu_create(&appdata);
2406  #else  #else
# Line 2121  int main(int argc, char *argv[]) { Line 2414  int main(int argc, char *argv[]) {
2414    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);
2415    
2416    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2417    #else
2418    #ifdef BCT
2419      /* on non-hildon machines we use some custom made breadcrumbtrail */
2420      /* replacement */
2421      appdata.bct = bct_new();
2422      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2423    #endif
2424    #endif
2425    
2426    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2427    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2428  #endif  #endif
2429    
Legend:
Removed from v.6  
changed lines
  Added in v.228