p/sensei-raw-ctl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow retrying on errors

Browse Source 
The GUI code stinks and it's not really worth my time.
This commit is contained in:
Přemysl Eric Janouch 2015-11-23 02:43:00 +01:00
parent 1619b4656c
commit 9ac9fe914f
1 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sensei-raw-ctl-gui.c
View File

@ -64,17 +64,22 @@ enum
// ----- User interface ------------------------------------------------------- // ----- User interface -------------------------------------------------------
static void static gboolean
fatal (GtkWidget *parent, const gchar *message) user_wants_to_retry_critical_op (GtkWidget *parent, const gchar *message)
{ {
GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (parent), GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (parent),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Fatal error")); GTK_MESSAGE_ERROR, GTK_BUTTONS_NONE, _("Error"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
_("_Retry"), TRUE, _("_Close"), FALSE, NULL);
gtk_message_dialog_format_secondary_text gtk_message_dialog_format_secondary_text
(GTK_MESSAGE_DIALOG (dialog), "%s", message); (GTK_MESSAGE_DIALOG (dialog), "%s", message);
gtk_dialog_run (GTK_DIALOG (dialog));
gboolean success = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
if (!success)
gtk_main_quit (); gtk_main_quit ();
return success;
} }
static void static void
@ -88,29 +93,37 @@ set_page (GtkBuilder *builder, gint page)
static gboolean static gboolean
spawn_ctl (gchar **argv, gchar **out, GtkBuilder *builder) spawn_ctl (gchar **argv, gchar **out, GtkBuilder *builder)
{ {
GError *error = NULL;
gint status;
gchar *err;
GtkWidget *win = GTK_WIDGET (gtk_builder_get_object (builder, "win")); GtkWidget *win = GTK_WIDGET (gtk_builder_get_object (builder, "win"));
gboolean trying = TRUE;
while (trying)
{
GError *error = NULL;
gchar *err = NULL;
gint status;
if (!g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, if (!g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL,
out, &err, &status, &error)) out, &err, &status, &error))
{ {
fatal (win, error->message); trying = user_wants_to_retry_critical_op (win, error->message);
g_error_free (error); g_error_free (error);
return FALSE; continue;
} }
if (WIFEXITED (status) && WEXITSTATUS (status) == 0) if (WIFEXITED (status) && WEXITSTATUS (status) == 0)
{
g_free (err);
return TRUE; return TRUE;
}
trying = FALSE;
if (strstr (err, "no suitable device")) if (strstr (err, "no suitable device"))
set_page (builder, PAGE_NO_DEVICE); set_page (builder, PAGE_NO_DEVICE);
else else
fatal (win, err); trying = user_wants_to_retry_critical_op (win, err);
g_clear_pointer (out, g_free); g_clear_pointer (out, g_free);
g_free (err); g_free (err);
}
return FALSE; return FALSE;
} }
@ -199,8 +212,14 @@ out:
g_free (out); g_free (out);
if (line != OUT_COUNT) if (line != OUT_COUNT)
fatal (GTK_WIDGET (gtk_builder_get_object (builder, "win")), {
_("Internal error")); GtkWidget *dialog = gtk_message_dialog_new (
GTK_WINDOW (gtk_builder_get_object (builder, "win")),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE, _("Internal error: backend mismatch"));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
} }
static void static void