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 205 by harbaum, Mon Nov 23 20:12:22 2009 UTC
# Line 31  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 94  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 149  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 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 684  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 776  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,
                  /* this doesn't fix the text selection issues ... */  
 #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >=5)  
                  GTK_MESSAGE_OTHER,  
 #else  
792                   GTK_MESSAGE_QUESTION,                   GTK_MESSAGE_QUESTION,
 #endif  
793                   GTK_BUTTONS_CANCEL,                   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?"));
# Line 795  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), _("Close or 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 829  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 1117  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 1333  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 1367  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 1393  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 1405  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 1447  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 1612  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 1726  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 1927  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)
Legend:
Removed from v.157  
changed lines
  Added in v.205