Diff of /trunk/src/main.c

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

revision 156 by harbaum, Tue Nov 3 13:15:35 2009 UTC revision 237 by harbaum, Thu Dec 10 21:24:43 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>
25    
26  #include <time.h>  #include <time.h>
27  #include <sys/time.h>  #include <sys/time.h>
28    
# Line 29  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    #endif
40  #endif  #endif
41    
42  #include <locale.h>  #include <locale.h>
# Line 92  void errorf(const char *fmt, ...) { Line 100  void errorf(const char *fmt, ...) {
100      }      }
101    }    }
102    
103    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
104    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
105                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
106                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
107                             GTK_MESSAGE_ERROR,                             GTK_MESSAGE_ERROR,
 #else  
                            GTK_MESSAGE_OTHER,  
 #endif  
108                             GTK_BUTTONS_CLOSE, buf);                             GTK_BUTTONS_CLOSE, buf);
109    
110    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
111    #else
112      GtkWidget *dialog =
113        hildon_note_new_information(GTK_WINDOW(NULL), buf);
114    #endif
115    
116    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
117    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 147  gpx_t *choose_file(appdata_t *appdata, g Line 156  gpx_t *choose_file(appdata_t *appdata, g
156        gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
157    
158        if(!whole_dir)        if(!whole_dir)
159          gpx = gpx_parse(dialog, filename);          gpx = gpx_parse(dialog, filename, appdata->username);
160        else {        else {
161          /* cur trailing '/' if present */          /* cur trailing '/' if present */
162          if(strlastchr(filename) == '/')          if(strlastchr(filename) == '/')
163            filename[strlen(filename)] = 0;            filename[strlen(filename)] = 0;
164    
165          gpx = gpx_parse_dir(dialog, filename);          gpx = gpx_parse_dir(dialog, filename, appdata->username);
166        }        }
167    
168        gpx_busy_dialog_destroy(dialog);        gpx_busy_dialog_destroy(dialog);
169    
170        /* save path if gpx was successfully loaded */        /* save path if gpx was successfully loaded */
# Line 213  void cachelist_goto_cache(appdata_t *app Line 222  void cachelist_goto_cache(appdata_t *app
222  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
223      cache_dialog(appdata, cache);      cache_dialog(appdata, cache);
224  #else  #else
225        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
226    
227      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
228      appdata->cur_view = cache_view(appdata, cache);      appdata->cur_view = cache_view(appdata, cache);
229      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
230      gtk_widget_show_all(appdata->vbox);      gtk_widget_show_all(appdata->vbox);
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
231  #endif  #endif
232  }  }
233    
# Line 297  void cachelist_redraw(appdata_t *appdata Line 306  void cachelist_redraw(appdata_t *appdata
306    }    }
307    
308    if(redraw) {    if(redraw) {
     GtkWidget *container = appdata->vbox;  
   
309  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
310      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
311      container = hildon_window_stack_peek(stack);      GtkWidget *container = hildon_window_stack_peek(stack);
312    #else
313        GtkWidget *container = appdata->vbox;
314  #endif  #endif
315    
316      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
# Line 317  void cachelist_redraw(appdata_t *appdata Line 326  void cachelist_redraw(appdata_t *appdata
326      }      }
327    
328  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
329      if(container != appdata->vbox)      gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
330        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);  #else
331      else      gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
332  #endif  #endif
       gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);  
