Diff of /trunk/src/main.c

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

revision 168 by harbaum, Mon Nov 9 10:49:51 2009 UTC revision 221 by harbaum, Mon Nov 30 21:28:04 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 33  Line 35 
35  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
36  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
37  #include <hildon/hildon-note.h>  #include <hildon/hildon-note.h>
38    #include <hildon/hildon-entry.h>
39  #include <hildon/hildon-check-button.h>  #include <hildon/hildon-check-button.h>
40  #endif  #endif
41  #endif  #endif
# Line 154  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 220  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 473  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 592  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    if(appdata->search_results) {    if(appdata->search_results) {
603      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
604      appdata->search_results = NULL;      appdata->search_results = NULL;
# Line 664  static GdkPixbuf *gpx_icon_get(gpx_t *gp Line 671  static GdkPixbuf *gpx_icon_get(gpx_t *gp
671    return icon_get(ICON_FILE, 0);    return icon_get(ICON_FILE, 0);
672  }  }
673    
674  static void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {  void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {
675    char date_str[32], cnum[32];    char date_str[32], cnum[32];
676    
677    if(gpx->year && gpx->month && gpx->day) {    if(gpx->year && gpx->month && gpx->day) {
# Line 689  static void gpxlist_set(GtkListStore *st Line 696  static void gpxlist_set(GtkListStore *st
696                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
697                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
698  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
699                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),
700  #endif  #endif
701                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
702                       -1);                       -1);
# Line 863  static void gpxlist_view_onRowActivated( Line 870  static void gpxlist_view_onRowActivated(
870          gpx_t *new = NULL;          gpx_t *new = NULL;
871    
872          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
873            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
874          else          else
875            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
876    
877          if(new) {          if(new) {
878            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 907  static void gpxlist_view_onRowActivated( Line 914  static void gpxlist_view_onRowActivated(
914    }    }
915  }  }
916    
917    /* search gpx file in gpx list */
918    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx) {
919      GtkTreeModel *model =
920        gtk_tree_view_get_model(GTK_TREE_VIEW(appdata->gpxview));
921    
922      gboolean found =
923        gtk_tree_model_get_iter_first(model, iter);
924    
925      while(found) {
926        gpx_t *this_gpx;
927        gtk_tree_model_get(model, iter, GPXLIST_COL_DATA, &this_gpx, -1);
928    
929        if(gpx == this_gpx)
930          return TRUE;
931    
932        found = gtk_tree_model_iter_next(model, iter);
933      }
934    
935      return FALSE;
936    }
937    
938    
939  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
940  static gboolean  static gboolean
941  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
# Line 1151  cb_menu_about(GtkWidget *window, gpointe Line 1180  cb_menu_about(GtkWidget *window, gpointe
1180    
1181    GtkWidget *button = gtk_button_new();    GtkWidget *button = gtk_button_new();
1182    gtk_button_set_image(GTK_BUTTON(button),    gtk_button_set_image(GTK_BUTTON(button),
1183                         icon_get_widget(ICON_MISC, 8));                         icon_get_widget(ICON_MISC, 5));
1184    gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);    gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1185    g_signal_connect(button, "clicked",    g_signal_connect(button, "clicked",
1186                     G_CALLBACK(on_paypal_button_clicked), &context);                     G_CALLBACK(on_paypal_button_clicked), &context);
# Line 1450  cb_menu_search(GtkWidget *window, gpoint Line 1479  cb_menu_search(GtkWidget *window, gpoint
1479    
1480    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1481                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1482      context.entry = entry_new();
1483    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1484                                context.entry = gtk_entry_new());                                context.entry);
1485    
1486    if(appdata->search_str)    if(appdata->search_str)
1487      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1488    
# Line 1668  cb_menu_precpos(GtkWidget *window, gpoin Line 1699  cb_menu_precpos(GtkWidget *window, gpoin
1699    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1700  }  }
1701    
1702    static void
1703    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1704      geotoad((appdata_t *)data);
1705    }
1706    
1707  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1708  typedef struct {  typedef struct {
1709    char *label, *desc;    char *label, *desc;
# Line 1782  static const menu_entry_t submenu_tools_ Line 1818  static const menu_entry_t submenu_tools_
1818      G_CALLBACK(cb_menu_geotext) },      G_CALLBACK(cb_menu_geotext) },
1819    { "Precise Position", "Calculate a precise GPS position",    { "Precise Position", "Calculate a precise GPS position",
1820      G_CALLBACK(cb_menu_precpos) },      G_CALLBACK(cb_menu_precpos) },
1821      { "GeoToad",          "Use GeoToad online downloader",
1822        G_CALLBACK(cb_menu_geotoad) },
1823    { NULL, NULL, NULL }    { NULL, NULL, NULL }
1824  };  };
1825    
# Line 1983  void menu_create(appdata_t *appdata) { Line 2021  void menu_create(appdata_t *appdata) {
2021    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2022                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2023    
2024      item = gtk_menu_item_new_with_label( _("GeoToad") );
2025      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2026      g_signal_connect(item, "activate",
2027                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2028    
2029    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2030    
2031  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 2022  void menu_create(appdata_t *appdata) { Line 2065  void menu_create(appdata_t *appdata) {
2065  /********************* end of menu **********************/  /********************* end of menu **********************/
2066    
2067  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2068      gconf_save_state(appdata);
2069    
2070    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);  
2071    
2072  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2073    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
# Line 2063  void cleanup(appdata_t *appdata) { Line 2105  void cleanup(appdata_t *appdata) {
2105  static void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2106    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2107    
   gconf_save_state(appdata);  
2108    gtk_main_quit();    gtk_main_quit();
2109    appdata->window = NULL;    appdata->window = NULL;
2110  }  }
Legend:
Removed from v.168  
changed lines
  Added in v.221