Diff of /trunk/src/main.c

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

revision 157 by harbaum, Tue Nov 3 20:20:39 2009 UTC revision 229 by harbaum, Fri Dec 4 19:58:26 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 31  Line 33 
33    
34  #ifdef USE_MAEMO  #ifdef USE_MAEMO
35  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
36    #if MAEMO_VERSION_MAJOR >= 5
37    #include <hildon/hildon-note.h>
38    #include <hildon/hildon-entry.h>
39    #include <hildon/hildon-check-button.h>
40    #endif
41  #endif  #endif
42    
43  #include <locale.h>  #include <locale.h>
# Line 94  void errorf(const char *fmt, ...) { Line 101  void errorf(const char *fmt, ...) {
101      }      }
102    }    }
103    
104    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
105    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
106                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
107                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
108                             GTK_MESSAGE_ERROR,                             GTK_MESSAGE_ERROR,
 #else  
                            GTK_MESSAGE_OTHER,  
 #endif  
109                             GTK_BUTTONS_CLOSE, buf);                             GTK_BUTTONS_CLOSE, buf);
110    
111    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
112    #else
113      GtkWidget *dialog =
114        hildon_note_new_information(GTK_WINDOW(NULL), buf);
115    #endif
116    
117    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
118    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 149  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 215  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 468  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 587  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 603  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    
626    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
627    char *title = g_strdup_printf("%s - GPXView", gpx->name);    gtk_window_set_title(GTK_WINDOW(window), gpx->name);
   gtk_window_set_title(GTK_WINDOW(window), title);  
   g_free(title);  
628    
629    appdata->cur_view = cachelist_create(appdata, gpx, NULL);    appdata->cur_view = cachelist_create(appdata, gpx, NULL);
630    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
# Line 659  static GdkPixbuf *gpx_icon_get(gpx_t *gp Line 673  static GdkPixbuf *gpx_icon_get(gpx_t *gp
673    return icon_get(ICON_FILE, 0);    return icon_get(ICON_FILE, 0);
674  }  }
675    
676  static void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {  void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {
677    char date_str[32], cnum[32];    char date_str[32], cnum[32];
678    
679    if(gpx->year && gpx->month && gpx->day) {    if(gpx->year && gpx->month && gpx->day) {
# Line 684  static void gpxlist_set(GtkListStore *st Line 698  static void gpxlist_set(GtkListStore *st
698                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
699                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
700  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
701                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),
702  #endif  #endif
703                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
704                       -1);                       -1);
# Line 776  static void gpxlist_view_onRowActivated( Line 790  static void gpxlist_view_onRowActivated(
790      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
791        printf("clicked delete\n");        printf("clicked delete\n");
792    
793    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
794        /* ask user what he wants */        /* ask user what he wants */
795        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
796                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
797                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
                  /* this doesn't fix the text selection issues ... */  
 #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >=5)  
                  GTK_MESSAGE_OTHER,  
 #else  
798                   GTK_MESSAGE_QUESTION,                   GTK_MESSAGE_QUESTION,
 #endif  
799                   GTK_BUTTONS_CANCEL,                   GTK_BUTTONS_CANCEL,
800                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
801                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
# Line 795  static void gpxlist_view_onRowActivated( Line 805  static void gpxlist_view_onRowActivated(
805                               _("Close"), 2,                               _("Close"), 2,
806                               NULL);                               NULL);
807    
808          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
809    #else
810    
811          GtkWidget *dialog =
812            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
813                                GTK_WINDOW(appdata->window),
814                                GTK_DIALOG_DESTROY_WITH_PARENT,
815                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
816                                _("Remove"), 1,
817                                _("Close"), 2,
818                                NULL);
819    
820          GtkWidget *content_area =
821            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
822    
823          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
824    
825          gtk_box_pack_start(GTK_BOX(hbox),
826             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
827                                       GTK_ICON_SIZE_DIALOG),
828                             FALSE, FALSE, 0);
829    
830          GtkWidget *label = gtk_label_new(
831                      _("Do you want to close this entry only or do "
832                        "you want to remove it completely from the list?"));
833    
834          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
835          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
836    
837          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
838          gtk_container_add (GTK_CONTAINER (content_area), hbox);
839    
840          gtk_widget_show_all (dialog);
841    #endif
842    
843        if(gpx->closed)        if(gpx->closed)
844          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
845    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));  
   
