Diff of /trunk/src/misc.c

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

revision 221 by harbaum, Mon Nov 30 21:28:04 2009 UTC revision 223 by harbaum, Tue Dec 1 20:03:51 2009 UTC
# Line 17  Line 17 
17   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
18   */   */
19    
20    /* TODO:
21    */
22    
23  #include <math.h>  #include <math.h>
24  #include <string.h>  #include <string.h>
25  #include <ctype.h>  #include <ctype.h>
# Line 35  Line 38 
38    
39  float roundf(float x);  float roundf(float x);
40    
41  /* TODO: make coordinate picker support "changed" signal */  /* Enable special fremantle UI elements. These particular widgets */
42    /* don't use any hildon/fremantle specific parts and can thus even */
43    /* be used under plain gtk. This is mainly for testing and developemt */
44  #ifdef FREMANTLE  #ifdef FREMANTLE
45  #define PRESET_PICKER_DIALOG  #define PRESET_PICKER_DIALOG
46  #define COORDINATE_PICKER  #define COORDINATE_PICKER
# Line 311  float distance_parse(char *str, gboolean Line 315  float distance_parse(char *str, gboolean
315    
316  /* ------------------ coordinate picker tool --------------------------- */  /* ------------------ coordinate picker tool --------------------------- */
317    
318    #ifndef COORDINATE_PICKER
319  static gboolean mark(GtkWidget *widget, gboolean valid) {  static gboolean mark(GtkWidget *widget, gboolean valid) {
320    gtk_widget_set_state(widget, valid?GTK_STATE_NORMAL:TAG_STATE);    gtk_widget_set_state(widget, valid?GTK_STATE_NORMAL:TAG_STATE);
321    return valid;    return valid;
322  }  }
323    
324  #ifndef COORDINATE_PICKER  GtkWidget *red_entry_new(void) {
325      GdkColor color;
326    
327      GtkWidget *widget = entry_new();
328      gdk_color_parse("#ff0000", &color);
329      gtk_widget_modify_text(widget, TAG_STATE, &color);
330      return widget;
331    }
332    
333  static void callback_modified_lat(GtkWidget *widget, gpointer data ) {  static void callback_modified_lat(GtkWidget *widget, gpointer data ) {
334    float i = pos_parse_lat((char*)gtk_entry_get_text(GTK_ENTRY(widget)));    float i = pos_parse_lat((char*)gtk_entry_get_text(GTK_ENTRY(widget)));
335    mark(widget, !isnan(i));    mark(widget, !isnan(i));
336  }  }
337  #else  #else
338  static GtkWidget *letter_picker_create(char *a, char *b, int sel) {  static void picker_center_iter(GtkWidget *view, GtkTreeIter *iter) {
339      /* select new iter */
340      GtkTreeSelection *selection =
341        gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
342      GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
343      gtk_tree_selection_select_iter(selection, iter);
344      GtkTreePath *path =
345        gtk_tree_model_get_path(model, iter);
346      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(view),
347                                   path, NULL, TRUE, 0.5, 0.5);
348      gtk_tree_path_free(path);
349    }
350    
351    static void on_picker_activated(GtkTreeView        *treeview,
352                                    GtkTreePath        *path,
353                                    GtkTreeViewColumn  *col,
354                                    gpointer            userdata) {
355      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(treeview),
356                                   path, NULL, TRUE, 0.5, 0.5);
357    }
358    
359    #define DUMMY_NUM  1
360    
361    static void dummy_append(GtkListStore *store, int n) {
362      GtkTreeIter iter;
363    
364      while(n--) {
365        gtk_list_store_append (store, &iter);
366        gtk_list_store_set(store, &iter, 0, "", 1, -1, 2, FALSE, -1);
367      }
368    }
369    
370    static GtkWidget *string_picker_create(const char *str[], int sel) {
371  #ifndef FREMANTLE  #ifndef FREMANTLE
372    GtkWidget *view = gtk_tree_view_new();    GtkWidget *view = gtk_tree_view_new();
373  #else  #else
# Line 337  static GtkWidget *letter_picker_create(c Line 382  static GtkWidget *letter_picker_create(c
382    GtkCellRenderer *renderer = gtk_cell_renderer_text_new();    GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
383    g_object_set(renderer, "xalign", 0.5, NULL );    g_object_set(renderer, "xalign", 0.5, NULL );
384    gtk_tree_view_insert_column_with_attributes(    gtk_tree_view_insert_column_with_attributes(
385        GTK_TREE_VIEW(view), -1, "char", renderer, "text", 0, NULL);        GTK_TREE_VIEW(view), -1, "str", renderer,
386          "text", 0,
387          "sensitive", 2,
388          NULL);
389    
390    GtkListStore *store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);    GtkListStore *store =
391        gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
392    
393    /* add digits */    dummy_append(store, DUMMY_NUM);
394    GtkTreeIter iter_a, iter_b;  
395    gtk_list_store_append (store, &iter_a);    /* add strings */
396    gtk_list_store_set(store, &iter_a, 0, _(a), 1, 0, -1);    GtkTreeIter iter, siter;
397    gtk_list_store_append (store, &iter_b);    int i;
398    gtk_list_store_set(store, &iter_b, 0, _(b), 1, 1, -1);    for(i=0;*str;str++,i++) {
399        gtk_list_store_append (store, &iter);
400        gtk_list_store_set(store, &iter, 0, _(*str), 1, i, 2, TRUE, -1);
401        if(i == sel) siter = iter;
402      }
403    
404      dummy_append(store, DUMMY_NUM);
405    
406    gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(store));    gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(store));
407    g_object_unref(store);    g_object_unref(store);
408    
409    #ifndef FREMANTLE
410      g_signal_connect(view, "row-activated",
411                       (GCallback)on_picker_activated, NULL);
412    #else
413      g_signal_connect(view, "hildon-row-tapped",
414                       (GCallback)on_picker_activated, NULL);
415    #endif
416    
417    /* select right character */    /* select right character */
418    GtkTreeIter iter = (!sel)?iter_a:iter_b;    gtk_tree_selection_select_iter(selection, &siter);
419    gtk_tree_selection_select_iter(selection, &iter);    picker_center_iter(view, &siter);
   GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);  
   gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(view),  
                                path, NULL, TRUE, 0.5, 0.5);  
   gtk_tree_path_free(path);  
