Diff of /trunk/src/main.c

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

revision 20 by harbaum, Sat Jul 4 19:42:28 2009 UTC revision 204 by harbaum, Mon Nov 23 18:32:06 2009 UTC
# Line 19  Line 19 
19  #include <string.h>  #include <string.h>
20  #include <math.h>  #include <math.h>
21    
22    #include <curl/curl.h>
23    
24  #include <time.h>  #include <time.h>
25  #include <sys/time.h>  #include <sys/time.h>
26    
# Line 29  Line 31 
31    
32  #ifdef USE_MAEMO  #ifdef USE_MAEMO
33  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
34    #if MAEMO_VERSION_MAJOR >= 5
35    #include <hildon/hildon-note.h>
36    #include <hildon/hildon-entry.h>
37    #include <hildon/hildon-check-button.h>
38    #endif
39  #endif  #endif
40    
41  #include <locale.h>  #include <locale.h>
42    
43  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
44    
45  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
46  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
47                        gpointer user_data);                        gpointer user_data);
48    
# Line 92  void errorf(const char *fmt, ...) { Line 99  void errorf(const char *fmt, ...) {
99      }      }
100    }    }
101    
102    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
103    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
104                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
105                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
106                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,                             GTK_MESSAGE_ERROR,
107                             buf);                             GTK_BUTTONS_CLOSE, buf);
108    
109    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
110    #else
111      GtkWidget *dialog =
112        hildon_note_new_information(GTK_WINDOW(NULL), buf);
113    #endif
114    
115    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
116    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 150  gpx_t *choose_file(appdata_t *appdata, g
150    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
151    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
152      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
153    
154        if(filename) {
155          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
156    
157      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
158            gpx = gpx_parse(dialog, filename, appdata->username);
159      if(!whole_dir)        else {
160        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
161      else {          if(strlastchr(filename) == '/')
162        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
163        if(strlastchr(filename) == '/')  
164          filename[strlen(filename)] = 0;          gpx = gpx_parse_dir(dialog, filename, appdata->username);
   
       gpx = gpx_parse_dir(dialog, filename);  
     }  
   
     gpx_busy_dialog_destroy(dialog);  
   
     /* save path if gpx was successfully loaded */  
     if(gpx) {  
       char *r = strrchr(filename, '/');  
   
       /* there is a delimiter, use everything left of it as path */  
       if(r && !whole_dir) {  
         *r = 0;  
         if(appdata->path) free(appdata->path);  
         appdata->path = strdup(filename);  
         /* restore path ... just in case ... */  
         *r = '/';  
165        }        }
166    
167        if(whole_dir)        gpx_busy_dialog_destroy(dialog);
168          appdata->path = strdup(filename);  
169      }        /* save path if gpx was successfully loaded */
170          if(gpx) {
171            char *r = strrchr(filename, '/');
172    
173            /* there is a delimiter, use everything left of it as path */
174            if(r && !whole_dir) {
175              *r = 0;
176              if(appdata->path) free(appdata->path);
177              appdata->path = strdup(filename);
178              /* restore path ... just in case ... */
179              *r = '/';
180            }
181    
182            if(whole_dir)
183              appdata->path = strdup(filename);
184          } else
185            errorf(_("Load error"));
186    
187      g_free (filename);        g_free (filename);
188        } else {
189    #ifndef USE_MAEMO
190          errorf(_("Error accessing the file."));
191    #else
192          errorf(_("Error accessing the file. This may happen if the file "
193                   "resides on a remote file system. Please copy the file onto "
194                   "the device (e.g. onto the memory card) and try again."));
195    #endif
196        }
197    }    }
198    
199    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 194  enum { Line 217  enum {
217    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
218  } ;  } ;
219    
220  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
221    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
222        cache_dialog(appdata, cache);
223    #else
224        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
225        appdata->cur_view = cache_view(appdata, cache);
226        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
227        gtk_widget_show_all(appdata->vbox);
228    
229        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
230    #endif
231    }
232    
233    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
234                                     GtkTreePath        *path,                                     GtkTreePath        *path,
235                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
236                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 238  void cachelist_view_onRowActivated(GtkTr
238    GtkTreeIter   iter;    GtkTreeIter   iter;
239    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
240    
241    #ifdef USE_MAEMO
242      /* check if a cache is already selected and ignore click if yes */
243      /* (was probably a double click) */
244      if(appdata->cur_cache) return;
245    #endif
246    
247    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
248      cache_t *cache;      cache_t *cache;
249      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
250  #ifndef USE_BREAD_CRUMB_TRAIL      cachelist_goto_cache(appdata, cache);
     cache_dialog(appdata, cache);  
 #else  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = cache_view(appdata, cache);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
 #endif  
251    }    }
252  }  }
253    
# Line 257  static GtkWidget *cachelist_create(appda Line 290  static GtkWidget *cachelist_create(appda
290                                     cache_t *sel_cache);                                     cache_t *sel_cache);
291    
292  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
 #ifndef USE_MAEMO  
   //  gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
   //  appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
   //  gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
   // gtk_widget_show_all(appdata->vbox);  
 #else  
   
