Diff of /trunk/src/main.c

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

revision 74 by harbaum, Mon Aug 24 09:23:36 2009 UTC revision 123 by harbaum, Wed Sep 23 11:23:45 2009 UTC
# Line 95  void errorf(const char *fmt, ...) { Line 95  void errorf(const char *fmt, ...) {
95    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
96                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
97                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
98                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
99                             buf);                             GTK_MESSAGE_ERROR,
100    #else
101                               GTK_MESSAGE_OTHER,
102    #endif
103                               GTK_BUTTONS_CLOSE, buf);
104    
105    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
106    
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 142  gpx_t *choose_file(appdata_t *appdata, g
142    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
143    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
144      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
145    
146        if(filename) {
147          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
148    
149      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
150            gpx = gpx_parse(dialog, filename);
151      if(!whole_dir)        else {
152        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
153      else {          if(strlastchr(filename) == '/')
154        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
155        if(strlastchr(filename) == '/')  
156          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 = '/';  
157        }        }
158    
159          gpx_busy_dialog_destroy(dialog);
160    
161          /* save path if gpx was successfully loaded */
162          if(gpx) {
163            char *r = strrchr(filename, '/');
164    
165            /* there is a delimiter, use everything left of it as path */
166            if(r && !whole_dir) {
167              *r = 0;
168              if(appdata->path) free(appdata->path);
169              appdata->path = strdup(filename);
170              /* restore path ... just in case ... */
171              *r = '/';
172            }
173    
174            if(whole_dir)
175              appdata->path = strdup(filename);
176          } else
177            errorf(_("Load error"));
178    
179        if(whole_dir)        g_free (filename);
180          appdata->path = strdup(filename);      } else {
181      } else  #ifndef USE_MAEMO
182        errorf(_("Load error"));        errorf(_("Error accessing the file."));
183    #else
184      g_free (filename);        errorf(_("Error accessing the file. This may happen if the file "
185                   "resides on a remote file system. Please copy the file onto "
186                   "the device (e.g. onto the memory card) and try again."));
187    #endif
188        }
189    }    }
190    
191    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 336  static gboolean cachelist_update(gpointe Line 350  static gboolean cachelist_update(gpointe
350    
351    if(appdata->cachelist_update)    if(appdata->cachelist_update)
352      cachelist_redraw(appdata);      cachelist_redraw(appdata);
353    
354  #endif  #endif
355    
356    return TRUE;    return TRUE;
# Line 967  static GtkWidget *gpxlist_create_view_an Line 982  static GtkWidget *gpxlist_create_view_an
982    GtkTreeIter sel_iter;    GtkTreeIter sel_iter;
983    gboolean sel_iter_valid = FALSE;    gboolean sel_iter_valid = FALSE;
984    while(gpx) {    while(gpx) {
985      /* don't display entries that failed at load */      GtkTreeIter         iter;
986      if(!gpx->failed) {      gtk_list_store_append(appdata->gpxstore, &iter);
987        GtkTreeIter         iter;      gpxlist_set(appdata->gpxstore, &iter, gpx);
988        gtk_list_store_append(appdata->gpxstore, &iter);  
989        gpxlist_set(appdata->gpxstore, &iter, gpx);      if(gpx == sel_gpx) {
990          sel_iter = iter;
991        if(gpx == sel_gpx) {        sel_iter_valid = TRUE;
         sel_iter = iter;  
         sel_iter_valid = TRUE;  
       }  
992      }      }
993    
994      gpx = gpx->next;      gpx = gpx->next;
# Line 1545  cb_menu_export_log(GtkWidget *widget, gp Line 1557  cb_menu_export_log(GtkWidget *widget, gp
1557    notes_log_export(appdata);    notes_log_export(appdata);
1558  }  }
1559    
1560  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1561  static void  static void
1562  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1563    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1664  static void submenu_cleanup(GtkWidget *m Line 1676  static void submenu_cleanup(GtkWidget *m
1676  }  }
1677    
1678  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1679    #ifdef ENABLE_MAEMO_MAPPER
1680    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1681      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1682    #endif
1683    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1684      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1685    { "Export Garmin GPX",       "Save modified waypoints in GPX file",    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
# Line 1752  HildonAppMenu *menu_create(appdata_t *ap Line 1766  HildonAppMenu *menu_create(appdata_t *ap
1766    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1767    
1768  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
   if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {  
1769      button = gtk_button_new_with_label(_("Map"));      button = gtk_button_new_with_label(_("Map"));
1770      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1771                             G_CALLBACK(cb_menu_map), appdata);                             G_CALLBACK(cb_menu_map), appdata);
1772      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1773  #endif  #endif
1774    
1775  #ifdef HILDON_HELP  #ifdef HILDON_HELP
# Line 1815  void menu_create(appdata_t *appdata) { Line 1827  void menu_create(appdata_t *appdata) {
1827    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1828    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1829    
1830  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1831    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1832    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1833    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 2279  int main(int argc, char *argv[]) { Line 2291  int main(int argc, char *argv[]) {
2291      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2292    }    }
2293    
2294    #ifdef ENABLE_MAEMO_MAPPER
2295    dbus_register(&appdata);    dbus_register(&appdata);
2296  #endif  #endif
2297    #endif
2298    
2299    icons_init();    icons_init();
2300    
Legend:
Removed from v.74  
changed lines
  Added in v.123