420    
421    /* put this inside a scrolled view */    /* put this inside a scrolled view */
422  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
# Line 392  static int picker_get(GtkWidget *widget) Line 451  static int picker_get(GtkWidget *widget)
451    return retval;    return retval;
452  }  }
453    
   
454  static GtkWidget *digit_picker_create(int min, int max, int sel) {  static GtkWidget *digit_picker_create(int min, int max, int sel) {
455  #ifndef FREMANTLE  #ifndef FREMANTLE
456    GtkWidget *view = gtk_tree_view_new();    GtkWidget *view = gtk_tree_view_new();
# Line 408  static GtkWidget *digit_picker_create(in Line 466  static GtkWidget *digit_picker_create(in
466    GtkCellRenderer *renderer = gtk_cell_renderer_text_new();    GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
467    g_object_set(renderer, "xalign", 0.5, NULL );    g_object_set(renderer, "xalign", 0.5, NULL );
468    gtk_tree_view_insert_column_with_attributes(    gtk_tree_view_insert_column_with_attributes(
469        GTK_TREE_VIEW(view), -1, "digit", renderer, "text", 0, NULL);        GTK_TREE_VIEW(view), -1, "digit", renderer,
470          "text", 0,
471          "sensitive", 2,
472          NULL);
473    
474    GtkListStore *store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);    GtkListStore *store =
475        gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
476    
477      dummy_append(store, DUMMY_NUM);
478    
479    /* add digits */    /* add digits */
480    int i;    int i;
# Line 420  static GtkWidget *digit_picker_create(in Line 484  static GtkWidget *digit_picker_create(in
484      GtkTreeIter     iter;      GtkTreeIter     iter;
485      /* Append a row and fill in some data */      /* Append a row and fill in some data */
486      gtk_list_store_append (store, &iter);      gtk_list_store_append (store, &iter);
487      gtk_list_store_set(store, &iter, 0, str, 1, i, -1);      gtk_list_store_set(store, &iter, 0, str, 1, i, 2, TRUE, -1);
488    
489      if(i == sel) siter = iter;      if(i == sel) siter = iter;
490    }    }
491    
492      dummy_append(store, DUMMY_NUM);
493    
494    gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(store));    gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(store));
495    g_object_unref(store);    g_object_unref(store);
496    
497    #ifndef FREMANTLE
498      g_signal_connect(view, "row-activated",
499                       (GCallback)on_picker_activated, NULL);
500    #else
501      g_signal_connect(view, "hildon-row-tapped",
502                       (GCallback)on_picker_activated, NULL);
503    #endif
504    
505    gtk_tree_selection_select_iter(selection, &siter);    gtk_tree_selection_select_iter(selection, &siter);
506    GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &siter);    picker_center_iter(view, &siter);
   gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(view),  
                                path, NULL, TRUE, 0.5, 0.5);  
   gtk_tree_path_free(path);  
