Add a new type GTK_IMAGE_ICON_NAME for named icons, update the size and

2004-10-25  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkimage.h:
	* gtk/gtkimage.c (gtk_image_new_from_icon_name)
	(gtk_image_set_from_icon_name, gtk_image_get_icon_name)
	(gtk_image_set_pixel_size, gtk_image_get_pixel_size):  Add a
	new type GTK_IMAGE_ICON_NAME for named icons, update the size
	and content of stock, icon set and named icon images upon style
	changes, and allow to set a fixed pixel size for named icon
	images.  (#155688, James Henstridge)

	* tests/testimage.c: Test application for theming behaviour of
	different image types and for image dnd.

1 files changed, 153 insertions, 0 deletions

diff --git a/tests/testimage.c b/tests/testimage.c
new file mode 100644
index 0000000000..b9ade1d1f2
--- /dev/null
+++ b/tests/testimage.c
@@ -0,0 +1,153 @@
+/* testimage.c
+ * Copyright (C) 2004  Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <gtk/gtk.h>
+
+static void
+drag_begin (GtkWidget      *widget,
+	    GdkDragContext *context,
+	    gpointer        data)
+{
+  GtkWidget *image = GTK_WIDGET (data);
+
+  GdkPixbuf *pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (image));
+
+  gtk_drag_set_icon_pixbuf (context, pixbuf, -2, -2);
+}
+
+void  
+drag_data_get  (GtkWidget        *widget,
+		GdkDragContext   *context,
+		GtkSelectionData *selection_data,
+		guint             info,
+		guint             time,
+		gpointer          data)
+{
+  GtkWidget *image = GTK_WIDGET (data);
+
+  GdkPixbuf *pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (image));
+
+  gtk_selection_data_set_pixbuf (selection_data, pixbuf);
+}
+
+static void
+drag_data_received (GtkWidget        *widget,
+		    GdkDragContext   *context,
+		    gint              x,
+		    gint              y,
+		    GtkSelectionData *selection_data,
+		    guint             info,
+		    guint32           time,
+		    gpointer          data)
+{
+  GtkWidget *image = GTK_WIDGET (data);
+
+  GdkPixbuf *pixbuf;
+
+  if (selection_data->length < 0)
+    return;
+
+  pixbuf = gtk_selection_data_get_pixbuf (selection_data);
+
+  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
+}
+
+int
+main (int argc, char **argv)
+{
+  GtkWidget *window, *table;
+  GtkWidget *label, *image, *box;
+  GtkIconTheme *theme;
+  GdkPixbuf *pixbuf;
+  GtkIconSet *iconset;
+  GtkIconSource *iconsource;
+  gchar *icon_name = "gnome-terminal";
+  
+  gtk_init (&argc, &argv);
+
+  if (argc > 1)
+    icon_name = argv[1];
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  table = gtk_table_new (4, 3, FALSE);
+  gtk_container_add (GTK_CONTAINER (window), table);
+
+  label = gtk_label_new ("symbolic size");
+  gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1,
+		    0, 0, 5, 5);
+  label = gtk_label_new ("fixed size");
+  gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1,
+		    0, 0, 5, 5);
+
+  label = gtk_label_new ("GTK_IMAGE_PIXBUF");
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+
+  theme = gtk_icon_theme_get_default ();
+  pixbuf = gtk_icon_theme_load_icon (theme, icon_name, 48, 0, NULL);
+  image = gtk_image_new_from_pixbuf (pixbuf);
+  box = gtk_event_box_new ();
+  gtk_container_add (GTK_CONTAINER (box), image);
+  gtk_table_attach_defaults (GTK_TABLE (table), box, 2, 3, 1, 2);
+
+  gtk_drag_source_set (box, GDK_BUTTON1_MASK, 
+		       NULL, 0,
+		       GDK_ACTION_COPY);
+  gtk_drag_source_add_image_targets (box);
+  g_signal_connect (box, "drag_begin", G_CALLBACK (drag_begin), image);
+  g_signal_connect (box, "drag_data_get", G_CALLBACK (drag_data_get), image);
+
+  gtk_drag_dest_set (box,
+                     GTK_DEST_DEFAULT_MOTION |
+                     GTK_DEST_DEFAULT_HIGHLIGHT |
+                     GTK_DEST_DEFAULT_DROP,
+                     NULL, 0, GDK_ACTION_COPY);
+  gtk_drag_dest_add_image_targets (box);
+  g_signal_connect (box, "drag_data_received", 
+		    G_CALLBACK (drag_data_received), image);
+
+  label = gtk_label_new ("GTK_IMAGE_STOCK");
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
+
+  image = gtk_image_new_from_stock (GTK_STOCK_REDO, GTK_ICON_SIZE_DIALOG);
+  gtk_table_attach_defaults (GTK_TABLE (table), image, 1, 2, 2, 3);
+
+  label = gtk_label_new ("GTK_IMAGE_ICON_SET");
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+
+  iconsource = gtk_icon_source_new ();
+  gtk_icon_source_set_icon_name (iconsource, icon_name);
+  iconset = gtk_icon_set_new ();
+  gtk_icon_set_add_source (iconset, iconsource);
+  image = gtk_image_new_from_icon_set (iconset, GTK_ICON_SIZE_DIALOG);
+  gtk_table_attach_defaults (GTK_TABLE (table), image, 1, 2, 3, 4);
+
+  label = gtk_label_new ("GTK_IMAGE_ICON_NAME");
+  gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5);
+  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_DIALOG);
+  gtk_table_attach_defaults (GTK_TABLE (table), image, 1, 2, 4, 5);
+  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_DIALOG);
+  gtk_image_set_pixel_size (GTK_IMAGE (image), 30);
+  gtk_table_attach_defaults (GTK_TABLE (table), image, 2, 3, 4, 5);
+		   
+  gtk_widget_show_all (window);
+
+  gtk_main ();
+
+  return 0;
+}