[glade/glade-3-8] Moved GtkComboBoxText support code to its own file for better comparison with the code in master.
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade/glade-3-8] Moved GtkComboBoxText support code to its own file for better comparison with the code in master.
- Date: Mon, 7 Oct 2013 19:33:33 +0000 (UTC)
commit bcd3c34fdf749701e7d7b144d492510d6f67b1f7
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date: Mon Oct 7 16:25:24 2013 -0300
Moved GtkComboBoxText support code to its own file for better comparison with the code in master.
Added missing fmt parameter to glade_gtk_combo_box_text_string_from_value()
Mark glade-items property as libglade unsupported.
plugins/gtk+/Makefile.am | 2 +-
plugins/gtk+/glade-gtk-combo-box-text.c | 241 +++++++++++++++++++++++++++++++
plugins/gtk+/glade-gtk.c | 212 ---------------------------
plugins/gtk+/gtk+.xml.in | 2 +-
4 files changed, 243 insertions(+), 214 deletions(-)
---
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index ee03044..903ef4d 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -25,7 +25,7 @@ libgladegtk_la_SOURCES = glade-gtk.c glade-accels.c glade-attributes.c glade
glade-icon-sources.c glade-button-editor.c glade-tool-button-editor.c glade-image-editor.c \
glade-image-item-editor.c glade-icon-factory-editor.c glade-store-editor.c glade-label-editor.c \
glade-cell-renderer-editor.c glade-treeview-editor.c glade-entry-editor.c glade-activatable-editor.c \
- glade-tool-item-group-editor.c glade-string-list.c
+ glade-tool-item-group-editor.c glade-string-list.c glade-gtk-combo-box-text.c
libgladegtk_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
libgladegtk_la_LIBADD = $(libgladeui) $(GTK_LIBS)
diff --git a/plugins/gtk+/glade-gtk-combo-box-text.c b/plugins/gtk+/glade-gtk-combo-box-text.c
new file mode 100644
index 0000000..59fc23a
--- /dev/null
+++ b/plugins/gtk+/glade-gtk-combo-box-text.c
@@ -0,0 +1,241 @@
+/*
+ * glade-gtk-combo-box-text.c - GladeWidgetAdaptor for GtkComboBoxText
+ *
+ * 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-string-list.h"
+
+#define GLADE_TAG_ITEMS "items"
+#define GLADE_TAG_ITEM "item"
+
+void
+glade_gtk_combo_box_text_post_create (GladeWidgetAdaptor *adaptor,
+ GObject *object,
+ GladeCreateReason reason)
+{
+ GladeWidget *gwidget;
+
+ /* Chain Up */
+ GWA_GET_CLASS (GTK_TYPE_COMBO_BOX)->post_create (adaptor, object, reason);
+
+ /* No editor, no model, no cells on a GtkComboBoxText, just the items. */
+ gwidget = glade_widget_get_from_gobject (object);
+ if (gwidget)
+ glade_widget_get_action (gwidget, "launch_editor")->sensitive = FALSE;
+}
+
+GladeEditorProperty *
+glade_gtk_combo_box_text_create_eprop (GladeWidgetAdaptor *adaptor,
+ GladePropertyClass *klass,
+ gboolean use_command)
+{
+ GladeEditorProperty *eprop;
+ GParamSpec *pspec;
+
+ pspec = klass->pspec;
+
+ if (pspec->value_type == GLADE_TYPE_STRING_LIST)
+ {
+ eprop = glade_eprop_string_list_new (klass, use_command, TRUE);
+ }
+ else
+ eprop = GWA_GET_CLASS
+ (GTK_TYPE_WIDGET)->create_eprop (adaptor, klass, use_command);
+
+ return eprop;
+}
+
+gchar *
+glade_gtk_combo_box_text_string_from_value (GladeWidgetAdaptor *adaptor,
+ GladePropertyClass *klass,
+ const GValue *value,
+ GladeProjectFormat fmt)
+{
+ GParamSpec *pspec;
+
+ pspec = klass->pspec;
+
+ if (pspec->value_type == GLADE_TYPE_STRING_LIST)
+ {
+ GList *list = g_value_get_boxed (value);
+
+ return glade_string_list_to_string (list);
+ }
+ else
+ return GWA_GET_CLASS
+ (GTK_TYPE_COMBO_BOX)->string_from_value (adaptor, klass, value, fmt);
+}
+
+void
+glade_gtk_combo_box_text_set_property (GladeWidgetAdaptor *adaptor,
+ GObject *object,
+ const gchar *id,
+ const GValue *value)
+{
+ if (!strcmp (id, "glade-items"))
+ {
+ GList *string_list, *l;
+ GladeString *string;
+ gint active;
+
+ string_list = g_value_get_boxed (value);
+
+ active = gtk_combo_box_get_active (GTK_COMBO_BOX (object));
+
+ /* Update comboboxtext items */
+ gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (object))));
+
+ for (l = string_list; l; l = l->next)
+ {
+ string = l->data;
+
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (object), string->string);
+ }
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (object),
+ CLAMP (active, 0, g_list_length (string_list) - 1));
+ }
+ else
+ GWA_GET_CLASS (GTK_TYPE_COMBO_BOX)->set_property (adaptor, object, id, value);
+}
+
+static void
+glade_gtk_combo_box_text_read_items (GladeWidget *widget, GladeXmlNode *node)
+{
+ GladeXmlNode *items_node;
+ GladeXmlNode *item_node;
+ GList *string_list = NULL;
+
+ if ((items_node =
+ glade_xml_search_child (node, GLADE_TAG_ITEMS)) != NULL)
+ {
+
+ for (item_node = glade_xml_node_get_children (items_node);
+ item_node; item_node = glade_xml_node_next (item_node))
+ {
+ gchar *str, *comment, *context;
+ gboolean translatable;
+
+ if (!glade_xml_node_verify (item_node, GLADE_TAG_ITEM))
+ continue;
+
+ if ((str = glade_xml_get_content (item_node)) == NULL)
+ continue;
+
+ context = glade_xml_get_property_string (item_node, GLADE_TAG_CONTEXT);
+ comment = glade_xml_get_property_string (item_node, GLADE_TAG_COMMENT);
+ translatable = glade_xml_get_property_boolean (item_node, GLADE_TAG_TRANSLATABLE, FALSE);
+
+ string_list =
+ glade_string_list_append (string_list,
+ str, comment, context, translatable);
+
+ g_free (str);
+ g_free (context);
+ g_free (comment);
+ }
+
+ glade_widget_property_set (widget, "glade-items", string_list);
+ glade_string_list_free (string_list);
+ }
+}
+
+void
+glade_gtk_combo_box_text_read_widget (GladeWidgetAdaptor *adaptor,
+ GladeWidget *widget,
+ GladeXmlNode *node)
+{
+ /* First chain up and read in all the normal properties.. */
+ GWA_GET_CLASS (GTK_TYPE_COMBO_BOX)->read_widget (adaptor, widget, node);
+
+ if (!glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET(GLADE_XML_TAG_BUILDER_WIDGET)))
+ return;
+
+ glade_gtk_combo_box_text_read_items (widget, node);
+}
+
+static void
+glade_gtk_combo_box_text_write_items (GladeWidget *widget,
+ GladeXmlContext *context,
+ GladeXmlNode *node)
+{
+ GladeXmlNode *item_node;
+ GList *string_list = NULL, *l;
+ GladeString *string;
+
+ if (!glade_widget_property_get (widget, "glade-items", &string_list) || !string_list)
+ return;
+
+ for (l = string_list; l; l = l->next)
+ {
+ string = l->data;
+
+ item_node = glade_xml_node_new (context, GLADE_TAG_ITEM);
+ glade_xml_node_append_child (node, item_node);
+
+ glade_xml_set_content (item_node, string->string);
+
+ if (string->translatable)
+ glade_xml_node_set_property_string (item_node,
+ GLADE_TAG_TRANSLATABLE,
+ GLADE_XML_TAG_I18N_TRUE);
+
+ if (string->comment)
+ glade_xml_node_set_property_string (item_node,
+ GLADE_TAG_COMMENT,
+ string->comment);
+
+ if (string->context)
+ glade_xml_node_set_property_string (item_node,
+ GLADE_TAG_CONTEXT,
+ string->context);
+ }
+}
+
+void
+glade_gtk_combo_box_text_write_widget (GladeWidgetAdaptor *adaptor,
+ GladeWidget *widget,
+ GladeXmlContext *context,
+ GladeXmlNode *node)
+{
+ GladeXmlNode *attrs_node;
+
+ /* First chain up and read in all the normal properties.. */
+ GWA_GET_CLASS (GTK_TYPE_WIDGET)->write_widget (adaptor, widget, context,
+ node);
+
+ if (!glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET(GLADE_XML_TAG_BUILDER_WIDGET)))
+ return;
+
+ attrs_node = glade_xml_node_new (context, GLADE_TAG_ITEMS);
+
+ glade_gtk_combo_box_text_write_items (widget, context, attrs_node);
+
+ if (!glade_xml_node_get_children (attrs_node))
+ glade_xml_node_delete (attrs_node);
+ else
+ glade_xml_node_append_child (node, attrs_node);
+
+}
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index e5a1138..c784341 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -44,7 +44,6 @@
#include "glade-entry-editor.h"
#include "glade-activatable-editor.h"
#include "glade-tool-item-group-editor.h"
-#include "glade-string-list.h"
#include <gladeui/glade-editor-property.h>
#include <gladeui/glade-base-editor.h>
@@ -9492,217 +9491,6 @@ glade_gtk_combo_box_entry_set_property (GladeWidgetAdaptor *adaptor,
id, value);
}
-/* ----------------------------- GtkComboBoxText ------------------------------ */
-#define GLADE_TAG_ITEMS "items"
-#define GLADE_TAG_ITEM "item"
-
-void
-glade_gtk_combo_box_text_post_create (GladeWidgetAdaptor *adaptor,
- GObject *object,
- GladeCreateReason reason)
-{
- GladeWidget *gwidget;
-
- /* Chain Up */
- GWA_GET_CLASS (GTK_TYPE_COMBO_BOX)->post_create (adaptor, object, reason);
-
- /* No editor, no model, no cells on a GtkComboBoxText, just the items. */
- gwidget = glade_widget_get_from_gobject (object);
- if (gwidget)
- glade_widget_get_action (gwidget, "launch_editor")->sensitive = FALSE;
-}
-
-GladeEditorProperty *
-glade_gtk_combo_box_text_create_eprop (GladeWidgetAdaptor * adaptor,
- GladePropertyClass * klass,
- gboolean use_command)
-{
- GladeEditorProperty *eprop;
- GParamSpec *pspec;
-
- pspec = klass->pspec;
-
- if (pspec->value_type == GLADE_TYPE_STRING_LIST)
- {
- eprop = glade_eprop_string_list_new (klass, use_command, TRUE);
- }
- else
- eprop = GWA_GET_CLASS
- (GTK_TYPE_WIDGET)->create_eprop (adaptor, klass, use_command);
-
- return eprop;
-}
-
-gchar *
-glade_gtk_combo_box_text_string_from_value (GladeWidgetAdaptor * adaptor,
- GladePropertyClass * klass,
- const GValue * value)
-{
- GParamSpec *pspec;
-
- pspec = klass->pspec;
-
- if (pspec->value_type == GLADE_TYPE_STRING_LIST)
- {
- GList *list = g_value_get_boxed (value);
-
- return glade_string_list_to_string (list);
- }
- else
- return GWA_GET_CLASS
- (GTK_TYPE_COMBO_BOX)->string_from_value (adaptor, klass, value, GLADE_PROJECT_FORMAT_GTKBUILDER);
-}
-
-void
-glade_gtk_combo_box_text_set_property (GladeWidgetAdaptor * adaptor,
- GObject * object,
- const gchar * id, const GValue * value)
-{
- if (!strcmp (id, "glade-items"))
- {
- GList *string_list, *l;
- GladeString *string;
- gint active;
-
- string_list = g_value_get_boxed (value);
-
- active = gtk_combo_box_get_active (GTK_COMBO_BOX (object));
-
- /* Update comboboxtext items */
- gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (object))));
-
- for (l = string_list; l; l = l->next)
- {
- string = l->data;
-
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (object), string->string);
- }
-
- gtk_combo_box_set_active (GTK_COMBO_BOX (object),
- CLAMP (active, 0, g_list_length (string_list) - 1));
- }
- else
- GWA_GET_CLASS (GTK_TYPE_COMBO_BOX)->set_property (adaptor, object, id, value);
-}
-
-static void
-glade_gtk_combo_box_text_read_items (GladeWidget * widget, GladeXmlNode * node)
-{
- GladeXmlNode *items_node;
- GladeXmlNode *item_node;
- GList *string_list = NULL;
-
- if ((items_node =
- glade_xml_search_child (node, GLADE_TAG_ITEMS)) != NULL)
- {
-
- for (item_node = glade_xml_node_get_children (items_node);
- item_node; item_node = glade_xml_node_next (item_node))
- {
- gchar *str, *comment, *context;
- gboolean translatable;
-
- if (!glade_xml_node_verify (item_node, GLADE_TAG_ITEM))
- continue;
-
- if ((str = glade_xml_get_content (item_node)) == NULL)
- continue;
-
- context = glade_xml_get_property_string (item_node, GLADE_TAG_CONTEXT);
- comment = glade_xml_get_property_string (item_node, GLADE_TAG_COMMENT);
- translatable = glade_xml_get_property_boolean (item_node, GLADE_TAG_TRANSLATABLE, FALSE);
-
- string_list =
- glade_string_list_append (string_list,
- str, comment, context, translatable);
-
- g_free (str);
- g_free (context);
- g_free (comment);
- }
-
- glade_widget_property_set (widget, "glade-items", string_list);
- glade_string_list_free (string_list);
- }
-}
-
-void
-glade_gtk_combo_box_text_read_widget (GladeWidgetAdaptor * adaptor,
- GladeWidget * widget, GladeXmlNode * node)
-{
- if (!glade_xml_node_verify (node, GLADE_XML_TAG_WIDGET(GLADE_XML_TAG_BUILDER_WIDGET)))
- return;
-
- /* First chain up and read in all the normal properties.. */
- GWA_GET_CLASS (GTK_TYPE_COMBO_BOX)->read_widget (adaptor, widget, node);
-
- glade_gtk_combo_box_text_read_items (widget, node);
-}
-
-static void
-glade_gtk_combo_box_text_write_items (GladeWidget * widget,
- GladeXmlContext * context,
- GladeXmlNode * node)
-{
- GladeXmlNode *item_node;
- GList *string_list = NULL, *l;
- GladeString *string;
-
- if (!glade_widget_property_get (widget, "glade-items", &string_list) || !string_list)
- return;
-
- for (l = string_list; l; l = l->next)
- {
- string = l->data;
-
- item_node = glade_xml_node_new (context, GLADE_TAG_ITEM);
- glade_xml_node_append_child (node, item_node);
-
- glade_xml_set_content (item_node, string->string);
-
- if (string->translatable)
- glade_xml_node_set_property_string (item_node,
- GLADE_TAG_TRANSLATABLE,
- GLADE_XML_TAG_I18N_TRUE);
-
- if (string->comment)
- glade_xml_node_set_property_string (item_node,
- GLADE_TAG_COMMENT,
- string->comment);
-
- if (string->context)
- glade_xml_node_set_property_string (item_node,
- GLADE_TAG_CONTEXT,
- string->context);
- }
-}
-
-void
-glade_gtk_combo_box_text_write_widget (GladeWidgetAdaptor * adaptor,
- GladeWidget * widget,
- GladeXmlContext * context, GladeXmlNode * node)
-{
- GladeXmlNode *attrs_node;
-
- if (!glade_xml_node_verify (node, GLADE_XML_TAG_WIDGET(GLADE_XML_TAG_BUILDER_WIDGET)))
- return;
-
- /* First chain up and read in all the normal properties.. */
- GWA_GET_CLASS (GTK_TYPE_WIDGET)->write_widget (adaptor, widget, context,
- node);
-
- attrs_node = glade_xml_node_new (context, GLADE_TAG_ITEMS);
-
- glade_gtk_combo_box_text_write_items (widget, context, attrs_node);
-
- if (!glade_xml_node_get_children (attrs_node))
- glade_xml_node_delete (attrs_node);
- else
- glade_xml_node_append_child (node, attrs_node);
-
-}
-
-
/* ----------------------------- GtkSpinButton ------------------------------ */
static void
glade_gtk_spin_button_set_adjustment (GObject *object, const GValue *value)
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index 61f4f38..f5719f9 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -1245,7 +1245,7 @@ embedded in another object</_tooltip>
<properties>
<property id="model" disabled="True"/>
- <property id="glade-items" _name="Items" save="False" since="2.24">
+ <property id="glade-items" _name="Items" save="False" since="2.24" libglade-unsupported="True">
<parameter-spec>
<type>GParamBoxed</type>
<value-type>GladeStringList</value-type>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
