X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=e994b32527d1dd2289259b5f489052fd8303971e;hb=77a903a6bb26d60e1736f7d5c118b598916b37f2;hp=2054ca017ca0b41b8d6642e22ec09aa2e223f687;hpb=9933ccd7cf3a84ca60330a810e7763668ad882fb;p=ext%2Fsubsurface.git

diff --git a/divelist.c b/divelist.c
index 2054ca0..e994b32 100644
--- a/divelist.c
+++ b/divelist.c
@@ -26,7 +26,7 @@ struct DiveList {
 	GtkWidget    *container_widget;
 	GtkListStore *model;
 	GtkTreeViewColumn *nr, *date, *stars, *depth, *duration, *location;
-	GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac, *otu;
+	GtkTreeViewColumn *temperature, *cylinder, *totalweight, *nitrox, *sac, *otu;
 	int changed;
 };
 
@@ -44,6 +44,7 @@ enum {
 	DIVE_DEPTH,		/* int: dive->maxdepth in mm */
 	DIVE_DURATION,		/* int: in seconds */
 	DIVE_TEMPERATURE,	/* int: in mkelvin */
+	DIVE_TOTALWEIGHT,	/* int: in grams */
 	DIVE_CYLINDER,
 	DIVE_NITROX,		/* int: dummy */
 	DIVE_SAC,		/* int: in ml/min */
@@ -269,6 +270,38 @@ newmax:
 	*o2low_p = mino2;
 }
 
+static int total_weight(struct dive *dive)
+{
+	int i, total_grams = 0;
+
+	if (dive)
+		for (i=0; i< MAX_WEIGHTSYSTEMS; i++)
+			total_grams += dive->weightsystem[i].weight.grams;
+	return total_grams;
+}
+
+static void weight_data_func(GtkTreeViewColumn *col,
+			     GtkCellRenderer *renderer,
+			     GtkTreeModel *model,
+			     GtkTreeIter *iter,
+			     gpointer data)
+{
+	int indx, decimals;
+	double value;
+	char buffer[80];
+	struct dive *dive;
+
+	gtk_tree_model_get(model, iter, DIVE_INDEX, &indx, -1);
+	dive = get_dive(indx);
+	value = get_weight_units(total_weight(dive), &decimals, NULL);
+	if (value == 0.0)
+		*buffer = '\0';
+	else
+		snprintf(buffer, sizeof(buffer), "%.*f", decimals, value);
+
+	g_object_set(renderer, "text", buffer, NULL);
+}
+
 static gint nitrox_sort_func(GtkTreeModel *model,
 	GtkTreeIter *iter_a,
 	GtkTreeIter *iter_b,
@@ -521,7 +554,11 @@ static void fill_one_dive(struct dive *dive,
 		DIVE_RATING, dive->rating,
 		DIVE_SAC, dive->sac,
 		DIVE_OTU, dive->otu,
+		DIVE_TOTALWEIGHT, total_weight(dive),
 		-1);
+
+	free(location);
+	free(cylinder);
 }
 
 static gboolean set_one_dive(GtkTreeModel *model,
@@ -569,6 +606,9 @@ void update_dive_list_units(void)
 	(void) get_temp_units(0, &unit);
 	gtk_tree_view_column_set_title(dive_list.temperature, unit);
 
+	(void) get_weight_units(0, NULL, &unit);
+	gtk_tree_view_column_set_title(dive_list.totalweight, unit);
+
 	gtk_tree_model_foreach(model, set_one_dive, NULL);
 }
 
@@ -576,6 +616,7 @@ void update_dive_list_col_visibility(void)
 {
 	gtk_tree_view_column_set_visible(dive_list.cylinder, visible_cols.cylinder);
 	gtk_tree_view_column_set_visible(dive_list.temperature, visible_cols.temperature);
+	gtk_tree_view_column_set_visible(dive_list.totalweight, visible_cols.totalweight);
 	gtk_tree_view_column_set_visible(dive_list.nitrox, visible_cols.nitrox);
 	gtk_tree_view_column_set_visible(dive_list.sac, visible_cols.sac);
 	gtk_tree_view_column_set_visible(dive_list.otu, visible_cols.otu);
@@ -604,6 +645,7 @@ static void fill_dive_list(void)
 			DIVE_DURATION, dive->duration.seconds,
 			DIVE_LOCATION, "location",
 			DIVE_TEMPERATURE, dive->watertemp.mkelvin,
+			DIVE_TOTALWEIGHT, 0,
 			DIVE_SAC, 0,
 			-1);
 	}
