fixed bug 5939, margins in text icons are weirdly proportioned. Fixed bypost-1_0_4

	fixed bug 5939, margins in text icons are weirdly proportioned.
	Fixed by distinguishing the rectangles for the anti-aliased and
	non-aa icon types

	* icons/i-regular.xml:
	added and tweaked both aa and non-aa text rectangles
	* libnautilus-extensions/nautilus-icon-factory.c:
	(get_themed_icon_file_path):
	get a separate text rectangle for anti-aliased mode if present

	fixed bug 6708, Change "support" link in menus, by moving and
	renamed the "support" item from the services menu to the help menu.
	This bug isn't finished yet, since we still have to rename the
	support uri, but it isn't ready on the service yet.

	* src/nautilus-service-ui.xml:
	removed support item
	* src/nautilus-shell-ui.xml:
	added customer service item
	* src/nautilus-window-menus.c: (help_menu_customer_service),
	(nautilus_window_initialize_menus):
	added code to handle the customer service command
	* src/nautilus-window-service-ui.c:
	(nautilus_window_install_service_ui):
	removed callback for the support command

9 files changed, 88 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 8f9294efb..69e9c20df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2001-02-21  Andy Hertzfeld  <andy@eazel.com>
+
+	fixed bug 5939, margins in text icons are weirdly proportioned.
+	Fixed by distinguishing the rectangles for the anti-aliased and
+	non-aa icon types
+	
+	* icons/i-regular.xml:
+	added and tweaked both aa and non-aa text rectangles
+	* libnautilus-extensions/nautilus-icon-factory.c:
+	(get_themed_icon_file_path):
+	get a separate text rectangle for anti-aliased mode if present
+	
+	fixed bug 6708, Change "support" link in menus, by moving and
+	renamed the "support" item from the services menu to the help menu.
+	This bug isn't finished yet, since we still have to rename the
+	support uri, but it isn't ready on the service yet.
+	
+	* src/nautilus-service-ui.xml:
+	removed support item
+	* src/nautilus-shell-ui.xml:
+	added customer service item
+	* src/nautilus-window-menus.c: (help_menu_customer_service),
+	(nautilus_window_initialize_menus):
+	added code to handle the customer service command
+	* src/nautilus-window-service-ui.c:
+	(nautilus_window_install_service_ui):
+	removed callback for the support command
+
 2001-02-21  Dan Mueth  <dan@eazel.com>
 
 	reviewed by: Mike Fleming  <mfleming@eazel.com>
diff --git a/icons/i-regular.xml b/icons/i-regular.xml
index e5ea80847..f0981ae64 100644
--- a/icons/i-regular.xml
+++ b/icons/i-regular.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <icon_set>
-  <icon size="36" embedded_text_rectangle="3,3,28,38"/>
-  <icon size="48" embedded_text_rectangle="4,4,40,48"/>
-  <icon size="72" embedded_text_rectangle="8,8,56,72"/>
-  <icon size="96" embedded_text_rectangle="12,12,65,92"/>
+  <icon size="36" embedded_text_rectangle_aa="3,3,29,37" embedded_text_rectangle="2,2,28,36"/>
+  <icon size="48" embedded_text_rectangle_aa="5,5,39,48" embedded_text_rectangle="3,3,39,48"/>
+  <icon size="72" embedded_text_rectangle_aa="6,6,62,75" embedded_text_rectangle="4,4,59,72"/>
+  <icon size="96" embedded_text_rectangle_aa="7,7,74,94" embedded_text_rectangle="5,5,72,93"/>
 </icon_set>
