X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=equipment.c;h=ba7fb6859f87ce6e821c43bfbc39fc5dca342e43;hb=bd8948386d555560477238dc09921b83f07b48b2;hp=d237b1b32f8bc60f82933ba8ac90fff3331d5b50;hpb=3e1b3c5c7fe6242319e8f4f994a1ca472fbed4ad;p=ext%2Fsubsurface.git

diff --git a/equipment.c b/equipment.c
index d237b1b..ba7fb68 100644
--- a/equipment.c
+++ b/equipment.c
@@ -22,7 +22,6 @@
 GtkListStore *cylinder_model;
 
 enum {
-	CYL_INDEX,
 	CYL_DESC,
 	CYL_SIZE,
 	CYL_WORKP,
@@ -220,7 +219,6 @@ static int cyl_nothing(cylinder_t *cyl)
 static void set_one_cylinder(int index, cylinder_t *cyl, GtkListStore *model, GtkTreeIter *iter)
 {
 	gtk_list_store_set(model, iter,
-		CYL_INDEX, index,
 		CYL_DESC, cyl->type.description ? : "",
 		CYL_SIZE, cyl->type.size.mliter,
 		CYL_WORKP, cyl->type.workingpressure.mbar,
@@ -449,21 +447,21 @@ static void cylinder_widget(GtkWidget *vbox, struct cylinder_widget *cylinder, G
 	gtk_spin_button_set_range(GTK_SPIN_BUTTON(cylinder->o2), 21.0, 100.0);
 }
 
-static void edit_cylinder_dialog(int index, GtkListStore *model, GtkTreeIter *iter)
+static int edit_cylinder_dialog(int index, cylinder_t *cyl)
 {
-	int result;
-	struct cylinder_widget cylinder;
+	int success;
 	GtkWidget *dialog, *vbox;
+	struct cylinder_widget cylinder;
 	struct dive *dive;
-	cylinder_t *cyl;
 
-	dive = current_dive;
-	if (!dive)
-		return;
-	cyl = dive->cylinder + index;
 	cylinder.index = index;
 	cylinder.changed = 0;
 
+	dive = current_dive;
+	if (!dive)
+		return 0;
+	*cyl = dive->cylinder[index];
+
 	dialog = gtk_dialog_new_with_buttons("Cylinder",
 		GTK_WINDOW(main_window),
 		GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -477,14 +475,29 @@ static void edit_cylinder_dialog(int index, GtkListStore *model, GtkTreeIter *it
 	show_cylinder(cyl, &cylinder);
 
 	gtk_widget_show_all(dialog);
-	result = gtk_dialog_run(GTK_DIALOG(dialog));
-	if (result == GTK_RESPONSE_ACCEPT) {
+	success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT;
+	if (success) {
 		record_cylinder_changes(cyl, &cylinder);
-		set_one_cylinder(index, cyl, model, iter);
+		dive->cylinder[index] = *cyl;
 		mark_divelist_changed(TRUE);
 		flush_divelist(dive);
 	}
+
 	gtk_widget_destroy(dialog);
+
+	return success;
+}
+
+static int get_model_index(GtkListStore *model, GtkTreeIter *iter)
+{
+	int *p, index;
+	GtkTreePath *path;
+
+	path = gtk_tree_model_get_path(GTK_TREE_MODEL(model), iter);
+	p = gtk_tree_path_get_indices(path);
+	index = p ? *p : 0;
+	gtk_tree_path_free(path);
+	return index;
 }
 
 static void edit_cb(GtkButton *button, gpointer data)
@@ -493,6 +506,7 @@ static void edit_cb(GtkButton *button, gpointer data)
 	GtkTreeIter iter;
 	GtkListStore *model = cylinder_list.model;
 	GtkTreeSelection *selection;
+	cylinder_t cyl;
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cylinder_list.tree_view));
 
@@ -500,8 +514,11 @@ static void edit_cb(GtkButton *button, gpointer data)
 	if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
 		return;
 
-	gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CYL_INDEX, &index, -1);
-	edit_cylinder_dialog(index, model, &iter);
+	index = get_model_index(model, &iter);
+	if (!edit_cylinder_dialog(index, &cyl))
+		return;
+
+	set_one_cylinder(index, &cyl, model, &iter);
 }
 
 static void add_cb(GtkButton *button, gpointer data)
@@ -510,14 +527,17 @@ static void add_cb(GtkButton *button, gpointer data)
 	GtkTreeIter iter;
 	GtkListStore *model = cylinder_list.model;
 	GtkTreeSelection *selection;
+	cylinder_t cyl;
+
+	if (!edit_cylinder_dialog(index, &cyl))
+		return;
 
 	gtk_list_store_append(model, &iter);
-	gtk_list_store_set(model, &iter, CYL_INDEX, index, -1);
+	set_one_cylinder(index, &cyl, model, &iter);
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cylinder_list.tree_view));
 	gtk_tree_selection_select_iter(selection, &iter);
 
