Update for the release.

2003-05-03  Marco Pesenti Gritti  <marco@it.gnome.org>

	* NEWS:
	* configure.in:

	Update for the release.

	* lib/egg/egg-editable-toolbar.c:
	* lib/egg/egg-editable-toolbar.h:
	* lib/egg/egg-toolbar-editor.c:

	Update.

3 files changed, 183 insertions, 13 deletions

diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index 92d3a3834..174b775fe 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -291,7 +291,6 @@ create_toolbar (EggEditableToolbar *t)
 
   toolbar = egg_toolbar_new ();
   egg_toolbar_set_show_arrow (EGG_TOOLBAR (toolbar), TRUE);
-  gtk_widget_set_sensitive (toolbar, TRUE);
   gtk_widget_show (toolbar);
   gtk_drag_dest_set (toolbar, GTK_DEST_DEFAULT_DROP,
 		     dest_drag_types, n_dest_drag_types,
@@ -314,6 +313,8 @@ create_item (EggEditableToolbar *t,
   EggAction *action;
   const char *action_name;
   gboolean is_separator;
+  GtkWidget *icon;
+  GtkImageType type;
 
   action_name = egg_toolbars_model_item_nth
 		(model, toolbar_position, position,
@@ -322,6 +323,7 @@ create_item (EggEditableToolbar *t,
   if (is_separator)
     {
       item = GTK_WIDGET (egg_separator_tool_item_new ());
+      icon = _egg_editable_toolbar_new_separator_image ();
     }
   else
     {
@@ -329,6 +331,10 @@ create_item (EggEditableToolbar *t,
 		     0, action_name);
       action = find_action (t, action_name);
       item = egg_action_create_tool_item (action);
+      gtk_widget_set_sensitive (item, TRUE);
+      icon = gtk_image_new_from_stock
+		(action->stock_id ? action->stock_id : GTK_STOCK_DND,
+		 GTK_ICON_SIZE_LARGE_TOOLBAR);
     }
 
   gtk_widget_show (item);
@@ -340,6 +346,19 @@ create_item (EggEditableToolbar *t,
   g_signal_connect (item, "drag_data_delete",
 		    G_CALLBACK (drag_data_delete_cb), t);
 
+  type = gtk_image_get_storage_type (GTK_IMAGE (icon));
+  if (type == GTK_IMAGE_STOCK)
+    {
+      gchar *stock_id;
+      gtk_image_get_stock (GTK_IMAGE (icon), &stock_id, NULL);
+      gtk_drag_source_set_icon_stock (item, stock_id);
+    }
+  else if (type == GTK_IMAGE_PIXBUF)
+    {
+      GdkPixbuf *pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (icon));
+      gtk_drag_source_set_icon_pixbuf (item, pixbuf);
+    }
+
   if (t->priv->edit_mode)
     {
       egg_tool_item_set_use_drag_window (EGG_TOOL_ITEM (item), TRUE);
@@ -701,3 +720,136 @@ egg_editable_toolbar_set_drag_dest (EggEditableToolbar   *etoolbar,
     }
 }
 
+#define DEFAULT_ICON_HEIGHT 20
+#define DEFAULT_ICON_WIDTH 0
+
+static void
+fake_expose_widget (GtkWidget *widget,
+		    GdkPixmap *pixmap)
+{
+  GdkWindow *tmp_window;
+  GdkEventExpose event;
+
+  event.type = GDK_EXPOSE;
+  event.window = pixmap;
+  event.send_event = FALSE;
+  event.area = widget->allocation;
+  event.region = NULL;
+  event.count = 0;
+
+  tmp_window = widget->window;
+  widget->window = pixmap;
+  gtk_widget_send_expose (widget, (GdkEvent *) &event);
+  widget->window = tmp_window;
+}
+
+/* We should probably experiment some more with this.
+ * Right now the rendered icon is pretty good for most
+ * themes. However, the icon is slightly large for themes
+ * with large toolbar icons.
+ */
+static GdkPixbuf *
+new_pixbuf_from_widget (GtkWidget *widget)
+{
+  GtkWidget *window;
+  GdkPixbuf *pixbuf;
+  GtkRequisition requisition;
+  GtkAllocation allocation;
+  GdkPixmap *pixmap;
+  GdkVisual *visual;
+  gint icon_width;
+  gint icon_height;
+
+  icon_width = DEFAULT_ICON_WIDTH;
+
+  if (!gtk_icon_size_lookup_for_settings (gtk_settings_get_default (), 
+					  GTK_ICON_SIZE_LARGE_TOOLBAR,
+					  NULL, 
+					  &icon_height))
+    {
+      icon_height = DEFAULT_ICON_HEIGHT;
+    }
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  
+  gtk_container_add (GTK_CONTAINER (window), widget);
+  gtk_widget_realize (window);
+  gtk_widget_show (widget);
+  gtk_widget_realize (widget);
+  gtk_widget_map (widget);
+
+  /* Gtk will never set the width or height of a window to 0. So setting the width to
+   * 0 and than getting it will provide us with the minimum width needed to render
+   * the icon correctly, without any additional window background noise.
+   * This is needed mostly for pixmap based themes.
+   */
+  gtk_window_set_default_size (GTK_WINDOW (window), icon_width, icon_height);
+  gtk_window_get_size (GTK_WINDOW (window),&icon_width, &icon_height);
+
+  gtk_widget_size_request (window, &requisition);
+  allocation.x = 0;
+  allocation.y = 0;
+  allocation.width = icon_width;
+  allocation.height = icon_height;
+  gtk_widget_size_allocate (window, &allocation);
+  gtk_widget_size_request (window, &requisition);
+  
+  /* Create a pixmap */
+  visual = gtk_widget_get_visual (window);
+  pixmap = gdk_pixmap_new (NULL, icon_width, icon_height, gdk_visual_get_best_depth());
+  gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (window));
+
+  /* Draw the window */
+  gtk_widget_ensure_style (window);
+  g_assert (window->style);
+  g_assert (window->style->font_desc);
+  
+  fake_expose_widget (window, pixmap);
+  fake_expose_widget (widget, pixmap);
+  
+  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, icon_width, icon_height);
+  gdk_pixbuf_get_from_drawable (pixbuf, pixmap, NULL, 0, 0, 0, 0, icon_width, icon_height);
+
+  return pixbuf;
+}
+
+static GdkPixbuf *
+new_separator_pixbuf ()
+{
+  GtkWidget *separator;
+  GdkPixbuf *pixbuf;
+
+  separator = gtk_vseparator_new ();
+  pixbuf = new_pixbuf_from_widget (separator);
+  gtk_widget_destroy (separator);
+  return pixbuf;
+}
+
+static void
+update_separator_image (GtkImage *image)
+{
+  GdkPixbuf *pixbuf = new_separator_pixbuf ();
+  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
+  g_object_unref (pixbuf);
+}
+
+static gboolean
+style_set_cb (GtkWidget *widget,
+              GtkStyle *previous_style,
+              GtkImage *image)
+{
+
+  update_separator_image (image);
+  return FALSE;
+}
+
+GtkWidget *
+_egg_editable_toolbar_new_separator_image ()
+{
+  GtkWidget *image = gtk_image_new ();
+  update_separator_image (GTK_IMAGE (image));
+  g_signal_connect (G_OBJECT (image), "style_set",
+		    G_CALLBACK (style_set_cb), GTK_IMAGE (image));
+
+  return image;
+}
diff --git a/lib/egg/egg-editable-toolbar.h b/lib/egg/egg-editable-toolbar.h
index a46b513f7..28b9976a2 100755
--- a/lib/egg/egg-editable-toolbar.h
+++ b/lib/egg/egg-editable-toolbar.h
@@ -69,6 +69,10 @@ void		    egg_editable_toolbar_set_drag_dest   (EggEditableToolbar   *etoolbar,
 							  gint                  n_targets,
 							  const char           *toolbar_name);
 
+/* Private Functions */
+
+GtkWidget 	   *_egg_editable_toolbar_new_separator_image ();
+
 G_END_DECLS
 
 #endif
diff --git a/lib/egg/egg-toolbar-editor.c b/lib/egg/egg-toolbar-editor.c
index aa047c195..fd032cdd6 100755
--- a/lib/egg/egg-toolbar-editor.c
+++ b/lib/egg/egg-toolbar-editor.c
@@ -361,15 +361,15 @@ elide_underscores (const gchar *original)
 
 static GtkWidget *
 editor_create_item (EggToolbarEditor *editor,
-		    const char         *stock_id,
-		    const char         *label_text,
-		    GdkDragAction	action)
+		    GtkImage	     *icon,
+		    const char       *label_text,
+		    GdkDragAction     action)
 {
   GtkWidget *event_box;
   GtkWidget *vbox;
-  GtkWidget *icon;
   GtkWidget *label;
   gchar *label_no_mnemonic = NULL;
+  GtkImageType type;
 
   event_box = gtk_event_box_new ();
   gtk_widget_show (event_box);
@@ -381,15 +381,25 @@ editor_create_item (EggToolbarEditor *editor,
   g_signal_connect (event_box, "drag_data_delete",
 		    G_CALLBACK (editor_drag_data_delete_cb), editor);
 
+  type = gtk_image_get_storage_type (icon);
+  if (type == GTK_IMAGE_STOCK)
+    {
+      gchar *stock_id;
+      gtk_image_get_stock (icon, &stock_id, NULL); 
+      gtk_drag_source_set_icon_stock (event_box, stock_id);
+    }
+  else if (type == GTK_IMAGE_PIXBUF)
+    {
+      GdkPixbuf *pixbuf = gtk_image_get_pixbuf (icon);    
+      gtk_drag_source_set_icon_pixbuf (event_box, pixbuf);
+    }
+
   vbox = gtk_vbox_new (0, FALSE);
   gtk_widget_show (vbox);
   gtk_container_add (GTK_CONTAINER (event_box), vbox);
 
-  icon = gtk_image_new_from_stock
-	(stock_id ? stock_id : GTK_STOCK_DND,
-	 GTK_ICON_SIZE_LARGE_TOOLBAR);
-  gtk_widget_show (icon);
-  gtk_box_pack_start (GTK_BOX (vbox), icon, FALSE, TRUE, 0);
+  gtk_widget_show (GTK_WIDGET (icon));
+  gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (icon), FALSE, TRUE, 0);
   label_no_mnemonic = elide_underscores (label_text);
   label = gtk_label_new (label_no_mnemonic);
   g_free (label_no_mnemonic);
@@ -408,6 +418,7 @@ update_editor_sheet (EggToolbarEditor *editor)
   GtkWidget *table;
   GtkWidget *viewport;
   GtkWidget *item;
+  GtkWidget *icon;
 
   g_return_if_fail (IS_EGG_TOOLBAR_EDITOR (editor));
 
@@ -436,8 +447,10 @@ update_editor_sheet (EggToolbarEditor *editor)
   for (l = to_drag; l != NULL; l = l->next)
     {
       EggAction *action = (l->data);
-
-      item = editor_create_item (editor, action->stock_id,
+      icon = gtk_image_new_from_stock
+		(action->stock_id ? action->stock_id : GTK_STOCK_DND,
+		 GTK_ICON_SIZE_LARGE_TOOLBAR);
+      item = editor_create_item (editor, GTK_IMAGE (icon),
 				 action->short_label, GDK_ACTION_MOVE);
       g_object_set_data (G_OBJECT (item), "egg-action", action);
       gtk_table_attach_defaults (GTK_TABLE (editor->priv->table),
@@ -451,7 +464,8 @@ update_editor_sheet (EggToolbarEditor *editor)
 	}
     }
 
-  item = editor_create_item (editor, NULL, _("Separator"),
+  icon = _egg_editable_toolbar_new_separator_image ();
+  item = editor_create_item (editor, GTK_IMAGE (icon), _("Separator"),
 			     GDK_ACTION_COPY);
   gtk_table_attach_defaults (GTK_TABLE (editor->priv->table),
 		             item, x, x + 1, y, y + 1);