X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=ca5399548c33b3743ef1b76bc8792ea894de2671;hb=77a903a6bb26d60e1736f7d5c118b598916b37f2;hp=10a31f55813dd57160d5c796b02aace0323e73d6;hpb=e3bdfc2dc357e362a695632a3e0ee24095bb5b5a;p=ext%2Fsubsurface.git

diff --git a/info.c b/info.c
index 10a31f5..ca53995 100644
--- a/info.c
+++ b/info.c
@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <ctype.h>
+#include <sys/time.h>
 
 #include "dive.h"
 #include "display.h"
@@ -241,6 +242,8 @@ static gboolean match_string_entry(GtkTreeModel *model, GtkTreePath *path, GtkTr
 
 	gtk_tree_model_get(model, iter, 0, &entry, -1);
 	cmp = strcmp(entry, string);
+	if (entry)
+		free(entry);
 
 	/* Stop. The entry is bigger than the new one */
 	if (cmp > 0)
@@ -420,17 +423,37 @@ int edit_dive_info(struct dive *dive)
 	return success;
 }
 
+static GtkWidget *frame_box(GtkWidget *vbox, const char *fmt, ...)
+{
+	va_list ap;
+	char buffer[64];
+	GtkWidget *frame, *hbox;
+
+	va_start(ap, fmt);
+	vsnprintf(buffer, sizeof(buffer), fmt, ap);
+	va_end(ap);
+
+	frame = gtk_frame_new(buffer);
+	gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, TRUE, 0);
+	hbox = gtk_hbox_new(0, 3);
+	gtk_container_add(GTK_CONTAINER(frame), hbox);
+	return hbox;
+}
+
 /* Fixme - should do at least depths too - a dive without a depth is kind of pointless */
 static time_t dive_time_widget(struct dive *dive)
 {
 	GtkWidget *dialog;
-	GtkWidget *cal, *hbox, *vbox;
+	GtkWidget *cal, *hbox, *vbox, *box;
 	GtkWidget *h, *m;
-	GtkWidget *duration;
+	GtkWidget *duration, *depth;
 	GtkWidget *label;
 	guint yval, mval, dval;
-	struct tm tm;
+	struct tm tm, *tmp;
+	struct timeval tv;
+	time_t time;
 	int success;
+	double depthinterval, val;
 
 	dialog = gtk_dialog_new_with_buttons("Date and Time",
 		GTK_WINDOW(main_window),
@@ -442,33 +465,49 @@ static time_t dive_time_widget(struct dive *dive)
 	vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 
 	/* Calendar hbox */
-	hbox = gtk_hbox_new(0, 3);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
-
+	hbox = frame_box(vbox, "Date:");
 	cal = gtk_calendar_new();
 	gtk_box_pack_start(GTK_BOX(hbox), cal, FALSE, TRUE, 0);
 
-	/* Time/duration hbox */
-	hbox = gtk_hbox_new(0, 3);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
+	/* Time hbox */
+	hbox = frame_box(vbox, "Time");
 
 	h = gtk_spin_button_new_with_range (0.0, 23.0, 1.0);
 	m = gtk_spin_button_new_with_range (0.0, 59.0, 1.0);
 
+	gettimeofday(&tv, NULL);
+	time = tv.tv_sec;
+	tmp = localtime(&time);
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(h), tmp->tm_hour);
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(m), (tmp->tm_min / 5)*5);
+
 	gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(h), TRUE);
 	gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(m), TRUE);
 
-	duration = gtk_spin_button_new_with_range (0.0, 1000.0, 1.0);
-
-	gtk_box_pack_start(GTK_BOX(hbox), h, FALSE, FALSE, 0);
+	gtk_box_pack_end(GTK_BOX(hbox), m, FALSE, FALSE, 0);
 	label = gtk_label_new(":");
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), m, FALSE, FALSE, 0);
+	gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+	gtk_box_pack_end(GTK_BOX(hbox), h, FALSE, FALSE, 0);
 
-	label = gtk_label_new("   Duration:");
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), duration, FALSE, FALSE, 0);
+	hbox = gtk_hbox_new(TRUE, 3);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
+	/* Duration hbox */
+	box = frame_box(hbox, "Duration (min)");
+	duration = gtk_spin_button_new_with_range (0.0, 1000.0, 1.0);
+	gtk_box_pack_end(GTK_BOX(box), duration, FALSE, FALSE, 0);
+
+	/* Depth box */
+	box = frame_box(hbox, "Depth (%s):", output_units.length == FEET ? "ft" : "m");
+	if (output_units.length == FEET) {
+		depthinterval = 1.0;
+	} else {
+		depthinterval = 0.1;
+	}
+	depth = gtk_spin_button_new_with_range (0.0, 1000.0, depthinterval);
+	gtk_box_pack_end(GTK_BOX(box), depth, FALSE, FALSE, 0);
+
+	/* All done, show it and wait for editing */
 	gtk_widget_show_all(dialog);
 	success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT;
 	if (!success) {
@@ -485,6 +524,13 @@ static time_t dive_time_widget(struct dive *dive)
 	tm.tm_hour = gtk_spin_button_get_value(GTK_SPIN_BUTTON(h));
 	tm.tm_min = gtk_spin_button_get_value(GTK_SPIN_BUTTON(m));
 
+	val = gtk_spin_button_get_value(GTK_SPIN_BUTTON(depth));
+	if (output_units.length == FEET) {
+		dive->maxdepth.mm = feet_to_mm(val);
+	} else {
+		dive->maxdepth.mm = val * 1000 + 0.5;
+	}
+
 	dive->duration.seconds = gtk_spin_button_get_value(GTK_SPIN_BUTTON(duration))*60;
 
 	gtk_widget_destroy(dialog);