-	edit_cylinder_dialog(index, model, &iter);
 	cylinder_list.max_index++;
 	gtk_widget_set_sensitive(cylinder_list.add, cylinder_list.max_index < MAX_CYLINDERS);
 }
@@ -537,7 +557,7 @@ static void del_cb(GtkButton *button, gpointer data)
 	if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
 		return;
 
-	gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CYL_INDEX, &index, -1);
+	index = get_model_index(model, &iter);
 
 	dive = current_dive;
 	if (!dive)
@@ -545,12 +565,7 @@ static void del_cb(GtkButton *button, gpointer data)
 	cyl = dive->cylinder + index;
 	nr = cylinder_list.max_index - index - 1;
 
-	if (gtk_list_store_remove(model, &iter)) {
-		do {
-			gtk_list_store_set(model, &iter, CYL_INDEX, index, -1);
-			index++;
-		} while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter));
-	}
+	gtk_list_store_remove(model, &iter);
 
 	cylinder_list.max_index--;
 	memmove(cyl, cyl+1, nr*sizeof(*cyl));
@@ -645,6 +660,14 @@ static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
 	gtk_widget_set_sensitive(cylinder_list.del, selected);
 }
 
+static void row_activated_cb(GtkTreeView *tree_view,
+			GtkTreePath *path,
+			GtkTreeViewColumn *column,
+			GtkTreeModel *model)
+{
+	edit_cb(NULL, NULL);
+}
+
 static GtkWidget *cylinder_list_create(void)
 {
 	GtkWidget *tree_view;
@@ -652,7 +675,6 @@ static GtkWidget *cylinder_list_create(void)
 	GtkListStore *model;
 
 	model = gtk_list_store_new(CYL_COLUMNS,
-		G_TYPE_INT,		/* CYL_INDEX */
 		G_TYPE_STRING,		/* CYL_DESC: utf8 */
 		G_TYPE_INT,		/* CYL_SIZE: mliter */
 		G_TYPE_INT,		/* CYL_WORKP: mbar */
@@ -663,12 +685,16 @@ static GtkWidget *cylinder_list_create(void)
 		);
 	cylinder_list.model = model;
 	tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
+	g_signal_connect(tree_view, "row-activated", G_CALLBACK(row_activated_cb), model);
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
 	gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
 	g_signal_connect(selection, "changed", G_CALLBACK(selection_cb), model);
 
-	tree_view_column(tree_view, CYL_INDEX, "Nr", NULL, PANGO_ALIGN_LEFT, TRUE);
+	g_object_set(G_OBJECT(tree_view), "headers-visible", TRUE,
+					  "enable-grid-lines", GTK_TREE_VIEW_GRID_LINES_BOTH,
+					  NULL);
+
 	cylinder_list.desc = tree_view_column(tree_view, CYL_DESC, "Type", NULL, PANGO_ALIGN_LEFT, TRUE);
 	cylinder_list.size = tree_view_column(tree_view, CYL_SIZE, "Size", size_data_func, PANGO_ALIGN_RIGHT, TRUE);
 	cylinder_list.workp = tree_view_column(tree_view, CYL_WORKP, "MaxPress", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE);