#include <config.h>
#include <string.h>
+#include "gtkbuildable.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
#include "gtkmenu.h"
#include "gtkmenubar.h"
#include "gtkmenushell.h"
+#include "gtkmenutoolbutton.h"
#include "gtkseparatormenuitem.h"
#include "gtkseparatortoolitem.h"
#include "gtktearoffmenuitem.h"
GQuark action_quark;
};
-static void gtk_ui_manager_class_init (GtkUIManagerClass *class);
-static void gtk_ui_manager_init (GtkUIManager *self);
static void gtk_ui_manager_finalize (GObject *object);
static void gtk_ui_manager_set_property (GObject *object,
guint prop_id,
static void mark_node_dirty (GNode *node);
static GNode * get_child_node (GtkUIManager *self,
GNode *parent,
+ GNode *sibling,
const gchar *childname,
gint childname_length,
NodeType node_type,
static void node_remove_ui_reference (GNode *node,
guint merge_id);
+/* GtkBuildable */
+static void gtk_ui_manager_buildable_init (GtkBuildableIface *iface);
+static void gtk_ui_manager_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type);
+static GObject* gtk_ui_manager_buildable_construct_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ const gchar *name);
+static gboolean gtk_ui_manager_buildable_custom_tag_start (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *tagname,
+ GMarkupParser *parser,
+ gpointer *data);
+static void gtk_ui_manager_buildable_custom_tag_end (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *tagname,
+ gpointer *data);
+
+
enum
{
PROP_UI
};
-static GObjectClass *parent_class = NULL;
static guint ui_manager_signals[LAST_SIGNAL] = { 0 };
-static GMemChunk *merge_node_chunk = NULL;
-
-GType
-gtk_ui_manager_get_type (void)
-{
- static GtkType type = 0;
-
- if (!type)
- {
- static const GTypeInfo type_info =
- {
- sizeof (GtkUIManagerClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) gtk_ui_manager_class_init,
- (GClassFinalizeFunc) NULL,
- NULL,
-
- sizeof (GtkUIManager),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_ui_manager_init,
- };
-
- type = g_type_register_static (G_TYPE_OBJECT,
- "GtkUIManager",
- &type_info, 0);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GtkUIManager, gtk_ui_manager, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+ gtk_ui_manager_buildable_init))
static void
gtk_ui_manager_class_init (GtkUIManagerClass *klass)
{
GObjectClass *gobject_class;
- parent_class = g_type_class_peek_parent (klass);
-
gobject_class = G_OBJECT_CLASS (klass);
- if (!merge_node_chunk)
- merge_node_chunk = g_mem_chunk_create (Node, 64,
- G_ALLOC_AND_FREE);
-
gobject_class->finalize = gtk_ui_manager_finalize;
gobject_class->set_property = gtk_ui_manager_set_property;
gobject_class->get_property = gtk_ui_manager_get_property;
g_param_spec_string ("ui",
P_("Merged UI definition"),
P_("An XML string describing the merged UI"),
- NULL,
+ "<ui>\n</ui>\n",
GTK_PARAM_READABLE));
* Since: 2.4
*/
ui_manager_signals[ADD_WIDGET] =
- g_signal_new ("add_widget",
+ g_signal_new (I_("add_widget"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (GtkUIManagerClass, add_widget),
* Since: 2.4
*/
ui_manager_signals[ACTIONS_CHANGED] =
- g_signal_new ("actions_changed",
+ g_signal_new (I_("actions_changed"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (GtkUIManagerClass, actions_changed),
* Since: 2.4
*/
ui_manager_signals[CONNECT_PROXY] =
- g_signal_new ("connect_proxy",
+ g_signal_new (I_("connect_proxy"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (GtkUIManagerClass, connect_proxy),
* Since: 2.4
*/
ui_manager_signals[DISCONNECT_PROXY] =
- g_signal_new ("disconnect_proxy",
+ g_signal_new (I_("disconnect_proxy"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (GtkUIManagerClass, disconnect_proxy),
* Since: 2.4
*/
ui_manager_signals[PRE_ACTIVATE] =
- g_signal_new ("pre_activate",
+ g_signal_new (I_("pre_activate"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (GtkUIManagerClass, pre_activate),
* Since: 2.4
*/
ui_manager_signals[POST_ACTIVATE] =
- g_signal_new ("post_activate",
+ g_signal_new (I_("post_activate"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (GtkUIManagerClass, post_activate),
self->private_data->add_tearoffs = FALSE;
merge_id = gtk_ui_manager_new_merge_id (self);
- node = get_child_node (self, NULL, "ui", 2,
+ node = get_child_node (self, NULL, NULL, "ui", 2,
NODE_TYPE_ROOT, TRUE, FALSE);
node_prepend_ui_reference (node, merge_id, 0);
}
g_object_unref (self->private_data->accel_group);
self->private_data->accel_group = NULL;
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gtk_ui_manager_parent_class)->finalize (object);
+}
+
+static void
+gtk_ui_manager_buildable_init (GtkBuildableIface *iface)
+{
+ iface->add_child = gtk_ui_manager_buildable_add_child;
+ iface->construct_child = gtk_ui_manager_buildable_construct_child;
+ iface->custom_tag_start = gtk_ui_manager_buildable_custom_tag_start;
+ iface->custom_tag_end = gtk_ui_manager_buildable_custom_tag_end;
+}
+
+static void
+gtk_ui_manager_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type)
+{
+ GtkUIManager *self = GTK_UI_MANAGER (buildable);
+ guint pos;
+
+ g_return_if_fail (GTK_IS_ACTION_GROUP (child));
+
+ pos = g_list_length (self->private_data->action_groups);
+
+ g_object_ref (child);
+ gtk_ui_manager_insert_action_group (self,
+ GTK_ACTION_GROUP (child),
+ pos);
+}
+
+static void
+child_hierarchy_changed_cb (GtkWidget *widget,
+ GtkWidget *unused,
+ GtkUIManager *uimgr)
+{
+ GtkWidget *toplevel;
+ GtkAccelGroup *group;
+ GSList *groups;
+
+ toplevel = gtk_widget_get_toplevel (widget);
+ if (!toplevel || !GTK_IS_WINDOW (toplevel))
+ return;
+
+ group = gtk_ui_manager_get_accel_group (uimgr);
+ groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
+ if (g_slist_find (groups, group) == NULL)
+ gtk_window_add_accel_group (GTK_WINDOW (toplevel), group);
+
+ g_signal_handlers_disconnect_by_func (widget,
+ child_hierarchy_changed_cb,
+ uimgr);
+}
+
+static GObject *
+gtk_ui_manager_buildable_construct_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ const gchar *id)
+{
+ GtkWidget *widget;
+ char *name;
+
+ name = g_strdup_printf ("ui/%s", id);
+ widget = gtk_ui_manager_get_widget (GTK_UI_MANAGER (buildable), name);
+ if (!widget)
+ {
+ g_error ("Unknown ui manager child: %s\n", name);
+ g_free (name);
+ return NULL;
+ }
+ g_free (name);
+
+ g_signal_connect (widget, "hierarchy-changed",
+ G_CALLBACK (child_hierarchy_changed_cb),
+ GTK_UI_MANAGER (buildable));
+ return g_object_ref (widget);
}
static void
g_value_set_boolean (value, self->private_data->add_tearoffs);
break;
case PROP_UI:
- g_value_set_string (value, gtk_ui_manager_get_ui (self));
+ g_value_take_string (value, gtk_ui_manager_get_ui (self));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
GtkActionGroup *action_group,
gint pos)
{
+#ifdef G_ENABLE_DEBUG
+ GList *l;
+ const char *group_name;
+#endif
+
g_return_if_fail (GTK_IS_UI_MANAGER (self));
g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
g_return_if_fail (g_list_find (self->private_data->action_groups,
action_group) == NULL);
+#ifdef G_ENABLE_DEBUG
+ group_name = gtk_action_group_get_name (action_group);
+
+ for (l = self->private_data->action_groups; l; l = l->next)
+ {
+ GtkActionGroup *group = l->data;
+
+ if (strcmp (gtk_action_group_get_name (group), group_name) == 0)
+ {
+ g_warning ("Inserting action group '%s' into UI manager which "
+ "already has a group with this name\n", group_name);
+ break;
+ }
+ }
+#endif /* G_ENABLE_DEBUG */
+
g_object_ref (action_group);
self->private_data->action_groups =
g_list_insert (self->private_data->action_groups, action_group, pos);
return GTK_UI_MANAGER_GET_CLASS (self)->get_widget (self, path);
}
+typedef struct {
+ GtkUIManagerItemType types;
+ GSList *list;
+} ToplevelData;
+
static void
collect_toplevels (GNode *node,
gpointer user_data)
{
- struct {
- GtkUIManagerItemType types;
- GSList *list;
- } *data = user_data;
-
- switch (NODE_INFO (node)->type) {
- case NODE_TYPE_MENUBAR:
- if (data->types & GTK_UI_MANAGER_MENUBAR)
- data->list = g_slist_prepend (data->list, NODE_INFO (node)->proxy);
- break;
- case NODE_TYPE_TOOLBAR:
- if (data->types & GTK_UI_MANAGER_TOOLBAR)
- data->list = g_slist_prepend (data->list, NODE_INFO (node)->proxy);
- break;
- case NODE_TYPE_POPUP:
- if (data->types & GTK_UI_MANAGER_POPUP)
- data->list = g_slist_prepend (data->list, NODE_INFO (node)->proxy);
- break;
- default: ;
- }
+ ToplevelData *data = user_data;
+
+ if (NODE_INFO (node)->proxy)
+ {
+ switch (NODE_INFO (node)->type)
+ {
+ case NODE_TYPE_MENUBAR:
+ if (data->types & GTK_UI_MANAGER_MENUBAR)
+ data->list = g_slist_prepend (data->list, NODE_INFO (node)->proxy);
+ break;
+ case NODE_TYPE_TOOLBAR:
+ if (data->types & GTK_UI_MANAGER_TOOLBAR)
+ data->list = g_slist_prepend (data->list, NODE_INFO (node)->proxy);
+ break;
+ case NODE_TYPE_POPUP:
+ if (data->types & GTK_UI_MANAGER_POPUP)
+ data->list = g_slist_prepend (data->list, NODE_INFO (node)->proxy);
+ break;
+ default: ;
+ }
+ }
}
/**
gtk_ui_manager_get_toplevels (GtkUIManager *self,
GtkUIManagerItemType types)
{
- struct {
- GtkUIManagerItemType types;
- GSList *list;
- } data;
+ ToplevelData data;
g_return_val_if_fail (GTK_IS_UI_MANAGER (self), NULL);
g_return_val_if_fail ((~(GTK_UI_MANAGER_MENUBAR |
static GNode *
get_child_node (GtkUIManager *self,
GNode *parent,
+ GNode *sibling,
const gchar *childname,
gint childname_length,
NodeType node_type,
{
GNode *child = NULL;
- g_return_val_if_fail (parent == NULL ||
- (NODE_INFO (parent)->type != NODE_TYPE_MENUITEM &&
- NODE_INFO (parent)->type != NODE_TYPE_TOOLITEM),
- NULL);
-
if (parent)
{
if (childname)
{
Node *mnode;
- mnode = g_chunk_new0 (Node, merge_node_chunk);
+ mnode = g_slice_new0 (Node);
mnode->type = node_type;
mnode->name = g_strndup (childname, childname_length);
- if (top)
- child = g_node_prepend_data (parent, mnode);
+ if (sibling)
+ {
+ if (top)
+ child = g_node_insert_before (parent, sibling,
+ g_node_new (mnode));
+ else
+ child = g_node_insert_after (parent, sibling,
+ g_node_new (mnode));
+ }
else
- child = g_node_append_data (parent, mnode);
+ {
+ if (top)
+ child = g_node_prepend_data (parent, mnode);
+ else
+ child = g_node_append_data (parent, mnode);
+ }
mark_node_dirty (child);
}
{
Node *mnode;
- mnode = g_chunk_new0 (Node, merge_node_chunk);
+ mnode = g_slice_new0 (Node);
mnode->type = node_type;
mnode->name = g_strndup (childname, childname_length);
mnode->dirty = TRUE;
else
length = strlen (pos);
- node = get_child_node (self, parent, pos, length, NODE_TYPE_UNDECIDED,
+ node = get_child_node (self, parent, NULL, pos, length, NODE_TYPE_UNDECIDED,
create, FALSE);
if (!node)
return NULL;
return node;
}
+static void
+node_ui_reference_free (gpointer data)
+{
+ g_slice_free (NodeUIReference, data);
+}
+
static gboolean
free_node (GNode *node)
{
Node *info = NODE_INFO (node);
- g_list_foreach (info->uifiles, (GFunc) g_free, NULL);
+ g_list_foreach (info->uifiles, (GFunc) node_ui_reference_free, NULL);
g_list_free (info->uifiles);
if (info->action)
if (info->extra)
g_object_unref (info->extra);
g_free (info->name);
- g_chunk_free (info, merge_node_chunk);
+ g_slice_free (Node, info);
return FALSE;
}
reference = node->uifiles->data;
else
{
- reference = g_new (NodeUIReference, 1);
+ reference = g_slice_new (NodeUIReference);
node->uifiles = g_list_prepend (node->uifiles, reference);
}
if (p == node->uifiles)
mark_node_dirty (gnode);
node->uifiles = g_list_delete_link (node->uifiles, p);
- g_free (reference);
+ g_slice_free (NodeUIReference, reference);
break;
}
if (ctx->state == STATE_ROOT && !strcmp (element_name, "accelerator"))
{
ctx->state = STATE_ACCELERATOR;
- ctx->current = get_child_node (self, ctx->current,
+ ctx->current = get_child_node (self, ctx->current, NULL,
node_name, strlen (node_name),
NODE_TYPE_ACCELERATOR,
TRUE, FALSE);
if (ctx->state == STATE_ROOT && !strcmp (element_name, "menubar"))
{
ctx->state = STATE_MENU;
- ctx->current = get_child_node (self, ctx->current,
+ ctx->current = get_child_node (self, ctx->current, NULL,
node_name, strlen (node_name),
NODE_TYPE_MENUBAR,
TRUE, FALSE);
}
else if (ctx->state == STATE_MENU && !strcmp (element_name, "menu"))
{
- ctx->current = get_child_node (self, ctx->current,
+ ctx->current = get_child_node (self, ctx->current, NULL,
+ node_name, strlen (node_name),
+ NODE_TYPE_MENU,
+ TRUE, top);
+ if (NODE_INFO (ctx->current)->action_name == 0)
+ NODE_INFO (ctx->current)->action_name = action_quark;
+
+ node_prepend_ui_reference (ctx->current, ctx->merge_id, action_quark);
+
+ raise_error = FALSE;
+ }
+ else if (ctx->state == STATE_TOOLITEM && !strcmp (element_name, "menu"))
+ {
+ ctx->state = STATE_MENU;
+
+ ctx->current = get_child_node (self, g_node_last_child (ctx->current), NULL,
node_name, strlen (node_name),
NODE_TYPE_MENU,
TRUE, top);
GNode *node;
ctx->state = STATE_MENUITEM;
- node = get_child_node (self, ctx->current,
+ node = get_child_node (self, ctx->current, NULL,
node_name, strlen (node_name),
NODE_TYPE_MENUITEM,
TRUE, top);
if (ctx->state == STATE_ROOT && !strcmp (element_name, "popup"))
{
ctx->state = STATE_MENU;
- ctx->current = get_child_node (self, ctx->current,
+ ctx->current = get_child_node (self, ctx->current, NULL,
node_name, strlen (node_name),
NODE_TYPE_POPUP,
TRUE, FALSE);
!strcmp (element_name, "placeholder"))
{
if (ctx->state == STATE_TOOLBAR)
- ctx->current = get_child_node (self, ctx->current,
+ ctx->current = get_child_node (self, ctx->current, NULL,
node_name, strlen (node_name),
NODE_TYPE_TOOLBAR_PLACEHOLDER,
TRUE, top);
else
- ctx->current = get_child_node (self, ctx->current,
+ ctx->current = get_child_node (self, ctx->current, NULL,
node_name, strlen (node_name),
NODE_TYPE_MENU_PLACEHOLDER,
TRUE, top);
if (!strcmp (node_name, "separator"))
{
node_name = NULL;
- length = -1;
+ length = 0;
}
else
length = strlen (node_name);
- node = get_child_node (self, ctx->current,
+ node = get_child_node (self, ctx->current, NULL,
node_name, length,
NODE_TYPE_SEPARATOR,
TRUE, top);
if (ctx->state == STATE_ROOT && !strcmp (element_name, "toolbar"))
{
ctx->state = STATE_TOOLBAR;
- ctx->current = get_child_node (self, ctx->current,
+ ctx->current = get_child_node (self, ctx->current, NULL,
node_name, strlen (node_name),
NODE_TYPE_TOOLBAR,
TRUE, FALSE);
GNode *node;
ctx->state = STATE_TOOLITEM;
- node = get_child_node (self, ctx->current,
+ node = get_child_node (self, ctx->current, NULL,
node_name, strlen (node_name),
NODE_TYPE_TOOLITEM,
TRUE, top);
ctx->current = ctx->current->parent;
if (NODE_INFO (ctx->current)->type == NODE_TYPE_ROOT)
ctx->state = STATE_ROOT;
+ else if (NODE_INFO (ctx->current)->type == NODE_TYPE_TOOLITEM)
+ {
+ ctx->current = ctx->current->parent;
+ ctx->state = STATE_TOOLITEM;
+ }
/* else, stay in same state */
break;
case STATE_MENUITEM:
}
-static GMarkupParser ui_parser = {
+static const GMarkupParser ui_parser = {
start_element_handler,
end_element_handler,
text_handler,
queue_update (self);
- g_object_notify (G_OBJECT (self), "ui");
+ g_object_notify (G_OBJECT (self), "ui");
return ctx.merge_id;
* separator if such an element can be inserted at the place determined by
* @path. Otherwise @type must indicate an element that can be inserted at
* the place determined by @path.
+ *
+ * If @path points to a menuitem or toolitem, the new element will be inserted
+ * before or after this item, depending on @top.
*
* Since: 2.4
**/
gboolean top)
{
GNode *node;
+ GNode *sibling;
GNode *child;
NodeType node_type;
GQuark action_quark = 0;
g_return_if_fail (GTK_IS_UI_MANAGER (self));
g_return_if_fail (merge_id > 0);
- g_return_if_fail (name != NULL);
+ g_return_if_fail (name != NULL || type == GTK_UI_MANAGER_SEPARATOR);
node = get_node (self, path, NODE_TYPE_UNDECIDED, FALSE);
-
+ sibling = NULL;
+
if (node == NULL)
return;
node_type = NODE_TYPE_UNDECIDED;
+ reswitch:
switch (NODE_INFO (node)->type)
{
+ case NODE_TYPE_SEPARATOR:
+ case NODE_TYPE_MENUITEM:
+ case NODE_TYPE_TOOLITEM:
+ sibling = node;
+ node = node->parent;
+ goto reswitch;
case NODE_TYPE_MENUBAR:
case NODE_TYPE_MENU:
case NODE_TYPE_POPUP:
}
if (node_type == NODE_TYPE_UNDECIDED)
- return;
+ {
+ g_warning ("item type %d not suitable for adding at '%s'",
+ type, path);
+ return;
+ }
- child = get_child_node (self, node,
- name, strlen (name),
+ child = get_child_node (self, node, sibling,
+ name, name ? strlen (name) : 0,
node_type, TRUE, top);
if (action != NULL)
gtk_ui_manager_remove_ui (GtkUIManager *self,
guint merge_id)
{
+ g_return_if_fail (GTK_IS_UI_MANAGER (self));
+
g_node_traverse (self->private_data->root_node,
G_POST_ORDER, G_TRAVERSE_ALL, -1,
remove_ui, GUINT_TO_POINTER (merge_id));
gint *pos_p)
{
GtkWidget *menushell;
- gint pos;
+ gint pos = 0;
g_return_val_if_fail (node != NULL, FALSE);
g_return_val_if_fail (NODE_INFO (node)->type == NODE_TYPE_MENU ||
- NODE_INFO (node)->type == NODE_TYPE_POPUP ||
- NODE_INFO (node)->type == NODE_TYPE_MENU_PLACEHOLDER ||
- NODE_INFO (node)->type == NODE_TYPE_MENUITEM ||
- NODE_INFO (node)->type == NODE_TYPE_SEPARATOR,
- FALSE);
+ NODE_INFO (node)->type == NODE_TYPE_POPUP ||
+ NODE_INFO (node)->type == NODE_TYPE_MENU_PLACEHOLDER ||
+ NODE_INFO (node)->type == NODE_TYPE_MENUITEM ||
+ NODE_INFO (node)->type == NODE_TYPE_SEPARATOR,
+ FALSE);
/* first sibling -- look at parent */
if (node->prev == NULL)
NODE_INFO (parent)->proxy) + 1;
break;
default:
- g_warning("%s: bad parent node type %d", G_STRLOC,
- NODE_INFO (parent)->type);
+ g_warning ("%s: bad parent node type %d", G_STRLOC,
+ NODE_INFO (parent)->type);
return FALSE;
}
}
else
prev_child = NODE_INFO (sibling)->proxy;
- g_return_val_if_fail (GTK_IS_WIDGET (prev_child), FALSE);
+ if (!GTK_IS_WIDGET (prev_child))
+ return FALSE;
+
menushell = gtk_widget_get_parent (prev_child);
- g_return_val_if_fail (GTK_IS_MENU_SHELL (menushell), FALSE);
+ if (!GTK_IS_MENU_SHELL (menushell))
+ return FALSE;
pos = g_list_index (GTK_MENU_SHELL (menushell)->children, prev_child) + 1;
}
g_return_val_if_fail (node != NULL, FALSE);
g_return_val_if_fail (NODE_INFO (node)->type == NODE_TYPE_TOOLBAR ||
- NODE_INFO (node)->type == NODE_TYPE_TOOLBAR_PLACEHOLDER ||
- NODE_INFO (node)->type == NODE_TYPE_TOOLITEM ||
- NODE_INFO (node)->type == NODE_TYPE_SEPARATOR,
- FALSE);
-
+ NODE_INFO (node)->type == NODE_TYPE_TOOLBAR_PLACEHOLDER ||
+ NODE_INFO (node)->type == NODE_TYPE_TOOLITEM ||
+ NODE_INFO (node)->type == NODE_TYPE_SEPARATOR,
+ FALSE);
+
/* first sibling -- look at parent */
if (node->prev == NULL)
{
else
prev_child = NODE_INFO (sibling)->proxy;
- g_return_val_if_fail (GTK_IS_WIDGET (prev_child), FALSE);
+ if (!GTK_IS_WIDGET (prev_child))
+ return FALSE;
+
toolbar = gtk_widget_get_parent (prev_child);
- g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), FALSE);
+ if (!GTK_IS_TOOLBAR (toolbar))
+ return FALSE;
pos = gtk_toolbar_get_item_index (GTK_TOOLBAR (toolbar),
GTK_TOOL_ITEM (prev_child)) + 1;
}
-
+
if (toolbar_p)
*toolbar_p = toolbar;
if (pos_p)
_gtk_menu_is_empty (GtkWidget *menu)
{
GList *children, *cur;
+ gboolean result = TRUE;
g_return_val_if_fail (menu == NULL || GTK_IS_MENU (menu), TRUE);
{
if (!GTK_IS_TEAROFF_MENU_ITEM (cur->data) &&
!g_object_get_data (cur->data, "gtk-empty-menu-item"))
- return FALSE;
+ {
+ result = FALSE;
+ break;
+ }
}
cur = cur->next;
}
g_list_free (children);
- return TRUE;
+ return result;
}
enum {
SEPARATOR_MODE_HIDDEN
};
-void _gtk_action_sync_menu_visible (GtkAction *action,
- GtkWidget *proxy,
- gboolean empty);
-
static void
update_smart_separators (GtkWidget *proxy)
{
gboolean empty;
GList *children, *cur, *last;
GtkWidget *filler;
- gint i;
children = gtk_container_get_children (GTK_CONTAINER (parent));
empty = TRUE;
filler = NULL;
- i = 0;
cur = children;
while (cur)
{
info->type != NODE_TYPE_MENU_PLACEHOLDER &&
info->type != NODE_TYPE_TOOLBAR_PLACEHOLDER)
{
- g_warning ("%s: missing action", info->name);
+ g_warning ("%s: missing action %s", info->name, action_name);
- goto recurse_children;
+ return;
}
if (action)
GtkWidget *menu;
GList *siblings;
- menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (info->proxy));
+ if (GTK_IS_MENU (info->proxy))
+ menu = info->proxy;
+ else
+ menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (info->proxy));
siblings = gtk_container_get_children (GTK_CONTAINER (menu));
if (siblings != NULL && GTK_IS_TEAROFF_MENU_ITEM (siblings->data))
{
if (info->proxy == NULL)
{
info->proxy = gtk_menu_bar_new ();
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
gtk_widget_set_name (info->proxy, info->name);
gtk_widget_show (info->proxy);
g_signal_emit (self, ui_manager_signals[ADD_WIDGET], 0, info->proxy);
if (info->proxy == NULL)
{
info->proxy = gtk_menu_new ();
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
}
gtk_widget_set_name (info->proxy, info->name);
break;
case NODE_TYPE_MENU:
{
GtkWidget *prev_submenu = NULL;
- GtkWidget *menu;
+ GtkWidget *menu = NULL;
GList *siblings;
+
/* remove the proxy if it is of the wrong type ... */
if (info->proxy &&
G_OBJECT_TYPE (info->proxy) != GTK_ACTION_GET_CLASS (action)->menu_item_type)
{
- prev_submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (info->proxy));
- if (prev_submenu)
+ if (GTK_IS_MENU_ITEM (info->proxy))
{
- g_object_ref (prev_submenu);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (info->proxy), NULL);
+ prev_submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (info->proxy));
+ if (prev_submenu)
+ {
+ g_object_ref (prev_submenu);
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (info->proxy), NULL);
+ }
}
+
gtk_action_disconnect_proxy (info->action, info->proxy);
gtk_container_remove (GTK_CONTAINER (info->proxy->parent),
info->proxy);
g_object_unref (info->proxy);
info->proxy = NULL;
}
+
/* create proxy if needed ... */
if (info->proxy == NULL)
{
- GtkWidget *menushell;
- gint pos;
+ /* ... if the action already provides a menu, then use
+ * that menu instead of creating an empty one
+ */
+ if ((NODE_INFO (node->parent)->type == NODE_TYPE_TOOLITEM ||
+ NODE_INFO (node->parent)->type == NODE_TYPE_MENUITEM) &&
+ GTK_ACTION_GET_CLASS (action)->create_menu)
+ {
+ menu = gtk_action_create_menu (action);
+ }
+
+ if (!menu)
+ {
+ GtkWidget *tearoff;
+ GtkWidget *filler;
- if (find_menu_position (node, &menushell, &pos))
+ menu = gtk_menu_new ();
+ gtk_widget_set_name (menu, info->name);
+ tearoff = gtk_tearoff_menu_item_new ();
+ gtk_widget_set_no_show_all (tearoff, TRUE);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), tearoff);
+ filler = gtk_menu_item_new_with_label (_("Empty"));
+ g_object_set_data (G_OBJECT (filler),
+ I_("gtk-empty-menu-item"),
+ GINT_TO_POINTER (TRUE));
+ gtk_widget_set_sensitive (filler, FALSE);
+ gtk_widget_set_no_show_all (filler, TRUE);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), filler);
+ }
+
+ if (NODE_INFO (node->parent)->type == NODE_TYPE_TOOLITEM)
+ {
+ info->proxy = menu;
+ g_object_ref_sink (info->proxy);
+ gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (NODE_INFO (node->parent)->proxy),
+ menu);
+ }
+ else
{
- GtkWidget *tearoff;
- GtkWidget *filler;
+ GtkWidget *menushell;
+ gint pos;
+
+ if (find_menu_position (node, &menushell, &pos))
+ {
+ info->proxy = gtk_action_create_menu_item (action);
+ g_object_ref_sink (info->proxy);
+ g_signal_connect (info->proxy, "notify::visible",
+ G_CALLBACK (update_smart_separators), NULL);
+ gtk_widget_set_name (info->proxy, info->name);
- info->proxy = gtk_action_create_menu_item (action);
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
- menu = gtk_menu_new ();
- gtk_widget_set_name (info->proxy, info->name);
- gtk_widget_set_name (menu, info->name);
- tearoff = gtk_tearoff_menu_item_new ();
- gtk_widget_set_no_show_all (tearoff, TRUE);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), tearoff);
- filler = gtk_menu_item_new_with_label (_("Empty"));
- g_object_set_data (G_OBJECT (filler),
- "gtk-empty-menu-item",
- GINT_TO_POINTER (TRUE));
- gtk_widget_set_sensitive (filler, FALSE);
- gtk_widget_set_no_show_all (filler, TRUE);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), filler);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (info->proxy), menu);
- gtk_menu_shell_insert (GTK_MENU_SHELL (menushell), info->proxy, pos);
- g_signal_connect (info->proxy, "notify::visible",
- G_CALLBACK (update_smart_separators), NULL);
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (info->proxy), menu);
+ gtk_menu_shell_insert (GTK_MENU_SHELL (menushell), info->proxy, pos);
+ }
}
}
else
prev_submenu);
g_object_unref (prev_submenu);
}
- menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (info->proxy));
+
+ if (GTK_IS_MENU (info->proxy))
+ menu = info->proxy;
+ else
+ menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (info->proxy));
+
siblings = gtk_container_get_children (GTK_CONTAINER (menu));
if (siblings != NULL && GTK_IS_TEAROFF_MENU_ITEM (siblings->data))
{
if (info->proxy == NULL)
{
info->proxy = gtk_toolbar_new ();
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
gtk_widget_set_name (info->proxy, info->name);
gtk_widget_show (info->proxy);
g_signal_emit (self, ui_manager_signals[ADD_WIDGET], 0, info->proxy);
gint pos;
if (find_menu_position (node, &menushell, &pos))
- {
+ {
info->proxy = gtk_separator_menu_item_new ();
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
g_object_set_data (G_OBJECT (info->proxy),
- "gtk-separator-mode",
- GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
+ I_("gtk-separator-mode"),
+ GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
gtk_widget_set_no_show_all (info->proxy, TRUE);
gtk_menu_shell_insert (GTK_MENU_SHELL (menushell),
- NODE_INFO (node)->proxy, pos);
-
+ NODE_INFO (node)->proxy, pos);
+
info->extra = gtk_separator_menu_item_new ();
- g_object_ref (info->extra);
- gtk_object_sink (GTK_OBJECT (info->extra));
+ g_object_ref_sink (info->extra);
g_object_set_data (G_OBJECT (info->extra),
- "gtk-separator-mode",
- GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
+ I_("gtk-separator-mode"),
+ GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
gtk_widget_set_no_show_all (info->extra, TRUE);
gtk_menu_shell_insert (GTK_MENU_SHELL (menushell),
- NODE_INFO (node)->extra, pos+1);
- }
+ NODE_INFO (node)->extra, pos + 1);
+ }
}
break;
case NODE_TYPE_TOOLBAR_PLACEHOLDER:
{
GtkWidget *toolbar;
gint pos;
+ GtkToolItem *item;
if (find_toolbar_position (node, &toolbar, &pos))
- {
- GtkToolItem *item;
-
+ {
item = gtk_separator_tool_item_new ();
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, pos);
info->proxy = GTK_WIDGET (item);
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
g_object_set_data (G_OBJECT (info->proxy),
- "gtk-separator-mode",
- GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
+ I_("gtk-separator-mode"),
+ GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
gtk_widget_set_no_show_all (info->proxy, TRUE);
-
+
item = gtk_separator_tool_item_new ();
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, pos+1);
info->extra = GTK_WIDGET (item);
- g_object_ref (info->extra);
- gtk_object_sink (GTK_OBJECT (info->extra));
+ g_object_ref_sink (info->extra);
g_object_set_data (G_OBJECT (info->extra),
- "gtk-separator-mode",
- GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
+ I_("gtk-separator-mode"),
+ GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
gtk_widget_set_no_show_all (info->extra, TRUE);
- }
+ }
}
break;
case NODE_TYPE_MENUITEM:
gint pos;
if (find_menu_position (node, &menushell, &pos))
- {
+ {
info->proxy = gtk_action_create_menu_item (action);
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
gtk_widget_set_name (info->proxy, info->name);
-
+
gtk_menu_shell_insert (GTK_MENU_SHELL (menushell),
info->proxy, pos);
- }
+ }
}
else
{
gtk_menu_item_set_submenu (GTK_MENU_ITEM (info->proxy), NULL);
gtk_action_connect_proxy (action, info->proxy);
}
- g_signal_connect (info->proxy, "notify::visible",
- G_CALLBACK (update_smart_separators), NULL);
- if (in_popup)
- {
- /* don't show accels in popups */
- GtkWidget *label = GTK_BIN (info->proxy)->child;
- g_object_set (label,
- "accel_closure", NULL,
- NULL);
- }
+
+ if (info->proxy)
+ {
+ g_signal_connect (info->proxy, "notify::visible",
+ G_CALLBACK (update_smart_separators), NULL);
+ if (in_popup)
+ {
+ /* don't show accels in popups */
+ GtkWidget *label = GTK_BIN (info->proxy)->child;
+ g_object_set (label, "accel-closure", NULL, NULL);
+ }
+ }
break;
case NODE_TYPE_TOOLITEM:
/* remove the proxy if it is of the wrong type ... */
- if (info->proxy &&
+ if (info->proxy &&
G_OBJECT_TYPE (info->proxy) != GTK_ACTION_GET_CLASS (action)->toolbar_item_type)
{
g_signal_handlers_disconnect_by_func (info->proxy,
gint pos;
if (find_toolbar_position (node, &toolbar, &pos))
- {
+ {
info->proxy = gtk_action_create_tool_item (action);
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
gtk_widget_set_name (info->proxy, info->name);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
- GTK_TOOL_ITEM (info->proxy), pos);
-
- /* FIXME: we must trigger the notify::tooltip handler, since
- * tooltips on toolitems can't be set before the toolitem
- * is added to the toolbar.
- */
- g_object_notify (G_OBJECT (action), "tooltip");
- }
+ GTK_TOOL_ITEM (info->proxy), pos);
+ }
}
else
{
NULL);
gtk_action_connect_proxy (action, info->proxy);
}
- g_signal_connect (info->proxy, "notify::visible",
- G_CALLBACK (update_smart_separators), NULL);
+
+ if (info->proxy)
+ {
+ g_signal_connect (info->proxy, "notify::visible",
+ G_CALLBACK (update_smart_separators), NULL);
+ }
break;
case NODE_TYPE_SEPARATOR:
if (NODE_INFO (node->parent)->type == NODE_TYPE_TOOLBAR ||
GtkWidget *toolbar;
gint pos;
gint separator_mode;
-
+ GtkToolItem *item;
+
if (GTK_IS_SEPARATOR_TOOL_ITEM (info->proxy))
{
gtk_container_remove (GTK_CONTAINER (info->proxy->parent),
}
if (find_toolbar_position (node, &toolbar, &pos))
- {
- GtkToolItem *item = gtk_separator_tool_item_new ();
+ {
+ item = gtk_separator_tool_item_new ();
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, pos);
info->proxy = GTK_WIDGET (item);
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ g_object_ref_sink (info->proxy);
gtk_widget_set_no_show_all (info->proxy, TRUE);
if (info->expand)
- {
- gtk_tool_item_set_expand (GTK_TOOL_ITEM (item), TRUE);
- gtk_separator_tool_item_set_draw
- (GTK_SEPARATOR_TOOL_ITEM (item), FALSE);
- separator_mode = SEPARATOR_MODE_VISIBLE;
- }
- else
- separator_mode = SEPARATOR_MODE_SMART;
-
+ {
+ gtk_tool_item_set_expand (GTK_TOOL_ITEM (item), TRUE);
+ gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (item), FALSE);
+ separator_mode = SEPARATOR_MODE_VISIBLE;
+ }
+ else
+ separator_mode = SEPARATOR_MODE_SMART;
+
g_object_set_data (G_OBJECT (info->proxy),
- "gtk-separator-mode",
- GINT_TO_POINTER (separator_mode));
+ I_("gtk-separator-mode"),
+ GINT_TO_POINTER (separator_mode));
gtk_widget_show (info->proxy);
- }
+ }
}
else
{
if (find_menu_position (node, &menushell, &pos))
{
- info->proxy = gtk_separator_menu_item_new ();
- g_object_ref (info->proxy);
- gtk_object_sink (GTK_OBJECT (info->proxy));
+ info->proxy = gtk_separator_menu_item_new ();
+ g_object_ref_sink (info->proxy);
gtk_widget_set_no_show_all (info->proxy, TRUE);
g_object_set_data (G_OBJECT (info->proxy),
- "gtk-separator-mode",
- GINT_TO_POINTER (SEPARATOR_MODE_SMART));
+ I_("gtk-separator-mode"),
+ GINT_TO_POINTER (SEPARATOR_MODE_SMART));
gtk_menu_shell_insert (GTK_MENU_SHELL (menushell),
info->proxy, pos);
gtk_widget_show (info->proxy);
- }
+ }
}
break;
case NODE_TYPE_ACCELERATOR:
if (info->proxy)
{
- if (info->type == NODE_TYPE_MENU)
+ if (info->type == NODE_TYPE_MENU && GTK_IS_MENU_ITEM (info->proxy))
update_smart_separators (gtk_menu_item_get_submenu (GTK_MENU_ITEM (info->proxy)));
- else if (info->type == NODE_TYPE_TOOLBAR || info->type == NODE_TYPE_POPUP)
+ else if (info->type == NODE_TYPE_MENU ||
+ info->type == NODE_TYPE_TOOLBAR ||
+ info->type == NODE_TYPE_POPUP)
update_smart_separators (info->proxy);
}
static gboolean
do_updates_idle (GtkUIManager *self)
{
- GDK_THREADS_ENTER ();
do_updates (self);
- GDK_THREADS_LEAVE ();
return FALSE;
}
if (self->private_data->update_tag != 0)
return;
- self->private_data->update_tag = g_idle_add ((GSourceFunc)do_updates_idle,
+ self->private_data->update_tag = gdk_threads_add_idle (
+ (GSourceFunc)do_updates_idle,
self);
}
* UI in an idle function. A typical example where this function is
* useful is to enforce that the menubar and toolbar have been added to
* the main window before showing it:
- * <informalexample>
- * <programlisting>
+ * |[
* gtk_container_add (GTK_CONTAINER (window), vbox);
* g_signal_connect (merge, "add_widget",
* G_CALLBACK (add_widget), vbox);
* gtk_ui_manager_add_ui_from_file (merge, "my-toolbars");
* gtk_ui_manager_ensure_update (merge);
* gtk_widget_show (window);
- * </programlisting>
- * </informalexample>
+ * ]|
*
* Since: 2.4
**/
NODE_INFO (p)->dirty = TRUE;
}
-static const gchar *const open_tag_format[] = {
- "%*s<UNDECIDED",
- "%*s<ui",
- "%*s<menubar",
- "%*s<menu",
- "%*s<toolbar",
- "%*s<placeholder",
- "%*s<placeholder",
- "%*s<popup",
- "%*s<menuitem",
- "%*s<toolitem",
- "%*s<separator",
- "%*s<accelerator"
-};
+static const gchar *
+open_tag_format (NodeType type)
+{
+ switch (type)
+ {
+ case NODE_TYPE_UNDECIDED: return "%*s<UNDECIDED";
+ case NODE_TYPE_ROOT: return "%*s<ui";
+ case NODE_TYPE_MENUBAR: return "%*s<menubar";
+ case NODE_TYPE_MENU: return "%*s<menu";
+ case NODE_TYPE_TOOLBAR: return "%*s<toolbar";
+ case NODE_TYPE_MENU_PLACEHOLDER:
+ case NODE_TYPE_TOOLBAR_PLACEHOLDER: return "%*s<placeholder";
+ case NODE_TYPE_POPUP: return "%*s<popup";
+ case NODE_TYPE_MENUITEM: return "%*s<menuitem";
+ case NODE_TYPE_TOOLITEM: return "%*s<toolitem";
+ case NODE_TYPE_SEPARATOR: return "%*s<separator";
+ case NODE_TYPE_ACCELERATOR: return "%*s<accelerator";
+ default: return NULL;
+ }
+}
-static const gchar *const close_tag_format[] = {
- "%*s</UNDECIDED>\n",
- "%*s</ui>\n",
- "%*s</menubar>\n",
- "%*s</menu>\n",
- "%*s</toolbar>\n",
- "%*s</placeholder>\n",
- "%*s</placeholder>\n",
- "%*s</popup>\n",
- NULL,
- NULL,
- NULL,
- NULL
-};
+static const gchar *
+close_tag_format (NodeType type)
+{
+ switch (type)
+ {
+ case NODE_TYPE_UNDECIDED: return "%*s</UNDECIDED>\n";
+ case NODE_TYPE_ROOT: return "%*s</ui>\n";
+ case NODE_TYPE_MENUBAR: return "%*s</menubar>\n";
+ case NODE_TYPE_MENU: return "%*s</menu>\n";
+ case NODE_TYPE_TOOLBAR: return "%*s</toolbar>\n";
+ case NODE_TYPE_MENU_PLACEHOLDER:
+ case NODE_TYPE_TOOLBAR_PLACEHOLDER: return "%*s</placeholder>\n";
+ case NODE_TYPE_POPUP: return "%*s</popup>\n";
+ default: return NULL;
+ }
+}
static void
print_node (GtkUIManager *self,
{
Node *mnode;
GNode *child;
+ const gchar *open_fmt;
+ const gchar *close_fmt;
mnode = node->data;
- g_string_append_printf (buffer, open_tag_format[mnode->type],
- indent_level, "");
+ open_fmt = open_tag_format (mnode->type);
+ close_fmt = close_tag_format (mnode->type);
+
+ g_string_append_printf (buffer, open_fmt, indent_level, "");
if (mnode->type != NODE_TYPE_ROOT)
{
g_quark_to_string (mnode->action_name));
}
- g_string_append (buffer,
- close_tag_format[mnode->type] ? ">\n" : "/>\n");
+ g_string_append (buffer, close_fmt ? ">\n" : "/>\n");
for (child = node->children; child != NULL; child = child->next)
print_node (self, child, indent_level + 2, buffer);
- if (close_tag_format[mnode->type])
- g_string_append_printf (buffer, close_tag_format[mnode->type],
- indent_level, "");
+ if (close_fmt)
+ g_string_append_printf (buffer, close_fmt, indent_level, "");
+}
+
+static gboolean
+gtk_ui_manager_buildable_custom_tag_start (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *tagname,
+ GMarkupParser *parser,
+ gpointer *data)
+{
+ if (child)
+ return FALSE;
+
+ if (strcmp (tagname, "ui") == 0)
+ {
+ ParseContext *ctx;
+
+ ctx = g_new0 (ParseContext, 1);
+ ctx->state = STATE_START;
+ ctx->self = GTK_UI_MANAGER (buildable);
+ ctx->current = NULL;
+ ctx->merge_id = gtk_ui_manager_new_merge_id (GTK_UI_MANAGER (buildable));
+
+ *data = ctx;
+ *parser = ui_parser;
+
+ return TRUE;
+ }
+
+ return FALSE;
+
+}
+
+static void
+gtk_ui_manager_buildable_custom_tag_end (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *tagname,
+ gpointer *data)
+{
+ queue_update (GTK_UI_MANAGER (buildable));
+ g_object_notify (G_OBJECT (buildable), "ui");
+ g_free (data);
}
/**
projects / ~andy / gtk / blobdiff