Diff of /trunk/src/main.c

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

revision 157 by harbaum, Tue Nov 3 20:20:39 2009 UTC revision 206 by harbaum, Tue Nov 24 12:42:31 2009 UTC
# Line 15  Line 15 
15   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
16   */   */
17    
18  #include <stdio.h>  #define __USE_GNU
19  #include <string.h>  #include <string.h>
20    
21    #include <stdio.h>
22  #include <math.h>  #include <math.h>
23    
24  #include <curl/curl.h>  #include <curl/curl.h>
# Line 31  Line 33 
33    
34  #ifdef USE_MAEMO  #ifdef USE_MAEMO
35  #include <hildon/hildon-banner.h>  #include <hildon/hildon-banner.h>
36    #if MAEMO_VERSION_MAJOR >= 5
37    #include <hildon/hildon-note.h>
38    #include <hildon/hildon-entry.h>
39    #include <hildon/hildon-check-button.h>
40    #endif
41  #endif  #endif
42    
43  #include <locale.h>  #include <locale.h>
# Line 94  void errorf(const char *fmt, ...) { Line 101  void errorf(const char *fmt, ...) {
101      }      }
102    }    }
103    
104    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
105    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
106                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
107                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
108                             GTK_MESSAGE_ERROR,                             GTK_MESSAGE_ERROR,
 #else  
                            GTK_MESSAGE_OTHER,  
 #endif  
109                             GTK_BUTTONS_CLOSE, buf);                             GTK_BUTTONS_CLOSE, buf);
110    
111    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
112    #else
113      GtkWidget *dialog =
114        hildon_note_new_information(GTK_WINDOW(NULL), buf);
115    #endif
116    
117    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
118    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
# Line 149  gpx_t *choose_file(appdata_t *appdata, g Line 157  gpx_t *choose_file(appdata_t *appdata, g
157        gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
158    
159        if(!whole_dir)        if(!whole_dir)
160          gpx = gpx_parse(dialog, filename);          gpx = gpx_parse(dialog, filename, appdata->username);
161        else {        else {
162          /* cur trailing '/' if present */          /* cur trailing '/' if present */
163          if(strlastchr(filename) == '/')          if(strlastchr(filename) == '/')
164            filename[strlen(filename)] = 0;            filename[strlen(filename)] = 0;
165    
166          gpx = gpx_parse_dir(dialog, filename);          gpx = gpx_parse_dir(dialog, filename, appdata->username);
167        }        }
168    
169        gpx_busy_dialog_destroy(dialog);        gpx_busy_dialog_destroy(dialog);
170    
171        /* save path if gpx was successfully loaded */        /* save path if gpx was successfully loaded */
# Line 468  static GtkWidget *cachelist_create(appda Line 476  static GtkWidget *cachelist_create(appda
476      if(tint > 8) tint = 8;      if(tint > 8) tint = 8;
477    
478      /* cache type includes "solved" flag in lowest bit */      /* cache type includes "solved" flag in lowest bit */
479      int type = (cache->type<<8) +      int type = cache->type<<8;
480        (cache->notes?4:0) +      if(cache->notes) type |= 4;
481        ((cache->notes && cache->notes->override)?1:0) +      if(cache->notes && cache->notes->override) type |= 1;
482        ((cache->notes && cache->notes->found)?2:0);      if(cache->notes && cache->notes->found) type |= 2;
483        if(cache->found) type |= 2;
484        if(cache->mine) type |= 8;
485    
486      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
487    
# Line 684  static void gpxlist_set(GtkListStore *st Line 694  static void gpxlist_set(GtkListStore *st
694                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
695                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
696  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
697                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 7),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),
698  #endif  #endif
699                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
700                       -1);                       -1);
# Line 776  static void gpxlist_view_onRowActivated( Line 786  static void gpxlist_view_onRowActivated(
786      if(col_name && !strcmp(col_name, "Del")) {      if(col_name && !strcmp(col_name, "Del")) {
787        printf("clicked delete\n");        printf("clicked delete\n");
788    
789    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
790        /* ask user what he wants */        /* ask user what he wants */
791        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
792                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
793                   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  
794                   GTK_MESSAGE_QUESTION,                   GTK_MESSAGE_QUESTION,
 #endif  
795                   GTK_BUTTONS_CANCEL,                   GTK_BUTTONS_CANCEL,
796                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
797                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
# Line 795  static void gpxlist_view_onRowActivated( Line 801  static void gpxlist_view_onRowActivated(
801                               _("Close"), 2,                               _("Close"), 2,
802                               NULL);                               NULL);
803    
804          gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
805    #else
806    
807          GtkWidget *dialog =
808            gtk_dialog_new_with_buttons(_("Close or remove entry?"),
809                                GTK_WINDOW(appdata->window),
810                                GTK_DIALOG_DESTROY_WITH_PARENT,
811                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
812                                _("Remove"), 1,
813                                _("Close"), 2,
814                                NULL);
815    
816          GtkWidget *content_area =
817            gtk_dialog_get_content_area (GTK_DIALOG (dialog));
818    
819          GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
820    
821          gtk_box_pack_start(GTK_BOX(hbox),
822             gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,
823                                       GTK_ICON_SIZE_DIALOG),
824                             FALSE, FALSE, 0);
825    
826          GtkWidget *label = gtk_label_new(
827                      _("Do you want to close this entry only or do "
828                        "you want to remove it completely from the list?"));
829    
830          gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
831          gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD);
832    
833          gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
834          gtk_container_add (GTK_CONTAINER (content_area), hbox);
835    
836          gtk_widget_show_all (dialog);
837    #endif
838    
839        if(gpx->closed)        if(gpx->closed)
840          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
841    
       gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));  
   
