Attachment 20342 Details for Bug 18556 – activate cancel/close button on escape

[patch] activate cancel/close button on escape

button-activate-on-escape.patch (text/plain), 14.78 KB, created by Rui Tiago Matos on 2008-11-16 13:51:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rui Tiago Matos

Created: 2008-11-16 13:51:12 UTC

Size: 14.78 KB

patch

obsolete

>[1mdiff --git a/src/Makefile.am b/src/Makefile.am[m
>[1mindex 153ed67..f56fb33 100644[m
>[1m--- a/src/Makefile.am[m
>[1m+++ b/src/Makefile.am[m
>[36m@@ -199,15 +199,8 @@ gpk_service_pack_LDADD =				\[m
> 	$(NULL)[m
> [m
> gpk_prefs_SOURCES =					\[m
>[31m-	egg-debug.c					\[m
>[31m-	egg-debug.h					\[m
>[31m-	egg-unique.c					\[m
>[31m-	egg-unique.h					\[m
> 	gpk-prefs.c					\[m
>[31m-	gpk-gnome.c					\[m
>[31m-	gpk-gnome.h					\[m
>[31m-	gpk-enum.c					\[m
>[31m-	gpk-enum.h					\[m
>[32m+[m	[32m$(shared_SOURCES)				\[m
> 	$(NULL)[m
> [m
> gpk_prefs_LDADD =					\[m
>[36m@@ -244,9 +237,8 @@ gpk_log_LDADD =						\[m
> 	$(NULL)[m
> [m
> gpk_backend_status_SOURCES =				\[m
>[31m-	egg-debug.c					\[m
>[31m-	egg-debug.h					\[m
> 	gpk-backend-status.c				\[m
>[32m+[m	[32m$(shared_SOURCES)				\[m
> 	$(NULL)[m
> [m
> gpk_backend_status_LDADD =				\[m
>[1mdiff --git a/src/gpk-backend-status.c b/src/gpk-backend-status.c[m
>[1mindex 2dc58eb..3713b47 100644[m
>[1m--- a/src/gpk-backend-status.c[m
>[1m+++ b/src/gpk-backend-status.c[m
>[36m@@ -35,6 +35,8 @@[m
> [m
> #include "egg-debug.h"[m
> [m
>[32m+[m[32m#include "gpk-common.h"[m
>[32m+[m
> /**[m
>  * pk_updates_close_cb:[m
>  **/[m
>[36m@@ -127,6 +129,7 @@ main (int argc, char *argv[])[m
> 	glade_xml = glade_xml_new (GPK_DATA "/gpk-backend-status.glade", NULL, NULL);[m
> [m
> 	widget = glade_xml_get_widget (glade_xml, "button_close");[m
>[32m+[m	[32mgpk_button_activate_on_escape (GTK_BUTTON (widget));[m
> 	g_signal_connect (widget, "clicked",[m
> 			  G_CALLBACK (pk_updates_close_cb), loop);[m
> [m
>[1mdiff --git a/src/gpk-client-chooser.c b/src/gpk-client-chooser.c[m
>[1mindex 9a67691..b1320fc 100644[m
>[1m--- a/src/gpk-client-chooser.c[m
>[1m+++ b/src/gpk-client-chooser.c[m
>[36m@@ -204,6 +204,7 @@ gpk_client_chooser_show (GtkWindow *window, PkPackageList *list, const gchar *ti[m
> 	widget = glade_xml_get_widget (glade_xml, "button_help");[m
> 	g_signal_connect (widget, "clicked", G_CALLBACK (gpk_client_chooser_button_help_cb), NULL);[m
> 	widget = glade_xml_get_widget (glade_xml, "button_close");[m
>[32m+[m	[32mgpk_button_activate_on_escape (GTK_BUTTON (widget));[m
> 	g_signal_connect (widget, "clicked", G_CALLBACK (gpk_client_chooser_button_close_cb), NULL);[m
> [m
> 	/* set icon name */[m
>[1mdiff --git a/src/gpk-client-dialog.c b/src/gpk-client-dialog.c[m
>[1mindex 1dce319..96f3a85 100644[m
>[1m--- a/src/gpk-client-dialog.c[m
>[1m+++ b/src/gpk-client-dialog.c[m
>[36m@@ -757,6 +757,7 @@ gpk_client_dialog_init (GpkClientDialog *dialog)[m
> 	widget = glade_xml_get_widget (dialog->priv->glade_xml, "window_client");[m
> 	g_signal_connect (widget, "delete_event", G_CALLBACK (gpk_client_dialog_window_delete_cb), dialog);[m
> 	widget = glade_xml_get_widget (dialog->priv->glade_xml, "button_close");[m
>[32m+[m	[32mgpk_button_activate_on_escape (GTK_BUTTON (widget));[m
> 	g_signal_connect (widget, "clicked", G_CALLBACK (gpk_client_dialog_button_close_cb), dialog);[m
> 	widget = glade_xml_get_widget (dialog->priv->glade_xml, "button_help");[m
> 	g_signal_connect (widget, "clicked", G_CALLBACK (gpk_client_dialog_button_help_cb), dialog);[m
>[1mdiff --git a/src/gpk-client-eula.c b/src/gpk-client-eula.c[m
>[1mindex 74f76d8..971e887 100644[m
>[1m--- a/src/gpk-client-eula.c[m
>[1m+++ b/src/gpk-client-eula.c[m
>[36m@@ -82,6 +82,7 @@ gpk_client_eula_show (GtkWindow *window, const gchar *eula_id, const gchar *pack[m
> 	widget = glade_xml_get_widget (glade_xml, "window_eula");[m
> 	g_signal_connect_swapped (widget, "delete_event", G_CALLBACK (gtk_main_quit), NULL);[m
> 	widget = glade_xml_get_widget (glade_xml, "button_cancel");[m
>[32m+[m	[32mgpk_button_activate_on_escape (GTK_BUTTON (widget));[m
> 	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (gtk_main_quit), NULL);[m
> [m
> 	/* set icon name */[m
>[1mdiff --git a/src/gpk-client-run.c b/src/gpk-client-run.c[m
>[1mindex 8ec7398..228671a 100644[m
>[1m--- a/src/gpk-client-run.c[m
>[1m+++ b/src/gpk-client-run.c[m
>[36m@@ -318,6 +318,7 @@ gpk_client_run_show (gchar **package_ids)[m
> 	widget = glade_xml_get_widget (glade_xml, "button_help");[m
> 	g_signal_connect (widget, "clicked", G_CALLBACK (gpk_client_run_button_help_cb), NULL);[m
> 	widget = glade_xml_get_widget (glade_xml, "button_close");[m
>[32m+[m	[32mgpk_button_activate_on_escape (GTK_BUTTON (widget));[m
> 	g_signal_connect (widget, "clicked", G_CALLBACK (gpk_client_run_button_close_cb), NULL);[m
> 	widget = glade_xml_get_widget (glade_xml, "button_action");[m
> 	g_signal_connect (widget, "clicked", G_CALLBACK (gpk_client_run_button_action_cb), NULL);[m
>[1mdiff --git a/src/gpk-client-signature.c b/src/gpk-client-signature.c[m
>[1mindex 3ec6a76..937dd15 100644[m
>[1m--- a/src/gpk-client-signature.c[m
>[1m+++ b/src/gpk-client-signature.c[m
>[36m@@ -76,6 +76,7 @@ gpk_client_signature_show (const gchar *package_id, const gchar *repository_name[m
> 	widget = glade_xml_get_widget (glade_xml, "window_gpg");[m
> 	g_signal_connect_swapped (widget, "delete_event", G_CALLBACK (gtk_main_quit), NULL);[m
> 	widget = glade_xml_get_widget (glade_xml, "button_no");[m
>[32m+[m	[32mgpk_button_activate_on_escape (GTK_BUTTON (widget));[m
> 	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (gtk_main_quit), NULL);[m
> [m
> 	/* set icon name */[m
>[1mdiff --git a/src/gpk-client-untrusted.c b/src/gpk-client-untrusted.c[m
>[1mindex af2d6f6..c75fb0c 100644[m
>[1m--- a/src/gpk-client-untrusted.c[m
>[1m+++ b/src/gpk-client-untrusted.c[m
>[36m@@ -77,6 +77,7 @@ gpk_client_untrusted_show (PkErrorCodeEnum code)[m
> [m
> 	/* close button */[m
> 	widget = glade_xml_get_widget (glade_xml, "button_close");[m
>[32m+[m	[32mgpk_button_activate_on_escape (GTK_BUTTON (widget));[m
> 	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (gtk_main_quit), NULL);[m
> [m
> 	/* title */[m
>[1mdiff --git a/src/gpk-common.c b/src/gpk-common.c[m
>[1mindex d81c9e3..4c1bbca 100644[m
>[1m--- a/src/gpk-common.c[m
>[1m+++ b/src/gpk-common.c[m
>[36m@@ -31,6 +31,7 @@[m
> #include <dbus/dbus-glib.h>[m
> #include <polkit-gnome/polkit-gnome.h>[m
> #include <packagekit-glib/packagekit.h>[m
>[32m+[m[32m#include <gdk/gdkkeysyms.h>[m
> [m
> #include "egg-debug.h"[m
> #include "egg-string.h"[m
>[36m@@ -41,6 +42,53 @@[m
> #include "gpk-error.h"[m
> [m
> /**[m
>[32m+[m[32m * gpk_button_activate_on_escape:[m
>[32m+[m[32m **/[m
>[32m+[m[32mvoid[m
>[32m+[m[32mgpk_button_activate_on_escape (GtkButton *button)[m
>[32m+[m[32m{[m
>[32m+[m	[32mGtkAccelGroup		*accel_group;[m
>[32m+[m	[32mGtkWidget		*toplevel;[m
>[32m+[m	[32mGSList			*slist;[m
>[32m+[m	[32mGtkAccelGroupEntry	*entry_array;[m
>[32m+[m	[32mguint			 n_entries;[m
>[32m+[m	[32mguint			 i;[m
>[32m+[m
>[32m+[m	[32mg_return_if_fail (GTK_IS_BUTTON (button));[m
>[32m+[m
>[32m+[m	[32mtoplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));[m
>[32m+[m	[32mg_return_if_fail (GTK_WIDGET_TOPLEVEL (toplevel));[m
>[32m+[m
>[32m+[m	[32mslist = gtk_accel_groups_from_object (G_OBJECT (toplevel));[m
>[32m+[m	[32mif (slist)[m
>[32m+[m		[32maccel_group = slist->data;[m
>[32m+[m	[32melse[m
>[32m+[m		[32maccel_group = NULL;[m
>[32m+[m
>[32m+[m	[32mfor (; slist; slist = slist->next) {[m
>[32m+[m		[32mentry_array = gtk_accel_group_query (slist->data,[m
>[32m+[m						[32m     GDK_Escape, 0,[m
>[32m+[m						[32m     &n_entries);[m
>[32m+[m		[32m/* if Escape is already in use we disconnect it */[m
>[32m+[m		[32mfor (i = 0; i < n_entries; ++i) {[m
>[32m+[m			[32mgtk_accel_group_disconnect (slist->data,[m
>[32m+[m						[32m    entry_array[i].closure);[m
>[32m+[m		[32m}[m
>[32m+[m	[32m}[m
>[32m+[m
>[32m+[m	[32mif (accel_group) {[m
>[32m+[m		[32m/* use an existing accel group */[m
>[32m+[m		[32mgtk_widget_add_accelerator (GTK_WIDGET (button), "activate",[m
>[32m+[m					[32m    accel_group, GDK_Escape, 0, 0);[m
>[32m+[m	[32m} else {[m
>[32m+[m		[32maccel_group = gtk_accel_group_new ();[m
>[32m+[m		[32mgtk_widget_add_accelerator (GTK_WIDGET (button), "activate",[m
>[32m+[m					[32m    accel_group, GDK_Escape, 0, 0);[m
>[32m+[m		[32mgtk_window_add_accel_group (GTK_WINDOW (toplevel), accel_group);[m
>[32m+[m	[32m}[m
>[32m+[m[32m}[m
>[32m+[m
>[32m+[m[32m/**[m
>  * gpk_window_set_size_request:[m
>  **/[m
> gboolean[m
>[1mdiff --git a/src/gpk-common.h b/src/gpk-common.h[m
>[1mindex 713d347..f33d233 100644[m
>[1m--- a/src/gpk-common.h[m
>[1m+++ b/src/gpk-common.h[m
>[36m@@ -94,6 +94,7 @@ GtkEntryCompletion	*gpk_package_entry_completion_new	(void);[m
> gboolean	 gpk_window_set_size_request		(GtkWindow	*window,[m
> 							 guint		 width,[m
> 							 guint		 height);[m
>[32m+[m[32mvoid		 gpk_button_activate_on_escape		(GtkButton	*button);[m
> [m
> G_END_DECLS[m
> [m
>[1mdiff --git a/src/gpk-error.c b/src/gpk-error.c[m
>[1mindex 8f33c90..dd3d941 100644[m
>[1m--- a/src/gpk-error.c[m
>[1m+++ b/src/gpk-error.c[m
>[36m@@ -69,6 +69,7 @@ gpk_error_dialog_modal_with_time (GtkWindow *window, const gchar *title, const g[m
> [m
> 	/* close button */[m
> 	widget = glade_xml_get_widget (glade_xml, "button_close");[m
>[32m+[m	[32mgpk_button_activate_on_escape (GTK_BUTTON (widget));[m
> 	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (gtk_main_quit), NULL);[m
> [m
> 	/* title */[m
>[1mdiff --git a/src/gpk-log.c b/src/gpk-log.c[m
>[1mindex 6623267..79ff5d4 100644[m
>[1m--- a/src/gpk-log.c[m
>[1m+++ b/src/gpk-log.c[m
>[36m@@ -651,6 +651,7 @@ main (int argc, char *argv[])[m
> 	g_signal_connect_swapped (widget, "delete_event", G_CALLBACK (gtk_main_quit), NULL);[m
> [m
> 	widget = glade_xml_get_widget (glade_xml, "button_close");[m
>[32m+[m	[32mgpk_button_activate_on_escape (GTK_BUTTON (widget));[m
> 	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (gtk_main_quit), NULL);[m
> 	gtk_widget_grab_default (widget);[m
> [m
>[1mdiff --git a/src/gpk-prefs.c b/src/gpk-prefs.c[m
>[1mindex 17db46e..d0afa60 100644[m
>[1m--- a/src/gpk-prefs.c[m
>[1m+++ b/src/gpk-prefs.c[m
>[36m@@ -336,21 +336,6 @@ gpk_prefs_activated_cb (EggUnique *egg_unique, gpointer data)[m
> }[m
> [m
> /**[m
>[31m- * gpk_prefs_key_event_cb[m
>[31m- **/[m
>[31m-static gboolean[m
>[31m-gpk_prefs_key_event_cb (GtkWidget *widget, GdkEventKey *event, gpointer data)[m
>[31m-{[m
>[31m-	if (event->keyval == GDK_Escape) {[m
>[31m-		/* user pressed escape key, close the window */[m
>[31m-		gtk_main_quit ();[m
>[31m-		return TRUE;[m
>[31m-	}[m
>[31m-	/* returns FALSE to propagate event further */[m
>[31m-	return FALSE;[m
>[31m-}[m
>[31m-[m
>[31m-/**[m
>  * main:[m
>  **/[m
> int[m
>[36m@@ -415,8 +400,6 @@ main (int argc, char *argv[])[m
> [m
> 	glade_xml = glade_xml_new (GPK_DATA "/gpk-prefs.glade", NULL, NULL);[m
> 	main_window = glade_xml_get_widget (glade_xml, "window_prefs");[m
>[31m-	g_signal_connect (main_window, "key_press_event",[m
>[31m-			  G_CALLBACK (gpk_prefs_key_event_cb), NULL);[m
> [m
> 	/* Hide window first so that the dialogue resizes itself without redrawing */[m
> 	gtk_widget_hide (main_window);[m
>[36m@@ -432,6 +415,7 @@ main (int argc, char *argv[])[m
> 	pk_prefs_notify_checkbutton_setup (widget, GPK_CONF_NOTIFY_COMPLETED);[m
> [m
> 	widget = glade_xml_get_widget (glade_xml, "button_close");[m
>[32m+[m	[32mgpk_button_activate_on_escape (GTK_BUTTON (widget));[m
> 	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (gtk_main_quit), NULL);[m
> 	widget = glade_xml_get_widget (glade_xml, "button_help");[m
> 	g_signal_connect (widget, "clicked",[m
>[1mdiff --git a/src/gpk-repo.c b/src/gpk-repo.c[m
>[1mindex c85ae1d..572e46c 100644[m
>[1m--- a/src/gpk-repo.c[m
>[1m+++ b/src/gpk-repo.c[m
>[36m@@ -402,6 +402,7 @@ main (int argc, char *argv[])[m
> 	g_signal_connect_swapped (main_window, "delete_event", G_CALLBACK (gtk_main_quit), NULL);[m
> [m
> 	widget = glade_xml_get_widget (glade_xml, "button_close");[m
>[32m+[m	[32mgpk_button_activate_on_escape (GTK_BUTTON (widget));[m
> 	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (gtk_main_quit), NULL);[m
> 	widget = glade_xml_get_widget (glade_xml, "button_help");[m
> 	g_signal_connect (widget, "clicked",[m
>[1mdiff --git a/src/gpk-service-pack.c b/src/gpk-service-pack.c[m
>[1mindex c85abc1..305fefc 100644[m
>[1m--- a/src/gpk-service-pack.c[m
>[1m+++ b/src/gpk-service-pack.c[m
>[36m@@ -617,6 +617,7 @@ main (int argc, char *argv[])[m
> 	g_signal_connect (widget, "clicked", G_CALLBACK (gpk_pack_radio_copy_cb), NULL);[m
> [m
> 	widget = glade_xml_get_widget (glade_xml, "button_close");[m
>[32m+[m	[32mgpk_button_activate_on_escape (GTK_BUTTON (widget));[m
> 	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (gtk_main_quit), NULL);[m
> 	widget = glade_xml_get_widget (glade_xml, "button_create");[m
> 	g_signal_connect (widget, "clicked", G_CALLBACK (gpk_pack_button_create_cb), NULL);[m
>[1mdiff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c[m
>[1mindex c759b2f..3c875fb 100644[m
>[1m--- a/src/gpk-update-viewer.c[m
>[1m+++ b/src/gpk-update-viewer.c[m
>[36m@@ -126,7 +126,7 @@ pk_button_help_cb (GtkWidget *widget, gpointer data)[m
> static void[m
> gpk_update_viewer_set_page (PkPageEnum page)[m
> {[m
>[31m-	GtkWidget *widget;[m
>[32m+[m	[32mGtkWidget *widget, *button;[m
> 	GList *list, *l;[m
> 	guint i;[m
> [m
>[36m@@ -155,13 +155,31 @@ gpk_update_viewer_set_page (PkPageEnum page)[m
> 		gtk_widget_hide (widget);[m
> 	}[m
> [m
>[32m+[m	[32mswitch (page) {[m
>[32m+[m	[32mcase PAGE_PREVIEW:[m
>[32m+[m		[32mbutton = glade_xml_get_widget (glade_xml, "button_close3");[m
>[32m+[m		[32mbreak;[m
>[32m+[m	[32mcase PAGE_DETAILS:[m
>[32m+[m		[32mbutton = glade_xml_get_widget (glade_xml, "button_close2");[m
>[32m+[m		[32mbreak;[m
>[32m+[m	[32mcase PAGE_CONFIRM:[m
>[32m+[m		[32mbutton = glade_xml_get_widget (glade_xml, "button_close4");[m
>[32m+[m		[32mbreak;[m
>[32m+[m	[32mdefault:[m
>[32m+[m		[32mg_assert_not_reached ();[m
>[32m+[m	[32m}[m
>[32m+[m
> 	widget = glade_xml_get_widget (glade_xml, "hbox_hidden");[m
> 	list = gtk_container_get_children (GTK_CONTAINER (widget));[m
> 	for (l=list, i=0; l; l=l->next, i++) {[m
>[31m-		if (i == page)[m
>[32m+[m		[32mif (i == page) {[m
>[32m+[m			[32m/* we need to do this every time since the toplevel[m
>[32m+[m			[32m   window is always the same */[m
>[32m+[m			[32mgpk_button_activate_on_escape (GTK_BUTTON (button));[m
> 			gtk_widget_show (l->data);[m
>[31m-		else[m
>[32m+[m		[32m} else {[m
> 			gtk_widget_hide (l->data);[m
>[32m+[m		[32m}[m
> 	}[m
> }[m
> [m
>[36m@@ -1943,6 +1961,8 @@ main (int argc, char *argv[])[m
> 	g_signal_connect (widget, "clicked",[m
> 			  G_CALLBACK (gpk_update_viewer_button_close_and_cancel_cb), NULL);[m
> 	widget = glade_xml_get_widget (glade_xml, "button_close3");[m
>[32m+[m	[32m/* this is the first close button shown */[m
>[32m+[m	[32mgpk_button_activate_on_escape (GTK_BUTTON (widget));[m
> 	g_signal_connect (widget, "clicked",[m
> 			  G_CALLBACK (gpk_update_viewer_button_close_and_cancel_cb), NULL);[m
> [m

Actions: View | Splinter Review

Attachments on bug 18556: 20342 | 20344

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.