X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=info.c;h=6d91a0f26c5704a25d800608dc2163cda20df4fb;hb=23c6a42b084fbd1affbf7cc1b3f5e94fb15d3a92;hp=efd17f896f85ec987a9c26900710087cfd3fd2fb;hpb=a39b2ee220cd23d4d6ed52f23e50fee0d4381a93;p=ext%2Fsubsurface.git diff --git a/info.c b/info.c index efd17f8..6d91a0f 100644 --- a/info.c +++ b/info.c @@ -12,6 +12,13 @@ void update_dive_info(struct dive *dive) struct tm *tm; char buffer[80]; + 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), ""); + return; + } + tm = gmtime(&dive->when); snprintf(buffer, sizeof(buffer), "%04d-%02d-%02d " @@ -44,19 +51,31 @@ GtkWidget *dive_info_frame(void) datetime = gtk_entry_new(); gtk_editable_set_editable(GTK_EDITABLE(datetime), FALSE); - gtk_box_pack_start(GTK_BOX(hbox), datetime, FALSE, FALSE, 0); depth = gtk_entry_new(); gtk_editable_set_editable(GTK_EDITABLE(depth), FALSE); - gtk_box_pack_start(GTK_BOX(hbox), depth, FALSE, FALSE, 0); duration = gtk_entry_new(); gtk_editable_set_editable(GTK_EDITABLE(duration), FALSE); - gtk_box_pack_start(GTK_BOX(hbox), duration, FALSE, FALSE, 0); + return frame; +} + +GtkWidget *extended_dive_info_frame(void) +{ + GtkWidget *frame; + GtkWidget *vbox; + + frame = gtk_frame_new("Extended dive info"); + gtk_widget_show(frame); + + vbox = gtk_vbox_new(FALSE, 5); + gtk_container_add(GTK_CONTAINER(frame), vbox); + + /* Add extended info here: name, description, yadda yadda */ update_dive_info(current_dive); return frame; }