Diff of /trunk/src/main.c

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

revision 63 by harbaum, Wed Aug 19 12:35:25 2009 UTC revision 164 by harbaum, Thu Nov 5 20:37:16 2009 UTC
# Line 19  Line 19 
19  #include <string.h>  #include <string.h>
20  #include <math.h>  #include <math.h>
21    
22    #include <curl/curl.h>
23    
24  #include <time.h>  #include <time.h>
25  #include <sys/time.h>  #include <sys/time.h>
26    
# Line 29  Line 31 
31    
32  #ifdef USE_MAEMO  #ifdef USE_MAEMO
33  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
34    #if MAEMO_VERSION_MAJOR >= 5
35    #include <hildon/hildon-note.h>
36    #endif
37  #endif  #endif
38    
39  #include <locale.h>  #include <locale.h>
40    
41  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
42    
43  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
44  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
45                        gpointer user_data);                        gpointer user_data);
46    
# Line 92  void errorf(const char *fmt, ...) { Line 97  void errorf(const char *fmt, ...) {
97      }      }
98    }    }
99    
100    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
101    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
102                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
103                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
104                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,                             GTK_MESSAGE_ERROR,
105                             buf);                             GTK_BUTTONS_CLOSE, buf);
106    
107    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
108    #else
109      GtkWidget *dialog =
110        hildon_note_new_information(GTK_WINDOW(NULL), buf);
111    #endif
112    
113    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
114    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 148  gpx_t *choose_file(appdata_t *appdata, g
148    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
149    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
150      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
151    
152        if(filename) {
153          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
154    
155      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
156            gpx = gpx_parse(dialog, filename);
157      if(!whole_dir)        else {
158        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
159      else {          if(strlastchr(filename) == '/')
160        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
161        if(strlastchr(filename) == '/')  
162          filename[strlen(filename)] = 0;          gpx = gpx_parse_dir(dialog, filename);
   
       gpx = gpx_parse_dir(dialog, filename);  
     }  
   
     gpx_busy_dialog_destroy(dialog);  
   
     /* save path if gpx was successfully loaded */  
     if(gpx) {  
       char *r = strrchr(filename, '/');  
   
       /* there is a delimiter, use everything left of it as path */  
       if(r && !whole_dir) {  
         *r = 0;  
         if(appdata->path) free(appdata->path);  
         appdata->path = strdup(filename);  
         /* restore path ... just in case ... */  
         *r = '/';  
163        }        }
164    
165          gpx_busy_dialog_destroy(dialog);
166    
167          /* save path if gpx was successfully loaded */
168          if(gpx) {
169            char *r = strrchr(filename, '/');
170    
171            /* there is a delimiter, use everything left of it as path */
172            if(r && !whole_dir) {
173              *r = 0;
174              if(appdata->path) free(appdata->path);
175              appdata->path = strdup(filename);
176              /* restore path ... just in case ... */
177              *r = '/';
178            }
179    
180            if(whole_dir)
181              appdata->path = strdup(filename);
182          } else
183            errorf(_("Load error"));
184    
185        if(whole_dir)        g_free (filename);
186          appdata->path = strdup(filename);      } else {
187    #ifndef USE_MAEMO
188          errorf(_("Error accessing the file."));
189    #else
190          errorf(_("Error accessing the file. This may happen if the file "
191                   "resides on a remote file system. Please copy the file onto "
192                   "the device (e.g. onto the memory card) and try again."));
193    #endif
194      }      }
   
     g_free (filename);  
195    }    }
196    
197    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 194  enum { Line 215  enum {
215    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
216  } ;  } ;
217    
218  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
219    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
220        cache_dialog(appdata, cache);
221    #else
222        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
223        appdata->cur_view = cache_view(appdata, cache);
224        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
225        gtk_widget_show_all(appdata->vbox);
226    
227        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
228    #endif
229    }
230    
231    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
232                                     GtkTreePath        *path,                                     GtkTreePath        *path,
233                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
234                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 211  void cachelist_view_onRowActivated(GtkTr Line 245  void cachelist_view_onRowActivated(GtkTr
245    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
246      cache_t *cache;      cache_t *cache;
247      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
248  #ifndef USE_BREAD_CRUMB_TRAIL      cachelist_goto_cache(appdata, cache);
     cache_dialog(appdata, cache);  
 #else  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = cache_view(appdata, cache);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
 #endif  
249    }    }
250  }  }
251    
# Line 263  static GtkWidget *cachelist_create(appda Line 288  static GtkWidget *cachelist_create(appda
288                                     cache_t *sel_cache);                                     cache_t *sel_cache);
289    
290  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
 #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  
   