293    if(!appdata->cur_view) {    if(!appdata->cur_view) {
294      printf("cachelist redraw: no active view\n");      printf("cachelist redraw: no active view\n");
295      return;      return;
# Line 281  void cachelist_redraw(appdata_t *appdata Line 307  void cachelist_redraw(appdata_t *appdata
307    if(redraw) {    if(redraw) {
308      GtkWidget *container = appdata->vbox;      GtkWidget *container = appdata->vbox;
309    
     printf("redraw %d\n", redraw);  
   
310  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
311      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
312      container = hildon_window_stack_peek(stack);      container = hildon_window_stack_peek(stack);
# Line 309  void cachelist_redraw(appdata_t *appdata Line 333  void cachelist_redraw(appdata_t *appdata
333    
334      gtk_widget_show_all(container);      gtk_widget_show_all(container);
335    }    }
 #endif  
336  }  }
337    
338    
# Line 317  static gboolean cachelist_update(gpointe Line 340  static gboolean cachelist_update(gpointe
340    
341    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
342    
 #ifdef USE_MAEMO  
343    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
344    
345    if(appdata->cur_cache)    if(appdata->cur_cache)
346      return TRUE;      return TRUE;
347    
348    #ifdef USE_MAEMO
349    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
350      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
351        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
352    #endif
353    
354    if(appdata->cachelist_update)    if(appdata->cachelist_update)
355      cachelist_redraw(appdata);      cachelist_redraw(appdata);
 #endif  