507    
508    /* put this inside a scrolled view */    /* put this inside a scrolled view */
509  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
# Line 460  static gint on_lat_picker_button_press(G Line 531  static gint on_lat_picker_button_press(G
531            _("Done"),        GTK_RESPONSE_ACCEPT,            _("Done"),        GTK_RESPONSE_ACCEPT,
532            NULL);            NULL);
533    
534      gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 200);      gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 210);
535    
536      int i, lat = (int)g_object_get_data(G_OBJECT(button), "latitude");      int i, lat = (int)g_object_get_data(G_OBJECT(button), "latitude");
537    
# Line 476  static gint on_lat_picker_button_press(G Line 547  static gint on_lat_picker_button_press(G
547    
548      /* create N/S 89° 99.999 */      /* create N/S 89° 99.999 */
549      GtkWidget *hbox = gtk_hbox_new(FALSE, 0);      GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
550        static const char *ns[] = { "N", "S", NULL };
551      gtk_box_pack_start_defaults(GTK_BOX(hbox),      gtk_box_pack_start_defaults(GTK_BOX(hbox),
552                  signw = letter_picker_create("N","S", sign));                  signw = string_picker_create(ns, sign));
553    
554      gtk_box_pack_start_defaults(GTK_BOX(hbox),      gtk_box_pack_start_defaults(GTK_BOX(hbox),
555                  degw[0] = digit_picker_create(0,8, deg/10));                  degw[0] = digit_picker_create(0,8, deg/10));
# Line 503  static gint on_lat_picker_button_press(G Line 575  static gint on_lat_picker_button_press(G
575      gtk_widget_show_all(dialog);      gtk_widget_show_all(dialog);
576      if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {      if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
577    
       /* parse N/S */  
       sign = picker_get(signw)?-1:1;  
   
578        /* parse degrees ... */        /* parse degrees ... */
579        for(deg=0,i=0;i<2;i++)        for(deg=0,i=0;i<2;i++)
580          deg = 10 * deg + picker_get(degw[i]);          deg = 10 * deg + picker_get(degw[i]);
# Line 518  static gint on_lat_picker_button_press(G Line 587  static gint on_lat_picker_button_press(G
587        for(minfrac=0,i=0;i<3;i++)        for(minfrac=0,i=0;i<3;i++)
588          minfrac = 10 * minfrac + picker_get(minfracw[i]);          minfrac = 10 * minfrac + picker_get(minfracw[i]);
589    
590          /* parse N/S */
591          if(deg | min | minfrac)
592            sign = picker_get(signw)?-1:1;
593          else
594            sign = 1;   // theres no S 00 00.000
595    
596        float latitude = sign * (deg + min/60.0 + minfrac/60000.0);        float latitude = sign * (deg + min/60.0 + minfrac/60000.0);
597        lat_entry_set(button, latitude);        lat_entry_set(button, latitude);
598      }      }
# Line 559  GtkWidget *lat_entry_new(float lat) { Line 634  GtkWidget *lat_entry_new(float lat) {
634    gtk_signal_connect(GTK_OBJECT(widget), "button-press-event",    gtk_signal_connect(GTK_OBJECT(widget), "button-press-event",
635                       (GtkSignalFunc)on_lat_picker_button_press, NULL);                       (GtkSignalFunc)on_lat_picker_button_press, NULL);
636  #endif  #endif
637    
638    return widget;    return widget;
639  }  }
640    
# Line 581  static gint on_lon_picker_button_press(G Line 656  static gint on_lon_picker_button_press(G
656            _("Done"),        GTK_RESPONSE_ACCEPT,            _("Done"),        GTK_RESPONSE_ACCEPT,
657            NULL);            NULL);
658    
659      gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 200);      gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 210);
660    
661      int i, lat = (int)g_object_get_data(G_OBJECT(button), "longitude");      int i, lat = (int)g_object_get_data(G_OBJECT(button), "longitude");
662    
# Line 596  static gint on_lon_picker_button_press(G Line 671  static gint on_lon_picker_button_press(G
671    
672      /* create E/W 179° 99.999 */      /* create E/W 179° 99.999 */
673      GtkWidget *hbox = gtk_hbox_new(FALSE, 0);      GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
674        static const char *ew[] = { "E", "W", NULL };
675      gtk_box_pack_start_defaults(GTK_BOX(hbox),      gtk_box_pack_start_defaults(GTK_BOX(hbox),
676                  signw = letter_picker_create("E","W", sign));                  signw = string_picker_create(ew, sign));
677    
678      gtk_box_pack_start_defaults(GTK_BOX(hbox),      gtk_box_pack_start_defaults(GTK_BOX(hbox),
679                  degw[0] = digit_picker_create(0,1, deg/100));                  degw[0] = digit_picker_create(0,1, deg/100));
# Line 625  static gint on_lon_picker_button_press(G Line 701  static gint on_lon_picker_button_press(G
701      gtk_widget_show_all(dialog);      gtk_widget_show_all(dialog);
702      if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {      if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
703    
       /* parse E/W */  
       sign = picker_get(signw)?-1:1;  
   
704        /* parse degrees ... */        /* parse degrees ... */
705        for(deg=0,i=0;i<3;i++)        for(deg=0,i=0;i<3;i++)
706          deg = 10 * deg + picker_get(degw[i]);          deg = 10 * deg + picker_get(degw[i]);
# Line 640  static gint on_lon_picker_button_press(G Line 713  static gint on_lon_picker_button_press(G
713        for(minfrac=0,i=0;i<3;i++)        for(minfrac=0,i=0;i<3;i++)
714          minfrac = 10 * minfrac + picker_get(minfracw[i]);          minfrac = 10 * minfrac + picker_get(minfracw[i]);
715    
716          if(deg | min | minfrac)
717            sign = picker_get(signw)?-1:1;
718          else
719            sign = 1;   // theres no W 00 00.000
720    
721        float longitude = sign * (deg + min/60.0 + minfrac/60000.0);        float longitude = sign * (deg + min/60.0 + minfrac/60000.0);
722        lon_entry_set(button, longitude);        lon_entry_set(button, longitude);
723      }      }
# Line 712  void lat_entry_set(GtkWidget *widget, fl Line 790  void lat_entry_set(GtkWidget *widget, fl
790    gtk_button_set_label(GTK_BUTTON(widget), str);    gtk_button_set_label(GTK_BUTTON(widget), str);
791    int lat_int = (int)roundf(lat * 60000);    int lat_int = (int)roundf(lat * 60000);
792    g_object_set_data(G_OBJECT(widget), "latitude", (gpointer)lat_int);    g_object_set_data(G_OBJECT(widget), "latitude", (gpointer)lat_int);
793      g_signal_emit_by_name(widget, "changed");
794  #endif  #endif
795  }  }
796    
# Line 724  void lon_entry_set(GtkWidget *widget, fl Line 803  void lon_entry_set(GtkWidget *widget, fl
803    gtk_button_set_label(GTK_BUTTON(widget), str);    gtk_button_set_label(GTK_BUTTON(widget), str);
804    int lon_int = (int)roundf(lon * 60000);    int lon_int = (int)roundf(lon * 60000);
805    g_object_set_data(G_OBJECT(widget), "longitude", (gpointer)lon_int);    g_object_set_data(G_OBJECT(widget), "longitude", (gpointer)lon_int);
806      g_signal_emit_by_name(widget, "changed");
807  #endif  #endif
808  }  }
809    
# Line 753  void lon_label_attrib_set(GtkWidget *wid Line 833  void lon_label_attrib_set(GtkWidget *wid
833    gtk_label_attrib_set(widget, str, size, strikethrough);    gtk_label_attrib_set(widget, str, size, strikethrough);
834  }  }
835    
836    #ifndef COORDINATE_PICKER
837  static void callback_modified_dist(GtkWidget *widget, gpointer data ) {  static void callback_modified_dist(GtkWidget *widget, gpointer data ) {
838    /* don't care for metric/imperial since we only want to know if this */    /* don't care for metric/imperial since we only want to know if this */
839    /* is parseable at all */    /* is parseable at all */
840    float i = distance_parse((char*)gtk_entry_get_text(GTK_ENTRY(widget)), FALSE);    float i =
841        distance_parse((char*)gtk_entry_get_text(GTK_ENTRY(widget)), FALSE);
842    mark(widget, !isnan(i));    mark(widget, !isnan(i));
843  }  }
844    #else
845    static gint on_dist_picker_button_press(GtkWidget *button,
846                       GdkEventButton *event, gpointer data) {
847    
848      if(event->type == GDK_BUTTON_PRESS) {
849        GtkWidget *dialog =
850          gtk_dialog_new_with_buttons(_("Distance"),
851              GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(button))),
852                                      GTK_DIALOG_MODAL,
853              GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
854              _("Done"),        GTK_RESPONSE_ACCEPT,
855              NULL);
856    
857        gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 210);
858    
859        /* distance is given in m or ft (depending on mil) */
860        int i, dist = (int)g_object_get_data(G_OBJECT(button), "distance");
861        gboolean mil = (gboolean)g_object_get_data(G_OBJECT(button), "mil");
862        int unit = 0;
863    
864        /* parse distance into components */
865        if(mil) {
866          /* 1 mil = 1760 yd = 5280 ft. 1yd = 3 ft */
867          if(dist<95)        { unit = 0; dist *= 100;  }
868          else if(dist<2904) { unit = 1; dist = 100 * dist / 3;  }
869          else               { unit = 2; dist = 5 * dist / 264; }
870        } else {
871          if(dist<1000)      { unit = 3; dist *= 100;  }
872          else               { unit = 4; dist /= 10; }
873        }
874    
875        GtkWidget *distw[4], *fracw[2], *unitw;
876    
877        /* create xxxx.x unit */
878        GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
879    
880        gtk_box_pack_start_defaults(GTK_BOX(hbox),
881                    distw[0] = digit_picker_create(0,9, (dist/100000)%10));
882        gtk_box_pack_start_defaults(GTK_BOX(hbox),
883                    distw[1] = digit_picker_create(0,9, (dist/10000)%10));
884        gtk_box_pack_start_defaults(GTK_BOX(hbox),
885                    distw[2] = digit_picker_create(0,9, (dist/1000)%10));
886        gtk_box_pack_start_defaults(GTK_BOX(hbox),
887                    distw[3] = digit_picker_create(0,9, (dist/100)%10));
888        gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(" . "), FALSE, FALSE, 0);
889        gtk_box_pack_start_defaults(GTK_BOX(hbox),
890                    fracw[0] = digit_picker_create(0,9, (dist/10)%10));
891        gtk_box_pack_start_defaults(GTK_BOX(hbox),
892                    fracw[1] = digit_picker_create(0,9, (dist/1)%10));
893    
894        static const char *units[] = { "ft", "yd", "mi", "m", "km", NULL };
895        gtk_box_pack_start_defaults(GTK_BOX(hbox),
896                    unitw = string_picker_create(units, unit));
897    
898        gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);
899    
900        gtk_widget_show_all(dialog);
901        if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
902    
903          /* parse distance */
904          for(dist=0,i=0;i<4;i++)
905            dist = 10 * dist + picker_get(distw[i]);
906    
907          for(i=0;i<2;i++)
908            dist = 10 * dist + picker_get(fracw[i]);
909    
910          unit = picker_get(unitw);
911          if(unit == 0)      { dist /= 100; }         // ft
912          else if(unit == 1) { dist = 3*dist/100; }   // yd
913          else if(unit == 2) { dist = 528*dist/10; }  // mi
914          else if(unit == 3) { dist /= 100; }         // m
915          else if(unit == 4) { dist *= 10; }          // km
916    
917          /* user may have switched between metric and imperial */
918          float distance;
919          if(unit <= 2) {
920            distance = dist / 5280.0;
921            if(!mil) distance *=  1.609344;
922          } else {
923            distance = dist / 1000.0;
924            if( mil) distance /=  1.609344;
925          }
926    
927          dist_entry_set(button, distance, mil);
928        }
929    
930        gtk_widget_destroy(dialog);
931    
932        return TRUE;
933      }
934      return FALSE;
935    }
936    #endif
937    
938  /* a entry that is colored red when filled with invalid distance */  /* a entry that is colored red when filled with invalid distance */
939  GtkWidget *dist_entry_new(float dist, gboolean mil) {  GtkWidget *dist_entry_new(float dist, gboolean mil) {
940      char str[32];
941      distance_str(str, sizeof(str), dist, mil);
942    
943    #ifndef COORDINATE_PICKER
944    GdkColor color;    GdkColor color;
945    GtkWidget *widget = entry_new();    GtkWidget *widget = entry_new();
946    gdk_color_parse("#ff0000", &color);    gdk_color_parse("#ff0000", &color);
947    gtk_widget_modify_text(widget, TAG_STATE, &color);    gtk_widget_modify_text(widget, TAG_STATE, &color);
948    
   char str[32];  
   distance_str(str, sizeof(str), dist, mil);  
949    gtk_entry_set_text(GTK_ENTRY(widget), str);    gtk_entry_set_text(GTK_ENTRY(widget), str);
950    
951    g_signal_connect(G_OBJECT(widget), "changed",    g_signal_connect(G_OBJECT(widget), "changed",
952                     G_CALLBACK(callback_modified_dist), NULL);                     G_CALLBACK(callback_modified_dist), NULL);
953    
954    #else
955      GtkWidget *widget = gtk_button_new_with_label(str);
956    
957    #ifdef FREMANTLE
958      hildon_gtk_widget_set_theme_size(widget,
959            (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
960    #endif
961      int dist_int = (int)roundf(dist * 1000);        // km -> m
962      if(mil) dist_int = (int)roundf(dist * 5280.0);  // mi -> ft
963    
964      g_object_set_data(G_OBJECT(widget), "distance", (gpointer)dist_int);
965      g_object_set_data(G_OBJECT(widget), "mil", (gpointer)mil);
966      gtk_signal_connect(GTK_OBJECT(widget), "button-press-event",
967                         (GtkSignalFunc)on_dist_picker_button_press, NULL);
968    #endif
969    
970    return widget;    return widget;
971  }  }
972    
973  float dist_get(GtkWidget *widget, gboolean mil) {  float dist_entry_get(GtkWidget *widget, gboolean mil) {
974    #ifndef COORDINATE_PICKER
975    char *p = (char*)gtk_entry_get_text(GTK_ENTRY(widget));    char *p = (char*)gtk_entry_get_text(GTK_ENTRY(widget));
976    #else
977      char *p = (char*)gtk_button_get_label(GTK_BUTTON(widget));
978    #endif
979    return distance_parse(p, mil);    return distance_parse(p, mil);
980  }  }
981    
982    void dist_entry_set(GtkWidget *widget, float dist, gboolean mil) {
983      char str[32];
984      distance_str(str, sizeof(str), dist, mil);
985    
986    #ifndef COORDINATE_PICKER
987      gtk_entry_set_text(GTK_ENTRY(widget), str);
988    #else
989      int dist_int = (int)roundf(dist * 1000);        // km -> m
990      if(mil) dist_int = (int)roundf(dist * 5280.0);  // mi -> ft
991      g_object_set_data(G_OBJECT(widget), "distance", (gpointer)dist_int);
992      g_object_set_data(G_OBJECT(widget), "mil", (gpointer)mil);
993      gtk_button_set_label(GTK_BUTTON(widget), str);
994    #endif
995    }
996    
997  #ifndef USE_MAEMO  #ifndef USE_MAEMO
998  #ifdef ENABLE_BROWSER_INTERFACE  #ifdef ENABLE_BROWSER_INTERFACE
999  #include <libgnome/gnome-url.h>  #include <libgnome/gnome-url.h>
# Line 1025  static GtkWidget *popup_menu_create(appd Line 1237  static GtkWidget *popup_menu_create(appd
1237                      GtkWidget *lat_entry, GtkWidget *lon_entry) {                      GtkWidget *lat_entry, GtkWidget *lon_entry) {
1238    GtkWidget *menu = gtk_menu_new();    GtkWidget *menu = gtk_menu_new();
1239    
1240    menu_add(menu, appdata, icon_get_widget(ICON_POS, 18),    if(pos_valid(gps_get_pos(appdata)))
1241             _("GPS position"), cb_gps, 0, lon_entry, lat_entry);      menu_add(menu, appdata, icon_get_widget(ICON_POS, 18),
1242                 _("GPS position"), cb_gps, 0, lon_entry, lat_entry);
1243    
1244    menu_add(menu, appdata, icon_get_widget(ICON_POS, 21),    if(pos_valid(&appdata->home))
1245             _("Home"), cb_gps, 1, lon_entry, lat_entry);      menu_add(menu, appdata, icon_get_widget(ICON_POS, 21),
1246                 _("Home"), cb_gps, 1, lon_entry, lat_entry);
1247    
1248    location_t *location = appdata->location;    location_t *location = appdata->location;
1249    gint id = 2;    gint id = 2;
1250    while(location) {    while(location) {
1251      menu_add(menu, appdata, icon_get_widget(ICON_POS, 21),      if(pos_valid(&location->pos))
1252                 location->name, cb_gps, id++, lon_entry, lat_entry);        menu_add(menu, appdata, icon_get_widget(ICON_POS, 21),
1253                   location->name, cb_gps, id, lon_entry, lat_entry);
1254    
1255        id++;
1256      location = location->next;      location = location->next;
1257    }    }
1258    
1259    menu_add(menu, appdata, icon_get_widget(ICON_POS, 19),    if(pos_valid(&appdata->geomath))
1260             _("Geomath projection"), cb_geomath, 0, lon_entry, lat_entry);      menu_add(menu, appdata, icon_get_widget(ICON_POS, 19),
1261                 _("Geomath projection"), cb_geomath, 0, lon_entry, lat_entry);
1262    
1263  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
1264    menu_add(menu, appdata, icon_get_widget(ICON_POS, 20),    if(pos_valid(&appdata->map.pos))
1265             _("Map position"), cb_map, 0, lon_entry, lat_entry);      menu_add(menu, appdata, icon_get_widget(ICON_POS, 20), _("Map position"),
1266                 cb_map, 0, lon_entry, lat_entry);
1267  #endif  #endif
1268    
1269    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 1054  static GtkWidget *popup_menu_create(appd Line 1273  static GtkWidget *popup_menu_create(appd
1273      if(!name) name = cache->id;      if(!name) name = cache->id;
1274    
1275      /* original cache position */      /* original cache position */
1276      if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon)) {      if(pos_valid(&cache->pos))
1277        menu_add(menu, appdata, icon_get_widget(ICON_POS, cache->type + 6),        menu_add(menu, appdata, icon_get_widget(ICON_POS, cache->type + 6),
1278                 name, cb_cache, 0, lon_entry, lat_entry);                 name, cb_cache, 0, lon_entry, lat_entry);
     }  
1279    
1280      /* overwritten cache position */      /* overwritten cache position */
1281      if(cache->notes &&      if(cache->notes && pos_valid(&cache->notes->pos))
        !isnan(cache->notes->pos.lat) && !isnan(cache->notes->pos.lon)) {  
1282        menu_add(menu, appdata, icon_get_widget(ICON_POS, cache->type + 6),        menu_add(menu, appdata, icon_get_widget(ICON_POS, cache->type + 6),
1283                 _("Modified coordinate"), cb_cache, 1, lon_entry, lat_entry);                 _("Modified coordinate"), cb_cache, 1, lon_entry, lat_entry);
     }  
1284    
1285      wpt_t *wpt = cache->wpt;      wpt_t *wpt = cache->wpt;
1286      gint id = 2;      gint id = 2;
1287      while(wpt) {      while(wpt) {
1288        GtkWidget *icon = NULL;        if(pos_valid(&wpt->pos)) {
1289        if(wpt->sym != WPT_SYM_UNKNOWN)          GtkWidget *icon = NULL;
1290          icon = icon_get_widget(ICON_POS, wpt->sym);          if(wpt->sym != WPT_SYM_UNKNOWN)
1291              icon = icon_get_widget(ICON_POS, wpt->sym);
1292        char *name = wpt->desc;  
1293        if(!name) name = wpt->cmt;          char *name = wpt->desc;
1294        if(!name) name = wpt->id;          if(!name) name = wpt->cmt;
1295            if(!name) name = wpt->id;
1296        menu_add(menu, appdata, icon, name, cb_cache, id++,  
1297                 lon_entry, lat_entry);          menu_add(menu, appdata, icon, name, cb_cache, id,
1298                     lon_entry, lat_entry);
1299          }
1300    
1301          id++;
1302        wpt = wpt->next;        wpt = wpt->next;
1303      }      }
1304    }    }
# Line 1092  static GtkWidget *popup_menu_create(appd Line 1311  static GtkWidget *popup_menu_create(appd
1311  static gint on_popup_button_press(GtkWidget *button, GdkEventButton *event,  static gint on_popup_button_press(GtkWidget *button, GdkEventButton *event,
1312                                    gpointer data) {                                    gpointer data) {
1313    
1314      appdata_t *appdata = (appdata_t*)data;
1315    
1316    if(event->type == GDK_BUTTON_PRESS) {    if(event->type == GDK_BUTTON_PRESS) {
1317      GtkWidget *menu = g_object_get_data(G_OBJECT(button), "menu");      GtkWidget *menu = g_object_get_data(G_OBJECT(button), "menu");
1318    
1319        if(menu)
1320          gtk_widget_destroy(menu);
1321    
1322        gpointer lat_entry = g_object_get_data(G_OBJECT(button), "lat_entry");
1323        g_assert(lat_entry);
1324        gpointer lon_entry = g_object_get_data(G_OBJECT(button), "lon_entry");
1325        g_assert(lon_entry);
1326    
1327        menu = popup_menu_create(appdata, lat_entry, lon_entry);
1328        g_object_set_data(G_OBJECT(button), "menu", (gpointer)menu);
1329    
1330      /* draw a popup menu */      /* draw a popup menu */
1331      gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,      gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
1332                     event->button, event->time);                     event->button, event->time);
# Line 1105  static gint on_popup_button_press(GtkWid Line 1337  static gint on_popup_button_press(GtkWid
1337    
1338  static void on_popup_destroy(GtkWidget *widget, gpointer user_data ) {  static void on_popup_destroy(GtkWidget *widget, gpointer user_data ) {
1339    GtkWidget *menu = g_object_get_data(G_OBJECT(widget), "menu");    GtkWidget *menu = g_object_get_data(G_OBJECT(widget), "menu");
1340    gtk_widget_destroy(menu);    if(menu) gtk_widget_destroy(menu);
1341  }  }
1342  #endif  #endif
1343    
# Line 1189  static GtkWidget *preset_picker_create(a Line 1421  static GtkWidget *preset_picker_create(a
1421                               G_TYPE_INT,                               G_TYPE_INT,
1422                               G_TYPE_POINTER);                               G_TYPE_POINTER);
1423    
1424    preset_picker_add(store, appdata, icon_get(ICON_POS, 18),    if(pos_valid(gps_get_pos(appdata)))
1425               _("GPS position"), cb_gps, 0);      preset_picker_add(store, appdata, icon_get(ICON_POS, 18),
1426                          _("GPS position"), cb_gps, 0);
1427    
1428    preset_picker_add(store, appdata, icon_get(ICON_POS, 21),    if(pos_valid(&appdata->home))
1429               _("Home"), cb_gps, 1);      preset_picker_add(store, appdata, icon_get(ICON_POS, 21),
1430                          _("Home"), cb_gps, 1);
1431    
1432    location_t *location = appdata->location;    location_t *location = appdata->location;
1433    gint id = 2;    gint id = 2;
1434    while(location) {    while(location) {
1435      preset_picker_add(store, appdata, icon_get(ICON_POS, 21),      if(pos_valid(&location->pos))
1436                 location->name, cb_gps, id++);        preset_picker_add(store, appdata, icon_get(ICON_POS, 21),
1437                            location->name, cb_gps, id);
1438    
1439        id++;
1440      location = location->next;      location = location->next;
1441    }    }
1442    
1443    preset_picker_add(store, appdata, icon_get(ICON_POS, 19),    if(pos_valid(&appdata->geomath))
1444               _("Geomath projection"), cb_geomath, 0);      preset_picker_add(store, appdata, icon_get(ICON_POS, 19),
1445                          _("Geomath projection"), cb_geomath, 0);
1446  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
1447    preset_picker_add(store, appdata, icon_get(ICON_POS, 20),    if(pos_valid(&appdata->map.pos))
1448               _("Map position"), cb_map, 0);      preset_picker_add(store, appdata, icon_get(ICON_POS, 20),
1449                          _("Map position"), cb_map, 0);
1450  #endif  #endif
1451    
1452    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 1216  static GtkWidget *preset_picker_create(a Line 1454  static GtkWidget *preset_picker_create(a
1454    
1455      char *name = cache->name;      char *name = cache->name;
1456      if(!name) name = cache->id;      if(!name) name = cache->id;
1457    
1458      /* original cache position */      /* original cache position */
1459      if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon)) {      if(pos_valid(&cache->pos))
1460        preset_picker_add(store, appdata, icon_get(ICON_POS, cache->type + 6),        preset_picker_add(store, appdata, icon_get(ICON_POS, cache->type + 6),
1461                   name, cb_cache, 0);                          name, cb_cache, 0);
     }  
