X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=b789d9fd8a6916923e29ccfa7069e69df46e9a7a;hb=bd315a4804cf60123c7016ece084f2593df5101f;hp=62a72e1405815ba958eac8a1b1e3db4b0f47a4c7;hpb=bcf12edfe9f9f00d39736d1cff791dbe8809f6f1;p=ext%2Fsubsurface.git

diff --git a/info.c b/info.c
index 62a72e1..b789d9f 100644
--- a/info.c
+++ b/info.c
@@ -5,6 +5,7 @@
 
 #include "dive.h"
 #include "display.h"
+#include "divelist.h"
 
 static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locationnote;
 static GtkEntry *location;
@@ -77,9 +78,18 @@ void update_dive_info(struct dive *dive)
 		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));
+	switch (output_units.length) {
+	case METERS:
+		snprintf(buffer, sizeof(buffer),
+			"%.1f m",
+			dive->maxdepth.mm / 1000.0);
+		break;
+	case FEET:
+		snprintf(buffer, sizeof(buffer),
+			"%d ft",
+			to_feet(dive->maxdepth));
+		break;
+	}
 	gtk_label_set_text(GTK_LABEL(depth), buffer);
 
 	snprintf(buffer, sizeof(buffer),
@@ -88,10 +98,25 @@ void update_dive_info(struct dive *dive)
 	gtk_label_set_text(GTK_LABEL(duration), buffer);
 
 	*buffer = 0;
-	if (dive->watertemp.mkelvin)
-		snprintf(buffer, sizeof(buffer),
-			"%d C",
-			to_C(dive->watertemp));
+	if (dive->watertemp.mkelvin) {
+		switch (output_units.temperature) {
+		case CELSIUS:
+			snprintf(buffer, sizeof(buffer),
+				"%d C",
+				to_C(dive->watertemp));
+			break;
+		case FAHRENHEIT:
+			snprintf(buffer, sizeof(buffer),
+				"%d F",
+				to_F(dive->watertemp));
+			break;
+		case KELVIN:
+			snprintf(buffer, sizeof(buffer),
+				"%d K",
+				to_K(dive->watertemp));
+			break;
+		}
+	}
 	gtk_label_set_text(GTK_LABEL(temperature), buffer);
 
 	text = dive->location ? : "";
@@ -119,15 +144,15 @@ GtkWidget *dive_info_frame(void)
 	frame = gtk_frame_new("Dive info");
 	gtk_widget_show(frame);
 
-	vbox = gtk_vbox_new(TRUE, 5);
+	vbox = gtk_vbox_new(TRUE, 6);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 3);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 
-	hbox = gtk_hbox_new(TRUE, 5);
+	hbox = gtk_hbox_new(TRUE, 6);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox), 3);
 	gtk_container_add(GTK_CONTAINER(vbox), hbox);
 
-	hbox2 = gtk_hbox_new(FALSE, 0);
+	hbox2 = gtk_hbox_new(FALSE, 6);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox2), 3);
 	gtk_container_add(GTK_CONTAINER(vbox), hbox2);
 
@@ -185,9 +210,10 @@ GtkWidget *extended_dive_info_widget(void)
 {
 	GtkWidget *vbox;
 
-	vbox = gtk_vbox_new(FALSE, 5);
+	vbox = gtk_vbox_new(FALSE, 6);
 
 	location = text_entry(vbox, "Location");
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
 	notes = text_view(vbox, "Notes", TRUE);
 
 	/* Add extended info here: name, description, yadda yadda */