846        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
847        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
848    
# Line 829  static void gpxlist_view_onRowActivated( Line 872  static void gpxlist_view_onRowActivated(
872          gpx_t *new = NULL;          gpx_t *new = NULL;
873    
874          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
875            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
876          else          else
877            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
878    
879          if(new) {          if(new) {
880            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 873  static void gpxlist_view_onRowActivated( Line 916  static void gpxlist_view_onRowActivated(
916    }    }
917  }  }
918    
919    /* search gpx file in gpx list */
920    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx) {
921      GtkTreeModel *model =
922        gtk_tree_view_get_model(GTK_TREE_VIEW(appdata->gpxview));
923    
924      gboolean found =
925        gtk_tree_model_get_iter_first(model, iter);
926    
927      while(found) {
928        gpx_t *this_gpx;
929        gtk_tree_model_get(model, iter, GPXLIST_COL_DATA, &this_gpx, -1);
930    
931        if(gpx == this_gpx)
932          return TRUE;
933    
934        found = gtk_tree_model_iter_next(model, iter);
935      }
936    
937      return FALSE;
938    }
939    
940    
941  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
942  static gboolean  static gboolean
943  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
# Line 1047  static GtkWidget *gpxlist_create_view_an Line 1112  static GtkWidget *gpxlist_create_view_an
1112  }  }
1113    
1114  /* add last entry in gpx list to visual representation */  /* add last entry in gpx list to visual representation */
1115  static void gpxlist_add(appdata_t *appdata, gpx_t *new) {  void gpxlist_add(appdata_t *appdata, gpx_t *new) {
1116    GtkTreeIter         iter;    GtkTreeIter         iter;
1117    
1118    gtk_list_store_append(appdata->gpxstore, &iter);    gtk_list_store_append(appdata->gpxstore, &iter);
# Line 1057  static void gpxlist_add(appdata_t *appda Line 1122  static void gpxlist_add(appdata_t *appda
1122    gpx_t **gpx = &appdata->gpx;    gpx_t **gpx = &appdata->gpx;
1123    while(*gpx) gpx = &((*gpx)->next);    while(*gpx) gpx = &((*gpx)->next);
1124    *gpx = new;    *gpx = new;
1125    
1126      /* select new iter */
1127      GtkTreeSelection *selection =
1128        gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1129      gtk_tree_selection_select_iter(selection, &iter);
1130      GtkTreePath *path =
1131        gtk_tree_model_get_path(GTK_TREE_MODEL(appdata->gpxstore), &iter);
1132      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(appdata->gpxview),
1133                                   path, NULL, TRUE, 0.0, 0.0);
1134      gtk_tree_path_free(path);
1135  }  }
1136    
1137  /******************** end of gpxlist ********************/  /******************** end of gpxlist ********************/
1138    
1139  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1140    
 typedef struct {  
   appdata_t *appdata;  
   GtkWidget *dialog;  
 } about_context_t;  
   
 #ifdef ENABLE_BROWSER_INTERFACE  
 void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {  
   gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);  
   browser_url(context->appdata,  
               "https://www.paypal.com/cgi-bin/webscr"  
               "?cmd=_s-xclick&hosted_button_id=7400558");  
 }  
 #endif  
   