842        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
843        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
844    
# Line 829  static void gpxlist_view_onRowActivated( Line 868  static void gpxlist_view_onRowActivated(
868          gpx_t *new = NULL;          gpx_t *new = NULL;
869    
870          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
871            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
872          else          else
873            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
874    
875          if(new) {          if(new) {
876            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 1117  cb_menu_about(GtkWidget *window, gpointe Line 1156  cb_menu_about(GtkWidget *window, gpointe
1156    
1157    GtkWidget *button = gtk_button_new();    GtkWidget *button = gtk_button_new();
1158    gtk_button_set_image(GTK_BUTTON(button),    gtk_button_set_image(GTK_BUTTON(button),
1159                         icon_get_widget(ICON_MISC, 8));                         icon_get_widget(ICON_MISC, 5));
1160    gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);    gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1161    g_signal_connect(button, "clicked",    g_signal_connect(button, "clicked",
1162                     G_CALLBACK(on_paypal_button_clicked), &context);                     G_CALLBACK(on_paypal_button_clicked), &context);
# Line 1333  typedef struct { Line 1372  typedef struct {
1372    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;    GtkWidget *in_id, *in_name, *in_desc, *in_owner, *in_finds;
1373  } search_context_t;  } search_context_t;
1374    
1375    
1376    static GtkWidget *check_button_new_with_label(char *label) {
1377    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1378      return gtk_check_button_new_with_label(label);
1379    #else
1380      GtkWidget *cbut =
1381        hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
1382      gtk_button_set_label(GTK_BUTTON(cbut), label);
1383      return cbut;
1384    #endif
1385    }
1386    
1387    static void check_button_set_active(GtkWidget *button, gboolean active) {
1388    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1389      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
1390    #else
1391      hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
1392    #endif
1393    }
1394    
1395    static gboolean check_button_get_active(GtkWidget *button) {
1396    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1397      return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
1398    #else
1399      return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));
1400    #endif
1401    }
1402    
1403  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1404    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1405    
1406    gboolean in_finds = gtk_toggle_button_get_active(    gboolean in_finds = check_button_get_active(context->in_finds);
           GTK_TOGGLE_BUTTON(context->in_finds));  
