Diff of /trunk/src/main.c

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

revision 50 by harbaum, Wed Aug 12 09:31:09 2009 UTC revision 74 by harbaum, Mon Aug 24 09:23:36 2009 UTC
# Line 168  gpx_t *choose_file(appdata_t *appdata, g Line 168  gpx_t *choose_file(appdata_t *appdata, g
168    
169        if(whole_dir)        if(whole_dir)
170          appdata->path = strdup(filename);          appdata->path = strdup(filename);
171      }      } else
172          errorf(_("Load error"));
173    
174      g_free (filename);      g_free (filename);
175    }    }
# Line 966  static GtkWidget *gpxlist_create_view_an Line 967  static GtkWidget *gpxlist_create_view_an
967    GtkTreeIter sel_iter;    GtkTreeIter sel_iter;
968    gboolean sel_iter_valid = FALSE;    gboolean sel_iter_valid = FALSE;
969    while(gpx) {    while(gpx) {
970      GtkTreeIter         iter;      /* don't display entries that failed at load */
971      gtk_list_store_append(appdata->gpxstore, &iter);      if(!gpx->failed) {
972      gpxlist_set(appdata->gpxstore, &iter, gpx);        GtkTreeIter         iter;
973          gtk_list_store_append(appdata->gpxstore, &iter);
974      if(gpx == sel_gpx) {        gpxlist_set(appdata->gpxstore, &iter, gpx);
975        sel_iter = iter;  
976        sel_iter_valid = TRUE;        if(gpx == sel_gpx) {
977            sel_iter = iter;
978            sel_iter_valid = TRUE;
979          }
980      }      }
981    
982      gpx = gpx->next;      gpx = gpx->next;
# Line 1868  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    
   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);  
   
1875  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
1876    item = gtk_menu_item_new_with_label( _("Map") );    item = gtk_menu_item_new_with_label( _("Map") );
1877    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1878    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1879                     GTK_SIGNAL_FUNC(cb_menu_map), appdata);                     GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1880  #endif  #endif
1881    
1882      item = gtk_menu_item_new_with_label(_("Tools"));
1883      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1884      submenu = gtk_menu_new();
1885      gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1886    
1887    item = gtk_menu_item_new_with_label( _("Geomath") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1888    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1889    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
Legend:
Removed from v.50  
changed lines
  Added in v.74