b404a9
From 8e31dd5a50c0236ea5853892d05e3376f061ee23 Mon Sep 17 00:00:00 2001
b404a9
From: Jakub Filak <jfilak@redhat.com>
b404a9
Date: Thu, 9 Jan 2014 21:18:37 +0100
b404a9
Subject: [ABRT PATCH 12/12] configui: show 'Close' button in the dialog
b404a9
b404a9
Closes rhbz#1050167
b404a9
b404a9
Signed-off-by: Jakub Filak <jfilak@redhat.com>
b404a9
---
b404a9
 src/configuration-gui/main.c               | 10 ++++++-
b404a9
 src/configuration-gui/system-config-abrt.c | 45 +++++++++++++++++++++++++++++-
b404a9
 2 files changed, 53 insertions(+), 2 deletions(-)
b404a9
b404a9
diff --git a/src/configuration-gui/main.c b/src/configuration-gui/main.c
b404a9
index b07b852..bd37ef9 100644
b404a9
--- a/src/configuration-gui/main.c
b404a9
+++ b/src/configuration-gui/main.c
b404a9
@@ -22,6 +22,12 @@
b404a9
 
b404a9
 #define APP_NAME "System Config ABRT"
b404a9
 
b404a9
+static void
b404a9
+system_config_abrt_window_close_cb(gpointer user_data)
b404a9
+{
b404a9
+    gtk_widget_destroy(GTK_WIDGET(user_data));
b404a9
+}
b404a9
+
b404a9
 static GtkWidget *
b404a9
 system_config_abrt_window_new(GApplication *app)
b404a9
 {
b404a9
@@ -29,7 +35,9 @@ system_config_abrt_window_new(GApplication *app)
b404a9
     gtk_window_set_default_size(GTK_WINDOW(wnd), 500, 300);
b404a9
     gtk_window_set_title(GTK_WINDOW(wnd), _("Problem Reporting Configuration"));
b404a9
 
b404a9
-    GtkWidget *sca = system_config_abrt_widget_new();
b404a9
+    GtkWidget *sca = system_config_abrt_widget_new_with_close_button(
b404a9
+                                    system_config_abrt_window_close_cb, wnd);
b404a9
+
b404a9
     gtk_container_add(GTK_CONTAINER(wnd), sca);
b404a9
 
b404a9
     return wnd;
b404a9
diff --git a/src/configuration-gui/system-config-abrt.c b/src/configuration-gui/system-config-abrt.c
b404a9
index 4638dd6..b15a5ef 100644
b404a9
--- a/src/configuration-gui/system-config-abrt.c
b404a9
+++ b/src/configuration-gui/system-config-abrt.c
b404a9
@@ -24,6 +24,15 @@
b404a9
 #define CLOSE_BUTTON_DATA_NAME_USER_DATA "my-close-user-data"
b404a9
 
b404a9
 static void
b404a9
+system_config_abrt_close_btn_cb(GtkButton *button, gpointer user_data)
b404a9
+{
b404a9
+    system_config_abrt_widget_close_callback callback = g_object_get_data(G_OBJECT(button), CLOSE_BUTTON_DATA_NAME_CALLBACK);
b404a9
+    gpointer callback_user_data = g_object_get_data(G_OBJECT(button), CLOSE_BUTTON_DATA_NAME_USER_DATA);
b404a9
+
b404a9
+    callback(callback_user_data);
b404a9
+}
b404a9
+
b404a9
+static void
b404a9
 system_config_abrt_defaults_cb(GtkButton *button, gpointer user_data)
b404a9
 {
b404a9
     AbrtConfigWidget *config = ABRT_CONFIG_WIDGET(user_data);
b404a9
@@ -32,6 +41,12 @@ system_config_abrt_defaults_cb(GtkButton *button, gpointer user_data)
b404a9
 
b404a9
 GtkWidget *system_config_abrt_widget_new(void)
b404a9
 {
b404a9
+    return system_config_abrt_widget_new_with_close_button(/*no close button*/NULL,
b404a9
+                                                           /*no user data*/NULL);
b404a9
+}
b404a9
+
b404a9
+GtkWidget *system_config_abrt_widget_new_with_close_button(system_config_abrt_widget_close_callback close_cb, gpointer user_data)
b404a9
+{
b404a9
     GtkBox *box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, /*spacing*/0));
b404a9
 
b404a9
     AbrtConfigWidget *config = abrt_config_widget_new();
b404a9
@@ -55,6 +70,17 @@ GtkWidget *system_config_abrt_widget_new(void)
b404a9
     gtk_widget_set_margin_top(buttons, 10);
b404a9
     gtk_widget_set_margin_bottom(buttons, 10);
b404a9
 
b404a9
+    if (close_cb != NULL)
b404a9
+    {
b404a9
+        GtkWidget *btn_close = gtk_button_new_with_mnemonic(_("_Close"));
b404a9
+        gtk_box_pack_end(GTK_BOX(buttons), btn_close, /*expand*/FALSE, /*fill*/FALSE, /*padding*/0);
b404a9
+
b404a9
+        g_object_set_data(G_OBJECT(btn_close), CLOSE_BUTTON_DATA_NAME_CALLBACK, close_cb);
b404a9
+        g_object_set_data(G_OBJECT(btn_close), CLOSE_BUTTON_DATA_NAME_USER_DATA, user_data);
b404a9
+
b404a9
+        g_signal_connect(btn_close, "clicked", G_CALLBACK(system_config_abrt_close_btn_cb), /*user_data*/NULL);
b404a9
+    }
b404a9
+
b404a9
     GtkWidget *btn_defaults = gtk_button_new_with_mnemonic(_("_Defaults"));
b404a9
     gtk_box_pack_start(GTK_BOX(buttons), btn_defaults, /*expand*/FALSE, /*fill*/FALSE, /*padding*/0);
b404a9
     g_signal_connect(btn_defaults, "clicked", G_CALLBACK(system_config_abrt_defaults_cb), config);
b404a9
@@ -64,6 +90,19 @@ GtkWidget *system_config_abrt_widget_new(void)
b404a9
     return GTK_WIDGET(box);
b404a9
 }
