769122 - Use the system provided Bonjour icon

Status: RESOLVED FIXED

(Camino Graveyard :: General, defect)

Description

[philippe (part-time)]

According to the Apple docs, the image is available as 'NSImageNameBonjour'

https://developer.apple.com/library/mac/#documentation/userexperience/conceptual/applehiguidelines/SystemProvidedIcons/SystemProvidedIcons.html#//apple_ref/doc/uid/20000957-CH5-SW1

(this would get us the HiDPI image for free as well)

I'm unsure if this applies to 10.5 and older, though.

Comment 1

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

From the NSImage docs, this is available in 10.5 and later.

I think we just have to treat it the same way we do the folder icon (osFolderIcon in NSImage+Utils).

Comment 2

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Attachment: Non-working un-proof of concept

Oh, part of the reason we haven't done this is that the constant isn't available until the 10.5 SDK (Stuart was able to use the old "HFS Type Code" way with NSWorkspace because a folder is an NSWorkspace concept, but Bonjour isn't).

If we did try to use the OS icon, the code would look something like this patch.

However, either I'm not doing the constant lookup/declaration correctly in this patch (certainly possible), or my copy/paste of the osFooIcon method has bugs, because I'm getting the folder icon instead of the Bonjour one :-P

Comment 3

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

FWIW, I modified DragNDropOutlineView (see bug 768757) to return NSImageNameBonjour, and it does (32px by default, 16px if I setSize:), so 10.5 SDK on 10.5 definitely works correctly ;-)

So that seems to imply that the constant declaration part of my code is wrong…

Comment 4

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Attachment: Fix

It occurred to me this afternoon while washing today's fruit and vegetable harvest that in the previous patch, I had defined (named) a constant so that the code would compile, but I had not actually specified the constant's value, which the OS isn't going to look up because, since I defined the constant, it's our constant, not the OS's.  So I was effectively doing [NSImage imageNamed:@""], which apparently triggers the folder icon ;-)

Per the NSImage docs (and NSImage.h), the value is the constant name minus the "ImageName" bit (so that the image can also be used in IB), so the value we want is "NSBonjour".

This new patch WFM in both normal and 2x scale on 10.5, but a sanity-check on 10.6/10.7 would be great.

Comment 5

[philippe (part-time)]

Comment on attachment 638148 [details] [diff] [review]
Fix

Works perfectly on 10.6 (normal mode) and 10.7 (normal mode and HiDPI mode); the OS provided icon is displayed in both (I replaced our rendezvous_icon.tiff with a specially crafted image to make sure). And the icon is correctly sized in both modes.

Comment 6

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Comment on attachment 638148 [details] [diff] [review]
Fix

See comment 0 and bug 768757 comment 2 for why.

Comment 7

[Stuart Morgan]

Comment on attachment 638148 [details] [diff] [review]
Fix

sr=smorgan

Comment 8

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

http://hg.mozilla.org/camino/rev/3249ec97333c