Diff of /trunk/src/main.c

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

revision 130 by harbaum, Wed Sep 30 12:11:22 2009 UTC revision 204 by harbaum, Mon Nov 23 18:32:06 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>
# 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,
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
106                             GTK_MESSAGE_ERROR,                             GTK_MESSAGE_ERROR,
 #else  
                            GTK_MESSAGE_OTHER,  
 #endif  
107                             GTK_BUTTONS_CLOSE, 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 147  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 209  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 226  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  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)      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 465  static GtkWidget *cachelist_create(appda Line 477  static GtkWidget *cachelist_create(appda
477      int type = (cache->type<<8) +      int type = (cache->type<<8) +
478        (cache->notes?4:0) +        (cache->notes?4:0) +
479        ((cache->notes && cache->notes->override)?1:0) +        ((cache->notes && cache->notes->override)?1:0) +
480        ((cache->notes && cache->notes->found)?2:0);        (((cache->notes && cache->notes->found)||cache->found)?2:0);
481    
482      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
483    
# Line 678  static void gpxlist_set(GtkListStore *st Line 690  static void gpxlist_set(GtkListStore *st
690                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
691                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
692  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
693                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),
694  #endif  #endif
695                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
696                       -1);                       -1);
# Line 724  static void gpxlist_close(appdata_t *app Line 736  static void gpxlist_close(appdata_t *app
736    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
737  }  }
738    
739    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
740    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
741    #ifdef USE_STACKABLE_WINDOW
742      if(!appdata->cur_gpx)
743    #endif
744        cachelist_dialog(appdata, gpx);
745    #ifdef USE_STACKABLE_WINDOW
746      else
747        printf("selected gpx, but cachelist window already present\n");
748    #endif
749    #else
750      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
751      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
752      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
753      gtk_widget_show_all(appdata->vbox);
754    
755      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
756    #endif
757    }
758    
759  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
760                            GtkTreePath        *path,                            GtkTreePath        *path,
761                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 750  static void gpxlist_view_onRowActivated( Line 782  static void gpxlist_view_onRowActivated(
782      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
783        printf("clicked delete\n");        printf("clicked delete\n");
784    
785    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
786        /* ask user what he wants */        /* ask user what he wants */
787        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
788                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
789                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
790                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   GTK_MESSAGE_QUESTION,
791                     GTK_BUTTONS_CANCEL,
792                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
793                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
794    
# Line 763  static void gpxlist_view_onRowActivated( Line 797  static void gpxlist_view_onRowActivated(
797                               _("Close"), 2,                               _("Close"), 2,
798                               NULL);                               NULL);
799    
800          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
801    #else
802    
803          GtkWidget *dialog =
804            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
805                                GTK_WINDOW(appdata->window),
806                                GTK_DIALOG_DESTROY_WITH_PARENT,
807                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
808                                _("Remove"), 1,
809                                _("Close"), 2,
810                                NULL);
811    
812          GtkWidget *content_area =
813            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
814    
815          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
816    
817          gtk_box_pack_start(GTK_BOX(hbox),
818             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
819                                       GTK_ICON_SIZE_DIALOG),
820                             FALSE, FALSE, 0);
821    
822          GtkWidget *label = gtk_label_new(
823                      _("Do you want to close this entry only or do "
824                        "you want to remove it completely from the list?"));
825    
826          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
827          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
828    
829          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
830          gtk_container_add (GTK_CONTAINER (content_area), hbox);
831    
832          gtk_widget_show_all (dialog);
833    #endif
834    
835        if(gpx->closed)        if(gpx->closed)
836          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
837    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));  
   