b404a9
 
b404a9
+static void
b404a9
+system_config_abrt_dialog_close_cb(gpointer user_data)
b404a9
+{
b404a9
+    gtk_widget_destroy(GTK_WIDGET(user_data));
b404a9
+}
b404a9
+
b404a9
+static gboolean
b404a9
+system_config_abrt_dialog_delete_event(GtkWidget *dialog, GdkEvent *event, gpointer user_data)
b404a9
+{
b404a9
+    system_config_abrt_dialog_close_cb(dialog);
b404a9
+    return TRUE; /*do not propagate the event*/
b404a9
+}
b404a9
+
b404a9
 void show_system_config_abrt_dialog(GtkWindow *parent)
b404a9
 {
b404a9
     GtkWidget *dialog = gtk_dialog_new();
b404a9
@@ -79,8 +118,12 @@ void show_system_config_abrt_dialog(GtkWindow *parent)
b404a9
         gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
b404a9
     }
b404a9
 
b404a9
+    /* Have to handle this signal, which is emitted on Esc or Alt+F4, otherwise */
b404a9
+    /* the user must commit the action twice to take effect. */
b404a9
+    g_signal_connect(dialog, "delete-event", G_CALLBACK(system_config_abrt_dialog_delete_event), /*user_data*/NULL);
b404a9
+
b404a9
     GtkWidget *content = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
b404a9
-    GtkWidget *sca = system_config_abrt_widget_new();
b404a9
+    GtkWidget *sca = system_config_abrt_widget_new_with_close_button(system_config_abrt_dialog_close_cb, dialog);
b404a9
     gtk_box_pack_start(GTK_BOX(content), sca, /*expand*/TRUE, /*fill*/TRUE, /*padding*/0);
b404a9
 
b404a9
     gtk_widget_show_all(content);
b404a9
-- 
b404a9
1.8.3.1
b404a9