Diff of /trunk/src/main.c

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

revision 120 by harbaum, Sat Sep 19 19:19:42 2009 UTC revision 205 by harbaum, Mon Nov 23 20:12:22 2009 UTC
# Line 19  Line 19 
19  #include <string.h>  #include <string.h>
20  #include <math.h>  #include <math.h>
21    
22    #include <curl/curl.h>
23    
24  #include <time.h>  #include <time.h>
25  #include <sys/time.h>  #include <sys/time.h>
26    
# Line 29  Line 31 
31    
32  #ifdef USE_MAEMO  #ifdef USE_MAEMO
33  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
34    #if MAEMO_VERSION_MAJOR >= 5
35    #include <hildon/hildon-note.h>
36    #include <hildon/hildon-entry.h>
37    #include <hildon/hildon-check-button.h>
38    #endif
39  #endif  #endif
40    
41  #include <locale.h>  #include <locale.h>
42    
43  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
44    
45  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
46  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
47                        gpointer user_data);                        gpointer user_data);
48    
# Line 92  void errorf(const char *fmt, ...) { Line 99  void errorf(const char *fmt, ...) {
99      }      }
100    }    }
101    
102    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
103    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
104                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
105                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
106                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,                             GTK_MESSAGE_ERROR,
107                             buf);                             GTK_BUTTONS_CLOSE, buf);
108    
109    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
110    #else
111      GtkWidget *dialog =
112        hildon_note_new_information(GTK_WINDOW(NULL), buf);
113    #endif
114    
115    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
116    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 143  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 205  enum { Line 217  enum {
217    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
218  } ;  } ;
219    
220  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
221    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
222        cache_dialog(appdata, cache);
223    #else
224        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
225        appdata->cur_view = cache_view(appdata, cache);
226        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
227        gtk_widget_show_all(appdata->vbox);
228    
229        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
230    #endif
231    }
232    
233    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
234                                     GtkTreePath        *path,                                     GtkTreePath        *path,
235                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
236                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 222  void cachelist_view_onRowActivated(GtkTr Line 247  void cachelist_view_onRowActivated(GtkTr
247    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
248      cache_t *cache;      cache_t *cache;
249      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
250  #ifndef USE_BREAD_CRUMB_TRAIL      cachelist_goto_cache(appdata, cache);
     cache_dialog(appdata, cache);  
 #else  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = cache_view(appdata, cache);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
 #endif  
251    }    }
252  }  }
253    
# Line 274  static GtkWidget *cachelist_create(appda Line 290  static GtkWidget *cachelist_create(appda
290                                     cache_t *sel_cache);                                     cache_t *sel_cache);
291    
292  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
 #ifndef USE_MAEMO  
   //  gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
   //  appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
   //  gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
   // gtk_widget_show_all(appdata->vbox);  
 #else  
   
293    if(!appdata->cur_view) {    if(!appdata->cur_view) {
294      printf("cachelist redraw: no active view\n");      printf("cachelist redraw: no active view\n");
295      return;      return;
# Line 298  void cachelist_redraw(appdata_t *appdata Line 307  void cachelist_redraw(appdata_t *appdata
307    if(redraw) {    if(redraw) {
308      GtkWidget *container = appdata->vbox;      GtkWidget *container = appdata->vbox;
309    
     printf("redraw %d\n", redraw);  
   
310  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
311      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
312      container = hildon_window_stack_peek(stack);      container = hildon_window_stack_peek(stack);
# Line 326  void cachelist_redraw(appdata_t *appdata Line 333  void cachelist_redraw(appdata_t *appdata
333    
334      gtk_widget_show_all(container);      gtk_widget_show_all(container);
335    }    }
 #endif  
336  }  }
337    
338    
# Line 334  static gboolean cachelist_update(gpointe Line 340  static gboolean cachelist_update(gpointe
340    
341    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
342    
 #ifdef USE_MAEMO  
343    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
344    
345    if(appdata->cur_cache)    if(appdata->cur_cache)
346      return TRUE;      return TRUE;
347    
348    #ifdef USE_MAEMO
349    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
350      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
351        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
352    #endif
353    
354    if(appdata->cachelist_update)    if(appdata->cachelist_update)
355      cachelist_redraw(appdata);      cachelist_redraw(appdata);
 #endif  
