mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 22:43:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make FileChooserButton end import dialog

Browse source 
If we choose a file in the import dialog then this should imply clicking
OK in that dialog - no reason for a two step process.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2011-10-05 14:12:03 -07:00
parent 447c8f04e1
commit b6f6107be1
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gtk-gui.c
View file

@ -836,7 +836,15 @@ static GtkEntry *dive_computer_device(GtkWidget *vbox)
return GTK_ENTRY(entry); return GTK_ENTRY(entry);
} }
static GtkWidget *xml_file_selector(GtkWidget *vbox) /* once a file is selected in the FileChooserButton we want to exit the import dialog */
static void on_file_set(GtkFileChooserButton *widget, gpointer _data)
{
GtkDialog *main_dialog = _data;
gtk_dialog_response(main_dialog, GTK_RESPONSE_ACCEPT);
}
static GtkWidget *xml_file_selector(GtkWidget *vbox, GtkWidget *main_dialog)
{ {
GtkWidget *hbox, *frame, *chooser, *dialog; GtkWidget *hbox, *frame, *chooser, *dialog;
GtkFileFilter *filter; GtkFileFilter *filter;
@ -864,6 +872,8 @@ static GtkWidget *xml_file_selector(GtkWidget *vbox)
gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter); gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter);
chooser = gtk_file_chooser_button_new_with_dialog(dialog); chooser = gtk_file_chooser_button_new_with_dialog(dialog);
g_signal_connect(G_OBJECT(chooser), "file-set", G_CALLBACK(on_file_set), main_dialog);
gtk_file_chooser_button_set_width_chars(GTK_FILE_CHOOSER_BUTTON(chooser), 30); gtk_file_chooser_button_set_width_chars(GTK_FILE_CHOOSER_BUTTON(chooser), 30);
gtk_container_add(GTK_CONTAINER(frame), chooser); gtk_container_add(GTK_CONTAINER(frame), chooser);
@ -904,7 +914,7 @@ void import_dialog(GtkWidget *w, gpointer data)
vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
label = gtk_label_new("Import: \nLoad XML file or import directly from dive computer"); label = gtk_label_new("Import: \nLoad XML file or import directly from dive computer");
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 3); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 3);
XMLchooser = xml_file_selector(vbox); XMLchooser = xml_file_selector(vbox, dialog);
computer = dive_computer_selector(vbox); computer = dive_computer_selector(vbox);
device = dive_computer_device(vbox); device = dive_computer_device(vbox);
hbox = gtk_hbox_new(FALSE, 6); hbox = gtk_hbox_new(FALSE, 6);