X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkactiongroup.c;h=ac177e1ab3d2b6bfdf119af56b6321e03e12c735;hb=5d011386a69aa59d6eda1e3ef32005efd831c179;hp=2554dc0d08a5c35960de1fee8085216ac254ef52;hpb=c09cc89317d222e54e98d4e2e9f2792de13897ec;p=~andy%2Fgtk diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index 2554dc0d0..ac177e1ab 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -14,9 +14,7 @@ * 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. + * License along with this library. If not, see . */ /* @@ -28,19 +26,82 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#include +/** + * SECTION:gtkactiongroup + * @Short_description: A group of actions + * @Title: GtkActionGroup + * + * Actions are organised into groups. An action group is essentially a + * map from names to #GtkAction objects. + * + * All actions that would make sense to use in a particular context + * should be in a single group. Multiple action groups may be used for a + * particular user interface. In fact, it is expected that most nontrivial + * applications will make use of multiple groups. For example, in an + * application that can edit multiple documents, one group holding global + * actions (e.g. quit, about, new), and one group per document holding + * actions that act on that document (eg. save, cut/copy/paste, etc). Each + * window's menus would be constructed from a combination of two action + * groups. + * + * + * Accelerators are handled by the GTK+ accelerator map. All actions are + * assigned an accelerator path (which normally has the form + * <Actions>/group-name/action-name) + * and a shortcut is associated with this accelerator path. All menuitems + * and toolitems take on this accelerator path. The GTK+ accelerator map + * code makes sure that the correct shortcut is displayed next to the menu + * item. + * + * + * GtkActionGroup as GtkBuildable + * + * The #GtkActionGroup implementation of the #GtkBuildable interface accepts + * #GtkAction objects as <child> elements in UI definitions. + * + * Note that it is probably more common to define actions and action groups + * in the code, since they are directly related to what the code can do. + * + * The GtkActionGroup implementation of the GtkBuildable interface supports + * a custom <accelerator> element, which has attributes named key and + * modifiers and allows to specify accelerators. This is similar to the + * <accelerator> element of #GtkWidget, the main difference is that + * it doesn't allow you to specify a signal. + * + * + * A #GtkDialog UI definition fragment. + * + * + * + * About + * gtk-about + * + * + * + * + * + * ]]> + * + * + */ + +#include "config.h" +#include #include "gtkactiongroup.h" +#include "gtkbuildable.h" +#include "gtkiconfactory.h" +#include "gtkicontheme.h" #include "gtkstock.h" #include "gtktoggleaction.h" #include "gtkradioaction.h" #include "gtkaccelmap.h" #include "gtkmarshalers.h" +#include "gtkbuilderprivate.h" #include "gtkprivate.h" #include "gtkintl.h" -#include "gtkalias.h" -#define GTK_ACTION_GROUP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ACTION_GROUP, GtkActionGroupPrivate)) struct _GtkActionGroupPrivate { @@ -48,10 +109,11 @@ struct _GtkActionGroupPrivate gboolean sensitive; gboolean visible; GHashTable *actions; + GtkAccelGroup *accel_group; GtkTranslateFunc translate_func; gpointer translate_data; - GtkDestroyNotify translate_notify; + GDestroyNotify translate_notify; }; enum @@ -68,7 +130,8 @@ enum PROP_0, PROP_NAME, PROP_SENSITIVE, - PROP_VISIBLE + PROP_VISIBLE, + PROP_ACCEL_GROUP }; static void gtk_action_group_init (GtkActionGroup *self); @@ -85,6 +148,26 @@ static void gtk_action_group_get_property (GObject *object, static GtkAction *gtk_action_group_real_get_action (GtkActionGroup *self, const gchar *name); +/* GtkBuildable */ +static void gtk_action_group_buildable_init (GtkBuildableIface *iface); +static void gtk_action_group_buildable_add_child (GtkBuildable *buildable, + GtkBuilder *builder, + GObject *child, + const gchar *type); +static void gtk_action_group_buildable_set_name (GtkBuildable *buildable, + const gchar *name); +static const gchar* gtk_action_group_buildable_get_name (GtkBuildable *buildable); +static gboolean gtk_action_group_buildable_custom_tag_start (GtkBuildable *buildable, + GtkBuilder *builder, + GObject *child, + const gchar *tagname, + GMarkupParser *parser, + gpointer *data); +static void gtk_action_group_buildable_custom_tag_end (GtkBuildable *buildable, + GtkBuilder *builder, + GObject *child, + const gchar *tagname, + gpointer *user_data); GType gtk_action_group_get_type (void) @@ -93,7 +176,7 @@ gtk_action_group_get_type (void) if (!type) { - static const GTypeInfo type_info = + const GTypeInfo type_info = { sizeof (GtkActionGroupClass), NULL, /* base_init */ @@ -106,10 +189,20 @@ gtk_action_group_get_type (void) (GInstanceInitFunc) gtk_action_group_init, }; - type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkActionGroup"), + const GInterfaceInfo buildable_info = + { + (GInterfaceInitFunc) gtk_action_group_buildable_init, + NULL, + NULL + }; + + type = g_type_register_static (G_TYPE_OBJECT, I_("GtkActionGroup"), &type_info, 0); - } + g_type_add_interface_static (type, + GTK_TYPE_BUILDABLE, + &buildable_info); + } return type; } @@ -150,6 +243,13 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) P_("Whether the action group is visible."), TRUE, GTK_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_ACCEL_GROUP, + g_param_spec_object ("accel-group", + P_("Accelerator Group"), + P_("The accelerator group the actions of this group should use."), + GTK_TYPE_ACCEL_GROUP, + GTK_PARAM_READWRITE)); /** * GtkActionGroup::connect-proxy: @@ -157,7 +257,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) * @action: the action * @proxy: the proxy * - * The connect_proxy signal is emitted after connecting a proxy to + * The ::connect-proxy signal is emitted after connecting a proxy to * an action in the group. Note that the proxy may have been connected * to a different action before. * @@ -172,7 +272,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) * Since: 2.4 */ action_group_signals[CONNECT_PROXY] = - g_signal_new ("connect_proxy", + g_signal_new (I_("connect-proxy"), G_OBJECT_CLASS_TYPE (klass), 0, 0, NULL, NULL, _gtk_marshal_VOID__OBJECT_OBJECT, @@ -185,7 +285,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) * @action: the action * @proxy: the proxy * - * The disconnect_proxy signal is emitted after disconnecting a proxy + * The ::disconnect-proxy signal is emitted after disconnecting a proxy * from an action in the group. * * #GtkUIManager proxies the signal and provides global notification @@ -195,7 +295,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) * Since: 2.4 */ action_group_signals[DISCONNECT_PROXY] = - g_signal_new ("disconnect_proxy", + g_signal_new (I_("disconnect-proxy"), G_OBJECT_CLASS_TYPE (klass), 0, 0, NULL, NULL, _gtk_marshal_VOID__OBJECT_OBJECT, @@ -207,7 +307,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) * @action_group: the group * @action: the action * - * The pre_activate signal is emitted just before the @action in the + * The ::pre-activate signal is emitted just before the @action in the * @action_group is activated * * This is intended for #GtkUIManager to proxy the signal and provide global @@ -216,7 +316,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) * Since: 2.4 */ action_group_signals[PRE_ACTIVATE] = - g_signal_new ("pre_activate", + g_signal_new (I_("pre-activate"), G_OBJECT_CLASS_TYPE (klass), 0, 0, NULL, NULL, _gtk_marshal_VOID__OBJECT, @@ -228,7 +328,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) * @action_group: the group * @action: the action * - * The post_activate signal is emitted just after the @action in the + * The ::post-activate signal is emitted just after the @action in the * @action_group is activated * * This is intended for #GtkUIManager to proxy the signal and provide global @@ -237,7 +337,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) * Since: 2.4 */ action_group_signals[POST_ACTIVATE] = - g_signal_new ("post_activate", + g_signal_new (I_("post-activate"), G_OBJECT_CLASS_TYPE (klass), 0, 0, NULL, NULL, _gtk_marshal_VOID__OBJECT, @@ -251,23 +351,177 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) static void remove_action (GtkAction *action) { - g_object_set (action, "action-group", NULL, NULL); + g_object_set (action, I_("action-group"), NULL, NULL); g_object_unref (action); } static void -gtk_action_group_init (GtkActionGroup *self) +gtk_action_group_init (GtkActionGroup *action_group) +{ + GtkActionGroupPrivate *private; + + action_group->priv = G_TYPE_INSTANCE_GET_PRIVATE (action_group, + GTK_TYPE_ACTION_GROUP, + GtkActionGroupPrivate); + private = action_group->priv; + + private->name = NULL; + private->sensitive = TRUE; + private->visible = TRUE; + private->actions = g_hash_table_new_full (g_str_hash, g_str_equal, + NULL, + (GDestroyNotify) remove_action); + private->translate_func = NULL; + private->translate_data = NULL; + private->translate_notify = NULL; +} + +static void +gtk_action_group_buildable_init (GtkBuildableIface *iface) +{ + iface->add_child = gtk_action_group_buildable_add_child; + iface->set_name = gtk_action_group_buildable_set_name; + iface->get_name = gtk_action_group_buildable_get_name; + iface->custom_tag_start = gtk_action_group_buildable_custom_tag_start; + iface->custom_tag_end = gtk_action_group_buildable_custom_tag_end; +} + +static void +gtk_action_group_buildable_add_child (GtkBuildable *buildable, + GtkBuilder *builder, + GObject *child, + const gchar *type) +{ + gtk_action_group_add_action_with_accel (GTK_ACTION_GROUP (buildable), + GTK_ACTION (child), NULL); +} + +static void +gtk_action_group_buildable_set_name (GtkBuildable *buildable, + const gchar *name) { - self->private_data = GTK_ACTION_GROUP_GET_PRIVATE (self); - self->private_data->name = NULL; - self->private_data->sensitive = TRUE; - self->private_data->visible = TRUE; - self->private_data->actions = g_hash_table_new_full (g_str_hash, g_str_equal, - (GDestroyNotify) g_free, - (GDestroyNotify) remove_action); - self->private_data->translate_func = NULL; - self->private_data->translate_data = NULL; - self->private_data->translate_notify = NULL; + GtkActionGroup *self = GTK_ACTION_GROUP (buildable); + GtkActionGroupPrivate *private = self->priv; + + private->name = g_strdup (name); +} + +static const gchar * +gtk_action_group_buildable_get_name (GtkBuildable *buildable) +{ + GtkActionGroup *self = GTK_ACTION_GROUP (buildable); + GtkActionGroupPrivate *private = self->priv; + + return private->name; +} + +typedef struct { + GObject *child; + guint key; + GdkModifierType modifiers; +} AcceleratorParserData; + +static void +accelerator_start_element (GMarkupParseContext *context, + const gchar *element_name, + const gchar **names, + const gchar **values, + gpointer user_data, + GError **error) +{ + gint i; + guint key = 0; + GdkModifierType modifiers = 0; + AcceleratorParserData *parser_data = (AcceleratorParserData*)user_data; + + if (strcmp (element_name, "accelerator") != 0) + g_warning ("Unknown tag: %s", element_name); + + for (i = 0; names[i]; i++) + { + if (strcmp (names[i], "key") == 0) + key = gdk_keyval_from_name (values[i]); + else if (strcmp (names[i], "modifiers") == 0) + { + if (!_gtk_builder_flags_from_string (GDK_TYPE_MODIFIER_TYPE, + values[i], + &modifiers, + error)) + return; + } + } + + if (key == 0) + { + g_warning (" requires a key attribute"); + return; + } + parser_data->key = key; + parser_data->modifiers = modifiers; +} + +static const GMarkupParser accelerator_parser = + { + accelerator_start_element + }; + +static gboolean +gtk_action_group_buildable_custom_tag_start (GtkBuildable *buildable, + GtkBuilder *builder, + GObject *child, + const gchar *tagname, + GMarkupParser *parser, + gpointer *user_data) +{ + AcceleratorParserData *parser_data; + + if (child && strcmp (tagname, "accelerator") == 0) + { + parser_data = g_slice_new0 (AcceleratorParserData); + parser_data->child = child; + *user_data = parser_data; + *parser = accelerator_parser; + + return TRUE; + } + return FALSE; +} + +static void +gtk_action_group_buildable_custom_tag_end (GtkBuildable *buildable, + GtkBuilder *builder, + GObject *child, + const gchar *tagname, + gpointer *user_data) +{ + AcceleratorParserData *data; + + if (strcmp (tagname, "accelerator") == 0) + { + GtkActionGroup *action_group; + GtkActionGroupPrivate *private; + GtkAction *action; + gchar *accel_path; + + data = (AcceleratorParserData*)user_data; + action_group = GTK_ACTION_GROUP (buildable); + private = action_group->priv; + action = GTK_ACTION (child); + + accel_path = g_strconcat ("/", + private->name, "/", + gtk_action_get_name (action), NULL); + + if (gtk_accel_map_lookup_entry (accel_path, NULL)) + gtk_accel_map_change_entry (accel_path, data->key, data->modifiers, TRUE); + else + gtk_accel_map_add_entry (accel_path, data->key, data->modifiers); + + gtk_action_set_accel_path (action, accel_path); + + g_free (accel_path); + g_slice_free (AcceleratorParserData, data); + } } /** @@ -286,9 +540,11 @@ GtkActionGroup * gtk_action_group_new (const gchar *name) { GtkActionGroup *self; + GtkActionGroupPrivate *private; self = g_object_new (GTK_TYPE_ACTION_GROUP, NULL); - self->private_data->name = g_strdup (name); + private = self->priv; + private->name = g_strdup (name); return self; } @@ -297,20 +553,23 @@ static void gtk_action_group_finalize (GObject *object) { GtkActionGroup *self; + GtkActionGroupPrivate *private; self = GTK_ACTION_GROUP (object); + private = self->priv; + + g_free (private->name); + private->name = NULL; - g_free (self->private_data->name); - self->private_data->name = NULL; + g_hash_table_destroy (private->actions); + private->actions = NULL; - g_hash_table_destroy (self->private_data->actions); - self->private_data->actions = NULL; + g_clear_object (&private->accel_group); - if (self->private_data->translate_notify) - self->private_data->translate_notify (self->private_data->translate_data); + if (private->translate_notify) + private->translate_notify (private->translate_data); - if (parent_class->finalize) - (* parent_class->finalize) (object); + parent_class->finalize (object); } static void @@ -320,15 +579,17 @@ gtk_action_group_set_property (GObject *object, GParamSpec *pspec) { GtkActionGroup *self; + GtkActionGroupPrivate *private; gchar *tmp; self = GTK_ACTION_GROUP (object); + private = self->priv; switch (prop_id) { case PROP_NAME: - tmp = self->private_data->name; - self->private_data->name = g_value_dup_string (value); + tmp = private->name; + private->name = g_value_dup_string (value); g_free (tmp); break; case PROP_SENSITIVE: @@ -337,6 +598,9 @@ gtk_action_group_set_property (GObject *object, case PROP_VISIBLE: gtk_action_group_set_visible (self, g_value_get_boolean (value)); break; + case PROP_ACCEL_GROUP: + gtk_action_group_set_accel_group (self, g_value_get_object (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -350,19 +614,24 @@ gtk_action_group_get_property (GObject *object, GParamSpec *pspec) { GtkActionGroup *self; + GtkActionGroupPrivate *private; self = GTK_ACTION_GROUP (object); + private = self->priv; switch (prop_id) { case PROP_NAME: - g_value_set_string (value, self->private_data->name); + g_value_set_string (value, private->name); break; case PROP_SENSITIVE: - g_value_set_boolean (value, self->private_data->sensitive); + g_value_set_boolean (value, private->sensitive); break; case PROP_VISIBLE: - g_value_set_boolean (value, self->private_data->visible); + g_value_set_boolean (value, private->visible); + break; + case PROP_ACCEL_GROUP: + g_value_set_object (value, private->accel_group); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -374,7 +643,11 @@ static GtkAction * gtk_action_group_real_get_action (GtkActionGroup *self, const gchar *action_name) { - return g_hash_table_lookup (self->private_data->actions, action_name); + GtkActionGroupPrivate *private; + + private = self->priv; + + return g_hash_table_lookup (private->actions, action_name); } /** @@ -387,12 +660,16 @@ gtk_action_group_real_get_action (GtkActionGroup *self, * * Since: 2.4 */ -G_CONST_RETURN gchar * +const gchar * gtk_action_group_get_name (GtkActionGroup *action_group) { + GtkActionGroupPrivate *private; + g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), NULL); - return action_group->private_data->name; + private = action_group->priv; + + return private->name; } /** @@ -411,18 +688,23 @@ gtk_action_group_get_name (GtkActionGroup *action_group) gboolean gtk_action_group_get_sensitive (GtkActionGroup *action_group) { + GtkActionGroupPrivate *private; + g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), FALSE); - return action_group->private_data->sensitive; + private = action_group->priv; + + return private->sensitive; } static void -cb_set_action_sensitivity (const gchar *name, GtkAction *action) +cb_set_action_sensitivity (const gchar *name, + GtkAction *action) { - /* Minor optimization, the action_groups state only affects actions that are - * themselves sensitive */ - if (gtk_action_get_sensitive (action)) - g_object_notify (G_OBJECT (action), "sensitive"); + /* Minor optimization, the action_groups state only affects actions + * that are themselves sensitive */ + g_object_notify (G_OBJECT (action), "sensitive"); + } /** @@ -435,15 +717,23 @@ cb_set_action_sensitivity (const gchar *name, GtkAction *action) * Since: 2.4 */ void -gtk_action_group_set_sensitive (GtkActionGroup *action_group, gboolean sensitive) +gtk_action_group_set_sensitive (GtkActionGroup *action_group, + gboolean sensitive) { + GtkActionGroupPrivate *private; + g_return_if_fail (GTK_IS_ACTION_GROUP (action_group)); - if (action_group->private_data->sensitive ^ sensitive) + private = action_group->priv; + sensitive = sensitive != FALSE; + + if (private->sensitive != sensitive) { - action_group->private_data->sensitive = sensitive; - g_hash_table_foreach (action_group->private_data->actions, + private->sensitive = sensitive; + g_hash_table_foreach (private->actions, (GHFunc) cb_set_action_sensitivity, NULL); + + g_object_notify (G_OBJECT (action_group), "sensitive"); } } @@ -463,18 +753,41 @@ gtk_action_group_set_sensitive (GtkActionGroup *action_group, gboolean sensitive gboolean gtk_action_group_get_visible (GtkActionGroup *action_group) { + GtkActionGroupPrivate *private; + g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), FALSE); - return action_group->private_data->visible; + private = action_group->priv; + + return private->visible; +} + +/** + * gtk_action_group_get_accel_group: + * @action_group: a #GtkActionGroup + * + * Gets the accelerator group. + * + * Returns: (transfer none): the accelerator group associated with this action + * group or %NULL if there is none. + * + * Since: 3.6 + */ +GtkAccelGroup * +gtk_action_group_get_accel_group (GtkActionGroup *action_group) +{ + g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), FALSE); + + return action_group->priv->accel_group; } static void -cb_set_action_visiblity (const gchar *name, GtkAction *action) +cb_set_action_visiblity (const gchar *name, + GtkAction *action) { - /* Minor optimization, the action_groups state only affects actions that are - * themselves sensitive */ - if (gtk_action_get_visible (action)) - g_object_notify (G_OBJECT (action), "visible"); + /* Minor optimization, the action_groups state only affects actions + * that are themselves visible */ + g_object_notify (G_OBJECT (action), "visible"); } /** @@ -487,18 +800,67 @@ cb_set_action_visiblity (const gchar *name, GtkAction *action) * Since: 2.4 */ void -gtk_action_group_set_visible (GtkActionGroup *action_group, gboolean visible) +gtk_action_group_set_visible (GtkActionGroup *action_group, + gboolean visible) { + GtkActionGroupPrivate *private; + g_return_if_fail (GTK_IS_ACTION_GROUP (action_group)); - if (action_group->private_data->visible ^ visible) + private = action_group->priv; + visible = visible != FALSE; + + if (private->visible != visible) { - action_group->private_data->visible = visible; - g_hash_table_foreach (action_group->private_data->actions, + private->visible = visible; + g_hash_table_foreach (private->actions, (GHFunc) cb_set_action_visiblity, NULL); + + g_object_notify (G_OBJECT (action_group), "visible"); } } +static void +gtk_action_group_accel_group_foreach (gpointer key, gpointer val, gpointer data) +{ + gtk_action_set_accel_group (val, data); +} + +/** + * gtk_action_group_set_accel_group: + * @action_group: a #GtkActionGroup + * @accel_group: (allow-none): a #GtkAccelGroup to set or %NULL + * + * Sets the accelerator group to be used by every action in this group. + * + * Since: 3.6 + */ +void +gtk_action_group_set_accel_group (GtkActionGroup *action_group, + GtkAccelGroup *accel_group) +{ + GtkActionGroupPrivate *private; + + g_return_if_fail (GTK_IS_ACTION_GROUP (action_group)); + + private = action_group->priv; + + if (private->accel_group == accel_group) + return; + + g_clear_object (&private->accel_group); + + if (accel_group) + private->accel_group = g_object_ref (accel_group); + + /* Set the new accel group on every action */ + g_hash_table_foreach (private->actions, + gtk_action_group_accel_group_foreach, + accel_group); + + g_object_notify (G_OBJECT (action_group), "accel-group"); +} + /** * gtk_action_group_get_action: * @action_group: the action group @@ -506,7 +868,7 @@ gtk_action_group_set_visible (GtkActionGroup *action_group, gboolean visible) * * Looks up an action in the action group by name. * - * Returns: the action, or %NULL if no action by that name exists + * Returns: (transfer none): the action, or %NULL if no action by that name exists * * Since: 2.4 */ @@ -517,8 +879,27 @@ gtk_action_group_get_action (GtkActionGroup *action_group, g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), NULL); g_return_val_if_fail (GTK_ACTION_GROUP_GET_CLASS (action_group)->get_action != NULL, NULL); - return (* GTK_ACTION_GROUP_GET_CLASS (action_group)->get_action) - (action_group, action_name); + return GTK_ACTION_GROUP_GET_CLASS (action_group)->get_action (action_group, + action_name); +} + +static gboolean +check_unique_action (GtkActionGroup *action_group, + const gchar *action_name) +{ + if (gtk_action_group_get_action (action_group, action_name) != NULL) + { + GtkActionGroupPrivate *private; + + private = action_group->priv; + + g_warning ("Refusing to add non-unique action '%s' to action group '%s'", + action_name, + private->name); + return FALSE; + } + + return TRUE; } /** @@ -539,23 +920,36 @@ void gtk_action_group_add_action (GtkActionGroup *action_group, GtkAction *action) { + GtkActionGroupPrivate *private; + const gchar *name; + g_return_if_fail (GTK_IS_ACTION_GROUP (action_group)); g_return_if_fail (GTK_IS_ACTION (action)); - g_return_if_fail (gtk_action_get_name (action) != NULL); - g_hash_table_insert (action_group->private_data->actions, - g_strdup (gtk_action_get_name (action)), + name = gtk_action_get_name (action); + g_return_if_fail (name != NULL); + + if (!check_unique_action (action_group, name)) + return; + + private = action_group->priv; + + g_hash_table_insert (private->actions, + (gpointer) name, g_object_ref (action)); - g_object_set (action, "action-group", action_group, NULL); + g_object_set (action, I_("action-group"), action_group, NULL); + + if (private->accel_group) + gtk_action_set_accel_group (action, private->accel_group); } /** * gtk_action_group_add_action_with_accel: - * @action_group: the action group - * @action: the action to add - * @accelerator: the accelerator for the action, in - * the format understood by gtk_accelerator_parse(), or "" for no accelerator, or - * %NULL to use the stock accelerator + * @action_group: the action group + * @action: the action to add + * @accelerator: (allow-none): the accelerator for the action, in + * the format understood by gtk_accelerator_parse(), or "" for no accelerator, or + * %NULL to use the stock accelerator * * Adds an action object to the action group and sets up the accelerator. * @@ -569,20 +963,22 @@ gtk_action_group_add_action (GtkActionGroup *action_group, */ void gtk_action_group_add_action_with_accel (GtkActionGroup *action_group, - GtkAction *action, - const gchar *accelerator) + GtkAction *action, + const gchar *accelerator) { + GtkActionGroupPrivate *private; gchar *accel_path; guint accel_key = 0; GdkModifierType accel_mods; - GtkStockItem stock_item; - gchar *name; - gchar *stock_id; - - g_object_get (action, "name", &name, "stock-id", &stock_id, NULL); + const gchar *name; + + name = gtk_action_get_name (action); + if (!check_unique_action (action_group, name)) + return; + private = action_group->priv; accel_path = g_strconcat ("/", - action_group->private_data->name, "/", name, NULL); + private->name, "/", name, NULL); if (accelerator) { @@ -596,10 +992,20 @@ gtk_action_group_add_action_with_accel (GtkActionGroup *action_group, accelerator, name); } } - else if (stock_id && gtk_stock_lookup (stock_id, &stock_item)) + else { - accel_key = stock_item.keyval; - accel_mods = stock_item.modifier; + gchar *stock_id; + GtkStockItem stock_item; + + g_object_get (action, "stock-id", &stock_id, NULL); + + if (stock_id && gtk_stock_lookup (stock_id, &stock_item)) + { + accel_key = stock_item.keyval; + accel_mods = stock_item.modifier; + } + + g_free (stock_id); } if (accel_key) @@ -609,8 +1015,6 @@ gtk_action_group_add_action_with_accel (GtkActionGroup *action_group, gtk_action_group_add_action (action_group, action); g_free (accel_path); - g_free (stock_id); - g_free (name); } /** @@ -626,14 +1030,18 @@ void gtk_action_group_remove_action (GtkActionGroup *action_group, GtkAction *action) { + GtkActionGroupPrivate *private; + const gchar *name; + g_return_if_fail (GTK_IS_ACTION_GROUP (action_group)); g_return_if_fail (GTK_IS_ACTION (action)); - g_return_if_fail (gtk_action_get_name (action) != NULL); - /* extra protection to make sure action->name is valid */ - g_object_ref (action); - g_hash_table_remove (action_group->private_data->actions, gtk_action_get_name (action)); - g_object_unref (action); + name = gtk_action_get_name (action); + g_return_if_fail (name != NULL); + + private = action_group->priv; + + g_hash_table_remove (private->actions, name); } static void @@ -652,26 +1060,30 @@ add_single_action (gpointer key, * * Lists the actions in the action group. * - * Returns: an allocated list of the action objects in the action group - * + * Returns: (element-type GtkAction) (transfer container): an allocated list of the action objects in the action group + * * Since: 2.4 */ GList * gtk_action_group_list_actions (GtkActionGroup *action_group) { + GtkActionGroupPrivate *private; GList *actions = NULL; + g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), NULL); + + private = action_group->priv; - g_hash_table_foreach (action_group->private_data->actions, add_single_action, &actions); + g_hash_table_foreach (private->actions, add_single_action, &actions); return g_list_reverse (actions); } /** - * gtk_action_group_add_actions: + * gtk_action_group_add_actions: (skip) * @action_group: the action group - * @entries: an array of action descriptions + * @entries: (array length=n_entries): an array of action descriptions * @n_entries: the number of entries * @user_data: data to pass to the action callbacks * @@ -711,18 +1123,18 @@ shared_data_unref (gpointer data) shared_data->ref_count--; if (shared_data->ref_count == 0) { - if (shared_data->destroy) - (*shared_data->destroy) (shared_data->data); - - g_free (shared_data); + if (shared_data->destroy) + shared_data->destroy (shared_data->data); + + g_slice_free (SharedData, shared_data); } } /** - * gtk_action_group_add_actions_full: + * gtk_action_group_add_actions_full: (skip) * @action_group: the action group - * @entries: an array of action descriptions + * @entries: (array length=n_entries): an array of action descriptions * @n_entries: the number of entries * @user_data: data to pass to the action callbacks * @destroy: destroy notification callback for @user_data @@ -748,7 +1160,7 @@ gtk_action_group_add_actions_full (GtkActionGroup *action_group, g_return_if_fail (GTK_IS_ACTION_GROUP (action_group)); - shared_data = g_new0 (SharedData, 1); + shared_data = g_slice_new0 (SharedData); shared_data->ref_count = 1; shared_data->data = user_data; shared_data->destroy = destroy; @@ -759,14 +1171,25 @@ gtk_action_group_add_actions_full (GtkActionGroup *action_group, const gchar *label; const gchar *tooltip; + if (!check_unique_action (action_group, entries[i].name)) + continue; + label = gtk_action_group_translate_string (action_group, entries[i].label); tooltip = gtk_action_group_translate_string (action_group, entries[i].tooltip); action = gtk_action_new (entries[i].name, label, tooltip, - entries[i].stock_id); + NULL); + if (entries[i].stock_id) + { + g_object_set (action, "stock-id", entries[i].stock_id, NULL); + if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), + entries[i].stock_id)) + g_object_set (action, "icon-name", entries[i].stock_id, NULL); + } + if (entries[i].callback) { GClosure *closure; @@ -789,9 +1212,9 @@ gtk_action_group_add_actions_full (GtkActionGroup *action_group, } /** - * gtk_action_group_add_toggle_actions: + * gtk_action_group_add_toggle_actions: (skip) * @action_group: the action group - * @entries: an array of toggle action descriptions + * @entries: (array length=n_entries): an array of toggle action descriptions * @n_entries: the number of entries * @user_data: data to pass to the action callbacks * @@ -817,9 +1240,9 @@ gtk_action_group_add_toggle_actions (GtkActionGroup *action_group, /** - * gtk_action_group_add_toggle_actions_full: + * gtk_action_group_add_toggle_actions_full: (skip) * @action_group: the action group - * @entries: an array of toggle action descriptions + * @entries: (array length=n_entries): an array of toggle action descriptions * @n_entries: the number of entries * @user_data: data to pass to the action callbacks * @destroy: destroy notification callback for @user_data @@ -844,7 +1267,7 @@ gtk_action_group_add_toggle_actions_full (GtkActionGroup *action_gro g_return_if_fail (GTK_IS_ACTION_GROUP (action_group)); - shared_data = g_new0 (SharedData, 1); + shared_data = g_slice_new0 (SharedData); shared_data->ref_count = 1; shared_data->data = user_data; shared_data->destroy = destroy; @@ -855,13 +1278,24 @@ gtk_action_group_add_toggle_actions_full (GtkActionGroup *action_gro const gchar *label; const gchar *tooltip; + if (!check_unique_action (action_group, entries[i].name)) + continue; + label = gtk_action_group_translate_string (action_group, entries[i].label); tooltip = gtk_action_group_translate_string (action_group, entries[i].tooltip); action = gtk_toggle_action_new (entries[i].name, label, tooltip, - entries[i].stock_id); + NULL); + + if (entries[i].stock_id) + { + if (gtk_icon_factory_lookup_default (entries[i].stock_id)) + g_object_set (action, "stock-id", entries[i].stock_id, NULL); + else + g_object_set (action, "icon-name", entries[i].stock_id, NULL); + } gtk_toggle_action_set_active (action, entries[i].is_active); @@ -883,13 +1317,13 @@ gtk_action_group_add_toggle_actions_full (GtkActionGroup *action_gro g_object_unref (action); } - shared_data_unref (shared_data); + shared_data_unref (shared_data); } /** - * gtk_action_group_add_radio_actions: + * gtk_action_group_add_radio_actions: (skip) * @action_group: the action group - * @entries: an array of radio action descriptions + * @entries: (array length=n_entries): an array of radio action descriptions * @n_entries: the number of entries * @value: the value of the action to activate initially, or -1 if * no action should be activated @@ -920,9 +1354,9 @@ gtk_action_group_add_radio_actions (GtkActionGroup *action_group, } /** - * gtk_action_group_add_radio_actions_full: + * gtk_action_group_add_radio_actions_full: (skip) * @action_group: the action group - * @entries: an array of radio action descriptions + * @entries: (array length=n_entries): an array of radio action descriptions * @n_entries: the number of entries * @value: the value of the action to activate initially, or -1 if * no action should be activated @@ -959,15 +1393,26 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup *action_group const gchar *label; const gchar *tooltip; + if (!check_unique_action (action_group, entries[i].name)) + continue; + label = gtk_action_group_translate_string (action_group, entries[i].label); tooltip = gtk_action_group_translate_string (action_group, entries[i].tooltip); action = gtk_radio_action_new (entries[i].name, label, tooltip, - entries[i].stock_id, + NULL, entries[i].value); + if (entries[i].stock_id) + { + if (gtk_icon_factory_lookup_default (entries[i].stock_id)) + g_object_set (action, "stock-id", entries[i].stock_id, NULL); + else + g_object_set (action, "icon-name", entries[i].stock_id, NULL); + } + if (i == 0) first_action = action; @@ -994,11 +1439,11 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup *action_group * @action_group: a #GtkActionGroup * @func: a #GtkTranslateFunc * @data: data to be passed to @func and @notify - * @notify: a #GtkDestroyNotify function to be called when @action_group is + * @notify: a #GDestroyNotify function to be called when @action_group is * destroyed and when the translation function is changed again - * + * * Sets a function to be used for translating the @label and @tooltip of - * #GtkActionGroupEntrys added by gtk_action_group_add_actions(). + * #GtkActionEntrys added by gtk_action_group_add_actions(). * * If you're using gettext(), it is enough to set the translation domain * with gtk_action_group_set_translation_domain(). @@ -1006,34 +1451,43 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup *action_group * Since: 2.4 **/ void -gtk_action_group_set_translate_func (GtkActionGroup *action_group, - GtkTranslateFunc func, - gpointer data, - GtkDestroyNotify notify) +gtk_action_group_set_translate_func (GtkActionGroup *action_group, + GtkTranslateFunc func, + gpointer data, + GDestroyNotify notify) { + GtkActionGroupPrivate *private; + g_return_if_fail (GTK_IS_ACTION_GROUP (action_group)); - if (action_group->private_data->translate_notify) - action_group->private_data->translate_notify (action_group->private_data->translate_data); + private = action_group->priv; + + if (private->translate_notify) + private->translate_notify (private->translate_data); - action_group->private_data->translate_func = func; - action_group->private_data->translate_data = data; - action_group->private_data->translate_notify = notify; + private->translate_func = func; + private->translate_data = data; + private->translate_notify = notify; } static gchar * dgettext_swapped (const gchar *msgid, const gchar *domainname) { - return dgettext (domainname, msgid); + /* Pass through g_dgettext if and only if msgid is nonempty. */ + if (msgid && *msgid) + return (gchar*) g_dgettext (domainname, msgid); + else + return (gchar*) msgid; } /** * gtk_action_group_set_translation_domain: * @action_group: a #GtkActionGroup - * @domain: the translation domain to use for dgettext() calls + * @domain: (allow-none): the translation domain to use for g_dgettext() + * calls, or %NULL to use the domain set with textdomain() * - * Sets the translation domain and uses dgettext() for translating the + * Sets the translation domain and uses g_dgettext() for translating the * @label and @tooltip of #GtkActionEntrys added by * gtk_action_group_add_actions(). * @@ -1060,17 +1514,19 @@ gtk_action_group_set_translation_domain (GtkActionGroup *action_group, * @action_group: a #GtkActionGroup * @string: a string * - * Translates a string using the specified translate_func(). This + * Translates a string using the function set with + * gtk_action_group_set_translate_func(). This * is mainly intended for language bindings. * * Returns: the translation of @string * * Since: 2.6 **/ -G_CONST_RETURN gchar * +const gchar * gtk_action_group_translate_string (GtkActionGroup *action_group, const gchar *string) { + GtkActionGroupPrivate *private; GtkTranslateFunc translate_func; gpointer translate_data; @@ -1079,8 +1535,10 @@ gtk_action_group_translate_string (GtkActionGroup *action_group, if (string == NULL) return NULL; - translate_func = action_group->private_data->translate_func; - translate_data = action_group->private_data->translate_data; + private = action_group->priv; + + translate_func = private->translate_func; + translate_data = private->translate_data; if (translate_func) return translate_func (string, translate_data); @@ -1116,10 +1574,7 @@ _gtk_action_group_emit_pre_activate (GtkActionGroup *action_group, void _gtk_action_group_emit_post_activate (GtkActionGroup *action_group, - GtkAction *action) + GtkAction *action) { g_signal_emit (action_group, action_group_signals[POST_ACTIVATE], 0, action); } - -#define __GTK_ACTION_GROUP_C__ -#include "gtkaliasdef.c"