GNOME.org
 

[glade3] * plugins/gtk+/gtk+.xml.in, plugins/gtk+/glade-gtk.c: Disable default saving behaviour of order dep

commit bcbb36d3a88e1a1d4317985453a28ff7d6fd397a
Author: Tristan Van Berkom <vantr TheBully-2 local>
Date:   Mon Nov 9 13:24:07 2009 -0200

    	* plugins/gtk+/gtk+.xml.in, plugins/gtk+/glade-gtk.c: Disable default saving behaviour of order dependant
    	GtkAdjustment properties and installed glade_gtk_adjustment_write_widget() to write the properties out
    	in the following order: "lower", "upper", "value" (fixes bug 578484).

 ChangeLog                |   10 ++++++++++
 plugins/gtk+/glade-gtk.c |   27 ++++++++++++++++++++++++++-
 plugins/gtk+/gtk+.xml.in |   31 ++++++++++++++++---------------
 3 files changed, 52 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ac013e8..2dcbd94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-09  Tristan Van Berkom <tvb gnome org>
+
+	* plugins/gtk+/gtk+.xml.in, plugins/gtk+/glade-gtk.c: Disable default saving behaviour of order dependant 
+	GtkAdjustment properties and installed glade_gtk_adjustment_write_widget() to write the properties out
+	in the following order: "lower", "upper", "value" (fixes bug 578484).
+
+2009-10-12  Javier Jardon <jjardon gnome org>
+
+	* configure.ac: Support silent build when using automake >= 1.11
+
 2009-09-14  Tristan Van Berkom <tvb gnome org>
 
 	* gladeui/glade-widget.c: Fixed crasher while copying internal widgets (bug 595156)
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 3d22082..3cbd80c 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -61,7 +61,7 @@
 #define MNEMONIC_INSENSITIVE_MSG   _("This property does not apply unless Use Underline is set.")
 #define NOT_SELECTED_MSG           _("Property not selected")
 #define RESPID_INSENSITIVE_MSG     _("This property is only for use in dialog action buttons")
-#define ACTION_APPEARANCE_MSG      _("This property is set to be controlled by an Action")
+#define ACTION_APPEARANCE_MSG      _("This property is set to be controled by an Action")
 /* -------------------------------- ParamSpecs ------------------------------ */
 /*
 GtkImageMenuItem GnomeUI "stock_item" property special case:
@@ -11281,3 +11281,28 @@ glade_gtk_treeview_depends (GladeWidgetAdaptor *adaptor,
 	return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->depends (adaptor, widget, another);
 }
 
+/*--------------------------- GtkAdjustment ---------------------------------*/
+void
+glade_gtk_adjustment_write_widget (GladeWidgetAdaptor *adaptor,
+				   GladeWidget        *widget,
+				   GladeXmlContext    *context,
+				   GladeXmlNode       *node)
+{
+	GladeProperty *prop;
+
+	if (!glade_xml_node_verify
+	    (node, GLADE_XML_TAG_WIDGET (glade_project_get_format (widget->project))))
+		return;
+
+	/* Ensure proper order of adjustment properties by writing them here. */
+	prop = glade_widget_get_property (widget, "lower");
+	glade_property_write (prop, context, node);
+
+	prop = glade_widget_get_property (widget, "upper");
+	glade_property_write (prop, context, node);
+
+	prop = glade_widget_get_property (widget, "value");
+	glade_property_write (prop, context, node);
+
+        GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
+}
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index 4a5f708..2d0cdb3 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -686,7 +686,7 @@ embedded in another object</_tooltip>
 
 	<!-- Virtual stock comboentry property -->
 	<property id="stock-id" visible="False" stock-icon="True" custom-layout="True">
-          <_tooltip>The stock icon displayed on the item (choose an item from GTK+ stock or from an icon factory)</_tooltip>
+          <_tooltip>The stock icon displayed on the item (chose an item from gtk+ stock or from an icon factory)</_tooltip>
 	</property>
         <property id="label" translatable="True" default="toolbutton" custom-layout="True"/>
 	<property id="label-widget" parentless-widget="True" libglade-unsupported="True" 
@@ -775,7 +775,7 @@ embedded in another object</_tooltip>
 	    <type>GParamBoxed</type>
 	    <value-type>GladeAttrGList</value-type>
 	  </parameter-spec>
-	  <_tooltip>The Pango attributes for this label</_tooltip>
+	  <_tooltip>The pango attributes for this label</_tooltip>
 	</property>
 	<property id="pattern" custom-layout="True"/>
 	<property id="use-markup" custom-layout="True"/>
@@ -896,7 +896,7 @@ embedded in another object</_tooltip>
 	  </parameter-spec>
         </property>
 