@@ -636,6 +678,7 @@ static struct divelist_column {
 	[DIVE_DEPTH] = { "ft", depth_data_func, NULL, ALIGN_RIGHT },
 	[DIVE_DURATION] = { "min", duration_data_func, NULL, ALIGN_RIGHT },
 	[DIVE_TEMPERATURE] = { UTF8_DEGREE "F", temperature_data_func, NULL, ALIGN_RIGHT, &visible_cols.temperature },
+	[DIVE_TOTALWEIGHT] = { "lbs", weight_data_func, NULL, ALIGN_RIGHT, &visible_cols.totalweight },
 	[DIVE_CYLINDER] = { "Cyl", NULL, NULL, 0, &visible_cols.cylinder },
 	[DIVE_NITROX] = { "O" UTF8_SUBSCRIPT_2 "%", nitrox_data_func, nitrox_sort_func, 0, &visible_cols.nitrox },
 	[DIVE_SAC] = { "SAC", sac_data_func, NULL, 0, &visible_cols.sac },
@@ -687,6 +730,49 @@ static void row_activated_cb(GtkTreeView *tree_view,
 	edit_dive_info(get_dive(index));
 }
 
+void add_dive_cb(GtkWidget *menuitem, gpointer data)
+{
+	struct dive *dive;
+
+	dive = alloc_dive();
+	if (add_new_dive(dive)) {
+		record_dive(dive);
+		report_dives(TRUE);
+		return;
+	}
+	free(dive);
+}
+
+static void popup_divelist_menu(GtkTreeView *tree_view, GtkTreeModel *model, int button)
+{
+	GtkWidget *menu, *menuitem;
+
+	menu = gtk_menu_new();
+	menuitem = gtk_menu_item_new_with_label("Add dive");
+	g_signal_connect(menuitem, "activate", G_CALLBACK(add_dive_cb), model);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+	gtk_widget_show_all(menu);
+
+	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
+		button, gtk_get_current_event_time());
+}
+
+static void popup_menu_cb(GtkTreeView *tree_view,
+			GtkTreeModel *model)
+{
+	popup_divelist_menu(tree_view, model, 0);
+}
+
+static gboolean button_press_cb(GtkWidget *treeview, GdkEventButton *event, GtkTreeModel *model)
+{
+	/* Right-click? Bring up the menu */
+	if (event->type == GDK_BUTTON_PRESS  &&  event->button == 3) {
+		popup_divelist_menu(GTK_TREE_VIEW(treeview), model, 3);
+		return TRUE;
+	}
+	return FALSE;
+}
+
 GtkWidget *dive_list_create(void)
 {
 	GtkTreeSelection  *selection;
@@ -699,6 +785,7 @@ GtkWidget *dive_list_create(void)
 				G_TYPE_INT, 			/* Depth */
 				G_TYPE_INT,			/* Duration */
 				G_TYPE_INT,			/* Temperature */
+				G_TYPE_INT,			/* Total weight */
 				G_TYPE_STRING,			/* Cylinder */
 				G_TYPE_INT,			/* Nitrox */
 				G_TYPE_INT,			/* SAC */
@@ -719,6 +806,7 @@ GtkWidget *dive_list_create(void)
 	dive_list.depth = divelist_column(&dive_list, dl_column + DIVE_DEPTH);
 	dive_list.duration = divelist_column(&dive_list, dl_column + DIVE_DURATION);
 	dive_list.temperature = divelist_column(&dive_list, dl_column + DIVE_TEMPERATURE);
+	dive_list.totalweight = divelist_column(&dive_list, dl_column + DIVE_TOTALWEIGHT);
 	dive_list.cylinder = divelist_column(&dive_list, dl_column + DIVE_CYLINDER);
 	dive_list.nitrox = divelist_column(&dive_list, dl_column + DIVE_NITROX);
 	dive_list.sac = divelist_column(&dive_list, dl_column + DIVE_SAC);
@@ -734,6 +822,8 @@ 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), dive_list.model);
+	g_signal_connect(dive_list.tree_view, "button-press-event", G_CALLBACK(button_press_cb), dive_list.model);
+	g_signal_connect(dive_list.tree_view, "popup-menu", G_CALLBACK(popup_menu_cb), dive_list.model);
 	g_signal_connect(selection, "changed", G_CALLBACK(selection_cb), dive_list.model);
 
 	dive_list.container_widget = gtk_scrolled_window_new(NULL, NULL);