diff --git a/libnautilus-extensions/nautilus-icon-factory.c b/libnautilus-extensions/nautilus-icon-factory.c
index 18ce228c9..7fc4b8089 100644
--- a/libnautilus-extensions/nautilus-icon-factory.c
+++ b/libnautilus-extensions/nautilus-icon-factory.c
@@ -987,7 +987,14 @@ get_themed_icon_file_path (const char *theme_name,
 			(doc, "icon", "size", size_as_string);
 		g_free (size_as_string);
 		
-		property = xmlGetProp (node, "embedded_text_rectangle");		
+		property = NULL;
+		if (aa_mode) {
+			property = xmlGetProp (node, "embedded_text_rectangle_aa");		
+		}
+		if (property == NULL) {
+			property = xmlGetProp (node, "embedded_text_rectangle");				
+		}
+		
 		if (property != NULL) {
 			
 			if (sscanf (property,
@@ -1001,7 +1008,14 @@ get_themed_icon_file_path (const char *theme_name,
 			xmlFree (property);
 		}
 
-		property = xmlGetProp (node, "attach_points");
+		property = NULL;
+		if (aa_mode) {
+			property = xmlGetProp (node, "attach_points_aa");
+		}
+		if (property == NULL) {
+			property = xmlGetProp (node, "attach_points");
+		}
+		
 		parse_attach_points (&details->attach_points, property);	
 		xmlFree (property);
 		
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index 18ce228c9..7fc4b8089 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -987,7 +987,14 @@ get_themed_icon_file_path (const char *theme_name,
 			(doc, "icon", "size", size_as_string);
 		g_free (size_as_string);
 		
-		property = xmlGetProp (node, "embedded_text_rectangle");		
+		property = NULL;
+		if (aa_mode) {
+			property = xmlGetProp (node, "embedded_text_rectangle_aa");		
+		}
+		if (property == NULL) {
+			property = xmlGetProp (node, "embedded_text_rectangle");				
+		}
+		
 		if (property != NULL) {
 			
 			if (sscanf (property,
@@ -1001,7 +1008,14 @@ get_themed_icon_file_path (const char *theme_name,
 			xmlFree (property);
 		}
 
-		property = xmlGetProp (node, "attach_points");
+		property = NULL;
+		if (aa_mode) {
+			property = xmlGetProp (node, "attach_points_aa");
+		}
+		if (property == NULL) {
+			property = xmlGetProp (node, "attach_points");
+		}
+		
 		parse_attach_points (&details->attach_points, property);	
 		xmlFree (property);
 		
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 0c6294993..b8345cd01 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -596,6 +596,15 @@ help_menu_nautilus_license_callback (BonoboUIComponent *component,
 }
 
 static void
+help_menu_customer_service (BonoboUIComponent *component, 
+		       gpointer callback_data, 
+		       const char *verb)
+{
+	nautilus_window_go_to (NAUTILUS_WINDOW (callback_data),
+			       "http://services.eazel.com/support");
+}
+
+static void
 help_menu_nautilus_feedback_callback (BonoboUIComponent *component, 
 			              gpointer user_data, 
 			              const char *verb)
@@ -1184,6 +1193,7 @@ nautilus_window_initialize_menus (NautilusWindow *window)
 		BONOBO_UI_VERB ("About Nautilus", help_menu_about_nautilus_callback),
 		BONOBO_UI_VERB ("Nautilus Manual", help_menu_nautilus_manual_callback),
 		BONOBO_UI_VERB ("Nautilus License", help_menu_nautilus_license_callback),
+		BONOBO_UI_VERB ("Customer Service", help_menu_customer_service),
 		BONOBO_UI_VERB ("Nautilus Feedback", help_menu_nautilus_feedback_callback),
 
 		BONOBO_UI_VERB ("Switch to Beginner Level", user_level_menu_item_callback),
diff --git a/src/nautilus-service-ui.xml b/src/nautilus-service-ui.xml
index 12d01c896..6d8f994a8 100644
--- a/src/nautilus-service-ui.xml
+++ b/src/nautilus-service-ui.xml
@@ -16,10 +16,6 @@
 				verb="Software Catalog"/>
 			<placeholder name="Service Items" delimit="top"/>
 			<placeholder name="Help Items" delimit="top">
-				<menuitem name="Support" 
-				  	_label="_Support" 
-				  	_tip="Display support information for Eazel Services"
-					verb="Services Support"/>
 			</placeholder>
 		</submenu>
 	</placeholder>
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 2c10bb3c4..d32f5d347 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -249,6 +249,10 @@
 			  _label="Nautilus _License" 
 			  _tip="Display the license for Nautilus"
 			  verb="Nautilus License"/>
+		<menuitem name="Support" 
+			  _label="_Customer Service" 
+			  _tip="Display support information for Nautilus and Eazel Services"
+			  verb="Customer Service"/>
 		<menuitem name="Nautilus Feedback" 
 			  _label="_Feedback..." 
 			  _tip="Show a page from which you can send feedback about Nautilus and Eazel Services"
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 0c6294993..b8345cd01 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -596,6 +596,15 @@ help_menu_nautilus_license_callback (BonoboUIComponent *component,
 }
 
 static void
+help_menu_customer_service (BonoboUIComponent *component, 
+		       gpointer callback_data, 
+		       const char *verb)
+{
+	nautilus_window_go_to (NAUTILUS_WINDOW (callback_data),
+			       "http://services.eazel.com/support");
+}
+
+static void
 help_menu_nautilus_feedback_callback (BonoboUIComponent *component, 
 			              gpointer user_data, 
 			              const char *verb)
@@ -1184,6 +1193,7 @@ nautilus_window_initialize_menus (NautilusWindow *window)
 		BONOBO_UI_VERB ("About Nautilus", help_menu_about_nautilus_callback),
 		BONOBO_UI_VERB ("Nautilus Manual", help_menu_nautilus_manual_callback),
 		BONOBO_UI_VERB ("Nautilus License", help_menu_nautilus_license_callback),
+		BONOBO_UI_VERB ("Customer Service", help_menu_customer_service),
 		BONOBO_UI_VERB ("Nautilus Feedback", help_menu_nautilus_feedback_callback),
 
 		BONOBO_UI_VERB ("Switch to Beginner Level", user_level_menu_item_callback),
diff --git a/src/nautilus-window-service-ui.c b/src/nautilus-window-service-ui.c
index 09358f30b..868ed0a02 100644
--- a/src/nautilus-window-service-ui.c
+++ b/src/nautilus-window-service-ui.c
@@ -102,16 +102,6 @@ goto_software_catalog (BonoboUIComponent *component,
 }
 
 static void
-goto_services_support (BonoboUIComponent *component, 
-		       gpointer callback_data, 
-		       const char *verb)
-{
-	nautilus_window_go_to (NAUTILUS_WINDOW (callback_data),
-			       "http://services.eazel.com/support");
-
-}
-
-static void
 detach_service_ui (GtkObject *object,
 		   gpointer callback_data)
 {
@@ -131,7 +121,6 @@ nautilus_window_install_service_ui (NautilusWindow *window)
 		BONOBO_UI_VERB ("Eazel Services", goto_services_summary),
 		BONOBO_UI_VERB ("Online Storage", goto_online_storage),
 		BONOBO_UI_VERB ("Software Catalog", goto_software_catalog),
-		BONOBO_UI_VERB ("Services Support", goto_services_support),
 		BONOBO_UI_VERB_END
 	};