X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=e000924368de40763520d22e1ab371957e287ce4;hb=682135838ff313594c7f67fabd9be8f88a33883b;hp=dc0e256a557c51b341fb9f22a7ef70e264868b87;hpb=7dca1cb78e7d8250bb4fd6843bd3260492554832;p=ext%2Fsubsurface.git

diff --git a/divelist.c b/divelist.c
index dc0e256..e000924 100644
--- a/divelist.c
+++ b/divelist.c
@@ -1,3 +1,13 @@
+/* divelist.c */
+/* this creates the UI for the dive list - 
+ * controlled through the following interfaces:
+ * 
+ * void flush_divelist(struct dive *dive)
+ * GtkWidget dive_list_create(void)
+ * void dive_list_update_dives(void)
+ * void update_dive_list_units(void)
+ * void set_divelist_font(const char *font)
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -6,6 +16,17 @@
 #include "divelist.h"
 #include "dive.h"
 #include "display.h"
+#include "display-gtk.h"
+
+struct DiveList {
+	GtkWidget    *tree_view;
+	GtkWidget    *container_widget;
+	GtkListStore *model;
+	GtkTreeViewColumn *date, *depth, *duration, *location;
+	GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac;
+};
+
+static struct DiveList dive_list;
 
 /*
  * The dive list has the dive data in both string format (for showing)
@@ -13,21 +34,19 @@
  */
 enum {
 	DIVE_INDEX = 0,
-	DIVE_DATESTR,		/* "Thu Jun 17th, 2011" or whatever */
 	DIVE_DATE,		/* time_t: dive->when */
-	DIVE_DEPTHSTR,		/* "67" in ft or whatever */
 	DIVE_DEPTH,		/* int: dive->maxdepth in mm */
-	DIVE_DURATIONSTR,	/* "47" in minutes */
 	DIVE_DURATION,		/* int: in seconds */
-	DIVE_TEMPSTR,		/* "78" in fahrenheit or whatever */
-	DIVE_TEMP,		/* int: in mkelvin */
-	DIVE_NITROXSTR,		/* "32.5" in percent */
+	DIVE_LOCATION,		/* "2nd Cathedral, Lanai" */
+	DIVE_TEMPERATURE,	/* int: in mkelvin */
+	DIVE_CYLINDER,
 	DIVE_NITROX,		/* int: in permille */
-	DIVE_SACSTR,		/* "0.49" in cuft/min */
-	DIVE_SAC,		/* int: in ml/min or something */
+	DIVE_SAC,		/* int: in ml/min */
 	DIVELIST_COLUMNS
 };
 
+/* the global dive list that we maintain */
+static struct DiveList dive_list;
 
 static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
 {
@@ -42,51 +61,43 @@ static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
 	repaint_dive();
 }
 
-static const char *weekday(int wday)
-{
-	static const char wday_array[7][4] = {
-		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-	};
-	return wday_array[wday];
-}
-
-static const char *monthname(int mon)
-{
-	static const char month_array[12][4] = {
-		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-		"Jul", "Aug", "Oct", "Sep", "Nov", "Dec",
-	};
-	return month_array[mon];
-}
-
-static void get_date(struct dive *dive, int *val, char **str)
+static void date_data_func(GtkTreeViewColumn *col,
+			   GtkCellRenderer *renderer,
+			   GtkTreeModel *model,
+			   GtkTreeIter *iter,
+			   gpointer data)
 {
+	int val;
 	struct tm *tm;
-	time_t when = dive->when;
+	time_t when;
 	char buffer[40];
 
+	gtk_tree_model_get(model, iter, DIVE_DATE, &val, -1);
+
 	/* 2038 problem */
-	*val = when;
+	when = val;
 
-	tm = gmtime(&dive->when);
+	tm = gmtime(&when);
 	snprintf(buffer, sizeof(buffer),
 		"%s, %s %d, %d %02d:%02d",
 		weekday(tm->tm_wday),
 		monthname(tm->tm_mon),
 		tm->tm_mday, tm->tm_year + 1900,
 		tm->tm_hour, tm->tm_min);
-	*str = strdup(buffer);
+	g_object_set(renderer, "text", buffer, NULL);
 }
 
