glade3 r2104 - in trunk: . gladeui plugins/gtk+ src

[tvb svn gnome org]

Author: tvb
Date: Thu Feb  5 19:47:06 2009
New Revision: 2104
URL: http://svn.gnome.org/viewvc/glade3?rev=2104&view=rev

Log:

	* NEWS: Rolling Glade 3.5.7



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/gladeui/glade-inspector.c
   trunk/plugins/gtk+/gtk+.xml.in
   trunk/src/glade-window.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Feb  5 19:47:06 2009
@@ -1,6 +1,25 @@
 ===========
 Glade 3.5.6
 ===========
+	- Added GladeDesignLayout::widget-event signal. Patch by Pavel Kostyuchenko (bug 542337).
+	- GObjectify signal editor and allow custom signal editors. by Pavel Kostyuchenko (bug 540691).
+	- Make virtual properties in GTK+ 2.16 in order to support running from GTK+ 2.14 and targetting 2.16
+	- New activatable editor to handle activatable properties in smart ways.
+	- Fix markup in confirm close dialog, patch by Felix Riemann (bug 567450).
+	- Marked use-stock property from imagemenuitem to be save-always (bug 568064).
+
+New and updated translations
+============================
+	- Updated de: Andre Klapper, Hendrik Richter
+	- Updated es: Jorge Gonzalez, Jorge GonzÃlez
+	- Updated fi: Ilkka Tuohela
+	- Updated he: Yair Hershkovitz, yairhr gmail com
+	- Updated ko: Changwoo Ryu
+	- Updated pt_BR: Jonh Wendell
+
+===========
+Glade 3.5.6
+===========
 	- Handling of new entry properties (bug 567454)
 	- Added filechooser dialog to pixbuf properties
 

Modified: trunk/gladeui/glade-inspector.c
==============================================================================
--- trunk/gladeui/glade-inspector.c	(original)
+++ trunk/gladeui/glade-inspector.c	Thu Feb  5 19:47:06 2009
@@ -79,6 +79,7 @@
 	GtkWidget    *view;
 	GtkTreeStore *model;
 	GtkTreeModel *filter;
+	GtkTreeIter   actions_iter;
 	GtkTreeIter   widgets_iter;
 	GtkTreeIter   objects_iter;
 
@@ -656,6 +657,26 @@
 
 	g_completion_add_items (priv->completion, (GList *)glade_project_get_objects (priv->project));
 
+
+	/* make a list of only the actions and groups */
+	for (l = (GList *) glade_project_get_objects (priv->project); l; l = l->next)
+	{
+		GObject     *object  = G_OBJECT (l->data);
+		GladeWidget *gwidget = glade_widget_get_from_gobject (object);
+		g_assert (gwidget);
+
+		if (gwidget->parent == NULL && 
+		    (GTK_IS_ACTION (object) || GTK_IS_ACTION_GROUP (object)))
+			toplevels = g_list_prepend (toplevels, object);
+	}
+	toplevels = g_list_reverse (toplevels);
+
+	/* recursively fill model */
+	gtk_tree_store_append (priv->model, &priv->actions_iter, NULL);
+	gtk_tree_store_set    (priv->model, &priv->actions_iter, TITLE_COLUMN, _("Actions"), -1);
+	fill_model (priv->model, toplevels, &priv->actions_iter);
+	toplevels = (g_list_free (toplevels), NULL);
+
 	/* make a list of only the toplevel window widgets */
 	for (l = (GList *) glade_project_get_objects (priv->project); l; l = l->next)
 	{
@@ -672,17 +693,17 @@
 	gtk_tree_store_append (priv->model, &priv->widgets_iter, NULL);
 	gtk_tree_store_set    (priv->model, &priv->widgets_iter, TITLE_COLUMN, _("Widgets"), -1);
 	fill_model (priv->model, toplevels, &priv->widgets_iter);
-	g_list_free (toplevels);
+	toplevels = (g_list_free (toplevels), NULL);
 
 	/* make a list of only the toplevel non-window widgets */
-	toplevels = NULL;
 	for (l = (GList *) glade_project_get_objects (priv->project); l; l = l->next)
 	{
 		GObject     *object  = G_OBJECT (l->data);
 		GladeWidget *gwidget = glade_widget_get_from_gobject (object);
 		g_assert (gwidget);
 
-		if (gwidget->parent == NULL && !GTK_IS_WIDGET (object))
+		if (gwidget->parent == NULL && !GTK_IS_WIDGET (object) && 
+		    !GTK_IS_ACTION (object) && !GTK_IS_ACTION_GROUP (object))
 			toplevels = g_list_prepend (toplevels, object);
 	}
 	toplevels = g_list_reverse (toplevels);
@@ -691,7 +712,7 @@
 	gtk_tree_store_append (priv->model, &priv->objects_iter, NULL);
 	gtk_tree_store_set    (priv->model, &priv->objects_iter, TITLE_COLUMN, _("Objects"), -1);
 	fill_model (priv->model, toplevels, &priv->objects_iter);
-	g_list_free (toplevels);
+	toplevels = (g_list_free (toplevels), NULL);
 }
 
 static void
@@ -718,7 +739,9 @@
 	
 	if (!parent_iter)
 	{
-		if (GTK_IS_WIDGET (widget->object))
+		if (GTK_IS_ACTION (widget->object) || GTK_IS_ACTION_GROUP (widget->object))
+			parent_iter = &inspector->priv->actions_iter;
+		else if (GTK_IS_WIDGET (widget->object))
 			parent_iter = &inspector->priv->widgets_iter;
 		else
 			parent_iter = &inspector->priv->objects_iter;

Modified: trunk/plugins/gtk+/gtk+.xml.in
==============================================================================
--- trunk/plugins/gtk+/gtk+.xml.in	(original)
+++ trunk/plugins/gtk+/gtk+.xml.in	Thu Feb  5 19:47:06 2009
@@ -506,7 +506,7 @@
       <remove-child-function>glade_gtk_image_menu_item_remove_child</remove-child-function>
       <create-editable-function>glade_gtk_image_menu_item_create_editable</create-editable-function>
       <properties>
-        <property id="use-stock" default="True" visible="False" gtkbuilder-since="2.16">
+        <property id="use-stock" default="True" visible="False" save-always="True" gtkbuilder-since="2.16">
 	  <parameter-spec>
 	    <type>GParamBoolean</type>
 	  </parameter-spec>

Modified: trunk/src/glade-window.c
==============================================================================
--- trunk/src/glade-window.c	(original)
+++ trunk/src/glade-window.c	Thu Feb  5 19:47:06 2009
@@ -1348,16 +1348,18 @@
 
 	project_name = glade_project_get_name (project);
 
-	msg = g_strdup_printf (_("<span weight=\"bold\" size=\"larger\">Save changes " 
-				 "to project \"%s\" before closing?</span>\n\n"
-				 "Your changes will be lost if you don't save them."), project_name);
-
-	dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (window),
-					             GTK_DIALOG_MODAL,
-					             GTK_MESSAGE_WARNING,
-					             GTK_BUTTONS_NONE,
-						     "%s",
-					             msg);
+	msg = g_strdup_printf (_("Save changes to project \"%s\" before closing?"),
+			       project_name);
+
+	dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					 GTK_DIALOG_MODAL,
+					 GTK_MESSAGE_WARNING,
+					 GTK_BUTTONS_NONE,
+					 "%s",
+					 msg);
+	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+						  "%s",
+						  _("Your changes will be lost if you don't save them."));
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
 
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog),