GNOME.org
 

[glade3] * plugins/gtk+/gtk+.xml.in: Updated newly added symbols in GTK+ on widgets already in the catalo

commit 1b750f3d5d41bc159dfc6cd5e3d799838d88d7ca
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Tue Mar 9 19:18:55 2010 -0500

    	* plugins/gtk+/gtk+.xml.in: Updated newly added symbols in GTK+ on widgets already
    	  in the catalog; added new objects from GTK+:
    	  - GtkEntryBuffer
    	  - GtkSpinner
    	  - GtkCellRendererSpinner

 ChangeLog                |    6 +++
 plugins/gtk+/glade-gtk.c |   40 +++++++++++++++++++
 plugins/gtk+/gtk+.xml.in |   97 ++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 140 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0046634..660dc20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@
 	* plugins/gtk+/glade-gtk.c: Fixed GtkBox & GtkTable regressions introduced
 	  by GSEAL patches.
 
+	* plugins/gtk+/gtk+.xml.in: Updated newly added symbols in GTK+ on widgets already
+	  in the catalog; added new objects from GTK+:
+	  - GtkEntryBuffer
+	  - GtkSpinner
+	  - GtkCellRendererSpinner
+
 2010-03-09  Tristan Van Berkom <tvb gnome org>
 
 	* plugins/gtk+/glade-gtk.c, plugins/gtk+/glade-column-types.[ch], 
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 6a7891c..9fc5c37 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -8617,6 +8617,44 @@ glade_gtk_label_create_editable (GladeWidgetAdaptor  *adaptor,
 
 /* ----------------------------- GtkTextBuffer ------------------------------ */
 static void
+glade_gtk_entry_buffer_changed (GtkTextBuffer *buffer, 
+				GParamSpec    *pspec,
+				GladeWidget  *gbuffy)
+{
+	const gchar *text_prop = NULL;
+	GladeProperty *prop;
+	gchar *text = NULL;
+	
+	g_object_get (buffer, "text", &text, NULL);
+
+	if ((prop = glade_widget_get_property (gbuffy, "text")))
+	{
+		glade_property_get (prop, &text_prop);
+
+		if (text_prop == NULL || text == NULL || strcmp (text, text_prop))
+			glade_command_set_property (prop, text);
+	}
+	g_free (text);
+}
+
+void
+glade_gtk_entry_buffer_post_create (GladeWidgetAdaptor *adaptor,
+				    GObject            *object, 
+				    GladeCreateReason   reason)
+{
+	GladeWidget *gbuffy;
+	
+	gbuffy = glade_widget_get_from_gobject (object);
+	
+	g_signal_connect (object, "notify::text",
+			  G_CALLBACK (glade_gtk_entry_buffer_changed),
+			  gbuffy);
+}
+
+
+
+/* ----------------------------- GtkTextBuffer ------------------------------ */
+static void
 glade_gtk_text_buffer_changed (GtkTextBuffer *buffer, GladeWidget *gbuffy)
 {
 	const gchar *text_prop = NULL;
@@ -11242,6 +11280,7 @@ glade_gtk_cell_layout_launch_editor (GObject  *layout)
 					_("Pixbuf"), GTK_TYPE_CELL_RENDERER_PIXBUF,
 					_("Progress"), GTK_TYPE_CELL_RENDERER_PROGRESS,
 					_("Toggle"), GTK_TYPE_CELL_RENDERER_TOGGLE,
+					_("Spinner"), GTK_TYPE_CELL_RENDERER_SPINNER,
 					NULL);
 
 	g_signal_connect (editor, "get-display-name", G_CALLBACK (glade_gtk_cell_layout_get_display_name), NULL);
@@ -11322,6 +11361,7 @@ glade_gtk_treeview_launch_editor (GObject  *treeview)
 					_("Pixbuf"), GTK_TYPE_CELL_RENDERER_PIXBUF,
 					_("Progress"), GTK_TYPE_CELL_RENDERER_PROGRESS,
 					_("Toggle"), GTK_TYPE_CELL_RENDERER_TOGGLE,
+					_("Spinner"), GTK_TYPE_CELL_RENDERER_SPINNER,
 					NULL);
 
 	g_signal_connect (editor, "get-display-name", G_CALLBACK (glade_gtk_cell_layout_get_display_name), NULL);
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index a8ba4b3..7daca34 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -1,6 +1,6 @@
 <glade-catalog name="gtk+"
-	       version="2.16"
-	       targetable="2.14,2.12,2.10,2.8"
+	       version="2.20"
+	       targetable="2.18,2.16,2.14,2.12,2.10,2.8"
 	       supports="libglade,gtkbuilder"
                icon-prefix="gtk"
                library="gladegtk"
@@ -111,6 +111,7 @@
 	<property id="style" disabled="True"/>
 	<property id="sensitive" ignore="True"/>
 	<property id="has-default" ignore="True" common="True"/>
