Makefile.am configure.in themes/.cvsignore themes/Makefile.am

2001-08-05  Michael Natterer  <mitch@gimp.org>

	* Makefile.am
	* configure.in
	* themes/.cvsignore
	* themes/Makefile.am
	* themes/Default/.cvsignore
	* themes/Default/Makefile.am
	* themes/Default/images/.cvsignore
	* themes/Default/images/*.png
	* themes/Default/images/tools/.cvsignore
	* themes/Default/images/tools/*.png: new place for all images
	which are registered with the stock system. The default images are
	all inlined but we will install the default theme later along with
	an appropriate gtkrc as a template for custom themes.

	Added PNGs of all tools icons. Thanks to syngin :)

	* pixmaps/.cvsignore
	* pixmaps/Makefile.am: reverted everything to the old state. This
	directory will go away soon.

	* libgimpwidgets/gimpstock.[ch]: changed accordingly. Register
	stock icons in GTK_ICON_SIZE_BUTTON for all tools.

	* app/core/gimptoolinfo.[ch]
	* app/tools/tool_manager.[ch]: GimpToolInfo wants a stock_id and a
	pre-rendered GdkPixbuf instead of ugly icon_data now. Added some
	workarounds until GimpPreview is a GtkImage and uses GdkPixbuf
	instead of TempBuf.

	* app/tools/Makefile.am
	* app/tools/icons.h: die, uglyness, die.

	* app/tools/[all tools].c: register with a stock_id, not a
	icon_data pointer.

	* app/gui/dialogs-constructors.c: Oops, GIMP badly crashed on
	changing the image for the past few days :)

	* app/gui/menus.c: create the tools' menu entries with stock
	icons.

	* app/gui/toolbox.c: use GtkImages instead of GimpPreviews for
	the toolbox buttons. Will need to change this back as soon
	as GimpPreview actually _is_ a GtkImage.

ChangeLog

@@ -1,3 +1,50 @@
+2001-08-05  Michael Natterer  <mitch@gimp.org>
+
+	* Makefile.am
+	* configure.in
+	* themes/.cvsignore
+	* themes/Makefile.am
+	* themes/Default/.cvsignore
+	* themes/Default/Makefile.am
+	* themes/Default/images/.cvsignore
+	* themes/Default/images/*.png
+	* themes/Default/images/tools/.cvsignore
+	* themes/Default/images/tools/*.png: new place for all images
+	which are registered with the stock system. The default images are
+	all inlined but we will install the default theme later along with
+	an appropriate gtkrc as a template for custom themes.
+
+	Added PNGs of all tools icons. Thanks to syngin :)
+
+	* pixmaps/.cvsignore
+	* pixmaps/Makefile.am: reverted everything to the old state. This
+	directory will go away soon.
+
+	* libgimpwidgets/gimpstock.[ch]: changed accordingly. Register
+	stock icons in GTK_ICON_SIZE_BUTTON for all tools.
+
+	* app/core/gimptoolinfo.[ch]
+	* app/tools/tool_manager.[ch]: GimpToolInfo wants a stock_id and a
+	pre-rendered GdkPixbuf instead of ugly icon_data now. Added some
+	workarounds until GimpPreview is a GtkImage and uses GdkPixbuf
+	instead of TempBuf.
+
+	* app/tools/Makefile.am
+	* app/tools/icons.h: die, uglyness, die.
+
+	* app/tools/[all tools].c: register with a stock_id, not a
+	icon_data pointer.
+
+	* app/gui/dialogs-constructors.c: Oops, GIMP badly crashed on
+	changing the image for the past few days :)
+
+	* app/gui/menus.c: create the tools' menu entries with stock
+	icons.
+
+	* app/gui/toolbox.c: use GtkImages instead of GimpPreviews for
+	the toolbox buttons. Will need to change this back as soon
+	as GimpPreview actually _is_ a GtkImage.
+
 2001-08-05  Michael Natterer  <mitch@gimp.org>
 
 	* libgimpwidgets/gimpstock.[ch]: register the button icons with

Makefile.am

@@ -5,6 +5,7 @@ SUBDIRS = \
 	intl			\
 	regexrepl		\
 	pixmaps			\
+	themes			\
 	libgimpbase		\
 	libgimpcolor		\
 	libgimpmath		\

app/core/gimptoolinfo.c

@@ -18,6 +18,7 @@
 
 #include "config.h"
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 
 #include "core-types.h"
@@ -100,7 +101,8 @@ gimp_tool_info_init (GimpToolInfo *tool_info)
   tool_info->help_domain  = NULL;
   tool_info->help_data    = NULL;
 
-  tool_info->icon_data    = NULL;
+  tool_info->stock_id     = NULL;
+  tool_info->stock_pixbuf = NULL;
 
   tool_info->context      = NULL;
 
@@ -123,85 +125,93 @@ gimp_tool_info_destroy (GtkObject *object)
   g_free (tool_info->help_domain);
   g_free (tool_info->help_data);
 
+  if (tool_info->stock_pixbuf)
+    {
+      g_object_unref (G_OBJECT (tool_info->stock_pixbuf));
+      tool_info->stock_pixbuf = NULL;
+    }
+
   if (GTK_OBJECT_CLASS (parent_class)->destroy)
     GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
+static TempBuf *
+temp_buf_new_from_pixbuf (GdkPixbuf *pixbuf,
+			  gint       width,
+			  gint       height)
+{
+  TempBuf   *temp_buf;
+  gint       pixbuf_width;
+  gint       pixbuf_height;
+  guchar     transparent[4] = { 0, 0, 0, 0 };
+  guchar    *p_data;
+  guchar    *t_data;
+  guchar    *p;
+  guchar    *t;
+  gint       x, y;
+
+  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+
+  pixbuf_width  = gdk_pixbuf_get_width (pixbuf);
+  pixbuf_height = gdk_pixbuf_get_height (pixbuf);
+
+  if (pixbuf_width != width || pixbuf_height != height)
+    {
+      GdkPixbuf *scaled_pixbuf;
+
+      scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf,
+					       width, height,
+					       GDK_INTERP_BILINEAR);
+
+      pixbuf = scaled_pixbuf;
+    }
+  else
+    {
+      g_object_ref (G_OBJECT (pixbuf));
+    }
+
+  temp_buf = temp_buf_new (width, height, 4, 0, 0, transparent);
+
+  p_data = gdk_pixbuf_get_pixels (pixbuf);
+  t_data = temp_buf_data (temp_buf);
+
+  for (y = 0; y < height; y++)
+    {
+      p = p_data;
+      t = t_data;
+
+      for (x = 0; x < width; x++)
+	{
+	  *t++ = *p++;
+	  *t++ = *p++;
+	  *t++ = *p++;
+	  *t++ = *p++;
+	}
+
+      p_data += gdk_pixbuf_get_rowstride (pixbuf);
+      t_data += width * 4;
+    }
+
+  g_object_unref (G_OBJECT (pixbuf));
+
+  return temp_buf;
+}
+
 static TempBuf *
 gimp_tool_info_get_new_preview (GimpViewable *viewable,
 				gint          width,
 				gint          height)
 {
   GimpToolInfo *tool_info;
-  TempBuf      *temp_buf;
-  TempBuf      *return_buf;
-  guchar        opaque[4] = { 0, 0, 0, 0 };
-  gint          offset_x = 0;
-  gint          offset_y = 0;
-  gint          r, s, cnt;
-  guchar        value;
-  guchar       *data;
-  guchar       *p;
-
-  static gint colors[8][3] =
-  {
-    { 0x00, 0x00, 0x00 }, /* a -   0 */
-    { 0x24, 0x24, 0x24 }, /* b -  36 */
-    { 0x49, 0x49, 0x49 }, /* c -  73 */
-    { 0x6D, 0x6D, 0x6D }, /* d - 109 */
-    { 0x92, 0x92, 0x92 }, /* e - 146 */
-    { 0xB6, 0xB6, 0xB6 }, /* f - 182 */
-    { 0xDB, 0xDB, 0xDB }, /* g - 219 */
-    { 0xFF, 0xFF, 0xFF }, /* h - 255 */
-  };
 
   tool_info = GIMP_TOOL_INFO (viewable);
 
