reviewed by: Pavel Cisler <pavel@eazel.com>

	* libnautilus-extensions/Makefile.am:
	New files.
	* libnautilus-extensions/nautilus-art-extensions.c:
	(nautilus_art_irect_align):
	* libnautilus-extensions/nautilus-art-extensions.h:
	Make the align function actually work.  The previous version was
	copied from GtkPixmap and i didnt realize it did not work.  Remove
	the padding parameters which are not really needed for alignment.

	* libnautilus-extensions/nautilus-clickable-image.h:
	* libnautilus-extensions/nautilus-clickable-image.c:
	New class.  A clickable image.

	* libnautilus-extensions/nautilus-labeled-image.h:
	* libnautilus-extensions/nautilus-labeled-image.c:
	New class.  A labeled image.

	* libnautilus-extensions/nautilus-image.h:
	* libnautilus-extensions/nautilus-image.c:
	(nautilus_image_expose_event), (image_get_pixbuf_bounds),
	(image_is_smooth), (nautilus_image_set_is_smooth),
	(nautilus_image_get_is_smooth), (nautilus_image_new_solid),
	(nautilus_image_set_never_smooth):
	Add never smooth attribute to force behavior to match GTK+ for
	cases when consistency is most important.
	Update for alignment art extensions api change.
	Some minor paramter name changes to lose abbreviations.

	* libnautilus-extensions/nautilus-label.h:
	* libnautilus-extensions/nautilus-label.c:
	(nautilus_label_size_request), (nautilus_label_expose_event),
	(label_get_text_bounds), (label_is_smooth),
	(nautilus_label_set_is_smooth), (nautilus_label_get_is_smooth),
	(nautilus_label_new_solid), (nautilus_label_set_never_smooth):
	Add never smooth attribute to force behavior to match GTK+ for
	cases when consistency is most important.
	Update for alignment art extensions api change.
	Update for alignment art extensions api change.
	Some minor paramter name changes to lose abbreviations.

	* libnautilus-extensions/nautilus-smooth-widget.c:
	(smooth_widget_get_tile_origin_point),
	(nautilus_smooth_widget_get_preferred_frame):
	Add some comments explaining why using 0 for ancestor offsets
	works.
	Fix a really dumb bug, the paddings where multiplies by 2 twice
	instead of once.

	* test/.cvsignore:
	* test/Makefile.am:
	* test/test-nautilus-clickable-image.c: (clicked_callback),
	(enter_callback), (leave_callback), (clickable_image_new), (main):
	* test/test-nautilus-label-background.c:
	* test/test-nautilus-label-scrolled.c: (label_window_new_scrolled),
	(label_window_new_table):
	* test/test-nautilus-label-simple.c: (main):
	* test/test-nautilus-label.c: (main):
	* test/test-nautilus-labeled-image.c: (labeled_image_new),
	(labeled_image_window_new), (labeled_image_button_window_new),
	(main):
	* test/test-nautilus-pixbuf-tile.c:
	(pixbuf_drawing_area_expose_event),
	(drawable_drawing_area_expose_event), (main):
	* test/test-nautilus-preferences-change.c: (main):
	* test/test.c: (test_init):
	New tests for clickable and labeled images.  Many updates to other
	tests.

	Also, changed many instances of NautilusFooDetail to
        NautilusFooDetails as well as the corresponding members.

1 files changed, 6 insertions, 2 deletions

diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 45f0f2922..342ff77de 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -49,8 +49,8 @@ libnautilus_extensions_la_LDFLAGS =	\
 
 libnautilus_extensions_la_SOURCES = 		\
 	bug-5712-pr3-workaround--gdk-pixbuf-drawable.c \
-	bug-5712-pr3-workaround--gdkimage.c \
 	bug-5712-pr3-workaround--gdk-pixbuf-private.h \
+	bug-5712-pr3-workaround--gdkimage.c \
 	nautilus-art-extensions.c		\
 	nautilus-art-gtk-extensions.c		\
 	nautilus-background-canvas-group.c	\
@@ -59,6 +59,7 @@ libnautilus_extensions_la_SOURCES = 		\
 	nautilus-bookmark.c			\
 	nautilus-caption-table.c		\
 	nautilus-caption.c			\
+	nautilus-clickable-image.c		\
 	nautilus-ctree.c			\
 	nautilus-customization-data.c		\
 	nautilus-dateedit-extensions.c		\
@@ -73,8 +74,8 @@ libnautilus_extensions_la_SOURCES = 		\
 	nautilus-drag.c				\
 	nautilus-druid-page-eazel.c		\
 	nautilus-druid.c			\
-	nautilus-entry.c			\
 	nautilus-ellipsizing-label.c		\
+	nautilus-entry.c			\
 	nautilus-enumeration.c			\
 	nautilus-file-changes-queue.c		\
 	nautilus-file-operations-progress.c	\
@@ -104,6 +105,7 @@ libnautilus_extensions_la_SOURCES = 		\
 	nautilus-keep-last-vertical-box.c	\
 	nautilus-label-with-background.c	\
 	nautilus-label.c			\
+	nautilus-labeled-image.c		\
 	nautilus-lib-self-check-functions.c	\
 	nautilus-link-set.c			\
 	nautilus-link.c				\
@@ -160,6 +162,7 @@ noinst_HEADERS =				\
 	nautilus-caption-table.h		\
 	nautilus-caption.h			\
 	nautilus-cdrom-extensions.h		\
+	nautilus-clickable-image.h		\
 	nautilus-ctree.h			\
 	nautilus-customization-data.h		\
 	nautilus-dateedit-extensions.h 		\
@@ -212,6 +215,7 @@ noinst_HEADERS =				\
 	nautilus-keep-last-vertical-box.h	\
 	nautilus-label-with-background.h	\
 	nautilus-label.h			\
+	nautilus-labeled-image.h		\
 	nautilus-lib-self-check-functions.h	\
 	nautilus-link-set.h			\
 	nautilus-link.h				\