1462    
1463      /* overwritten cache position */      /* overwritten cache position */
1464      if(cache->notes &&      if(cache->notes && pos_valid(&cache->notes->pos))
        !isnan(cache->notes->pos.lat) && !isnan(cache->notes->pos.lon)) {  
1465        preset_picker_add(store, appdata, icon_get(ICON_POS, cache->type + 6),        preset_picker_add(store, appdata, icon_get(ICON_POS, cache->type + 6),
1466                   _("Modified coordinate"), cb_cache, 1);                          _("Modified coordinate"), cb_cache, 1);
     }  
1467    
1468      wpt_t *wpt = cache->wpt;      wpt_t *wpt = cache->wpt;
1469      gint id = 2;      gint id = 2;
1470      while(wpt) {      while(wpt) {
1471        GdkPixbuf *icon = NULL;        if(pos_valid(&wpt->pos)) {
1472        if(wpt->sym != WPT_SYM_UNKNOWN)          GdkPixbuf *icon = NULL;
1473          icon = icon_get(ICON_POS, wpt->sym);          if(wpt->sym != WPT_SYM_UNKNOWN)
1474              icon = icon_get(ICON_POS, wpt->sym);
1475        char *name = wpt->desc;  
1476        if(!name) name = wpt->cmt;          char *name = wpt->desc;
1477        if(!name) name = wpt->id;          if(!name) name = wpt->cmt;
1478            if(!name) name = wpt->id;
1479    
1480        preset_picker_add(store, appdata, icon, name, cb_cache, id++);          preset_picker_add(store, appdata, icon, name, cb_cache, id);
1481          }
1482          id++;
1483        wpt = wpt->next;        wpt = wpt->next;
1484      }      }
1485    }    }
1486    
   
