X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=5f2063e9f8192fa6f10fb4a744f046dd5b448904;hb=e2f3114254a28d3d0a62bfb21e3a779c7a143a23;hp=13257a437173672cb21b67da32a9657b54ea066d;hpb=d5c86ebe3dd67397f0f61d57ae9c07d995c38728;p=ext%2Fsubsurface.git

diff --git a/divelist.c b/divelist.c
index 13257a4..5f2063e 100644
--- a/divelist.c
+++ b/divelist.c
@@ -26,7 +26,7 @@ struct DiveList {
 	GtkWidget    *container_widget;
 	GtkListStore *model;
 	GtkTreeViewColumn *date, *depth, *duration, *location;
-	GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac;
+	GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac, *otu;
 	int changed;
 };
 
@@ -50,17 +50,42 @@ enum {
 	DIVELIST_COLUMNS
 };
 
+static GList *selected_dives;
+
 static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
 {
 	GtkTreeIter iter;
 	GValue value = {0, };
+	GtkTreePath *path;
 
-	if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
-		return;
+	int nr_selected = gtk_tree_selection_count_selected_rows(selection);
 
-	gtk_tree_model_get_value(model, &iter, DIVE_INDEX, &value);
-	selected_dive = g_value_get_int(&value);
-	repaint_dive();
+	if (selected_dives) {
+		g_list_foreach (selected_dives, (GFunc) gtk_tree_path_free, NULL);
+		g_list_free (selected_dives);
+	}
+	selected_dives = gtk_tree_selection_get_selected_rows(selection, NULL);
+
+	switch (nr_selected) {
+	case 0: /* keep showing the last selected dive */
+		return;
+	case 1:	
+		/* just pick that dive as selected */
+		path = g_list_nth_data(selected_dives, 0);
+		if (gtk_tree_model_get_iter(model, &iter, path)) {
+			gtk_tree_model_get_value(model, &iter, DIVE_INDEX, &value);
+			selected_dive = g_value_get_int(&value);
+			repaint_dive();
+		}
+		return;
+	default: /* multiple selections - what now? At this point I
+		  * don't want to change the selected dive unless
+		  * there is exactly one dive selected; not sure this
+		  * is the most intuitive solution.
+		  * I do however want to keep around which dives have
+		  * been selected */
+		return;
+	}
 }
 
 static void date_data_func(GtkTreeViewColumn *col,
@@ -422,6 +447,13 @@ void update_dive_list_units(void)
 	gtk_tree_model_foreach(model, set_one_dive, NULL);
 }
 
+void update_dive_list_col_visibility(void)
+{
+	gtk_tree_view_column_set_visible(dive_list.sac, visible_cols.sac);
+	gtk_tree_view_column_set_visible(dive_list.otu, visible_cols.otu);
+	return;
+}
+
 static void fill_dive_list(void)
 {
 	int i;
@@ -462,45 +494,10 @@ void dive_list_update_dives(void)
 	repaint_dive();
 }
 
-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, PangoAlignment align)
+				data_func_t data_func, PangoAlignment align, gboolean visible)
 {
-	GtkCellRenderer *renderer;
-	GtkTreeViewColumn *col;
-	double xalign = 0.0; /* left as default */
-
-	renderer = gtk_cell_renderer_text_new();
-	col = gtk_tree_view_column_new();
-
-	gtk_tree_view_column_set_title(col, title);
-	gtk_tree_view_column_set_sort_column_id(col, index);
-	gtk_tree_view_column_set_resizable(col, TRUE);
-	gtk_tree_view_column_pack_start(col, renderer, TRUE);
-	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);
-	gtk_object_set(GTK_OBJECT(renderer), "alignment", align, NULL);
-	switch (align) {
-	case PANGO_ALIGN_LEFT:
-		xalign = 0.0;
-		break;
-	case PANGO_ALIGN_CENTER:
-		xalign = 0.5;
-		break;
-	case PANGO_ALIGN_RIGHT:
-		xalign = 1.0;
-		break;
-	}
-	gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), xalign, 0.5);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(dl->tree_view), col);
-	return col;
+	return tree_view_column(dl->tree_view, index, title, data_func, align, visible);
 }
 
 /*
@@ -533,7 +530,7 @@ GtkWidget *dive_list_create(void)
 
 	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_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_MULTIPLE);
 	gtk_widget_set_size_request(dive_list.tree_view, 200, 200);
 
 	dive_list.date = divelist_column(&dive_list, DIVE_DATE, "Date", date_data_func, PANGO_ALIGN_LEFT, TRUE);
@@ -542,8 +539,8 @@ GtkWidget *dive_list_create(void)
 	dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, UTF8_DEGREE "F", temperature_data_func, PANGO_ALIGN_RIGHT, TRUE);
 	dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, PANGO_ALIGN_CENTER, TRUE);
 	dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O" UTF8_SUBSCRIPT_2 "%", nitrox_data_func, PANGO_ALIGN_CENTER, TRUE);
-	dive_list.sac = divelist_column(&dive_list, DIVE_SAC, "SAC", sac_data_func, PANGO_ALIGN_CENTER, TRUE);
-	dive_list.sac = divelist_column(&dive_list, DIVE_OTU, "OTU", otu_data_func, PANGO_ALIGN_CENTER, FALSE);
+	dive_list.sac = divelist_column(&dive_list, DIVE_SAC, "SAC", sac_data_func, PANGO_ALIGN_CENTER, visible_cols.sac);
+	dive_list.otu = divelist_column(&dive_list, DIVE_OTU, "OTU", otu_data_func, PANGO_ALIGN_CENTER, visible_cols.otu);
 	dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, PANGO_ALIGN_LEFT, TRUE);
 
 	fill_dive_list();