X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=7e94a22046b477bbaaf761016703ec205d5e567e;hb=042c77c0fc6969d2d969fb68f1db51d33364d034;hp=c9522a857509d349a019d9f0882a0ab6c3390b1c;hpb=7e920844ac34587534cc108b7028ccb0e2c1b082;p=ext%2Fsubsurface.git

diff --git a/info.c b/info.c
index c9522a8..7e94a22 100644
--- a/info.c
+++ b/info.c
@@ -62,26 +62,30 @@ static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp)
 #define SET_TEXT_VALUE(x) \
 	gtk_entry_set_text(x, dive && dive->x ? dive->x : "")
 
+static int divename(char *buf, size_t size, struct dive *dive)
+{
+	struct tm *tm = gmtime(&dive->when);
+	return snprintf(buf, size, "Dive #%d - %s %02d/%02d/%04d at %d:%02d",
+		dive->number,
+		weekday(tm->tm_wday),
+		tm->tm_mon+1, tm->tm_mday,
+		tm->tm_year+1900,
+		tm->tm_hour, tm->tm_min);
+}
+
 void show_dive_info(struct dive *dive)
 {
-	struct tm *tm;
 	const char *text;
 	char buffer[80];
 
 	/* dive number and location (or lacking that, the date) go in the window title */
-	tm = gmtime(&dive->when);
 	text = dive->location;
 	if (!text)
 		text = "";
 	if (*text) {
 		snprintf(buffer, sizeof(buffer), "Dive #%d - %s", dive->number, text);
 	} else {
-		snprintf(buffer, sizeof(buffer), "Dive #%d - %s %02d/%02d/%04d at %d:%02d",
-			dive->number,
-			weekday(tm->tm_wday),
-			tm->tm_mon+1, tm->tm_mday,
-			tm->tm_year+1900,
-			tm->tm_hour, tm->tm_min);
+		divename(buffer, sizeof(buffer), dive);
 	}
 	text = buffer;
 	if (!dive->number)
@@ -294,7 +298,12 @@ static void save_dive_info_changes(struct dive *dive, struct dive_info *info)
 
 static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info *info)
 {
-	GtkWidget *hbox;
+	GtkWidget *hbox, *label, *cylinder, *frame;
+	char buffer[80];
+
+	divename(buffer, sizeof(buffer), dive);
+	label = gtk_label_new(buffer);
+	gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
 
 	info->location = text_entry(box, "Location", location_list, dive->location);
 
@@ -307,6 +316,11 @@ static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info
 	info->notes = text_view(box, "Notes", READ_WRITE);
 	if (dive->notes && *dive->notes)
 		gtk_text_buffer_set_text(gtk_text_view_get_buffer(info->notes), dive->notes, -1);
+
+	frame = gtk_frame_new("Cylinder");
+	cylinder = cylinder_list_widget();
+	gtk_container_add(GTK_CONTAINER(frame), cylinder);
+	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
 }
 
 int edit_dive_info(struct dive *dive)