X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=30bd2d8e97b9024383e3e961457bae46ae06d356;hb=666538ec7739fe839623bd1b6f9f80ff884ad5a9;hp=1c475afeab5b3896d2a614e3c4fdd56eb3272c30;hpb=972669d6363c163ed6d3b737cbd6b1bd534f3d7b;p=ext%2Fsubsurface.git

diff --git a/divelist.c b/divelist.c
index 1c475af..30bd2d8 100644
--- a/divelist.c
+++ b/divelist.c
@@ -85,7 +85,7 @@ void dump_selection(void)
 	struct dive *dive;
 
 	printf("currently selected are %d dives:", amount_selected);
-	for (i = 0; (dive = get_dive(i)) != NULL; i++) {
+	for_each_dive(i, dive) {
 		if (dive->selected)
 			printf(" %d", i);
 	}
@@ -138,6 +138,37 @@ void row_expanded_cb(GtkTreeView *tree_view, GtkTreeIter *iter, GtkTreePath *pat
 	} while (gtk_tree_model_iter_next(model, &child));
 }
 
+static int selected_children(GtkTreeModel *model, GtkTreeIter *iter)
+{
+	GtkTreeIter child;
+
+	if (!gtk_tree_model_iter_children(model, &child, iter))
+		return FALSE;
+
+	do {
+		int idx;
+		struct dive *dive;
+
+		gtk_tree_model_get(model, &child, DIVE_INDEX, &idx, -1);
+		dive = get_dive(idx);
+
+		if (dive->selected)
+			return TRUE;
+	} while (gtk_tree_model_iter_next(model, &child));
+	return FALSE;
+}
+
+/* Make sure that if we collapse a summary row with any selected children, the row
+   shows up as selected too */
+void row_collapsed_cb(GtkTreeView *tree_view, GtkTreeIter *iter, GtkTreePath *path, gpointer data)
+{
+	GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model);
+	GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));
+
+	if (selected_children(model, iter))
+		gtk_tree_selection_select_iter(selection, iter);
+}
+
 static GList *selection_changed = NULL;
 
 /*
@@ -179,6 +210,9 @@ static void select_dive_group(GtkTreeModel *model, GtkTreeSelection *selection,
 	int first = 1;
 	GtkTreeIter child;
 
+	if (selected == selected_children(model, iter))
+		return;
+
 	if (!gtk_tree_model_iter_children(model, &child, iter))
 		return;
 
@@ -192,7 +226,7 @@ static void select_dive_group(GtkTreeModel *model, GtkTreeSelection *selection,
 		first = 0;
 		dive = get_dive(idx);
 		if (dive->selected == selected)
-			break;
+			continue;
 
 		select_dive(dive, selected);
 		if (selected)
@@ -1074,7 +1108,7 @@ void add_dive_cb(GtkWidget *menuitem, gpointer data)
 
 void edit_dive_cb(GtkWidget *menuitem, gpointer data)
 {
-	edit_multi_dive_info(-1);
+	edit_multi_dive_info(NULL);
 }
 
 static void expand_all_cb(GtkWidget *menuitem, GtkTreeView *tree_view)
@@ -1296,6 +1330,7 @@ GtkWidget *dive_list_create(void)
 	g_signal_connect_after(dive_list.tree_view, "realize", G_CALLBACK(realize_cb), NULL);
 	g_signal_connect(dive_list.tree_view, "row-activated", G_CALLBACK(row_activated_cb), NULL);
 	g_signal_connect(dive_list.tree_view, "row-expanded", G_CALLBACK(row_expanded_cb), NULL);
+	g_signal_connect(dive_list.tree_view, "row-collapsed", G_CALLBACK(row_collapsed_cb), NULL);
 	g_signal_connect(dive_list.tree_view, "button-press-event", G_CALLBACK(button_press_cb), NULL);
 	g_signal_connect(dive_list.tree_view, "popup-menu", G_CALLBACK(popup_menu_cb), NULL);
 	g_signal_connect(selection, "changed", G_CALLBACK(selection_cb), dive_list.model);