356    
357    return TRUE;    return TRUE;
358  }  }
# Line 454  static GtkWidget *cachelist_create(appda Line 477  static GtkWidget *cachelist_create(appda
477      int type = (cache->type<<8) +      int type = (cache->type<<8) +
478        (cache->notes?4:0) +        (cache->notes?4:0) +
479        ((cache->notes && cache->notes->override)?1:0) +        ((cache->notes && cache->notes->override)?1:0) +
480        ((cache->notes && cache->notes->found)?2:0);        (((cache->notes && cache->notes->found)||cache->found)?2:0);
481    
482      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
483    
# Line 576  void on_cachelist_destroy(GtkWidget *wid Line 599  void on_cachelist_destroy(GtkWidget *wid
599    }    }
600    appdata->cur_gpx = NULL;    appdata->cur_gpx = NULL;
601    
602    #ifdef ENABLE_OSM_GPS_MAP
603      map_update(appdata);
604    #endif
605    
606    /* restore cur_view */    /* restore cur_view */
607    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
608  }  }
# Line 587  void cachelist_dialog(appdata_t *appdata Line 614  void cachelist_dialog(appdata_t *appdata
614    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
615    
616    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
617    char *title = g_strdup_printf("GPXView - %s", gpx->name);    char *title = g_strdup_printf("%s - GPXView", gpx->name);
618    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
619    g_free(title);    g_free(title);
620    
# Line 602  void cachelist_dialog(appdata_t *appdata Line 629  void cachelist_dialog(appdata_t *appdata
629                     G_CALLBACK(on_cachelist_destroy), appdata);                     G_CALLBACK(on_cachelist_destroy), appdata);
630    
631    gtk_widget_show_all(window);    gtk_widget_show_all(window);
632    
633    #ifdef ENABLE_OSM_GPS_MAP
634      map_update(appdata);
635    #endif
636  }  }
637  #endif  #endif
638  #endif  #endif
# Line 659  static void gpxlist_set(GtkListStore *st Line 690  static void gpxlist_set(GtkListStore *st
690                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
691                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
692  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
693                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),
694  #endif  #endif
695                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
696                       -1);                       -1);
# Line 705  static void gpxlist_close(appdata_t *app Line 736  static void gpxlist_close(appdata_t *app
736    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
737  }  }
738    
739    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
740    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
741    #ifdef USE_STACKABLE_WINDOW
742      if(!appdata->cur_gpx)
743    #endif
744        cachelist_dialog(appdata, gpx);
745    #ifdef USE_STACKABLE_WINDOW
746      else
747        printf("selected gpx, but cachelist window already present\n");
748    #endif
749    #else
750      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
751      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
752      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
753      gtk_widget_show_all(appdata->vbox);
754    
755      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
756    #endif
757    }
758    
759  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
760                            GtkTreePath        *path,                            GtkTreePath        *path,
761                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 713  static void gpxlist_view_onRowActivated( Line 764  static void gpxlist_view_onRowActivated(
764    GtkTreeIter   iter;    GtkTreeIter   iter;
765    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
766    
767    #ifdef USE_MAEMO
768      /* check if a cache is already selected and ignore click if yes */
769      /* (was probably a double click) */
770      if(appdata->cur_gpx) return;
771    #endif
772    
773    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
774      gpx_t *gpx;      gpx_t *gpx;
775      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 725  static void gpxlist_view_onRowActivated( Line 782  static void gpxlist_view_onRowActivated(
782      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
783        printf("clicked delete\n");        printf("clicked delete\n");
784    
785    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
786        /* ask user what he wants */        /* ask user what he wants */
787        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
788                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
789                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
790                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   GTK_MESSAGE_QUESTION,
791                     GTK_BUTTONS_CANCEL,
792                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
793                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
794    
# Line 738  static void gpxlist_view_onRowActivated( Line 797  static void gpxlist_view_onRowActivated(
797                               _("Close"), 2,                               _("Close"), 2,
798                               NULL);                               NULL);
799    
800          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
801    #else
802    
803          GtkWidget *dialog =
804            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
805                                GTK_WINDOW(appdata->window),
806                                GTK_DIALOG_DESTROY_WITH_PARENT,
807                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
808                                _("Remove"), 1,
809                                _("Close"), 2,
810                                NULL);
811    
812          GtkWidget *content_area =
813            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
814    
815          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
816    
817          gtk_box_pack_start(GTK_BOX(hbox),
818             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
819                                       GTK_ICON_SIZE_DIALOG),
820                             FALSE, FALSE, 0);
821    
822          GtkWidget *label = gtk_label_new(
823                      _("Do you want to close this entry only or do "
824                        "you want to remove it completely from the list?"));
825    
826          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
827          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
828    
829          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
830          gtk_container_add (GTK_CONTAINER (content_area), hbox);
831    
832          gtk_widget_show_all (dialog);
833    #endif
834    
835        if(gpx->closed)        if(gpx->closed)
836          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
837    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));  
   
