X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=813d58adcfb0572dc88c278ca13820bd2e0380d3;hb=2cada118eb515e369ba23b85c8f3fb8c4d100aaa;hp=6a4a296b004013d7b77ba9bb746b79225385f6d7;hpb=81fddfa67e779c8d378eee4c57fd9f201e15f96f;p=ext%2Fsubsurface.git

diff --git a/info.c b/info.c
index 6a4a296..813d58a 100644
--- a/info.c
+++ b/info.c
@@ -100,19 +100,58 @@ void show_dive_info(struct dive *dive)
 		dive && dive->notes ? dive->notes : "", -1);
 }
 
+static int delete_dive_info(struct dive *dive)
+{
+	int success;
+	GtkWidget *dialog;
+
+	if (!dive)
+		return 0;
+
+	dialog = gtk_dialog_new_with_buttons("Delete Dive",
+		GTK_WINDOW(main_window),
+		GTK_DIALOG_DESTROY_WITH_PARENT,
+		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+		NULL);
+
+	gtk_widget_show_all(dialog);
+	success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT;
+	if (success) {
+		delete_dive(dive);
+		mark_divelist_changed(TRUE);
+		dive_list_update_dives();
+	}
+
+	gtk_widget_destroy(dialog);
+
+	return success;
+}
+
 static void info_menu_edit_cb(GtkMenuItem *menuitem, gpointer user_data)
 {
 	edit_dive_info(current_dive);
 }
 
-static void populate_popup_cb(GtkTextView *entry, GtkMenu *menu, gpointer user_data)
+static void info_menu_delete_cb(GtkMenuItem *menuitem, gpointer user_data)
 {
-	GtkWidget *item = gtk_menu_item_new_with_label("Edit");
-	g_signal_connect(item, "activate", G_CALLBACK(info_menu_edit_cb), NULL);
+	delete_dive_info(current_dive);
+}
+
+static void add_menu_item(GtkMenu *menu, const char *label, void (*cb)(GtkMenuItem *, gpointer))
+{
+	GtkWidget *item = gtk_menu_item_new_with_label(label);
+	g_signal_connect(item, "activate", G_CALLBACK(cb), NULL);
 	gtk_widget_show(item); /* Yes, really */
 	gtk_menu_prepend(menu, item);
 }
 
+static void populate_popup_cb(GtkTextView *entry, GtkMenu *menu, gpointer user_data)
+{
+	add_menu_item(menu, "Delete", info_menu_delete_cb);
+	add_menu_item(menu, "Edit", info_menu_edit_cb);
+}
+
 static GtkEntry *text_value(GtkWidget *box, const char *label)
 {
 	GtkWidget *widget;
@@ -313,7 +352,7 @@ static void save_dive_info_changes(struct dive *dive, struct dive_info *info)
 
 	if (changed) {
 		mark_divelist_changed(TRUE);
-		flush_divelist(dive);
+		update_dive(dive);
 	}
 }