X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=equipment.c;h=b9b9259b5a8cd0631816842e95d513e14d1066e3;hb=9cf8d98711dff888f5bfa8efd52ca7b8cf8bfa07;hp=b1a89471ef6f688ed02708d6b332d49f2c04c972;hpb=b19b76ecfa1ae206f7d272a50d9dc28c1942726b;p=ext%2Fsubsurface.git

diff --git a/equipment.c b/equipment.c
index b1a8947..b9b9259 100644
--- a/equipment.c
+++ b/equipment.c
@@ -9,15 +9,17 @@
 #include "divelist.h"
 
 struct cylinder_widget {
-	int changed;
+	int index, changed;
+	const char *name;
+	GtkWidget *hbox;
 	GtkComboBox *description;
 	GtkSpinButton *size, *pressure;
 	GtkWidget *o2, *gasmix_button;
 };
 
-static struct cylinder_widget cylinder;
+static struct cylinder_widget gtk_cylinder[MAX_CYLINDERS];
 
-static void set_cylinder_spinbuttons(int ml, int mbar)
+static void set_cylinder_spinbuttons(struct cylinder_widget *cylinder, int ml, int mbar)
 {
 	double volume, pressure;
 
@@ -33,8 +35,8 @@ static void set_cylinder_spinbuttons(int ml, int mbar)
 		}
 	}
 
-	gtk_spin_button_set_value(cylinder.size, volume);
-	gtk_spin_button_set_value(cylinder.pressure, pressure);
+	gtk_spin_button_set_value(cylinder->size, volume);
+	gtk_spin_button_set_value(cylinder->pressure, pressure);
 }
 
 static void cylinder_cb(GtkComboBox *combo_box, gpointer data)
@@ -42,11 +44,12 @@ static void cylinder_cb(GtkComboBox *combo_box, gpointer data)
 	GtkTreeIter iter;
 	GtkTreeModel *model = gtk_combo_box_get_model(combo_box);
 	GValue value1 = {0, }, value2 = {0,};
-	cylinder_t *cyl = current_dive->cylinder + 0;
+	struct cylinder_widget *cylinder = data;
+	cylinder_t *cyl = current_dive->cylinder + cylinder->index;
 
 	/* Did the user set it to some non-standard value? */
 	if (!gtk_combo_box_get_active_iter(combo_box, &iter)) {
-		cylinder.changed = 1;
+		cylinder->changed = 1;
 		return;
 	}
 
@@ -55,7 +58,7 @@ static void cylinder_cb(GtkComboBox *combo_box, gpointer data)
 	 * the description by hand. Whatever. So ignore them if
 	 * they are no-ops.
 	 */
-	if (!cylinder.changed && cyl->type.description) {
+	if (!cylinder->changed && cyl->type.description) {
 		int same;
 		char *desc = gtk_combo_box_get_active_text(combo_box);
 
@@ -64,12 +67,12 @@ static void cylinder_cb(GtkComboBox *combo_box, gpointer data)
 		if (same)
 			return;
 	}
-	cylinder.changed = 1;
+	cylinder->changed = 1;
 
 	gtk_tree_model_get_value(model, &iter, 1, &value1);
 	gtk_tree_model_get_value(model, &iter, 2, &value2);
 
-	set_cylinder_spinbuttons(g_value_get_int(&value1), g_value_get_int(&value2));
+	set_cylinder_spinbuttons(cylinder, g_value_get_int(&value1), g_value_get_int(&value2));
 }
 
 /*
@@ -84,25 +87,26 @@ static gboolean match_cylinder(GtkTreeModel *model,
 				gpointer data)
 {
 	const char *name;
-	const char *desc = data;
+	struct cylinder_widget *cylinder = data;
 	GValue value = {0, };
 
 	gtk_tree_model_get_value(model, iter, 0, &value);
 	name = g_value_get_string(&value);
-	if (strcmp(desc, name))
+	if (strcmp(cylinder->name, name))
 		return FALSE;
-	gtk_combo_box_set_active_iter(cylinder.description, iter);
+	gtk_combo_box_set_active_iter(cylinder->description, iter);
 	found_match = 1;
 	return TRUE;
 }
 
-static void add_cylinder(const char *desc, int ml, int mbar)
+static void add_cylinder(struct cylinder_widget *cylinder, const char *desc, int ml, int mbar)
 {
 	GtkTreeModel *model;
 
 	found_match = 0;
-	model = gtk_combo_box_get_model(cylinder.description);
-	gtk_tree_model_foreach(model, match_cylinder, (gpointer)desc);
+	model = gtk_combo_box_get_model(cylinder->description);
+	cylinder->name = desc;
+	gtk_tree_model_foreach(model, match_cylinder, cylinder);
 
 	if (!found_match) {
 		GtkListStore *store = GTK_LIST_STORE(model);
@@ -114,31 +118,42 @@ static void add_cylinder(const char *desc, int ml, int mbar)
 			1, ml,
 			2, mbar,
 			-1);
-		gtk_combo_box_set_active_iter(cylinder.description, &iter);
+		gtk_combo_box_set_active_iter(cylinder->description, &iter);
 	}
 }
 
-void show_dive_equipment(struct dive *dive)
+static void show_cylinder(cylinder_t *cyl, struct cylinder_widget *cylinder)
 {
-	cylinder_t *cyl = &dive->cylinder[0];
-	const char *desc = cyl->type.description;
+	const char *desc;
 	int ml, mbar;
 	double o2;
 
+	/* Don't show uninitialized cylinder widgets */
+	if (!cylinder->description)
+		return;
+
+	desc = cyl->type.description;
 	if (!desc)
 		desc = "";