333    
334      gtk_widget_show_all(container);      gtk_widget_show_all(container);
335    }    }
# Line 466  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 585  void cachelist_dialog(appdata_t *appdata Line 595  void cachelist_dialog(appdata_t *appdata
595  static void search_result_free(gpx_t *result);  static void search_result_free(gpx_t *result);
596    
597  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
598      printf("cachelist destroy\n");
599    
600      HildonWindowStack *stack = hildon_window_stack_get_default();
601      appdata->window = HILDON_WINDOW(hildon_window_stack_peek(stack));
602    
603    if(appdata->search_results) {    if(appdata->search_results) {
604      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
605      appdata->search_results = NULL;      appdata->search_results = NULL;
# Line 601  void on_cachelist_destroy(GtkWidget *wid Line 616  void on_cachelist_destroy(GtkWidget *wid
616    
617  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
618    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
619      appdata->window = HILDON_WINDOW(window);
620    
621    /* store last "cur_view" in window */    /* store last "cur_view" in window */
622    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
623    
624    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
625    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);  
626    
627    appdata->cur_view = cachelist_create(appdata, gpx, NULL);    appdata->cur_view = cachelist_create(appdata, gpx, NULL);
628    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
# Line 657  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 682  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, 2),
700  #endif  #endif
701                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
702                       -1);                       -1);
# Line 774  static void gpxlist_view_onRowActivated( Line 788  static void gpxlist_view_onRowActivated(
788      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
789        printf("clicked delete\n");        printf("clicked delete\n");
790    
791    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
792        /* ask user what he wants */        /* ask user what he wants */
793        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
794                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
795                   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  
796                   GTK_MESSAGE_QUESTION,                   GTK_MESSAGE_QUESTION,
 #endif  
797                   GTK_BUTTONS_CANCEL,                   GTK_BUTTONS_CANCEL,
798                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
799                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
# Line 793  static void gpxlist_view_onRowActivated( Line 803  static void gpxlist_view_onRowActivated(
803                               _("Close"), 2,                               _("Close"), 2,
804                               NULL);                               NULL);
805    
806          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
807    #else
808    
809          GtkWidget *dialog =
810            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
811                                GTK_WINDOW(appdata->window),
812                                GTK_DIALOG_DESTROY_WITH_PARENT,
813                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
814                                _("Remove"), 1,
815                                _("Close"), 2,
816                                NULL);
817    
818          GtkWidget *content_area =
819            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
820    
821          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
822    
823          gtk_box_pack_start(GTK_BOX(hbox),
824             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
825                                       GTK_ICON_SIZE_DIALOG),
826                             FALSE, FALSE, 0);
827    
828          GtkWidget *label = gtk_label_new(
829                      _("Do you want to close this entry only or do "
830                        "you want to remove it completely from the list?"));
831    
832          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
833          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
834    
835          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
836          gtk_container_add (GTK_CONTAINER (content_area), hbox);
837    
838          gtk_widget_show_all (dialog);
839    #endif
840    
841        if(gpx->closed)        if(gpx->closed)
842          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
843    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));  
   
