mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Show the "save changes" dialog before the main window is destroyed

Browse source 
By using the delete-event callback instead of the destroy callback we are
able to display our dialog (and the file-save dialog) while the program
window is still being displayed. Much nicer this way.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2011-09-21 10:31:03 -07:00
parent 740e7119cd
commit 8a8ad3f997
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gtk-gui.c
View file

@ -141,7 +141,7 @@ static void file_save(GtkWidget *w, gpointer data)
filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
save_dives(filename); save_dives(filename);
g_free(filename); g_free(filename);
mark_divelist_changed(TRUE); mark_divelist_changed(FALSE);
} }
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
} }
@ -165,13 +165,19 @@ static void ask_save_changes()
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
} }
void on_destroy(GtkWidget* w, gpointer data) static gboolean on_delete(GtkWidget* w, gpointer data)
{ {
/* Make sure to flush any modified dive data */ /* Make sure to flush any modified dive data */
update_dive(NULL); update_dive(NULL);
if (unsaved_changes()) if (unsaved_changes())
ask_save_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(); gtk_main_quit();
} }
@ -417,6 +423,7 @@ void init_ui(int argc, char **argv)
error_info_bar = NULL; error_info_bar = NULL;
win = gtk_window_new(GTK_WINDOW_TOPLEVEL); win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_icon_from_file(GTK_WINDOW(win), "icon.svg", NULL); 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); g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);
main_window = win; main_window = win;