X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/3220e3365d3c899468f8b178552aeb19659ac3d7..48254848ab0cbe2a9ed0549ecc997c17aa7a925f:/src/viktrwlayer_propwin.c diff --git a/src/viktrwlayer_propwin.c b/src/viktrwlayer_propwin.c index 769a1c60..c76cd545 100644 --- a/src/viktrwlayer_propwin.c +++ b/src/viktrwlayer_propwin.c @@ -19,13 +19,20 @@ * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include + #include +#include #include #include #include "coords.h" #include "vikcoord.h" #include "viktrack.h" +#include "viktrwlayer.h" #include "viktrwlayer_propwin.h" #include "vikwaypoint.h" #include "dialog.h" @@ -44,6 +51,52 @@ #define MIN_ALT_DIFF 100.0 #define MIN_SPEED_DIFF 20.0 +typedef struct _propsaved { + gboolean saved; + gint pos; + GdkImage *img; +} PropSaved; + +typedef struct _propwidgets { + VikTrwLayer *vtl; + VikTrack *tr; + VikLayersPanel *vlp; + gchar *track_name; + GtkWidget *w_comment; + GtkWidget *w_track_length; + GtkWidget *w_tp_count; + GtkWidget *w_segment_count; + GtkWidget *w_duptp_count; + GtkWidget *w_max_speed; + GtkWidget *w_avg_speed; + GtkWidget *w_avg_dist; + GtkWidget *w_elev_range; + GtkWidget *w_elev_gain; + GtkWidget *w_time_start; + GtkWidget *w_time_end; + GtkWidget *w_time_dur; + GtkWidget *w_dist_time; + PropSaved elev_graph_saved_img; + PropSaved speed_graph_saved_img; +} PropWidgets; + +static PropWidgets *prop_widgets_new() +{ + PropWidgets *widgets = g_malloc0(sizeof(PropWidgets)); + + return widgets; +} + +static void prop_widgets_free(PropWidgets *widgets) +{ + + if (widgets->elev_graph_saved_img.img) + g_object_unref(widgets->elev_graph_saved_img.img); + if (widgets->speed_graph_saved_img.img) + g_object_unref(widgets->speed_graph_saved_img.img); + g_free(widgets); +} + static void minmax_alt(const gdouble *altitudes, gdouble *min, gdouble *max) { *max = -1000; @@ -59,9 +112,7 @@ static void minmax_alt(const gdouble *altitudes, gdouble *min, gdouble *max) } } -static GtkWidget *label_date; - -#define MARGIN 50 +#define MARGIN 70 #define LINES 5 static void set_center_at_graph_position(gdouble event_x, gint img_width, VikLayersPanel *vlp, VikTrack *tr, gboolean time_base) { @@ -83,23 +134,68 @@ static void set_center_at_graph_position(gdouble event_x, gint img_width, VikLay vik_layers_panel_emit_update ( vlp ); } } -void track_profile_click( GtkWidget *image, GdkEventButton *event, gpointer *pass_along ) + +static void draw_graph_mark(GtkWidget *image, gdouble x, GdkGC *gc, PropSaved *saved_img) { - VikTrack *tr = pass_along[0]; - VikLayersPanel *vlp = pass_along[1]; - set_center_at_graph_position(event->x, image->allocation.width, vlp, tr, FALSE); + GdkPixmap *pix; + const int saved_width = 5; + + gtk_image_get_pixmap(GTK_IMAGE(image), &pix, NULL); + if (saved_img->saved) { + gdk_draw_image(GDK_DRAWABLE(pix), gc, saved_img->img, 0, 0, + saved_img->pos, 0, -1, -1); + saved_img->saved = FALSE; + gtk_widget_queue_draw_area(image, saved_img->pos, 0, + saved_img->img->width, saved_img->img->height); + } + if ((x >= MARGIN) && (x < (PROFILE_WIDTH + MARGIN))) { + if (saved_img->img) + gdk_drawable_copy_to_image(GDK_DRAWABLE(pix), saved_img->img, + x - (saved_width/2), 0, 0, 0, saved_img->img->width, saved_img->img->height); + else + saved_img->img = gdk_drawable_copy_to_image(GDK_DRAWABLE(pix), + saved_img->img, x - (saved_width/2), 0, 0, 0, saved_width, PROFILE_HEIGHT); + saved_img->pos = x - (saved_width/2); + saved_img->saved = TRUE; + gdk_draw_line (GDK_DRAWABLE(pix), gc, x, 0, x, image->allocation.height); + /* redraw the area which contains the line, saved_width is just convenient */ + gtk_widget_queue_draw_area(image, x - saved_width/2, 0, saved_width, PROFILE_HEIGHT); + } } -void track_vt_click( GtkWidget *image, GdkEventButton *event, gpointer *pass_along ) +static void track_graph_click( GtkWidget *event_box, GdkEventButton *event, gpointer *pass_along, gboolean is_vt_graph ) { VikTrack *tr = pass_along[0]; VikLayersPanel *vlp = pass_along[1]; - set_center_at_graph_position(event->x, image->allocation.width, vlp, tr, TRUE); + PropWidgets *widgets = pass_along[2]; + GList *child = gtk_container_get_children(GTK_CONTAINER(event_box)); + GtkWidget *image = GTK_WIDGET(child->data); + GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(event_box)); + + + set_center_at_graph_position(event->x, event_box->allocation.width, vlp, tr, is_vt_graph); + draw_graph_mark(image, event->x, window->style->black_gc, + is_vt_graph ? &widgets->speed_graph_saved_img : &widgets->elev_graph_saved_img); + g_list_free(child); + +} + +static gboolean track_profile_click( GtkWidget *event_box, GdkEventButton *event, gpointer *pass_along ) +{ + track_graph_click(event_box, event, pass_along, FALSE); + return TRUE; /* don't call other (further) callbacks */ +} + +static gboolean track_vt_click( GtkWidget *event_box, GdkEventButton *event, gpointer *pass_along ) +{ + track_graph_click(event_box, event, pass_along, TRUE); + return TRUE; /* don't call other (further) callbacks */ } void track_profile_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass_along ) { VikTrack *tr = pass_along[0]; + PropWidgets *widgets = pass_along[2]; int mouse_x, mouse_y; GdkModifierType state; @@ -116,16 +212,17 @@ void track_profile_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass gdouble meters_from_start; VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_dist ( tr, (gdouble) x / PROFILE_WIDTH, &meters_from_start ); - if (trackpoint) { + if (trackpoint && widgets->w_dist_time) { static gchar tmp_buf[20]; g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m", meters_from_start); - gtk_label_set_text(GTK_LABEL(label_date), tmp_buf); + gtk_label_set_text(GTK_LABEL(widgets->w_dist_time), tmp_buf); } } void track_vt_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass_along ) { VikTrack *tr = pass_along[0]; + PropWidgets *widgets = pass_along[2]; int mouse_x, mouse_y; GdkModifierType state; @@ -142,7 +239,7 @@ void track_vt_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass_alon time_t seconds_from_start; VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_time ( tr, (gdouble) x / PROFILE_WIDTH, &seconds_from_start ); - if (trackpoint) { + if (trackpoint && widgets->w_dist_time) { static gchar tmp_buf[20]; guint h, m, s; h = seconds_from_start/3600; @@ -150,7 +247,7 @@ void track_vt_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass_alon s = seconds_from_start - (3600*h) - (60*m); g_snprintf(tmp_buf, sizeof(tmp_buf), "%02d:%02d:%02d", h, m, s); - gtk_label_set_text(GTK_LABEL(label_date), tmp_buf); + gtk_label_set_text(GTK_LABEL(widgets->w_dist_time), tmp_buf); } } @@ -169,13 +266,13 @@ static void draw_dem_alt_speed_dist(VikTrack *tr, GdkDrawable *pix, GdkGC *alt_g for (iter = tr->trackpoints->next; iter; iter = iter->next) { int x, y_alt, y_speed; - gint16 elev = a_dems_get_elev_by_coord(&(VIK_TRACKPOINT(iter->data)->coord)); + gint16 elev = a_dems_get_elev_by_coord(&(VIK_TRACKPOINT(iter->data)->coord), VIK_DEM_INTERPOL_BEST); elev -= alt_offset; dist += vik_coord_diff ( &(VIK_TRACKPOINT(iter->data)->coord), &(VIK_TRACKPOINT(iter->prev->data)->coord) ); x = (width * dist)/total_length + margin; if ( elev != VIK_DEM_INVALID_ELEVATION ) { - y_alt = height - (height * elev)/alt_diff; + y_alt = height - ((height * elev)/alt_diff); gdk_draw_rectangle(GDK_DRAWABLE(pix), alt_gc, TRUE, x-2, y_alt-2, 4, 4); } if (!isnan(VIK_TRACKPOINT(iter->data)->speed)) { @@ -185,7 +282,7 @@ static void draw_dem_alt_speed_dist(VikTrack *tr, GdkDrawable *pix, GdkGC *alt_g } } -GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gdouble *min_alt, gdouble *max_alt, gpointer vlp ) +GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gpointer vlp, PropWidgets *widgets, gdouble *min_alt, gdouble *max_alt) { GdkPixmap *pix; GtkWidget *image; @@ -218,10 +315,7 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gdoub minmax_alt(altitudes, min_alt, max_alt); mina = *min_alt; - maxa = *max_alt * 110 / 100; - if (maxa-mina < MIN_ALT_DIFF) { - maxa = mina + MIN_ALT_DIFF; - } + maxa = *max_alt + ((*max_alt - *min_alt) * 0.25); /* clear the image */ gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->bg_gc[0], @@ -230,19 +324,22 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gdoub TRUE, MARGIN, 0, PROFILE_WIDTH, PROFILE_HEIGHT); /* draw grid */ -#define LABEL_FONT "Sans 8" +#define LABEL_FONT "Sans 7" for (i=0; i<=LINES; i++) { PangoFontDescription *pfd; PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL); gchar s[32]; + int w, h; + pango_layout_set_alignment (pl, PANGO_ALIGN_RIGHT); pfd = pango_font_description_from_string (LABEL_FONT); pango_layout_set_font_description (pl, pfd); pango_font_description_free (pfd); sprintf(s, "%8dm", (int)(mina + (LINES-i)*(maxa-mina)/LINES)); pango_layout_set_text(pl, s, -1); - gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], 0, - CLAMP((int)i*PROFILE_HEIGHT/LINES - 5, 0, PROFILE_HEIGHT-15), pl); + pango_layout_get_pixel_size (pl, &w, &h); + gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], MARGIN-w-3, + CLAMP((int)i*PROFILE_HEIGHT/LINES - h/2, 0, PROFILE_HEIGHT-h), pl); gdk_draw_line (GDK_DRAWABLE(pix), window->style->dark_gc[0], MARGIN, PROFILE_HEIGHT/LINES * i, MARGIN + PROFILE_WIDTH, PROFILE_HEIGHT/LINES * i); @@ -270,9 +367,10 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gdoub g_object_unref ( G_OBJECT(dem_alt_gc) ); g_object_unref ( G_OBJECT(gps_speed_gc) ); - pass_along = g_malloc ( sizeof(gpointer) * 2 ); + pass_along = g_malloc ( sizeof(gpointer) * 3 ); /* FIXME: mem leak -- never be freed */ pass_along[0] = tr; pass_along[1] = vlp; + pass_along[2] = widgets; eventbox = gtk_event_box_new (); g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_profile_click), pass_along ); @@ -293,7 +391,7 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gdoub #define MTOK(v) ( (v)*3600.0/1000.0 * 0.6214) /* m/s to mph - we'll handle this globally eventually but for now ...*/ #endif -GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpointer vlp) +GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpointer vlp, PropWidgets *widgets) { GdkPixmap *pix; GtkWidget *image; @@ -302,9 +400,10 @@ GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpoint GtkWidget *eventbox; gpointer *pass_along; - pass_along = g_malloc ( sizeof(gpointer) * 2 ); + pass_along = g_malloc ( sizeof(gpointer) * 3 ); /* FIXME: mem leak -- never be freed */ pass_along[0] = tr; pass_along[1] = vlp; + pass_along[2] = widgets; gdouble *speeds = vik_track_make_speed_map ( tr, PROFILE_WIDTH ); if ( speeds == NULL ) @@ -318,8 +417,9 @@ GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpoint } minmax_alt(speeds, &mins, &maxs); - mins = 0; /* splines sometimes give negative speeds */ - maxs = maxs * 110 / 100; + if (mins < 0.0) + mins = 0; /* splines sometimes give negative speeds */ + maxs = maxs + ((maxs - mins) * 0.1); if (maxs-mins < MIN_SPEED_DIFF) { maxs = mins + MIN_SPEED_DIFF; } @@ -351,12 +451,14 @@ GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpoint #else /* draw grid */ -#define LABEL_FONT "Sans 8" +#define LABEL_FONT "Sans 7" for (i=0; i<=LINES; i++) { PangoFontDescription *pfd; PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL); gchar s[32]; + int w, h; + pango_layout_set_alignment (pl, PANGO_ALIGN_RIGHT); pfd = pango_font_description_from_string (LABEL_FONT); pango_layout_set_font_description (pl, pfd); pango_font_description_free (pfd); @@ -366,12 +468,14 @@ GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpoint sprintf(s, "%8dmph", (int)(mins + (LINES-i)*(maxs-mins)/LINES)); #endif pango_layout_set_text(pl, s, -1); - gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], 0, - CLAMP((int)i*PROFILE_HEIGHT/LINES - 5, 0, PROFILE_HEIGHT-15), pl); + pango_layout_get_pixel_size (pl, &w, &h); + gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], MARGIN-w-3, + CLAMP((int)i*PROFILE_HEIGHT/LINES - h/2, 0, PROFILE_HEIGHT-h), pl); gdk_draw_line (GDK_DRAWABLE(pix), window->style->dark_gc[0], MARGIN, PROFILE_HEIGHT/LINES * i, MARGIN + PROFILE_WIDTH, PROFILE_HEIGHT/LINES * i); } + /* draw speeds */ for ( i = 0; i < PROFILE_WIDTH; i++ ) @@ -419,92 +523,169 @@ GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpoint #undef MARGIN #undef LINES -gint vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrack *tr, gpointer vlp ) +static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widgets) { - GtkWidget *dialog = gtk_dialog_new_with_buttons ("Track Properties", - parent, - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, - GTK_STOCK_CANCEL, - GTK_RESPONSE_REJECT, - "Split Segments", - VIK_TRW_LAYER_PROPWIN_SPLIT, - "Reverse", - VIK_TRW_LAYER_PROPWIN_REVERSE, - "Delete Dupl.", - VIK_TRW_LAYER_PROPWIN_DEL_DUP, - GTK_STOCK_OK, - GTK_RESPONSE_ACCEPT, - NULL); + VikTrack *tr = widgets->tr; + VikTrwLayer *vtl = widgets->vtl; + + /* FIXME: check and make sure the track still exists before doing anything to it */ + /* Note: destroying diaglog (eg, parent window exit) won't give "response" */ + switch (resp) { + case GTK_RESPONSE_DELETE_EVENT: /* received delete event (not from buttons) */ + case GTK_RESPONSE_REJECT: + break; + case GTK_RESPONSE_ACCEPT: + vik_track_set_comment(tr, gtk_entry_get_text(GTK_ENTRY(widgets->w_comment))); + break; + case VIK_TRW_LAYER_PROPWIN_REVERSE: + vik_track_reverse(tr); + vik_layer_emit_update ( VIK_LAYER(vtl) ); + break; + case VIK_TRW_LAYER_PROPWIN_DEL_DUP: + vik_track_remove_dup_points(tr); + /* above operation could have deleted current_tp or last_tp */ + trw_layer_cancel_tps_of_track ( vtl, widgets->track_name ); + vik_layer_emit_update ( VIK_LAYER(vtl) ); + break; + case VIK_TRW_LAYER_PROPWIN_SPLIT: + { + /* get new tracks, add them, resolve naming conflicts (free if cancel), and delete old. old can still exist on clipboard. */ + guint ntracks; + VikTrack **tracks = vik_track_split_into_segments(tr, &ntracks); + gchar *new_tr_name; + guint i; + for ( i = 0; i < ntracks; i++ ) + { + g_assert ( tracks[i] ); + new_tr_name = g_strdup_printf("%s #%d", widgets->track_name, i+1); + /* if ( (wp_exists) && (! overwrite) ) */ + /* don't need to upper case new_tr_name because old tr name was uppercase */ + if ( vik_trw_layer_get_track(vtl, new_tr_name ) && + ( ! a_dialog_overwrite ( VIK_GTK_WINDOW_FROM_LAYER(vtl), "The track \"%s\" exists, do you wish to overwrite it?", new_tr_name ) ) ) + { + gchar *new_new_tr_name = a_dialog_new_track ( VIK_GTK_WINDOW_FROM_LAYER(vtl), vik_trw_layer_get_tracks(vtl) ); + g_free ( new_tr_name ); + if (new_new_tr_name) + new_tr_name = new_new_tr_name; + else + { + new_tr_name = NULL; + vik_track_free ( tracks[i] ); + } + } + if ( new_tr_name ) + vik_trw_layer_add_track ( vtl, new_tr_name, tracks[i] ); + } + if ( tracks ) + { + g_free ( tracks ); + /* Don't let track destroy this dialog */ + vik_track_clear_property_dialog(tr); + vik_trw_layer_delete_track ( vtl, widgets->track_name ); + vik_layer_emit_update ( VIK_LAYER(vtl) ); /* chase thru the hoops */ + } + } + break; + default: + fprintf(stderr, "DEBUG: unknown response\n"); + return; + } + + /* Keep same behaviour for now: destroy dialog if click on any button */ + prop_widgets_free(widgets); + vik_track_clear_property_dialog(tr); + gtk_widget_destroy ( GTK_WIDGET(dialog) ); +} + +void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack *tr, gpointer vlp, gchar *track_name ) +{ + /* FIXME: free widgets when destroy signal received */ + PropWidgets *widgets = prop_widgets_new(); + widgets->vtl = vtl; + widgets->tr = tr; + widgets->vlp = vlp; + widgets->track_name = track_name; + gchar *title = g_strdup_printf(_("%s - Track Properties"), track_name); + GtkWidget *dialog = gtk_dialog_new_with_buttons (title, + parent, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + _("Split Segments"), VIK_TRW_LAYER_PROPWIN_SPLIT, + _("Reverse"), VIK_TRW_LAYER_PROPWIN_REVERSE, + _("Delete Dupl."), VIK_TRW_LAYER_PROPWIN_DEL_DUP, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + NULL); + g_free(title); + g_signal_connect(dialog, "response", G_CALLBACK(propwin_response_cb), widgets); + //fprintf(stderr, "DEBUG: dialog=0x%p\n", dialog); GtkTable *table; - GtkWidget *e_cmt; gdouble tr_len; guint32 tp_count, seg_count; - gint resp; gdouble min_alt, max_alt; - GtkWidget *profile = vik_trw_layer_create_profile(GTK_WIDGET(parent),tr,&min_alt,&max_alt,vlp); - GtkWidget *vtdiag = vik_trw_layer_create_vtdiag(GTK_WIDGET(parent), tr, vlp); + GtkWidget *profile = vik_trw_layer_create_profile(GTK_WIDGET(parent),tr, vlp, widgets, &min_alt,&max_alt); + GtkWidget *vtdiag = vik_trw_layer_create_vtdiag(GTK_WIDGET(parent), tr, vlp, widgets); GtkWidget *graphs = gtk_notebook_new(); GtkWidget *content[20]; int cnt; int i; - static gchar *label_texts[] = { "Comment:", "Track Length:", "Trackpoints:", "Segments:", "Duplicate Points:", "Max Speed:", "Avg. Speed:", "Avg. Dist. Between TPs:", "Elevation Range:", "Total Elevation Gain/Loss:", "Start:", "End:", "Duration:", "Track Distance/Time:" }; + static gchar *label_texts[] = { N_("Comment:"), N_("Track Length:"), N_("Trackpoints:"), N_("Segments:"), N_("Duplicate Points:"), N_("Max Speed:"), N_("Avg. Speed:"), N_("Avg. Dist. Between TPs:"), N_("Elevation Range:"), N_("Total Elevation Gain/Loss:"), N_("Start:"), N_("End:"), N_("Duration:"), N_("Track Distance/Time:") }; static gchar tmp_buf[50]; gdouble tmp_speed; cnt = 0; - e_cmt = gtk_entry_new (); + widgets->w_comment = gtk_entry_new (); if ( tr->comment ) - gtk_entry_set_text ( GTK_ENTRY(e_cmt), tr->comment ); - g_signal_connect_swapped ( e_cmt, "activate", G_CALLBACK(a_dialog_response_accept), GTK_DIALOG(dialog) ); - content[cnt++] = e_cmt; + gtk_entry_set_text ( GTK_ENTRY(widgets->w_comment), tr->comment ); + g_signal_connect_swapped ( widgets->w_comment, "activate", G_CALLBACK(a_dialog_response_accept), GTK_DIALOG(dialog) ); + content[cnt++] = widgets->w_comment; tr_len = vik_track_get_length(tr); g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m", tr_len ); - content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_track_length = content[cnt++] = gtk_label_new ( tmp_buf ); tp_count = vik_track_get_tp_count(tr); g_snprintf(tmp_buf, sizeof(tmp_buf), "%u", tp_count ); - content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_tp_count = content[cnt++] = gtk_label_new ( tmp_buf ); seg_count = vik_track_get_segment_count(tr) ; g_snprintf(tmp_buf, sizeof(tmp_buf), "%u", seg_count ); - content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_segment_count = content[cnt++] = gtk_label_new ( tmp_buf ); g_snprintf(tmp_buf, sizeof(tmp_buf), "%lu", vik_track_get_dup_point_count(tr) ); - content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_duptp_count = content[cnt++] = gtk_label_new ( tmp_buf ); tmp_speed = vik_track_get_max_speed(tr); if ( tmp_speed == 0 ) - g_snprintf(tmp_buf, sizeof(tmp_buf), "No Data"); + g_snprintf(tmp_buf, sizeof(tmp_buf), _("No Data")); else g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m/s (%.0f km/h)", tmp_speed, MTOK(tmp_speed) ); - content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_max_speed = content[cnt++] = gtk_label_new ( tmp_buf ); tmp_speed = vik_track_get_average_speed(tr); if ( tmp_speed == 0 ) - g_snprintf(tmp_buf, sizeof(tmp_buf), "No Data"); + g_snprintf(tmp_buf, sizeof(tmp_buf), _("No Data")); else g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m/s (%.0f km/h)", tmp_speed, MTOK(tmp_speed) ); - content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_avg_speed = content[cnt++] = gtk_label_new ( tmp_buf ); g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m", (tp_count - seg_count) == 0 ? 0 : tr_len / ( tp_count - seg_count ) ); - content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_avg_dist = content[cnt++] = gtk_label_new ( tmp_buf ); if ( min_alt == VIK_DEFAULT_ALTITUDE ) - g_snprintf(tmp_buf, sizeof(tmp_buf), "No Data"); + g_snprintf(tmp_buf, sizeof(tmp_buf), _("No Data")); else g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m - %.0f m", min_alt, max_alt ); - content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_elev_range = content[cnt++] = gtk_label_new ( tmp_buf ); vik_track_get_total_elevation_gain(tr, &max_alt, &min_alt ); if ( min_alt == VIK_DEFAULT_ALTITUDE ) - g_snprintf(tmp_buf, sizeof(tmp_buf), "No Data"); + g_snprintf(tmp_buf, sizeof(tmp_buf), _("No Data")); else g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m / %.0f m", max_alt, min_alt ); - content[cnt++] = gtk_label_new ( tmp_buf ); + widgets->w_elev_gain = content[cnt++] = gtk_label_new ( tmp_buf ); #if 0 #define PACK(w) gtk_box_pack_start (GTK_BOX(right_vbox), w, FALSE, FALSE, 0); @@ -530,22 +711,21 @@ gint vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrack *tr, gpointer vlp ) strncpy(tmp_buf, ctime(&t1), sizeof(tmp_buf)); tmp_buf[sizeof(tmp_buf)-1] = 0; g_strchomp(tmp_buf); - content[cnt++] = gtk_label_new(tmp_buf); + widgets->w_time_start = content[cnt++] = gtk_label_new(tmp_buf); strncpy(tmp_buf, ctime(&t2), sizeof(tmp_buf)); tmp_buf[sizeof(tmp_buf)-1] = 0; g_strchomp(tmp_buf); - content[cnt++] = gtk_label_new(tmp_buf); + widgets->w_time_end = content[cnt++] = gtk_label_new(tmp_buf); - g_snprintf(tmp_buf, sizeof(tmp_buf), "%d minutes", (int)(t2-t1)/60); - content[cnt++] = gtk_label_new(tmp_buf); + g_snprintf(tmp_buf, sizeof(tmp_buf), _("%d minutes"), (int)(t2-t1)/60); + widgets->w_time_dur = content[cnt++] = gtk_label_new(tmp_buf); } else { - content[cnt++] = gtk_label_new("No Data"); - content[cnt++] = gtk_label_new("No Data"); - content[cnt++] = gtk_label_new("No Data"); + widgets->w_time_start = content[cnt++] = gtk_label_new(_("No Data")); + widgets->w_time_end = content[cnt++] = gtk_label_new(_("No Data")); + widgets->w_time_dur = content[cnt++] = gtk_label_new(_("No Data")); } - label_date = gtk_label_new("No Data"); - content[cnt++] = label_date; + widgets->w_dist_time = content[cnt++] = gtk_label_new(_("No Data")); table = GTK_TABLE(gtk_table_new (cnt, 2, FALSE)); gtk_table_set_col_spacing (table, 0, 10); @@ -554,7 +734,7 @@ gint vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrack *tr, gpointer vlp ) label = gtk_label_new(NULL); gtk_misc_set_alignment ( GTK_MISC(label), 1, 0 ); - gtk_label_set_markup ( GTK_LABEL(label), label_texts[i] ); + gtk_label_set_markup ( GTK_LABEL(label), _(label_texts[i]) ); gtk_table_attach_defaults ( table, label, 0, 1, i, i+1 ); if (GTK_IS_MISC(content[i])) { gtk_misc_set_alignment ( GTK_MISC(content[i]), 0, 0 ); @@ -565,18 +745,18 @@ gint vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrack *tr, gpointer vlp ) gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), GTK_WIDGET(table), FALSE, FALSE, 0); if ( profile ) - gtk_notebook_append_page(GTK_NOTEBOOK(graphs), profile, gtk_label_new("Elevation-distance")); + gtk_notebook_append_page(GTK_NOTEBOOK(graphs), profile, gtk_label_new(_("Elevation-distance"))); if ( vtdiag ) - gtk_notebook_append_page(GTK_NOTEBOOK(graphs), vtdiag, gtk_label_new("Speed-time")); + gtk_notebook_append_page(GTK_NOTEBOOK(graphs), vtdiag, gtk_label_new(_("Speed-time"))); gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), graphs, FALSE, FALSE, 0); - - gtk_widget_show_all ( dialog ); - resp = gtk_dialog_run (GTK_DIALOG (dialog)); - if ( resp == GTK_RESPONSE_ACCEPT ) - vik_track_set_comment ( tr, gtk_entry_get_text ( GTK_ENTRY(e_cmt) ) ); - gtk_widget_destroy ( dialog ); - return resp; + if (seg_count <= 1) + gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), VIK_TRW_LAYER_PROPWIN_SPLIT, FALSE); + if (vik_track_get_dup_point_count(tr) <= 0) + gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), VIK_TRW_LAYER_PROPWIN_DEL_DUP, FALSE); + + vik_track_set_property_dialog(tr, dialog); + gtk_widget_show_all ( dialog ); }