glade3 r2141 - in trunk: . gladeui plugins/gtk+

[jpu svn gnome org]

Author: jpu
Date: Mon Mar  2 22:54:39 2009
New Revision: 2141
URL: http://svn.gnome.org/viewvc/glade3?rev=2141&view=rev

Log:
* plugins/gtk+/glade-label-editor.c, plugins/gtk+/glade-store-editor.c,
  plugins/gtk+/glade-icon-sources.c: fixed typos, bugs #571884 and #571867

* plugins/gtk+/gtk+.xml.in: fixed typos, and mark missing translatable strings
  bugs #573661, #571861

* gladeui/glade-property.c: do not write disabled props on
  glade_property_write() fixes bug #573513

* plugins/gtk+/glade-gtk.c: added convenience function 
  glade_gtk_container_create_editable() to disable custom editables part of bug #573513.

* gladeui/glade-signal-editor.c: fixed Bug #573453
  "Signal connect-after is not functional." using Ryu Jinno`s patch as reference.


Modified:
   trunk/ChangeLog
   trunk/gladeui/glade-property.c
   trunk/gladeui/glade-signal-editor.c
   trunk/plugins/gtk+/glade-gtk.c
   trunk/plugins/gtk+/glade-icon-sources.c
   trunk/plugins/gtk+/glade-label-editor.c
   trunk/plugins/gtk+/glade-store-editor.c
   trunk/plugins/gtk+/gtk+.xml.in

Modified: trunk/gladeui/glade-property.c
==============================================================================
--- trunk/gladeui/glade-property.c	(original)
+++ trunk/gladeui/glade-property.c	Mon Mar  2 22:54:39 2009
@@ -1128,6 +1128,9 @@
 	if (!(property->klass->save_always || property->save_always) &&
 	    glade_property_original_default (property))
 		return;
+	
+	/* Also skip disabled properties */
+	if (property->klass->save == FALSE) return;
 
 	/* Escape our string and save with underscores */
 	name = g_strdup (property->klass->id);

Modified: trunk/gladeui/glade-signal-editor.c
==============================================================================
--- trunk/gladeui/glade-signal-editor.c	(original)
+++ trunk/gladeui/glade-signal-editor.c	Mon Mar  2 22:54:39 2009
@@ -76,6 +76,22 @@
 #define HANDLER_DEFAULT  _("<Type here>")
 #define USERDATA_DEFAULT HANDLER_DEFAULT
 
+static gboolean
+is_void_handler (const gchar *signal_handler)
+{
+	return ( signal_handler == NULL ||
+		*signal_handler == 0    ||
+		 g_utf8_collate (signal_handler, _(HANDLER_DEFAULT)) == 0);
+}
+
+static gboolean
+is_void_userdata (const gchar *user_data)
+{
+	return ( user_data == NULL ||
+		*user_data == 0    ||
+		 g_utf8_collate (user_data, _(USERDATA_DEFAULT)) == 0);
+}
+
 static void
 glade_signal_editor_after_toggled (GtkCellRendererToggle *cell,
 				   gchar                 *path_str,
@@ -111,6 +127,12 @@
 		g_assert (signal_name != NULL);
 	}
 
+	if (is_void_userdata (userdata))
+	{
+		g_free (userdata);
+		userdata = NULL;
+	}
+	
 	old_signal = glade_signal_new (signal_name, handler, userdata, after);
 	new_signal = glade_signal_new (signal_name, handler, userdata, !after);
 
@@ -167,6 +189,12 @@
 		g_assert (signal_name != NULL);
 	}
 
+	if (is_void_userdata (userdata))
+	{
+		g_free (userdata);
+		userdata = NULL;
+	}
+	
 	old_signal = glade_signal_new (signal_name, handler, userdata, lookup, after);
 	new_signal = glade_signal_new (signal_name, handler, userdata, !lookup, after);
 
@@ -304,22 +332,6 @@
 }
 
 static gboolean
-is_void_handler (const gchar *signal_handler)
-{
-	return ( signal_handler == NULL ||
-		*signal_handler == 0    ||
-		 g_utf8_collate (signal_handler, _(HANDLER_DEFAULT)) == 0);
-}
-
-static gboolean
-is_void_userdata (const gchar *user_data)
-{
-	return ( user_data == NULL ||
-		*user_data == 0    ||
-		 g_utf8_collate (user_data, _(USERDATA_DEFAULT)) == 0);
-}
-
-static gboolean
 glade_signal_editor_handler_editing_done_impl  (GladeSignalEditor *self,
 						gchar *signal_name,
 						gchar *old_handler,

Modified: trunk/plugins/gtk+/glade-gtk.c
==============================================================================
--- trunk/plugins/gtk+/glade-gtk.c	(original)
+++ trunk/plugins/gtk+/glade-gtk.c	Mon Mar  2 22:54:39 2009
@@ -1571,6 +1571,13 @@
 	return glade_util_container_get_all_children (container);
 }
 
+GladeEditable *
+glade_gtk_container_create_editable (GladeWidgetAdaptor  *adaptor,
+				       GladeEditorPageType  type)
+{
+	return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->create_editable (adaptor, type);;
+}
+
 /* ----------------------------- GtkBox ------------------------------ */
 typedef struct {
 	GtkWidget *widget;

Modified: trunk/plugins/gtk+/glade-icon-sources.c
==============================================================================
--- trunk/plugins/gtk+/glade-icon-sources.c	(original)
+++ trunk/plugins/gtk+/glade-icon-sources.c	Mon Mar  2 22:54:39 2009
@@ -692,7 +692,7 @@
 				case COLUMN_TEXT:
 					tooltip_text = 
 						g_strdup_printf (_("Enter a filename or a relative or full path for this "
-								   "source of '%s' (Glade will only ever load them in"
+								   "source of '%s' (Glade will only ever load them in "
 								   "the runtime from your project directory)."), 
 								 icon_name);
 					break;

Modified: trunk/plugins/gtk+/glade-label-editor.c
==============================================================================
--- trunk/plugins/gtk+/glade-label-editor.c	(original)
+++ trunk/plugins/gtk+/glade-label-editor.c	Mon Mar  2 22:54:39 2009
@@ -354,7 +354,7 @@
 
 	label_editor->modifying = TRUE;
 
-	glade_command_push_group (_("Setting %s to set desired width in charachters"), 
+	glade_command_push_group (_("Setting %s to set desired width in characters"), 
 				  label_editor->loaded_widget->name);
 
 	property = glade_widget_get_property (label_editor->loaded_widget, "max-width-chars");
@@ -385,7 +385,7 @@
 
 	label_editor->modifying = TRUE;
 
-	glade_command_push_group (_("Setting %s to set maximum width in charachters"), 
+	glade_command_push_group (_("Setting %s to set maximum width in characters"), 
 				  label_editor->loaded_widget->name);
 
 	property = glade_widget_get_property (label_editor->loaded_widget, "width-chars");

Modified: trunk/plugins/gtk+/glade-store-editor.c
==============================================================================
--- trunk/plugins/gtk+/glade-store-editor.c	(original)
+++ trunk/plugins/gtk+/glade-store-editor.c	Mon Mar  2 22:54:39 2009
@@ -221,7 +221,7 @@
 	gtk_container_add (GTK_CONTAINER (alignment), vbox);
 
 	/* Add descriptive label */
-	label = gtk_label_new (_("Add remove and edit rows of data (you can optionally use CNTL-N to add "
+	label = gtk_label_new (_("Add remove and edit rows of data (you can optionally use Ctrl+N to add "
 				 "new rows and the Delete key to remove the selected row)"));
 	gtk_label_set_line_wrap (GTK_LABEL(label), TRUE);
 	gtk_label_set_line_wrap_mode (GTK_LABEL(label), PANGO_WRAP_WORD);

Modified: trunk/plugins/gtk+/gtk+.xml.in
==============================================================================
--- trunk/plugins/gtk+/gtk+.xml.in	(original)
+++ trunk/plugins/gtk+/gtk+.xml.in	Mon Mar  2 22:54:39 2009
@@ -696,7 +696,7 @@
 	    <type>GParamObject</type>
 	    <value-type>GdkPixbuf</value-type>
 	  </parameter-spec>
-          <_tooltip>A filname, full or relative path to load an icon for this toolbutton</_tooltip>
+          <_tooltip>A filename, full or relative path to load an icon for this toolbutton</_tooltip>
 	</property>
         <property id="icon-widget" parentless-widget="True" libglade-unsupported="True" 
 		  create-type="GtkImage" custom-layout="True"/>
@@ -1144,6 +1144,7 @@
     </glade-widget-class>
 
     <glade-widget-class name="GtkColorButton" generic-name="colorbutton" _title="Color Button">
+      <create-editable-function>glade_gtk_container_create_editable</create-editable-function>
       <properties>
 	<property id="title" translatable="True"/>
 	<property id="color" default="Black"/>
@@ -1157,6 +1158,7 @@
     </glade-widget-class>
 
     <glade-widget-class name="GtkFontButton" generic-name="fontbutton" _title="Font Button">
+      <create-editable-function>glade_gtk_container_create_editable</create-editable-function>
       <properties>
 	<property id="title" translatable="True"/>
 
@@ -3392,7 +3394,7 @@
     <glade-widget-class-ref name="GtkFileChooserWidget"/>
   </glade-widget-group>
 
-  <glade-widget-group name="gtk-model" title="Tree Model">
+  <glade-widget-group name="gtk-model" _title="Tree Model">
 
     <default-palette-state expanded="False"/>
 
@@ -3413,7 +3415,7 @@
   </glade-widget-group>
 
 
-  <glade-widget-group name="gtk-objects" title="Miscellaneous">
+  <glade-widget-group name="gtk-objects" _title="Miscellaneous">
 
     <default-palette-state expanded="False"/>
 
@@ -3427,7 +3429,7 @@
     <glade-widget-class-ref name="GtkFileFilter"/>
   </glade-widget-group>
 
-  <glade-widget-group name="gtk-specialized" title="Specialized Widgets">
+  <glade-widget-group name="gtk-specialized" _title="Specialized Widgets">
 
     <default-palette-state expanded="False"/>
 
@@ -3438,7 +3440,7 @@
     <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"/>