forked from AuroraMiddleware/gtk
0ceb0db081
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.
110 lines
4.1 KiB
C
110 lines
4.1 KiB
C
/*
|
|
* GTK - The GIMP Toolkit
|
|
* Copyright (C) 1998, 1999 Red Hat, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* This Library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Library General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This Library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Library General Public
|
|
* License along with the Gnome Library; see the file COPYING.LIB. If not,
|
|
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
/*
|
|
* Author: James Henstridge <james@daa.com.au>
|
|
*
|
|
* Modified by the GTK+ Team and others 2003. See the AUTHORS
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
* files for a list of changes. These files are distributed with
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
|
*/
|
|
#ifndef __GTK_ACTION_H__
|
|
#define __GTK_ACTION_H__
|
|
|
|
#include <gtk/gtkwidget.h>
|
|
#include <glib-object.h>
|
|
|
|
#define GTK_TYPE_ACTION (gtk_action_get_type ())
|
|
#define GTK_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACTION, GtkAction))
|
|
#define GTK_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACTION, GtkActionClass))
|
|
#define GTK_IS_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACTION))
|
|
#define GTK_IS_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_ACTION))
|
|
#define GTK_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_ACTION, GtkActionClass))
|
|
|
|
typedef struct _GtkAction GtkAction;
|
|
typedef struct _GtkActionClass GtkActionClass;
|
|
typedef struct _GtkActionPrivate GtkActionPrivate;
|
|
|
|
struct _GtkAction
|
|
{
|
|
GObject object;
|
|
|
|
/*< private >*/
|
|
|
|
GtkActionPrivate *private_data;
|
|
};
|
|
|
|
struct _GtkActionClass
|
|
{
|
|
GObjectClass parent_class;
|
|
|
|
/* activation signal */
|
|
void (* activate) (GtkAction *action);
|
|
|
|
GType menu_item_type;
|
|
GType toolbar_item_type;
|
|
|
|
/* widget creation routines (not signals) */
|
|
GtkWidget *(* create_menu_item) (GtkAction *action);
|
|
GtkWidget *(* create_tool_item) (GtkAction *action);
|
|
void (* connect_proxy) (GtkAction *action,
|
|
GtkWidget *proxy);
|
|
void (* disconnect_proxy) (GtkAction *action,
|
|
GtkWidget *proxy);
|
|
|
|
/* Padding for future expansion */
|
|
void (*_gtk_reserved1) (void);
|
|
void (*_gtk_reserved2) (void);
|
|
void (*_gtk_reserved3) (void);
|
|
void (*_gtk_reserved4) (void);
|
|
};
|
|
|
|
GType gtk_action_get_type (void);
|
|
const gchar* gtk_action_get_name (GtkAction *action);
|
|
void gtk_action_activate (GtkAction *action);
|
|
GtkWidget* gtk_action_create_icon (GtkAction *action,
|
|
GtkIconSize icon_size);
|
|
GtkWidget* gtk_action_create_menu_item (GtkAction *action);
|
|
GtkWidget* gtk_action_create_tool_item (GtkAction *action);
|
|
void gtk_action_connect_proxy (GtkAction *action,
|
|
GtkWidget *proxy);
|
|
void gtk_action_disconnect_proxy (GtkAction *action,
|
|
GtkWidget *proxy);
|
|
GSList* gtk_action_get_proxies (GtkAction *action);
|
|
void gtk_action_connect_accelerator (GtkAction *action);
|
|
void gtk_action_disconnect_accelerator (GtkAction *action);
|
|
|
|
/* protected ... for use by child actions */
|
|
void gtk_action_block_activate_from (GtkAction *action,
|
|
GtkWidget *proxy);
|
|
void gtk_action_unblock_activate_from (GtkAction *action,
|
|
GtkWidget *proxy);
|
|
|
|
/* protected ... for use by action groups */
|
|
void gtk_action_set_accel_path (GtkAction *action,
|
|
const gchar *accel_path);
|
|
void gtk_action_set_accel_group (GtkAction *action,
|
|
GtkAccelGroup *accel_group);
|
|
|
|
|
|
#endif /* __GTK_ACTION_H__ */
|