mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add the cylinder list to the dive info edit dialog

Browse source 
This way, when you have a new dive that you just imported from your dive
computer, you can just double-click on the dive and fill out all the
relevant information: location, notes, buddies and cylinder info.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-11-19 11:47:04 -08:00
parent 6f81b3636b
commit 9f500ec8dc
3 changed files with 50 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
display-gtk.h
View file

@ -34,6 +34,7 @@ extern GtkWidget *dive_info_frame(void);
extern GtkWidget *extended_dive_info_widget(void); extern GtkWidget *extended_dive_info_widget(void);
extern GtkWidget *equipment_widget(void); extern GtkWidget *equipment_widget(void);
extern GtkWidget *stats_widget(void); extern GtkWidget *stats_widget(void);
extern GtkWidget *cylinder_list_widget(void);
extern GtkWidget *dive_list_create(void); extern GtkWidget *dive_list_create(void);

80
equipment.c
View file

@ -34,9 +34,7 @@ enum {
static struct { static struct {
int max_index; int max_index;
GtkListStore *model; GtkListStore *model;
GtkWidget *tree_view;
GtkWidget *edit, *add, *del; GtkWidget *edit, *add, *del;
GtkTreeViewColumn *desc, *size, *workp, *startp, *endp, *o2, *he;
} cylinder_list; } cylinder_list;
struct cylinder_widget { struct cylinder_widget {
@ -661,7 +659,7 @@ static int get_model_index(GtkListStore *model, GtkTreeIter *iter)
return index; return index;
} }
static void edit_cb(GtkButton *button, gpointer data) static void edit_cb(GtkButton *button, GtkTreeView *tree_view)
{ {
int index; int index;
GtkTreeIter iter; GtkTreeIter iter;
@ -669,7 +667,7 @@ static void edit_cb(GtkButton *button, gpointer data)
GtkTreeSelection *selection; GtkTreeSelection *selection;
cylinder_t cyl; cylinder_t cyl;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cylinder_list.tree_view)); selection = gtk_tree_view_get_selection(tree_view);
/* Nothing selected? This shouldn't happen, since the button should be inactive */ /* Nothing selected? This shouldn't happen, since the button should be inactive */
if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
@ -683,7 +681,7 @@ static void edit_cb(GtkButton *button, gpointer data)
repaint_dive(); repaint_dive();
} }
static void add_cb(GtkButton *button, gpointer data) static void add_cb(GtkButton *button, GtkTreeView *tree_view)
{ {
int index = cylinder_list.max_index; int index = cylinder_list.max_index;
GtkTreeIter iter; GtkTreeIter iter;
@ -697,14 +695,14 @@ static void add_cb(GtkButton *button, gpointer data)
gtk_list_store_append(model, &iter); gtk_list_store_append(model, &iter);
set_one_cylinder(index, &cyl, model, &iter); set_one_cylinder(index, &cyl, model, &iter);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cylinder_list.tree_view)); selection = gtk_tree_view_get_selection(tree_view);
gtk_tree_selection_select_iter(selection, &iter); gtk_tree_selection_select_iter(selection, &iter);
cylinder_list.max_index++; cylinder_list.max_index++;
gtk_widget_set_sensitive(cylinder_list.add, cylinder_list.max_index < MAX_CYLINDERS); gtk_widget_set_sensitive(cylinder_list.add, cylinder_list.max_index < MAX_CYLINDERS);
} }
static void del_cb(GtkButton *button, gpointer data) static void del_cb(GtkButton *button, GtkTreeView *tree_view)
{ {
int index, nr; int index, nr;
GtkTreeIter iter; GtkTreeIter iter;
@ -713,7 +711,7 @@ static void del_cb(GtkButton *button, gpointer data)
struct dive *dive; struct dive *dive;
cylinder_t *cyl; cylinder_t *cyl;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cylinder_list.tree_view)); selection = gtk_tree_view_get_selection(tree_view);
/* Nothing selected? This shouldn't happen, since the button should be inactive */ /* Nothing selected? This shouldn't happen, since the button should be inactive */
if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
@ -827,13 +825,40 @@ static void row_activated_cb(GtkTreeView *tree_view,
GtkTreeViewColumn *column, GtkTreeViewColumn *column,
GtkTreeModel *model) GtkTreeModel *model)
{ {
edit_cb(NULL, NULL); edit_cb(NULL, tree_view);
}
GtkWidget *cylinder_list_widget(void)
{
GtkListStore *model = cylinder_list.model;
GtkWidget *tree_view;
GtkTreeSelection *selection;
tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
gtk_widget_set_can_focus(tree_view, FALSE);
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);
g_object_set(G_OBJECT(tree_view), "headers-visible", TRUE,
"enable-grid-lines", GTK_TREE_VIEW_GRID_LINES_BOTH,
NULL);
tree_view_column(tree_view, CYL_DESC, "Type", NULL, PANGO_ALIGN_LEFT, TRUE);
tree_view_column(tree_view, CYL_SIZE, "Size", size_data_func, PANGO_ALIGN_RIGHT, TRUE);
tree_view_column(tree_view, CYL_WORKP, "MaxPress", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE);
tree_view_column(tree_view, CYL_STARTP, "Start", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE);
tree_view_column(tree_view, CYL_ENDP, "End", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE);
tree_view_column(tree_view, CYL_O2, "O" UTF8_SUBSCRIPT_2 "%", percentage_data_func, PANGO_ALIGN_RIGHT, TRUE);
tree_view_column(tree_view, CYL_HE, "He%", percentage_data_func, PANGO_ALIGN_RIGHT, TRUE);
return tree_view;
} }
static GtkWidget *cylinder_list_create(void) static GtkWidget *cylinder_list_create(void)
{ {
GtkWidget *tree_view;
GtkTreeSelection *selection;
GtkListStore *model; GtkListStore *model;
model = gtk_list_store_new(CYL_COLUMNS, model = gtk_list_store_new(CYL_COLUMNS,
@ -846,31 +871,12 @@ static GtkWidget *cylinder_list_create(void)
G_TYPE_INT /* CYL_HE: permille */ G_TYPE_INT /* CYL_HE: permille */
); );
cylinder_list.model = model; cylinder_list.model = model;
tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model)); return cylinder_list_widget();
gtk_widget_set_can_focus(tree_view, FALSE);
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);
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);
cylinder_list.startp = tree_view_column(tree_view, CYL_STARTP, "Start", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE);
cylinder_list.endp = tree_view_column(tree_view, CYL_ENDP, "End", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE);
cylinder_list.o2 = tree_view_column(tree_view, CYL_O2, "O" UTF8_SUBSCRIPT_2 "%", percentage_data_func, PANGO_ALIGN_RIGHT, TRUE);
cylinder_list.he = tree_view_column(tree_view, CYL_HE, "He%", percentage_data_func, PANGO_ALIGN_RIGHT, TRUE);
return tree_view;
} }
GtkWidget *equipment_widget(void) GtkWidget *equipment_widget(void)
{ {
GtkWidget *vbox, *hbox, *frame, *framebox; GtkWidget *vbox, *hbox, *frame, *framebox, *tree_view;
GtkWidget *add, *del, *edit; GtkWidget *add, *del, *edit;
vbox = gtk_vbox_new(FALSE, 3); vbox = gtk_vbox_new(FALSE, 3);
@ -884,7 +890,7 @@ GtkWidget *equipment_widget(void)
*/ */
cylinder_model = create_tank_size_model(); cylinder_model = create_tank_size_model();
cylinder_list.tree_view = cylinder_list_create(); tree_view = cylinder_list_create();
hbox = gtk_hbox_new(FALSE, 3); hbox = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3);
@ -898,7 +904,7 @@ GtkWidget *equipment_widget(void)
hbox = gtk_hbox_new(FALSE, 3); hbox = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3); gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3);
gtk_box_pack_start(GTK_BOX(hbox), cylinder_list.tree_view, TRUE, FALSE, 3); gtk_box_pack_start(GTK_BOX(hbox), tree_view, TRUE, FALSE, 3);
hbox = gtk_hbox_new(TRUE, 3); hbox = gtk_hbox_new(TRUE, 3);
gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3); gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3);
@ -914,9 +920,9 @@ GtkWidget *equipment_widget(void)
cylinder_list.add = add; cylinder_list.add = add;
cylinder_list.del = del; cylinder_list.del = del;
g_signal_connect(edit, "clicked", G_CALLBACK(edit_cb), NULL); g_signal_connect(edit, "clicked", G_CALLBACK(edit_cb), tree_view);
g_signal_connect(add, "clicked", G_CALLBACK(add_cb), NULL); g_signal_connect(add, "clicked", G_CALLBACK(add_cb), tree_view);
g_signal_connect(del, "clicked", G_CALLBACK(del_cb), NULL); g_signal_connect(del, "clicked", G_CALLBACK(del_cb), tree_view);
return vbox; return vbox;
} }

7
info.c
View file

@ -298,7 +298,7 @@ static void save_dive_info_changes(struct dive *dive, struct dive_info *info)
static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info *info) static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info *info)
{ {
GtkWidget *hbox, *label; GtkWidget *hbox, *label, *cylinder, *frame;
char buffer[80]; char buffer[80];
divename(buffer, sizeof(buffer), dive); divename(buffer, sizeof(buffer), dive);
@ -316,6 +316,11 @@ static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info
info->notes = text_view(box, "Notes", READ_WRITE); info->notes = text_view(box, "Notes", READ_WRITE);
if (dive->notes && *dive->notes) if (dive->notes && *dive->notes)
gtk_text_buffer_set_text(gtk_text_view_get_buffer(info->notes), dive->notes, -1); gtk_text_buffer_set_text(gtk_text_view_get_buffer(info->notes), dive->notes, -1);
frame = gtk_frame_new("Cylinder");
cylinder = cylinder_list_widget();
gtk_container_add(GTK_CONTAINER(frame), cylinder);
gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
} }
int edit_dive_info(struct dive *dive) int edit_dive_info(struct dive *dive)