1141  static void  static void
1142  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1143    about_context_t context;    about_box((appdata_t*)data);
   
   context.appdata = (appdata_t *)data;  
   
 #ifdef ENABLE_LIBLOCATION  
   char *uses = "uses liblocation";  
 #elif defined(ENABLE_GPSBT)  
   char *uses = "uses gpsbt and gpsd";  
 #else  
   char *uses = "uses gpsd";  
 #endif  
   
   const gchar *authors[] = {  
     "Till Harbaum <till@harbaum.org>",  
     "John Stowers <john.stowers@gmail.com>",  
     "GCVote: Guido Wegener <guido.wegener@gmx.de>",  
     NULL };  
   
   context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,  
                         "name", "GPXView",  
                         "version", VERSION,  
                         "copyright", _("Copyright 2008-2009"),  
                         "authors", authors,  
                         "website", _("http://www.harbaum.org/till/maemo"),  
                         "comments", _(uses),  
                         NULL);  
   
 #ifdef ENABLE_BROWSER_INTERFACE  
   /* add a way to donate to the project */  
   GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);  
   
   GtkWidget *hbox = gtk_hbox_new(FALSE, 8);  
   gtk_box_pack_start(GTK_BOX(hbox),  
                      gtk_label_new(_("Do you like GPXView?")),  
                      FALSE, FALSE, 0);  
   
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button),  
                        icon_get_widget(ICON_MISC, 8));  
   gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(on_paypal_button_clicked), &context);  
   gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);  
   
   gtk_container_add(GTK_CONTAINER(alignment), hbox);  
   gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),  
                               alignment);  
   
   gtk_widget_show_all(alignment);  
 #endif  
   
   gtk_dialog_run(GTK_DIALOG(context.dialog));  
   gtk_widget_destroy(context.dialog);  
1144  }  }
1145    
1146  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1333  typedef struct { Line 1342  typedef struct {
1342    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1343  } search_context_t;  } search_context_t;
1344    
1345    
1346    static GtkWidget *check_button_new_with_label(char *label) {
1347    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1348      return gtk_check_button_new_with_label(label);
1349    #else
1350      GtkWidget *cbut =
1351        hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
1352      gtk_button_set_label(GTK_BUTTON(cbut), label);
1353      return cbut;
1354    #endif
1355    }
1356    
1357    static void check_button_set_active(GtkWidget *button, gboolean active) {
1358    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1359      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
1360    #else
1361      hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
1362    #endif
1363    }
1364    
1365    static gboolean check_button_get_active(GtkWidget *button) {
1366    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1367      return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
1368    #else
1369      return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));
1370    #endif
1371    }
1372    
1373  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1374    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1375    
1376    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1377    
1378    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1379    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1367  cb_menu_search(GtkWidget *window, gpoint Line 1403  cb_menu_search(GtkWidget *window, gpoint
1403    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1404    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1405    
1406    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1407    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_id),    check_button_set_active(context.in_id, appdata->search & SEARCH_ID);
                                appdata->search & SEARCH_ID);  
1408    gtk_table_attach_defaults(GTK_TABLE(table), context.in_id, 0, 1, 0, 1);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_id, 0, 1, 0, 1);
1409    
1410    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1411    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_name),    check_button_set_active(context.in_name, appdata->search & SEARCH_NAME);
                                appdata->search & SEARCH_NAME);  
1412    gtk_table_attach_defaults(GTK_TABLE(table), context.in_name, 1, 2, 0, 1);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_name, 1, 2, 0, 1);
1413    
1414    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1415    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_desc),    check_button_set_active(context.in_desc, appdata->search & SEARCH_DESC);
                                appdata->search & SEARCH_DESC);  
1416    gtk_table_attach_defaults(GTK_TABLE(table), context.in_desc, 0, 1, 1, 2);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_desc, 0, 1, 1, 2);
1417    
1418    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1419    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_owner),    check_button_set_active(context.in_owner, appdata->search & SEARCH_OWNER);
                                appdata->search & SEARCH_OWNER);  
