X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=3c8415cb36a7283e596aa970428e857ec03aa0d1;hb=de721d98106569ccf74d4bcc35619e281df00e5e;hp=547b5d1190f19b4559eb491daef0312e77b9b33c;hpb=feec55504084baf022517d39e72431b4d361a217;p=ext%2Fsubsurface.git diff --git a/info.c b/info.c index 547b5d1..3c8415c 100644 --- a/info.c +++ b/info.c @@ -1,111 +1,118 @@ #include +#include #include #include #include "dive.h" #include "display.h" +#include "divelist.h" -static GtkWidget *divedate, *divetime, *depth, *duration; -static GtkWidget *location, *notes; +static GtkEntry *location, *buddy, *divemaster; +static GtkTextBuffer *notes; +static int location_changed = 1, notes_changed = 1; +static int divemaster_changed = 1, buddy_changed = 1; -static const char *weekday(int wday) +static char *get_text(GtkTextBuffer *buffer) { - static const char wday_array[7][4] = { - "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" - }; - return wday_array[wday]; + 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 update_dive_info(struct dive *dive) +void flush_dive_info_changes(struct dive *dive) { - struct tm *tm; - char buffer[80]; - - 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), ""); + if (!dive) return; + + if (location_changed) { + g_free(dive->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); } - 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); + if (notes_changed) { + g_free(dive->notes); + dive->notes = get_text(notes); + } } -static GtkWidget *info_label(GtkWidget *box, const char *str) +#define SET_TEXT_ENTRY(x) \ + gtk_entry_set_text(x, dive && dive->x ? dive->x : "") + +void show_dive_info(struct dive *dive) { - GtkWidget *label = gtk_label_new(str); - gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT); - gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0); - return label; + 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; - - frame = gtk_frame_new("Dive info"); - gtk_widget_show(frame); + GtkWidget *entry; + GtkWidget *frame = gtk_frame_new(label); - hbox = gtk_hbox_new(TRUE, 5); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 3); - gtk_container_add(GTK_CONTAINER(frame), hbox); + gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0); - divedate = info_label(hbox, "date"); - divetime = info_label(hbox, "time"); - depth = info_label(hbox, "depth"); - duration = info_label(hbox, "duration"); + entry = gtk_entry_new(); + gtk_container_add(GTK_CONTAINER(frame), entry); - return frame; + return GTK_ENTRY(entry); } -static GtkWidget *text_entry(GtkWidget *box, const char *label) +static GtkTextBuffer *text_view(GtkWidget *box, const char *label) { - GtkWidget *entry; + GtkWidget *view, *vbox; + GtkTextBuffer *buffer; GtkWidget *frame = gtk_frame_new(label); - gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0); - entry = gtk_entry_new(); - gtk_container_add(GTK_CONTAINER(frame), entry); - return entry; + + 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); + + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (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"); - notes = text_entry(vbox, "Notes"); - location = gtk_entry_new(); + divemaster = text_entry(hbox, "Divemaster"); + buddy = text_entry(hbox, "Buddy"); - /* Add extended info here: name, description, yadda yadda */ - update_dive_info(current_dive); - return frame; + notes = text_view(vbox, "Notes"); + return vbox; }