Diff of /trunk/src/main.c

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

revision 2 by harbaum, Sat Jun 20 11:44:14 2009 UTC revision 165 by harbaum, Sun Nov 8 20:32:55 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    #endif
37  #endif  #endif
38    
39  #include <locale.h>  #include <locale.h>
40    
41  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
42    
43  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
44  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
45                        gpointer user_data);                        gpointer user_data);
46    
# Line 92  void errorf(const char *fmt, ...) { Line 97  void errorf(const char *fmt, ...) {
97      }      }
98    }    }
99    
100    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
101    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
102                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
103                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
104                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,                             GTK_MESSAGE_ERROR,
105                             buf);                             GTK_BUTTONS_CLOSE, buf);
106    
107    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
108    #else
109      GtkWidget *dialog =
110        hildon_note_new_information(GTK_WINDOW(NULL), buf);
111    #endif
112    
113    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
114    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 120  gpx_t *choose_file(appdata_t *appdata, g Line 130  gpx_t *choose_file(appdata_t *appdata, g
130                   HELP_ID_IMPORT, appdata->osso_context);                   HELP_ID_IMPORT, appdata->osso_context);
131  #endif  #endif
132  #else  #else
133    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Open Directory"):    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Import directory"):
134                                          _("Open File"),                                          _("Import file"),
135                          GTK_WINDOW(appdata->window),                          GTK_WINDOW(appdata->window),
136                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :
137                                          GTK_FILE_CHOOSER_ACTION_OPEN,                                          GTK_FILE_CHOOSER_ACTION_OPEN,
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 148  gpx_t *choose_file(appdata_t *appdata, g
148    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
149    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
150      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
151    
152        if(filename) {
153          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
154    
155      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
156            gpx = gpx_parse(dialog, filename);
157      if(!whole_dir)        else {
158        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
159      else {          if(strlastchr(filename) == '/')
160        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
161        if(strlastchr(filename) == '/')  
162          filename[strlen(filename)] = 0;          gpx = gpx_parse_dir(dialog, filename);
   
       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 = '/';  
163        }        }
164    
165          gpx_busy_dialog_destroy(dialog);
166    
167          /* save path if gpx was successfully loaded */
168          if(gpx) {
169            char *r = strrchr(filename, '/');
170    
171            /* there is a delimiter, use everything left of it as path */
172            if(r && !whole_dir) {
173              *r = 0;
174              if(appdata->path) free(appdata->path);
175              appdata->path = strdup(filename);
176              /* restore path ... just in case ... */
177              *r = '/';
178            }
179    
180            if(whole_dir)
181              appdata->path = strdup(filename);
182          } else
183            errorf(_("Load error"));
184    
185        if(whole_dir)        g_free (filename);
186          appdata->path = strdup(filename);      } else {
187    #ifndef USE_MAEMO
188          errorf(_("Error accessing the file."));
189    #else
190          errorf(_("Error accessing the file. This may happen if the file "
191                   "resides on a remote file system. Please copy the file onto "
192                   "the device (e.g. onto the memory card) and try again."));
193    #endif
194      }      }
   
     g_free (filename);  
195    }    }
196    
197    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 194  enum { Line 215  enum {
215    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
216  } ;  } ;
217    
218  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
219    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
220        cache_dialog(appdata, cache);
221    #else
222        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
223        appdata->cur_view = cache_view(appdata, cache);
224        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
225        gtk_widget_show_all(appdata->vbox);
226    
227        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
228    #endif
229    }
230    
231    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
232                                     GtkTreePath        *path,                                     GtkTreePath        *path,
233                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
234                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 236  void cachelist_view_onRowActivated(GtkTr
236    GtkTreeIter   iter;    GtkTreeIter   iter;
237    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
238    
239    #ifdef USE_MAEMO
240      /* check if a cache is already selected and ignore click if yes */
241      /* (was probably a double click) */
242      if(appdata->cur_cache) return;
243    #endif
244    
245    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
246      cache_t *cache;      cache_t *cache;
247      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
248  #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  
249    }    }
250  }  }
251    
# Line 257  static GtkWidget *cachelist_create(appda Line 288  static GtkWidget *cachelist_create(appda
288                                     cache_t *sel_cache);                                     cache_t *sel_cache);
289    
290  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
291  #ifndef USE_MAEMO    if(!appdata->cur_view) {
292    //  gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      printf("cachelist redraw: no active view\n");
293    //  appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);      return;
294    //  gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);    }
   // gtk_widget_show_all(appdata->vbox);  
 #else  