-#define TOOL_INFO_WIDTH  22
+  return temp_buf_new_from_pixbuf (tool_info->stock_pixbuf, width, height);
-#define TOOL_INFO_HEIGHT 22
-
-  temp_buf = temp_buf_new (TOOL_INFO_WIDTH, TOOL_INFO_HEIGHT, 4, 0, 0, opaque);
-
-  data = temp_buf_data (temp_buf);
-
-  p = data;
-
-  for (r = 0; r < TOOL_INFO_HEIGHT; r++)
-    {
-      for (s = 0, cnt = 0; s < TOOL_INFO_WIDTH; s++)
-        {
-          value = tool_info->icon_data[r][s];
-
-          if (value != '.')
-            {
-              *p++ = colors[value - 'a'][0];
-              *p++ = colors[value - 'a'][1];
-              *p++ = colors[value - 'a'][2];
-              *p++ = 255;
-            }
-	  else
-	    {
-	      p += 4;
-	    }
-	}
-    }
-
-  if (width > TOOL_INFO_WIDTH)
-    offset_x = (width - TOOL_INFO_WIDTH) / 2;
-
-  if (height > TOOL_INFO_HEIGHT)
-    offset_y = (height - TOOL_INFO_HEIGHT) / 2;
-
-  return_buf = temp_buf_scale (temp_buf, width, height);
-
-  temp_buf_free (temp_buf);
-
-  return return_buf;
 }
 
 GimpToolInfo *
 gimp_tool_info_new (GimpContext  *context,
-		    GtkType       tool_type,
+		    GType         tool_type,
                     gboolean      tool_context,
 		    const gchar  *identifier,
 		    const gchar  *blurb,
@@ -211,10 +221,19 @@ gimp_tool_info_new (GimpContext  *context,
 		    const gchar  *help_domain,
 		    const gchar  *help_data,
 		    const gchar  *pdb_string,
-		    const gchar **icon_data)
+		    const gchar  *stock_id,
+		    GdkPixbuf    *stock_pixbuf)
 {
   GimpToolInfo *tool_info;
 
+  g_return_val_if_fail (! context || GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (identifier != NULL, NULL);
+  g_return_val_if_fail (blurb != NULL, NULL);
+  g_return_val_if_fail (help != NULL, NULL);
+  g_return_val_if_fail (menu_path != NULL, NULL);
+  g_return_val_if_fail (stock_id != NULL, NULL);
+  g_return_val_if_fail (GDK_IS_PIXBUF (stock_pixbuf), NULL);
+
   tool_info = gtk_type_new (GIMP_TYPE_TOOL_INFO);
 
   gimp_object_set_name (GIMP_OBJECT (tool_info), identifier);
@@ -233,7 +252,10 @@ gimp_tool_info_new (GimpContext  *context,
   tool_info->pdb_string    = (pdb_string ?
 			      g_strdup (pdb_string) : "gimp_paintbrush_default");
 
-  tool_info->icon_data     = icon_data;
+  tool_info->stock_id      = stock_id;
+  tool_info->stock_pixbuf  = stock_pixbuf;
+
+  g_object_ref (G_OBJECT (stock_pixbuf));
 
   if (tool_context)
     {
@@ -252,6 +274,14 @@ gimp_tool_info_get_standard (void)
 
   if (! standard_tool_info)
     {
+      GdkPixbuf *pixbuf;
+
+      pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+			       TRUE,
+			       8,
+			       22,
+			       22);
+
       standard_tool_info =
 	gimp_tool_info_new (NULL,
 			    GIMP_TYPE_RECT_SELECT_TOOL,
@@ -259,10 +289,13 @@ gimp_tool_info_get_standard (void)
 			    "gimp:standard_tool",
 			    "Standard Tool",
 			    "Well something must be broken",
-			    NULL, NULL,
+			    "<Image>/Tools/Default Tool", NULL,
 			    NULL, NULL,
 			    NULL,
-			    NULL);
+			    GTK_STOCK_STOP,
+			    pixbuf);
+
+      g_object_unref (G_OBJECT (pixbuf));
     }
 
   return standard_tool_info;

app/core/gimptoolinfo.h

@@ -50,7 +50,8 @@ struct _GimpToolInfo
 
   gchar            *pdb_string;
 
-  const gchar     **icon_data;
+  const gchar      *stock_id;
+  GdkPixbuf        *stock_pixbuf;
 
   GimpContext      *context;
 
@@ -76,7 +77,8 @@ GimpToolInfo * gimp_tool_info_new          (GimpContext  *context,
 					    const gchar  *help_domain,
 					    const gchar  *help_data,
 					    const gchar  *pdb_string,
-					    const gchar **icon_data);
+					    const gchar  *stock_id,
+					    GdkPixbuf    *stock_pixbuf);
 
 GimpToolInfo * gimp_tool_info_get_standard (void);
 

configure.in

@@ -910,6 +910,8 @@ devel-docs/libgimpmath/Makefile
 devel-docs/libgimpwidgets/Makefile
 docs/Makefile
 pixmaps/Makefile
+themes/Makefile
+themes/Default/Makefile
 data/Makefile
 data/brushes/Makefile
 data/gradients/Makefile

libgimpwidgets/gimpstock.c

@@ -27,7 +27,7 @@
 
 #include "gimpstock.h"
 
-#include "pixmaps/gimp-stock-pixbufs.h"
+#include "themes/Default/gimp-stock-pixbufs.h"
 
 #include "libgimp/libgimp-intl.h"
 
@@ -101,9 +101,72 @@ static GtkStockItem gimp_stock_items[] =
   { GIMP_STOCK_STROKE,       N_("_Stroke"),           0, 0, "gimp-libgimp" },
   { GIMP_STOCK_TO_PATH,      N_("Selection To Path"), 0, 0, "gimp-libgimp" },
   { GIMP_STOCK_TO_SELECTION, N_("To Sleection"),      0, 0, "gimp-libgimp" },
-  { GIMP_STOCK_VISIBLE,      N_("Visible"),           0, 0, "gimp-libgimp" },
+  { GIMP_STOCK_VISIBLE,      N_("Visible"),           0, 0, "gimp-libgimp" }
-  { GIMP_STOCK_ZOOM_IN,      N_("Zoom In"),           0, 0, "gimp-libgimp" },
+};
-  { GIMP_STOCK_ZOOM_OUT,     N_("Zoom Out"),          0, 0, "gimp-libgimp" }
+
+static struct
+{
+  const gchar   *stock_id;
+  gconstpointer  inline_data;
+}
+gimp_stock_pixbufs[] =
+{
+  { GIMP_STOCK_ANCHOR,                   stock_button_anchor                   },
+  { GIMP_STOCK_DELETE,                   stock_button_delete                   },
+  { GIMP_STOCK_DUPLICATE,                stock_button_duplicate                },
+  { GIMP_STOCK_EDIT,                     stock_button_edit                     },
+  { GIMP_STOCK_LINKED,                   stock_button_linked                   },
+  { GIMP_STOCK_LOWER,                    stock_button_lower                    },
+  { GIMP_STOCK_NEW,                      stock_button_new                      },
+  { GIMP_STOCK_PASTE,                    stock_button_paste                    },
+  { GIMP_STOCK_PASTE_AS_NEW,             stock_button_paste_as_new             },
+  { GIMP_STOCK_PASTE_INTO,               stock_button_paste_into               },
+  { GIMP_STOCK_RAISE,                    stock_button_raise                    },
+  { GIMP_STOCK_REFRESH,                  stock_button_refresh                  },
+  { GIMP_STOCK_RESET,                    stock_button_refresh                  },
+  { GIMP_STOCK_STROKE,                   stock_button_stroke                   },
+  { GIMP_STOCK_TO_PATH,                  stock_button_to_path                  },
+  { GIMP_STOCK_TO_SELECTION,             stock_button_to_selection             },
+  { GIMP_STOCK_VISIBLE,                  stock_button_eye                      },
+
+  { GIMP_STOCK_TOOL_AIRBRUSH,            stock_tool_button_airbrush            },
+  { GIMP_STOCK_TOOL_BEZIER_SELECT,       stock_tool_button_bezier_select       },
+  { GIMP_STOCK_TOOL_BLEND,               stock_tool_button_blend               },
+  { GIMP_STOCK_TOOL_BLUR,                stock_tool_button_blur                },
+  { GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST, stock_tool_button_brightness_contrast },
+  { GIMP_STOCK_TOOL_BUCKET_FILL,         stock_tool_button_bucket_fill         },
+  { GIMP_STOCK_TOOL_BY_COLOR_SELECT,     stock_tool_button_by_color_select     },
+  { GIMP_STOCK_TOOL_CLONE,               stock_tool_button_clone               },
+  { GIMP_STOCK_TOOL_COLOR_BALANCE,       stock_tool_button_color_balance       },
+  { GIMP_STOCK_TOOL_COLOR_PICKER,        stock_tool_button_color_picker        },
+  { GIMP_STOCK_TOOL_CROP,                stock_tool_button_crop                },
+  { GIMP_STOCK_TOOL_CURVES,              stock_tool_button_curves              },
+  { GIMP_STOCK_TOOL_DODGE,               stock_tool_button_dodge               },
+  { GIMP_STOCK_TOOL_ELLIPSE_SELECT,      stock_tool_button_ellipse_select      },
+  { GIMP_STOCK_TOOL_ERASER,              stock_tool_button_eraser              },
+  { GIMP_STOCK_TOOL_FLIP,                stock_tool_button_flip                },
+  { GIMP_STOCK_TOOL_FREE_SELECT,         stock_tool_button_free_select         },
+  { GIMP_STOCK_TOOL_FUZZY_SELECT,        stock_tool_button_fuzzy_select        },
+  { GIMP_STOCK_TOOL_HISTOGRAM,           stock_tool_button_histogram           },
+  { GIMP_STOCK_TOOL_HUE_SATURATION,      stock_tool_button_hue_saturation      },
+  { GIMP_STOCK_TOOL_INK,                 stock_tool_button_ink                 },
+  { GIMP_STOCK_TOOL_ISCISSORS,           stock_tool_button_iscissors           },
+  { GIMP_STOCK_TOOL_LEVELS,              stock_tool_button_levels              },
+  { GIMP_STOCK_TOOL_MEASURE,             stock_tool_button_measure             },
+  { GIMP_STOCK_TOOL_MOVE,                stock_tool_button_move                },
+  { GIMP_STOCK_TOOL_PAINTBRUSH,          stock_tool_button_paintbrush          },
+  { GIMP_STOCK_TOOL_PATH,                stock_tool_button_path                },
+  { GIMP_STOCK_TOOL_PENCIL,              stock_tool_button_pencil              },
+  { GIMP_STOCK_TOOL_PERSPECTIVE,         stock_tool_button_perspective         },
+  { GIMP_STOCK_TOOL_POSTERIZE,           stock_tool_button_posterize           },
+  { GIMP_STOCK_TOOL_RECT_SELECT,         stock_tool_button_rect_select         },
+  { GIMP_STOCK_TOOL_ROTATE,              stock_tool_button_rotate              },
+  { GIMP_STOCK_TOOL_SCALE,               stock_tool_button_scale               },
+  { GIMP_STOCK_TOOL_SHEAR,               stock_tool_button_shear               },
+  { GIMP_STOCK_TOOL_SMUDGE,              stock_tool_button_smudge              },
+  { GIMP_STOCK_TOOL_TEXT,                stock_tool_button_text                },
+  { GIMP_STOCK_TOOL_THRESHOLD,           stock_tool_button_threshold           },
+  { GIMP_STOCK_TOOL_ZOOM,                stock_tool_button_zoom                }
 };
 
 void