291    if(!appdata->cur_view) {    if(!appdata->cur_view) {
292      printf("cachelist redraw: no active view\n");      printf("cachelist redraw: no active view\n");
293      return;      return;
# Line 287  void cachelist_redraw(appdata_t *appdata Line 305  void cachelist_redraw(appdata_t *appdata
305    if(redraw) {    if(redraw) {
306      GtkWidget *container = appdata->vbox;      GtkWidget *container = appdata->vbox;
307    
     printf("redraw %d\n", redraw);  
   
308  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
309      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
310      container = hildon_window_stack_peek(stack);      container = hildon_window_stack_peek(stack);
# Line 315  void cachelist_redraw(appdata_t *appdata Line 331  void cachelist_redraw(appdata_t *appdata
331    
332      gtk_widget_show_all(container);      gtk_widget_show_all(container);
333    }    }
 #endif  
334  }  }
335    
336    
# Line 323  static gboolean cachelist_update(gpointe Line 338  static gboolean cachelist_update(gpointe
338    
339    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
340    
 #ifdef USE_MAEMO  
341    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
342    
343    if(appdata->cur_cache)    if(appdata->cur_cache)
344      return TRUE;      return TRUE;
345    
346    #ifdef USE_MAEMO
347    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
348      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
349        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
350    #endif
351    
352    if(appdata->cachelist_update)    if(appdata->cachelist_update)
353      cachelist_redraw(appdata);      cachelist_redraw(appdata);
 #endif  
354    
355    return TRUE;    return TRUE;
356  }  }
# Line 582  void on_cachelist_destroy(GtkWidget *wid Line 597  void on_cachelist_destroy(GtkWidget *wid
597    }    }
598    appdata->cur_gpx = NULL;    appdata->cur_gpx = NULL;
599    
600    #ifdef ENABLE_OSM_GPS_MAP
601      map_update(appdata);
602    #endif
603    
604    /* restore cur_view */    /* restore cur_view */
605    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
606  }  }
# Line 608  void cachelist_dialog(appdata_t *appdata Line 627  void cachelist_dialog(appdata_t *appdata
627                     G_CALLBACK(on_cachelist_destroy), appdata);                     G_CALLBACK(on_cachelist_destroy), appdata);
628    
629    gtk_widget_show_all(window);    gtk_widget_show_all(window);
630    
631    #ifdef ENABLE_OSM_GPS_MAP
632      map_update(appdata);
633    #endif
634  }  }
635  #endif  #endif
636  #endif  #endif
# Line 711  static void gpxlist_close(appdata_t *app Line 734  static void gpxlist_close(appdata_t *app
734    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
735  }  }
736    
737    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
738    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
739    #ifdef USE_STACKABLE_WINDOW
740      if(!appdata->cur_gpx)
741    #endif
742        cachelist_dialog(appdata, gpx);
743    #ifdef USE_STACKABLE_WINDOW
744      else
745        printf("selected gpx, but cachelist window already present\n");
746    #endif
747    #else
748      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
749      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
750      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
751      gtk_widget_show_all(appdata->vbox);
752    
753      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
754    #endif
755    }
756    
757  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
758                            GtkTreePath        *path,                            GtkTreePath        *path,
759                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 737  static void gpxlist_view_onRowActivated( Line 780  static void gpxlist_view_onRowActivated(
780      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
781        printf("clicked delete\n");        printf("clicked delete\n");
782    
783    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
784        /* ask user what he wants */        /* ask user what he wants */
785        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
786                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
787                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
788                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   GTK_MESSAGE_QUESTION,
789                     GTK_BUTTONS_CANCEL,
790                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
791                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
792    
# Line 750  static void gpxlist_view_onRowActivated( Line 795  static void gpxlist_view_onRowActivated(
795                               _("Close"), 2,                               _("Close"), 2,
796                               NULL);                               NULL);
797    
798          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
799    #else
800          GtkWidget *dialog =
801            hildon_note_new_confirmation_add_buttons(GTK_WINDOW(appdata->window),
802                      _("Do you want to close this entry only or do "
803                        "you want to remove it completely from the list?"),
804                     GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
805                      _("Remove"), 1,
806                      _("Close"), 2,
807                      NULL);
808    #endif
809    
810        if(gpx->closed)        if(gpx->closed)
811          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
812    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));  
   
