X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=2cc98f4fd1f81b404ad01cbc9982c9ec2e9fa9c6;hb=42f627b8b1cf7e929a30c0a07a5fb44a4cec9e1f;hp=c3b51409155c8d42202be54a9b88d46a1f371376;hpb=6b075e0339f419555f08ece3a6c4a29407ecc32b;p=ext%2Fsubsurface.git diff --git a/info.c b/info.c index c3b5140..2cc98f4 100644 --- a/info.c +++ b/info.c @@ -5,12 +5,13 @@ #include "dive.h" #include "display.h" +#include "divelist.h" -static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locationnote; +static GtkWidget *info_frame; +static GtkWidget *divedate, *divetime, *depth, *duration, *temperature; static GtkEntry *location; static GtkTextBuffer *notes; static int location_changed = 1, notes_changed = 1; -static struct dive *buffered_dive; static const char *weekday(int wday) { @@ -30,10 +31,8 @@ static char *get_text(GtkTextBuffer *buffer) return gtk_text_buffer_get_text(buffer, &start, &end, FALSE); } -void flush_dive_info_changes(void) +void flush_dive_info_changes(struct dive *dive) { - struct dive *dive = buffered_dive; - if (!dive) return; @@ -48,14 +47,12 @@ void flush_dive_info_changes(void) } } -void update_dive_info(struct dive *dive) +void show_dive_info(struct dive *dive) { struct tm *tm; char buffer[80]; char *text; - - flush_dive_info_changes(); - buffered_dive = dive; + int len; if (!dive) { gtk_label_set_text(GTK_LABEL(divedate), "no dive"); @@ -77,9 +74,18 @@ void update_dive_info(struct dive *dive) tm->tm_hour, tm->tm_min, tm->tm_sec); gtk_label_set_text(GTK_LABEL(divetime), buffer); - snprintf(buffer, sizeof(buffer), - "%d ft", - to_feet(dive->maxdepth)); + switch (output_units.length) { + case METERS: + snprintf(buffer, sizeof(buffer), + "%.1f m", + dive->maxdepth.mm / 1000.0); + break; + case FEET: + snprintf(buffer, sizeof(buffer), + "%d ft", + to_feet(dive->maxdepth)); + break; + } gtk_label_set_text(GTK_LABEL(depth), buffer); snprintf(buffer, sizeof(buffer), @@ -88,15 +94,38 @@ void update_dive_info(struct dive *dive) gtk_label_set_text(GTK_LABEL(duration), buffer); *buffer = 0; - if (dive->watertemp.mkelvin) - snprintf(buffer, sizeof(buffer), - "%d C", - to_C(dive->watertemp)); + if (dive->watertemp.mkelvin) { + switch (output_units.temperature) { + case CELSIUS: + snprintf(buffer, sizeof(buffer), + "%d C", + to_C(dive->watertemp)); + break; + case FAHRENHEIT: + snprintf(buffer, sizeof(buffer), + "%d F", + to_F(dive->watertemp)); + break; + case KELVIN: + snprintf(buffer, sizeof(buffer), + "%d K", + to_K(dive->watertemp)); + break; + } + } gtk_label_set_text(GTK_LABEL(temperature), buffer); text = dive->location ? : ""; gtk_entry_set_text(location, text); - gtk_label_set_text(GTK_LABEL(locationnote), text); + + text = "Dive Info"; + if (dive->location && *dive->location) + text = dive->location; + len = 0; + if (dive->number) + len = snprintf(buffer, sizeof(buffer), "%d. ", dive->number); + snprintf(buffer+len, sizeof(buffer)-len, "%s", text); + gtk_frame_set_label(GTK_FRAME(info_frame), buffer); text = dive->notes ? : ""; gtk_text_buffer_set_text(notes, text, -1); @@ -113,23 +142,20 @@ static GtkWidget *info_label(GtkWidget *box, const char *str, GtkJustification j GtkWidget *dive_info_frame(void) { GtkWidget *frame; - GtkWidget *hbox, *hbox2; + GtkWidget *hbox; GtkWidget *vbox; frame = gtk_frame_new("Dive info"); + info_frame = frame; gtk_widget_show(frame); - vbox = gtk_vbox_new(TRUE, 6); + vbox = gtk_vbox_new(FALSE, 6); gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); gtk_container_add(GTK_CONTAINER(frame), vbox); - hbox = gtk_hbox_new(TRUE, 6); + hbox = gtk_hbox_new(FALSE, 16); gtk_container_set_border_width(GTK_CONTAINER(hbox), 3); - gtk_container_add(GTK_CONTAINER(vbox), hbox); - - hbox2 = gtk_hbox_new(FALSE, 6); - gtk_container_set_border_width(GTK_CONTAINER(hbox2), 3); - gtk_container_add(GTK_CONTAINER(vbox), hbox2); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); divedate = info_label(hbox, "date", GTK_JUSTIFY_RIGHT); divetime = info_label(hbox, "time", GTK_JUSTIFY_RIGHT); @@ -137,61 +163,59 @@ GtkWidget *dive_info_frame(void) duration = info_label(hbox, "duration", GTK_JUSTIFY_RIGHT); temperature = info_label(hbox, "temperature", GTK_JUSTIFY_RIGHT); - locationnote = info_label(hbox2, "location", GTK_JUSTIFY_LEFT); - gtk_label_set_width_chars(GTK_LABEL(locationnote), 80); - return frame; } static GtkEntry *text_entry(GtkWidget *box, const char *label) { GtkWidget *entry; - GtkWidget *frame = gtk_frame_new(label); gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0); - entry = gtk_entry_new (); + entry = gtk_entry_new(); gtk_container_add(GTK_CONTAINER(frame), entry); return GTK_ENTRY(entry); } -static GtkTextBuffer *text_view(GtkWidget *box, const char *label, gboolean expand) +static GtkTextBuffer *text_view(GtkWidget *box, const char *label) { - GtkWidget *view; + GtkWidget *view, *vbox; GtkTextBuffer *buffer; - GtkWidget *frame = gtk_frame_new(label); - gtk_box_pack_start(GTK_BOX(box), frame, expand, expand, 0); + gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0); + box = gtk_hbox_new(FALSE, 3); + gtk_container_add(GTK_CONTAINER(frame), box); + vbox = gtk_vbox_new(FALSE, 3); + gtk_container_add(GTK_CONTAINER(box), vbox); - GtkWidget* scrolled_window = gtk_scrolled_window_new (0, 0); + GtkWidget* scrolled_window = gtk_scrolled_window_new(0, 0); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), GTK_SHADOW_IN); gtk_widget_show(scrolled_window); - view = gtk_text_view_new (); + view = gtk_text_view_new(); gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD); gtk_container_add(GTK_CONTAINER(scrolled_window), view); buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - gtk_container_add(GTK_CONTAINER(frame), scrolled_window); + gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0); return buffer; } GtkWidget *extended_dive_info_widget(void) { GtkWidget *vbox; - vbox = gtk_vbox_new(FALSE, 6); location = text_entry(vbox, "Location"); gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); - notes = text_view(vbox, "Notes", TRUE); + notes = text_view(vbox, "Notes"); /* Add extended info here: name, description, yadda yadda */ - update_dive_info(current_dive); + show_dive_info(current_dive); return vbox; }