X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=75936f4fef3abf2eb61381e615aa5d3f0e9d8683;hb=3def2b1aacd9c018f1bfe9b7f8bce467239cc3b0;hp=6d91a0f26c5704a25d800608dc2163cda20df4fb;hpb=23c6a42b084fbd1affbf7cc1b3f5e94fb15d3a92;p=ext%2Fsubsurface.git diff --git a/info.c b/info.c index 6d91a0f..75936f4 100644 --- a/info.c +++ b/info.c @@ -1,69 +1,163 @@ #include +#include #include #include #include "dive.h" #include "display.h" -static GtkWidget *datetime, *depth, *duration; +static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locationnote; +static GtkTextBuffer *location, *notes; +static int location_changed = 1, notes_changed = 1; +static struct dive *buffered_dive; + +static const char *weekday(int wday) +{ + static const char wday_array[7][4] = { + "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" + }; + return wday_array[wday]; +} + +static char *get_text(GtkTextBuffer *buffer) +{ + GtkTextIter start; + GtkTextIter end; + + gtk_text_buffer_get_start_iter(buffer, &start); + gtk_text_buffer_get_end_iter(buffer, &end); + return gtk_text_buffer_get_text(buffer, &start, &end, FALSE); +} + +void flush_dive_info_changes(void) +{ + struct dive *dive = buffered_dive; + + if (!dive) + return; + + if (location_changed) { + g_free(dive->location); + dive->location = get_text(location); + } + + if (notes_changed) { + g_free(dive->notes); + dive->notes = get_text(notes); + } +} void update_dive_info(struct dive *dive) { struct tm *tm; char buffer[80]; + char *text; + + flush_dive_info_changes(); + buffered_dive = dive; if (!dive) { - gtk_entry_set_text(GTK_ENTRY(datetime), "no dive"); - gtk_entry_set_text(GTK_ENTRY(depth), ""); - gtk_entry_set_text(GTK_ENTRY(duration), ""); + gtk_label_set_text(GTK_LABEL(divedate), "no dive"); + gtk_label_set_text(GTK_LABEL(divetime), ""); + gtk_label_set_text(GTK_LABEL(depth), ""); + gtk_label_set_text(GTK_LABEL(duration), ""); return; } tm = gmtime(&dive->when); snprintf(buffer, sizeof(buffer), - "%04d-%02d-%02d " + "%s %02d/%02d/%04d", + weekday(tm->tm_wday), + tm->tm_mon+1, tm->tm_mday, tm->tm_year+1900); + gtk_label_set_text(GTK_LABEL(divedate), buffer); + + snprintf(buffer, sizeof(buffer), "%02d:%02d:%02d", - tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); - gtk_entry_set_text(GTK_ENTRY(datetime), buffer); + gtk_label_set_text(GTK_LABEL(divetime), buffer); snprintf(buffer, sizeof(buffer), "%d ft", to_feet(dive->maxdepth)); - gtk_entry_set_text(GTK_ENTRY(depth), buffer); + gtk_label_set_text(GTK_LABEL(depth), buffer); snprintf(buffer, sizeof(buffer), "%d min", dive->duration.seconds / 60); - gtk_entry_set_text(GTK_ENTRY(duration), buffer); + gtk_label_set_text(GTK_LABEL(duration), buffer); + + *buffer = 0; + if (dive->watertemp.mkelvin) + snprintf(buffer, sizeof(buffer), + "%d C", + to_C(dive->watertemp)); + gtk_label_set_text(GTK_LABEL(temperature), buffer); + + text = dive->location ? : ""; + gtk_text_buffer_set_text(location, text, -1); + gtk_label_set_text(GTK_LABEL(locationnote), text); + + text = dive->notes ? : ""; + gtk_text_buffer_set_text(notes, text, -1); +} + +static GtkWidget *info_label(GtkWidget *box, const char *str, GtkJustification jtype) +{ + GtkWidget *label = gtk_label_new(str); + gtk_label_set_justify(GTK_LABEL(label), jtype); + gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0); + return label; } GtkWidget *dive_info_frame(void) { GtkWidget *frame; - GtkWidget *hbox; + GtkWidget *hbox, *hbox2; + GtkWidget *vbox; frame = gtk_frame_new("Dive info"); gtk_widget_show(frame); - hbox = gtk_hbox_new(FALSE, 5); - gtk_container_add(GTK_CONTAINER(frame), hbox); + vbox = gtk_vbox_new(TRUE, 5); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); + gtk_container_add(GTK_CONTAINER(frame), vbox); + + hbox = gtk_hbox_new(TRUE, 5); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 3); + gtk_container_add(GTK_CONTAINER(vbox), hbox); - datetime = gtk_entry_new(); - gtk_editable_set_editable(GTK_EDITABLE(datetime), FALSE); - gtk_box_pack_start(GTK_BOX(hbox), datetime, FALSE, FALSE, 0); + hbox2 = gtk_hbox_new(FALSE, 0); + gtk_container_set_border_width(GTK_CONTAINER(hbox2), 3); + gtk_container_add(GTK_CONTAINER(vbox), hbox2); - depth = gtk_entry_new(); - gtk_editable_set_editable(GTK_EDITABLE(depth), FALSE); - gtk_box_pack_start(GTK_BOX(hbox), depth, FALSE, FALSE, 0); + divedate = info_label(hbox, "date", GTK_JUSTIFY_RIGHT); + divetime = info_label(hbox, "time", GTK_JUSTIFY_RIGHT); + depth = info_label(hbox, "depth", GTK_JUSTIFY_RIGHT); + duration = info_label(hbox, "duration", GTK_JUSTIFY_RIGHT); + temperature = info_label(hbox, "temperature", GTK_JUSTIFY_RIGHT); - duration = gtk_entry_new(); - gtk_editable_set_editable(GTK_EDITABLE(duration), FALSE); - gtk_box_pack_start(GTK_BOX(hbox), duration, FALSE, FALSE, 0); + locationnote = info_label(hbox2, "location", GTK_JUSTIFY_LEFT); + gtk_label_set_width_chars(GTK_LABEL(locationnote), 80); return frame; } +static GtkTextBuffer *text_entry(GtkWidget *box, const char *label, gboolean expand) +{ + GtkWidget *view; + GtkTextBuffer *buffer; + + GtkWidget *frame = gtk_frame_new(label); + + gtk_box_pack_start(GTK_BOX(box), frame, expand, expand, 0); + + view = gtk_text_view_new (); + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); + + gtk_container_add(GTK_CONTAINER(frame), view); + return buffer; +} + GtkWidget *extended_dive_info_frame(void) { GtkWidget *frame; @@ -75,6 +169,9 @@ GtkWidget *extended_dive_info_frame(void) vbox = gtk_vbox_new(FALSE, 5); gtk_container_add(GTK_CONTAINER(frame), vbox); + location = text_entry(vbox, "Location", FALSE); + notes = text_entry(vbox, "Notes", TRUE); + /* Add extended info here: name, description, yadda yadda */ update_dive_info(current_dive); return frame;