From 56374f1cfdbe68658a139cfad9dac8936f6ae60e Mon Sep 17 00:00:00 2001 From: Nick Dedekind Date: Tue, 30 Jul 2013 18:59:20 +0100 Subject: Added action name --- libqmenumodel/src/gtk/gtkmenutrackeritem.c | 24 ++++++++++++++++++++++++ libqmenumodel/src/gtk/gtkmenutrackeritem.h | 2 ++ 2 files changed, 26 insertions(+) (limited to 'libqmenumodel/src/gtk') diff --git a/libqmenumodel/src/gtk/gtkmenutrackeritem.c b/libqmenumodel/src/gtk/gtkmenutrackeritem.c index fb856c9..c14bbb8 100644 --- a/libqmenumodel/src/gtk/gtkmenutrackeritem.c +++ b/libqmenumodel/src/gtk/gtkmenutrackeritem.c @@ -106,6 +106,7 @@ enum { PROP_TOGGLED, PROP_ACCEL, PROP_SUBMENU_SHOWN, + PROP_ACTION_NAME, PROP_ACTION_STATE, N_PROPS }; @@ -179,6 +180,8 @@ gtk_menu_tracker_item_get_property (GObject *object, case PROP_SUBMENU_SHOWN: g_value_set_boolean (value, gtk_menu_tracker_item_get_submenu_shown (self)); break; + case PROP_ACTION_NAME: + g_value_set_string (value, gtk_menu_tracker_item_get_action_name (self)); case PROP_ACTION_STATE: g_value_set_variant (value, self->action_state); break; @@ -239,12 +242,16 @@ gtk_menu_tracker_item_class_init (GtkMenuTrackerItemClass *class) g_param_spec_string ("accel", "", "", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE); gtk_menu_tracker_item_pspecs[PROP_SUBMENU_SHOWN] = g_param_spec_boolean ("submenu-shown", "", "", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE); + gtk_menu_tracker_item_pspecs[PROP_ACTION_NAME] = + g_param_spec_boolean ("action-name", "", "", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE); gtk_menu_tracker_item_pspecs[PROP_ACTION_STATE] = g_param_spec_boolean ("action-state", "", "", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE); g_object_class_install_properties (class, N_PROPS, gtk_menu_tracker_item_pspecs); } +#include + static void gtk_menu_tracker_item_action_added (GtkActionObserver *observer, GtkActionObservable *observable, @@ -268,6 +275,7 @@ gtk_menu_tracker_item_action_added (GtkActionObserver *observer, g_variant_unref (action_target); return; } + printf("INDICATORS: activateable %p\n", action_target); self->sensitive = enabled; @@ -612,6 +620,22 @@ gtk_menu_tracker_item_get_submenu_shown (GtkMenuTrackerItem *self) return self->submenu_shown; } +/** + * gtk_menu_tracker_item_get_action_name: + * @self: A #GtkMenuTrackerItem instance + * + * Returns the action name + */ +const gchar * +gtk_menu_tracker_item_get_action_name (GtkMenuTrackerItem *self) +{ + const gchar *action_name = NULL; + + g_menu_item_get_attribute (self->item, G_MENU_ATTRIBUTE_ACTION, "&s", &action_name); + + return action_name; +} + GVariant * gtk_menu_tracker_item_get_action_state (GtkMenuTrackerItem *self) { diff --git a/libqmenumodel/src/gtk/gtkmenutrackeritem.h b/libqmenumodel/src/gtk/gtkmenutrackeritem.h index 16c4415..8b0afae 100644 --- a/libqmenumodel/src/gtk/gtkmenutrackeritem.h +++ b/libqmenumodel/src/gtk/gtkmenutrackeritem.h @@ -81,6 +81,8 @@ void gtk_menu_tracker_item_request_submenu_shown (GtkMenu gboolean gtk_menu_tracker_item_get_submenu_shown (GtkMenuTrackerItem *self); +const gchar * gtk_menu_tracker_item_get_action_name (GtkMenuTrackerItem *self); + GVariant * gtk_menu_tracker_item_get_action_state (GtkMenuTrackerItem *self); gboolean gtk_menu_tracker_item_get_attribute (GtkMenuTrackerItem *self, -- cgit v1.2.3 From 37e62467aaa50babb48a45dcba8ab3ce5f5a7ec8 Mon Sep 17 00:00:00 2001 From: Nick Dedekind Date: Tue, 30 Jul 2013 20:49:44 +0100 Subject: Added menu action updateState --- libqmenumodel/src/gtk/gtkmenutrackeritem.c | 21 +++++++++++++++++++++ libqmenumodel/src/gtk/gtkmenutrackeritem.h | 6 ++++++ 2 files changed, 27 insertions(+) (limited to 'libqmenumodel/src/gtk') diff --git a/libqmenumodel/src/gtk/gtkmenutrackeritem.c b/libqmenumodel/src/gtk/gtkmenutrackeritem.c index c14bbb8..7187921 100644 --- a/libqmenumodel/src/gtk/gtkmenutrackeritem.c +++ b/libqmenumodel/src/gtk/gtkmenutrackeritem.c @@ -685,6 +685,27 @@ gtk_menu_tracker_item_activated (GtkMenuTrackerItem *self) g_variant_unref (action_target); } +void +gtk_menu_tracker_item_update_state (GtkMenuTrackerItem *self, GVariant *value) +{ + const gchar *action_name; + + g_return_if_fail (GTK_IS_MENU_TRACKER_ITEM (self)); + + g_menu_item_get_attribute (self->item, G_MENU_ATTRIBUTE_ACTION, "&s", &action_name); + + if (self->action_namespace) + { + gchar *full_action; + + full_action = g_strjoin (".", self->action_namespace, action_name, NULL); + g_action_group_change_action_state (G_ACTION_GROUP (self->observable), full_action, g_variant_ref(value)); + g_free (full_action); + } + else + g_action_group_change_action_state (G_ACTION_GROUP (self->observable), action_name, g_variant_ref(value)); +} + typedef struct { GtkMenuTrackerItem *item; diff --git a/libqmenumodel/src/gtk/gtkmenutrackeritem.h b/libqmenumodel/src/gtk/gtkmenutrackeritem.h index 8b0afae..f38d9fe 100644 --- a/libqmenumodel/src/gtk/gtkmenutrackeritem.h +++ b/libqmenumodel/src/gtk/gtkmenutrackeritem.h @@ -76,6 +76,12 @@ gboolean gtk_menu_tracker_item_get_should_request_show (GtkMenu void gtk_menu_tracker_item_activated (GtkMenuTrackerItem *self); +void gtk_menu_tracker_item_update_state (GtkMenuTrackerItem *self, + GVariant *value); + + + + void gtk_menu_tracker_item_request_submenu_shown (GtkMenuTrackerItem *self, gboolean shown); -- cgit v1.2.3 From 27e7c3bf6ee276c5956331f292a72a5dde5869ed Mon Sep 17 00:00:00 2001 From: Nick Dedekind Date: Wed, 31 Jul 2013 12:14:53 +0100 Subject: removed debug code --- libqmenumodel/src/gtk/gtkmenutrackeritem.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'libqmenumodel/src/gtk') diff --git a/libqmenumodel/src/gtk/gtkmenutrackeritem.c b/libqmenumodel/src/gtk/gtkmenutrackeritem.c index 7187921..dbc1580 100644 --- a/libqmenumodel/src/gtk/gtkmenutrackeritem.c +++ b/libqmenumodel/src/gtk/gtkmenutrackeritem.c @@ -250,8 +250,6 @@ gtk_menu_tracker_item_class_init (GtkMenuTrackerItemClass *class) g_object_class_install_properties (class, N_PROPS, gtk_menu_tracker_item_pspecs); } -#include - static void gtk_menu_tracker_item_action_added (GtkActionObserver *observer, GtkActionObservable *observable, @@ -275,7 +273,6 @@ gtk_menu_tracker_item_action_added (GtkActionObserver *observer, g_variant_unref (action_target); return; } - printf("INDICATORS: activateable %p\n", action_target); self->sensitive = enabled; -- cgit v1.2.3