[glade] Move GladeWidgetAdaptor code for GtkExpander 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 GtkExpander into it's own C file
- Date: Fri, 3 May 2013 17:06:42 +0000 (UTC)
commit b13dfaf3e3b85ce501be35f104f73e0537b3dcda
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Fri May 3 22:25:26 2013 +0900
Move GladeWidgetAdaptor code for GtkExpander into it's own C file
plugins/gtk+/Makefile.am | 1 +
plugins/gtk+/glade-gtk-expander.c | 150 +++++++++++++++++++++++++++++++++++++
plugins/gtk+/glade-gtk.c | 124 ------------------------------
po/POTFILES.in | 1 +
4 files changed, 152 insertions(+), 124 deletions(-)
---
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index 9dafa38..b762224 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -36,6 +36,7 @@ libgladegtk_la_SOURCES = \
glade-gtk-action-widgets.c \
glade-gtk-box.c \
glade-gtk-container.c \
+ glade-gtk-expander.c \
glade-gtk-frame.c \
glade-gtk-grid.c \
glade-gtk-info-bar.c \
diff --git a/plugins/gtk+/glade-gtk-expander.c b/plugins/gtk+/glade-gtk-expander.c
new file mode 100644
index 0000000..aaef8f9
--- /dev/null
+++ b/plugins/gtk+/glade-gtk-expander.c
@@ -0,0 +1,150 @@
+/*
+ * glade-gtk-expander.c - GladeWidgetAdaptor for GtkExpander
+ *
+ * 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 "glade-gtk-frame.h"
+
+void
+glade_gtk_expander_post_create (GladeWidgetAdaptor * adaptor,
+ GObject * expander, GladeCreateReason reason)
+{
+ static GladeWidgetAdaptor *wadaptor = NULL;
+ GladeWidget *gexpander, *glabel;
+ GtkWidget *label;
+
+ if (wadaptor == NULL)
+ wadaptor = glade_widget_adaptor_get_by_type (GTK_TYPE_LABEL);
+
+ if (reason != GLADE_CREATE_USER)
+ return;
+
+ g_return_if_fail (GTK_IS_EXPANDER (expander));
+ gexpander = glade_widget_get_from_gobject (expander);
+ g_return_if_fail (GLADE_IS_WIDGET (gexpander));
+
+ /* If we didnt put this object here... */
+ if ((label = gtk_expander_get_label_widget (GTK_EXPANDER (expander))) == NULL
+ || (glade_widget_get_from_gobject (label) == NULL))
+ {
+ glabel = glade_widget_adaptor_create_widget (wadaptor, FALSE,
+ "parent", gexpander,
+ "project",
+ glade_widget_get_project
+ (gexpander), NULL);
+
+ glade_widget_property_set (glabel, "label", "expander");
+
+ g_object_set_data (glade_widget_get_object (glabel), "special-child-type", "label_item");
+ glade_widget_add_child (gexpander, glabel, FALSE);
+ }
+
+ gtk_expander_set_expanded (GTK_EXPANDER (expander), TRUE);
+
+ gtk_container_add (GTK_CONTAINER (expander), glade_placeholder_new ());
+
+}
+
+void
+glade_gtk_expander_replace_child (GladeWidgetAdaptor * adaptor,
+ GtkWidget * container,
+ GtkWidget * current, GtkWidget * new_widget)
+{
+ gchar *special_child_type;
+
+ special_child_type =
+ g_object_get_data (G_OBJECT (current), "special-child-type");
+
+ if (special_child_type && !strcmp (special_child_type, "label_item"))
+ {
+ g_object_set_data (G_OBJECT (new_widget), "special-child-type",
+ "label_item");
+ gtk_expander_set_label_widget (GTK_EXPANDER (container), new_widget);
+ return;
+ }
+
+ /* Chain Up */
+ GWA_GET_CLASS
+ (GTK_TYPE_CONTAINER)->replace_child (adaptor,
+ G_OBJECT (container),
+ G_OBJECT (current),
+ G_OBJECT (new_widget));
+}
+
+
+void
+glade_gtk_expander_add_child (GladeWidgetAdaptor * adaptor,
+ GObject * object, GObject * child)
+{
+ gchar *special_child_type;
+
+ special_child_type = g_object_get_data (child, "special-child-type");
+
+ if (special_child_type && !strcmp (special_child_type, "label"))
+ {
+ g_object_set_data (child, "special-child-type", "label_item");
+ gtk_expander_set_label_widget (GTK_EXPANDER (object), GTK_WIDGET (child));
+ }
+ else if (special_child_type && !strcmp (special_child_type, "label_item"))
+ {
+ gtk_expander_set_label_widget (GTK_EXPANDER (object), GTK_WIDGET (child));
+ }
+ else
+ /* Chain Up */
+ GWA_GET_CLASS (GTK_TYPE_CONTAINER)->add (adaptor, object, child);
+}
+
+void
+glade_gtk_expander_remove_child (GladeWidgetAdaptor * adaptor,
+ GObject * object, GObject * child)
+{
+ gchar *special_child_type;
+
+ special_child_type = g_object_get_data (child, "special-child-type");
+ if (special_child_type && !strcmp (special_child_type, "label_item"))
+ {
+ gtk_expander_set_label_widget (GTK_EXPANDER (object),
+ glade_placeholder_new ());
+ }
+ else
+ {
+ gtk_container_remove (GTK_CONTAINER (object), GTK_WIDGET (child));
+ gtk_container_add (GTK_CONTAINER (object), glade_placeholder_new ());
+ }
+}
+
+void
+glade_gtk_expander_write_child (GladeWidgetAdaptor * adaptor,
+ GladeWidget * widget,
+ GladeXmlContext * context, GladeXmlNode * node)
+{
+
+ if (!glade_gtk_write_special_child_label_item (adaptor, widget, context, node,
+ GWA_GET_CLASS (GTK_TYPE_CONTAINER)->
+ write_child))
+ /* Chain Up */
+ GWA_GET_CLASS
+ (GTK_TYPE_CONTAINER)->write_child (adaptor, widget, context, node);
+}
+
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 309e031..3956080 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -85,130 +85,6 @@ glade_gtk_init (const gchar * name)
{
}
-/* ----------------------------- GtkExpander ------------------------------ */
-void
-glade_gtk_expander_post_create (GladeWidgetAdaptor * adaptor,
- GObject * expander, GladeCreateReason reason)
-{
- static GladeWidgetAdaptor *wadaptor = NULL;
- GladeWidget *gexpander, *glabel;
- GtkWidget *label;
-
- if (wadaptor == NULL)
- wadaptor = glade_widget_adaptor_get_by_type (GTK_TYPE_LABEL);
-
- if (reason != GLADE_CREATE_USER)
- return;
-
- g_return_if_fail (GTK_IS_EXPANDER (expander));
- gexpander = glade_widget_get_from_gobject (expander);
- g_return_if_fail (GLADE_IS_WIDGET (gexpander));
-
- /* If we didnt put this object here... */
- if ((label = gtk_expander_get_label_widget (GTK_EXPANDER (expander))) == NULL
- || (glade_widget_get_from_gobject (label) == NULL))
- {
- glabel = glade_widget_adaptor_create_widget (wadaptor, FALSE,
- "parent", gexpander,
- "project",
- glade_widget_get_project
- (gexpander), NULL);
-
- glade_widget_property_set (glabel, "label", "expander");
-
- g_object_set_data (glade_widget_get_object (glabel), "special-child-type", "label_item");
- glade_widget_add_child (gexpander, glabel, FALSE);
- }
-
- gtk_expander_set_expanded (GTK_EXPANDER (expander), TRUE);
-
- gtk_container_add (GTK_CONTAINER (expander), glade_placeholder_new ());
-
-}
-
-void
-glade_gtk_expander_replace_child (GladeWidgetAdaptor * adaptor,
- GtkWidget * container,
- GtkWidget * current, GtkWidget * new_widget)
-{
- gchar *special_child_type;
-
- special_child_type =
- g_object_get_data (G_OBJECT (current), "special-child-type");
-
- if (special_child_type && !strcmp (special_child_type, "label_item"))
- {
- g_object_set_data (G_OBJECT (new_widget), "special-child-type",
- "label_item");
- gtk_expander_set_label_widget (GTK_EXPANDER (container), new_widget);
- return;
- }
-
- /* Chain Up */
- GWA_GET_CLASS
- (GTK_TYPE_CONTAINER)->replace_child (adaptor,
- G_OBJECT (container),
- G_OBJECT (current),
- G_OBJECT (new_widget));
-}
-
-
-void
-glade_gtk_expander_add_child (GladeWidgetAdaptor * adaptor,
- GObject * object, GObject * child)
-{
- gchar *special_child_type;
-
- special_child_type = g_object_get_data (child, "special-child-type");
-
- if (special_child_type && !strcmp (special_child_type, "label"))
- {
- g_object_set_data (child, "special-child-type", "label_item");
- gtk_expander_set_label_widget (GTK_EXPANDER (object), GTK_WIDGET (child));
- }
- else if (special_child_type && !strcmp (special_child_type, "label_item"))
- {
- gtk_expander_set_label_widget (GTK_EXPANDER (object), GTK_WIDGET (child));
- }
- else
- /* Chain Up */
- GWA_GET_CLASS (GTK_TYPE_CONTAINER)->add (adaptor, object, child);
-}
-
-void
-glade_gtk_expander_remove_child (GladeWidgetAdaptor * adaptor,
- GObject * object, GObject * child)
-{
- gchar *special_child_type;
-
- special_child_type = g_object_get_data (child, "special-child-type");
- if (special_child_type && !strcmp (special_child_type, "label_item"))
- {
- gtk_expander_set_label_widget (GTK_EXPANDER (object),
- glade_placeholder_new ());
- }
- else
- {
- gtk_container_remove (GTK_CONTAINER (object), GTK_WIDGET (child));
- gtk_container_add (GTK_CONTAINER (object), glade_placeholder_new ());
- }
-}
-
-void
-glade_gtk_expander_write_child (GladeWidgetAdaptor * adaptor,
- GladeWidget * widget,
- GladeXmlContext * context, GladeXmlNode * node)
-{
-
- if (!glade_gtk_write_special_child_label_item (adaptor, widget, context, node,
- GWA_GET_CLASS (GTK_TYPE_CONTAINER)->
- write_child))
- /* Chain Up */
- GWA_GET_CLASS
- (GTK_TYPE_CONTAINER)->write_child (adaptor, widget, context, node);
-}
-
-
/* -------------------------------- GtkEntry -------------------------------- */
gboolean
diff --git a/po/POTFILES.in b/po/POTFILES.in
index eeac9ce..6ee82fb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -64,6 +64,7 @@ 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-expander.c
plugins/gtk+/glade-gtk-frame.c
plugins/gtk+/glade-gtk-grid.c
plugins/gtk+/glade-gtk-notebook.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]