844        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
845        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
846    
# Line 827  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 871  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 909  static GtkWidget *gpxlist_create_view_an Line 974  static GtkWidget *gpxlist_create_view_an
974    
975    appdata->gpxview = gtk_tree_view_new ();    appdata->gpxview = gtk_tree_view_new ();
976    
977      printf("building gpx list, items = %d\n", appdata->gpxlist_items);
978    
979    GtkTreeSelection *selection =    GtkTreeSelection *selection =
980      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
981  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
# Line 1045  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 1055  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 1331  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 void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1347    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1348    
1349    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1350    
1351    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1352    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1365  cb_menu_search(GtkWidget *window, gpoint Line 1376  cb_menu_search(GtkWidget *window, gpoint
1376    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1377    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1378    
1379    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1380    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);  
1381    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);
1382    
1383    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1384    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);  
1385    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);
1386    
1387    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1388    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);  
1389    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);
1390    
1391    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1392    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);  
1393    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);
1394    
1395    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 1391  cb_menu_search(GtkWidget *window, gpoint Line 1398  cb_menu_search(GtkWidget *window, gpoint
1398    
1399    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1400                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1401      context.entry = entry_new();
1402    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1403                                context.entry = gtk_entry_new());                                context.entry);
1404    
1405    if(appdata->search_str)    if(appdata->search_str)
1406      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1407    
# Line 1403  cb_menu_search(GtkWidget *window, gpoint Line 1412  cb_menu_search(GtkWidget *window, gpoint
1412    
1413    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1414    
1415    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1416    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);  
1417    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1418    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1419                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1445  cb_menu_search(GtkWidget *window, gpoint Line 1453  cb_menu_search(GtkWidget *window, gpoint
1453                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1454  #endif  #endif
1455    
1456      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1457        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1458      else      else
1459        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1460    
1461      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1462        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1463      else      else
1464        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1465    
1466      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1467        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1468      else      else
1469        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1470    
1471      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1472        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1473      else      else
1474        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1475    
1476      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1477        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1478      else      else
1479        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1610  cb_menu_precpos(GtkWidget *window, gpoin Line 1618  cb_menu_precpos(GtkWidget *window, gpoin
1618    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1619  }  }
1620    
1621    static void
1622    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1623      geotoad((appdata_t *)data);
1624    }
1625    
1626  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1627  typedef struct {  typedef struct {
1628    char *label, *desc;    char *label, *desc;
# Line 1724  static const menu_entry_t submenu_tools_ Line 1737  static const menu_entry_t submenu_tools_
1737      G_CALLBACK(cb_menu_geotext) },      G_CALLBACK(cb_menu_geotext) },
1738    { "Precise Position", "Calculate a precise GPS position",    { "Precise Position", "Calculate a precise GPS position",
1739      G_CALLBACK(cb_menu_precpos) },      G_CALLBACK(cb_menu_precpos) },
1740      { "GeoToad",          "Use GeoToad online downloader",
1741        G_CALLBACK(cb_menu_geotoad) },
1742    { NULL, NULL, NULL }    { NULL, NULL, NULL }
1743  };  };
1744    
# Line 1925  void menu_create(appdata_t *appdata) { Line 1940  void menu_create(appdata_t *appdata) {
1940    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1941                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
1942    
1943      item = gtk_menu_item_new_with_label( _("GeoToad") );
1944      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1945      g_signal_connect(item, "activate",
1946                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
1947    
1948    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1949    
1950  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1964  void menu_create(appdata_t *appdata) { Line 1984  void menu_create(appdata_t *appdata) {
1984  /********************* end of menu **********************/  /********************* end of menu **********************/
1985    
1986  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
1987      gconf_save_state(appdata);
1988    
1989    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);  
1990    
1991  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1992    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
# Line 2005  void cleanup(appdata_t *appdata) { Line 2024  void cleanup(appdata_t *appdata) {
2024  static void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2025    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2026    
   gconf_save_state(appdata);  
2027    gtk_main_quit();    gtk_main_quit();
2028    appdata->window = NULL;    appdata->window = NULL;
2029  }  }
# Line 2245  void main_after_settings_redraw(appdata_ Line 2263  void main_after_settings_redraw(appdata_
2263    }    }
2264    
2265    if(redraw) {    if(redraw) {
     GtkWidget *container = appdata->vbox;  
2266    
2267  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2268      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
2269      container = hildon_window_stack_peek(stack);      GtkWidget *container = hildon_window_stack_peek(stack);
2270    #else
2271        GtkWidget *container = appdata->vbox;
2272  #endif  #endif
2273    
2274      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
# Line 2268  void main_after_settings_redraw(appdata_ Line 2287  void main_after_settings_redraw(appdata_
2287      }      }
2288    
2289  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
     if(container != appdata->vbox)  
2290        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2291      else  #else
 #endif  
2292        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2293    #endif
2294    
2295      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2296    }    }
# Line 2296  int main(int argc, char *argv[]) { Line 2314  int main(int argc, char *argv[]) {
2314    
2315    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2316    
2317      misc_init();
2318    
2319      curl_global_init(CURL_GLOBAL_ALL);
2320    
2321  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2322    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2323    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2348  int main(int argc, char *argv[]) { Line 2370  int main(int argc, char *argv[]) {
2370    appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);    appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2371    gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);    gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2372    
2373    #ifndef USE_STACKABLE_WINDOW
2374    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2375    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
 #ifndef USE_STACKABLE_WINDOW  
2376    menu_create(&appdata);    menu_create(&appdata);
2377  #else  #else
2378    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),
# Line 2386  int main(int argc, char *argv[]) { Line 2408  int main(int argc, char *argv[]) {
2408    gps_init(&appdata);    gps_init(&appdata);
2409    
2410    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);
2411    #ifndef USE_STACKABLE_WINDOW
2412    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);
2413    #else
2414      gtk_container_add(GTK_CONTAINER(appdata.window), appdata.cur_view);
2415    #endif
2416    
2417    gtk_widget_show_all(GTK_WIDGET(appdata.window));    gtk_widget_show_all(GTK_WIDGET(appdata.window));
2418    gtk_main();    gtk_main();
Legend:
Removed from v.156  
changed lines
  Added in v.237