diff options
| author | Matthias Clasen <maclas@gmx.de> | 2003-09-17 23:58:28 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2003-09-17 23:58:28 +0000 |
| commit | 0ceb0db081e18718f7df81092fbc64788f22b9e3 (patch) | |
| tree | 93b8695504be9469a33c086ef35beded26b34062 /tests | |
| parent | a7ad2a46634aa17687521d055bf2f47e1c9738f8 (diff) | |
| download | gdk-pixbuf-0ceb0db081e18718f7df81092fbc64788f22b9e3.tar.gz | |
Install accelerators on actions, not on proxies, support accelerator-only
2003-09-18 Matthias Clasen <maclas@gmx.de>
Install accelerators on actions, not on proxies, support
accelerator-only actions:
* gtk/gtkmenu.c (get_accel_path): New function to get the accel path
and its lock status either via _gtk_widget_get_accel_path() or by
looking at the accel_path stored in the menu item itself and determining
its lock status by peeking into the contained accel label. This was
already (accidentally) committed a week ago.
* gtk/gtkaction.h (gtk_action_set_accel_group):
(gtk_action_[dis]connect_accelerator): New functions.
* gtk/gtkaction.c (struct _GtkActionPrivate): Add accel_group,
accel_closure and accel_count. We must have a reference to the accel_group,
since we need it in connect_proxy. The count is necessary to ensure
that the accelerator isn't removed before the last proxy requesting
it has been unmerged.
(connect_proxy): Connect the accelerator to the
action now, only set the accel_path on the menuitem.
(remove_proxy): Disconnect the accelerator from the action, not from
the menuitem.
(gtk_action_set_accel_group): Set the accel group.
(gtk_action_[dis]connect_accelerator): Count the number of times
this functions have been called and install/remove the accelerator if
the count leaves/reaches zero.
* gtk/gtkuimanager.h (GtkUIManagerItemType): Add
GTK_UI_MANAGER_ACCELERATOR.
* gtk/gtkuimanager.c (NodeType): Add NODE_TYPE_ACCELERATOR.
(start_element_handler): Create NODE_TYPE_ACCELERATOR nodes from
<accelerator> elements.
(gtk_ui_manager_add_ui): Create NODE_TYPE_ACCELERATOR nodes when
type is GTK_UI_MANAGER_ACCELERATOR.
(update_node): Set the accel group on actions before creating their
proxies. Don't set the accel group on created menus. For
NODE_TYPE_ACCELERATOR nodes, [dis]connect the actions' accelerator.
(print_node): Also emit <accelerator> elements.
* tests/testmerge.c (dump_accels): Add a "Dump Accels" button.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testmerge.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/testmerge.c b/tests/testmerge.c index 4b40f1262..c79090b20 100644 --- a/tests/testmerge.c +++ b/tests/testmerge.c @@ -1,5 +1,6 @@ #include <stdio.h> #include <string.h> +#include <unistd.h> #include <gtk/gtk.h> struct { const gchar *filename; guint merge_id; } merge_ids[] = { @@ -20,6 +21,12 @@ dump_tree (GtkWidget *button, } static void +dump_accels (void) +{ + gtk_accel_map_save_fd (STDOUT_FILENO); +} + +static void toggle_tearoffs (GtkWidget *button, GtkUIManager *merge) { @@ -538,6 +545,10 @@ main (int argc, char **argv) g_signal_connect (button, "clicked", G_CALLBACK (dump_tree), merge); gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); + button = gtk_button_new_with_label ("Dump Accels"); + g_signal_connect (button, "clicked", G_CALLBACK (dump_accels), NULL); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); + view = create_tree_view (merge); gtk_table_attach (GTK_TABLE (table), view, 1,2, 0,1, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0); |