mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Show dive import error messages in the import dialog

Browse source 
.. not in the main window.  And leave the import dialog open, so that
you can either try doing it again, or cancel.  This makes it much easier
to re-try a failed dive import, and actually makes the failure more
obvious too.

Todo:

 - make the "Ok" button change to "Retry" when an error happens

 - try to see if we can catch the actual status update messages from
   libdivecomputer and show them too in the import dialog.  Right now
   they are printed out to stderr by the library.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2012-05-02 12:49:03 -07:00
parent c8f3dc3594
commit b0ba22a068
3 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gtk-gui.c
View file

@ -1013,10 +1013,27 @@ static void do_import_file(gpointer data, gpointer user_data)
}
}
static GtkWidget *import_dive_computer(device_data_t *data, GtkBox *vbox)
{
GError *error;
GtkWidget *info, *container, *label;
error = do_import(data);
if (!error)
return NULL;
info = gtk_info_bar_new();
container = gtk_info_bar_get_content_area(GTK_INFO_BAR(info));
label = gtk_label_new(error->message);
gtk_container_add(GTK_CONTAINER(container), label);
gtk_box_pack_start(vbox, info, FALSE, FALSE, 0);
return info;
}
void import_dialog(GtkWidget *w, gpointer data)
{
int result;
GtkWidget *dialog, *hbox, *vbox, *label;
GtkWidget *dialog, *hbox, *vbox, *label, *info = NULL;
GtkComboBox *computer;
GtkEntry *device;
GtkWidget *XMLchooser;
@ -1042,6 +1059,7 @@ void import_dialog(GtkWidget *w, gpointer data)
devicedata.progress.bar = gtk_progress_bar_new();
gtk_container_add(GTK_CONTAINER(hbox), devicedata.progress.bar);
repeat:
gtk_widget_show_all(dialog);
result = gtk_dialog_run(GTK_DIALOG(dialog));
switch (result) {
@ -1053,6 +1071,8 @@ void import_dialog(GtkWidget *w, gpointer data)
case GTK_RESPONSE_ACCEPT:
/* what happened - did the user pick a file? In that case
* we ignore whether a dive computer model was picked */
if (info)
gtk_widget_destroy(info);
list = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(XMLchooser));
if (g_slist_length(list) == 0) {
if (!gtk_combo_box_get_active_iter(computer, &iter))
@ -1066,7 +1086,9 @@ void import_dialog(GtkWidget *w, gpointer data)
devicedata.name = comp;
devicedata.devname = gtk_entry_get_text(device);
set_default_dive_computer(devicedata.name);
do_import(&devicedata);
info = import_dive_computer(&devicedata, GTK_BOX(vbox));
if (info)
goto repeat;
} else {
g_slist_foreach(list,do_import_file,NULL);
g_slist_free(list);

10
libdivecomputer.c
View file

@ -18,7 +18,7 @@
#define NOT_FROG
#endif
static void error(const char *fmt, ...)
static GError *error(const char *fmt, ...)
{
va_list args;
GError *error;
@ -28,8 +28,7 @@ static void error(const char *fmt, ...)
g_quark_from_string("subsurface"),
DIVE_ERROR_PARSE, fmt, args);
va_end(args);
report_error(error);
g_error_free(error);
return error;
}
static parser_status_t create_parser(device_data_t *devdata, parser_t **parser)
@ -512,7 +511,7 @@ static void *pthread_wrapper(void *_data)
return (void *)err_string;
}
void do_import(device_data_t *data)
GError *do_import(device_data_t *data)
{
pthread_t pthread;
void *retval;
@ -527,7 +526,8 @@ void do_import(device_data_t *data)
if (pthread_join(pthread, &retval) < 0)
retval = "Odd pthread error return";
if (retval)
error(retval, data->name, data->devname);
return error(retval, data->name, data->devname);
return NULL;
}
/*

2
libdivecomputer.h
View file

@ -34,6 +34,6 @@ struct device_list {
};
extern struct device_list device_list[];
extern void do_import(device_data_t *data);
extern GError *do_import(device_data_t *data);
#endif