]> git.tdb.fi Git - ext/subsurface.git/blobdiff - equipment.c
Install manpage
[ext/subsurface.git] / equipment.c
index 2bbd6511ecf647d9914dc67d69e07fc38d652a4a..ba7fb6859f87ce6e821c43bfbc39fc5dca342e43 100644 (file)
@@ -22,7 +22,6 @@
 GtkListStore *cylinder_model;
 
 enum {
-       CYL_INDEX,
        CYL_DESC,
        CYL_SIZE,
        CYL_WORKP,
@@ -50,8 +49,6 @@ struct cylinder_widget {
        GtkWidget *o2, *gasmix_button;
 };
 
-static struct cylinder_widget gtk_cylinder[MAX_CYLINDERS];
-
 static int convert_pressure(int mbar, double *p)
 {
        int decimals = 1;
@@ -219,6 +216,19 @@ static int cyl_nothing(cylinder_t *cyl)
                !cyl->end.mbar;
 }
 
+static void set_one_cylinder(int index, cylinder_t *cyl, GtkListStore *model, GtkTreeIter *iter)
+{
+       gtk_list_store_set(model, iter,
+               CYL_DESC, cyl->type.description ? : "",
+               CYL_SIZE, cyl->type.size.mliter,
+               CYL_WORKP, cyl->type.workingpressure.mbar,
+               CYL_STARTP, cyl->start.mbar,
+               CYL_ENDP, cyl->end.mbar,
+               CYL_O2, cyl->gasmix.o2.permille,
+               CYL_HE, cyl->gasmix.he.permille,
+               -1);
+}
+
 void show_dive_equipment(struct dive *dive)
 {
        int i, max;
@@ -245,16 +255,7 @@ void show_dive_equipment(struct dive *dive)
                cylinder_t *cyl = dive->cylinder+i;
 
                gtk_list_store_append(model, &iter);
-               gtk_list_store_set(model, &iter,
-                       CYL_INDEX, i,
-                       CYL_DESC, cyl->type.description ? : "",
-                       CYL_SIZE, cyl->type.size.mliter,
-                       CYL_WORKP, cyl->type.workingpressure.mbar,
-                       CYL_STARTP, cyl->start.mbar,
-                       CYL_ENDP, cyl->end.mbar,
-                       CYL_O2, cyl->gasmix.o2.permille,
-                       CYL_HE, cyl->gasmix.he.permille,
-                       -1);
+               set_one_cylinder(i, cyl, model, &iter);
        }
 }
 
@@ -330,30 +331,6 @@ void flush_dive_equipment_changes(struct dive *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);
-       mark_divelist_changed(TRUE);
-       flush_divelist(dive);
-}
-
-static void cancel_cb(GtkButton *button, gpointer data)
-{
-       struct dive *dive = current_dive;
-
-       if (!dive)
-               return;
-
-       show_dive_equipment(current_dive);
-}
-
 /*
  * We hardcode the most common standard cylinders,
  * we should pick up any other names from the dive
@@ -470,11 +447,20 @@ 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 cyl;
-       GtkWidget *dialog, *frame, *vbox;
+       int success;
+       GtkWidget *dialog, *vbox;
+       struct cylinder_widget cylinder;
+       struct dive *dive;
+
+       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),
@@ -484,14 +470,34 @@ static void edit_cylinder_dialog(int index, GtkListStore *model, GtkTreeIter *it
                NULL);
 
        vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
-       cylinder_widget(vbox, &cyl, cylinder_model);
+       cylinder_widget(vbox, &cylinder, cylinder_model);
+
+       show_cylinder(cyl, &cylinder);
 
        gtk_widget_show_all(dialog);
-       result = gtk_dialog_run(GTK_DIALOG(dialog));
-       if (result == GTK_RESPONSE_ACCEPT) {
-               /* Save it */
+       success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT;
+       if (success) {
+               record_cylinder_changes(cyl, &cylinder);
+               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)
@@ -500,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));
 
@@ -507,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)
@@ -517,24 +527,29 @@ 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);
 }
 
 static void del_cb(GtkButton *button, gpointer data)
 {
-       int index;
+       int index, nr;
        GtkTreeIter iter;
        GtkListStore *model = cylinder_list.model;
        GtkTreeSelection *selection;
+       struct dive *dive;
+       cylinder_t *cyl;
 
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cylinder_list.tree_view));
 
@@ -542,15 +557,23 @@ 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);
-       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));
-       }
+       index = get_model_index(model, &iter);
+
+       dive = current_dive;
+       if (!dive)
+               return;
+       cyl = dive->cylinder + index;
+       nr = cylinder_list.max_index - index - 1;
+
+       gtk_list_store_remove(model, &iter);
 
        cylinder_list.max_index--;
+       memmove(cyl, cyl+1, nr*sizeof(*cyl));
+       memset(cyl+nr, 0, sizeof(*cyl));
+
+       mark_divelist_changed(TRUE);
+       flush_divelist(dive);
+
        gtk_widget_set_sensitive(cylinder_list.edit, 0);
        gtk_widget_set_sensitive(cylinder_list.del, 0);
        gtk_widget_set_sensitive(cylinder_list.add, 1);
@@ -637,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;
@@ -644,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 */
@@ -655,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);