295    
296    g_assert(!appdata->cur_cache);    g_assert(!appdata->cur_cache);
297    int redraw = 0;    int redraw = 0;
# Line 274  void cachelist_redraw(appdata_t *appdata Line 303  void cachelist_redraw(appdata_t *appdata
303    }    }
304    
305    if(redraw) {    if(redraw) {
306      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
307    
308    #ifdef USE_STACKABLE_WINDOW
309        HildonWindowStack *stack = hildon_window_stack_get_default();
310        container = hildon_window_stack_peek(stack);
311    #endif
312    
313        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
314      switch(redraw) {      switch(redraw) {
315      case 1:      case 1:
316        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 286  void cachelist_redraw(appdata_t *appdata Line 322  void cachelist_redraw(appdata_t *appdata
322        break;        break;
323      }      }
324    
325      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
326      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
327    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
328        else
329  #endif  #endif
330          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
331    
332        gtk_widget_show_all(container);
333      }
334  }  }
335    
336    
# Line 297  static gboolean cachelist_update(gpointe Line 338  static gboolean cachelist_update(gpointe
338    
339    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
340    
 #ifdef USE_MAEMO  
341    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
342    
343      if(appdata->cur_cache)
344        return TRUE;
345    
346    #ifdef USE_MAEMO
347    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
348      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
349        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
350    #endif
351    
352    if(appdata->cachelist_update)    if(appdata->cachelist_update)
353      cachelist_redraw(appdata);      cachelist_redraw(appdata);
 #endif  
354    
355    return TRUE;    return TRUE;
356  }  }
357    
358  static void cachelist_timer_reset(appdata_t *appdata) {  static void cachelist_timer_reset(appdata_t *appdata) {
359      printf("cachelist timer reset\n");
360    g_assert(appdata->cachelist_handler_id);    g_assert(appdata->cachelist_handler_id);
361    gtk_timeout_remove(appdata->cachelist_handler_id);    gtk_timeout_remove(appdata->cachelist_handler_id);
362    appdata->cachelist_handler_id =    appdata->cachelist_handler_id =
# Line 543  void cachelist_dialog(appdata_t *appdata Line 588  void cachelist_dialog(appdata_t *appdata
588  }  }
589  #else  #else
590  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
591    static void search_result_free(gpx_t *result);
592    
593    void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
594      if(appdata->search_results) {
595        search_result_free(appdata->search_results);
596        appdata->search_results = NULL;
597      }
598      appdata->cur_gpx = NULL;
599    
600    #ifdef ENABLE_OSM_GPS_MAP
601      map_update(appdata);
602    #endif
603    
604      /* restore cur_view */
605      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
606    }
607    
608  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
609    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
610    
611    gtk_window_set_title(GTK_WINDOW(window), gpx->name);    /* store last "cur_view" in window */
612      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
613    
614    gtk_container_add(GTK_CONTAINER(window),    appdata->cur_gpx = gpx;
615                      cachelist_create(appdata, gpx, NULL));    char *title = g_strdup_printf("%s - GPXView", gpx->name);
616      gtk_window_set_title(GTK_WINDOW(window), title);
617      g_free(title);
618    
619      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
620      gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
621    
622    
623      hildon_window_set_app_menu(HILDON_WINDOW(window),
624                                 menu_create(appdata, MENU_CACHELIST));
625    
626      g_signal_connect(G_OBJECT(window), "destroy",
627                       G_CALLBACK(on_cachelist_destroy), appdata);
628    
629    gtk_widget_show_all(window);    gtk_widget_show_all(window);
630    
631    #ifdef ENABLE_OSM_GPS_MAP
632      map_update(appdata);
633    #endif
634  }  }
635  #endif  #endif
636  #endif  #endif
# Line 655  static void gpxlist_close(appdata_t *app Line 734  static void gpxlist_close(appdata_t *app
734    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
735  }  }
736    
737    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
738    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
739    #ifdef USE_STACKABLE_WINDOW
740      if(!appdata->cur_gpx)
741    #endif
742        cachelist_dialog(appdata, gpx);
743    #ifdef USE_STACKABLE_WINDOW
744      else
745        printf("selected gpx, but cachelist window already present\n");
746    #endif
747    #else
748      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
749      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
750      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
751      gtk_widget_show_all(appdata->vbox);
752    
753      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
754    #endif
755    }
756    
757  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
758                            GtkTreePath        *path,                            GtkTreePath        *path,
759                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 663  static void gpxlist_view_onRowActivated( Line 762  static void gpxlist_view_onRowActivated(
762    GtkTreeIter   iter;    GtkTreeIter   iter;
763    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
764    
765    #ifdef USE_MAEMO
766      /* check if a cache is already selected and ignore click if yes */
767      /* (was probably a double click) */
768      if(appdata->cur_gpx) return;
769    #endif
770    
771    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
772      gpx_t *gpx;      gpx_t *gpx;
773      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 780  static void gpxlist_view_onRowActivated(
780      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
781        printf("clicked delete\n");        printf("clicked delete\n");
782    
783    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
784        /* ask user what he wants */        /* ask user what he wants */
785        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
786                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
787                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
788                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   GTK_MESSAGE_QUESTION,
789                     GTK_BUTTONS_CANCEL,
790                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
791                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
792    
# Line 688  static void gpxlist_view_onRowActivated( Line 795  static void gpxlist_view_onRowActivated(
795                               _("Close"), 2,                               _("Close"), 2,
796                               NULL);                               NULL);
797    
798          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
799    #else
800    
801          GtkWidget *dialog =
802            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
803                                GTK_WINDOW(appdata->window),
804                                GTK_DIALOG_DESTROY_WITH_PARENT,
805                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
806                                _("Remove"), 1,
807                                _("Close"), 2,
808                                NULL);
809    
810          GtkWidget *content_area =
811            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
812    
813          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
814    
815          gtk_box_pack_start(GTK_BOX(hbox),
816             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
817                                       GTK_ICON_SIZE_DIALOG),
818                             FALSE, FALSE, 0);
819    
820          GtkWidget *label = gtk_label_new(
821                      _("Do you want to close this entry only or do "
822                        "you want to remove it completely from the list?"));
823    
824          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
825          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
826    
827          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
828          gtk_container_add (GTK_CONTAINER (content_area), hbox);
829    
830          gtk_widget_show_all (dialog);
831    #endif
832    
833        if(gpx->closed)        if(gpx->closed)
834          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
835    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));  
   