356    
357    return TRUE;    return TRUE;
358  }  }
# Line 468  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 593  void on_cachelist_destroy(GtkWidget *wid Line 601  void on_cachelist_destroy(GtkWidget *wid
601    }    }
602    appdata->cur_gpx = NULL;    appdata->cur_gpx = NULL;
603    
604    #ifdef ENABLE_OSM_GPS_MAP
605      map_update(appdata);
606    #endif
607    
608    /* restore cur_view */    /* restore cur_view */
609    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
610  }  }
# Line 619  void cachelist_dialog(appdata_t *appdata Line 631  void cachelist_dialog(appdata_t *appdata
631                     G_CALLBACK(on_cachelist_destroy), appdata);                     G_CALLBACK(on_cachelist_destroy), appdata);
632    
633    gtk_widget_show_all(window);    gtk_widget_show_all(window);
634    
635    #ifdef ENABLE_OSM_GPS_MAP
636      map_update(appdata);
637    #endif
638  }  }
639  #endif  #endif
640  #endif  #endif
# Line 676  static void gpxlist_set(GtkListStore *st Line 692  static void gpxlist_set(GtkListStore *st
692                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
693                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
694  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
695                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),
696  #endif  #endif
697                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
698                       -1);                       -1);
# Line 722  static void gpxlist_close(appdata_t *app Line 738  static void gpxlist_close(appdata_t *app
738    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
739  }  }
740    
741    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
742    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
743    #ifdef USE_STACKABLE_WINDOW
744      if(!appdata->cur_gpx)
745    #endif
746        cachelist_dialog(appdata, gpx);
747    #ifdef USE_STACKABLE_WINDOW
748      else
749        printf("selected gpx, but cachelist window already present\n");
750    #endif
751    #else
752      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
753      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
754      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
755      gtk_widget_show_all(appdata->vbox);
756    
757      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
758    #endif
759    }
760    
761  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
762                            GtkTreePath        *path,                            GtkTreePath        *path,
763                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 748  static void gpxlist_view_onRowActivated( Line 784  static void gpxlist_view_onRowActivated(
784      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
785        printf("clicked delete\n");        printf("clicked delete\n");
786    
787    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
788        /* ask user what he wants */        /* ask user what he wants */
789        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
790                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
791                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
792                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   GTK_MESSAGE_QUESTION,
793                     GTK_BUTTONS_CANCEL,
794                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
795                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
796    
# Line 761  static void gpxlist_view_onRowActivated( Line 799  static void gpxlist_view_onRowActivated(
799                               _("Close"), 2,                               _("Close"), 2,
800                               NULL);                               NULL);
801    
802          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
803    #else
804    
805          GtkWidget *dialog =
806            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
807                                GTK_WINDOW(appdata->window),
808                                GTK_DIALOG_DESTROY_WITH_PARENT,
809                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
810                                _("Remove"), 1,
811                                _("Close"), 2,
812                                NULL);
813    
814          GtkWidget *content_area =
815            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
816    
817          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
818    
819          gtk_box_pack_start(GTK_BOX(hbox),
820             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
821                                       GTK_ICON_SIZE_DIALOG),
822                             FALSE, FALSE, 0);
823    
824          GtkWidget *label = gtk_label_new(
825                      _("Do you want to close this entry only or do "
826                        "you want to remove it completely from the list?"));
827    
828          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
829          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
830    
831          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
832          gtk_container_add (GTK_CONTAINER (content_area), hbox);
833    
834          gtk_widget_show_all (dialog);
835    #endif
836    
837        if(gpx->closed)        if(gpx->closed)
838          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
839    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));  
   
840        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
841        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
842    
# Line 795  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 833  static void gpxlist_view_onRowActivated( Line 904  static void gpxlist_view_onRowActivated(
904    
905          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
906        }        }
907  #ifndef USE_BREAD_CRUMB_TRAIL  
908  #ifdef USE_STACKABLE_WINDOW        gpxlist_goto_cachelist(appdata, gpx);
       if(!appdata->cur_gpx)  
 #endif  
         cachelist_dialog(appdata, gpx);  
 #ifdef USE_STACKABLE_WINDOW  
       else  
         printf("selected gpx, but cachelist window already present\n");  
 #endif  
 #else  
       gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
       appdata->cur_view = cachelist_create(appdata, gpx, NULL);  
       gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
       gtk_widget_show_all(appdata->vbox);  
   
       crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);  
 #endif  