+	<property id="double-buffered" since="2.18"/>
 
 	<!-- Accelerators -->
 	<property id="accelerator" _name="Accelerators" ignore="True" common="True" save="False">
@@ -738,6 +739,8 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
+    <glade-widget-class name="GtkSpinner" generic-name="spinner" _title="Spinner"/>
+
     <glade-widget-class name="GtkLabel" generic-name="label" _title="Label">
       <post-create-function>glade_gtk_label_post_create</post-create-function>
       <create-editor-property-function>glade_gtk_label_create_eprop</create-editor-property-function>
@@ -812,7 +815,13 @@ embedded in another object</_tooltip>
 	    <value id="PANGO_WRAP_WORD_CHAR" _name="Word Character"/>
 	  </displayable-values>
 	</property>
+	<property id="track-visited-links" since="2.18"/>
       </properties>
+
+      <signals>
+	<signal id="activate-current-link" since="2.18"/>
+	<signal id="activate-link" since="2.18"/>
+      </signals>
     </glade-widget-class>
 
     <glade-widget-class name="GtkEntry" generic-name="entry" _title="Text Entry">
@@ -824,6 +833,7 @@ embedded in another object</_tooltip>
       <signals>
 	<signal id="icon-press" since="2.16"/>
 	<signal id="icon-release" since="2.16"/>
+	<signal id="preedit-changed" since="2.20"/>
       </signals>
 
       <properties>
@@ -831,6 +841,8 @@ embedded in another object</_tooltip>
         <property id="inner-border" since="2.10"/>
         <property id="truncate-multiline" since="2.10"/>
 	<property id="shadow-type" since="2.12"/>
+	<property id="editing-canceled" disabled="True" since="2.20"/>
+        <property id="buffer" libglade-unsupported="True" create-type="GtkEntryBuffer" since="2.18"/>
 	<property id="primary-icon-gicon" disabled="True"/>
 	<property id="secondary-icon-gicon" disabled="True"/>
 	<property id="primary-icon-stock" _name="Primary Stock Icon" since="2.16" custom-layout="True" stock-icon="True">
@@ -1078,6 +1090,7 @@ embedded in another object</_tooltip>
 
       <signals>
 	<signal id="wrapped" since="2.10"/>
+	<signal id="preedit-changed" since="2.20"/>
       </signals>
 
       <properties>
@@ -1123,6 +1136,7 @@ embedded in another object</_tooltip>
 	<property id="extra-widget" parentless-widget="True" libglade-unsupported="True"/>
 	<property id="preview-widget" parentless-widget="True" libglade-unsupported="True"/>
 	<property id="filter" libglade-unsupported="True"/>
+	<property id="create-folders" since="2.18"/>
       </properties>
     </glade-widget-class>
 
@@ -1141,7 +1155,12 @@ embedded in another object</_tooltip>
 	<property id="extra-widget" parentless-widget="True" libglade-unsupported="True"/>
 	<property id="preview-widget" parentless-widget="True" libglade-unsupported="True"/>
 	<property id="filter" libglade-unsupported="True"/>
+	<property id="create-folders" since="2.18"/>
       </properties>
+
+      <signals>
+	<signal id="file-set" since="2.12"/>
+      </signals>
     </glade-widget-class>
 
     <glade-widget-class name="GtkColorButton" generic-name="colorbutton" _title="Color Button">
@@ -1212,7 +1231,8 @@ embedded in another object</_tooltip>
 	    <value id="GTK_SENSITIVITY_ON" _name="On"/>
 	    <value id="GTK_SENSITIVITY_OFF" _name="Off"/>
 	  </displayable-values>
-         </property>
+        </property>
+	<property id="editing-canceled" disabled="True" since="2.20"/>
 
 	<!-- Atk press property -->
 	<property id="atk-press" _name="Press" ignore="True" atk-property="True" save="False">
@@ -1492,6 +1512,7 @@ embedded in another object</_tooltip>
         <property id="active" disabled="True" since="2.14"/>
         <property id="attach-widget" disabled="True" since="2.14"/>
         <property id="monitor" disabled="True" since="2.14"/>
+        <property id="reserve-toggle-size" since="2.18"/>
       </properties>
 
     </glade-widget-class>
@@ -1667,7 +1688,12 @@ embedded in another object</_tooltip>
 	<property id="extra-widget" parentless-widget="True" />
 	<property id="preview-widget" parentless-widget="True" />
 	<property id="filter"/>
+	<property id="create-folders" since="2.18"/>
       </properties>
+
+      <signals>
+	<signal id="file-set" since="2.12"/>
+      </signals>
     </glade-widget-class>
     
     <glade-widget-class name="GtkFontSelectionDialog" generic-name="fontselectiondialog" _title="Font Selection Dialog">