-static void get_depth(struct dive *dive, int *val, char **str)
+static void depth_data_func(GtkTreeViewColumn *col,
+			    GtkCellRenderer *renderer,
+			    GtkTreeModel *model,
+			    GtkTreeIter *iter,
+			    gpointer data)
 {
-	int len;
-	int depth = dive->maxdepth.mm;
-	int integer, frac = -1;
-	char buffer[10];
+	int depth, integer, frac, len;
+	char buffer[40];
+
+	gtk_tree_model_get(model, iter, DIVE_DEPTH, &depth, -1);
 
-	*val = depth;
-	*str = "";
 	switch (output_units.length) {
 	case METERS:
 		/* To tenths of meters */
@@ -99,37 +110,46 @@ static void get_depth(struct dive *dive, int *val, char **str)
 		/* Rounding? */
 		break;
 	case FEET:
-		integer = to_feet(dive->maxdepth);
+		integer = mm_to_feet(depth) + 0.5;
 		frac = -1;
 		break;
 	default:
 		return;
 	}
-	len = snprintf(buffer, sizeof(buffer),
-	               "%d", integer);
+	len = snprintf(buffer, sizeof(buffer), "%d", integer);
 	if (frac >= 0)
-		len += snprintf(buffer+len, sizeof(buffer)-len,
-			".%d", frac);
-	*str = strdup(buffer);
+		len += snprintf(buffer+len, sizeof(buffer)-len, ".%d", frac);
+
+	g_object_set(renderer, "text", buffer, NULL);
 }
 
-static void get_duration(struct dive *dive, int *val, char **str)
+static void duration_data_func(GtkTreeViewColumn *col,
+			       GtkCellRenderer *renderer,
+			       GtkTreeModel *model,
+			       GtkTreeIter *iter,
+			       gpointer data)
 {
-	unsigned int sec = dive->duration.seconds;
+	unsigned int sec;
 	char buffer[16];
 
-	*val = sec;
+	gtk_tree_model_get(model, iter, DIVE_DURATION, &sec, -1);
 	snprintf(buffer, sizeof(buffer), "%d:%02d", sec / 60, sec % 60);
-	*str = strdup(buffer);
+
+	g_object_set(renderer, "text", buffer, NULL);
 }
 
-static void get_temp(struct dive *dive, int *val, char **str)
+static void temperature_data_func(GtkTreeViewColumn *col,
+				  GtkCellRenderer *renderer,
+				  GtkTreeModel *model,
+				  GtkTreeIter *iter,
+				  gpointer data)
 {
-	int value = dive->watertemp.mkelvin;
+	int value;
 	char buffer[80];
 
-	*val = value;
-	*str = "";
+	gtk_tree_model_get(model, iter, DIVE_TEMPERATURE, &value, -1);
+
+	*buffer = 0;
 	if (value) {
 		double deg;
 		switch (output_units.temperature) {
@@ -143,27 +163,154 @@ static void get_temp(struct dive *dive, int *val, char **str)
 			return;
 		}
 		snprintf(buffer, sizeof(buffer), "%.1f", deg);
-		*str = strdup(buffer);
 	}
+
+	g_object_set(renderer, "text", buffer, NULL);
 }
 
