Diff of /trunk/src/main.c

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

revision 32 by harbaum, Tue Jul 28 13:21:22 2009 UTC revision 157 by harbaum, Tue Nov 3 20:20:39 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 35  Line 37 
37    
38  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
39    
40  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
41  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
42                        gpointer user_data);                        gpointer user_data);
43    
# Line 95  void errorf(const char *fmt, ...) { Line 97  void errorf(const char *fmt, ...) {
97    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
98                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
99                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
100                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
101                             buf);                             GTK_MESSAGE_ERROR,
102    #else
103                               GTK_MESSAGE_OTHER,
104    #endif
105                               GTK_BUTTONS_CLOSE, buf);
106    
107    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
108    
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 144  gpx_t *choose_file(appdata_t *appdata, g
144    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
145    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
146      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
147    
148        if(filename) {
149          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
150    
151      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
152            gpx = gpx_parse(dialog, filename);
153      if(!whole_dir)        else {
154        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
155      else {          if(strlastchr(filename) == '/')
156        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
157        if(strlastchr(filename) == '/')  
158          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 = '/';  
159        }        }
160    
161          gpx_busy_dialog_destroy(dialog);
162    
163          /* save path if gpx was successfully loaded */
164          if(gpx) {
165            char *r = strrchr(filename, '/');
166    
167            /* there is a delimiter, use everything left of it as path */
168            if(r && !whole_dir) {
169              *r = 0;
170              if(appdata->path) free(appdata->path);
171              appdata->path = strdup(filename);
172              /* restore path ... just in case ... */
173              *r = '/';
174            }
175    
176            if(whole_dir)
177              appdata->path = strdup(filename);
178          } else
179            errorf(_("Load error"));
180    
181        if(whole_dir)        g_free (filename);
182          appdata->path = strdup(filename);      } else {
183    #ifndef USE_MAEMO
184          errorf(_("Error accessing the file."));
185    #else
186          errorf(_("Error accessing the file. This may happen if the file "
187                   "resides on a remote file system. Please copy the file onto "
188                   "the device (e.g. onto the memory card) and try again."));
189    #endif
190      }      }
   
     g_free (filename);  
191    }    }
192    
193    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 194  enum { Line 211  enum {
211    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
212  } ;  } ;
213    
214  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
215    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
216        cache_dialog(appdata, cache);
217    #else
218        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
219        appdata->cur_view = cache_view(appdata, cache);
220        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
221        gtk_widget_show_all(appdata->vbox);
222    
223        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
224    #endif
225    }
226    
227    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
228                                     GtkTreePath        *path,                                     GtkTreePath        *path,
229                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
230                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 232  void cachelist_view_onRowActivated(GtkTr
232    GtkTreeIter   iter;    GtkTreeIter   iter;
233    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
234    
235    #ifdef USE_MAEMO
236      /* check if a cache is already selected and ignore click if yes */
237      /* (was probably a double click) */
238      if(appdata->cur_cache) return;
239    #endif
240    
241    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
242      cache_t *cache;      cache_t *cache;
243      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
244  #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  
245    }    }
246  }  }
247    
# Line 257  static GtkWidget *cachelist_create(appda Line 284  static GtkWidget *cachelist_create(appda
284                                     cache_t *sel_cache);                                     cache_t *sel_cache);
285    
286  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  
   
287    if(!appdata->cur_view) {    if(!appdata->cur_view) {
288      printf("cachelist redraw: no active view\n");      printf("cachelist redraw: no active view\n");
289      return;      return;
# Line 281  void cachelist_redraw(appdata_t *appdata Line 301  void cachelist_redraw(appdata_t *appdata
301    if(redraw) {    if(redraw) {
302      GtkWidget *container = appdata->vbox;      GtkWidget *container = appdata->vbox;
303    
     printf("redraw %d\n", redraw);  
   
304  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
305      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
306      container = hildon_window_stack_peek(stack);      container = hildon_window_stack_peek(stack);
# Line 309  void cachelist_redraw(appdata_t *appdata Line 327  void cachelist_redraw(appdata_t *appdata
327    
328      gtk_widget_show_all(container);      gtk_widget_show_all(container);
329    }    }
 #endif  
330  }  }
331    
332    
# Line 317  static gboolean cachelist_update(gpointe Line 334  static gboolean cachelist_update(gpointe
334    
335    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
336    
 #ifdef USE_MAEMO  