-
 	ml = cyl->type.size.mliter;
 	mbar = cyl->type.workingpressure.mbar;
-	add_cylinder(desc, ml, mbar);
+	add_cylinder(cylinder, desc, ml, mbar);
 
-	set_cylinder_spinbuttons(cyl->type.size.mliter, cyl->type.workingpressure.mbar);
+	set_cylinder_spinbuttons(cylinder, cyl->type.size.mliter, cyl->type.workingpressure.mbar);
 	o2 = cyl->gasmix.o2.permille / 10.0;
-	gtk_widget_set_sensitive(cylinder.o2, !!o2);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cylinder.gasmix_button), !!o2);
+	gtk_widget_set_sensitive(cylinder->o2, !!o2);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cylinder->gasmix_button), !!o2);
 	if (!o2)
 		o2 = 21.0;
-	gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder.o2), o2);
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->o2), o2);
+}
+
+void show_dive_equipment(struct dive *dive)
+{
+	int i;
+
+	for (i = 0; i < MAX_CYLINDERS; i++)
+		show_cylinder(dive->cylinder + i, gtk_cylinder+i);
 }
 
 static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name, double min, double max, double incr)
@@ -159,7 +174,7 @@ static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name, double mi
 	return button;
 }
 
-static void fill_cylinder_info(cylinder_t *cyl, const char *desc, double volume, double pressure, int o2)
+static void fill_cylinder_info(struct cylinder_widget *cylinder, cylinder_t *cyl, const char *desc, double volume, double pressure, int o2)
 {
 	int mbar, ml;
 
@@ -184,28 +199,56 @@ static void fill_cylinder_info(cylinder_t *cyl, const char *desc, double volume,
 	/*
 	 * Also, insert it into the model if it doesn't already exist
 	 */
-	add_cylinder(desc, ml, mbar);
+	add_cylinder(cylinder, desc, ml, mbar);
 }
 
-static void record_cylinder_changes(struct dive *dive)
+static void record_cylinder_changes(cylinder_t *cyl, struct cylinder_widget *cylinder)
 {
 	const gchar *desc;
-	GtkComboBox *box = cylinder.description;
+	GtkComboBox *box;
 	double volume, pressure;
 	int o2;
 
+	/* Ignore uninitialized cylinder widgets */
+	box = cylinder->description;
+	if (!box)
+		return;
+
 	desc = gtk_combo_box_get_active_text(box);
-	volume = gtk_spin_button_get_value(cylinder.size);
-	pressure = gtk_spin_button_get_value(cylinder.pressure);
-	o2 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder.o2))*10 + 0.5;
-	if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cylinder.gasmix_button)))
+	volume = gtk_spin_button_get_value(cylinder->size);
+	pressure = gtk_spin_button_get_value(cylinder->pressure);
+	o2 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->o2))*10 + 0.5;
+	if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cylinder->gasmix_button)))
 		o2 = 0;