@@ -1974,6 +2000,7 @@ embedded in another object</_tooltip>
 	<property id="icon-name" themed-icon="True"/>
 	<property id="gicon" disabled="True"/>
 	<property id="action-group" disabled="True"/>
+	<property id="always-show-image" since="2.20"/>
       </properties>
     </glade-widget-class>
 
@@ -2125,6 +2152,7 @@ embedded in another object</_tooltip>
       </actions>
 
       <properties>
+        <property id="sort-column-id" since="2.18"/>
         <property id="title" default="column"/>
         <property id="sizing">
   	  <displayable-values>
@@ -2160,6 +2188,7 @@ embedded in another object</_tooltip>
       </actions>
 
       <properties>
+        <property id="item-padding" since="2.18"/>
         <property id="text-column" disabled="True"/>
         <property id="markup-column" disabled="True"/>
         <property id="pixbuf-column" disabled="True"/>
@@ -3195,6 +3224,54 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
+    <glade-widget-class name="GtkCellRendererSpinner" generic-name="cellrendererspinner" _title="Spinner Renderer" 
+			libglade-unsupported="True" since="2.20">
+      <properties>
+        <property id="active" save="False" custom-layout="True"/>
+        <property id="attr-active" _name="Active column" save="False" default="-1" custom-layout="True">
+	  <parameter-spec>
+	    <type>GParamInt</type>
+	    <min>-1</min>
+	  </parameter-spec>
+          <_tooltip>The column in the model to load the value from</_tooltip>
+	</property>
+        <property id="use-attr-active" default="True" save="False" visible="False">
+	  <parameter-spec>
+	    <type>GParamBoolean</type>
+	  </parameter-spec>
+	</property>
+
+        <property id="pulse" save="False" custom-layout="True"/>
+        <property id="attr-pulse" _name="Pulse column" save="False" default="-1" custom-layout="True">
+	  <parameter-spec>
+	    <type>GParamInt</type>
+	    <min>-1</min>
+	  </parameter-spec>
+          <_tooltip>The column in the model to load the value from</_tooltip>
+	</property>
+        <property id="use-attr-pulse" default="True" save="False" visible="False">
+	  <parameter-spec>
+	    <type>GParamBoolean</type>
+	  </parameter-spec>
+	</property>
+
+        <property id="size" save="False" custom-layout="True"/>
+        <property id="attr-size" _name="Icon Size" save="False" default="-1" custom-layout="True">
+	  <parameter-spec>
+	    <type>GParamInt</type>
+	    <min>-1</min>
+	  </parameter-spec>
+          <_tooltip>The column in the model to load the value from</_tooltip>
+	</property>
+        <property id="use-attr-size" default="True" save="False" visible="False">
+	  <parameter-spec>
+	    <type>GParamBoolean</type>
+	  </parameter-spec>
+	</property>
+
+      </properties>
+    </glade-widget-class>
+
     <glade-widget-class name="GtkCellRendererToggle" generic-name="cellrenderertoggle" _title="Toggle Renderer" 
 			libglade-unsupported="True">
       <properties>
@@ -3275,6 +3352,7 @@ embedded in another object</_tooltip>
 			libglade-unsupported="True" toplevel="True">
       <properties>
 	<property id="gicon" disabled="True" since="2.14"/>
+	<property id="title" since="2.18"/>
       </properties>
     </glade-widget-class>
 
@@ -3292,6 +3370,16 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
+    <glade-widget-class name="GtkEntryBuffer" generic-name="entrybuffer" _title="Entry Buffer" 
+			libglade-unsupported="True" toplevel="True" since="2.18">
+      <post-create-function>glade_gtk_entry_buffer_post_create</post-create-function>
+      <properties>
+	<property id="text" translatable="True">
+	  <visible-lines>2</visible-lines>
+	</property>
+      </properties>
+    </glade-widget-class>
+
 
     <glade-widget-class name="GtkTextTag" generic-name="texttag" _title="Text Tag" 
 			libglade-unsupported="True" toplevel="True"/>
@@ -3374,6 +3462,7 @@ embedded in another object</_tooltip>
     <glade-widget-class-ref name="GtkComboBox"/>
     <glade-widget-class-ref name="GtkComboBoxEntry"/>
     <glade-widget-class-ref name="GtkProgressBar"/>
+    <glade-widget-class-ref name="GtkSpinner"/>
 
     <glade-widget-class-ref name="GtkTextView"/>
 
@@ -3415,6 +3504,8 @@ embedded in another object</_tooltip>
   <glade-widget-group name="gtk-text" _title="Text Buffers">
 
     <default-palette-state expanded="False"/>
+ 
+    <glade-widget-class-ref name="GtkEntryBuffer"/>
 
     <glade-widget-class-ref name="GtkTextBuffer"/>
     <glade-widget-class-ref name="GtkTextTag"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]