1487    gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(store));    gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(store));
1488    g_object_unref(store);    g_object_unref(store);
1489    
# Line 1283  static gint on_preset_picker_button_pres Line 1520  static gint on_preset_picker_button_pres
1520            GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,            GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
1521            NULL);            NULL);
1522    
1523      gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 200);      gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 210);
1524    
1525      gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),      gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1526                          preset_picker_create(appdata, lat_entry, lon_entry));                          preset_picker_create(appdata, lat_entry, lon_entry));
# Line 1298  static gint on_preset_picker_button_pres Line 1535  static gint on_preset_picker_button_pres
1535  }  }
1536  #endif  #endif
1537    
 void preset_coordinate_picker_update(appdata_t *appdata, GtkWidget *widget) {  
 #ifndef PRESET_PICKER_DIALOG  
   printf("updating popup menu\n");  
   
   GtkWidget *menu = g_object_get_data(G_OBJECT(widget), "menu");  
   g_assert(menu);  
   gtk_widget_destroy(menu);  
   
   gpointer lat_entry = g_object_get_data(G_OBJECT(widget), "lat_entry");  
   g_assert(lat_entry);  
   gpointer lon_entry = g_object_get_data(G_OBJECT(widget), "lon_entry");  
   g_assert(lon_entry);  
   
   menu = popup_menu_create(appdata, lat_entry, lon_entry);  
   g_object_set_data(G_OBJECT(widget), "menu", (gpointer)menu);  
 #endif  
 }  