@@ -111,49 +174,20 @@ gimp_stock_init (void)
 {
   static gboolean initialized = FALSE;
 
+  gint i;
+
   if (initialized)
     return;
 
   gimp_stock_factory = gtk_icon_factory_new ();
 
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_anchor_button,
+  for (i = 0; i < G_N_ELEMENTS (gimp_stock_pixbufs); i++)
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_ANCHOR);
+    {
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_delete_button,
+      add_sized_with_same_fallback (gimp_stock_factory,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_DELETE);
+				    gimp_stock_pixbufs[i].inline_data,
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_duplicate_button,
+				    GTK_ICON_SIZE_BUTTON,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_DUPLICATE);
+				    gimp_stock_pixbufs[i].stock_id);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_edit_button,
+    }
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_EDIT);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_linked_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_LINKED);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_lower_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_LOWER);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_new_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_NEW);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_paste_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_PASTE);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_paste_as_new_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_PASTE_AS_NEW);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_paste_into_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_PASTE_INTO);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_raise_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_RAISE);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_refresh_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_REFRESH);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_refresh_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_RESET);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_stroke_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_STROKE);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_to_path_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_TO_PATH);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_to_selection_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_TO_SELECTION);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_eye_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_VISIBLE);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_zoom_in_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_ZOOM_IN);
-  add_sized_with_same_fallback (gimp_stock_factory,   stock_zoom_out_button,
-				GTK_ICON_SIZE_BUTTON, GIMP_STOCK_ZOOM_OUT);
 
   gtk_icon_factory_add_default (gimp_stock_factory);
 