813        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
814        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
815    
# Line 822  static void gpxlist_view_onRowActivated( Line 877  static void gpxlist_view_onRowActivated(
877    
878          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
879        }        }
880  #ifndef USE_BREAD_CRUMB_TRAIL  
881  #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  
882      }      }
883    }    }
884  }  }
# Line 893  static GtkWidget *gpxlist_create_view_an Line 933  static GtkWidget *gpxlist_create_view_an
933    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
934                    -1, "Icon", renderer,                    -1, "Icon", renderer,
935                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
936                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
937            /* at least one entry needs to be sensitive. */
938            /* This is the delete icon if the PANNABLE_AREA is used */
939                      "sensitive", GPXLIST_COL_OPEN,
940    #endif
941                    NULL);                    NULL);
942    
943    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 949  static GtkWidget *gpxlist_create_view_an Line 993  static GtkWidget *gpxlist_create_view_an
993    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
994                    -1, "Del", renderer,                    -1, "Del", renderer,
995                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
996                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
997                    NULL);                    NULL);
998  #endif  #endif
999    
# Line 969  static GtkWidget *gpxlist_create_view_an Line 1013  static GtkWidget *gpxlist_create_view_an
1013      GtkTreeIter         iter;      GtkTreeIter         iter;
1014      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1015      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1016    
1017      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1018        sel_iter = iter;        sel_iter = iter;
1019        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 1060  cb_menu_about(GtkWidget *window, gpointe Line 1104  cb_menu_about(GtkWidget *window, gpointe
1104    const gchar *authors[] = {    const gchar *authors[] = {
1105      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
1106      "John Stowers <john.stowers@gmail.com>",      "John Stowers <john.stowers@gmail.com>",
1107        "GCVote: Guido Wegener <guido.wegener@gmx.de>",
1108      NULL };      NULL };
1109    
1110    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
# Line 1268  gpx_t *search_do(appdata_t *appdata, gpx Line 1313  gpx_t *search_do(appdata_t *appdata, gpx
1313        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1314                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1315          hit = 1;          hit = 1;
1316        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1317                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1318          hit = 1;          hit = 1;
1319    
1320        if(hit) {        if(hit) {
# Line 1445  cb_menu_search(GtkWidget *window, gpoint Line 1490  cb_menu_search(GtkWidget *window, gpoint
1490    
1491        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1492    
1493  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1494        gpx_t *found =        gpx_t *found =
1495          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1496    
# Line 1541  cb_menu_export_log(GtkWidget *widget, gp Line 1586  cb_menu_export_log(GtkWidget *widget, gp
1586    notes_log_export(appdata);    notes_log_export(appdata);
1587  }  }
1588    
1589  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1590  static void  static void
1591  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1592    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1660  static void submenu_cleanup(GtkWidget *m Line 1705  static void submenu_cleanup(GtkWidget *m
1705  }  }
1706    
1707  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1708    #ifdef ENABLE_MAEMO_MAPPER
1709    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1710      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1711    #endif
1712    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1713      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1714    { "Export Garmin GPX",       "Save modified waypoints in GPX file",    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
# Line 1748  HildonAppMenu *menu_create(appdata_t *ap Line 1795  HildonAppMenu *menu_create(appdata_t *ap
1795    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1796    
1797  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
   if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {  
1798      button = gtk_button_new_with_label(_("Map"));      button = gtk_button_new_with_label(_("Map"));
1799      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1800                             G_CALLBACK(cb_menu_map), appdata);                             G_CALLBACK(cb_menu_map), appdata);
1801      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1802  #endif  #endif
1803    
1804  #ifdef HILDON_HELP  #ifdef HILDON_HELP
# Line 1773  void menu_create(appdata_t *appdata) { Line 1818  void menu_create(appdata_t *appdata) {
1818    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1819    menu = gtk_menu_new();    menu = gtk_menu_new();
1820    
1821  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1822    appdata->menu_import =    appdata->menu_import =
1823  #endif  #endif
1824    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1803  void menu_create(appdata_t *appdata) { Line 1848  void menu_create(appdata_t *appdata) {
1848    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1849  #endif  #endif
1850    
1851  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1852    appdata->menu_export =    appdata->menu_export =
1853  #endif  #endif
1854      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1811  void menu_create(appdata_t *appdata) { Line 1856  void menu_create(appdata_t *appdata) {
1856    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1857    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1858    
1859  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1860    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1861    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1862    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1828  void menu_create(appdata_t *appdata) { Line 1873  void menu_create(appdata_t *appdata) {
1873    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1874                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1875    
1876  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1877    appdata->menu_search =    appdata->menu_search =
1878  #endif  #endif
1879    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1837  void menu_create(appdata_t *appdata) { Line 1882  void menu_create(appdata_t *appdata) {
1882    
1883    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1884    
 #ifndef NO_COPY_N_PASTE  
1885    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1886    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1887    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1888    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1889    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 2035  gboolean on_window_key_press(GtkWidget * Line 2077  gboolean on_window_key_press(GtkWidget *
2077    return handled;    return handled;
2078  }  }
2079    
2080  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2081  typedef struct {  typedef struct {
2082    int level;    int level;
2083    appdata_t *appdata;    appdata_t *appdata;
# Line 2127  crumb_back(gpointer data) { Line 2169  crumb_back(gpointer data) {
2169    
2170    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2171    g_free(data);    g_free(data);
2172    
2173    #ifdef ENABLE_OSM_GPS_MAP
2174      map_update(crumb->appdata);
2175    #endif
2176  }  }
2177    
2178  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 2167  static void crumb_add(appdata_t *appdata Line 2213  static void crumb_add(appdata_t *appdata
2213  #endif  #endif
2214    }    }
2215    
2216    #ifdef USE_BREAD_CRUMB_TRAIL
2217    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2218                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2219    #else
2220      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2221    #endif
2222    
2223    #ifdef ENABLE_OSM_GPS_MAP
2224      map_update(appdata);
2225    #endif
2226  }  }
2227  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2228    
# Line 2180  void main_after_settings_redraw(appdata_ Line 2234  void main_after_settings_redraw(appdata_
2234      return;      return;
2235    }    }
2236    
 #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  
2237    /* 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 */
2238    /* need to be redrawn */    /* need to be redrawn */
2239    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2246  void main_after_settings_redraw(appdata_ Line 2288  void main_after_settings_redraw(appdata_
2288    
2289      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2290    }    }
 #endif // USE_MAEMO  
2291  }  }
2292    
2293  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2267  int main(int argc, char *argv[]) { Line 2308  int main(int argc, char *argv[]) {
2308    
2309    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2310    
2311      curl_global_init(CURL_GLOBAL_ALL);
2312    
2313  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2314    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2315    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2275  int main(int argc, char *argv[]) { Line 2318  int main(int argc, char *argv[]) {
2318      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2319    }    }
2320    
2321    #ifdef ENABLE_MAEMO_MAPPER
2322    dbus_register(&appdata);    dbus_register(&appdata);
2323  #endif  #endif
2324    #endif
2325    
2326    icons_init();    icons_init();
2327    
# Line 2300  int main(int argc, char *argv[]) { Line 2345  int main(int argc, char *argv[]) {
2345    /* Create a Window. */    /* Create a Window. */
2346    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2347    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2348    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2349  #endif  #endif
2350    
2351  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2313  int main(int argc, char *argv[]) { Line 2358  int main(int argc, char *argv[]) {
2358    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2359                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2360    
2361      /* prepare clipboard */
2362      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2363      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2364    
2365    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2366    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2367  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
# Line 2328  int main(int argc, char *argv[]) { Line 2377  int main(int argc, char *argv[]) {
2377    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);
2378    
2379    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2380    #else
2381    #ifdef BCT
2382      /* on non-hildon machines we use some custom made breadcrumbtrail */
2383      /* replacement */
2384      appdata.bct = bct_new();
2385      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2386    #endif
2387    #endif
2388    
2389    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2390    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2391  #endif  #endif
2392    
Legend:
Removed from v.63  
changed lines
  Added in v.164