X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=813d58adcfb0572dc88c278ca13820bd2e0380d3;hb=d4b0ce1c86d420a308770a598a07c3815778dc57;hp=7e94a22046b477bbaaf761016703ec205d5e567e;hpb=e8230c9d13afc84e88207ab6fde3190f0bd25fd0;p=ext%2Fsubsurface.git

diff --git a/info.c b/info.c
index 7e94a22..813d58a 100644
--- a/info.c
+++ b/info.c
@@ -18,9 +18,9 @@
 #include "display-gtk.h"
 #include "divelist.h"
 
-static GtkEntry *location, *buddy, *divemaster;
+static GtkEntry *location, *buddy, *divemaster, *rating;
 static GtkTextView *notes;
-static GtkListStore *location_list, *people_list;
+static GtkListStore *location_list, *people_list, *star_list;
 
 static char *get_text(GtkTextView *view)
 {
@@ -38,8 +38,8 @@ static char *get_text(GtkTextView *view)
  * NOTW: NULL and "" need to be treated as "unchanged" */
 static int text_changed(const char *old, const char *new)
 {
-	return ((old && strcmp(old,new)) ||
-		(!old && strcmp("",new)));
+	return (old && strcmp(old,new)) ||
+		(!old && strcmp("",new));
 }
 
 static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp)
@@ -95,23 +95,63 @@ void show_dive_info(struct dive *dive)
 	SET_TEXT_VALUE(divemaster);
 	SET_TEXT_VALUE(buddy);
 	SET_TEXT_VALUE(location);
+	gtk_entry_set_text(rating, star_strings[dive->rating]);
 	gtk_text_buffer_set_text(gtk_text_view_get_buffer(notes),
 		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;
@@ -255,14 +295,26 @@ void add_location(const char *string)
 	add_string_list_entry(string, location_list);
 }
 
+static int get_rating(const char *string)
+{
+	int rating_val = 0;
+	int i;
+
+	for (i = 0; i <= 5; i++)
+		if (!strcmp(star_strings[i],string))
+			rating_val = i;
+	return rating_val;
+}
+
 struct dive_info {
-	GtkComboBoxEntry *location, *divemaster, *buddy;
+	GtkComboBoxEntry *location, *divemaster, *buddy, *rating;
 	GtkTextView *notes;
 };
 
 static void save_dive_info_changes(struct dive *dive, struct dive_info *info)
 {
 	char *old_text, *new_text;
+	char *rating_string;
 	int changed = 0;
 
 	new_text = get_combo_box_entry_text(info->location, &dive->location);
@@ -283,6 +335,14 @@ static void save_dive_info_changes(struct dive *dive, struct dive_info *info)
 		changed = 1;
 	}
 
+	rating_string = strdup(star_strings[dive->rating]);
+	new_text = get_combo_box_entry_text(info->rating, &rating_string);
+	if (new_text) {
+		dive->rating = get_rating(rating_string);
+		free(rating_string);
+		changed =1;
+	}
+
 	old_text = dive->notes;
 	dive->notes = get_text(info->notes);
 	if (text_changed(old_text,dive->notes))
@@ -292,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);
 	}
 }
 
@@ -313,14 +373,22 @@ static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info
 	info->divemaster = text_entry(hbox, "Dive master", people_list, dive->divemaster);
 	info->buddy = text_entry(hbox, "Buddy", people_list, dive->buddy);
 
+	hbox = gtk_hbox_new(FALSE, 3);
+	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
+
+	info->rating = text_entry(hbox, "Rating", star_list, star_strings[dive->rating]);
+
 	info->notes = text_view(box, "Notes", READ_WRITE);
 	if (dive->notes && *dive->notes)
 		gtk_text_buffer_set_text(gtk_text_view_get_buffer(info->notes), dive->notes, -1);
 
+	hbox = gtk_hbox_new(FALSE, 3);
+	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
+
 	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);
+	gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 0);
 }
 
 int edit_dive_info(struct dive *dive)
@@ -359,6 +427,13 @@ GtkWidget *extended_dive_info_widget(void)
 
 	people_list = gtk_list_store_new(1, G_TYPE_STRING);
 	location_list = gtk_list_store_new(1, G_TYPE_STRING);
+	star_list = gtk_list_store_new(1, G_TYPE_STRING);
+	add_string_list_entry(ZERO_STARS, star_list);
+	add_string_list_entry(ONE_STARS, star_list);
+	add_string_list_entry(TWO_STARS, star_list);
+	add_string_list_entry(THREE_STARS, star_list);
+	add_string_list_entry(FOUR_STARS, star_list);
+	add_string_list_entry(FIVE_STARS, star_list);
 
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
 	location = text_value(vbox, "Location");
@@ -369,6 +444,11 @@ GtkWidget *extended_dive_info_widget(void)
 	divemaster = text_value(hbox, "Divemaster");
 	buddy = text_value(hbox, "Buddy");
 
+	hbox = gtk_hbox_new(FALSE, 3);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
+
+	rating = text_value(hbox, "Rating");
+
 	notes = text_view(vbox, "Notes", READ_ONLY);
 	return vbox;
 }