adium 4056:859e25a23dba: Removed service icon from top of "Get I...
commits at adium.im
commits at adium.im
Sun Jul 17 11:27:24 UTC 2011
details: http://hg.adium.im/adium/rev/859e25a23dba
revision: 4056:859e25a23dba
branch: (none)
author: Patrick Steinhardt <steinhardt.p at me.com>
date: Sun Jul 17 13:21:43 2011 +0200
Removed service icon from top of "Get Info"-inspector and contact list tooltip. "Contacts" array now displays for all contacts. Fixes #14654.
diffs (truncated from 1049 to 1000 lines):
diff -r 830a902a0960 -r 859e25a23dba Resources/AIInfoInspectorPane.nib/designable.nib
--- a/Resources/AIInfoInspectorPane.nib/designable.nib Sat Jul 16 17:49:16 2011 -0500
+++ b/Resources/AIInfoInspectorPane.nib/designable.nib Sun Jul 17 13:21:43 2011 +0200
@@ -1,14 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9L31a</string>
- <string key="IBDocument.InterfaceBuilderVersion">680</string>
- <string key="IBDocument.AppKitVersion">949.54</string>
- <string key="IBDocument.HIToolboxVersion">353.00</string>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <string key="IBDocument.SystemVersion">10K540</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1305</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="NS.object.0">1305</string>
+ </object>
+ <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="3"/>
+ <string>NSProgressIndicator</string>
+ <string>NSCustomObject</string>
+ <string>NSScrollView</string>
+ <string>NSTextField</string>
+ <string>NSTextFieldCell</string>
+ <string>NSCustomView</string>
+ <string>NSTextView</string>
+ <string>NSImageCell</string>
+ <string>NSImageView</string>
+ <string>NSScroller</string>
+ <string>NSBox</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -16,7 +30,7 @@
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0" id="9"/>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="413974837">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -40,9 +54,10 @@
<object class="NSPSMatrix" key="NSDrawMatrix"/>
<string key="NSFrame">{{134, 100}, {32, 32}}</string>
<reference key="NSSuperview" ref="932146179"/>
+ <reference key="NSWindow"/>
<int key="NSpiFlags">20490</int>
- <double key="NSMinValue">1.600000e+01</double>
- <double key="NSMaxValue">1.000000e+02</double>
+ <double key="NSMinValue">16</double>
+ <double key="NSMaxValue">100</double>
</object>
<object class="NSBox" id="902753176">
<reference key="NSNextResponder" ref="932146179"/>
@@ -57,8 +72,9 @@
<object class="NSTextField" id="70999372">
<reference key="NSNextResponder" ref="1023396534"/>
<int key="NSvFlags">270</int>
- <string key="NSFrame">{{119, 47}, {162, 17}}</string>
+ <string key="NSFrame">{{107, 47}, {162, 17}}</string>
<reference key="NSSuperview" ref="1023396534"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1065181077">
<int key="NSCellFlags">69336641</int>
@@ -66,7 +82,7 @@
<string key="NSContents">Contact Name</string>
<object class="NSFont" key="NSSupport" id="612434423">
<string key="NSName">LucidaGrande</string>
- <double key="NSSize">1.300000e+01</double>
+ <double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="70999372"/>
@@ -77,7 +93,7 @@
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="358578630">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="951201770">
@@ -339,44 +355,12 @@
</object>
</object>
</object>
- <object class="NSImageView" id="600397044">
- <reference key="NSNextResponder" ref="1023396534"/>
- <int key="NSvFlags">268</int>
- <object class="NSMutableSet" key="NSDragTypes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="set.sortedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>Apple PDF pasteboard type</string>
- <string>Apple PICT pasteboard type</string>
- <string>Apple PNG pasteboard type</string>
- <string>NSFilenamesPboardType</string>
- <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
- <string>NeXT TIFF v4.0 pasteboard type</string>
- </object>
- </object>
- <string key="NSFrame">{{72, 46}, {18, 18}}</string>
- <reference key="NSSuperview" ref="1023396534"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSImageCell" key="NSCell" id="1010124770">
- <int key="NSCellFlags">130560</int>
- <int key="NSCellFlags2">33554432</int>
- <object class="NSCustomResource" key="NSContents" id="445909554">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSApplicationIcon</string>
- </object>
- <int key="NSAlign">0</int>
- <int key="NSScale">0</int>
- <int key="NSStyle">0</int>
- <bool key="NSAnimates">NO</bool>
- </object>
- <bool key="NSEditable">YES</bool>
- </object>
<object class="NSImageView" id="586371905">
<reference key="NSNextResponder" ref="1023396534"/>
<int key="NSvFlags">268</int>
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="set.sortedObjects">
+ <object class="NSArray" key="set.sortedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Apple PDF pasteboard type</string>
<string>Apple PICT pasteboard type</string>
@@ -388,11 +372,15 @@
</object>
<string key="NSFrame">{{16, 16}, {48, 48}}</string>
<reference key="NSSuperview" ref="1023396534"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="787587921">
<int key="NSCellFlags">270663168</int>
<int key="NSCellFlags2">32768</int>
- <reference key="NSContents" ref="445909554"/>
+ <object class="NSCustomResource" key="NSContents" id="18491072">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSApplicationIcon</string>
+ </object>
<int key="NSAlign">0</int>
<int key="NSScale">0</int>
<int key="NSStyle">0</int>
@@ -405,7 +393,7 @@
<int key="NSvFlags">268</int>
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="set.sortedObjects">
+ <object class="NSArray" key="set.sortedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Apple PDF pasteboard type</string>
<string>Apple PICT pasteboard type</string>
@@ -415,13 +403,14 @@
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{96, 46}, {18, 18}}</string>
+ <string key="NSFrame">{{84, 46}, {18, 18}}</string>
<reference key="NSSuperview" ref="1023396534"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="894190430">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">33554432</int>
- <reference key="NSContents" ref="445909554"/>
+ <reference key="NSContents" ref="18491072"/>
<reference key="NSSupport" ref="612434423"/>
<int key="NSAlign">8</int>
<int key="NSScale">0</int>
@@ -435,6 +424,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{69, 17}, {48, 17}}</string>
<reference key="NSSuperview" ref="1023396534"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="959777481">
<int key="NSCellFlags">67239424</int>
@@ -442,7 +432,7 @@
<string key="NSContents">Alias:</string>
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">LucidaGrande</string>
- <double key="NSSize">1.100000e+01</double>
+ <double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
</object>
<reference key="NSControlView" ref="1049268456"/>
@@ -455,6 +445,7 @@
<int key="NSvFlags">266</int>
<string key="NSFrame">{{122, 16}, {162, 19}}</string>
<reference key="NSSuperview" ref="1023396534"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="858584296">
<int key="NSCellFlags">-1804468671</int>
@@ -483,10 +474,12 @@
</object>
<string key="NSFrameSize">{300, 80}</string>
<reference key="NSSuperview" ref="902753176"/>
+ <reference key="NSWindow"/>
</object>
</object>
<string key="NSFrame">{{0, 220}, {300, 80}}</string>
<reference key="NSSuperview" ref="932146179"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -520,6 +513,7 @@
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{300, 14}</string>
<reference key="NSSuperview" ref="432376147"/>
+ <reference key="NSWindow"/>
<object class="NSTextContainer" key="NSTextContainer" id="922054680">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -536,16 +530,17 @@
<nil key="NSDelegate"/>
</object>
<reference key="NSTextView" ref="1000427931"/>
- <double key="NSWidth">3.000000e+02</double>
+ <double key="NSWidth">300</double>
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
<int key="NSFlags">11173</int>
+ <int key="NSTextCheckingTypes">0</int>
+ <nil key="NSMarkedAttributes"/>
<reference key="NSBackgroundColor" ref="330751029"/>
- <reference key="NSInsertionColor" ref="652056281"/>
<object class="NSDictionary" key="NSSelectedAttributes">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
+ <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSBackgroundColor</string>
<string>NSColor</string>
@@ -566,10 +561,10 @@
</object>
</object>
</object>
- <nil key="NSMarkedAttributes"/>
+ <reference key="NSInsertionColor" ref="652056281"/>
<object class="NSDictionary" key="NSLinkAttributes">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
+ <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSColor</string>
<string>NSUnderline</string>
@@ -580,7 +575,7 @@
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MCAwIDEAA</bytes>
</object>
- <reference ref="9"/>
+ <integer value="1"/>
</object>
</object>
<nil key="NSDefaultParagraphStyle"/>
@@ -593,6 +588,7 @@
</object>
<string key="NSFrameSize">{300, 221}</string>
<reference key="NSSuperview" ref="728721158"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1000427931"/>
<reference key="NSDocView" ref="1000427931"/>
<reference key="NSBGColor" ref="330751029"/>
@@ -607,24 +603,27 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-30, 1}, {15, 163}}</string>
<reference key="NSSuperview" ref="728721158"/>
+ <reference key="NSWindow"/>
<reference key="NSTarget" ref="728721158"/>
<string key="NSAction">_doScroller:</string>
- <double key="NSCurValue">1.000000e+00</double>
+ <double key="NSCurValue">1</double>
</object>
<object class="NSScroller" id="25053041">
<reference key="NSNextResponder" ref="728721158"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="728721158"/>
+ <reference key="NSWindow"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="728721158"/>
<string key="NSAction">_doScroller:</string>
- <double key="NSCurValue">1.000000e+00</double>
- <double key="NSPercent">9.456522e-01</double>
+ <double key="NSCurValue">1</double>
+ <double key="NSPercent">0.94565220000000005</double>
</object>
</object>
<string key="NSFrameSize">{300, 221}</string>
<reference key="NSSuperview" ref="932146179"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="432376147"/>
<int key="NSsFlags">528</int>
<reference key="NSVScroller" ref="884824177"/>
@@ -636,6 +635,7 @@
<int key="NSvFlags">266</int>
<string key="NSFrame">{{0, 219}, {300, 5}}</string>
<reference key="NSSuperview" ref="932146179"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -656,6 +656,7 @@
</object>
<string key="NSFrameSize">{300, 300}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
</object>
@@ -683,14 +684,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">serviceImage</string>
- <reference key="source" ref="384977958"/>
- <reference key="destination" ref="600397044"/>
- </object>
- <int key="connectionID">79</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">statusImage</string>
<reference key="source" ref="384977958"/>
<reference key="destination" ref="603184944"/>
@@ -769,7 +762,7 @@
<int key="objectID">-2</int>
<reference key="object" ref="384977958"/>
<reference key="parent" ref="0"/>
- <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
+ <string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
@@ -806,7 +799,6 @@
<reference ref="603184944"/>
<reference ref="70999372"/>
<reference ref="859992357"/>
- <reference ref="600397044"/>
</object>
<reference key="parent" ref="932146179"/>
</object>
@@ -916,25 +908,11 @@
<reference key="object" ref="858584296"/>
<reference key="parent" ref="859992357"/>
</object>
- <object class="IBObjectRecord">
- <int key="objectID">77</int>
- <reference key="object" ref="600397044"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1010124770"/>
- </object>
- <reference key="parent" ref="902753176"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">192</int>
- <reference key="object" ref="1010124770"/>
- <reference key="parent" ref="600397044"/>
- </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
+ <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-3.IBPluginDependency</string>
<string>-3.ImportedFromIB2</string>
@@ -971,82 +949,66 @@
<string>6.IBPluginDependency</string>
<string>6.IBViewBoundsToFrameTransform</string>
<string>6.ImportedFromIB2</string>
- <string>77.IBPluginDependency</string>
- <string>77.IBViewBoundsToFrameTransform</string>
- <string>77.ImportedFromIB2</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" id="5"/>
+ <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUOGgABCKAAAA</bytes>
</object>
- <reference ref="5"/>
+ <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="5"/>
+ <boolean value="YES"/>
<string>AIContactInfoImageViewWithImagePicker</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUDgAABBEAAAA</bytes>
</object>
- <reference ref="5"/>
+ <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="5"/>
+ <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="5"/>
+ <boolean value="YES"/>
<string>AILocalizationTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCkAAAwfAAAA</bytes>
</object>
- <reference ref="5"/>
+ <boolean value="YES"/>
<string>AIDelayedTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABC5AAAwgAAAA</bytes>
</object>
- <reference ref="5"/>
+ <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="5"/>
- <reference ref="5"/>
- <reference ref="5"/>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
<string>{{360, 310}, {300, 300}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="5"/>
+ <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="5"/>
+ <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw2sAAA</bytes>
</object>
- <reference ref="5"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">AUNzAABCJAAAA</bytes>
- </object>
- <reference ref="5"/>
+ <boolean value="YES"/>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <reference key="dict.values" ref="0"/>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">202</int>
@@ -1058,28 +1020,65 @@
<string key="className">AIContactInfoImageViewWithImagePicker</string>
<string key="superclassName">AIImageViewWithImagePicker</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIContactInfoImageViewWithImagePicker.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">AIDelayedTextField</string>
<string key="superclassName">NSTextField</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIDelayedTextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIImageViewWithImagePicker</string>
+ <string key="superclassName">NSImageView</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">showImagePicker:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">showImagePicker:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">showImagePicker:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">delegate</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">delegate</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">delegate</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIImageViewWithImagePicker.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">AIInfoInspectorPane</string>
- <string key="superclassName">AIObject</string>
+ <string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">setAlias:</string>
<string key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">setAlias:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">setAlias:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
+ <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>accountName</string>
<string>aliasLabel</string>
@@ -1104,9 +1103,63 @@
<string>AIContactInfoImageViewWithImagePicker</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>accountName</string>
+ <string>aliasLabel</string>
+ <string>contactAlias</string>
+ <string>inspectorContentView</string>
+ <string>profileProgress</string>
+ <string>profileView</string>
+ <string>serviceImage</string>
+ <string>statusImage</string>
+ <string>userIcon</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">accountName</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">aliasLabel</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">contactAlias</string>
+ <string key="candidateClassName">AIDelayedTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">inspectorContentView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">profileProgress</string>
+ <string key="candidateClassName">NSProgressIndicator</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">profileView</string>
+ <string key="candidateClassName">NSTextView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">serviceImage</string>
+ <string key="candidateClassName">NSImageView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">statusImage</string>
+ <string key="candidateClassName">NSImageView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">userIcon</string>
+ <string key="candidateClassName">AIContactInfoImageViewWithImagePicker</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIInfoInspectorPane.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -1114,7 +1167,7 @@
<string key="superclassName">NSTextField</string>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
+ <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>view_anchorToLeftSide</string>
<string>view_anchorToRightSide</string>
@@ -1129,113 +1182,57 @@
<string>NSWindow</string>
</object>
</object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">AIObject</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <string key="superclassName">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="NSMutableDictionary" key="actions">
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
+ <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>adiumPrint:</string>
- <string>didAdjustSubviews:</string>
- <string>prefsWindowWillClose:</string>
- <string>toggleFindPanel:</string>
- <string>willAdjustSubviews:</string>
+ <string>view_anchorToLeftSide</string>
+ <string>view_anchorToRightSide</string>
+ <string>window_anchorOnLeftSide</string>
+ <string>window_anchorOnRightSide</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>RBSplitView</string>
- <string>SS_PrefsController</string>
- <string>id</string>
- <string>RBSplitView</string>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_anchorToLeftSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_anchorToRightSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">window_anchorOnLeftSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">window_anchorOnRightSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSScrollView</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSTextField</string>
- <string key="superclassName">NSControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <string key="superclassName">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">RBSplitSubview</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">RBSplitView</string>
- <string key="superclassName">RBSplitSubview</string>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">delegate</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">SS_PrefsController</string>
- <string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">delegate</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AILocalizationTextField.h</string>
</object>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Adium.xcodeproj</string>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+ <integer value="1050" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NS.key.0">NSApplicationIcon</string>
+ <string key="NS.object.0">{128, 128}</string>
+ </object>
</data>
</archive>
diff -r 830a902a0960 -r 859e25a23dba Resources/AIInfoInspectorPane.nib/keyedobjects.nib
Binary file Resources/AIInfoInspectorPane.nib/keyedobjects.nib has changed
diff -r 830a902a0960 -r 859e25a23dba Source/AIInfoInspectorPane.h
--- a/Source/AIInfoInspectorPane.h Sat Jul 16 17:49:16 2011 -0500
+++ b/Source/AIInfoInspectorPane.h Sun Jul 17 13:21:43 2011 +0200
@@ -26,7 +26,6 @@
IBOutlet AIContactInfoImageViewWithImagePicker *userIcon;
IBOutlet NSImageView *statusImage;
- IBOutlet NSImageView *serviceImage;
IBOutlet NSTextField *aliasLabel;
IBOutlet AIDelayedTextField *contactAlias;
diff -r 830a902a0960 -r 859e25a23dba Source/AIInfoInspectorPane.m
--- a/Source/AIInfoInspectorPane.m Sat Jul 16 17:49:16 2011 -0500
+++ b/Source/AIInfoInspectorPane.m Sun Jul 17 13:21:43 2011 +0200
@@ -41,7 +41,6 @@
@interface AIInfoInspectorPane ()
- (void)updateUserIcon:(AIListObject *)inObject;
- (void)updateAccountName:(AIListObject *)inObject;
-- (void)updateServiceIcon:(AIListObject *)inObject;
- (void)updateStatusIcon:(AIListObject *)inObject;
- (void)updateAlias:(AIListObject *)inObject;
- (void)addAddressBookInfoToProfileArray:(NSMutableArray *)profileArray forContact:(AIListContact *)inContact;
@@ -102,7 +101,6 @@
[self updateUserIcon:inObject];
[self updateAccountName:inObject];
- [self updateServiceIcon:inObject];
[self updateStatusIcon:inObject];
[self updateAlias:inObject];
@@ -173,16 +171,6 @@
}
}
--(void)updateServiceIcon:(AIListObject *)inObject
-{
- if([inObject isKindOfClass:[AIListGroup class]]) {
- [serviceImage setHidden:YES];
- } else {
- [serviceImage setHidden:NO];
- [serviceImage setImage:[AIServiceIcons serviceIconForObject:inObject type:AIServiceIconSmall direction:AIIconNormal]];
- }
-}
-
#define KEY_KEY @"Key"
#define KEY_VALUE @"Value"
#define KEY_TYPE @"Type"
diff -r 830a902a0960 -r 859e25a23dba Source/AIInterfaceController.m
--- a/Source/AIInterfaceController.m Sat Jul 16 17:49:16 2011 -0500
+++ b/Source/AIInterfaceController.m Sun Jul 17 13:21:43 2011 +0200
@@ -1618,30 +1618,7 @@
[titleString appendString:[NSString stringWithFormat:@" (%@)", formattedUID] withAttributes:titleDict];
}
[displayName release];
-
- if ([object isKindOfClass:[AIListContact class]]) {
- if ((![object isKindOfClass:[AIMetaContact class]] || [(AIMetaContact *)object containsOnlyOneService]) &&
- [object userIcon]) {
- NSImage *serviceIcon = [[AIServiceIcons serviceIconForObject:object type:AIServiceIconSmall direction:AIIconNormal]
- imageByScalingToSize:NSMakeSize(14,14)];
- if (serviceIcon) {
- NSTextAttachment *attachment;
- NSTextAttachmentCell *cell;
-
- cell = [[NSTextAttachmentCell alloc] init];
- [cell setImage:serviceIcon];
-
- attachment = [[NSTextAttachment alloc] init];
- [attachment setAttachmentCell:cell];
- [cell release];
-
- [titleString appendString:@" " withAttributes:nil];
- [titleString appendAttributedString:[NSAttributedString attributedStringWithAttachment:attachment]];
- [attachment release];
- }
- }
- }
-
+
if ([object isKindOfClass:[AIListGroup class]]) {
[titleString appendString:[NSString stringWithFormat:@" (%ld/%ld)",[(AIListGroup *)object visibleCount],[(AIListGroup *)object countOfContainedObjects]]
withAttributes:titleDict];
diff -r 830a902a0960 -r 859e25a23dba Source/AIListObjectContentsPlugin.m
--- a/Source/AIListObjectContentsPlugin.m Sat Jul 16 17:49:16 2011 -0500
+++ b/Source/AIListObjectContentsPlugin.m Sun Jul 17 13:21:43 2011 +0200
@@ -18,6 +18,7 @@
#import <Adium/AIContactControllerProtocol.h>
#import <Adium/AIInterfaceControllerProtocol.h>
#import <Adium/AIMenuControllerProtocol.h>
+#import <Adium/AIListBookmark.h>
#import <Adium/AIListContact.h>
#import <Adium/AIListObject.h>
#import <Adium/AIListGroup.h>
@@ -84,7 +85,9 @@
*/
- (NSString *)labelForObject:(AIListObject *)inObject
{
- if ([inObject conformsToProtocol:@protocol(AIContainingObject)]) {
+ if ([inObject conformsToProtocol:@protocol(AIContainingObject)] ||
+ [inObject isKindOfClass:[AIListContact class]] &&
+ ![inObject isKindOfClass:[AIListBookmark class]]) {
return AILocalizedString(@"Contacts",nil);
}
@@ -99,87 +102,86 @@
- (NSAttributedString *)entryForObject:(AIListObject *)inObject
{
NSMutableAttributedString *entry = nil;
+ NSMutableString *entryString = nil;
+ NSArray *listContacts = nil;
+ NSUInteger count = 0;
+ BOOL shouldAppendString = NO;
+ id<AIContainingObject> containingObject = nil;
+
+ entry = [[NSMutableAttributedString alloc] init];
+ entryString = [entry mutableString];
if ([inObject conformsToProtocol:@protocol(AIContainingObject)]) {
- id<AIContainingObject> containingObject = (id<AIContainingObject>)inObject;
- NSArray *listContacts = [containingObject uniqueContainedObjects];
+ containingObject = (id<AIContainingObject>)inObject;
- //Only display the contents of a meta if it has more than one contact within it.
- if ([inObject isKindOfClass:[AIListGroup class]] || [listContacts count] > 1) {
- BOOL shouldAppendString = NO;
- BOOL shouldAppendServiceIcon = ([inObject isKindOfClass:[AIMetaContact class]] && ![(AIMetaContact *)inObject containsOnlyOneService]);
+ listContacts = [containingObject uniqueContainedObjects];
+ } else if ([inObject isKindOfClass:[AIListContact class]]) {
+ listContacts = [NSArray arrayWithObject:inObject];
+ }
+
+ for (AIListContact *contact in listContacts) {
+ NSImage *statusIcon, *serviceIcon;
+
+ if (containingObject != nil && [inObject isKindOfClass:[AIListGroup class]] &&
+ ![[AIContactHidingController sharedController] visibilityOfListObject:contact inContainer:containingObject]) {
+ continue;
+ }
+
+ if (shouldAppendString) {
+ [entryString appendString:@"\r"];
+ } else {
+ shouldAppendString = YES;
+ }
+
+ // If there are a lot of contacts, just stop.
+ if (++count >= MAX_CONTACTS) {
+ [entryString appendString:[NSString stringWithFormat:MORE_CONTACTS_STRING, listContacts.count - MAX_CONTACTS]];
+ break;
+ }
+
+ statusIcon = [[AIStatusIcons statusIconForListObject:contact
+ type:AIStatusIconTab
+ direction:AIIconNormal] imageByScalingToSize:META_TOOLTIP_ICON_SIZE];
+ if (statusIcon) {
+ NSTextAttachment *attachment;
+ NSTextAttachmentCell *cell;
+
+ cell = [[NSTextAttachmentCell alloc] init];
+ [cell setImage:statusIcon];
+
+ attachment = [[NSTextAttachment alloc] init];
+ [attachment setAttachmentCell:cell];
+ [cell release];
- entry = [[NSMutableAttributedString alloc] init];
- NSMutableString *entryString = [entry mutableString];
+ [entry appendAttributedString:[NSAttributedString attributedStringWithAttachment:attachment]];
+ [attachment release];
+
+ [entryString appendString:@" "];
+ }
- NSUInteger count = 0;
- for (AIListContact *contact in listContacts) {
- if ([inObject isKindOfClass:[AIListGroup class]] &&
- ![[AIContactHidingController sharedController] visibilityOfListObject:contact inContainer:containingObject]) {
- continue;
- }
-
- NSImage *statusIcon, *serviceIcon;
+ if ([inObject isKindOfClass:[AIMetaContact class]]) {
+ [entryString appendString:contact.formattedUID];
+ } else if ([inObject isKindOfClass:[AIListGroup class]] ||
+ [inObject isKindOfClass:[AIListContact class]]) {
+ [entryString appendString:contact.displayName];
+ }
- if (shouldAppendString) {
- [entryString appendString:@"\r"];
- } else {
- shouldAppendString = YES;
- }
-
- // If there are a lot of contacts, just stop.
- if (++count >= MAX_CONTACTS) {
- [entryString appendString:[NSString stringWithFormat:MORE_CONTACTS_STRING, listContacts.count - MAX_CONTACTS]];
- break;
- }
-
- statusIcon = [[AIStatusIcons statusIconForListObject:contact
- type:AIStatusIconTab
- direction:AIIconNormal] imageByScalingToSize:META_TOOLTIP_ICON_SIZE];
-
- if (statusIcon) {
- NSTextAttachment *attachment;
- NSTextAttachmentCell *cell;
-
- cell = [[NSTextAttachmentCell alloc] init];
- [cell setImage:statusIcon];
+ serviceIcon = [[AIServiceIcons serviceIconForObject:contact type:AIServiceIconSmall direction:AIIconNormal]
+ imageByScalingToSize:META_TOOLTIP_ICON_SIZE];
+ if (serviceIcon) {
+ NSTextAttachment *attachment;
+ NSTextAttachmentCell *cell;
More information about the commits
mailing list