-static void get_nitrox(struct dive *dive, int *val, char **str)
+static void nitrox_data_func(GtkTreeViewColumn *col,
+			     GtkCellRenderer *renderer,
+			     GtkTreeModel *model,
+			     GtkTreeIter *iter,
+			     gpointer data)
 {
-	int value = dive->cylinder[0].gasmix.o2.permille;
+	int value;
 	char buffer[80];
 
-	*val = value;
-	*str = "";
-	if (value) {
+	gtk_tree_model_get(model, iter, DIVE_NITROX, &value, -1);
+
+	if (value)
 		snprintf(buffer, sizeof(buffer), "%.1f", value/10.0);
-		*str = strdup(buffer);
+	else
+		strcpy(buffer, "air");
+
+	g_object_set(renderer, "text", buffer, NULL);
+}
+
+/* Render the SAC data (integer value of "ml / min") */
+static void sac_data_func(GtkTreeViewColumn *col,
+			  GtkCellRenderer *renderer,
+			  GtkTreeModel *model,
+			  GtkTreeIter *iter,
+			  gpointer data)
+{
+	int value;
+	const double liters_per_cuft = 28.317;
+	const char *fmt;
+	char buffer[16];
+	double sac;
+
+	gtk_tree_model_get(model, iter, DIVE_SAC, &value, -1);
+
+	if (!value) {
+		g_object_set(renderer, "text", "", NULL);
+		return;
 	}
+
+	sac = value / 1000.0;
+	switch (output_units.volume) {
+	case LITER:
+		fmt = "%4.1f";
+		break;
+	case CUFT:
+		fmt = "%4.2f";
+		sac /= liters_per_cuft;
+		break;
+	}
+	snprintf(buffer, sizeof(buffer), fmt, sac);
+
+	g_object_set(renderer, "text", buffer, NULL);
+}
+
+/*
+ * Return air usage (in liters).
+ */
+static double calculate_airuse(struct dive *dive)
+{
+	double airuse = 0;
+	int i;
+
+	for (i = 0; i < MAX_CYLINDERS; i++) {
+		cylinder_t *cyl = dive->cylinder + i;
+		int size = cyl->type.size.mliter;
+		double kilo_atm;
+
+		if (!size)
+			continue;
+
+		kilo_atm = (cyl->start.mbar - cyl->end.mbar) / 1013250.0;
+
+		/* Liters of air at 1 atm == milliliters at 1k atm*/
+		airuse += kilo_atm * size;
+	}
+	return airuse;
 }
 
-static void get_sac(struct dive *dive, int *val, char **str)
+static void get_sac(struct dive *dive, int *val)
 {
+	double airuse, pressure, sac;
+
 	*val = 0;
-	*str = "";
+	airuse = calculate_airuse(dive);
+	if (!airuse)
+		return;
+	if (!dive->duration.seconds)
+		return;
+
+	/* Mean pressure in atm: 1 atm per 10m */
+	pressure = 1 + (dive->meandepth.mm / 10000.0);
+	sac = airuse / pressure * 60 / dive->duration.seconds;
+
+	/* milliliters per minute.. */
+	*val = sac * 1000;
+}
+
+static void get_string(char **str, const char *s)
+{
+	int len;
+	char *n;
+
+	if (!s)
+		s = "";
+	len = strlen(s);
+	if (len > 40)
+		len = 40;
+	n = malloc(len+1);
+	memcpy(n, s, len);
+	n[len] = 0;
+	*str = n;
+}
+
+static void get_location(struct dive *dive, char **str)
+{
+	get_string(str, dive->location);
+}
+
+static void get_cylinder(struct dive *dive, char **str)
+{
+	get_string(str, dive->cylinder[0].type.description);
+}
+
+static void fill_one_dive(struct dive *dive,
+			  GtkTreeModel *model,
+			  GtkTreeIter *iter)
+{
+	int sac;
+	char *location, *cylinder;
+
+	get_cylinder(dive, &cylinder);
+	get_location(dive, &location);
+	get_sac(dive, &sac);
+
+	/*
+	 * We only set the fields that changed: the strings.
+	 * The core data itself is unaffected by units
+	 */
+	gtk_list_store_set(GTK_LIST_STORE(model), iter,
+		DIVE_LOCATION, location,
+		DIVE_CYLINDER, cylinder,
+		DIVE_SAC, sac,
+		-1);
 }
 
 static gboolean set_one_dive(GtkTreeModel *model,
@@ -173,66 +320,71 @@ static gboolean set_one_dive(GtkTreeModel *model,
 {
 	GValue value = {0, };
 	struct dive *dive;
-	int date, depth, duration, temp, nitrox, sac;
-	char *datestr, *depthstr, *durationstr, *tempstr, *nitroxstr, *sacstr;
 
 	/* Get the dive number */
 	gtk_tree_model_get_value(model, iter, DIVE_INDEX, &value);
 	dive = get_dive(g_value_get_int(&value));
 	if (!dive)
 		return TRUE;
+	if (data && dive != data)
+		return FALSE;
 
-	get_date(dive, &date, &datestr);
-	get_depth(dive, &depth, &depthstr);
-	get_duration(dive, &duration, &durationstr);
-	get_temp(dive, &temp, &tempstr);
-	get_nitrox(dive, &nitrox, &nitroxstr);
-	get_sac(dive, &sac, &sacstr);
+	fill_one_dive(dive, model, iter);
+	return dive == data;
+}
 
-	/*
-	 * We only set the fields that changed: the strings.
-	 * The core data itself is unaffected by units
-	 */
-	gtk_list_store_set(GTK_LIST_STORE(model), iter,
-		DIVE_DATESTR, datestr,
-		DIVE_DEPTHSTR, depthstr,
-		DIVE_DURATIONSTR, durationstr,
-		DIVE_TEMPSTR, tempstr,
-		DIVE_TEMP, temp,
-		DIVE_NITROXSTR, nitroxstr,
-		DIVE_NITROX, nitrox,
-		DIVE_SACSTR, sacstr,
-		DIVE_NITROX, sac,
-		-1);
+void flush_divelist(struct dive *dive)
+{
+	GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model);
+
+	gtk_tree_model_foreach(model, set_one_dive, dive);
+}
 
-	return FALSE;
+void set_divelist_font(const char *font)
+{
+	PangoFontDescription *font_desc = pango_font_description_from_string(font);
+	gtk_widget_modify_font(dive_list.tree_view, font_desc);
+	pango_font_description_free(font_desc);
 }
 
-void update_dive_list_units(struct DiveList *dive_list)
+void update_dive_list_units(void)
 {
 	const char *unit;
-	GtkTreeModel *model = GTK_TREE_MODEL(dive_list->model);
+	GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model);
 
 	switch (output_units.length) {
 	case METERS:
-		unit = "m";
+		unit = "max/m";
 		break;
 	case FEET:
-		unit = "ft";
+		unit = "max/ft";
+		break;
+	}
+	gtk_tree_view_column_set_title(dive_list.depth, unit);
+
+	switch (output_units.temperature) {
+	case CELSIUS:
+		unit = "degC";
+		break;
+	case FAHRENHEIT:
+		unit = "degF";
+		break;
+	case KELVIN:
+		unit = "Kelvin";
 		break;
 	}
-	gtk_tree_view_column_set_title(dive_list->depth, unit);
+	gtk_tree_view_column_set_title(dive_list.temperature, unit);
 
 	gtk_tree_model_foreach(model, set_one_dive, NULL);
 }
 
-static void fill_dive_list(struct DiveList *dive_list)
+static void fill_dive_list(void)
 {
 	int i;
 	GtkTreeIter iter;
 	GtkListStore *store;
 
-	store = GTK_LIST_STORE(dive_list->model);
+	store = GTK_LIST_STORE(dive_list.model);
 
 	for (i = 0; i < dive_table.nr; i++) {
 		struct dive *dive = dive_table.dives[i];
@@ -240,113 +392,93 @@ static void fill_dive_list(struct DiveList *dive_list)
 		gtk_list_store_append(store, &iter);
 		gtk_list_store_set(store, &iter,
 			DIVE_INDEX, i,
-			DIVE_DATESTR, "date",
 			DIVE_DATE, dive->when,
-			DIVE_DEPTHSTR, "depth",
 			DIVE_DEPTH, dive->maxdepth,
-			DIVE_DURATIONSTR, "duration",
 			DIVE_DURATION, dive->duration.seconds,
-			DIVE_TEMPSTR, "temp",
-			DIVE_TEMP, dive->watertemp.mkelvin,
-			DIVE_NITROXSTR, "21.0",
+			DIVE_LOCATION, "location",
+			DIVE_TEMPERATURE, dive->watertemp.mkelvin,
 			DIVE_NITROX, dive->cylinder[0].gasmix.o2,
-			DIVE_SACSTR, "sac",
 			DIVE_SAC, 0,
 			-1);
 	}
 
-	update_dive_list_units(dive_list);
+	update_dive_list_units();
 }
 
-void dive_list_update_dives(struct DiveList dive_list)
+void dive_list_update_dives(void)
 {
 	gtk_list_store_clear(GTK_LIST_STORE(dive_list.model));
-	fill_dive_list(&dive_list);
+	fill_dive_list();
 	repaint_dive();
 }
 
-struct DiveList dive_list_create(void)
+typedef void (*data_func_t)(GtkTreeViewColumn *col,
+			    GtkCellRenderer *renderer,
+			    GtkTreeModel *model,
+			    GtkTreeIter *iter,
+			    gpointer data);
+
+static GtkTreeViewColumn *divelist_column(struct DiveList *dl, int index, const char *title,
+					data_func_t data_func, int align_right, int expand)
 {
-	struct DiveList    dive_list;
-	GtkTreeSelection  *selection;
-	GtkCellRenderer   *renderer;
+	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *col;
 
-	dive_list.model = gtk_list_store_new(DIVELIST_COLUMNS,
-				G_TYPE_INT,			/* index */
-				G_TYPE_STRING, G_TYPE_INT,	/* Date */
-	                        G_TYPE_STRING, G_TYPE_INT, 	/* Depth */
-	                        G_TYPE_STRING, G_TYPE_INT,	/* Duration */
-				G_TYPE_STRING, G_TYPE_INT,	/* Temperature */
-				G_TYPE_STRING, G_TYPE_INT,	/* Nitrox */
-				G_TYPE_STRING, G_TYPE_INT	/* SAC */
-				);
-	dive_list.tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dive_list.model));
-	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));
-
-	gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
-	gtk_widget_set_size_request(dive_list.tree_view, 200, 100);
-
 	renderer = gtk_cell_renderer_text_new();
