Add some extended dive info fields

.. and tweak the basic info layout a bit.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 51 insertions, 21 deletions

diff --git a/info.c b/info.c
index 6d91a0f26..547b5d119 100644
--- a/info.c
+++ b/info.c
@@ -5,7 +5,16 @@
 #include "dive.h"
 #include "display.h"
 
-static GtkWidget *datetime, *depth, *duration;
+static GtkWidget *divedate, *divetime, *depth, *duration;
+static GtkWidget *location, *notes;
+
+static const char *weekday(int wday)
+{
+	static const char wday_array[7][4] = {
+		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+	};
+	return wday_array[wday];
+}
 
 void update_dive_info(struct dive *dive)
 {
@@ -13,29 +22,42 @@ void update_dive_info(struct dive *dive)
 	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), "");
+		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;
 	}
 
 	tm = gmtime(&dive->when);
 	snprintf(buffer, sizeof(buffer),
-		"%04d-%02d-%02d "
+		"%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_year+1900, tm->tm_mon+1, tm->tm_mday,
 		tm->tm_hour, tm->tm_min, tm->tm_sec);
-	gtk_entry_set_text(GTK_ENTRY(datetime), buffer);
+	gtk_label_set_text(GTK_LABEL(divetime), buffer);
 
 	snprintf(buffer, sizeof(buffer),
 		"%d ft",
 		to_feet(dive->maxdepth));
-	gtk_entry_set_text(GTK_ENTRY(depth), buffer);
+	gtk_label_set_text(GTK_LABEL(depth), buffer);
 
 	snprintf(buffer, sizeof(buffer),
 		"%d min",
 		dive->duration.seconds / 60);
-	gtk_entry_set_text(GTK_ENTRY(duration), buffer);
+	gtk_label_set_text(GTK_LABEL(duration), buffer);
+}
+
+static GtkWidget *info_label(GtkWidget *box, const char *str)
+{
+	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;
 }
 
 GtkWidget *dive_info_frame(void)
@@ -46,24 +68,28 @@ GtkWidget *dive_info_frame(void)
 	frame = gtk_frame_new("Dive info");
 	gtk_widget_show(frame);
 
-	hbox = gtk_hbox_new(FALSE, 5);
+	hbox = gtk_hbox_new(TRUE, 5);
+	gtk_container_set_border_width(GTK_CONTAINER(hbox), 3);
 	gtk_container_add(GTK_CONTAINER(frame), hbox);
 
-	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);
+	divedate = info_label(hbox, "date");
+	divetime = info_label(hbox, "time");
+	depth = info_label(hbox, "depth");
+	duration = info_label(hbox, "duration");
 
 	return frame;
 }
 
+static GtkWidget *text_entry(GtkWidget *box, const char *label)
+{
+	GtkWidget *entry;
+	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;
+}
+
 GtkWidget *extended_dive_info_frame(void)
 {
 	GtkWidget *frame;
@@ -75,6 +101,10 @@ GtkWidget *extended_dive_info_frame(void)
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 
+	location = text_entry(vbox, "Location");
+	notes = text_entry(vbox, "Notes");
+	location = gtk_entry_new();
+
 	/* Add extended info here: name, description, yadda yadda */
 	update_dive_info(current_dive);
 	return frame;