836        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
837        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
838    
# Line 760  static void gpxlist_view_onRowActivated( Line 900  static void gpxlist_view_onRowActivated(
900    
901          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
902        }        }
903  #ifndef USE_BREAD_CRUMB_TRAIL  
904        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  
905      }      }
906    }    }
907  }  }
# Line 824  static GtkWidget *gpxlist_create_view_an Line 956  static GtkWidget *gpxlist_create_view_an
956    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
957                    -1, "Icon", renderer,                    -1, "Icon", renderer,
958                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
959                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
960            /* at least one entry needs to be sensitive. */
961            /* This is the delete icon if the PANNABLE_AREA is used */
962                      "sensitive", GPXLIST_COL_OPEN,
963    #endif
964                    NULL);                    NULL);
965    
966    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 880  static GtkWidget *gpxlist_create_view_an Line 1016  static GtkWidget *gpxlist_create_view_an
1016    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1017                    -1, "Del", renderer,                    -1, "Del", renderer,
1018                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
1019                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
1020                    NULL);                    NULL);
1021  #endif  #endif
1022    
# Line 900  static GtkWidget *gpxlist_create_view_an Line 1036  static GtkWidget *gpxlist_create_view_an
1036      GtkTreeIter         iter;      GtkTreeIter         iter;
1037      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1038      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1039    
1040      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1041        sel_iter = iter;        sel_iter = iter;
1042        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 960  static void gpxlist_add(appdata_t *appda Line 1096  static void gpxlist_add(appdata_t *appda
1096    
1097  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1098    
1099    typedef struct {
1100      appdata_t *appdata;
1101      GtkWidget *dialog;
1102    } about_context_t;
1103    
1104    #ifdef ENABLE_BROWSER_INTERFACE
1105    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1106      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1107      browser_url(context->appdata,
1108                  "https://www.paypal.com/cgi-bin/webscr"
1109                  "?cmd=_s-xclick&hosted_button_id=7400558");
1110    }
1111    #endif
1112    
1113  static void  static void
1114  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1115    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1116    
1117      context.appdata = (appdata_t *)data;
1118    
1119    gtk_about_dialog_set_name(about, "GPXView");  #ifdef ENABLE_LIBLOCATION
1120    gtk_about_dialog_set_version(about, VERSION);    char *uses = "uses liblocation";
1121    gtk_about_dialog_set_copyright(about,  #elif defined(ENABLE_GPSBT)
1122           _("GPXView (c) 2008 by\n"    char *uses = "uses gpsbt and gpsd";
1123           "Till Harbaum <till@harbaum.org>\n"  #else
1124           "Geocaching.com: Tantil"));    char *uses = "uses gpsd";
1125    #endif
1126    gtk_about_dialog_set_website(about,  
1127         _("http://www.harbaum.org/till/maemo"));    const gchar *authors[] = {
1128        "Till Harbaum <till@harbaum.org>",
1129    gtk_about_dialog_set_comments(about,      "John Stowers <john.stowers@gmail.com>",
1130         _("Geocaching.com GPX file viewer"));      "GCVote: Guido Wegener <guido.wegener@gmx.de>",
1131        NULL };
1132    gtk_widget_show_all(GTK_WIDGET(about));  
1133    gtk_dialog_run(GTK_DIALOG(about));    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1134    gtk_widget_destroy(GTK_WIDGET(about));                          "name", "GPXView",
1135                            "version", VERSION,
1136                            "copyright", _("Copyright 2008-2009"),
1137                            "authors", authors,
1138                            "website", _("http://www.harbaum.org/till/maemo"),
1139                            "comments", _(uses),
1140                            NULL);
1141    
1142    #ifdef ENABLE_BROWSER_INTERFACE
1143      /* add a way to donate to the project */
1144      GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1145    
1146      GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1147      gtk_box_pack_start(GTK_BOX(hbox),
1148                         gtk_label_new(_("Do you like GPXView?")),
1149                         FALSE, FALSE, 0);
1150    
1151      GtkWidget *button = gtk_button_new();
1152      gtk_button_set_image(GTK_BUTTON(button),
1153                           icon_get_widget(ICON_MISC, 8));
1154      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1155      g_signal_connect(button, "clicked",
1156                       G_CALLBACK(on_paypal_button_clicked), &context);
1157      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1158    
1159      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1160      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1161                                  alignment);
1162    
1163      gtk_widget_show_all(alignment);
1164    #endif
1165    
1166      gtk_dialog_run(GTK_DIALOG(context.dialog));
1167      gtk_widget_destroy(context.dialog);
1168  }  }
1169    
1170  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1007  cb_menu_adddir(GtkWidget *window, gpoint Line 1192  cb_menu_adddir(GtkWidget *window, gpoint
1192    if(new) gpxlist_add(appdata, new);    if(new) gpxlist_add(appdata, new);
1193  }  }
1194    
 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);  
 }  
   