-	dive_list.date = col = gtk_tree_view_column_new();
-	gtk_tree_view_column_set_title(col, "Date");
+	col = gtk_tree_view_column_new();
+
+	gtk_tree_view_column_set_title(col, title);
 	gtk_tree_view_column_set_sort_column_id(col, DIVE_DATE);
-	gtk_tree_view_column_set_resizable (col, TRUE);
+	gtk_tree_view_column_set_resizable(col, TRUE);
 	gtk_tree_view_column_pack_start(col, renderer, TRUE);
-	gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_DATESTR);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col);
+	if (data_func)
+		gtk_tree_view_column_set_cell_data_func(col, renderer, data_func, NULL, NULL);
+	else
+		gtk_tree_view_column_add_attribute(col, renderer, "text", index);
+	if (align_right) {
+		gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL);
+		gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5);
+	}
+	gtk_tree_view_column_set_expand(col,expand);
+	if (expand) 
+		gtk_tree_view_column_set_min_width(col,50);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(dl->tree_view), col);
+	return col;
+}
 
-	renderer = gtk_cell_renderer_text_new();
-	dive_list.depth = col = gtk_tree_view_column_new();
-	gtk_tree_view_column_set_title(col, "ft");
-	gtk_tree_view_column_set_sort_column_id(col, DIVE_DEPTH);
-	gtk_tree_view_column_pack_start(col, renderer, FALSE);
-	gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_DEPTHSTR);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col);
-	gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL);
-	gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5);
+GtkWidget *dive_list_create(void)
+{
+	GtkTreeSelection  *selection;
 
-	renderer = gtk_cell_renderer_text_new();
-	dive_list.duration = col = gtk_tree_view_column_new();
-	gtk_tree_view_column_set_title(col, "min");
-	gtk_tree_view_column_set_sort_column_id(col, DIVE_DURATION);
-	gtk_tree_view_column_pack_start(col, renderer, FALSE);
-	gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_DURATIONSTR);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col);
-	gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL);
-	gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5);
+	dive_list.model = gtk_list_store_new(DIVELIST_COLUMNS,
+				G_TYPE_INT,			/* index */
+				G_TYPE_INT,			/* Date */
+				G_TYPE_INT, 			/* Depth */
+				G_TYPE_INT,			/* Duration */
+				G_TYPE_STRING,			/* Location */
+				G_TYPE_INT,			/* Temperature */
+				G_TYPE_STRING,			/* Cylinder */
+				G_TYPE_INT,			/* Nitrox */
+				G_TYPE_INT			/* SAC */
+				);
+	dive_list.tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dive_list.model));
+	set_divelist_font(divelist_font);
 
