[glade] Move GladeWidgetAdaptor code for GtkImageMenuItem 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 GtkImageMenuItem into it's own C file
- Date: Fri, 3 May 2013 17:07:53 +0000 (UTC)
commit 16906e0f14f0354d6ec546cbf12214f85eb10995
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Fri May 3 23:31:54 2013 +0900
Move GladeWidgetAdaptor code for GtkImageMenuItem into it's own C file
plugins/gtk+/Makefile.am | 1 +
plugins/gtk+/glade-gtk-image-menu-item.c | 237 ++++++++++++++++++++++++++++++
plugins/gtk+/glade-gtk.c | 208 --------------------------
po/POTFILES.in | 1 +
4 files changed, 239 insertions(+), 208 deletions(-)
---
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index 61eda94..e3ef0ee 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -46,6 +46,7 @@ libgladegtk_la_SOURCES = \
glade-gtk-frame.c \
glade-gtk-grid.c \
glade-gtk-image.c \
+ glade-gtk-image-menu-item.c \
glade-gtk-info-bar.c \
glade-gtk-menu.c \
glade-gtk-menu-item.c \
diff --git a/plugins/gtk+/glade-gtk-image-menu-item.c b/plugins/gtk+/glade-gtk-image-menu-item.c
new file mode 100644
index 0000000..b09ed05
--- /dev/null
+++ b/plugins/gtk+/glade-gtk-image-menu-item.c
@@ -0,0 +1,237 @@
+/*
+ * glade-gtk-image-menu-item.c - GladeWidgetAdaptor for GtkImageMenuItem
+ *
+ * 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-image-item-editor.h"
+#include "glade-gtk-button.h"
+#include "glade-gtk.h"
+
+static void
+glade_gtk_image_menu_item_set_use_stock (GObject * object, const GValue * value)
+{
+ GladeWidget *widget = glade_widget_get_from_gobject (object);
+ gboolean use_stock;
+
+ use_stock = g_value_get_boolean (value);
+
+ /* Set some things */
+ if (use_stock)
+ {
+ glade_widget_property_set_sensitive (widget, "stock", TRUE, NULL);
+ glade_widget_property_set_sensitive (widget, "accel-group", TRUE, NULL);
+ }
+ else
+ {
+ glade_widget_property_set_sensitive (widget, "stock", FALSE,
+ NOT_SELECTED_MSG);
+ glade_widget_property_set_sensitive (widget, "accel-group", FALSE,
+ NOT_SELECTED_MSG);
+ }
+
+ gtk_image_menu_item_set_use_stock (GTK_IMAGE_MENU_ITEM (object), use_stock);
+
+ glade_gtk_sync_use_appearance (widget);
+}
+
+static gboolean
+glade_gtk_image_menu_item_set_label (GObject * object, const GValue * value)
+{
+ GladeWidget *gitem;
+ GtkWidget *label;
+ gboolean use_underline = FALSE, use_stock = FALSE;
+ const gchar *text;
+
+ gitem = glade_widget_get_from_gobject (object);
+ label = gtk_bin_get_child (GTK_BIN (object));
+
+ glade_widget_property_get (gitem, "use-stock", &use_stock);
+ glade_widget_property_get (gitem, "use-underline", &use_underline);
+ text = g_value_get_string (value);
+
+ /* In "use-stock" mode we dont have a GladeWidget child image */
+ if (use_stock)
+ {
+ GtkWidget *image;
+ GtkStockItem item;
+
+ image =
+ gtk_image_new_from_stock (g_value_get_string (value),
+ GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (object), image);
+
+ if (use_underline)
+ gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
+
+ /* Get the label string... */
+ if (text && gtk_stock_lookup (text, &item))
+ gtk_label_set_label (GTK_LABEL (label), item.label);
+ else
+ gtk_label_set_label (GTK_LABEL (label), text ? text : "");
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+glade_gtk_image_menu_item_set_stock (GObject * object, const GValue * value)
+{
+ GladeWidget *gitem;
+ gboolean use_stock = FALSE;
+
+ gitem = glade_widget_get_from_gobject (object);
+
+ glade_widget_property_get (gitem, "use-stock", &use_stock);
+
+ /* Forward the work along to the label handler... */
+ if (use_stock)
+ glade_gtk_image_menu_item_set_label (object, value);
+}
+
+void
+glade_gtk_image_menu_item_set_property (GladeWidgetAdaptor * adaptor,
+ GObject * object,
+ const gchar * id, const GValue * value)
+{
+ if (!strcmp (id, "stock"))
+ glade_gtk_image_menu_item_set_stock (object, value);
+ else if (!strcmp (id, "use-stock"))
+ glade_gtk_image_menu_item_set_use_stock (object, value);
+ else if (!strcmp (id, "label"))
+ {
+ if (!glade_gtk_image_menu_item_set_label (object, value))
+ GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->set_property (adaptor, object,
+ id, value);
+ }
+ else
+ GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->set_property (adaptor, object,
+ id, value);
+}
+
+static void
+glade_gtk_image_menu_item_parse_finished (GladeProject * project,
+ GladeWidget * widget)
+{
+ GladeWidget *gimage;
+ GtkWidget *image = NULL;
+ glade_widget_property_get (widget, "image", &image);
+
+ if (image && (gimage = glade_widget_get_from_gobject (image)))
+ glade_widget_lock (widget, gimage);
+}
+
+void
+glade_gtk_image_menu_item_read_widget (GladeWidgetAdaptor * adaptor,
+ GladeWidget * widget,
+ GladeXmlNode * node)
+{
+ GladeProperty *property;
+ gboolean use_stock;
+ gchar *label = NULL;
+
+ if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) ||
+ glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE)))
+ return;
+
+ /* First chain up and read in all the normal properties.. */
+ GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->read_widget (adaptor, widget, node);
+
+ glade_widget_property_get (widget, "use-stock", &use_stock);
+ if (use_stock)
+ {
+ property = glade_widget_get_property (widget, "label");
+
+ glade_property_get (property, &label);
+ glade_widget_property_set (widget, "use-underline", TRUE);
+ glade_widget_property_set (widget, "stock", label);
+ glade_property_sync (property);
+ }
+
+ /* Update sensitivity of related properties... */
+ property = glade_widget_get_property (widget, "use-stock");
+ glade_property_sync (property);
+
+
+ /* Run this after the load so that image is resolved. */
+ g_signal_connect (G_OBJECT (glade_widget_get_project (widget)), "parse-finished",
+ G_CALLBACK (glade_gtk_image_menu_item_parse_finished),
+ widget);
+}
+
+
+void
+glade_gtk_image_menu_item_write_widget (GladeWidgetAdaptor * adaptor,
+ GladeWidget * widget,
+ GladeXmlContext * context,
+ GladeXmlNode * node)
+{
+ GladeProperty *label_prop;
+ gboolean use_stock;
+ gchar *stock;
+
+ if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) ||
+ glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE)))
+ return;
+
+ /* Make a copy of the GladeProperty, override its value if use-stock is TRUE */
+ label_prop = glade_widget_get_property (widget, "label");
+ label_prop = glade_property_dup (label_prop, widget);
+ glade_widget_property_get (widget, "use-stock", &use_stock);
+ if (use_stock)
+ {
+ glade_widget_property_get (widget, "stock", &stock);
+ glade_property_set (label_prop, stock);
+ glade_property_i18n_set_translatable (label_prop, FALSE);
+ }
+ glade_property_write (label_prop, context, node);
+ g_object_unref (G_OBJECT (label_prop));
+
+ /* Chain up and write all the normal properties ... */
+ GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->write_widget (adaptor, widget, context,
+ node);
+
+}
+
+/* We need write_widget to write child images as internal, in builder, they are
+ * attached as a property
+ */
+
+GladeEditable *
+glade_gtk_image_menu_item_create_editable (GladeWidgetAdaptor * adaptor,
+ GladeEditorPageType type)
+{
+ GladeEditable *editable;
+
+ /* Get base editable */
+ editable =
+ GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->create_editable (adaptor, type);
+
+ if (type == GLADE_PAGE_GENERAL)
+ return (GladeEditable *) glade_image_item_editor_new (adaptor, editable);
+
+ return editable;
+}
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 19eda9e..8a76f90 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -81,214 +81,6 @@ glade_gtk_init (const gchar * name)
{
}
-/* ----------------------------- GtkImageMenuItem ------------------------------ */
-static void
-glade_gtk_image_menu_item_set_use_stock (GObject * object, const GValue * value)
-{
- GladeWidget *widget = glade_widget_get_from_gobject (object);
- gboolean use_stock;
-
- use_stock = g_value_get_boolean (value);
-
- /* Set some things */
- if (use_stock)
- {
- glade_widget_property_set_sensitive (widget, "stock", TRUE, NULL);
- glade_widget_property_set_sensitive (widget, "accel-group", TRUE, NULL);
- }
- else
- {
- glade_widget_property_set_sensitive (widget, "stock", FALSE,
- NOT_SELECTED_MSG);
- glade_widget_property_set_sensitive (widget, "accel-group", FALSE,
- NOT_SELECTED_MSG);
- }
-
- gtk_image_menu_item_set_use_stock (GTK_IMAGE_MENU_ITEM (object), use_stock);
-
- glade_gtk_sync_use_appearance (widget);
-}
-
-static gboolean
-glade_gtk_image_menu_item_set_label (GObject * object, const GValue * value)
-{
- GladeWidget *gitem;
- GtkWidget *label;
- gboolean use_underline = FALSE, use_stock = FALSE;
- const gchar *text;
-
- gitem = glade_widget_get_from_gobject (object);
- label = gtk_bin_get_child (GTK_BIN (object));
-
- glade_widget_property_get (gitem, "use-stock", &use_stock);
- glade_widget_property_get (gitem, "use-underline", &use_underline);
- text = g_value_get_string (value);
-
- /* In "use-stock" mode we dont have a GladeWidget child image */
- if (use_stock)
- {
- GtkWidget *image;
- GtkStockItem item;
-
- image =
- gtk_image_new_from_stock (g_value_get_string (value),
- GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (object), image);
-
- if (use_underline)
- gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
-
- /* Get the label string... */
- if (text && gtk_stock_lookup (text, &item))
- gtk_label_set_label (GTK_LABEL (label), item.label);
- else
- gtk_label_set_label (GTK_LABEL (label), text ? text : "");
-
- return TRUE;
- }
-
- return FALSE;
-}
-
-static void
-glade_gtk_image_menu_item_set_stock (GObject * object, const GValue * value)
-{
- GladeWidget *gitem;
- gboolean use_stock = FALSE;
-
- gitem = glade_widget_get_from_gobject (object);
-
- glade_widget_property_get (gitem, "use-stock", &use_stock);
-
- /* Forward the work along to the label handler... */
- if (use_stock)
- glade_gtk_image_menu_item_set_label (object, value);
-}
-
-void
-glade_gtk_image_menu_item_set_property (GladeWidgetAdaptor * adaptor,
- GObject * object,
- const gchar * id, const GValue * value)
-{
- if (!strcmp (id, "stock"))
- glade_gtk_image_menu_item_set_stock (object, value);
- else if (!strcmp (id, "use-stock"))
- glade_gtk_image_menu_item_set_use_stock (object, value);
- else if (!strcmp (id, "label"))
- {
- if (!glade_gtk_image_menu_item_set_label (object, value))
- GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->set_property (adaptor, object,
- id, value);
- }
- else
- GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->set_property (adaptor, object,
- id, value);
-}
-
-static void
-glade_gtk_image_menu_item_parse_finished (GladeProject * project,
- GladeWidget * widget)
-{
- GladeWidget *gimage;
- GtkWidget *image = NULL;
- glade_widget_property_get (widget, "image", &image);
-
- if (image && (gimage = glade_widget_get_from_gobject (image)))
- glade_widget_lock (widget, gimage);
-}
-
-void
-glade_gtk_image_menu_item_read_widget (GladeWidgetAdaptor * adaptor,
- GladeWidget * widget,
- GladeXmlNode * node)
-{
- GladeProperty *property;
- gboolean use_stock;
- gchar *label = NULL;
-
- if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) ||
- glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE)))
- return;
-
- /* First chain up and read in all the normal properties.. */
- GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->read_widget (adaptor, widget, node);
-
- glade_widget_property_get (widget, "use-stock", &use_stock);
- if (use_stock)
- {
- property = glade_widget_get_property (widget, "label");
-
- glade_property_get (property, &label);
- glade_widget_property_set (widget, "use-underline", TRUE);
- glade_widget_property_set (widget, "stock", label);
- glade_property_sync (property);
- }
-
- /* Update sensitivity of related properties... */
- property = glade_widget_get_property (widget, "use-stock");
- glade_property_sync (property);
-
-
- /* Run this after the load so that image is resolved. */
- g_signal_connect (G_OBJECT (glade_widget_get_project (widget)), "parse-finished",
- G_CALLBACK (glade_gtk_image_menu_item_parse_finished),
- widget);
-}
-
-
-void
-glade_gtk_image_menu_item_write_widget (GladeWidgetAdaptor * adaptor,
- GladeWidget * widget,
- GladeXmlContext * context,
- GladeXmlNode * node)
-{
- GladeProperty *label_prop;
- gboolean use_stock;
- gchar *stock;
-
- if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) ||
- glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE)))
- return;
-
- /* Make a copy of the GladeProperty, override its value if use-stock is TRUE */
- label_prop = glade_widget_get_property (widget, "label");
- label_prop = glade_property_dup (label_prop, widget);
- glade_widget_property_get (widget, "use-stock", &use_stock);
- if (use_stock)
- {
- glade_widget_property_get (widget, "stock", &stock);
- glade_property_set (label_prop, stock);
- glade_property_i18n_set_translatable (label_prop, FALSE);
- }
- glade_property_write (label_prop, context, node);
- g_object_unref (G_OBJECT (label_prop));
-
- /* Chain up and write all the normal properties ... */
- GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->write_widget (adaptor, widget, context,
- node);
-
-}
-
-/* We need write_widget to write child images as internal, in builder, they are
- * attached as a property
- */
-
-GladeEditable *
-glade_gtk_image_menu_item_create_editable (GladeWidgetAdaptor * adaptor,
- GladeEditorPageType type)
-{
- GladeEditable *editable;
-
- /* Get base editable */
- editable =
- GWA_GET_CLASS (GTK_TYPE_MENU_ITEM)->create_editable (adaptor, type);
-
- if (type == GLADE_PAGE_GENERAL)
- return (GladeEditable *) glade_image_item_editor_new (adaptor, editable);
-
- return editable;
-}
-
/* ----------------------------- GtkRadioMenuItem ------------------------------ */
static void
glade_gtk_radio_menu_item_set_group (GObject * object, const GValue * value)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1e79eb9..5f88dc9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -74,6 +74,7 @@ plugins/gtk+/glade-gtk-fixed-layout.c
plugins/gtk+/glade-gtk-frame.c
plugins/gtk+/glade-gtk-grid.c
plugins/gtk+/glade-gtk-image.c
+plugins/gtk+/glade-gtk-image-menu-item.c
plugins/gtk+/glade-gtk-menu.c
plugins/gtk+/glade-gtk-menu-item.c
plugins/gtk+/glade-gtk-menu-shell.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]