X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=9e061970d808ba14bb18d9c259de638781b0c0af;hb=682135838ff313594c7f67fabd9be8f88a33883b;hp=beadda0a5d679e856a0c79099bac3f7cfe9828ce;hpb=c4514b062a9866153c179d4b6ecf7972c9496891;p=ext%2Fsubsurface.git diff --git a/info.c b/info.c index beadda0..9e06197 100644 --- a/info.c +++ b/info.c @@ -1,3 +1,13 @@ +/* info.c */ +/* creates the UI for the info frame - + * controlled through the following interfaces: + * + * void flush_dive_info_changes(struct dive *dive) + * void show_dive_info(struct dive *dive) + * + * called from gtk-ui: + * GtkWidget *extended_dive_info_widget(void) + */ #include #include #include @@ -5,19 +15,13 @@ #include "dive.h" #include "display.h" +#include "display-gtk.h" +#include "divelist.h" -static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locationnote; -static GtkTextBuffer *location, *notes; +static GtkEntry *location, *buddy, *divemaster; +static GtkTextBuffer *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 int divemaster_changed = 1, buddy_changed = 1; static char *get_text(GtkTextBuffer *buffer) { @@ -29,16 +33,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) { @@ -47,133 +59,95 @@ void flush_dive_info_changes(void) } } -void update_dive_info(struct dive *dive) +#define SET_TEXT_ENTRY(x) \ + gtk_entry_set_text(x, dive && dive->x ? dive->x : "") + +void show_dive_info(struct dive *dive) { struct tm *tm; + const char *text; 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), ""); - 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); - - snprintf(buffer, sizeof(buffer), - "%d ft", - to_feet(dive->maxdepth)); - gtk_label_set_text(GTK_LABEL(depth), buffer); - - snprintf(buffer, sizeof(buffer), - "%d min", - dive->duration.seconds / 60); - 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; + 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); + + SET_TEXT_ENTRY(divemaster); + SET_TEXT_ENTRY(buddy); + SET_TEXT_ENTRY(location); + gtk_text_buffer_set_text(notes, dive && dive->notes ? dive->notes : "", -1); } -GtkWidget *dive_info_frame(void) +static GtkEntry *text_entry(GtkWidget *box, const char *label) { - GtkWidget *frame; - GtkWidget *hbox, *hbox2; - GtkWidget *vbox; - - frame = gtk_frame_new("Dive info"); - gtk_widget_show(frame); - - 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); - - hbox2 = gtk_hbox_new(FALSE, 0); - gtk_container_set_border_width(GTK_CONTAINER(hbox2), 3); - gtk_container_add(GTK_CONTAINER(vbox), hbox2); + GtkWidget *entry; + GtkWidget *frame = gtk_frame_new(label); - 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); + gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0); - locationnote = info_label(hbox2, "location", GTK_JUSTIFY_LEFT); - gtk_label_set_width_chars(GTK_LABEL(locationnote), 80); + entry = gtk_entry_new(); + gtk_container_add(GTK_CONTAINER(frame), entry); - return frame; + return GTK_ENTRY(entry); } -static GtkTextBuffer *text_entry(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_box(void) +GtkWidget *extended_dive_info_widget(void) { - GtkWidget *vbox; + GtkWidget *vbox, *hbox; vbox = gtk_vbox_new(FALSE, 6); - location = text_entry(vbox, "Location", FALSE); gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); - notes = text_entry(vbox, "Notes", TRUE); + location = text_entry(vbox, "Location"); + + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + + divemaster = text_entry(hbox, "Divemaster"); + buddy = text_entry(hbox, "Buddy"); - /* Add extended info here: name, description, yadda yadda */ - update_dive_info(current_dive); + notes = text_view(vbox, "Notes"); return vbox; }