1420    gtk_table_attach_defaults(GTK_TABLE(table), context.in_owner, 1, 2, 1, 2);    gtk_table_attach_defaults(GTK_TABLE(table), context.in_owner, 1, 2, 1, 2);
1421    
1422    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
# Line 1393  cb_menu_search(GtkWidget *window, gpoint Line 1425  cb_menu_search(GtkWidget *window, gpoint
1425    
1426    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1427                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1428      context.entry = entry_new();
1429    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1430                                context.entry = gtk_entry_new());                                context.entry);
1431    
1432    if(appdata->search_str)    if(appdata->search_str)
1433      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1434    
# Line 1405  cb_menu_search(GtkWidget *window, gpoint Line 1439  cb_menu_search(GtkWidget *window, gpoint
1439    
1440    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1441    
1442    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1443    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(context.in_finds),    check_button_set_active(context.in_finds, appdata->search & SEARCH_FINDS);
                                appdata->search & SEARCH_FINDS);  
1444    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1445    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1446                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1447  cb_menu_search(GtkWidget *window, gpoint Line 1480  cb_menu_search(GtkWidget *window, gpoint
1480                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1481  #endif  #endif
1482    
1483      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1484        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1485      else      else
1486        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1487    
1488      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1489        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1490      else      else
1491        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1492    
1493      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1494        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1495      else      else
1496        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1497    
1498      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1499        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1500      else      else
1501        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1502    
1503      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1504        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1505      else      else
1506        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1612  cb_menu_precpos(GtkWidget *window, gpoin Line 1645  cb_menu_precpos(GtkWidget *window, gpoin
1645    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1646  }  }
1647    
1648    static void
1649    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1650      geotoad((appdata_t *)data);
1651    }
1652    
1653  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1654  typedef struct {  typedef struct {
1655    char *label, *desc;    char *label, *desc;
# Line 1726  static const menu_entry_t submenu_tools_ Line 1764  static const menu_entry_t submenu_tools_
1764      G_CALLBACK(cb_menu_geotext) },      G_CALLBACK(cb_menu_geotext) },
1765    { "Precise Position", "Calculate a precise GPS position",    { "Precise Position", "Calculate a precise GPS position",
1766      G_CALLBACK(cb_menu_precpos) },      G_CALLBACK(cb_menu_precpos) },
1767      { "GeoToad",          "Use GeoToad online downloader",
1768        G_CALLBACK(cb_menu_geotoad) },
1769    { NULL, NULL, NULL }    { NULL, NULL, NULL }
1770  };  };
1771    
# Line 1927  void menu_create(appdata_t *appdata) { Line 1967  void menu_create(appdata_t *appdata) {
1967    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1968                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
1969    
1970      item = gtk_menu_item_new_with_label( _("GeoToad") );
1971      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1972      g_signal_connect(item, "activate",
1973                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
1974    
1975    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1976    
1977  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1966  void menu_create(appdata_t *appdata) { Line 2011  void menu_create(appdata_t *appdata) {
2011  /********************* end of menu **********************/  /********************* end of menu **********************/
2012    
2013  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2014      gconf_save_state(appdata);
2015    
2016    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);  
2017    
2018  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2019    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
# Line 2007  void cleanup(appdata_t *appdata) { Line 2051  void cleanup(appdata_t *appdata) {
2051  static void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2052    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2053    
   gconf_save_state(appdata);  
2054    gtk_main_quit();    gtk_main_quit();
2055    appdata->window = NULL;    appdata->window = NULL;
2056  }  }
# Line 2298  int main(int argc, char *argv[]) { Line 2341  int main(int argc, char *argv[]) {
2341    
2342    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2343    
2344      misc_init();
2345    
2346    curl_global_init(CURL_GLOBAL_ALL);    curl_global_init(CURL_GLOBAL_ALL);
2347    
2348  #ifdef USE_MAEMO  #ifdef USE_MAEMO
Legend:
Removed from v.157  
changed lines
  Added in v.229