X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=gtk-gui.c;h=4b994d17c722005706209fa46169f693ec1b3f27;hb=f12684dcd7f40651c2480be758c9d3b34ef19a6e;hp=77cf4a9ec49edf7bd904cc9cffb9cce9ee461a8e;hpb=682135838ff313594c7f67fabd9be8f88a33883b;p=ext%2Fsubsurface.git

diff --git a/gtk-gui.c b/gtk-gui.c
index 77cf4a9..4b994d1 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -31,11 +31,6 @@ struct units output_units;
 
 #define GCONF_NAME(x) "/apps/subsurface/" #x
 
-void on_destroy(GtkWidget* w, gpointer data)
-{
-	gtk_main_quit();
-}
-
 static GtkWidget *dive_profile;
 
 void repaint_dive(void)
@@ -146,23 +141,64 @@ static void file_save(GtkWidget *w, gpointer data)
 		filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
 		save_dives(filename);
 		g_free(filename);
+		mark_divelist_changed(FALSE);
 	}
 	gtk_widget_destroy(dialog);
 }
 
+static void ask_save_changes()
+{
+	GtkWidget *dialog, *label, *content;
+	dialog = gtk_dialog_new_with_buttons("Save Changes?",
+		GTK_WINDOW(main_window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+		GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		NULL);
+	content = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	label = gtk_label_new ("You have unsaved changes\nWould you like to save those before exiting the program?");
+	gtk_container_add (GTK_CONTAINER (content), label);
+	gtk_widget_show_all (dialog);
+	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
+	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+		file_save(NULL,NULL);
+	}
+	gtk_widget_destroy(dialog);
+}
+
+static gboolean on_delete(GtkWidget* w, gpointer data)
+{
+	/* Make sure to flush any modified dive data */
+	update_dive(NULL);
+
+	if (unsaved_changes())
+		ask_save_changes();
+
+	return FALSE; /* go ahead, kill the program, we're good now */
+}
+
+static void on_destroy(GtkWidget* w, gpointer data)
+{
+	gtk_main_quit();
+}
+
 static void quit(GtkWidget *w, gpointer data)
 {
+	/* Make sure to flush any modified dive data */
+	update_dive(NULL);
+
+	if (unsaved_changes())
+		ask_save_changes();
 	gtk_main_quit();
 }
 
-static void create_radio(GtkWidget *dialog, const char *name, ...)
+static void create_radio(GtkWidget *vbox, const char *name, ...)
 {
 	va_list args;
 	GtkRadioButton *group = NULL;
 	GtkWidget *box, *label;
 
 	box = gtk_hbox_new(TRUE, 10);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), box);
+	gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 0);
 
 	label = gtk_label_new(name);
 	gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0);
@@ -210,7 +246,7 @@ UNITCALLBACK(set_fahrenheit, temperature, FAHRENHEIT)
 static void preferences_dialog(GtkWidget *w, gpointer data)
 {
 	int result;
-	GtkWidget *dialog, *font, *frame, *box;
+	GtkWidget *dialog, *font, *frame, *box, *vbox;
 
 	menu_units = output_units;
 
@@ -222,7 +258,8 @@ static void preferences_dialog(GtkWidget *w, gpointer data)
 		NULL);
 
 	frame = gtk_frame_new("Units");
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5);
+	vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+	gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
 
 	box = gtk_vbox_new(FALSE, 6);
 	gtk_container_add(GTK_CONTAINER(frame), box);
@@ -248,7 +285,7 @@ static void preferences_dialog(GtkWidget *w, gpointer data)
 		NULL);
 
 	font = gtk_font_button_new_with_font(divelist_font);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), font, FALSE, FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), font, FALSE, FALSE, 5);
 
 	gtk_widget_show_all(dialog);
 	result = gtk_dialog_run(GTK_DIALOG(dialog));
@@ -274,7 +311,7 @@ static void preferences_dialog(GtkWidget *w, gpointer data)
 static void renumber_dialog(GtkWidget *w, gpointer data)
 {
 	int result;
-	GtkWidget *dialog, *frame, *button;
+	GtkWidget *dialog, *frame, *button, *vbox;
 
 	dialog = gtk_dialog_new_with_buttons("Renumber",
 		GTK_WINDOW(main_window),
@@ -283,8 +320,10 @@ static void renumber_dialog(GtkWidget *w, gpointer data)
 		GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
 		NULL);
 
+	vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+
 	frame = gtk_frame_new("New starting number");
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), frame);
+	gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
 
 	button = gtk_spin_button_new_with_range(1, 50000, 1);
 	gtk_container_add(GTK_CONTAINER(frame), button);
@@ -387,6 +426,7 @@ void init_ui(int argc, char **argv)
 	error_info_bar = NULL;
 	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_icon_from_file(GTK_WINDOW(win), "icon.svg", NULL);
+	g_signal_connect(G_OBJECT(win), "delete-event", G_CALLBACK (on_delete), NULL);
 	g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);
 	main_window = win;
 
@@ -539,12 +579,13 @@ static void fill_computer_list(GtkListStore *store)
 
 static GtkComboBox *dive_computer_selector(GtkWidget *dialog)
 {
-	GtkWidget *hbox, *combo_box;
+	GtkWidget *hbox, *combo_box, *vbox;
 	GtkListStore *model;
 	GtkCellRenderer *renderer;
 
 	hbox = gtk_hbox_new(FALSE, 6);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 3);
+	vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3);
 
 	model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
 	fill_computer_list(model);
@@ -562,7 +603,7 @@ static GtkComboBox *dive_computer_selector(GtkWidget *dialog)
 void import_dialog(GtkWidget *w, gpointer data)
 {
 	int result;
-	GtkWidget *dialog, *hbox;
+	GtkWidget *dialog, *hbox, *vbox;
 	GtkComboBox *computer;
 	device_data_t devicedata = {
 		.devname = "/dev/ttyUSB0",
@@ -578,9 +619,10 @@ void import_dialog(GtkWidget *w, gpointer data)
 	computer = dive_computer_selector(dialog);
 
 	hbox = gtk_hbox_new(FALSE, 6);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, TRUE, 3);
-	devicedata.progress->bar = gtk_progress_bar_new();
-	gtk_container_add(GTK_CONTAINER(hbox), devicedata.progress->bar);
+	vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 3);
+	devicedata.progress.bar = gtk_progress_bar_new();
+	gtk_container_add(GTK_CONTAINER(hbox), devicedata.progress.bar);
 
 	gtk_widget_show_all(dialog);
 	result = gtk_dialog_run(GTK_DIALOG(dialog));
@@ -614,3 +656,11 @@ void update_progressbar(progressbar_t *progress, double value)
 {
 	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress->bar), value);
 }
+
+
+void set_filename(const char *filename)
+{
+	if (filename)
+		existing_filename = strdup(filename);
+	return;
+}