X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=5cfe7286cb32ad406d945a8865c4019fd8bb1ac1;hb=4564d67953af9bfa8086c457b26e3b66f1c2718d;hp=3adbe15d191446d0495285c13f16b6666f3b2afe;hpb=22fcef2ec7fd1efd3d1df2aba2b7b3af5d463288;p=ext%2Fsubsurface.git diff --git a/info.c b/info.c index 3adbe15..5cfe728 100644 --- a/info.c +++ b/info.c @@ -1,14 +1,21 @@ #include +#include #include #include #include "dive.h" #include "display.h" +#include "divelist.h" -static GtkWidget *divedate, *divetime, *depth, *duration; -static GtkTextBuffer *location, *notes; +static GtkWidget *info_frame; +static GtkWidget *depth, *duration, *temperature, *airconsumption; +static GtkEntry *location, *buddy, *divemaster; +static GtkTextBuffer *notes; static int location_changed = 1, notes_changed = 1; -static struct dive *buffered_dive; +static int divemaster_changed = 1, buddy_changed = 1; + +#define EMPTY_AIRCONSUMPTION " \n " +#define AIRCON_WIDTH 20 static const char *weekday(int wday) { @@ -28,16 +35,24 @@ 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; if (location_changed) { g_free(dive->location); - dive->location = get_text(location); + dive->location = gtk_editable_get_chars(GTK_EDITABLE(location), 0, -1); + } + + if (divemaster_changed) { + g_free(dive->divemaster); + dive->divemaster = gtk_editable_get_chars(GTK_EDITABLE(divemaster), 0, -1); + } + + if (buddy_changed) { + g_free(dive->buddy); + dive->buddy = gtk_editable_get_chars(GTK_EDITABLE(buddy), 0, -1); } if (notes_changed) { @@ -46,38 +61,60 @@ 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; - if (!dive) { - 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), ""); + gtk_label_set_text(GTK_LABEL(airconsumption), EMPTY_AIRCONSUMPTION); + gtk_label_set_width_chars(GTK_LABEL(airconsumption), AIRCON_WIDTH); return; } - + /* dive number and location (or lacking that, the date) go in the window title */ tm = gmtime(&dive->when); - snprintf(buffer, sizeof(buffer), - "%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_hour, tm->tm_min, tm->tm_sec); - gtk_label_set_text(GTK_LABEL(divetime), buffer); + text = dive->location; + if (!text) + text = ""; + if (*text) { + snprintf(buffer, sizeof(buffer), "Dive #%d - %s", dive->number, text); + } else { + snprintf(buffer, sizeof(buffer), "Dive #%d - %s %02d/%02d/%04d at %d:%02d", + dive->number, + weekday(tm->tm_wday), + tm->tm_mon+1, tm->tm_mday, + tm->tm_year+1900, + tm->tm_hour, tm->tm_min); + } + text = buffer; + if (!dive->number) + text += 10; /* Skip the "Dive #0 - " part */ + gtk_window_set_title(GTK_WINDOW(main_window), text); - snprintf(buffer, sizeof(buffer), - "%d ft", - to_feet(dive->maxdepth)); + /* the date goes in the frame label */ + snprintf(buffer, sizeof(buffer), "%s %02d/%02d/%04d at %d:%02d", + weekday(tm->tm_wday), + tm->tm_mon+1, tm->tm_mday, + tm->tm_year+1900, + tm->tm_hour, tm->tm_min); + gtk_frame_set_label(GTK_FRAME(info_frame), buffer); + + + 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), @@ -85,16 +122,45 @@ void update_dive_info(struct dive *dive) dive->duration.seconds / 60); gtk_label_set_text(GTK_LABEL(duration), buffer); + *buffer = 0; + 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_text_buffer_set_text(location, text, -1); + gtk_entry_set_text(location, text); + + text = dive->divemaster ? : ""; + gtk_entry_set_text(divemaster, text); + + text = dive->buddy ? : ""; + gtk_entry_set_text(buddy, text); + text = dive->notes ? : ""; gtk_text_buffer_set_text(notes, text, -1); } -static GtkWidget *info_label(GtkWidget *box, const char *str) +static GtkWidget *info_label(GtkWidget *box, const char *str, GtkJustification jtype) { GtkWidget *label = gtk_label_new(str); - gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT); + gtk_label_set_justify(GTK_LABEL(label), jtype); gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0); return label; } @@ -103,53 +169,95 @@ GtkWidget *dive_info_frame(void) { GtkWidget *frame; GtkWidget *hbox; + GtkWidget *vbox; frame = gtk_frame_new("Dive info"); + info_frame = frame; gtk_widget_show(frame); - hbox = gtk_hbox_new(TRUE, 5); + 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(FALSE, 16); gtk_container_set_border_width(GTK_CONTAINER(hbox), 3); - gtk_container_add(GTK_CONTAINER(frame), hbox); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); - divedate = info_label(hbox, "date"); - divetime = info_label(hbox, "time"); - depth = info_label(hbox, "depth"); - duration = info_label(hbox, "duration"); + depth = info_label(hbox, "depth", GTK_JUSTIFY_RIGHT); + duration = info_label(hbox, "duration", GTK_JUSTIFY_RIGHT); + temperature = info_label(hbox, "temperature", GTK_JUSTIFY_RIGHT); + airconsumption = info_label(hbox, "air", GTK_JUSTIFY_RIGHT); + gtk_misc_set_alignment(GTK_MISC(airconsumption), 1.0, 0.5); + gtk_label_set_width_chars(GTK_LABEL(airconsumption), AIRCON_WIDTH); return frame; } -static GtkTextBuffer *text_entry(GtkWidget *box, const char *label, gboolean expand) +void update_air_info(char *buffer) { - GtkWidget *view; - GtkTextBuffer *buffer; + char markup[120]; + + snprintf(markup, sizeof(markup), "%s",buffer); + gtk_label_set_markup(GTK_LABEL(airconsumption), markup); +} +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, expand, expand, 0); + gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0); + + entry = gtk_entry_new(); + gtk_container_add(GTK_CONTAINER(frame), entry); + + return GTK_ENTRY(entry); +} + +static GtkTextBuffer *text_view(GtkWidget *box, const char *label) +{ + GtkWidget *view, *vbox; + GtkTextBuffer *buffer; + GtkWidget *frame = gtk_frame_new(label); + + 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); + 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(); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD); + gtk_container_add(GTK_CONTAINER(scrolled_window), view); - view = gtk_text_view_new (); buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - gtk_container_add(GTK_CONTAINER(frame), view); + gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0); return buffer; } -GtkWidget *extended_dive_info_frame(void) +GtkWidget *extended_dive_info_widget(void) { - GtkWidget *frame; - GtkWidget *vbox; + GtkWidget *vbox, *hbox; + vbox = gtk_vbox_new(FALSE, 6); - frame = gtk_frame_new("Extended dive info"); - gtk_widget_show(frame); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); + location = text_entry(vbox, "Location"); - vbox = gtk_vbox_new(FALSE, 5); - gtk_container_add(GTK_CONTAINER(frame), vbox); + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); - location = text_entry(vbox, "Location", FALSE); - notes = text_entry(vbox, "Notes", TRUE); + divemaster = text_entry(hbox, "Divemaster"); + buddy = text_entry(hbox, "Buddy"); + + notes = text_view(vbox, "Notes"); /* Add extended info here: name, description, yadda yadda */ - update_dive_info(current_dive); - return frame; + show_dive_info(current_dive); + return vbox; }