[glade] Added GladeComboBoxEditor
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade] Added GladeComboBoxEditor
- Date: Mon, 13 May 2013 10:11:29 +0000 (UTC)
commit ae6bdf61f6ed6ab6f9ed607efb9fe15c163ca0c1
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Mon May 13 19:05:26 2013 +0900
Added GladeComboBoxEditor
plugins/gtk+/Makefile.am | 3 +
plugins/gtk+/glade-combo-box-editor.c | 74 ++++
plugins/gtk+/glade-combo-box-editor.h | 56 +++
plugins/gtk+/glade-combo-box-editor.ui | 539 ++++++++++++++++++++++++
plugins/gtk+/glade-gtk-combo-box-text.c | 1 -
plugins/gtk+/glade-gtk-combo-box.c | 13 +
plugins/gtk+/glade-gtk-resources.gresource.xml | 1 +
plugins/gtk+/gtk+.xml.in | 31 +-
po/POTFILES.in | 2 +
9 files changed, 705 insertions(+), 15 deletions(-)
---
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index 0c17213..3747921 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -34,6 +34,7 @@ libgladegtk_la_SOURCES = \
glade-button-editor.c \
glade-cell-renderer-editor.c \
glade-column-types.c \
+ glade-combo-box-editor.c \
glade-combo-box-text-editor.c \
glade-entry-editor.c \
glade-file-chooser-button-editor.c \
@@ -144,6 +145,7 @@ noinst_HEADERS = \
glade-button-editor.h \
glade-cell-renderer-editor.h \
glade-column-types.h \
+ glade-combo-box-editor.h \
glade-combo-box-text-editor.h \
glade-entry-editor.h \
glade-file-chooser-button-editor.h \
@@ -220,6 +222,7 @@ UI_FILES = \
glade-app-chooser-widget-editor.ui \
glade-box-editor.ui \
glade-button-editor.ui \
+ glade-combo-box-editor.ui \
glade-combo-box-text-editor.ui \
glade-entry-editor.ui \
glade-file-chooser-button-editor.ui \
diff --git a/plugins/gtk+/glade-combo-box-editor.c b/plugins/gtk+/glade-combo-box-editor.c
new file mode 100644
index 0000000..86a5a46
--- /dev/null
+++ b/plugins/gtk+/glade-combo-box-editor.c
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2013 Tristan Van Berkom.
+ *
+ * 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.
+ *
+ * Authors:
+ * Tristan Van Berkom <tvb gnome org>
+ */
+
+#include <config.h>
+#include <gladeui/glade.h>
+#include <glib/gi18n-lib.h>
+
+#include "glade-combo-box-editor.h"
+
+static void glade_combo_box_editor_grab_focus (GtkWidget * widget);
+
+struct _GladeComboBoxEditorPrivate
+{
+ GtkWidget *embed;
+};
+
+G_DEFINE_TYPE (GladeComboBoxEditor, glade_combo_box_editor, GLADE_TYPE_EDITOR_SKELETON)
+
+static void
+glade_combo_box_editor_class_init (GladeComboBoxEditorClass * klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+ widget_class->grab_focus = glade_combo_box_editor_grab_focus;
+
+ gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/gladegtk/glade-combo-box-editor.ui");
+ gtk_widget_class_bind_child (widget_class, GladeComboBoxEditorPrivate, embed);
+
+ g_type_class_add_private (object_class, sizeof (GladeComboBoxEditorPrivate));
+}
+
+static void
+glade_combo_box_editor_init (GladeComboBoxEditor * self)
+{
+ self->priv =
+ G_TYPE_INSTANCE_GET_PRIVATE (self,
+ GLADE_TYPE_COMBO_BOX_EDITOR,
+ GladeComboBoxEditorPrivate);
+
+ gtk_widget_init_template (GTK_WIDGET (self));
+}
+
+static void
+glade_combo_box_editor_grab_focus (GtkWidget * widget)
+{
+ GladeComboBoxEditor *combo_editor = GLADE_COMBO_BOX_EDITOR (widget);
+
+ gtk_widget_grab_focus (combo_editor->priv->embed);
+}
+
+GtkWidget *
+glade_combo_box_editor_new (void)
+{
+ return g_object_new (GLADE_TYPE_COMBO_BOX_EDITOR, NULL);
+}
diff --git a/plugins/gtk+/glade-combo-box-editor.h b/plugins/gtk+/glade-combo-box-editor.h
new file mode 100644
index 0000000..c177ace
--- /dev/null
+++ b/plugins/gtk+/glade-combo-box-editor.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013 Tristan Van Berkom.
+ *
+ * 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.
+ *
+ * Authors:
+ * Tristan Van Berkom <tvb gnome org>
+ */
+#ifndef _GLADE_COMBO_BOX_EDITOR_H_
+#define _GLADE_COMBO_BOX_EDITOR_H_
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GLADE_TYPE_COMBO_BOX_EDITOR (glade_combo_box_editor_get_type ())
+#define GLADE_COMBO_BOX_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GLADE_TYPE_COMBO_BOX_EDITOR, GladeComboBoxEditor))
+#define GLADE_COMBO_BOX_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
GLADE_TYPE_COMBO_BOX_EDITOR, GladeComboBoxEditorClass))
+#define GLADE_IS_COMBO_BOX_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_COMBO_BOX_EDITOR))
+#define GLADE_IS_COMBO_BOX_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
GLADE_TYPE_COMBO_BOX_EDITOR))
+#define GLADE_COMBO_BOX_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
GLADE_TYPE_COMBO_BOX_EDITOR, GladeComboBoxEditorClass))
+
+typedef struct _GladeComboBoxEditor GladeComboBoxEditor;
+typedef struct _GladeComboBoxEditorClass GladeComboBoxEditorClass;
+typedef struct _GladeComboBoxEditorPrivate GladeComboBoxEditorPrivate;
+
+struct _GladeComboBoxEditor
+{
+ GladeEditorSkeleton parent;
+
+ GladeComboBoxEditorPrivate *priv;
+};
+
+struct _GladeComboBoxEditorClass
+{
+ GladeEditorSkeletonClass parent;
+};
+
+GType glade_combo_box_editor_get_type (void) G_GNUC_CONST;
+GtkWidget *glade_combo_box_editor_new (void);
+
+G_END_DECLS
+
+#endif /* _GLADE_COMBO_BOX_EDITOR_H_ */
diff --git a/plugins/gtk+/glade-combo-box-editor.ui b/plugins/gtk+/glade-combo-box-editor.ui
new file mode 100644
index 0000000..bdd094b
--- /dev/null
+++ b/plugins/gtk+/glade-combo-box-editor.ui
@@ -0,0 +1,539 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="glade">
+ <!-- interface-requires gladeui 0.0 -->
+ <!-- interface-requires gtk+ 3.10 -->
+ <template class="GladeComboBoxEditor" parent="GladeEditorSkeleton">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkGrid" id="grid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GladeEditorTable" id="embed">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">6</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="title">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">center</property>
+ <property name="label" translatable="yes">Combo Box Attributes</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">6</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="model_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">model</property>
+ <property name="custom_text" translatable="yes">Tree model:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="model_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="property_name">model</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="has_entry_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">has-entry</property>
+ <property name="editor_type">GladeEpropCheck</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="entry_text_column_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="property_name">entry-text-column</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">8</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="entry_text_column_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">entry-text-column</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="has_frame_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">has-frame</property>
+ <property name="editor_type">GladeEpropCheck</property>
+ <property name="custom_text" translatable="yes">Draw frame around entry</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="add_tearoffs_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">add-tearoffs</property>
+ <property name="editor_type">GladeEpropCheck</property>
+ <property name="custom_text" translatable="yes">Tearoff menus</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="tearoff_title_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="property_name">tearoff-title</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">9</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="tearoff_title_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="property_name">tearoff-title</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">9</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="active_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">active</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="active_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">active</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="active_id_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">active-id</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="active_id_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">active-id</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="button_sensitivity_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">button-sensitivity</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="button_sensitivity_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">button-sensitivity</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="id_column_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">id-column</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="id_column_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">id-column</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="focus_on_click_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">focus-on-click</property>
+ <property name="editor_type">GladeEpropCheck</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">10</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="popup_fixed_width_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">popup-fixed-width</property>
+ <property name="editor_type">GladeEpropCheck</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">10</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="tabular_title">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">center</property>
+ <property name="label" translatable="yes">Tabular Menus</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">11</property>
+ <property name="width">6</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="wrap_width_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">wrap-width</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">12</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="wrap_width_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">wrap-width</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">12</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="row_span_column_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">row-span-column</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">13</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyLabel" id="column_span_column_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">column-span-column</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">14</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="row_span_column_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">row-span-column</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">13</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GladePropertyShell" id="column_span_column_editor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="property_name">column-span-column</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">14</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child-editors>
+ <editor id="embed"/>
+ <editor id="model_label"/>
+ <editor id="model_editor"/>
+ <editor id="has_entry_editor"/>
+ <editor id="entry_text_column_label"/>
+ <editor id="entry_text_column_editor"/>
+ <editor id="has_frame_editor"/>
+ <editor id="add_tearoffs_editor"/>
+ <editor id="tearoff_title_label"/>
+ <editor id="tearoff_title_editor"/>
+ <editor id="active_label"/>
+ <editor id="active_editor"/>
+ <editor id="active_id_label"/>
+ <editor id="active_id_editor"/>
+ <editor id="button_sensitivity_label"/>
+ <editor id="button_sensitivity_editor"/>
+ <editor id="id_column_label"/>
+ <editor id="id_column_editor"/>
+ <editor id="focus_on_click_editor"/>
+ <editor id="popup_fixed_width_editor"/>
+ <editor id="wrap_width_label"/>
+ <editor id="wrap_width_editor"/>
+ <editor id="row_span_column_label"/>
+ <editor id="column_span_column_label"/>
+ <editor id="row_span_column_editor"/>
+ <editor id="column_span_column_editor"/>
+ </child-editors>
+ </template>
+</interface>
diff --git a/plugins/gtk+/glade-gtk-combo-box-text.c b/plugins/gtk+/glade-gtk-combo-box-text.c
index 64702ed..562dc96 100644
--- a/plugins/gtk+/glade-gtk-combo-box-text.c
+++ b/plugins/gtk+/glade-gtk-combo-box-text.c
@@ -31,7 +31,6 @@
#define GLADE_TAG_ITEMS "items"
#define GLADE_TAG_ITEM "item"
-
GladeEditable *
glade_gtk_combo_box_text_create_editable (GladeWidgetAdaptor * adaptor,
GladeEditorPageType type)
diff --git a/plugins/gtk+/glade-gtk-combo-box.c b/plugins/gtk+/glade-gtk-combo-box.c
index cdfadf7..fc93118 100644
--- a/plugins/gtk+/glade-gtk-combo-box.c
+++ b/plugins/gtk+/glade-gtk-combo-box.c
@@ -26,9 +26,22 @@
#include <gladeui/glade.h>
#include "glade-gtk-cell-layout.h"
+#include "glade-combo-box-editor.h"
#define NO_ENTRY_MSG _("This combo box is not configured to have an entry")
+GladeEditable *
+glade_gtk_combo_box_create_editable (GladeWidgetAdaptor * adaptor,
+ GladeEditorPageType type)
+{
+ if (type == GLADE_PAGE_GENERAL)
+ {
+ return (GladeEditable *) glade_combo_box_editor_new ();
+ }
+
+ return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);
+}
+
void
glade_gtk_combo_box_post_create (GladeWidgetAdaptor *adaptor,
GObject *object,
diff --git a/plugins/gtk+/glade-gtk-resources.gresource.xml b/plugins/gtk+/glade-gtk-resources.gresource.xml
index 8698b32..b057aa0 100644
--- a/plugins/gtk+/glade-gtk-resources.gresource.xml
+++ b/plugins/gtk+/glade-gtk-resources.gresource.xml
@@ -8,6 +8,7 @@
<file compressed="true" preprocess="xml-stripblanks">glade-app-chooser-widget-editor.ui</file>
<file compressed="true" preprocess="xml-stripblanks">glade-box-editor.ui</file>
<file compressed="true" preprocess="xml-stripblanks">glade-button-editor.ui</file>
+ <file compressed="true" preprocess="xml-stripblanks">glade-combo-box-editor.ui</file>
<file compressed="true" preprocess="xml-stripblanks">glade-combo-box-text-editor.ui</file>
<file compressed="true" preprocess="xml-stripblanks">glade-entry-editor.ui</file>
<file compressed="true" preprocess="xml-stripblanks">glade-file-chooser-button-editor.ui</file>
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index 08dfe7d..0686d15 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -1508,6 +1508,7 @@ range of values</_tooltip>
</glade-widget-class>
<glade-widget-class name="GtkComboBox" generic-name="combobox" _title="Combo Box">
+ <create-editable-function>glade_gtk_combo_box_create_editable</create-editable-function>
<post-create-function>glade_gtk_combo_box_post_create</post-create-function>
<set-property-function>glade_gtk_combo_box_set_property</set-property-function>
<add-child-verify-function>glade_gtk_cell_layout_add_verify</add-child-verify-function>
@@ -1535,21 +1536,23 @@ range of values</_tooltip>
<signal id="popup" since="2.12"/>
</signals>
<properties>
- <property id="model" create-type="GtkListStore"/>
+ <property id="has-frame" custom-layout="True"/>
+ <property id="focus-on-click" custom-layout="True"/>
+ <property id="wrap-width" custom-layout="True"/>
+ <property id="model" create-type="GtkListStore" custom-layout="True"/>
<property id="cell-area" disabled="True"/>
- <property id="popup-shown" since="2.10"/>
- <property id="arrow-scaling" since="3.2"/>
- <property id="add-tearoffs" needs-sync="True"/>
- <property id="tearoff-title" since="2.10" translatable="True"/>
- <property id="active" ignore="True"/>
- <property id="active-id" ignore="True" since="3.0"/>
- <property id="id-column" since="3.0"/>
- <property id="column-span-column" ignore="True"/>
- <property id="row-span-column" ignore="True"/>
- <property id="entry-text-column" since="2.24"/>
- <property id="has-entry" since="2.24"/>
- <property id="popup-fixed-width" since="3.0"/>
- <property id="button-sensitivity">
+ <property id="arrow-scaling" since="3.2" custom-layout="True"/>
+ <property id="add-tearoffs" needs-sync="True" custom-layout="True"/>
+ <property id="tearoff-title" since="2.10" translatable="True" custom-layout="True"/>
+ <property id="active" ignore="True" custom-layout="True"/>
+ <property id="active-id" ignore="True" since="3.0" custom-layout="True"/>
+ <property id="id-column" since="3.0" custom-layout="True"/>
+ <property id="column-span-column" ignore="True" custom-layout="True"/>
+ <property id="row-span-column" ignore="True" custom-layout="True"/>
+ <property id="entry-text-column" since="2.24" custom-layout="True"/>
+ <property id="has-entry" since="2.24" custom-layout="True"/>
+ <property id="popup-fixed-width" since="3.0" custom-layout="True"/>
+ <property id="button-sensitivity" custom-layout="True">
<displayable-values>
<value id="GTK_SENSITIVITY_AUTO" _name="Automatic"/>
<value id="GTK_SENSITIVITY_ON" _name="On"/>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a639e42..0266a54 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -63,6 +63,7 @@ plugins/gtk+/glade-box-editor.c
plugins/gtk+/glade-button-editor.c
plugins/gtk+/glade-cell-renderer-editor.c
plugins/gtk+/glade-column-types.c
+plugins/gtk+/glade-combo-box-editor.c
plugins/gtk+/glade-combo-box-text-editor.c
plugins/gtk+/glade-entry-editor.c
plugins/gtk+/glade-file-chooser-button-editor.c
@@ -166,6 +167,7 @@ plugins/gtk+/gtk+.xml.in
[type: gettext/glade]plugins/gtk+/glade-app-chooser-widget-editor.ui
[type: gettext/glade]plugins/gtk+/glade-box-editor.ui
[type: gettext/glade]plugins/gtk+/glade-button-editor.ui
+[type: gettext/glade]plugins/gtk+/glade-combo-box-editor.ui
[type: gettext/glade]plugins/gtk+/glade-combo-box-text-editor.ui
[type: gettext/glade]plugins/gtk+/glade-entry-editor.ui
[type: gettext/glade]plugins/gtk+/glade-file-chooser-button-editor.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
