diff --git a/common/utils/itti_analyzer/libui/ui_filters.c b/common/utils/itti_analyzer/libui/ui_filters.c index 5fe994b83a9eaacda76e8c61cb78ece0c24daf2d..c046b0d5e44176c80dfc1ff1534b07271f286d2b 100644 --- a/common/utils/itti_analyzer/libui/ui_filters.c +++ b/common/utils/itti_analyzer/libui/ui_filters.c @@ -303,7 +303,7 @@ int ui_filters_read(const char *file_name) if (doc == NULL) { g_warning("Failed to parse \"%s\"", file_name); - ui_notification_dialog (DIALOG_WARNING, "Failed to parse file \"%s\"", file_name); + ui_notification_dialog (GTK_MESSAGE_ERROR, "open filters", "Failed to parse file \"%s\"", file_name); return RC_FAIL; } @@ -312,7 +312,7 @@ int ui_filters_read(const char *file_name) if (ret != RC_OK) { g_warning("Found no filter definition in \"%s\"", file_name); - ui_notification_dialog (DIALOG_WARNING, "Found no filter definition in \"%s\"", file_name); + ui_notification_dialog (GTK_MESSAGE_ERROR, "open filters", "Found no filter definitions in \"%s\"", file_name); return RC_FAIL; } diff --git a/common/utils/itti_analyzer/libui/ui_notif_dlg.c b/common/utils/itti_analyzer/libui/ui_notif_dlg.c index 2b2fc95e86e97cd5efa3b9e3662cc122159c24b6..97908006d75c3516e1b339dca2e80e92d1f68754 100644 --- a/common/utils/itti_analyzer/libui/ui_notif_dlg.c +++ b/common/utils/itti_analyzer/libui/ui_notif_dlg.c @@ -3,7 +3,10 @@ #include "ui_notif_dlg.h" #include "ui_main_screen.h" -int ui_notification_dialog(dialog_type_t type, const char *fmt, ...) +static const char * const title_type[] = + {"Info", "Warning", "Question", "Error", "Other"}; + +int ui_notification_dialog(GtkMessageType type, const char *title, const char *fmt, ...) { va_list args; GtkWidget *dialogbox; @@ -11,13 +14,15 @@ int ui_notification_dialog(dialog_type_t type, const char *fmt, ...) va_start(args, fmt); - vsnprintf(buffer, sizeof(buffer), fmt, args); + vsnprintf (buffer, sizeof(buffer), fmt, args); + + dialogbox = gtk_message_dialog_new (GTK_WINDOW(ui_main_data.window), GTK_DIALOG_MODAL, type, GTK_BUTTONS_OK, "%s", + buffer); - dialogbox = gtk_message_dialog_new(GTK_WINDOW(ui_main_data.window), - GTK_DIALOG_MODAL, type, - GTK_BUTTONS_OK, "%s", buffer); + snprintf (buffer, sizeof(buffer), "%s: %s", title_type[type], title); + gtk_window_set_title (GTK_WINDOW(dialogbox), buffer); - gtk_dialog_run(GTK_DIALOG (dialogbox)); + gtk_dialog_run (GTK_DIALOG (dialogbox)); gtk_widget_destroy (dialogbox); diff --git a/common/utils/itti_analyzer/libui/ui_notif_dlg.h b/common/utils/itti_analyzer/libui/ui_notif_dlg.h index a351f317097592683da5766956ba90569bcf1e81..2741f7e25c9c4f10da45bf68547ee8ab7185300a 100644 --- a/common/utils/itti_analyzer/libui/ui_notif_dlg.h +++ b/common/utils/itti_analyzer/libui/ui_notif_dlg.h @@ -3,15 +3,6 @@ #ifndef UI_NOTIF_DLG_H_ #define UI_NOTIF_DLG_H_ -typedef enum dialog_type_e { - DIALOG_INFO, - DIALOG_WARNING, - DIALOG_QUESTION, - DIALOG_ERROR, - DIALOG_OTHER, - DIALOG_MAX -} dialog_type_t; - -extern int ui_notification_dialog(dialog_type_t type, const char *fmt, ...); +extern int ui_notification_dialog(GtkMessageType type, const char *title, const char *fmt, ...); #endif /* UI_NOTIF_DLG_H_ */