X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=divelist.c;h=21f343f7f0d2d0f6d98685eacd5a65be460c961e;hp=32dc92b9980dc7bf75573c0880a84e069927b871;hb=618a20ba5f2a9adc0e5a35117535f8eaa9fd34a4;hpb=2175226580a523a9a3abba3723991b003eee5a2a

diff --git a/divelist.c b/divelist.c
index 32dc92b..21f343f 100644
--- a/divelist.c
+++ b/divelist.c
@@ -73,6 +73,7 @@ static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
 		return;
 	case 1:	
 		/* just pick that dive as selected */
+		amount_selected = 1;
 		path = g_list_nth_data(selected_dives, 0);
 		if (gtk_tree_model_get_iter(model, &iter, path)) {
 			gtk_tree_model_get_value(model, &iter, DIVE_INDEX, &value);
@@ -86,6 +87,9 @@ static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
 		  * is the most intuitive solution.
 		  * I do however want to keep around which dives have
 		  * been selected */
+		amount_selected = g_list_length(selected_dives);
+		process_selected_dives(selected_dives, model);
+		repaint_dive();
 		return;
 	}
 }
@@ -230,7 +234,7 @@ static void temperature_data_func(GtkTreeViewColumn *col,
  *  - Nitrox trumps air (even if hypoxic)
  * These are the same rules as the inter-dive sorting rules.
  */
-static void get_dive_gas(struct dive *dive, int *o2, int *he, int *o2low)
+static void get_dive_gas(struct dive *dive, int *o2_p, int *he_p, int *o2low_p)
 {
 	int i;
 	int maxo2 = -1, maxhe = -1, mino2 = 1000;
@@ -244,7 +248,7 @@ static void get_dive_gas(struct dive *dive, int *o2, int *he, int *o2low)
 		if (cylinder_none(cyl))
 			continue;
 		if (!o2)
-			o2 = 209;
+			o2 = AIR_PERMILLE;
 		if (o2 < mino2)
 			mino2 = o2;
 		if (he > maxhe)
@@ -258,11 +262,11 @@ newmax:
 		maxo2 = o2;
 	}
 	/* All air? Show/sort as "air"/zero */
-	if (!maxhe && maxo2 == 209 && mino2 == maxo2)
+	if (!maxhe && maxo2 == AIR_PERMILLE && mino2 == maxo2)
 		maxo2 = mino2 = 0;
-	*o2 = maxo2;
-	*he = maxhe;
-	*o2low = mino2;
+	*o2_p = maxo2;
+	*he_p = maxhe;
+	*o2low_p = mino2;
 }
 
 static gint nitrox_sort_func(GtkTreeModel *model,
@@ -394,7 +398,7 @@ static int calculate_otu(struct dive *dive)
 		t = sample->time.seconds - psample->time.seconds;
 		int o2 = dive->cylinder[sample->cylinderindex].gasmix.o2.permille;
 		if (!o2)
-			o2 = 209;
+			o2 = AIR_PERMILLE;
 		po2 = o2 / 1000.0 * (sample->depth.mm + 10000) / 10000.0;
 		if (po2 >= 0.5)
 			otu += pow(po2 - 0.5, 0.83) * t / 30.0;
@@ -625,7 +629,7 @@ static struct divelist_column {
 	sort_func_t sort;
 	unsigned int flags;
 	int *visible;
-} column[] = {
+} dl_column[] = {
 	[DIVE_NR] = { "#", NULL, NULL, ALIGN_RIGHT | UNSORTABLE },
 	[DIVE_DATE] = { "Date", date_data_func, NULL, ALIGN_LEFT },
 	[DIVE_RATING] = { UTF8_BLACKSTAR, star_data_func, NULL, ALIGN_LEFT },
@@ -642,7 +646,7 @@ static struct divelist_column {
 
 static GtkTreeViewColumn *divelist_column(struct DiveList *dl, struct divelist_column *col)
 {
-	int index = col - &column[0];
+	int index = col - &dl_column[0];
 	const char *title = col->header;
 	data_func_t data_func = col->data;
 	sort_func_t sort_func = col->sort;
@@ -683,6 +687,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;
@@ -709,17 +756,17 @@ GtkWidget *dive_list_create(void)
 	gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_MULTIPLE);
 	gtk_widget_set_size_request(dive_list.tree_view, 200, 200);
 
-	dive_list.nr = divelist_column(&dive_list, column + DIVE_NR);
-	dive_list.date = divelist_column(&dive_list, column + DIVE_DATE);
-	dive_list.stars = divelist_column(&dive_list, column + DIVE_RATING);
-	dive_list.depth = divelist_column(&dive_list, column + DIVE_DEPTH);
-	dive_list.duration = divelist_column(&dive_list, column + DIVE_DURATION);
-	dive_list.temperature = divelist_column(&dive_list, column + DIVE_TEMPERATURE);
-	dive_list.cylinder = divelist_column(&dive_list, column + DIVE_CYLINDER);
-	dive_list.nitrox = divelist_column(&dive_list, column + DIVE_NITROX);
-	dive_list.sac = divelist_column(&dive_list, column + DIVE_SAC);
-	dive_list.otu = divelist_column(&dive_list, column + DIVE_OTU);
-	dive_list.location = divelist_column(&dive_list, column + DIVE_LOCATION);
+	dive_list.nr = divelist_column(&dive_list, dl_column + DIVE_NR);
+	dive_list.date = divelist_column(&dive_list, dl_column + DIVE_DATE);
+	dive_list.stars = divelist_column(&dive_list, dl_column + DIVE_RATING);
+	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.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);
+	dive_list.otu = divelist_column(&dive_list, dl_column + DIVE_OTU);
+	dive_list.location = divelist_column(&dive_list, dl_column + DIVE_LOCATION);
 
 	fill_dive_list();
 
@@ -730,6 +777,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);