Diff of /trunk/src/main.c

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

revision 190 by harbaum, Tue Nov 17 10:22:41 2009 UTC revision 226 by harbaum, Wed Dec 2 20:05:52 2009 UTC
# Line 15  Line 15 
15   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
16   */   */
17    
18  #include <stdio.h>  #define __USE_GNU
19  #include <string.h>  #include <string.h>
20    
21    #include <stdio.h>
22  #include <math.h>  #include <math.h>
23    
24  #include <curl/curl.h>  #include <curl/curl.h>
# Line 155  gpx_t *choose_file(appdata_t *appdata, g Line 157  gpx_t *choose_file(appdata_t *appdata, g
157        gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
158    
159        if(!whole_dir)        if(!whole_dir)
160          gpx = gpx_parse(dialog, filename);          gpx = gpx_parse(dialog, filename, appdata->username);
161        else {        else {
162          /* cur trailing '/' if present */          /* cur trailing '/' if present */
163          if(strlastchr(filename) == '/')          if(strlastchr(filename) == '/')
164            filename[strlen(filename)] = 0;            filename[strlen(filename)] = 0;
165    
166          gpx = gpx_parse_dir(dialog, filename);          gpx = gpx_parse_dir(dialog, filename, appdata->username);
167        }        }
168    
169        gpx_busy_dialog_destroy(dialog);        gpx_busy_dialog_destroy(dialog);
170    
171        /* save path if gpx was successfully loaded */        /* save path if gpx was successfully loaded */
# Line 221  void cachelist_goto_cache(appdata_t *app Line 223  void cachelist_goto_cache(appdata_t *app
223  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
224      cache_dialog(appdata, cache);      cache_dialog(appdata, cache);
225  #else  #else
226        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
227    
228      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
229      appdata->cur_view = cache_view(appdata, cache);      appdata->cur_view = cache_view(appdata, cache);
230      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
231      gtk_widget_show_all(appdata->vbox);      gtk_widget_show_all(appdata->vbox);
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
232  #endif  #endif
233  }  }
234    
# Line 474  static GtkWidget *cachelist_create(appda Line 476  static GtkWidget *cachelist_create(appda
476      if(tint > 8) tint = 8;      if(tint > 8) tint = 8;
477    
478      /* cache type includes "solved" flag in lowest bit */      /* cache type includes "solved" flag in lowest bit */
479      int type = (cache->type<<8) +      int type = cache->type<<8;
480        (cache->notes?4:0) +      if(cache->notes) type |= 4;
481        ((cache->notes && cache->notes->override)?1:0) +      if(cache->notes && cache->notes->override) type |= 1;
482        ((cache->notes && cache->notes->found)?2:0);      if(cache->notes && cache->notes->found) type |= 2;
483        if(cache->found) type |= 2;
484        if(cache->mine) type |= 8;
485    
486      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
487    
# Line 593  void cachelist_dialog(appdata_t *appdata Line 597  void cachelist_dialog(appdata_t *appdata
597  static void search_result_free(gpx_t *result);  static void search_result_free(gpx_t *result);
598    
599  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
600      printf("cachelist destroy\n");
601    
602      HildonWindowStack *stack = hildon_window_stack_get_default();
603      appdata->window = HILDON_WINDOW(hildon_window_stack_peek(stack));
604    
605    if(appdata->search_results) {    if(appdata->search_results) {
606      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
607      appdata->search_results = NULL;      appdata->search_results = NULL;
# Line 609  void on_cachelist_destroy(GtkWidget *wid Line 618  void on_cachelist_destroy(GtkWidget *wid
618    
619  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
620    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
621      appdata->window = HILDON_WINDOW(window);
622    
623    /* store last "cur_view" in window */    /* store last "cur_view" in window */
624    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
625    
# Line 665  static GdkPixbuf *gpx_icon_get(gpx_t *gp Line 675  static GdkPixbuf *gpx_icon_get(gpx_t *gp
675    return icon_get(ICON_FILE, 0);    return icon_get(ICON_FILE, 0);
676  }  }
677    
678  static void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {  void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {
679    char date_str[32], cnum[32];    char date_str[32], cnum[32];
680    
681    if(gpx->year && gpx->month && gpx->day) {    if(gpx->year && gpx->month && gpx->day) {
# Line 864  static void gpxlist_view_onRowActivated( Line 874  static void gpxlist_view_onRowActivated(
874          gpx_t *new = NULL;          gpx_t *new = NULL;
875    
876          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
877            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
878          else          else
879            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
880    
881          if(new) {          if(new) {
882            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 908  static void gpxlist_view_onRowActivated( Line 918  static void gpxlist_view_onRowActivated(
918    }    }
919  }  }
920    
921    /* search gpx file in gpx list */
922    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx) {
923      GtkTreeModel *model =
924        gtk_tree_view_get_model(GTK_TREE_VIEW(appdata->gpxview));
925    
926      gboolean found =
927        gtk_tree_model_get_iter_first(model, iter);
928    
929      while(found) {
930        gpx_t *this_gpx;
931        gtk_tree_model_get(model, iter, GPXLIST_COL_DATA, &this_gpx, -1);
932    
933        if(gpx == this_gpx)
934          return TRUE;
935    
936        found = gtk_tree_model_iter_next(model, iter);
937      }
938    
939      return FALSE;
940    }
941    
942    
943  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
944  static gboolean  static gboolean
945  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
# Line 1082  static GtkWidget *gpxlist_create_view_an Line 1114  static GtkWidget *gpxlist_create_view_an
1114  }  }
1115    
1116  /* add last entry in gpx list to visual representation */  /* add last entry in gpx list to visual representation */
1117  static void gpxlist_add(appdata_t *appdata, gpx_t *new) {  void gpxlist_add(appdata_t *appdata, gpx_t *new) {
1118    GtkTreeIter         iter;    GtkTreeIter         iter;
1119    
1120    gtk_list_store_append(appdata->gpxstore, &iter);    gtk_list_store_append(appdata->gpxstore, &iter);
# Line 1092  static void gpxlist_add(appdata_t *appda Line 1124  static void gpxlist_add(appdata_t *appda
1124    gpx_t **gpx = &appdata->gpx;    gpx_t **gpx = &appdata->gpx;
1125    while(*gpx) gpx = &((*gpx)->next);    while(*gpx) gpx = &((*gpx)->next);
1126    *gpx = new;    *gpx = new;
1127    
1128      /* select new iter */
1129      GtkTreeSelection *selection =
1130        gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1131      gtk_tree_selection_select_iter(selection, &iter);
1132      GtkTreePath *path =
1133        gtk_tree_model_get_path(GTK_TREE_MODEL(appdata->gpxstore), &iter);
1134      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(appdata->gpxview),
1135                                   path, NULL, TRUE, 0.0, 0.0);
1136      gtk_tree_path_free(path);
1137  }  }
1138    
1139  /******************** end of gpxlist ********************/  /******************** end of gpxlist ********************/
# Line 1451  cb_menu_search(GtkWidget *window, gpoint Line 1493  cb_menu_search(GtkWidget *window, gpoint
1493    
1494    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1495                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1496  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)    context.entry = entry_new();
   context.entry = gtk_entry_new();  
 #else  
   context.entry = hildon_entry_new(HILDON_SIZE_AUTO);  
 #endif  
   
