X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=dc3a95bde4c06e67e90a5e1ad3e0547731240d08;hb=d9106995d39138dbce5f3306a391361f68ce0a07;hp=547b5d1190f19b4559eb491daef0312e77b9b33c;hpb=feec55504084baf022517d39e72431b4d361a217;p=ext%2Fsubsurface.git

diff --git a/info.c b/info.c
index 547b5d1..dc3a95b 100644
--- a/info.c
+++ b/info.c
@@ -5,8 +5,10 @@
 #include "dive.h"
 #include "display.h"
 
-static GtkWidget *divedate, *divetime, *depth, *duration;
-static GtkWidget *location, *notes;
+static GtkWidget *divedate, *divetime, *depth, *duration, *temperature;
+static GtkTextBuffer *location, *notes;
+static int location_changed = 1, notes_changed = 1;
+static struct dive *buffered_dive;
 
 static const char *weekday(int wday)
 {
@@ -16,10 +18,42 @@ static const char *weekday(int wday)
 	return wday_array[wday];
 }
 
+static char *get_text(GtkTextBuffer *buffer)
+{
+	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 flush_dive_info_changes(void)
+{
+	struct dive *dive = buffered_dive;
+
+	if (!dive)
+		return;
+
+	if (location_changed) {
+		g_free(dive->location);
+		dive->location = get_text(location);
+	}
+
+	if (notes_changed) {
+		g_free(dive->notes);
+		dive->notes = get_text(notes);
+	}
+}
+
 void update_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");
@@ -50,6 +84,18 @@ void update_dive_info(struct dive *dive)
 		"%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);
+	text = dive->notes ? : "";
+	gtk_text_buffer_set_text(notes, text, -1);
 }
 
 static GtkWidget *info_label(GtkWidget *box, const char *str)
@@ -76,18 +122,25 @@ GtkWidget *dive_info_frame(void)
 	divetime = info_label(hbox, "time");
 	depth = info_label(hbox, "depth");
 	duration = info_label(hbox, "duration");
+	temperature = info_label(hbox, "temperature");
 
 	return frame;
 }
 
-static GtkWidget *text_entry(GtkWidget *box, const char *label)
+static GtkTextBuffer *text_entry(GtkWidget *box, const char *label, gboolean expand)
 {
-	GtkWidget *entry;
+	GtkWidget *view;
+	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, expand, expand, 0);
+
+	view = gtk_text_view_new ();
+	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+
+	gtk_container_add(GTK_CONTAINER(frame), view);
+	return buffer;
 }
 
 GtkWidget *extended_dive_info_frame(void)
@@ -101,9 +154,8 @@ 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();
+	location = text_entry(vbox, "Location", FALSE);
+	notes = text_entry(vbox, "Notes", TRUE);
 
 	/* Add extended info here: name, description, yadda yadda */
 	update_dive_info(current_dive);