#include "config.h"
-#include "gtkmodelmenu.h"
-
-#include "gtkmenu.h"
+#include "gtkmenushell.h"
#include "gtkmenubar.h"
+#include "gtkmenu.h"
+
#include "gtkseparatormenuitem.h"
#include "gtkmodelmenuitem.h"
#include "gtkapplicationprivate.h"
}
}
-static void
-gtk_model_menu_bind (GtkMenuShell *shell,
- GMenuModel *model,
- const gchar *action_namespace,
- gboolean with_separators)
-{
- GtkModelMenuBinding *binding;
-
- binding = g_slice_new (GtkModelMenuBinding);
- binding->model = g_object_ref (model);
- binding->shell = shell;
- binding->update_idle = 0;
- binding->connected = NULL;
- binding->with_separators = with_separators;
- binding->action_namespace = g_strdup (action_namespace);
-
- g_object_set_data_full (G_OBJECT (shell), "gtk-model-menu-binding", binding, gtk_model_menu_binding_free);
-}
-
-
-static void
-gtk_model_menu_populate (GtkMenuShell *shell)
-{
- GtkModelMenuBinding *binding;
-
- binding = (GtkModelMenuBinding*) g_object_get_data (G_OBJECT (shell), "gtk-model-menu-binding");
-
- gtk_model_menu_binding_populate (binding);
-}
-
-GtkWidget *
-gtk_model_menu_create_menu (GMenuModel *model,
- const gchar *action_namespace)
-{
- GtkWidget *menu;
-
- menu = gtk_menu_new ();
-
- gtk_model_menu_bind (GTK_MENU_SHELL (menu), model, action_namespace, TRUE);
- gtk_model_menu_populate (GTK_MENU_SHELL (menu));
-
- return menu;
-}
-
/**
- * gtk_menu_new_from_model:
- * @model: a #GMenuModel
+ * gtk_menu_shell_bind_model:
+ * @menu_shell: a #GtkMenuShell
+ * @model: (allow-none): the #GMenuModel to bind to or %NULL to remove
+ * binding
+ * @action_namespace: (allow-none): the namespace for actions in @model
+ * @with_separators: %TRUE if toplevel items in @shell should have
+ * separators between them
+ *
+ * Establishes a binding between a #GtkMenuShell and a #GMenuModel.
+ *
+ * The contents of @shell are removed and then refilled with menu items
+ * according to @model. When @model changes, @shell is updated.
+ * Calling this function twice on @shell with different @model will
+ * cause the first binding to be replaced with a binding to the new
+ * model. If @model is %NULL then any previous binding is undone and
+ * all children are removed.
*
- * Creates a #GtkMenu and populates it with menu items and
- * submenus according to @model.
+ * @with_separators determines if toplevel items (eg: sections) have
+ * separators inserted between them. This is typically desired for
+ * menus but doesn't make sense for menubars.
*
- * The created menu items are connected to actions found in the
- * #GtkApplicationWindow to which the menu belongs - typically
- * by means of being attached to a widget (see gtk_menu_attach_to_widget())
- * that is contained within the #GtkApplicationWindows widget hierarchy.
+ * If @action_namespace is non-%NULL then the effect is as if all
+ * actions mentioned in the @model have their names prefixed with the
+ * namespace, plus a dot. For example, if the action "quit" is
+ * mentioned and @action_namespace is "app" then the effective action
+ * name is "app.quit".
*
- * Returns: a new #GtkMenu
+ * For most cases you are probably better off using
+ * gtk_menu_new_from_model() or gtk_menu_bar_new_from_model() or just
+ * directly passing the #GMenuModel to gtk_application_set_app_menu() or
+ * gtk_application_set_menu_bar().
*
- * Since: 3.4
+ * Since: 3.6
*/
-GtkWidget *
-gtk_menu_new_from_model (GMenuModel *model)
-{
- GtkWidget *menu;
-
- menu = gtk_menu_new ();
- gtk_model_menu_bind (GTK_MENU_SHELL (menu), model, NULL, TRUE);
- gtk_model_menu_populate (GTK_MENU_SHELL (menu));
-
- return menu;
-}
-
-GtkWidget *
-gtk_model_menu_create_menu_bar (GMenuModel *model)
+void
+gtk_menu_shell_bind_model (GtkMenuShell *shell,
+ GMenuModel *model,
+ const gchar *action_namespace,
+ gboolean with_separators)
{
- GtkWidget *menubar;
+ g_return_if_fail (GTK_IS_MENU_SHELL (shell));
+ g_return_if_fail (model == NULL || G_IS_MENU_MODEL (model));
- menubar = gtk_menu_bar_new ();
+ if (model)
+ {
+ GtkModelMenuBinding *binding;
- gtk_model_menu_bind (GTK_MENU_SHELL (menubar), model, NULL, FALSE);
- gtk_model_menu_populate (GTK_MENU_SHELL (menubar));
+ binding = g_slice_new (GtkModelMenuBinding);
+ binding->model = g_object_ref (model);
+ binding->shell = shell;
+ binding->update_idle = 0;
+ binding->connected = NULL;
+ binding->with_separators = with_separators;
+ binding->action_namespace = g_strdup (action_namespace);
- return menubar;
-}
+ g_object_set_data_full (G_OBJECT (shell), "gtk-model-menu-binding", binding, gtk_model_menu_binding_free);
-/**
- * gtk_menu_bar_new_from_model:
- * @model: a #GMenuModel
- *
- * Creates a new #GtkMenuBar and populates it with menu items
- * and submenus according to @model.
- *
- * The created menu items are connected to actions found in the
- * #GtkApplicationWindow to which the menu bar belongs - typically
- * by means of being contained within the #GtkApplicationWindows
- * widget hierarchy.
- *
- * Returns: a new #GtkMenuBar
- *
- * Since: 3.4
- */
-GtkWidget *
-gtk_menu_bar_new_from_model (GMenuModel *model)
-{
- GtkWidget *menubar;
+ gtk_model_menu_binding_populate (binding);
+ }
- menubar = gtk_menu_bar_new ();
+ else
+ {
+ GList *children;
- gtk_model_menu_bind (GTK_MENU_SHELL (menubar), model, NULL, FALSE);
- gtk_model_menu_populate (GTK_MENU_SHELL (menubar));
+ /* break existing binding */
+ g_object_set_data (G_OBJECT (shell), "gtk-model-menu-binding", NULL);
- return menubar;
+ /* remove all children */
+ children = gtk_container_get_children (GTK_CONTAINER (shell));
+ while (children)
+ {
+ gtk_container_remove (GTK_CONTAINER (shell), children->data);
+ children = g_list_delete_link (children, children);
+ }
+ }
}
+++ /dev/null
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_MODEL_MENU_H__
-#define __GTK_MODEL_MENU_H__
-
-#include <gtk/gtkmenushell.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gio/gio.h>
-
-G_GNUC_INTERNAL
-GtkWidget * gtk_model_menu_create_menu_bar (GMenuModel *model);
-
-G_GNUC_INTERNAL
-GtkWidget * gtk_model_menu_create_menu (GMenuModel *model,
- const gchar *action_namespace);
-
-#endif /* __GTK_MODEL_MENU_H__ */
projects / ~andy / gtk / commitdiff