summaryrefslogtreecommitdiff
path: root/libnautilus-private
diff options
context:
space:
mode:
authorAndy Hertzfeld <andy@src.gnome.org>2001-02-21 08:54:53 +0000
committerAndy Hertzfeld <andy@src.gnome.org>2001-02-21 08:54:53 +0000
commit958d9934f73a6cb511267da727c31c07a03b248e (patch)
treecd9c9f7722db11b5ec97d06f7bb8ddf4d1f2f908 /libnautilus-private
parent239311ed88b2181b11abfc569e2e332ee1172aa0 (diff)
downloadnautilus-958d9934f73a6cb511267da727c31c07a03b248e.tar.gz
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
Diffstat (limited to 'libnautilus-private')
-rw-r--r--libnautilus-private/nautilus-icon-factory.c18
1 files changed, 16 insertions, 2 deletions
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);