-	fill_cylinder_info(dive->cylinder+0, desc, volume, pressure, o2);
+	fill_cylinder_info(cylinder, cyl, desc, volume, pressure, o2);
 }
 
 void flush_dive_equipment_changes(struct dive *dive)
 {
-	record_cylinder_changes(dive);
+	/* We do nothing: we require the "Ok" button press */
+}
+
+static void apply_cb(GtkButton *button, gpointer data)
+{
+	int i;
+	struct dive *dive = current_dive;
+
+	if (!dive)
+		return;
+
+	for (i = 0; i < MAX_CYLINDERS; i++)
+		record_cylinder_changes(dive->cylinder+i, gtk_cylinder+i);
+	flush_divelist(dive);
+}
+
+static void cancel_cb(GtkButton *button, gpointer data)
+{
+	struct dive *dive = current_dive;
+
+	if (!dive)
+		return;
+
+	show_dive_equipment(current_dive);
 }
 
 /*
@@ -281,21 +324,25 @@ static void fill_tank_list(GtkListStore *store)
 
 static void nitrox_cb(GtkToggleButton *button, gpointer data)
 {
-	GtkWidget *o2 = data;
+	struct cylinder_widget *cylinder = data;
 	int state;
 
 	state = gtk_toggle_button_get_active(button);
-	gtk_widget_set_sensitive(o2, state);
+	gtk_widget_set_sensitive(cylinder->o2, state);
 }
 
-static void cylinder_widget(GtkWidget *box, int nr, GtkListStore *model)
+static void cylinder_widget(int nr, GtkListStore *model)
 {
+	struct cylinder_widget *cylinder;
 	GtkWidget *frame, *hbox, *hbox2;
 	GtkWidget *widget;
 	char buffer[80];
 
+	cylinder = gtk_cylinder + nr;
+	cylinder->index = nr;
+
 	hbox = gtk_hbox_new(FALSE, 3);
-	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
+	cylinder->hbox = hbox;
 
 	snprintf(buffer, sizeof(buffer), "Cylinder %d", nr+1);
 	frame = gtk_frame_new(buffer);
@@ -307,23 +354,23 @@ static void cylinder_widget(GtkWidget *box, int nr, GtkListStore *model)
 	widget = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(model), 0);
 	gtk_box_pack_start(GTK_BOX(hbox2), widget, FALSE, TRUE, 0);
 
-	cylinder.description = GTK_COMBO_BOX(widget);
-	g_signal_connect(widget, "changed", G_CALLBACK(cylinder_cb), NULL);
+	cylinder->description = GTK_COMBO_BOX(widget);
+	g_signal_connect(widget, "changed", G_CALLBACK(cylinder_cb), cylinder);
 
 	widget = create_spinbutton(hbox, "Size", 0, 200, 0.1);
-	cylinder.size = GTK_SPIN_BUTTON(widget);
+	cylinder->size = GTK_SPIN_BUTTON(widget);
 
 	widget = create_spinbutton(hbox, "Pressure", 0, 5000, 1);
-	cylinder.pressure = GTK_SPIN_BUTTON(widget);
+	cylinder->pressure = GTK_SPIN_BUTTON(widget);
 
 	widget = create_spinbutton(hbox, "Nitrox", 21, 100, 0.1);
-	cylinder.o2 = widget;
-	cylinder.gasmix_button = gtk_check_button_new();
-	gtk_box_pack_start(GTK_BOX(gtk_widget_get_parent(cylinder.o2)),
-		cylinder.gasmix_button, FALSE, FALSE, 3);
-	g_signal_connect(cylinder.gasmix_button, "toggled", G_CALLBACK(nitrox_cb), cylinder.o2);
+	cylinder->o2 = widget;
+	cylinder->gasmix_button = gtk_check_button_new();
+	gtk_box_pack_start(GTK_BOX(gtk_widget_get_parent(cylinder->o2)),
+		cylinder->gasmix_button, FALSE, FALSE, 3);
+	g_signal_connect(cylinder->gasmix_button, "toggled", G_CALLBACK(nitrox_cb), cylinder);
 
-	gtk_spin_button_set_range(GTK_SPIN_BUTTON(cylinder.o2), 21.0, 100.0);
+	gtk_spin_button_set_range(GTK_SPIN_BUTTON(cylinder->o2), 21.0, 100.0);
 }
 
 static GtkListStore *create_tank_size_model(void)
@@ -342,13 +389,35 @@ static GtkListStore *create_tank_size_model(void)
 
 GtkWidget *equipment_widget(void)
 {
-	GtkWidget *vbox;
+	int i;
+	GtkWidget *vbox, *hbox;
+	GtkWidget *apply, *cancel;
 	GtkListStore *model;
 
 	vbox = gtk_vbox_new(FALSE, 3);
 
 	model = create_tank_size_model();
-	cylinder_widget(vbox, 0, model);
+
+	/* Create all MAX_CYLINDER gtk widgets */
+	for (i = 0; i < MAX_CYLINDERS; i++)
+		cylinder_widget(i, model);
+
+	/* But only connect two of them right now to the frame vbox */
+	for (i = 0; i < 2; i++) {
+		struct cylinder_widget *cylinder = gtk_cylinder+i;
+		gtk_box_pack_start(GTK_BOX(vbox), cylinder->hbox, FALSE, TRUE, 0);
+	}
+
+	hbox = gtk_hbox_new(TRUE, 3);
+	gtk_box_pack_end(GTK_BOX(vbox), hbox, TRUE, FALSE, 0);
+
+	apply = gtk_button_new_from_stock(GTK_STOCK_APPLY);
+	cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+	gtk_box_pack_start(GTK_BOX(hbox), apply, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), cancel, FALSE, FALSE, 0);
+
+	g_signal_connect(apply, "clicked", G_CALLBACK(apply_cb), NULL);
+	g_signal_connect(cancel, "clicked", G_CALLBACK(cancel_cb), NULL);
 
 	return vbox;
 }