838        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
839        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
840    
# Line 772  static void gpxlist_view_onRowActivated( Line 864  static void gpxlist_view_onRowActivated(
864          gpx_t *new = NULL;          gpx_t *new = NULL;
865    
866          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
867            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
868          else          else
869            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
870    
871          if(new) {          if(new) {
872            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 810  static void gpxlist_view_onRowActivated( Line 902  static void gpxlist_view_onRowActivated(
902    
903          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
904        }        }
905  #ifndef USE_BREAD_CRUMB_TRAIL  
906  #ifdef USE_STACKABLE_WINDOW        gpxlist_goto_cachelist(appdata, gpx);
       if(!appdata->cur_gpx)  
 #endif  
         cachelist_dialog(appdata, gpx);  
 #ifdef USE_STACKABLE_WINDOW  
       else  
         printf("selected gpx, but cachelist window already present\n");  
 #endif  
 #else  
       gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
       appdata->cur_view = cachelist_create(appdata, gpx, NULL);  
       gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
       gtk_widget_show_all(appdata->vbox);  
   
       crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);  
 #endif  
907      }      }
908    }    }
909  }  }
# Line 881  static GtkWidget *gpxlist_create_view_an Line 958  static GtkWidget *gpxlist_create_view_an
958    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
959                    -1, "Icon", renderer,                    -1, "Icon", renderer,
960                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
961                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
962            /* at least one entry needs to be sensitive. */
963            /* This is the delete icon if the PANNABLE_AREA is used */
964                      "sensitive", GPXLIST_COL_OPEN,
965    #endif
966                    NULL);                    NULL);
967    
968    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 937  static GtkWidget *gpxlist_create_view_an Line 1018  static GtkWidget *gpxlist_create_view_an
1018    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1019                    -1, "Del", renderer,                    -1, "Del", renderer,
1020                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
1021                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
1022                    NULL);                    NULL);
1023  #endif  #endif
1024    
# Line 957  static GtkWidget *gpxlist_create_view_an Line 1038  static GtkWidget *gpxlist_create_view_an
1038      GtkTreeIter         iter;      GtkTreeIter         iter;
1039      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1040      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1041    
1042      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1043        sel_iter = iter;        sel_iter = iter;
1044        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 1017  static void gpxlist_add(appdata_t *appda Line 1098  static void gpxlist_add(appdata_t *appda
1098    
1099  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1100    
1101    typedef struct {
1102      appdata_t *appdata;
1103      GtkWidget *dialog;
1104    } about_context_t;
1105    
1106    #ifdef ENABLE_BROWSER_INTERFACE
1107    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1108      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1109      browser_url(context->appdata,
1110                  "https://www.paypal.com/cgi-bin/webscr"
1111                  "?cmd=_s-xclick&hosted_button_id=7400558");
1112    }
1113    #endif
1114    
1115  static void  static void
1116  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1117    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1118    
1119    gtk_about_dialog_set_name(about, "GPXView");    context.appdata = (appdata_t *)data;
   gtk_about_dialog_set_version(about, VERSION);  
1120    
1121  #ifdef ENABLE_LIBLOCATION  #ifdef ENABLE_LIBLOCATION
1122    char *uses = "uses liblocation";    char *uses = "uses liblocation";
# Line 1032  cb_menu_about(GtkWidget *window, gpointe Line 1126  cb_menu_about(GtkWidget *window, gpointe
1126    char *uses = "uses gpsd";    char *uses = "uses gpsd";
1127  #endif  #endif
1128    
1129    char *str = g_strdup_printf("%s\n\n(%s)",    const gchar *authors[] = {
1130                        _("GPXView (c) 2008-2009 by\n"      "Till Harbaum <till@harbaum.org>",
1131                          "Till Harbaum <till@harbaum.org>\n"      "John Stowers <john.stowers@gmail.com>",
1132                          "Mailing list: gpxview-users@garage.maemo.org"),      "GCVote: Guido Wegener <guido.wegener@gmx.de>",
1133                        _(uses)      NULL };
1134                        );  
1135      context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1136    gtk_about_dialog_set_copyright(about, str);                          "name", "GPXView",
1137    g_free(str);                          "version", VERSION,
1138                            "copyright", _("Copyright 2008-2009"),
1139    gtk_about_dialog_set_website(about,                          "authors", authors,
1140         _("http://www.harbaum.org/till/maemo"));                          "website", _("http://www.harbaum.org/till/maemo"),
1141                            "comments", _(uses),
1142    gtk_about_dialog_set_comments(about,                          NULL);
1143         _("Geocaching.com GPX file viewer"));  
1144    #ifdef ENABLE_BROWSER_INTERFACE
1145    gtk_widget_show_all(GTK_WIDGET(about));    /* add a way to donate to the project */
1146    gtk_dialog_run(GTK_DIALOG(about));    GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1147    gtk_widget_destroy(GTK_WIDGET(about));  
1148      GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1149      gtk_box_pack_start(GTK_BOX(hbox),
1150                         gtk_label_new(_("Do you like GPXView?")),
1151                         FALSE, FALSE, 0);
1152    
1153      GtkWidget *button = gtk_button_new();
1154      gtk_button_set_image(GTK_BUTTON(button),
1155                           icon_get_widget(ICON_MISC, 5));
1156      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1157      g_signal_connect(button, "clicked",
1158                       G_CALLBACK(on_paypal_button_clicked), &context);
1159      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1160    
1161      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1162      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1163                                  alignment);
1164    
1165      gtk_widget_show_all(alignment);
1166    #endif
1167    
1168      gtk_dialog_run(GTK_DIALOG(context.dialog));
1169      gtk_widget_destroy(context.dialog);
1170  }  }
1171    
1172  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1222  gpx_t *search_do(appdata_t *appdata, gpx Line 1338  gpx_t *search_do(appdata_t *appdata, gpx
1338        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1339                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1340          hit = 1;          hit = 1;
1341        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1342                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1343          hit = 1;          hit = 1;
1344    
1345        if(hit) {        if(hit) {
# Line 1252  typedef struct { Line 1368  typedef struct {
1368    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1369  } search_context_t;  } search_context_t;
1370    
1371    
1372    static GtkWidget *check_button_new_with_label(char *label) {
1373    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1374      return gtk_check_button_new_with_label(label);
1375    #else
1376      GtkWidget *cbut =
1377        hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
1378      gtk_button_set_label(GTK_BUTTON(cbut), label);
1379      return cbut;
1380    #endif
1381    }
1382    
1383    static void check_button_set_active(GtkWidget *button, gboolean active) {
1384    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1385      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
1386    #else
1387      hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
1388    #endif
1389    }
1390    
1391    static gboolean check_button_get_active(GtkWidget *button) {
1392    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1393      return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
1394    #else
1395      return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));
1396    #endif
1397    }
1398    
1399  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1400    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1401    
1402    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1403    
1404    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1405    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1286  cb_menu_search(GtkWidget *window, gpoint Line 1429  cb_menu_search(GtkWidget *window, gpoint
1429    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1430    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1431    
1432    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1433    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);  
1434    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);
1435    
1436    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1437    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);  
1438    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);
1439    
1440    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1441    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);  
1442    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);
1443    
1444    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1445    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);  
1446    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);
1447    
1448    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 1312  cb_menu_search(GtkWidget *window, gpoint Line 1451  cb_menu_search(GtkWidget *window, gpoint
1451    
1452    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1453                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1454    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1455      context.entry = gtk_entry_new();
1456    #else
1457      context.entry = hildon_entry_new(HILDON_SIZE_AUTO);
1458    #endif
1459    
1460    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1461                                context.entry = gtk_entry_new());                                context.entry);
1462    
1463    if(appdata->search_str)    if(appdata->search_str)
1464      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1465    
# Line 1324  cb_menu_search(GtkWidget *window, gpoint Line 1470  cb_menu_search(GtkWidget *window, gpoint
1470    
1471    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1472    
1473    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1474    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);  
1475    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1476    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1477                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1366  cb_menu_search(GtkWidget *window, gpoint Line 1511  cb_menu_search(GtkWidget *window, gpoint
1511                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1512  #endif  #endif
1513    
1514      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1515        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1516      else      else
1517        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1518    
1519      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1520        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1521      else      else
1522        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1523    
1524      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1525        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1526      else      else
1527        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1528    
1529      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1530        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1531      else      else
1532        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1533    
1534      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1535        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1536      else      else
1537        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1399  cb_menu_search(GtkWidget *window, gpoint Line 1544  cb_menu_search(GtkWidget *window, gpoint
1544    
1545        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1546    
1547  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1548        gpx_t *found =        gpx_t *found =
1549          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1550    
# Line 1433  cb_menu_search(GtkWidget *window, gpoint Line 1578  cb_menu_search(GtkWidget *window, gpoint
1578      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1579  }  }
1580    
1581  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1582    
1583  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1584  static void  static void
# Line 1493  static void Line 1638  static void
1638  cb_menu_export_log(GtkWidget *widget, gpointer data) {  cb_menu_export_log(GtkWidget *widget, gpointer data) {
1639    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1640    notes_log_export(appdata);    notes_log_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1641  }  }
1642    
1643  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1644  static void  static void
1645  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1646    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1647    mmpoi_export(appdata);    mmpoi_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1648  }  }
1649  #endif  #endif
1650    
# Line 1513  static void Line 1652  static void
1652  cb_menu_export_garmin(GtkWidget *widget, gpointer data) {  cb_menu_export_garmin(GtkWidget *widget, gpointer data) {
1653    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1654    garmin_export(appdata);    garmin_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1655  }  }
1656    
1657    #ifdef ENABLE_OSM_GPS_MAP
1658    static void
1659    cb_menu_map(GtkWidget *window, gpointer data) {
1660      map((appdata_t *)data);
1661    }
1662    #endif
1663    
1664  static void  static void
1665  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1666    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1667  }  }
1668    
1669  static void  static void
1670  cb_menu_geotext(GtkWidget *window, gpointer data) {  cb_menu_geotext(GtkWidget *window, gpointer data) {
1671    geotext_dialog((appdata_t *)data);    geotext_dialog((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1672  }  }
1673    
1674  static void  static void
1675  cb_menu_precpos(GtkWidget *window, gpointer data) {  cb_menu_precpos(GtkWidget *window, gpointer data) {
1676    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1677  }  }
1678    
1679  #ifdef USE_STACKABLE_WINDOW  static void
1680  static GtkWidget *export_menu_create(appdata_t *appdata) {  cb_menu_geotoad(GtkWidget *window, gpointer data) {
1681    GtkWidget *button;    geotoad((appdata_t *)data);
1682    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());  }
1683    
1684    button = hildon_button_new_with_text(  #ifdef USE_STACKABLE_WINDOW
1685              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  typedef struct {
1686              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    char *label, *desc;
1687              _("Export to Maemo Mapper"),    GtkSignalFunc activate_cb;
1688              _("Save a Maemo Mapper POI file"));  } menu_entry_t;
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_mmpoi), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1689    
1690    button = hildon_button_new_with_text(  typedef struct {
1691              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    const char *title;
1692              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    const menu_entry_t *menu;
1693              _("Export Field Notes"),    int len;
1694              _("Save a Garmin Field Notes file"));  } submenu_t;
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_log), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1695    
1696    button = hildon_button_new_with_text(  #define COLUMNS  1
             HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Export Garmin GPX"),  
             _("Save modified waypoints in GPX file"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_garmin), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1697    
1698    gtk_widget_show_all(GTK_WIDGET(menu));  void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1699    
1700    return GTK_WIDGET(menu);    /* force closing of submenu dialog */
1701      gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1702      gtk_widget_hide(menu);
1703    
1704      /* let gtk clean up */
1705      while(gtk_events_pending())
1706        gtk_main_iteration();
1707  }  }
1708    
1709  /* the export submenu */  static GtkWidget *app_submenu_create(appdata_t *appdata,
1710  void on_export_clicked(GtkButton *button, appdata_t *appdata) {                                       const submenu_t *submenu) {
   if(!appdata->export_menu)  
     appdata->export_menu = export_menu_create(appdata);  
1711    
1712    /* draw a popup menu */    /* create a oridinary dialog box */
1713    hildon_app_menu_popup(HILDON_APP_MENU(appdata->export_menu),    GtkWidget *dialog = gtk_dialog_new();
1714                          GTK_WINDOW(hildon_window_stack_peek(    gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1715                      hildon_window_stack_get_default())));    gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1716  }    gtk_window_set_transient_for(GTK_WINDOW(dialog),
1717                                   GTK_WINDOW(appdata->window));
1718      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1719    
1720  static GtkWidget *tools_menu_create(appdata_t *appdata) {    GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1721    GtkWidget *button;    int x = 0, y = 0;
1722    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());  
1723      const menu_entry_t *menu_entries = submenu->menu;
1724      while(menu_entries->label) {
1725        GtkWidget *button = NULL;
1726    
1727    button = hildon_button_new_with_text(      button = hildon_button_new_with_text(
1728              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1729              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1730              _("Geomath"),              _(menu_entries->label), _(menu_entries->desc));
             _("Geocoordinate calculation"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_geomath), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1731    
1732        /* try to center both texts */
1733        hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1734        hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1735    
1736    button = hildon_button_new_with_text(      g_signal_connect(button, "clicked",
1737              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,                       G_CALLBACK(on_submenu_entry_clicked), dialog);
1738              HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
1739              _("Geotext"),      g_signal_connect(button, "clicked",
1740              _("Text analysis"));                       menu_entries->activate_cb, appdata);
1741    g_signal_connect(button, "clicked",  
1742                     G_CALLBACK(cb_menu_geotext), appdata);      gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1743    hildon_app_menu_append(menu, GTK_BUTTON(button));  
1744        x++;
1745        if(x == COLUMNS) { x = 0; y++; }
1746    
1747    button = hildon_button_new_with_text(      menu_entries++;
1748              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    }
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Precise Position"),  
             _("Calculate a precise GPS position"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_precpos), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1749    
1750    gtk_widget_show_all(GTK_WIDGET(menu));    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1751    
1752    return GTK_WIDGET(menu);    return dialog;
1753  }  }
1754    
1755    /* popup the dialog shaped submenu */
1756    static void submenu_popup(GtkWidget *menu) {
1757      gtk_widget_show_all(menu);
1758      gtk_dialog_run(GTK_DIALOG(menu));
1759      gtk_widget_hide(menu);
1760    }
1761    
1762    static void submenu_cleanup(GtkWidget *menu) {
1763      gtk_widget_destroy(menu);
1764    }
1765    
1766    static const menu_entry_t submenu_export_entries[] = {
1767    #ifdef ENABLE_MAEMO_MAPPER
1768      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1769        G_CALLBACK(cb_menu_export_mmpoi)  },
1770    #endif
1771      { "Export Field Notes",      "Save a Garmin Field Notes file",
1772        G_CALLBACK(cb_menu_export_log)    },
1773      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1774        G_CALLBACK(cb_menu_export_garmin) },
1775      { NULL, NULL, NULL }
1776    };
1777    
1778    static const submenu_t submenu_export = {
1779      "Export", submenu_export_entries,
1780      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1781    };
1782    
1783    /* the export submenu */
1784    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1785      if(!appdata->export_menu)
1786        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1787    
1788      submenu_popup(appdata->export_menu);
1789    }
1790    
1791    static const menu_entry_t submenu_tools_entries[] = {
1792      { "Geomath",          "Geocoordinate calculation",
1793        G_CALLBACK(cb_menu_geomath) },
1794      { "Geotext",          "Text analysis",
1795        G_CALLBACK(cb_menu_geotext) },
1796      { "Precise Position", "Calculate a precise GPS position",
1797        G_CALLBACK(cb_menu_precpos) },
1798      { "GeoToad",          "Use GeoToad online downloader",
1799        G_CALLBACK(cb_menu_geotoad) },
1800      { NULL, NULL, NULL }
1801    };
1802    
1803    static const submenu_t submenu_tools = {
1804      "Tools", submenu_tools_entries,
1805      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1806    };
1807    
1808  /* the tools submenu */  /* the tools submenu */
1809  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1810    if(!appdata->tools_menu)    if(!appdata->tools_menu)
1811      appdata->tools_menu = tools_menu_create(appdata);      appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1812    
1813    /* draw a popup menu */    submenu_popup(appdata->tools_menu);
   hildon_app_menu_popup(HILDON_APP_MENU(appdata->tools_menu),  
                         GTK_WINDOW(hildon_window_stack_peek(  
                     hildon_window_stack_get_default())));  
