X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gerror.c;h=1ebcb272fa3a839fa366667e145415f37f5d90e6;hp=82e0dd270f19bbc51f6f7324b263ffd31c2a89a6;hb=58dc28f4e56cba465cc56b9f81065862b1e98548;hpb=41666588eed4ed830b1fabd0458eb2b0a93f0147 diff --git a/gerror.c b/gerror.c index 82e0dd27..1ebcb272 100644 --- a/gerror.c +++ b/gerror.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include @@ -9,7 +9,7 @@ #include "gerror.h" static void on_info_bar_response(GtkWidget *widget, gint response, - gpointer data) + gpointer data) { struct gui *ui = (struct gui *) data; @@ -24,23 +24,24 @@ static void report_error(struct gui_entry *ge, GError *error) struct gui *ui = ge->ui; if (ui->error_info_bar == NULL) { + GtkWidget *container; + ui->error_info_bar = gtk_info_bar_new_with_buttons(GTK_STOCK_OK, - GTK_RESPONSE_OK, - NULL); + GTK_RESPONSE_OK, NULL); g_signal_connect(ui->error_info_bar, "response", G_CALLBACK(on_info_bar_response), ui); gtk_info_bar_set_message_type(GTK_INFO_BAR(ui->error_info_bar), - GTK_MESSAGE_ERROR); - + GTK_MESSAGE_ERROR); + ui->error_label = gtk_label_new(error->message); - GtkWidget *container = gtk_info_bar_get_content_area(GTK_INFO_BAR(ui->error_info_bar)); + container = gtk_info_bar_get_content_area(GTK_INFO_BAR(ui->error_info_bar)); gtk_container_add(GTK_CONTAINER(container), ui->error_label); - + gtk_box_pack_start(GTK_BOX(ui->vbox), ui->error_info_bar, FALSE, FALSE, 0); gtk_widget_show_all(ui->vbox); } else { char buffer[256]; snprintf(buffer, sizeof(buffer), "Failed to open file."); - gtk_label_set(GTK_LABEL(ui->error_label), buffer); + gtk_label_set_text(GTK_LABEL(ui->error_label), buffer); } } @@ -57,4 +58,19 @@ void gfio_report_error(struct gui_entry *ge, const char *format, ...) g_error_free(error); } +void gfio_report_info(struct gui *ui, const char *title, const char *message) +{ + GtkWidget *dialog, *content, *label; + + dialog = gtk_dialog_new_with_buttons(title, GTK_WINDOW(ui->window), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + content = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); + label = gtk_label_new(message); + gtk_container_add(GTK_CONTAINER(content), label); + gtk_widget_show_all(dialog); + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); +}