1195  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
1196  static void  static void
1197  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 1336  gpx_t *search_do(appdata_t *appdata, gpx
1336        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1337                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1338          hit = 1;          hit = 1;
1339        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1340                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1341          hit = 1;          hit = 1;
1342    
1343        if(hit) {        if(hit) {
# Line 1340  cb_menu_search(GtkWidget *window, gpoint Line 1510  cb_menu_search(GtkWidget *window, gpoint
1510      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1511      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1512          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1513    
1514        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1515    
1516  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1517        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        gpx_t *found =
1518            search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1519    
1520        /* do search result dialog here ... */        /* do search result dialog here ... */
1521        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, found);
1522    #ifndef USE_STACKABLE_WINDOW
1523        search_result_free(found);        search_result_free(found);
1524  #else  #else
1525          appdata->search_results = found;
1526    #endif
1527    #else
1528          gpx_t *found = NULL;
1529    
1530        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1531          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1532        else        else
# Line 1371  cb_menu_search(GtkWidget *window, gpoint Line 1547  cb_menu_search(GtkWidget *window, gpoint
1547      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1548  }  }
1549    
1550  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1551    
1552  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1553  static void  static void
# Line 1433  cb_menu_export_log(GtkWidget *widget, gp Line 1609  cb_menu_export_log(GtkWidget *widget, gp
1609    notes_log_export(appdata);    notes_log_export(appdata);
1610  }  }
1611    
1612  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1613  static void  static void
1614  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1615    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1447  cb_menu_export_garmin(GtkWidget *widget, Line 1623  cb_menu_export_garmin(GtkWidget *widget,
1623    garmin_export(appdata);    garmin_export(appdata);
1624  }  }
1625    
1626    #ifdef ENABLE_OSM_GPS_MAP
1627    static void
1628    cb_menu_map(GtkWidget *window, gpointer data) {
1629      map((appdata_t *)data);
1630    }
1631    #endif
1632    
1633    static void
1634    cb_menu_geomath(GtkWidget *window, gpointer data) {
1635      geomath_dialog((appdata_t *)data);
1636    }
1637    
1638    static void
1639    cb_menu_geotext(GtkWidget *window, gpointer data) {
1640      geotext_dialog((appdata_t *)data);
1641    }
1642    
1643    static void
1644    cb_menu_precpos(GtkWidget *window, gpointer data) {
1645      precise_position((appdata_t *)data);
1646    }
1647    
1648    #ifdef USE_STACKABLE_WINDOW
1649    typedef struct {
1650      char *label, *desc;
1651      GtkSignalFunc activate_cb;
1652    } menu_entry_t;
1653    
1654    typedef struct {
1655      const char *title;
1656      const menu_entry_t *menu;
1657      int len;
1658    } submenu_t;
1659    
1660    #define COLUMNS  1
1661    
1662    void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1663    
1664      /* force closing of submenu dialog */
1665      gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1666      gtk_widget_hide(menu);
1667    
1668      /* let gtk clean up */
1669      while(gtk_events_pending())
1670        gtk_main_iteration();
1671    }
1672    
1673    static GtkWidget *app_submenu_create(appdata_t *appdata,
1674                                         const submenu_t *submenu) {
1675    
1676      /* create a oridinary dialog box */
1677      GtkWidget *dialog = gtk_dialog_new();
1678      gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1679      gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1680      gtk_window_set_transient_for(GTK_WINDOW(dialog),
1681                                   GTK_WINDOW(appdata->window));
1682      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1683    
1684      GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1685      int x = 0, y = 0;
1686    
1687      const menu_entry_t *menu_entries = submenu->menu;
1688      while(menu_entries->label) {
1689        GtkWidget *button = NULL;
1690    
1691        button = hildon_button_new_with_text(
1692                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1693                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1694                _(menu_entries->label), _(menu_entries->desc));
1695    
1696        /* try to center both texts */
1697        hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1698        hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1699    
1700        g_signal_connect(button, "clicked",
1701                         G_CALLBACK(on_submenu_entry_clicked), dialog);
1702    
1703        g_signal_connect(button, "clicked",
1704                         menu_entries->activate_cb, appdata);
1705    
1706        gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1707    
1708        x++;
1709        if(x == COLUMNS) { x = 0; y++; }
1710    
1711        menu_entries++;
1712      }
1713    
1714      gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1715    
1716      return dialog;
1717    }
1718    
1719    /* popup the dialog shaped submenu */
1720    static void submenu_popup(GtkWidget *menu) {
1721      gtk_widget_show_all(menu);
1722      gtk_dialog_run(GTK_DIALOG(menu));
1723      gtk_widget_hide(menu);
1724    }
1725    
1726    static void submenu_cleanup(GtkWidget *menu) {
1727      gtk_widget_destroy(menu);
1728    }
1729    
1730    static const menu_entry_t submenu_export_entries[] = {
1731    #ifdef ENABLE_MAEMO_MAPPER
1732      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1733        G_CALLBACK(cb_menu_export_mmpoi)  },
1734    #endif
1735      { "Export Field Notes",      "Save a Garmin Field Notes file",
1736        G_CALLBACK(cb_menu_export_log)    },
1737      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1738        G_CALLBACK(cb_menu_export_garmin) },
1739      { NULL, NULL, NULL }
1740    };
1741    
1742    static const submenu_t submenu_export = {
1743      "Export", submenu_export_entries,
1744      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1745    };
1746    
1747    /* the export submenu */
1748    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1749      if(!appdata->export_menu)
1750        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1751    
1752      submenu_popup(appdata->export_menu);
1753    }
1754    
1755    static const menu_entry_t submenu_tools_entries[] = {
1756      { "Geomath",          "Geocoordinate calculation",
1757        G_CALLBACK(cb_menu_geomath) },
1758      { "Geotext",          "Text analysis",
1759        G_CALLBACK(cb_menu_geotext) },
1760      { "Precise Position", "Calculate a precise GPS position",
1761        G_CALLBACK(cb_menu_precpos) },
1762      { NULL, NULL, NULL }
1763    };
1764    
1765    static const submenu_t submenu_tools = {
1766      "Tools", submenu_tools_entries,
1767      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1768    };
1769    
1770    /* the tools submenu */
1771    void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1772      if(!appdata->tools_menu)
1773        appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1774    
1775      submenu_popup(appdata->tools_menu);
1776    }
1777    
1778    HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
1779      GtkWidget *button;
1780      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1781    
1782      /* ------- */
1783      button = gtk_button_new_with_label(_("About"));
1784      g_signal_connect_after(button, "clicked",
1785                             G_CALLBACK(cb_menu_about), appdata);
1786      hildon_app_menu_append(menu, GTK_BUTTON(button));
1787    
1788      button = gtk_button_new_with_label(_("Settings"));
1789      g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1790                             appdata);
1791      hildon_app_menu_append(menu, GTK_BUTTON(button));
1792    
1793      if(mode == MENU_GPXLIST) {
1794        button = gtk_button_new_with_label(_("Import file"));
1795        g_signal_connect_after(button, "clicked",
1796                               G_CALLBACK(cb_menu_add), appdata);
1797        hildon_app_menu_append(menu, GTK_BUTTON(button));
1798    
1799        button = gtk_button_new_with_label(_("Import directory"));
1800        g_signal_connect_after(button, "clicked",
1801                               G_CALLBACK(cb_menu_adddir), appdata);
1802        hildon_app_menu_append(menu, GTK_BUTTON(button));
1803    
1804        button = gtk_button_new_with_label(_("Export"));
1805        g_signal_connect_after(button, "clicked",
1806                               G_CALLBACK(on_export_clicked), appdata);
1807        hildon_app_menu_append(menu, GTK_BUTTON(button));
1808    
1809        button = gtk_button_new_with_label(_("Search"));
1810        g_signal_connect_after(button, "clicked",
1811                               G_CALLBACK(cb_menu_search), appdata);
1812        hildon_app_menu_append(menu, GTK_BUTTON(button));
1813      }
1814    
1815      button = gtk_button_new_with_label(_("Tools"));
1816      g_signal_connect_after(button, "clicked",
1817                             G_CALLBACK(on_tools_clicked), appdata);
1818      hildon_app_menu_append(menu, GTK_BUTTON(button));
1819    
1820    #ifdef ENABLE_OSM_GPS_MAP
1821        button = gtk_button_new_with_label(_("Map"));
1822        g_signal_connect_after(button, "clicked",
1823                               G_CALLBACK(cb_menu_map), appdata);
1824        hildon_app_menu_append(menu, GTK_BUTTON(button));
1825    #endif
1826    
1827    #ifdef HILDON_HELP
1828      button = gtk_button_new_with_label(_("Help"));
1829      g_signal_connect_after(button, "clicked",
1830                             G_CALLBACK(cb_menu_help), appdata);
1831      hildon_app_menu_append(menu, GTK_BUTTON(button));
1832    #endif
1833    
1834      gtk_widget_show_all(GTK_WIDGET(menu));
1835    
1836      return menu;
1837    }
1838    #else
1839    
1840  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1841    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1842    menu = gtk_menu_new();    menu = gtk_menu_new();
1843    
1844  #ifdef USE_MAEMO  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1845    appdata->menu_import =    appdata->menu_import =
1846  #endif  #endif
1847    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1459  void menu_create(appdata_t *appdata) { Line 1849  void menu_create(appdata_t *appdata) {
1849    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1850    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1851    
1852    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1853    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1854    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1855    
1856    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1857    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1858    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1859    
# Line 1481  void menu_create(appdata_t *appdata) { Line 1871  void menu_create(appdata_t *appdata) {
1871    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1872  #endif  #endif
1873    
1874  #ifdef USE_MAEMO  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1875    appdata->menu_export =    appdata->menu_export =
1876  #endif  #endif
1877      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1489  void menu_create(appdata_t *appdata) { Line 1879  void menu_create(appdata_t *appdata) {
1879    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1880    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1881    
1882  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1883    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1884    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1885    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1886                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1887  #endif  #endif
1888    
1889    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1890    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1891    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1892                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1893    
1894    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1895    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1896    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1897                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1898    
1899  #ifdef USE_MAEMO  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1900    appdata->menu_search =    appdata->menu_search =
1901  #endif  #endif
1902    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1903    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1904    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1905    
1906    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1907    
 #ifndef NO_COPY_N_PASTE  
1908    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1909    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1910    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1911    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1912    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1539  void menu_create(appdata_t *appdata) { Line 1926  void menu_create(appdata_t *appdata) {
1926    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_paste), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_paste), appdata);
1927  #endif  #endif
1928    
1929    item = gtk_menu_item_new_with_label( _("Settings...") );    item = gtk_menu_item_new_with_label( _("Settings") );
1930    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1931    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_settings),    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_settings),
1932                     appdata);                     appdata);
1933    
1934    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1935    
1936    #ifdef ENABLE_OSM_GPS_MAP
1937      item = gtk_menu_item_new_with_label( _("Map") );
1938      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1939      g_signal_connect(item, "activate",
1940                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1941    #endif
1942    
1943    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1944    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1945    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1946    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1947    
1948    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1949    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1950    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1951                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1952    
1953    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1954    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1955    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1956                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1957    
1958    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
1959    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1960    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1961                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
# Line 1569  void menu_create(appdata_t *appdata) { Line 1963  void menu_create(appdata_t *appdata) {
1963    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1964    
1965  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
1966    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
1967    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1968    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
1969  #endif  #endif
1970    
1971    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
1972    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1973    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
1974    
# Line 1600  void menu_create(appdata_t *appdata) { Line 1994  void menu_create(appdata_t *appdata) {
1994    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);
1995  #endif  #endif
1996  }  }
1997    #endif
1998    
1999  /********************* end of menu **********************/  /********************* end of menu **********************/
2000    
# Line 1609  void cleanup(appdata_t *appdata) { Line 2004  void cleanup(appdata_t *appdata) {
2004    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
2005    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
2006    
2007    #ifdef USE_STACKABLE_WINDOW
2008      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
2009      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
2010    #endif
2011    
2012    gnome_vfs_shutdown();    gnome_vfs_shutdown();
2013    icons_free();    icons_free();
2014    gps_release(appdata);    gps_release(appdata);
# Line 1637  void cleanup(appdata_t *appdata) { Line 2037  void cleanup(appdata_t *appdata) {
2037    puts("everything is gone");    puts("everything is gone");
2038  }  }
2039    
2040  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2041    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2042    
2043    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 1646  void on_window_destroy (GtkWidget *widge Line 2046  void on_window_destroy (GtkWidget *widge
2046  }  }
2047    
2048  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
2049                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
2050    int handled = FALSE;    int handled = FALSE;
2051    
2052    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1655  gboolean on_window_key_press(GtkWidget * Line 2054  gboolean on_window_key_press(GtkWidget *
2054    switch(event->keyval) {    switch(event->keyval) {
2055  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2056    
 #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  
   
2057  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
2058    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
2059      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1710  gboolean on_window_key_press(GtkWidget * Line 2100  gboolean on_window_key_press(GtkWidget *
2100    return handled;    return handled;
2101  }  }
2102    
2103  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2104  typedef struct {  typedef struct {
2105    int level;    int level;
2106    appdata_t *appdata;    appdata_t *appdata;
# Line 1802  crumb_back(gpointer data) { Line 2192  crumb_back(gpointer data) {
2192    
2193    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2194    g_free(data);    g_free(data);
2195    
2196    #ifdef ENABLE_OSM_GPS_MAP
2197      map_update(crumb->appdata);
2198    #endif
2199  }  }
2200    
2201  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 1842  static void crumb_add(appdata_t *appdata Line 2236  static void crumb_add(appdata_t *appdata
2236  #endif  #endif
2237    }    }
2238    
2239    #ifdef USE_BREAD_CRUMB_TRAIL
2240    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2241                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2242    #else
2243      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2244    #endif
2245    
2246    #ifdef ENABLE_OSM_GPS_MAP
2247      map_update(appdata);
2248    #endif
2249  }  }
2250  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2251    
2252  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2253  #ifndef USE_MAEMO    printf("main after settings redraw\n");
2254    // in non-maemo setup this can only affect the main screen as  
2255    // the menu is blocked while a dialog is open. also the main    if(!appdata->cur_view) {
2256    // screen is always present      printf("no active view\n");
2257    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);  
2258    }    }
2259  #else  
2260    /* 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 */
2261    /* need to be redrawn */    /* need to be redrawn */
2262    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 1883  void main_after_settings_redraw(appdata_ Line 2280  void main_after_settings_redraw(appdata_
2280    }    }
2281    
2282    if(redraw) {    if(redraw) {
2283      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2284    
2285    #ifdef USE_STACKABLE_WINDOW
2286        HildonWindowStack *stack = hildon_window_stack_get_default();
2287        container = hildon_window_stack_peek(stack);
2288    #endif
2289    
2290        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2291      switch(redraw) {      switch(redraw) {
2292      case 1:      case 1:
2293        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 1898  void main_after_settings_redraw(appdata_ Line 2302  void main_after_settings_redraw(appdata_
2302        break;        break;
2303      }      }
2304    
2305      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2306      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2307    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2308        else
2309  #endif  #endif
2310          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2311    
2312        gtk_widget_show_all(container);
2313      }
2314  }  }
2315    
2316  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 1922  int main(int argc, char *argv[]) { Line 2331  int main(int argc, char *argv[]) {
2331    
2332    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2333    
2334      curl_global_init(CURL_GLOBAL_ALL);
2335    
2336  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2337    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2338    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 1930  int main(int argc, char *argv[]) { Line 2341  int main(int argc, char *argv[]) {
2341      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2342    }    }
2343    
2344    #ifdef ENABLE_MAEMO_MAPPER
2345    dbus_register(&appdata);    dbus_register(&appdata);
2346  #endif  #endif
2347    #endif
2348    
2349    icons_init();    icons_init();
2350    
# Line 1955  int main(int argc, char *argv[]) { Line 2368  int main(int argc, char *argv[]) {
2368    /* Create a Window. */    /* Create a Window. */
2369    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2370    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2371    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2372  #endif  #endif
2373    
2374    #if MAEMO_VERSION_MAJOR == 5
2375    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2376    #endif
2377    
2378    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2379                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2380    
2381    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2382                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2383    
2384      /* prepare clipboard */
2385      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2386      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2387    
2388    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2389    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2390    #ifndef USE_STACKABLE_WINDOW
2391    menu_create(&appdata);    menu_create(&appdata);
2392    #else
2393      hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),
2394                                 menu_create(&appdata, MENU_GPXLIST));
2395    #endif
2396    
2397  #ifdef USE_BREAD_CRUMB_TRAIL  #ifdef USE_BREAD_CRUMB_TRAIL
2398    appdata.bct = hildon_bread_crumb_trail_new();    appdata.bct = hildon_bread_crumb_trail_new();
# Line 1976  int main(int argc, char *argv[]) { Line 2400  int main(int argc, char *argv[]) {
2400    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);
2401    
2402    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2403    #else
2404    #ifdef BCT
2405      /* on non-hildon machines we use some custom made breadcrumbtrail */
2406      /* replacement */
2407      appdata.bct = bct_new();
2408      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2409    #endif
2410    #endif
2411    
2412    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2413    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2414  #endif  #endif
2415    
Legend:
Removed from v.2  
changed lines
  Added in v.165