1814  }  }
1815    
   
1816  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
1817    GtkWidget *button;    GtkWidget *button;
1818    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
# Line 1665  HildonAppMenu *menu_create(appdata_t *ap Line 1838  HildonAppMenu *menu_create(appdata_t *ap
1838      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1839                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1840      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1841    
   if(mode == MENU_GPXLIST) {  
1842      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1843      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1844                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1684  HildonAppMenu *menu_create(appdata_t *ap Line 1855  HildonAppMenu *menu_create(appdata_t *ap
1855                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1856    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1857    
1858    #ifdef ENABLE_OSM_GPS_MAP
1859        button = gtk_button_new_with_label(_("Map"));
1860        g_signal_connect_after(button, "clicked",
1861                               G_CALLBACK(cb_menu_map), appdata);
1862        hildon_app_menu_append(menu, GTK_BUTTON(button));
1863    #endif
1864    
1865  #ifdef HILDON_HELP  #ifdef HILDON_HELP
1866    button = gtk_button_new_with_label(_("Help"));    button = gtk_button_new_with_label(_("Help"));
1867    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
# Line 1701  void menu_create(appdata_t *appdata) { Line 1879  void menu_create(appdata_t *appdata) {
1879    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1880    menu = gtk_menu_new();    menu = gtk_menu_new();
1881    
1882  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1883    appdata->menu_import =    appdata->menu_import =
1884  #endif  #endif
1885    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1731  void menu_create(appdata_t *appdata) { Line 1909  void menu_create(appdata_t *appdata) {
1909    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1910  #endif  #endif
1911    
1912  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1913    appdata->menu_export =    appdata->menu_export =
1914  #endif  #endif
1915      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1739  void menu_create(appdata_t *appdata) { Line 1917  void menu_create(appdata_t *appdata) {
1917    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1918    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1919    
1920  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1921    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1922    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1923    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1756  void menu_create(appdata_t *appdata) { Line 1934  void menu_create(appdata_t *appdata) {
1934    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1935                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1936    
1937  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1938    appdata->menu_search =    appdata->menu_search =
1939  #endif  #endif
1940    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1765  void menu_create(appdata_t *appdata) { Line 1943  void menu_create(appdata_t *appdata) {
1943    
1944    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1945    
 #ifndef NO_COPY_N_PASTE  
1946    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1947    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1948    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1949    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1950    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1796  void menu_create(appdata_t *appdata) { Line 1971  void menu_create(appdata_t *appdata) {
1971    
1972    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1973    
1974    #ifdef ENABLE_OSM_GPS_MAP
1975      item = gtk_menu_item_new_with_label( _("Map") );
1976      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1977      g_signal_connect(item, "activate",
1978                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1979    #endif
1980    
1981    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1982    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1983    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1816  void menu_create(appdata_t *appdata) { Line 1998  void menu_create(appdata_t *appdata) {
1998    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1999                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2000    
2001      item = gtk_menu_item_new_with_label( _("GeoToad") );
2002      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2003      g_signal_connect(item, "activate",
2004                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2005    
2006    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2007    
2008  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1860  void cleanup(appdata_t *appdata) { Line 2047  void cleanup(appdata_t *appdata) {
2047    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
2048    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
2049    
2050    #ifdef USE_STACKABLE_WINDOW
2051      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
2052      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
2053    #endif
2054    
2055    gnome_vfs_shutdown();    gnome_vfs_shutdown();
2056    icons_free();    icons_free();
2057    gps_release(appdata);    gps_release(appdata);
# Line 1888  void cleanup(appdata_t *appdata) { Line 2080  void cleanup(appdata_t *appdata) {
2080    puts("everything is gone");    puts("everything is gone");
2081  }  }
2082    
2083  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2084    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2085    
2086    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 1951  gboolean on_window_key_press(GtkWidget * Line 2143  gboolean on_window_key_press(GtkWidget *
2143    return handled;    return handled;
2144  }  }
2145    
2146  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2147  typedef struct {  typedef struct {
2148    int level;    int level;
2149    appdata_t *appdata;    appdata_t *appdata;
# Line 2043  crumb_back(gpointer data) { Line 2235  crumb_back(gpointer data) {
2235    
2236    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2237    g_free(data);    g_free(data);
2238    
2239    #ifdef ENABLE_OSM_GPS_MAP
2240      map_update(crumb->appdata);
2241    #endif
2242  }  }
2243    
2244  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 2083  static void crumb_add(appdata_t *appdata Line 2279  static void crumb_add(appdata_t *appdata
2279  #endif  #endif
2280    }    }
2281    
2282    #ifdef USE_BREAD_CRUMB_TRAIL
2283    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2284                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2285    #else
2286      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2287    #endif
2288    
2289    #ifdef ENABLE_OSM_GPS_MAP
2290      map_update(appdata);
2291    #endif
2292  }  }
2293  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2294    
# Line 2096  void main_after_settings_redraw(appdata_ Line 2300  void main_after_settings_redraw(appdata_
2300      return;      return;
2301    }    }
2302    
 #ifndef USE_MAEMO  
   // in non-maemo setup this can only affect the main screen as  
   // the menu is blocked while a dialog is open. also the main  
   // screen is always present  
   if(appdata->gpxlist_items != appdata->cur_items) {  
     /* re-do the main screen */  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   }  
 #else  
2303    /* 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 */
2304    /* need to be redrawn */    /* need to be redrawn */
2305    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2162  void main_after_settings_redraw(appdata_ Line 2354  void main_after_settings_redraw(appdata_
2354    
2355      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2356    }    }
 #endif // USE_MAEMO  
2357  }  }
2358    
2359  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2183  int main(int argc, char *argv[]) { Line 2374  int main(int argc, char *argv[]) {
2374    
2375    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2376    
2377      curl_global_init(CURL_GLOBAL_ALL);
2378    
2379  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2380    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2381    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2191  int main(int argc, char *argv[]) { Line 2384  int main(int argc, char *argv[]) {
2384      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2385    }    }
2386    
2387    #ifdef ENABLE_MAEMO_MAPPER
2388    dbus_register(&appdata);    dbus_register(&appdata);
2389  #endif  #endif
2390    #endif
2391    
2392    icons_init();    icons_init();
2393    
# Line 2216  int main(int argc, char *argv[]) { Line 2411  int main(int argc, char *argv[]) {
2411    /* Create a Window. */    /* Create a Window. */
2412    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2413    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2414    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2415  #endif  #endif
2416    
2417  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2229  int main(int argc, char *argv[]) { Line 2424  int main(int argc, char *argv[]) {
2424    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2425                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2426    
2427      /* prepare clipboard */
2428      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2429      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2430    
2431    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2432    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2433  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2434    menu_create(&appdata);    menu_create(&appdata);
2435  #else  #else
# Line 2245  int main(int argc, char *argv[]) { Line 2443  int main(int argc, char *argv[]) {
2443    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);
2444    
2445    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2446    #else
2447    #ifdef BCT
2448      /* on non-hildon machines we use some custom made breadcrumbtrail */
2449      /* replacement */
2450      appdata.bct = bct_new();
2451      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2452    #endif
2453    #endif
2454    
2455    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2456    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2457  #endif  #endif
2458    
Legend:
Removed from v.20  
changed lines
  Added in v.204