-	renderer = gtk_cell_renderer_text_new();
-	dive_list.temperature = col = gtk_tree_view_column_new();
-	gtk_tree_view_column_set_title(col, "deg");
-	gtk_tree_view_column_set_sort_column_id(col, DIVE_TEMP);
-	gtk_tree_view_column_pack_start(col, renderer, FALSE);
-	gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_TEMPSTR);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col);
-	gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL);
-	gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5);
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));
 
-	renderer = gtk_cell_renderer_text_new();
-	dive_list.nitrox = col = gtk_tree_view_column_new();
-	gtk_tree_view_column_set_title(col, "EAD");
-	gtk_tree_view_column_set_sort_column_id(col, DIVE_NITROX);
-	gtk_tree_view_column_pack_start(col, renderer, FALSE);
-	gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_NITROXSTR);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col);
-	gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL);
-	gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5);
+	gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
+	gtk_widget_set_size_request(dive_list.tree_view, 200, 200);
 
-	renderer = gtk_cell_renderer_text_new();
-	dive_list.sac = col = gtk_tree_view_column_new();
-	gtk_tree_view_column_set_title(col, "SAC");
-	gtk_tree_view_column_set_sort_column_id(col, DIVE_SAC);
-	gtk_tree_view_column_pack_start(col, renderer, FALSE);
-	gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_SACSTR);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col);
-	gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL);
-	gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5);
+	dive_list.date = divelist_column(&dive_list, DIVE_DATE, "Date", date_data_func, 0, 0);
+	dive_list.depth = divelist_column(&dive_list, DIVE_DEPTH, "max/ft", depth_data_func, 1, 0);
+	dive_list.duration = divelist_column(&dive_list, DIVE_DURATION, "min", duration_data_func, 1, 0);
+	dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, 0, 1);
+	dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, "degF", temperature_data_func, 1, 0);
+	dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, 0, 0);
+	dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O2%", nitrox_data_func, 1, 0);
+	dive_list.sac = divelist_column(&dive_list, DIVE_NITROX, "SAC", sac_data_func, 1, 0);
 
-	fill_dive_list(&dive_list);
+	fill_dive_list();
 
 	g_object_set(G_OBJECT(dive_list.tree_view), "headers-visible", TRUE,
 					  "search-column", 0,
@@ -357,8 +489,8 @@ struct DiveList dive_list_create(void)
 
 	dive_list.container_widget = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dive_list.container_widget),
-		               GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+			       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_container_add(GTK_CONTAINER(dive_list.container_widget), dive_list.tree_view);
 
-	return dive_list;
+	return dive_list.container_widget;
 }