838        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
839        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
840    
# Line 797  static void gpxlist_view_onRowActivated( Line 864  static void gpxlist_view_onRowActivated(
864          gpx_t *new = NULL;          gpx_t *new = NULL;
865    
866          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
867            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
868          else          else
869            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
870    
871          if(new) {          if(new) {
872            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 835  static void gpxlist_view_onRowActivated( Line 902  static void gpxlist_view_onRowActivated(
902    
903          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
904        }        }
905  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)  
906  #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  
907      }      }
908    }    }
909  }  }
# Line 906  static GtkWidget *gpxlist_create_view_an Line 958  static GtkWidget *gpxlist_create_view_an
958    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
959                    -1, "Icon", renderer,                    -1, "Icon", renderer,
960                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
961                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
962            /* at least one entry needs to be sensitive. */
963            /* This is the delete icon if the PANNABLE_AREA is used */
964                      "sensitive", GPXLIST_COL_OPEN,
965    #endif
966                    NULL);                    NULL);
967    
968    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 962  static GtkWidget *gpxlist_create_view_an Line 1018  static GtkWidget *gpxlist_create_view_an
1018    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
1019                    -1, "Del", renderer,                    -1, "Del", renderer,
1020                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
1021                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
1022                    NULL);                    NULL);
1023  #endif  #endif
1024    
# Line 1073  cb_menu_about(GtkWidget *window, gpointe Line 1129  cb_menu_about(GtkWidget *window, gpointe
1129    const gchar *authors[] = {    const gchar *authors[] = {
1130      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
1131      "John Stowers <john.stowers@gmail.com>",      "John Stowers <john.stowers@gmail.com>",
1132        "GCVote: Guido Wegener <guido.wegener@gmx.de>",
1133      NULL };      NULL };
1134    
1135    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
# Line 1095  cb_menu_about(GtkWidget *window, gpointe Line 1152  cb_menu_about(GtkWidget *window, gpointe
1152    
1153    GtkWidget *button = gtk_button_new();    GtkWidget *button = gtk_button_new();
1154    gtk_button_set_image(GTK_BUTTON(button),    gtk_button_set_image(GTK_BUTTON(button),
1155                         icon_get_widget(ICON_MISC, 8));                         icon_get_widget(ICON_MISC, 5));
1156    gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);    gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1157    g_signal_connect(button, "clicked",    g_signal_connect(button, "clicked",
1158                     G_CALLBACK(on_paypal_button_clicked), &context);                     G_CALLBACK(on_paypal_button_clicked), &context);
# Line 1281  gpx_t *search_do(appdata_t *appdata, gpx Line 1338  gpx_t *search_do(appdata_t *appdata, gpx
1338        else if(cache->long_description && (what & SEARCH_DESC) &&        else if(cache->long_description && (what & SEARCH_DESC) &&
1339                strcasestr(cache->long_description, phrase))                strcasestr(cache->long_description, phrase))
1340          hit = 1;          hit = 1;
1341        else if(cache->owner && (what & SEARCH_OWNER) &&        else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) &&
1342                strcasestr(cache->owner, phrase))                strcasestr(cache->owner->name, phrase))
1343          hit = 1;          hit = 1;
1344    
1345        if(hit) {        if(hit) {
# Line 1311  typedef struct { Line 1368  typedef struct {
1368    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1369  } search_context_t;  } search_context_t;
1370    
1371    
1372    static GtkWidget *check_button_new_with_label(char *label) {
1373    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1374      return gtk_check_button_new_with_label(label);
1375    #else
1376      GtkWidget *cbut =
1377        hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
1378      gtk_button_set_label(GTK_BUTTON(cbut), label);
1379      return cbut;
1380    #endif
1381    }
1382    
1383    static void check_button_set_active(GtkWidget *button, gboolean active) {
1384    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1385      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
1386    #else
1387      hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
1388    #endif
1389    }
1390    
1391    static gboolean check_button_get_active(GtkWidget *button) {
1392    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1393      return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
1394    #else
1395      return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));
1396    #endif
1397    }
1398    
1399  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1400    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1401    
1402    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1403    
1404    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1405    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1345  cb_menu_search(GtkWidget *window, gpoint Line 1429  cb_menu_search(GtkWidget *window, gpoint
1429    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1430    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1431    
1432    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1433    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);  
1434    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);
1435    
1436    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1437    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);  
1438    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);
1439    
1440    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1441    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);  
1442    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);
1443    
1444    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1445    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);  
1446    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);
1447    
1448    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 1371  cb_menu_search(GtkWidget *window, gpoint Line 1451  cb_menu_search(GtkWidget *window, gpoint
1451    
1452    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1453                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1454    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1455      context.entry = gtk_entry_new();
1456    #else
1457      context.entry = hildon_entry_new(HILDON_SIZE_AUTO);
1458    #endif
1459    
1460    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1461                                context.entry = gtk_entry_new());                                context.entry);
1462    
1463    if(appdata->search_str)    if(appdata->search_str)
1464      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1465    
# Line 1383  cb_menu_search(GtkWidget *window, gpoint Line 1470  cb_menu_search(GtkWidget *window, gpoint
1470    
1471    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1472    
1473    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1474    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);  
1475    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1476    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1477                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1425  cb_menu_search(GtkWidget *window, gpoint Line 1511  cb_menu_search(GtkWidget *window, gpoint
1511                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1512  #endif  #endif
1513    
1514      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1515        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1516      else      else
1517        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1518    
1519      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1520        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1521      else      else
1522        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1523    
1524      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1525        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1526      else      else
1527        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1528    
1529      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1530        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1531      else      else
1532        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1533    
1534      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1535        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1536      else      else
1537        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1590  cb_menu_precpos(GtkWidget *window, gpoin Line 1676  cb_menu_precpos(GtkWidget *window, gpoin
1676    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1677  }  }
1678    
1679    static void
1680    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1681      geotoad((appdata_t *)data);
1682    }
1683    
1684  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1685  typedef struct {  typedef struct {
1686    char *label, *desc;    char *label, *desc;
# Line 1704  static const menu_entry_t submenu_tools_ Line 1795  static const menu_entry_t submenu_tools_
1795      G_CALLBACK(cb_menu_geotext) },      G_CALLBACK(cb_menu_geotext) },
1796    { "Precise Position", "Calculate a precise GPS position",    { "Precise Position", "Calculate a precise GPS position",
1797      G_CALLBACK(cb_menu_precpos) },      G_CALLBACK(cb_menu_precpos) },
1798      { "GeoToad",          "Use GeoToad online downloader",
1799        G_CALLBACK(cb_menu_geotoad) },
1800    { NULL, NULL, NULL }    { NULL, NULL, NULL }
1801  };  };
1802    
# Line 1850  void menu_create(appdata_t *appdata) { Line 1943  void menu_create(appdata_t *appdata) {
1943    
1944    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1945    
 #ifndef NO_COPY_N_PASTE  
1946    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1947    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1948    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1949    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1950    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1908  void menu_create(appdata_t *appdata) { Line 1998  void menu_create(appdata_t *appdata) {
1998    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1999                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2000    
2001      item = gtk_menu_item_new_with_label( _("GeoToad") );
2002      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2003      g_signal_connect(item, "activate",
2004                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2005    
2006    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2007    
2008  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 2279  int main(int argc, char *argv[]) { Line 2374  int main(int argc, char *argv[]) {
2374    
2375    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2376    
2377      curl_global_init(CURL_GLOBAL_ALL);
2378    
2379  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2380    printf("Installing osso context for \"org.harbaum." APP "\"\n");    printf("Installing osso context for \"org.harbaum." APP "\"\n");
2381    appdata.osso_context = osso_initialize("org.harbaum."APP,    appdata.osso_context = osso_initialize("org.harbaum."APP,
# Line 2327  int main(int argc, char *argv[]) { Line 2424  int main(int argc, char *argv[]) {
2424    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2425                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2426    
2427      /* prepare clipboard */
2428      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2429      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2430    
2431    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2432    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2433  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
Legend:
Removed from v.130  
changed lines
  Added in v.204