[glade] Move GladeWidgetAdaptor code for GtkContainer into it's own C file
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade] Move GladeWidgetAdaptor code for GtkContainer into it's own C file
- Date: Fri, 3 May 2013 17:06:17 +0000 (UTC)
commit 94a5f71ad0fec0a9315444a99d88eedc8eb3ff71
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Fri May 3 21:57:47 2013 +0900
Move GladeWidgetAdaptor code for GtkContainer into it's own C file
plugins/gtk+/Makefile.am | 1 +
plugins/gtk+/glade-gtk-container.c | 229 ++++++++++++++++++++++++++++++++++++
plugins/gtk+/glade-gtk.c | 203 --------------------------------
po/POTFILES.in | 1 +
4 files changed, 231 insertions(+), 203 deletions(-)
---
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index 9df8bc5..f93ab70 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -35,6 +35,7 @@ libgladegtk_la_SOURCES = \
glade-gtk.c \
glade-gtk-action-widgets.c \
glade-gtk-box.c \
+ glade-gtk-container.c \
glade-gtk-grid.c \
glade-gtk-info-bar.c \
glade-gtk-switch.c \
diff --git a/plugins/gtk+/glade-gtk-container.c b/plugins/gtk+/glade-gtk-container.c
new file mode 100644
index 0000000..6064ea7
--- /dev/null
+++ b/plugins/gtk+/glade-gtk-container.c
@@ -0,0 +1,229 @@
+/*
+ * glade-gtk-container.c - GladeWidgetAdaptor for GtkContainer
+ *
+ * Copyright (C) 2013 Tristan Van Berkom
+ *
+ * Authors:
+ * Tristan Van Berkom <tristan van berkom gmail com>
+ *
+ * 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.1 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+#include <config.h>
+#include <glib/gi18n-lib.h>
+#include <gladeui/glade.h>
+#include <string.h>
+
+void
+glade_gtk_container_post_create (GladeWidgetAdaptor * adaptor,
+ GObject * container, GladeCreateReason reason)
+{
+ GList *children;
+ g_return_if_fail (GTK_IS_CONTAINER (container));
+
+ if (reason == GLADE_CREATE_USER)
+ {
+ if ((children =
+ gtk_container_get_children (GTK_CONTAINER (container))) == NULL)
+ gtk_container_add (GTK_CONTAINER (container), glade_placeholder_new ());
+ else
+ g_list_free (children);
+ }
+}
+
+gboolean
+glade_gtk_container_add_verify (GladeWidgetAdaptor *adaptor,
+ GtkWidget *container,
+ GtkWidget *child,
+ gboolean user_feedback)
+{
+ GladeWidget *gwidget = glade_widget_get_from_gobject (container);
+
+ if (GTK_IS_WINDOW (child))
+ {
+ if (user_feedback)
+ glade_util_ui_message (glade_app_get_window (),
+ GLADE_UI_INFO, NULL,
+ _("Cannot add a toplevel window to a containter."));
+
+ return FALSE;
+ }
+ else if (!GTK_IS_WIDGET (child) ||
+ GTK_IS_TOOL_ITEM (child) ||
+ GTK_IS_MENU_ITEM (child))
+ {
+ if (user_feedback)
+ glade_util_ui_message (glade_app_get_window (),
+ GLADE_UI_INFO, NULL,
+ _("Widgets of type %s can only have widgets as children."),
+ glade_widget_adaptor_get_title (adaptor));
+
+ return FALSE;
+ }
+ else if (GWA_USE_PLACEHOLDERS (adaptor) &&
+ glade_util_count_placeholders (gwidget) == 0)
+ {
+ if (user_feedback)
+ glade_util_ui_message (glade_app_get_window (),
+ GLADE_UI_INFO, NULL,
+ _("Widgets of type %s need placeholders to add children."),
+ glade_widget_adaptor_get_title (adaptor));
+
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+void
+glade_gtk_container_replace_child (GladeWidgetAdaptor * adaptor,
+ GtkWidget * container,
+ GtkWidget * current, GtkWidget * new_widget)
+{
+ GParamSpec **param_spec;
+ GladePropertyClass *pclass;
+ GValue *value;
+ guint nproperties;
+ guint i;
+
+ if (gtk_widget_get_parent (current) != container)
+ return;
+
+ param_spec = gtk_container_class_list_child_properties
+ (G_OBJECT_GET_CLASS (container), &nproperties);
+ value = g_malloc0 (sizeof (GValue) * nproperties);
+
+ for (i = 0; i < nproperties; i++)
+ {
+ g_value_init (&value[i], param_spec[i]->value_type);
+ gtk_container_child_get_property
+ (GTK_CONTAINER (container), current, param_spec[i]->name, &value[i]);
+ }
+
+ gtk_container_remove (GTK_CONTAINER (container), current);
+ gtk_container_add (GTK_CONTAINER (container), new_widget);
+
+ for (i = 0; i < nproperties; i++)
+ {
+ /* If the added widget is a placeholder then we
+ * want to keep all the "tranfer-on-paste" properties
+ * as default so that it looks fresh (transfer-on-paste
+ * properties dont effect the position/slot inside a
+ * contianer)
+ */
+ if (GLADE_IS_PLACEHOLDER (new_widget))
+ {
+ pclass = glade_widget_adaptor_get_pack_property_class
+ (adaptor, param_spec[i]->name);
+
+ if (pclass && glade_property_class_transfer_on_paste (pclass))
+ continue;
+ }
+
+ gtk_container_child_set_property
+ (GTK_CONTAINER (container), new_widget, param_spec[i]->name,
+ &value[i]);
+ }
+
+ for (i = 0; i < nproperties; i++)
+ g_value_unset (&value[i]);
+
+ g_free (param_spec);
+ g_free (value);
+}
+
+void
+glade_gtk_container_add_child (GladeWidgetAdaptor * adaptor,
+ GtkWidget * container, GtkWidget * child)
+{
+ GtkWidget *container_child = NULL;
+
+ if (GTK_IS_BIN (container))
+ container_child = gtk_bin_get_child (GTK_BIN (container));
+
+ /* Get a placeholder out of the way before adding the child if its a GtkBin
+ */
+ if (GTK_IS_BIN (container) && container_child != NULL &&
+ GLADE_IS_PLACEHOLDER (container_child))
+ gtk_container_remove (GTK_CONTAINER (container), container_child);
+
+ gtk_container_add (GTK_CONTAINER (container), child);
+}
+
+void
+glade_gtk_container_remove_child (GladeWidgetAdaptor * adaptor,
+ GtkWidget * container, GtkWidget * child)
+{
+ GList *children;
+ gtk_container_remove (GTK_CONTAINER (container), child);
+
+ /* If this is the last one, add a placeholder by default.
+ */
+ if ((children =
+ gtk_container_get_children (GTK_CONTAINER (container))) == NULL)
+ {
+ gtk_container_add (GTK_CONTAINER (container), glade_placeholder_new ());
+ }
+ else
+ g_list_free (children);
+}
+
+void
+glade_gtk_container_set_child_property (GladeWidgetAdaptor * adaptor,
+ GObject * container,
+ GObject * child,
+ const gchar * property_name,
+ const GValue * value)
+{
+ if (gtk_widget_get_parent (GTK_WIDGET (child)) == GTK_WIDGET (container))
+ gtk_container_child_set_property (GTK_CONTAINER (container),
+ GTK_WIDGET (child), property_name, value);
+}
+
+void
+glade_gtk_container_get_child_property (GladeWidgetAdaptor * adaptor,
+ GObject * container,
+ GObject * child,
+ const gchar * property_name,
+ GValue * value)
+{
+ if (gtk_widget_get_parent (GTK_WIDGET (child)) == GTK_WIDGET (container))
+ gtk_container_child_get_property (GTK_CONTAINER (container),
+ GTK_WIDGET (child), property_name, value);
+}
+
+GList *
+glade_gtk_container_get_children (GladeWidgetAdaptor *adaptor,
+ GObject *container)
+{
+ GList *parent_children, *children;
+
+ children = glade_util_container_get_all_children (GTK_CONTAINER (container));
+
+ /* Chain up */
+ if (GWA_GET_CLASS (GTK_TYPE_WIDGET)->get_children)
+ parent_children = GWA_GET_CLASS (GTK_TYPE_WIDGET)->get_children (adaptor, container);
+ else
+ parent_children = NULL;
+
+ return glade_util_purify_list (g_list_concat (children, parent_children));
+}
+
+/* This is used in the XML for some derived classes */
+GladeEditable *
+glade_gtk_container_create_editable (GladeWidgetAdaptor * adaptor,
+ GladeEditorPageType type)
+{
+ return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+}
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 4cb584e..0b9eb6a 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -84,209 +84,6 @@ glade_gtk_init (const gchar * name)
{
}
-/* ----------------------------- GtkContainer ------------------------------ */
-void
-glade_gtk_container_post_create (GladeWidgetAdaptor * adaptor,
- GObject * container, GladeCreateReason reason)
-{
- GList *children;
- g_return_if_fail (GTK_IS_CONTAINER (container));
-
- if (reason == GLADE_CREATE_USER)
- {
- if ((children =
- gtk_container_get_children (GTK_CONTAINER (container))) == NULL)
- gtk_container_add (GTK_CONTAINER (container), glade_placeholder_new ());
- else
- g_list_free (children);
- }
-}
-
-gboolean
-glade_gtk_container_add_verify (GladeWidgetAdaptor *adaptor,
- GtkWidget *container,
- GtkWidget *child,
- gboolean user_feedback)
-{
- GladeWidget *gwidget = glade_widget_get_from_gobject (container);
-
- if (GTK_IS_WINDOW (child))
- {
- if (user_feedback)
- glade_util_ui_message (glade_app_get_window (),
- GLADE_UI_INFO, NULL,
- _("Cannot add a toplevel window to a containter."));
-
- return FALSE;
- }
- else if (!GTK_IS_WIDGET (child) ||
- GTK_IS_TOOL_ITEM (child) ||
- GTK_IS_MENU_ITEM (child))
- {
- if (user_feedback)
- glade_util_ui_message (glade_app_get_window (),
- GLADE_UI_INFO, NULL,
- _("Widgets of type %s can only have widgets as children."),
- glade_widget_adaptor_get_title (adaptor));
-
- return FALSE;
- }
- else if (GWA_USE_PLACEHOLDERS (adaptor) &&
- glade_util_count_placeholders (gwidget) == 0)
- {
- if (user_feedback)
- glade_util_ui_message (glade_app_get_window (),
- GLADE_UI_INFO, NULL,
- _("Widgets of type %s need placeholders to add children."),
- glade_widget_adaptor_get_title (adaptor));
-
- return FALSE;
- }
-
- return TRUE;
-}
-
-void
-glade_gtk_container_replace_child (GladeWidgetAdaptor * adaptor,
- GtkWidget * container,
- GtkWidget * current, GtkWidget * new_widget)
-{
- GParamSpec **param_spec;
- GladePropertyClass *pclass;
- GValue *value;
- guint nproperties;
- guint i;
-
- if (gtk_widget_get_parent (current) != container)
- return;
-
- param_spec = gtk_container_class_list_child_properties
- (G_OBJECT_GET_CLASS (container), &nproperties);
- value = g_malloc0 (sizeof (GValue) * nproperties);
-
- for (i = 0; i < nproperties; i++)
- {
- g_value_init (&value[i], param_spec[i]->value_type);
- gtk_container_child_get_property
- (GTK_CONTAINER (container), current, param_spec[i]->name, &value[i]);
- }
-
- gtk_container_remove (GTK_CONTAINER (container), current);
- gtk_container_add (GTK_CONTAINER (container), new_widget);
-
- for (i = 0; i < nproperties; i++)
- {
- /* If the added widget is a placeholder then we
- * want to keep all the "tranfer-on-paste" properties
- * as default so that it looks fresh (transfer-on-paste
- * properties dont effect the position/slot inside a
- * contianer)
- */
- if (GLADE_IS_PLACEHOLDER (new_widget))
- {
- pclass = glade_widget_adaptor_get_pack_property_class
- (adaptor, param_spec[i]->name);
-
- if (pclass && glade_property_class_transfer_on_paste (pclass))
- continue;
- }
-
- gtk_container_child_set_property
- (GTK_CONTAINER (container), new_widget, param_spec[i]->name,
- &value[i]);
- }
-
- for (i = 0; i < nproperties; i++)
- g_value_unset (&value[i]);
-
- g_free (param_spec);
- g_free (value);
-}
-
-void
-glade_gtk_container_add_child (GladeWidgetAdaptor * adaptor,
- GtkWidget * container, GtkWidget * child)
-{
- GtkWidget *container_child = NULL;
-
- if (GTK_IS_BIN (container))
- container_child = gtk_bin_get_child (GTK_BIN (container));
-
- /* Get a placeholder out of the way before adding the child if its a GtkBin
- */
- if (GTK_IS_BIN (container) && container_child != NULL &&
- GLADE_IS_PLACEHOLDER (container_child))
- gtk_container_remove (GTK_CONTAINER (container), container_child);
-
- gtk_container_add (GTK_CONTAINER (container), child);
-}
-
-void
-glade_gtk_container_remove_child (GladeWidgetAdaptor * adaptor,
- GtkWidget * container, GtkWidget * child)
-{
- GList *children;
- gtk_container_remove (GTK_CONTAINER (container), child);
-
- /* If this is the last one, add a placeholder by default.
- */
- if ((children =
- gtk_container_get_children (GTK_CONTAINER (container))) == NULL)
- {
- gtk_container_add (GTK_CONTAINER (container), glade_placeholder_new ());
- }
- else
- g_list_free (children);
-}
-
-void
-glade_gtk_container_set_child_property (GladeWidgetAdaptor * adaptor,
- GObject * container,
- GObject * child,
- const gchar * property_name,
- const GValue * value)
-{
- if (gtk_widget_get_parent (GTK_WIDGET (child)) == GTK_WIDGET (container))
- gtk_container_child_set_property (GTK_CONTAINER (container),
- GTK_WIDGET (child), property_name, value);
-}
-
-void
-glade_gtk_container_get_child_property (GladeWidgetAdaptor * adaptor,
- GObject * container,
- GObject * child,
- const gchar * property_name,
- GValue * value)
-{
- if (gtk_widget_get_parent (GTK_WIDGET (child)) == GTK_WIDGET (container))
- gtk_container_child_get_property (GTK_CONTAINER (container),
- GTK_WIDGET (child), property_name, value);
-}
-
-GList *
-glade_gtk_container_get_children (GladeWidgetAdaptor *adaptor,
- GObject *container)
-{
- GList *parent_children, *children;
-
- children = glade_util_container_get_all_children (GTK_CONTAINER (container));
-
- /* Chain up */
- if (GWA_GET_CLASS (GTK_TYPE_WIDGET)->get_children)
- parent_children = GWA_GET_CLASS (GTK_TYPE_WIDGET)->get_children (adaptor, container);
- else
- parent_children = NULL;
-
- return glade_util_purify_list (g_list_concat (children, parent_children));
-}
-
-GladeEditable *
-glade_gtk_container_create_editable (GladeWidgetAdaptor * adaptor,
- GladeEditorPageType type)
-{
- return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
-}
-
/* ----------------- Generic GladeFixed constructor ------------------ */
GladeWidget *
glade_gtk_create_fixed_widget (GladeWidgetAdaptor * adaptor,
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9e2b92b..c16bcad 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -63,6 +63,7 @@ plugins/gtk+/glade-entry-editor.c
plugins/gtk+/glade-fixed.c
plugins/gtk+/glade-gtk.c
plugins/gtk+/glade-gtk-box.c
+plugins/gtk+/glade-gtk-container.c
plugins/gtk+/glade-gtk-grid.c
plugins/gtk+/glade-gtk-table.c
plugins/gtk+/glade-gtk-widget.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]