Diff of /trunk/src/main.c

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

revision 189 by harbaum, Tue Nov 17 09:07:17 2009 UTC revision 205 by harbaum, Mon Nov 23 20:12:22 2009 UTC
# Line 33  Line 33 
33  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
34  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
35  #include <hildon/hildon-note.h>  #include <hildon/hildon-note.h>
36    #include <hildon/hildon-entry.h>
37  #include <hildon/hildon-check-button.h>  #include <hildon/hildon-check-button.h>
38  #endif  #endif
39  #endif  #endif
# Line 154  gpx_t *choose_file(appdata_t *appdata, g Line 155  gpx_t *choose_file(appdata_t *appdata, g
155        gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
156    
157        if(!whole_dir)        if(!whole_dir)
158          gpx = gpx_parse(dialog, filename);          gpx = gpx_parse(dialog, filename, appdata->username);
159        else {        else {
160          /* cur trailing '/' if present */          /* cur trailing '/' if present */
161          if(strlastchr(filename) == '/')          if(strlastchr(filename) == '/')
162            filename[strlen(filename)] = 0;            filename[strlen(filename)] = 0;
163    
164          gpx = gpx_parse_dir(dialog, filename);          gpx = gpx_parse_dir(dialog, filename, appdata->username);
165        }        }
166    
167        gpx_busy_dialog_destroy(dialog);        gpx_busy_dialog_destroy(dialog);
168    
169        /* save path if gpx was successfully loaded */        /* save path if gpx was successfully loaded */
# Line 473  static GtkWidget *cachelist_create(appda Line 474  static GtkWidget *cachelist_create(appda
474      if(tint > 8) tint = 8;      if(tint > 8) tint = 8;
475    
476      /* cache type includes "solved" flag in lowest bit */      /* cache type includes "solved" flag in lowest bit */
477      int type = (cache->type<<8) +      int type = cache->type<<8;
478        (cache->notes?4:0) +      if(cache->notes) type |= 4;
479        ((cache->notes && cache->notes->override)?1:0) +      if(cache->notes && cache->notes->override) type |= 1;
480        ((cache->notes && cache->notes->found)?2:0);      if(cache->notes && cache->notes->found) type |= 2;
481        if(cache->found) type |= 2;
482        if(cache->mine) type |= 8;
483    
484      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
485    
# Line 863  static void gpxlist_view_onRowActivated( Line 866  static void gpxlist_view_onRowActivated(
866          gpx_t *new = NULL;          gpx_t *new = NULL;
867    
868          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
869            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
870          else          else
871            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
872    
873          if(new) {          if(new) {
874            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 1450  cb_menu_search(GtkWidget *window, gpoint Line 1453  cb_menu_search(GtkWidget *window, gpoint
1453    
1454    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1455                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1456    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1457      context.entry = gtk_entry_new();
1458    #else
1459      context.entry = hildon_entry_new(HILDON_SIZE_AUTO);
1460    #endif
1461    
1462    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1463                                context.entry = gtk_entry_new());                                context.entry);
1464    
1465    if(appdata->search_str)    if(appdata->search_str)
1466      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1467    
# Line 1668  cb_menu_precpos(GtkWidget *window, gpoin Line 1678  cb_menu_precpos(GtkWidget *window, gpoin
1678    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1679  }  }
1680    
1681    static void
1682    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1683      geotoad((appdata_t *)data);
1684    }
1685    
1686  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1687  typedef struct {  typedef struct {
1688    char *label, *desc;    char *label, *desc;
# Line 1782  static const menu_entry_t submenu_tools_ Line 1797  static const menu_entry_t submenu_tools_
1797      G_CALLBACK(cb_menu_geotext) },      G_CALLBACK(cb_menu_geotext) },
1798    { "Precise Position", "Calculate a precise GPS position",    { "Precise Position", "Calculate a precise GPS position",
1799      G_CALLBACK(cb_menu_precpos) },      G_CALLBACK(cb_menu_precpos) },
1800      { "GeoToad",          "Use GeoToad online downloader",
1801        G_CALLBACK(cb_menu_geotoad) },
1802    { NULL, NULL, NULL }    { NULL, NULL, NULL }
1803  };  };
1804    
# Line 1983  void menu_create(appdata_t *appdata) { Line 2000  void menu_create(appdata_t *appdata) {
2000    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2001                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2002    
2003      item = gtk_menu_item_new_with_label( _("GeoToad") );
2004      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2005      g_signal_connect(item, "activate",
2006                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2007    
2008    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2009    
2010  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
Legend:
Removed from v.189  
changed lines
  Added in v.205