1407    
1408    gtk_widget_set_sensitive(context->entry,    !in_finds);    gtk_widget_set_sensitive(context->entry,    !in_finds);
1409    gtk_widget_set_sensitive(context->in_id,    !in_finds);    gtk_widget_set_sensitive(context->in_id,    !in_finds);
# Line 1367  cb_menu_search(GtkWidget *window, gpoint Line 1433  cb_menu_search(GtkWidget *window, gpoint
1433    GtkWidget *table = gtk_table_new(2, 2, TRUE);    GtkWidget *table = gtk_table_new(2, 2, TRUE);
1434    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
1435    
1436    context.in_id = gtk_check_button_new_with_label(_("Waypoint IDs"));    context.in_id = check_button_new_with_label(_("Waypoint IDs"));
1437    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);  
1438    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);
1439    
1440    context.in_name = gtk_check_button_new_with_label(_("Names"));    context.in_name = check_button_new_with_label(_("Names"));
1441    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);  
1442    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);
1443    
1444    context.in_desc = gtk_check_button_new_with_label(_("Descriptions"));    context.in_desc = check_button_new_with_label(_("Descriptions"));
1445    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);  
1446    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);
1447    
1448    context.in_owner = gtk_check_button_new_with_label(_("Owner"));    context.in_owner = check_button_new_with_label(_("Owner"));
1449    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);  
1450    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);
1451    
1452    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
# Line 1393  cb_menu_search(GtkWidget *window, gpoint Line 1455  cb_menu_search(GtkWidget *window, gpoint
1455    
1456    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1457                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1458    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
1459      context.entry = gtk_entry_new();
1460    #else
1461      context.entry = hildon_entry_new(HILDON_SIZE_AUTO);
1462    #endif
1463    
1464    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1465                                context.entry = gtk_entry_new());                                context.entry);
1466    
1467    if(appdata->search_str)    if(appdata->search_str)
1468      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);      gtk_entry_set_text(GTK_ENTRY(context.entry), appdata->search_str);
1469    
# Line 1405  cb_menu_search(GtkWidget *window, gpoint Line 1474  cb_menu_search(GtkWidget *window, gpoint
1474    
1475    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);    GtkWidget *hbox = gtk_hbox_new(FALSE, 5);
1476    
1477    context.in_finds = gtk_check_button_new_with_label(_("Search finds for"));    context.in_finds = check_button_new_with_label(_("Search finds for"));
1478    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);  
1479    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.in_finds);
1480    g_signal_connect(G_OBJECT(context.in_finds), "toggled",    g_signal_connect(G_OBJECT(context.in_finds), "toggled",
1481                     G_CALLBACK(callback_finds_toggled), &context);                     G_CALLBACK(callback_finds_toggled), &context);
# Line 1447  cb_menu_search(GtkWidget *window, gpoint Line 1515  cb_menu_search(GtkWidget *window, gpoint
1515                      HILDON_NUMBER_EDITOR(context.spinner));                      HILDON_NUMBER_EDITOR(context.spinner));
1516  #endif  #endif
1517    
1518      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_finds)))      if(check_button_get_active(context.in_finds))
1519        appdata->search |=  SEARCH_FINDS;        appdata->search |=  SEARCH_FINDS;
1520      else      else
1521        appdata->search &= ~SEARCH_FINDS;        appdata->search &= ~SEARCH_FINDS;
1522    
1523      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_id)))      if(check_button_get_active(context.in_id))
1524        appdata->search |=  SEARCH_ID;        appdata->search |=  SEARCH_ID;
1525      else      else
1526        appdata->search &= ~SEARCH_ID;        appdata->search &= ~SEARCH_ID;
1527    
1528      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_name)))      if(check_button_get_active(context.in_name))
1529        appdata->search |=  SEARCH_NAME;        appdata->search |=  SEARCH_NAME;
1530      else      else
1531        appdata->search &= ~SEARCH_NAME;        appdata->search &= ~SEARCH_NAME;
1532    
1533      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_desc)))      if(check_button_get_active(context.in_desc))
1534        appdata->search |=  SEARCH_DESC;        appdata->search |=  SEARCH_DESC;
1535      else      else
1536        appdata->search &= ~SEARCH_DESC;        appdata->search &= ~SEARCH_DESC;
1537    
1538      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(context.in_owner)))      if(check_button_get_active(context.in_owner))
1539        appdata->search |=  SEARCH_OWNER;        appdata->search |=  SEARCH_OWNER;
1540      else      else
1541        appdata->search &= ~SEARCH_OWNER;        appdata->search &= ~SEARCH_OWNER;
# Line 1612  cb_menu_precpos(GtkWidget *window, gpoin Line 1680  cb_menu_precpos(GtkWidget *window, gpoin
1680    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
1681  }  }
1682    
1683    static void
1684    cb_menu_geotoad(GtkWidget *window, gpointer data) {
1685      geotoad((appdata_t *)data);
1686    }
1687    
1688  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1689  typedef struct {  typedef struct {
1690    char *label, *desc;    char *label, *desc;
# Line 1726  static const menu_entry_t submenu_tools_ Line 1799  static const menu_entry_t submenu_tools_
1799      G_CALLBACK(cb_menu_geotext) },      G_CALLBACK(cb_menu_geotext) },
1800    { "Precise Position", "Calculate a precise GPS position",    { "Precise Position", "Calculate a precise GPS position",
1801      G_CALLBACK(cb_menu_precpos) },      G_CALLBACK(cb_menu_precpos) },
1802      { "GeoToad",          "Use GeoToad online downloader",
1803        G_CALLBACK(cb_menu_geotoad) },
1804    { NULL, NULL, NULL }    { NULL, NULL, NULL }
1805  };  };
1806    
# Line 1927  void menu_create(appdata_t *appdata) { Line 2002  void menu_create(appdata_t *appdata) {
2002    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
2003                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
2004    
2005      item = gtk_menu_item_new_with_label( _("GeoToad") );
2006      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
2007      g_signal_connect(item, "activate",
2008                       GTK_SIGNAL_FUNC(cb_menu_geotoad), appdata);
2009    
2010    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
2011    
2012  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
Legend:
Removed from v.157  
changed lines
  Added in v.206