-	<property id="invisible-char-set" _name="Invisible Character Set" since="2.16">
+	<property id="invisible-char-set" _name="Invisible Char Set" since="2.16">
 	  <parameter-spec>
 	    <type>GParamBoolean</type>
 	  </parameter-spec>
@@ -1957,10 +1957,11 @@ embedded in another object</_tooltip>
 			_title="Accel Group" libglade-unsupported="True" toplevel="True"/>
     <glade-widget-class name="GtkAdjustment" generic-name="adjustment" 
 			_title="Adjustment" libglade-unsupported="True" toplevel="True">
+      <write-widget-function>glade_gtk_adjustment_write_widget</write-widget-function>
       <properties>
-	<property id="value" default="0.0"/>
-	<property id="lower" default="0.0"/>
-	<property id="upper" default="100.0"/>
+	<property id="value" default="0.0" save="False"/>
+	<property id="lower" default="0.0" save="False"/>
+	<property id="upper" default="100.0" save="False"/>
 	<property id="page-increment" default="10.0"/>
 	<property id="step-increment" default="1.0"/>
 	<property id="page-size" default="10.0"/>
@@ -2623,15 +2624,15 @@ embedded in another object</_tooltip>
 
         <property id="stretch" save="False" custom-layout="True">
   	  <displayable-values>
-	    <value id="PANGO_STRETCH_ULTRA_CONDENSED" _name="Ultra-Condensed"/>
-	    <value id="PANGO_STRETCH_EXTRA_CONDENSED" _name="Extra-Condensed"/>
+	    <value id="PANGO_STRETCH_ULTRA_CONDENSED" _name="Ultra Condensed"/>
+	    <value id="PANGO_STRETCH_EXTRA_CONDENSED" _name="Extra Condensed"/>
 	    <value id="PANGO_STRETCH_CONDENSED" _name="Condensed"/>
-	    <value id="PANGO_STRETCH_SEMI_CONDENSED" _name="Semi-Condensed"/>
+	    <value id="PANGO_STRETCH_SEMI_CONDENSED" _name="Semi Condensed"/>
 	    <value id="PANGO_STRETCH_NORMAL" _name="Normal"/>
-	    <value id="PANGO_STRETCH_SEMI_EXPANDED" _name="Semi-Expanded"/>
+	    <value id="PANGO_STRETCH_SEMI_EXPANDED" _name="Semi Expanded"/>
 	    <value id="PANGO_STRETCH_EXPANDED" _name="Expanded"/>
-	    <value id="PANGO_STRETCH_EXTRA_EXPANDED" _name="Extra-Expanded"/>
-	    <value id="PANGO_STRETCH_ULTRA_EXPANDED" _name="Ultra-Expanded"/>
+	    <value id="PANGO_STRETCH_EXTRA_EXPANDED" _name="Extra Expanded"/>
+	    <value id="PANGO_STRETCH_ULTRA_EXPANDED" _name="Ultra Expanded"/>
 	  </displayable-values>
 	</property>
 
@@ -2814,7 +2815,7 @@ embedded in another object</_tooltip>
 
         <property id="accel-mode" save="False" custom-layout="True">
   	  <displayable-values>
-	    <value id="GTK_CELL_RENDERER_ACCEL_MODE_GTK" _name="GTK+"/>
+	    <value id="GTK_CELL_RENDERER_ACCEL_MODE_GTK" _name="Gtk"/>
 	    <value id="GTK_CELL_RENDERER_ACCEL_MODE_OTHER" _name="Other"/>
 	  </displayable-values>
 	</property>
@@ -2844,7 +2845,7 @@ embedded in another object</_tooltip>
 	    <value id="GDK_BUTTON1_MASK" _name="First Mouse Button"/>
 	    <value id="GDK_BUTTON2_MASK" _name="Second Mouse Button"/>
 	    <value id="GDK_BUTTON3_MASK" _name="Third Mouse Button"/>
-	    <value id="GDK_BUTTON4_MASK" _name="Fourth Mouse Button"/>
+	    <value id="GDK_BUTTON4_MASK" _name="Forth Mouse Button"/>
 	    <value id="GDK_BUTTON5_MASK" _name="Fifth Mouse Button"/>
 	    <value id="GDK_SUPER_MASK" _name="Super Modifier"/>
 	    <value id="GDK_HYPER_MASK" _name="Hyper Modifier"/>
@@ -3447,7 +3448,7 @@ embedded in another object</_tooltip>
     <glade-widget-class-ref name="GtkGammaCurve"/>
   </glade-widget-group>
 
-  <glade-widget-group name="gtk-obsolete" _title="GTK+ Obsolete">
+  <glade-widget-group name="gtk-obsolete" _title="Gtk+ Obsolete">
 
     <default-palette-state expanded="False"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]