1538    
1539  GtkWidget *preset_coordinate_picker(appdata_t *appdata,  GtkWidget *preset_coordinate_picker(appdata_t *appdata,
1540                       GtkWidget *lat_entry, GtkWidget *lon_entry) {                       GtkWidget *lat_entry, GtkWidget *lon_entry) {
# Line 1328  GtkWidget *preset_coordinate_picker(appd Line 1548  GtkWidget *preset_coordinate_picker(appd
1548    g_object_set_data(G_OBJECT(button), "lat_entry", (gpointer)lat_entry);    g_object_set_data(G_OBJECT(button), "lat_entry", (gpointer)lat_entry);
1549    g_object_set_data(G_OBJECT(button), "lon_entry", (gpointer)lon_entry);    g_object_set_data(G_OBJECT(button), "lon_entry", (gpointer)lon_entry);
1550    
   g_object_set_data(G_OBJECT(button), "lat_entry", (gpointer)lat_entry);  
   g_object_set_data(G_OBJECT(button), "lon_entry", (gpointer)lon_entry);  
   
1551  #ifndef PRESET_PICKER_DIALOG  #ifndef PRESET_PICKER_DIALOG
1552    gtk_signal_connect(GTK_OBJECT(button), "button-press-event",    gtk_signal_connect(GTK_OBJECT(button), "button-press-event",
1553                       (GtkSignalFunc)on_popup_button_press, appdata);                       (GtkSignalFunc)on_popup_button_press, appdata);
# Line 1368  gboolean pos_differ(pos_t *pos1, pos_t * Line 1585  gboolean pos_differ(pos_t *pos1, pos_t *
1585    return((lat1 != lat2) || (lon1 != lon2));    return((lat1 != lat2) || (lon1 != lon2));
1586  }  }
1587    
1588    gboolean pos_valid(pos_t *pos) {
1589      if(!pos) return FALSE;
1590      return(!isnan(pos->lat) && !isnan(pos->lon));
1591    }
1592    
1593    void misc_init(void) {
1594      g_signal_new ("changed", GTK_TYPE_BUTTON,
1595                    G_SIGNAL_RUN_FIRST, 0, NULL, NULL,
1596                    g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
1597    }
1598    
1599    void angle_str(char *str, int len, float angle) {
1600      snprintf(str, len, _("%.1f°"), angle);
1601    }
1602    
1603    float angle_parse(char *str) {
1604      float val;
1605    
1606      if(sscanf(str, _("%f°"), &val) != 1)
1607        val = NAN;
1608    
1609      return val;
1610    }
1611    
1612    #ifndef COORDINATE_PICKER
1613    static void callback_modified_angle(GtkWidget *widget, gpointer data ) {
1614      float i = angle_parse((char*)gtk_entry_get_text(GTK_ENTRY(widget)));
1615      mark(widget, !isnan(i));
1616    }
1617    #else
1618    static gint on_angle_picker_button_press(GtkWidget *button,
1619                       GdkEventButton *event, gpointer data) {
1620    
1621      if(event->type == GDK_BUTTON_PRESS) {
1622        GtkWidget *dialog =
1623          gtk_dialog_new_with_buttons(_("Direction"),
1624              GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(button))),
1625                                      GTK_DIALOG_MODAL,
1626              GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
1627              _("Done"),        GTK_RESPONSE_ACCEPT,
1628              NULL);
1629    
1630        gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 210);
1631    
1632        int i, angle = (int)g_object_get_data(G_OBJECT(button), "angle");
1633    
1634        GtkWidget *anglew[3], *fracw;
1635    
1636        /* create xxx.x° */
1637        GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
1638    
1639        gtk_box_pack_start_defaults(GTK_BOX(hbox),
1640                    anglew[0] = digit_picker_create(0,3, (angle/1000)%10));
1641        gtk_box_pack_start_defaults(GTK_BOX(hbox),
1642                    anglew[1] = digit_picker_create(0,9, (angle/100)%10));
1643        gtk_box_pack_start_defaults(GTK_BOX(hbox),
1644                    anglew[2] = digit_picker_create(0,9, (angle/10)%10));
1645        gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(" . "), FALSE, FALSE, 0);
1646        gtk_box_pack_start_defaults(GTK_BOX(hbox),
1647                    fracw = digit_picker_create(0,9, (angle/1)%10));
1648        gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new("°"), FALSE, FALSE, 0);
1649    
1650        gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);
1651    
1652        gtk_widget_show_all(dialog);
1653        if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
1654    
1655          /* parse angle */
1656          for(angle=0,i=0;i<3;i++)
1657            angle = 10 * angle + picker_get(anglew[i]);
1658    
1659          angle = 10 * angle + picker_get(fracw);
1660    
1661          angle_entry_set(button, angle/10.0);
1662        }
1663    
1664        gtk_widget_destroy(dialog);
1665    
1666        return TRUE;
1667      }
1668      return FALSE;
1669    }
1670    #endif
1671    
1672    GtkWidget *angle_entry_new(float angle) {
1673      char str[32];
1674      angle_str(str, sizeof(str), angle);
1675    
1676    #ifndef COORDINATE_PICKER
1677      GtkWidget *widget = red_entry_new();
1678      gtk_entry_set_text(GTK_ENTRY(widget), str);
1679    
1680      g_signal_connect(G_OBJECT(widget), "changed",
1681                       G_CALLBACK(callback_modified_angle), NULL);
1682    #else
1683      GtkWidget *widget = gtk_button_new_with_label(str);
1684    
1685    #ifdef FREMANTLE
1686      hildon_gtk_widget_set_theme_size(widget,
1687            (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
1688    #endif
1689      int angle_int = (int)roundf(angle*10.0);
1690      g_object_set_data(G_OBJECT(widget), "angle", (gpointer)angle_int);
1691      gtk_signal_connect(GTK_OBJECT(widget), "button-press-event",
1692                         (GtkSignalFunc)on_angle_picker_button_press, NULL);
1693    #endif
1694      return widget;
1695    }
1696    
1697    float angle_entry_get(GtkWidget *widget) {
1698    #ifndef COORDINATE_PICKER
1699      char *p = (char*)gtk_entry_get_text(GTK_ENTRY(widget));
1700    #else
1701      char *p = (char*)gtk_button_get_label(GTK_BUTTON(widget));
1702    #endif
1703      return angle_parse(p);
1704    }
1705    
1706    void angle_entry_set(GtkWidget *widget, float angle) {
1707      char str[32];
1708      angle_str(str, sizeof(str)-1, angle);
1709    #ifndef COORDINATE_PICKER
1710      gtk_entry_set_text(GTK_ENTRY(widget), str);
1711    #else
1712      gtk_button_set_label(GTK_BUTTON(widget), str);
1713      int angle_int = (int)roundf(angle * 10.0);
1714      g_object_set_data(G_OBJECT(widget), "angle", (gpointer)angle_int);
1715      g_signal_emit_by_name(widget, "changed");
1716    #endif
1717    }
1718    
Legend:
Removed from v.221  
changed lines
  Added in v.223