909      }      }
910    }    }
911  }  }
# Line 904  static GtkWidget *gpxlist_create_view_an Line 960  static GtkWidget *gpxlist_create_view_an
960    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
961                    -1, "Icon", renderer,                    -1, "Icon", renderer,
962                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
963                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
964            /* at least one entry needs to be sensitive. */
965            /* This is the delete icon if the PANNABLE_AREA is used */
966                      "sensitive", GPXLIST_COL_OPEN,
967    #endif
968                    NULL);                    NULL);
969    
970    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 960  static GtkWidget *gpxlist_create_view_an Line 1020  static GtkWidget *gpxlist_create_view_an
1020    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1021                    -1, "Del", renderer,                    -1, "Del", renderer,
1022                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
1023                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
1024                    NULL);                    NULL);
1025  #endif  #endif
1026    
# Line 1071  cb_menu_about(GtkWidget *window, gpointe Line 1131  cb_menu_about(GtkWidget *window, gpointe
1131    const gchar *authors[] = {    const gchar *authors[] = {
1132      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
1133      "John Stowers <john.stowers@gmail.com>",      "John Stowers <john.stowers@gmail.com>",
1134        "GCVote: Guido Wegener <guido.wegener@gmx.de>",
1135      NULL };      NULL };
1136    
1137    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
# Line 1093  cb_menu_about(GtkWidget *window, gpointe Line 1154  cb_menu_about(GtkWidget *window, gpointe
1154    
1155    GtkWidget *button = gtk_button_new();    GtkWidget *button = gtk_button_new();
1156    gtk_button_set_image(GTK_BUTTON(button),    gtk_button_set_image(GTK_BUTTON(button),
1157                         icon_get_widget(ICON_MISC, 8));                         icon_get_widget(ICON_MISC, 5));
1158    gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);    gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1159    g_signal_connect(button, "clicked",    g_signal_connect(button, "clicked",
1160                     G_CALLBACK(on_paypal_button_clicked), &context);                     G_CALLBACK(on_paypal_button_clicked), &context);
# Line 1279  gpx_t *search_do(appdata_t *appdata, gpx Line 1340  gpx_t *search_do(appdata_t *appdata, gpx
1340        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1341                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1342          hit = 1;          hit = 1;
1343        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1344                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1345          hit = 1;          hit = 1;
1346    
1347        if(hit) {        if(hit) {
# Line 1309  typedef struct { Line 1370  typedef struct {
1370    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1371  } search_context_t;  } search_context_t;
1372    
1373    
1374    static GtkWidget *check_button_new_with_label(char *label) {
1375    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1376      return gtk_check_button_new_with_label(label);
1377    #else
1378      GtkWidget *cbut =
1379        hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
1380      gtk_button_set_label(GTK_BUTTON(cbut), label);
1381      return cbut;
1382    #endif
1383    }
1384    
1385    static void check_button_set_active(GtkWidget *button, gboolean active) {
1386    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1387      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
1388    #else
1389      hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
1390    #endif
1391    }
1392    
1393    static gboolean check_button_get_active(GtkWidget *button) {
1394    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1395      return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
1396    #else
1397      return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));
1398    #endif
1399    }
1400    
1401  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1402    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1403    
1404    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1405    
1406    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1407    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1343  cb_menu_search(GtkWidget *window, gpoint Line 1431  cb_menu_search(GtkWidget *window, gpoint
1431    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1432    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1433    
1434    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1435    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);  
1436    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);
1437    
1438    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1439    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);  
1440    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);
1441    
1442    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1443    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);  
1444    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);
1445    
1446    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1447    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);  
1448    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);
1449    
1450    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 1369  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 1381  cb_menu_search(GtkWidget *window, gpoint Line 1472  cb_menu_search(GtkWidget *window, gpoint
1472    
1473    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1474    
1475    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1476    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);  
1477    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1478    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1479                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1423  cb_menu_search(GtkWidget *window, gpoint Line 1513  cb_menu_search(GtkWidget *window, gpoint
1513                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1514  #endif  #endif
1515    
1516      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1517        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1518      else      else
1519        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1520    
1521      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1522        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1523      else      else
1524        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1525    
1526      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1527        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1528      else      else
1529        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1530    
1531      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1532        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1533      else      else
1534        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1535    
1536      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1537        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1538      else      else
1539        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1456  cb_menu_search(GtkWidget *window, gpoint Line 1546  cb_menu_search(GtkWidget *window, gpoint
1546    
1547        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1548    
1549  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1550        gpx_t *found =        gpx_t *found =
1551          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1552    
# Line 1552  cb_menu_export_log(GtkWidget *widget, gp Line 1642  cb_menu_export_log(GtkWidget *widget, gp
1642    notes_log_export(appdata);    notes_log_export(appdata);
1643  }  }
1644    
1645  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1646  static void  static void
1647  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1648    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1588  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 1671  static void submenu_cleanup(GtkWidget *m Line 1766  static void submenu_cleanup(GtkWidget *m
1766  }  }
1767    
1768  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1769    #ifdef ENABLE_MAEMO_MAPPER
1770    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1771      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1772    #endif
1773    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1774      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1775    { "Export Garmin GPX",       "Save modified waypoints in GPX file",    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
# Line 1700  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 1782  void menu_create(appdata_t *appdata) { Line 1881  void menu_create(appdata_t *appdata) {
1881    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1882    menu = gtk_menu_new();    menu = gtk_menu_new();
1883    
1884  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1885    appdata->menu_import =    appdata->menu_import =
1886  #endif  #endif
1887    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1812  void menu_create(appdata_t *appdata) { Line 1911  void menu_create(appdata_t *appdata) {
1911    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1912  #endif  #endif
1913    
1914  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1915    appdata->menu_export =    appdata->menu_export =
1916  #endif  #endif
1917      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1820  void menu_create(appdata_t *appdata) { Line 1919  void menu_create(appdata_t *appdata) {
1919    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1920    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1921    
1922  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1923    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1924    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1925    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1837  void menu_create(appdata_t *appdata) { Line 1936  void menu_create(appdata_t *appdata) {
1936    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1937                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1938    
1939  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1940    appdata->menu_search =    appdata->menu_search =
1941  #endif  #endif
1942    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1846  void menu_create(appdata_t *appdata) { Line 1945  void menu_create(appdata_t *appdata) {
1945    
1946    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1947    
 #ifndef NO_COPY_N_PASTE  
1948    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1949    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1950    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1951    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1952    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1904  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)
# Line 2044  gboolean on_window_key_press(GtkWidget * Line 2145  gboolean on_window_key_press(GtkWidget *
2145    return handled;    return handled;
2146  }  }
2147    
2148  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2149  typedef struct {  typedef struct {
2150    int level;    int level;
2151    appdata_t *appdata;    appdata_t *appdata;
# Line 2136  crumb_back(gpointer data) { Line 2237  crumb_back(gpointer data) {
2237    
2238    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2239    g_free(data);    g_free(data);
2240    
2241    #ifdef ENABLE_OSM_GPS_MAP
2242      map_update(crumb->appdata);
2243    #endif
2244  }  }
2245    
2246  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 2176  static void crumb_add(appdata_t *appdata Line 2281  static void crumb_add(appdata_t *appdata
2281  #endif  #endif
2282    }    }
2283    
2284    #ifdef USE_BREAD_CRUMB_TRAIL
2285    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2286                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2287    #else
2288      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2289    #endif
2290    
2291    #ifdef ENABLE_OSM_GPS_MAP
2292      map_update(appdata);
2293    #endif
2294  }  }
2295  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2296    
# Line 2189  void main_after_settings_redraw(appdata_ Line 2302  void main_after_settings_redraw(appdata_
2302      return;      return;
2303    }    }
2304    
 #ifndef USE_MAEMO  
   // in non-maemo setup this can only affect the main screen as  
   // the menu is blocked while a dialog is open. also the main  
   // screen is always present  
   if(appdata->gpxlist_items != appdata->cur_items) {  
     /* re-do the main screen */  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   }  
 #else  
2305    /* a cache screen cannot be changed from the settings and thus doesn't */    /* a cache screen cannot be changed from the settings and thus doesn't */
2306    /* need to be redrawn */    /* need to be redrawn */
2307    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2255  void main_after_settings_redraw(appdata_ Line 2356  void main_after_settings_redraw(appdata_
2356    
2357      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2358    }    }
 #endif // USE_MAEMO  
2359  }  }
2360    
2361  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2276  int main(int argc, char *argv[]) { Line 2376  int main(int argc, char *argv[]) {
2376    
2377    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2378    
2379      curl_global_init(CURL_GLOBAL_ALL);
2380    
2381  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2382    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2383    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2284  int main(int argc, char *argv[]) { Line 2386  int main(int argc, char *argv[]) {
2386      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2387    }    }
2388    
2389    #ifdef ENABLE_MAEMO_MAPPER
2390    dbus_register(&appdata);    dbus_register(&appdata);
2391  #endif  #endif
2392    #endif
2393    
2394    icons_init();    icons_init();
2395    
# Line 2309  int main(int argc, char *argv[]) { Line 2413  int main(int argc, char *argv[]) {
2413    /* Create a Window. */    /* Create a Window. */
2414    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2415    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2416    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2417  #endif  #endif
2418    
2419  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2322  int main(int argc, char *argv[]) { Line 2426  int main(int argc, char *argv[]) {
2426    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2427                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2428    
2429      /* prepare clipboard */
2430      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2431      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2432    
2433    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2434    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2435  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
# Line 2337  int main(int argc, char *argv[]) { Line 2445  int main(int argc, char *argv[]) {
2445    gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2446    
2447    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2448    #else
2449    #ifdef BCT
2450      /* on non-hildon machines we use some custom made breadcrumbtrail */
2451      /* replacement */
2452      appdata.bct = bct_new();
2453      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2454    #endif
2455    #endif
2456    
2457    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2458    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2459  #endif  #endif
2460    
Legend:
Removed from v.120  
changed lines
  Added in v.205