fixed bug 3332, erase emblem was mistakenly included in properties window.

fixed bug 3332, erase emblem was mistakenly included in
	properties window.

	tweaked images from Susan for the property browser

	Susan fixed Eli's time signature bug in the music icon

ChangeLog

@@ -1,3 +1,24 @@
+2000-09-28  Andy Hertzfeld  <set EMAIL_ADDRESS environment variable>
+
+	* src/file-manager/fm-properties-window.c:
+	(get_property_names_from_uri):
+	fixed bug 3332, erase emblem was mistakenly included in
+	properties window.
+	
+	* src/nautilus-property-browser.c: (make_color_drag_image),
+	(element_clicked_callback), (make_properties_from_xml_node):
+	made the colors in the property browser consistent with the
+	image backgrounds
+	
+	* icons/backgrounds.png:
+	* icons/colors.png:
+	* icons/emblems.png:
+	* icons/chit_frame.png:
+	tweaked images from Susan for the property browser
+	
+	* icons/i-music-aa.png:
+	Susan fixed Eli's time signature bug in the music icon
+	
 2000-09-28  Mathieu Lacage  <mathieu@eazel.com>
 
 	Fix bug 2688. back and forward buttons do not work 

src/file-manager/fm-properties-window.c

@@ -113,6 +113,8 @@ enum {
 	COLUMN_COUNT
 };
 
+#define ERASE_EMBLEM_FILENAME	"erase.png"
+
 static void cancel_group_change_callback (gpointer callback_data);
 static void cancel_owner_change_callback (gpointer callback_data);
 
@@ -1218,6 +1220,11 @@ get_property_names_from_uri (const char *directory_uri, GList *property_list)
 	for (current_file_info = gnome_vfs_directory_list_first(list); current_file_info != NULL; 
 	    current_file_info = gnome_vfs_directory_list_next(list)) {
 		if (nautilus_istr_has_prefix (current_file_info->mime_type, "image/")) {
+			/* skip the special "erase" emblem */
+			if (nautilus_strcmp (current_file_info->name, 
+					     ERASE_EMBLEM_FILENAME) == 0)
+				continue;
+				
 			keyword = g_strdup (current_file_info->name);
 			
 			/* strip image type suffix */

src/nautilus-property-browser.c

@@ -592,7 +592,7 @@ make_drag_image(NautilusPropertyBrowser *property_browser, const char* file_name
 /* create a pixbuf and fill it with a color */
 
 static GdkPixbuf*
-make_color_drag_image (NautilusPropertyBrowser *property_browser, const char *color_spec)
+make_color_drag_image (NautilusPropertyBrowser *property_browser, const char *color_spec, gboolean trim_edges)
 {
 	GdkPixbuf *color_square;
 	int row, col, stride;
@@ -620,7 +620,9 @@ make_color_drag_image (NautilusPropertyBrowser *property_browser, const char *co
 		}
 	}
 	
-	return nautilus_customization_make_background_chit (color_square, property_browser->details->property_chit, TRUE);	
+	return nautilus_customization_make_background_chit (color_square, 
+							    property_browser->details->property_chit,
+							    trim_edges);	
 }
 
 /* this callback handles button presses on the category widget. It maintains the select color */
@@ -1298,7 +1300,7 @@ element_clicked_callback(GtkWidget *widget, GdkEventButton *event, char *element
 
 		pixbuf = make_drag_image(property_browser, element_name);
 	} else {
-		pixbuf = make_color_drag_image(property_browser, element_name);
+		pixbuf = make_color_drag_image(property_browser, element_name, TRUE);
 	}
 
 	
@@ -1490,7 +1492,7 @@ make_properties_from_xml_node (NautilusPropertyBrowser *property_browser, xmlNod
 			
 			/* make the image from the color spec */
 
-			pixbuf = make_color_drag_image (property_browser, color_str);			
+			pixbuf = make_color_drag_image (property_browser, color_str, FALSE);			
 			gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
 			gdk_pixbuf_unref (pixbuf);
 			pixmap_widget = GTK_WIDGET (gtk_pixmap_new (pixmap, mask));