1497    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1498                                context.entry);                                context.entry);
1499    
# Line 1676  cb_menu_precpos(GtkWidget *window, gpoin Line 1713  cb_menu_precpos(GtkWidget *window, gpoin
1713    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1714  }  }
1715    
1716    static void
1717    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1718      geotoad((appdata_t *)data);
1719    }
1720    
1721  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1722  typedef struct {  typedef struct {
1723    char *label, *desc;    char *label, *desc;
# Line 1790  static const menu_entry_t submenu_tools_ Line 1832  static const menu_entry_t submenu_tools_
1832      G_CALLBACK(cb_menu_geotext) },      G_CALLBACK(cb_menu_geotext) },
1833    { "Precise Position", "Calculate a precise GPS position",    { "Precise Position", "Calculate a precise GPS position",
1834      G_CALLBACK(cb_menu_precpos) },      G_CALLBACK(cb_menu_precpos) },
1835      { "GeoToad",          "Use GeoToad online downloader",
1836        G_CALLBACK(cb_menu_geotoad) },
1837    { NULL, NULL, NULL }    { NULL, NULL, NULL }
1838  };  };
1839    
# Line 1991  void menu_create(appdata_t *appdata) { Line 2035  void menu_create(appdata_t *appdata) {
2035    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2036                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2037    
2038      item = gtk_menu_item_new_with_label( _("GeoToad") );
2039      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2040      g_signal_connect(item, "activate",
2041                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2042    
2043    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2044    
2045  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 2030  void menu_create(appdata_t *appdata) { Line 2079  void menu_create(appdata_t *appdata) {
2079  /********************* end of menu **********************/  /********************* end of menu **********************/
2080    
2081  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2082      gconf_save_state(appdata);
2083    
2084    gpx_free_all(appdata->gpx);    gpx_free_all(appdata->gpx);
   if(appdata->path) free(appdata->path);  
   if(appdata->image_path) free(appdata->image_path);  
   if(appdata->search_str) free(appdata->search_str);  
2085    
2086  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2087    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
# Line 2071  void cleanup(appdata_t *appdata) { Line 2119  void cleanup(appdata_t *appdata) {
2119  static void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2120    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2121    
   gconf_save_state(appdata);  
2122    gtk_main_quit();    gtk_main_quit();
2123    appdata->window = NULL;    appdata->window = NULL;
2124  }  }
# Line 2362  int main(int argc, char *argv[]) { Line 2409  int main(int argc, char *argv[]) {
2409    
2410    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2411    
2412      misc_init();
2413    
2414    curl_global_init(CURL_GLOBAL_ALL);    curl_global_init(CURL_GLOBAL_ALL);
2415    
2416  #ifdef USE_MAEMO  #ifdef USE_MAEMO
Legend:
Removed from v.190  
changed lines
  Added in v.226