337    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
338    
339    if(appdata->cur_cache)    if(appdata->cur_cache)
340      return TRUE;      return TRUE;
341    
342    #ifdef USE_MAEMO
343    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
344      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
345        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
346    #endif
347    
348    if(appdata->cachelist_update)    if(appdata->cachelist_update)
349      cachelist_redraw(appdata);      cachelist_redraw(appdata);
 #endif  
350    
351    return TRUE;    return TRUE;
352  }  }
# Line 576  void on_cachelist_destroy(GtkWidget *wid Line 593  void on_cachelist_destroy(GtkWidget *wid
593    }    }
594    appdata->cur_gpx = NULL;    appdata->cur_gpx = NULL;
595    
596    #ifdef ENABLE_OSM_GPS_MAP
597      map_update(appdata);
598    #endif
599    
600    /* restore cur_view */    /* restore cur_view */
601    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
602  }  }
# Line 587  void cachelist_dialog(appdata_t *appdata Line 608  void cachelist_dialog(appdata_t *appdata
608    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
609    
610    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
611    char *title = g_strdup_printf("GPXView - %s", gpx->name);    char *title = g_strdup_printf("%s - GPXView", gpx->name);
612    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
613    g_free(title);    g_free(title);
614    
# Line 602  void cachelist_dialog(appdata_t *appdata Line 623  void cachelist_dialog(appdata_t *appdata
623                     G_CALLBACK(on_cachelist_destroy), appdata);                     G_CALLBACK(on_cachelist_destroy), appdata);
624    
625    gtk_widget_show_all(window);    gtk_widget_show_all(window);
626    
627    #ifdef ENABLE_OSM_GPS_MAP
628      map_update(appdata);
629    #endif
630  }  }
631  #endif  #endif
632  #endif  #endif
# Line 705  static void gpxlist_close(appdata_t *app Line 730  static void gpxlist_close(appdata_t *app
730    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
731  }  }
732    
733    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
734    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
735    #ifdef USE_STACKABLE_WINDOW
736      if(!appdata->cur_gpx)
737    #endif
738        cachelist_dialog(appdata, gpx);
739    #ifdef USE_STACKABLE_WINDOW
740      else
741        printf("selected gpx, but cachelist window already present\n");
742    #endif
743    #else
744      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
745      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
746      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
747      gtk_widget_show_all(appdata->vbox);
748    
749      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
750    #endif
751    }
752    
753  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
754                            GtkTreePath        *path,                            GtkTreePath        *path,
755                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 713  static void gpxlist_view_onRowActivated( Line 758  static void gpxlist_view_onRowActivated(
758    GtkTreeIter   iter;    GtkTreeIter   iter;
759    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
760    
761    #ifdef USE_MAEMO
762      /* check if a cache is already selected and ignore click if yes */
763      /* (was probably a double click) */
764      if(appdata->cur_gpx) return;
765    #endif
766    
767    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
768      gpx_t *gpx;      gpx_t *gpx;
769      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 729  static void gpxlist_view_onRowActivated( Line 780  static void gpxlist_view_onRowActivated(
780        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
781                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
782                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
783                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   /* this doesn't fix the text selection issues ... */
784    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >=5)
785                     GTK_MESSAGE_OTHER,
786    #else
787                     GTK_MESSAGE_QUESTION,
788    #endif
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 741  static void gpxlist_view_onRowActivated( Line 798  static void gpxlist_view_onRowActivated(
798        if(gpx->closed)        if(gpx->closed)
799          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
800    
801        gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));        gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
802    
803        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
804        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
# Line 810  static void gpxlist_view_onRowActivated( Line 867  static void gpxlist_view_onRowActivated(
867    
868          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
869        }        }
870  #ifndef USE_BREAD_CRUMB_TRAIL  
871  #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  
872      }      }
873    }    }
874  }  }
# Line 881  static GtkWidget *gpxlist_create_view_an Line 923  static GtkWidget *gpxlist_create_view_an
923    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
924                    -1, "Icon", renderer,                    -1, "Icon", renderer,
925                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
926                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
927            /* at least one entry needs to be sensitive. */
928            /* This is the delete icon if the PANNABLE_AREA is used */
929                      "sensitive", GPXLIST_COL_OPEN,
930    #endif
931                    NULL);                    NULL);
932    
933    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 937  static GtkWidget *gpxlist_create_view_an Line 983  static GtkWidget *gpxlist_create_view_an
983    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
984                    -1, "Del", renderer,                    -1, "Del", renderer,
985                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
986                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
987                    NULL);                    NULL);
988  #endif  #endif
989    
# Line 957  static GtkWidget *gpxlist_create_view_an Line 1003  static GtkWidget *gpxlist_create_view_an
1003      GtkTreeIter         iter;      GtkTreeIter         iter;
1004      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1005      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1006    
1007      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1008        sel_iter = iter;        sel_iter = iter;
1009        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 1017  static void gpxlist_add(appdata_t *appda Line 1063  static void gpxlist_add(appdata_t *appda
1063    
1064  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1065    
1066    typedef struct {
1067      appdata_t *appdata;
1068      GtkWidget *dialog;
1069    } about_context_t;
1070    
1071    #ifdef ENABLE_BROWSER_INTERFACE
1072    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1073      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1074      browser_url(context->appdata,
1075                  "https://www.paypal.com/cgi-bin/webscr"
1076                  "?cmd=_s-xclick&hosted_button_id=7400558");
1077    }
1078    #endif
1079    
1080  static void  static void
1081  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1082    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1083    
1084    gtk_about_dialog_set_name(about, "GPXView");    context.appdata = (appdata_t *)data;
   gtk_about_dialog_set_version(about, VERSION);  
1085    
1086  #ifdef ENABLE_LIBLOCATION  #ifdef ENABLE_LIBLOCATION
1087    char *uses = "uses liblocation";    char *uses = "uses liblocation";
# Line 1032  cb_menu_about(GtkWidget *window, gpointe Line 1091  cb_menu_about(GtkWidget *window, gpointe
1091    char *uses = "uses gpsd";    char *uses = "uses gpsd";
1092  #endif  #endif
1093    
1094    char *str = g_strdup_printf("%s\n\n(%s)",    const gchar *authors[] = {
1095                        _("GPXView (c) 2008-2009 by\n"      "Till Harbaum <till@harbaum.org>",
1096                          "Till Harbaum <till@harbaum.org>\n"      "John Stowers <john.stowers@gmail.com>",
1097                          "Mailing list: gpxview-users@garage.maemo.org"),      "GCVote: Guido Wegener <guido.wegener@gmx.de>",
1098                        _(uses)      NULL };
1099                        );  
1100      context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1101    gtk_about_dialog_set_copyright(about, str);                          "name", "GPXView",
1102    g_free(str);                          "version", VERSION,
1103                            "copyright", _("Copyright 2008-2009"),
1104    gtk_about_dialog_set_website(about,                          "authors", authors,
1105         _("http://www.harbaum.org/till/maemo"));                          "website", _("http://www.harbaum.org/till/maemo"),
1106                            "comments", _(uses),
1107    gtk_about_dialog_set_comments(about,                          NULL);
1108         _("Geocaching.com GPX file viewer"));  
1109    #ifdef ENABLE_BROWSER_INTERFACE
1110    gtk_widget_show_all(GTK_WIDGET(about));    /* add a way to donate to the project */
1111    gtk_dialog_run(GTK_DIALOG(about));    GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1112    gtk_widget_destroy(GTK_WIDGET(about));  
1113      GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1114      gtk_box_pack_start(GTK_BOX(hbox),
1115                         gtk_label_new(_("Do you like GPXView?")),
1116                         FALSE, FALSE, 0);
1117    
1118      GtkWidget *button = gtk_button_new();
1119      gtk_button_set_image(GTK_BUTTON(button),
1120                           icon_get_widget(ICON_MISC, 8));
1121      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1122      g_signal_connect(button, "clicked",
1123                       G_CALLBACK(on_paypal_button_clicked), &context);
1124      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1125    
1126      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1127      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1128                                  alignment);
1129    
1130      gtk_widget_show_all(alignment);
1131    #endif
1132    
1133      gtk_dialog_run(GTK_DIALOG(context.dialog));
1134      gtk_widget_destroy(context.dialog);
1135  }  }
1136    
1137  #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 1303  gpx_t *search_do(appdata_t *appdata, gpx
1303        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1304                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1305          hit = 1;          hit = 1;
1306        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1307                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1308          hit = 1;          hit = 1;
1309    
1310        if(hit) {        if(hit) {
# Line 1399  cb_menu_search(GtkWidget *window, gpoint Line 1480  cb_menu_search(GtkWidget *window, gpoint
1480    
1481        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1482    
1483  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1484        gpx_t *found =        gpx_t *found =
1485          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1486    
# Line 1433  cb_menu_search(GtkWidget *window, gpoint Line 1514  cb_menu_search(GtkWidget *window, gpoint
1514      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1515  }  }
1516    
1517  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1518    
1519  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1520  static void  static void
# Line 1495  cb_menu_export_log(GtkWidget *widget, gp Line 1576  cb_menu_export_log(GtkWidget *widget, gp
1576    notes_log_export(appdata);    notes_log_export(appdata);
1577  }  }
1578    
1579  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1580  static void  static void
1581  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1582    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1614  static void submenu_cleanup(GtkWidget *m Line 1695  static void submenu_cleanup(GtkWidget *m
1695  }  }
1696    
1697  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1698    #ifdef ENABLE_MAEMO_MAPPER
1699    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1700      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1701    #endif
1702    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1703      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1704    { "Export Garmin GPX",       "Save modified waypoints in GPX file",    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
# Line 1637  void on_export_clicked(GtkButton *button Line 1720  void on_export_clicked(GtkButton *button
1720  }  }
1721    
1722  static const menu_entry_t submenu_tools_entries[] = {  static const menu_entry_t submenu_tools_entries[] = {
 #ifdef ENABLE_OSM_GPS_MAP  
   { "Map",              "Display an interactive world map",  
     G_CALLBACK(cb_menu_map) },  
 #endif  
1723    { "Geomath",          "Geocoordinate calculation",    { "Geomath",          "Geocoordinate calculation",
1724      G_CALLBACK(cb_menu_geomath) },      G_CALLBACK(cb_menu_geomath) },
1725    { "Geotext",          "Text analysis",    { "Geotext",          "Text analysis",
# Line 1688  HildonAppMenu *menu_create(appdata_t *ap Line 1767  HildonAppMenu *menu_create(appdata_t *ap
1767      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1768                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1769      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1770    
   if(mode == MENU_GPXLIST) {  
1771      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1772      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1773                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1707  HildonAppMenu *menu_create(appdata_t *ap Line 1784  HildonAppMenu *menu_create(appdata_t *ap
1784                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1785    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1786    
1787    #ifdef ENABLE_OSM_GPS_MAP
1788        button = gtk_button_new_with_label(_("Map"));
1789        g_signal_connect_after(button, "clicked",
1790                               G_CALLBACK(cb_menu_map), appdata);
1791        hildon_app_menu_append(menu, GTK_BUTTON(button));
1792    #endif
1793    
1794  #ifdef HILDON_HELP  #ifdef HILDON_HELP
1795    button = gtk_button_new_with_label(_("Help"));    button = gtk_button_new_with_label(_("Help"));
1796    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
# Line 1724  void menu_create(appdata_t *appdata) { Line 1808  void menu_create(appdata_t *appdata) {
1808    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1809    menu = gtk_menu_new();    menu = gtk_menu_new();
1810    
1811  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1812    appdata->menu_import =    appdata->menu_import =
1813  #endif  #endif
1814    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1754  void menu_create(appdata_t *appdata) { Line 1838  void menu_create(appdata_t *appdata) {
1838    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1839  #endif  #endif
1840    
1841  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1842    appdata->menu_export =    appdata->menu_export =
1843  #endif  #endif
1844      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1762  void menu_create(appdata_t *appdata) { Line 1846  void menu_create(appdata_t *appdata) {
1846    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1847    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1848    
1849  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1850    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1851    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1852    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1779  void menu_create(appdata_t *appdata) { Line 1863  void menu_create(appdata_t *appdata) {
1863    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1864                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1865    
1866  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1867    appdata->menu_search =    appdata->menu_search =
1868  #endif  #endif
1869    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1788  void menu_create(appdata_t *appdata) { Line 1872  void menu_create(appdata_t *appdata) {
1872    
1873    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1874    
 #ifndef NO_COPY_N_PASTE  
1875    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1876    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1877    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1878    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1879    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1819  void menu_create(appdata_t *appdata) { Line 1900  void menu_create(appdata_t *appdata) {
1900    
1901    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1902    
   item = gtk_menu_item_new_with_label(_("Tools"));  
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
   submenu = gtk_menu_new();  
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);  
   
1903  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
1904    item = gtk_menu_item_new_with_label( _("Map") );    item = gtk_menu_item_new_with_label( _("Map") );
1905    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1906    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1907                     GTK_SIGNAL_FUNC(cb_menu_map), appdata);                     GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1908  #endif  #endif
1909    
1910      item = gtk_menu_item_new_with_label(_("Tools"));
1911      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1912      submenu = gtk_menu_new();
1913      gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1914    
1915    item = gtk_menu_item_new_with_label( _("Geomath") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1916    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1917    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1923  void cleanup(appdata_t *appdata) { Line 2004  void cleanup(appdata_t *appdata) {
2004    puts("everything is gone");    puts("everything is gone");
2005  }  }
2006    
2007  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2008    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2009    
2010    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 1986  gboolean on_window_key_press(GtkWidget * Line 2067  gboolean on_window_key_press(GtkWidget *
2067    return handled;    return handled;
2068  }  }
2069    
2070  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2071  typedef struct {  typedef struct {
2072    int level;    int level;
2073    appdata_t *appdata;    appdata_t *appdata;
# Line 2078  crumb_back(gpointer data) { Line 2159  crumb_back(gpointer data) {
2159    
2160    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2161    g_free(data);    g_free(data);
2162    
2163    #ifdef ENABLE_OSM_GPS_MAP
2164      map_update(crumb->appdata);
2165    #endif
2166  }  }
2167    
2168  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 2118  static void crumb_add(appdata_t *appdata Line 2203  static void crumb_add(appdata_t *appdata
2203  #endif  #endif
2204    }    }
2205    
2206    #ifdef USE_BREAD_CRUMB_TRAIL
2207    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2208                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2209    #else
2210      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2211    #endif
2212    
2213    #ifdef ENABLE_OSM_GPS_MAP
2214      map_update(appdata);
2215    #endif
2216  }  }
2217  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2218    
# Line 2131  void main_after_settings_redraw(appdata_ Line 2224  void main_after_settings_redraw(appdata_
2224      return;      return;
2225    }    }
2226    
 #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  
2227    /* 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 */
2228    /* need to be redrawn */    /* need to be redrawn */
2229    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2197  void main_after_settings_redraw(appdata_ Line 2278  void main_after_settings_redraw(appdata_
2278    
2279      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2280    }    }
 #endif // USE_MAEMO  
2281  }  }
2282    
2283  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2218  int main(int argc, char *argv[]) { Line 2298  int main(int argc, char *argv[]) {
2298    
2299    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2300    
2301      curl_global_init(CURL_GLOBAL_ALL);
2302    
2303  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2304    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2305    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2226  int main(int argc, char *argv[]) { Line 2308  int main(int argc, char *argv[]) {
2308      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2309    }    }
2310    
2311    #ifdef ENABLE_MAEMO_MAPPER
2312    dbus_register(&appdata);    dbus_register(&appdata);
2313  #endif  #endif
2314    #endif
2315    
2316    icons_init();    icons_init();
2317    
# Line 2251  int main(int argc, char *argv[]) { Line 2335  int main(int argc, char *argv[]) {
2335    /* Create a Window. */    /* Create a Window. */
2336    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2337    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2338    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2339  #endif  #endif
2340    
2341  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2264  int main(int argc, char *argv[]) { Line 2348  int main(int argc, char *argv[]) {
2348    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2349                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2350    
2351      /* prepare clipboard */
2352      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2353      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2354    
2355    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2356    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2357  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
# Line 2279  int main(int argc, char *argv[]) { Line 2367  int main(int argc, char *argv[]) {
2367    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);
2368    
2369    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2370    #else
2371    #ifdef BCT
2372      /* on non-hildon machines we use some custom made breadcrumbtrail */
2373      /* replacement */
2374      appdata.bct = bct_new();
2375      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2376    #endif
2377    #endif
2378    
2379    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2380    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2381  #endif  #endif
2382    
Legend:
Removed from v.32  
changed lines
  Added in v.157