libgimpwidgets/gimpstock.h

@@ -47,8 +47,45 @@ extern "C" {
 #define GIMP_STOCK_TO_PATH      "gimp-to-path"
 #define GIMP_STOCK_TO_SELECTION "gimp-to-selection"
 #define GIMP_STOCK_VISIBLE      "gimp-visible"
-#define GIMP_STOCK_ZOOM_IN      "gimp-zoom-in"
+
-#define GIMP_STOCK_ZOOM_OUT     "gimp-zoom-out"
+#define GIMP_STOCK_TOOL_AIRBRUSH            "gimp-tool-airbrush"
+#define GIMP_STOCK_TOOL_BEZIER_SELECT       "gimp-tool-bezier-select"
+#define GIMP_STOCK_TOOL_BLEND               "gimp-tool-blend"
+#define GIMP_STOCK_TOOL_BLUR                "gimp-tool-blur"
+#define GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST "gimp-tool-brightness-contrast"
+#define GIMP_STOCK_TOOL_BUCKET_FILL         "gimp-tool-bucket-fill"
+#define GIMP_STOCK_TOOL_BY_COLOR_SELECT     "gimp-tool-by-color-select"
+#define GIMP_STOCK_TOOL_CLONE               "gimp-tool-clone"
+#define GIMP_STOCK_TOOL_COLOR_BALANCE       "gimp-tool-color-balance"
+#define GIMP_STOCK_TOOL_COLOR_PICKER        "gimp-tool-color-picker"
+#define GIMP_STOCK_TOOL_CROP                "gimp-tool-crop"
+#define GIMP_STOCK_TOOL_CURVES              "gimp-tool-curves"
+#define GIMP_STOCK_TOOL_DODGE               "gimp-tool-dodge"
+#define GIMP_STOCK_TOOL_ELLIPSE_SELECT      "gimp-tool-ellipse-select"
+#define GIMP_STOCK_TOOL_ERASER              "gimp-tool-eraser"
+#define GIMP_STOCK_TOOL_FLIP                "gimp-tool-flip"
+#define GIMP_STOCK_TOOL_FREE_SELECT         "gimp-tool-free-select"
+#define GIMP_STOCK_TOOL_FUZZY_SELECT        "gimp-tool-fuzzy-select"
+#define GIMP_STOCK_TOOL_HISTOGRAM           "gimp-tool-histogram"
+#define GIMP_STOCK_TOOL_HUE_SATURATION      "gimp-tool-hue-saturation"
+#define GIMP_STOCK_TOOL_INK                 "gimp-tool-ink"
+#define GIMP_STOCK_TOOL_ISCISSORS           "gimp-tool-iscissors"
+#define GIMP_STOCK_TOOL_LEVELS              "gimp-tool-levels"
+#define GIMP_STOCK_TOOL_MEASURE             "gimp-tool-measure"
+#define GIMP_STOCK_TOOL_MOVE                "gimp-tool-move"
+#define GIMP_STOCK_TOOL_PAINTBRUSH          "gimp-tool-paintbrush"
+#define GIMP_STOCK_TOOL_PATH                "gimp-tool-path"
+#define GIMP_STOCK_TOOL_PENCIL              "gimp-tool-pencil"
+#define GIMP_STOCK_TOOL_PERSPECTIVE         "gimp-tool-perspective"
+#define GIMP_STOCK_TOOL_POSTERIZE           "gimp-tool-posterize"
+#define GIMP_STOCK_TOOL_RECT_SELECT         "gimp-tool-rect-select"
+#define GIMP_STOCK_TOOL_ROTATE              "gimp-tool-rotate"
+#define GIMP_STOCK_TOOL_SCALE               "gimp-tool-scale"
+#define GIMP_STOCK_TOOL_SHEAR               "gimp-tool-shear"
+#define GIMP_STOCK_TOOL_SMUDGE              "gimp-tool-smudge"
+#define GIMP_STOCK_TOOL_TEXT                "gimp-tool-text"
+#define GIMP_STOCK_TOOL_THRESHOLD           "gimp-tool-threshold"
+#define GIMP_STOCK_TOOL_ZOOM                "gimp-tool-zoom"
 
 
 void   gimp_stock_init (void);

pixmaps/.cvsignore

@@ -2,4 +2,3 @@ Makefile
 Makefile.in
 .xvpics
 .thumbnails
-gimp-stock-pixbufs.h

pixmaps/Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-STOCK_IMAGES = @STRIP_BEGIN@ \
+EXTRA_DIST = @STRIP_BEGIN@ \
 	anchor.xpm		\
 	delete.xpm		\
 	duplicate.xpm		\
@@ -19,30 +19,7 @@ STOCK_IMAGES = @STRIP_BEGIN@ \
 	toselection.xpm		\
 	zoom_in.xpm		\
 	zoom_out.xpm		\
-@STRIP_END@
+	\
-
-STOCK_VARIABLES = @STRIP_BEGIN@ \
-	stock_anchor_button		$(srcdir)/anchor.xpm		\
-	stock_delete_button		$(srcdir)/delete.xpm		\
-	stock_duplicate_button		$(srcdir)/duplicate.xpm		\
-	stock_edit_button		$(srcdir)/edit.xpm		\
-	stock_eye_button		$(srcdir)/eye.xpm		\
-	stock_linked_button		$(srcdir)/linked.xpm		\
-	stock_lower_button		$(srcdir)/lower.xpm		\
-	stock_new_button		$(srcdir)/new.xpm		\
-	stock_paste_button		$(srcdir)/paste.xpm		\
-	stock_paste_as_new_button	$(srcdir)/paste-as-new.xpm	\
-	stock_paste_into_button		$(srcdir)/paste-into.xpm	\
-	stock_raise_button		$(srcdir)/raise.xpm		\
-	stock_refresh_button		$(srcdir)/refresh.xpm		\
-	stock_stroke_button		$(srcdir)/penstroke.xpm		\
-	stock_to_path_button		$(srcdir)/topath.xpm		\
-	stock_to_selection_button	$(srcdir)/toselection.xpm	\
-	stock_zoom_in_button		$(srcdir)/zoom_in.xpm		\
-	stock_zoom_out_button		$(srcdir)/zoom_out.xpm		\
-@STRIP_END@
-
-EXTRA_IMAGES = @STRIP_BEGIN@ \
 	chain.xpm		\
 	default.xpm		\
 	eek.xpm			\
@@ -71,14 +48,6 @@ EXTRA_IMAGES = @STRIP_BEGIN@ \
 	yes.xpm			\
 @STRIP_END@
 
-EXTRA_DIST = $(STOCK_IMAGES) $(EXTRA_IMAGES)
-
-noinst_DATA = gimp-stock-pixbufs.h
-CLEANFILES += $(noinst_DATA)
-
-gimp-stock-pixbufs.h: $(STOCK_IMAGES)
-	gdk-pixbuf-csource --raw --build-list $(STOCK_VARIABLES) >$(srcdir)/gimp-stock-pixbufs.h
-
 .PHONY: files
 
 files:

themes/.cvsignore

@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

themes/Default/.cvsignore

@@ -0,0 +1,5 @@
+Makefile
+Makefile.in
+.xvpics
+.thumbnails
+gimp-stock-pixbufs.h

themes/Default/Makefile.am

@@ -0,0 +1,190 @@
+## Process this file with automake to produce Makefile.in
+
+STOCK_IMAGES = @STRIP_BEGIN@ \
+	images/stock-button-anchor.png		\
+	images/stock-button-delete.png		\
+	images/stock-button-duplicate.png	\
+	images/stock-button-edit.png		\
+	images/stock-button-eye.png		\
+	images/stock-button-linked.png		\
+	images/stock-button-lower.png		\
+	images/stock-button-new.png		\
+	images/stock-button-paste.png		\
+	images/stock-button-paste-as-new.png	\
+	images/stock-button-paste-into.png	\
+	images/stock-button-stroke.png		\
+	images/stock-button-raise.png		\
+	images/stock-button-refresh.png		\
+	images/stock-button-to-path.png		\
+	images/stock-button-to-selection.png	\
+@STRIP_END@
+
+STOCK_VARIABLES = @STRIP_BEGIN@ \
+	stock_button_anchor				\
+	$(srcdir)/images/stock-button-anchor.png	\
+	stock_button_delete				\
+	$(srcdir)/images/stock-button-delete.png	\
+	stock_button_duplicate				\
+	$(srcdir)/images/stock-button-duplicate.png	\
+	stock_button_edit				\
+	$(srcdir)/images/stock-button-edit.png		\
+	stock_button_eye				\
+	$(srcdir)/images/stock-button-eye.png		\
+	stock_button_linked				\
+	$(srcdir)/images/stock-button-linked.png	\
+	stock_button_lower				\
+	$(srcdir)/images/stock-button-lower.png		\
+	stock_button_new				\
+	$(srcdir)/images/stock-button-new.png		\
+	stock_button_paste				\
+	$(srcdir)/images/stock-button-paste.png		\
+	stock_button_paste_as_new			\
+	$(srcdir)/images/stock-button-paste-as-new.png	\
+	stock_button_paste_into				\
+	$(srcdir)/images/stock-button-paste-into.png	\
+	stock_button_raise				\
+	$(srcdir)/images/stock-button-raise.png		\
+	stock_button_refresh				\
+	$(srcdir)/images/stock-button-refresh.png	\
+	stock_button_stroke				\
+	$(srcdir)/images/stock-button-stroke.png	\
+	stock_button_to_path				\
+	$(srcdir)/images/stock-button-to-path.png	\
+	stock_button_to_selection			\
+	$(srcdir)/images/stock-button-to-selection.png	\
+@STRIP_END@
+
+STOCK_TOOL_IMAGES = @STRIP_BEGIN@ \
+	images/tools/stock-tool-button-airbrush.png		\
+	images/tools/stock-tool-button-bezier-select.png	\
+	images/tools/stock-tool-button-blend.png		\
+	images/tools/stock-tool-button-blur.png			\
+	images/tools/stock-tool-button-brightness-contrast.png	\
+	images/tools/stock-tool-button-bucket-fill.png		\
+	images/tools/stock-tool-button-by-color-select.png	\
+	images/tools/stock-tool-button-clone.png		\
+	images/tools/stock-tool-button-color-balance.png	\
+	images/tools/stock-tool-button-color-picker.png		\
+	images/tools/stock-tool-button-crop.png			\
+	images/tools/stock-tool-button-curves.png		\
+	images/tools/stock-tool-button-dodge.png		\
+	images/tools/stock-tool-button-ellipse-select.png	\
+	images/tools/stock-tool-button-eraser.png		\
+	images/tools/stock-tool-button-flip.png			\
+	images/tools/stock-tool-button-free-select.png		\
+	images/tools/stock-tool-button-fuzzy-select.png		\
+	images/tools/stock-tool-button-histogram.png		\
+	images/tools/stock-tool-button-hue-saturation.png	\
+	images/tools/stock-tool-button-ink.png			\
+	images/tools/stock-tool-button-iscissors.png		\
+	images/tools/stock-tool-button-levels.png		\
+	images/tools/stock-tool-button-measure.png		\
+	images/tools/stock-tool-button-move.png			\
+	images/tools/stock-tool-button-paintbrush.png		\
+	images/tools/stock-tool-button-path.png			\
+	images/tools/stock-tool-button-pencil.png		\
+	images/tools/stock-tool-button-perspective.png		\
+	images/tools/stock-tool-button-posterize.png		\
+	images/tools/stock-tool-button-rect-select.png		\
+	images/tools/stock-tool-button-rotate.png		\
+	images/tools/stock-tool-button-scale.png		\
+	images/tools/stock-tool-button-shear.png		\
+	images/tools/stock-tool-button-smudge.png		\
+	images/tools/stock-tool-button-text.png			\
+	images/tools/stock-tool-button-threshold.png		\
+	images/tools/stock-tool-button-zoom.png			\
+@STRIP_END@
+
+STOCK_TOOL_VARIABLES = @STRIP_BEGIN@ \
+	stock_tool_button_airbrush						\
+	$(srcdir)/images/tools/stock-tool-button-airbrush.png			\
+	stock_tool_button_bezier_select						\
+	$(srcdir)/images/tools/stock-tool-button-bezier-select.png		\
+	stock_tool_button_blend							\
+	$(srcdir)/images/tools/stock-tool-button-blend.png			\
+	stock_tool_button_blur							\
+	$(srcdir)/images/tools/stock-tool-button-blur.png			\
+	stock_tool_button_brightness_contrast					\
+	$(srcdir)/images/tools/stock-tool-button-brightness-contrast.png	\
+	stock_tool_button_bucket_fill						\
+	$(srcdir)/images/tools/stock-tool-button-bucket-fill.png		\
+	stock_tool_button_by_color_select					\
+	$(srcdir)/images/tools/stock-tool-button-by-color-select.png		\
+	stock_tool_button_clone							\
+	$(srcdir)/images/tools/stock-tool-button-clone.png			\
+	stock_tool_button_color_balance						\
+	$(srcdir)/images/tools/stock-tool-button-color-balance.png		\
+	stock_tool_button_color_picker						\
+	$(srcdir)/images/tools/stock-tool-button-color-picker.png		\
+	stock_tool_button_crop							\
+	$(srcdir)/images/tools/stock-tool-button-crop.png			\
+	stock_tool_button_curves						\
+	$(srcdir)/images/tools/stock-tool-button-curves.png			\
+	stock_tool_button_dodge							\
+	$(srcdir)/images/tools/stock-tool-button-dodge.png			\
+	stock_tool_button_ellipse_select					\
+	$(srcdir)/images/tools/stock-tool-button-ellipse-select.png		\
+	stock_tool_button_eraser						\
+	$(srcdir)/images/tools/stock-tool-button-eraser.png			\
+	stock_tool_button_flip							\
+	$(srcdir)/images/tools/stock-tool-button-flip.png			\
+	stock_tool_button_free_select						\
+	$(srcdir)/images/tools/stock-tool-button-free-select.png		\
+	stock_tool_button_fuzzy_select						\
+	$(srcdir)/images/tools/stock-tool-button-fuzzy-select.png		\
+	stock_tool_button_histogram						\
+	$(srcdir)/images/tools/stock-tool-button-histogram.png			\
+	stock_tool_button_hue_saturation					\
+	$(srcdir)/images/tools/stock-tool-button-hue-saturation.png		\
+	stock_tool_button_ink							\
+	$(srcdir)/images/tools/stock-tool-button-ink.png			\
+	stock_tool_button_iscissors						\
+	$(srcdir)/images/tools/stock-tool-button-iscissors.png			\
+	stock_tool_button_levels						\
+	$(srcdir)/images/tools/stock-tool-button-levels.png			\
+	stock_tool_button_measure						\
+	$(srcdir)/images/tools/stock-tool-button-measure.png			\
+	stock_tool_button_move							\
+	$(srcdir)/images/tools/stock-tool-button-move.png			\
+	stock_tool_button_paintbrush						\
+	$(srcdir)/images/tools/stock-tool-button-paintbrush.png			\
+	stock_tool_button_path							\
+	$(srcdir)/images/tools/stock-tool-button-path.png			\
+	stock_tool_button_pencil						\
+	$(srcdir)/images/tools/stock-tool-button-pencil.png			\
+	stock_tool_button_perspective						\
+	$(srcdir)/images/tools/stock-tool-button-perspective.png		\
+	stock_tool_button_posterize						\
+	$(srcdir)/images/tools/stock-tool-button-posterize.png			\
+	stock_tool_button_rect_select						\
+	$(srcdir)/images/tools/stock-tool-button-rect-select.png		\
+	stock_tool_button_rotate						\
+	$(srcdir)/images/tools/stock-tool-button-rotate.png			\
+	stock_tool_button_scale							\
+	$(srcdir)/images/tools/stock-tool-button-scale.png			\
+	stock_tool_button_shear							\
+	$(srcdir)/images/tools/stock-tool-button-shear.png			\
+	stock_tool_button_smudge						\
+	$(srcdir)/images/tools/stock-tool-button-smudge.png			\
+	stock_tool_button_text							\
+	$(srcdir)/images/tools/stock-tool-button-text.png			\
+	stock_tool_button_threshold						\
+	$(srcdir)/images/tools/stock-tool-button-threshold.png			\
+	stock_tool_button_zoom							\
+	$(srcdir)/images/tools/stock-tool-button-zoom.png			\
+@STRIP_END@
+
+EXTRA_DIST = $(STOCK_IMAGES) $(STOCK_TOOL_IMAGES)
+
+noinst_DATA = gimp-stock-pixbufs.h
+CLEANFILES += $(noinst_DATA)
+
+gimp-stock-pixbufs.h: $(STOCK_IMAGES) $(STOCK_TOOL_IMAGES)
+	gdk-pixbuf-csource --raw --build-list $(STOCK_VARIABLES) $(STOCK_TOOL_VARIABLES) >$(srcdir)/gimp-stock-pixbufs.h
+
+.PHONY: files
+
+files:
+	@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
+	  echo $$p; \
+	done

themes/Default/images/.cvsignore

@@ -0,0 +1,2 @@
+.xvpics
+.thumbnails

themes/Default/images/tools/.cvsignore

@@ -0,0 +1,2 @@
+.xvpics
+.thumbnails

themes/Makefile.am

@@ -0,0 +1,16 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = Default
+
+.PHONY: files
+
+files:
+	@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
+	  echo $$p; \
+	done
+	@for subdir in $(SUBDIRS); do \
+	  files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \
+	  for file in $$files; do \
+	    echo $$subdir/$$file; \
+	  done; \
+	done