adium 3918:b88499df0305: Replaced old "Format names as:" with in...
commits at adium.im
commits at adium.im
Mon May 30 23:38:48 UTC 2011
details: http://hg.adium.im/adium/rev/b88499df0305
revision: 3918:b88499df0305
branch: (none)
author: Patrick Steinhardt <steinhardt.p at me.com>
date: Tue May 31 01:26:12 2011 +0200
Replaced old "Format names as:" with instructions and broadened token field.
diffs (753 lines):
diff -r 3b1b884f27c0 -r b88499df0305 Resources/AddressBookPrefs.nib/designable.nib
--- a/Resources/AddressBookPrefs.nib/designable.nib Thu May 26 12:48:45 2011 +0200
+++ b/Resources/AddressBookPrefs.nib/designable.nib Tue May 31 01:26:12 2011 +0200
@@ -3,12 +3,12 @@
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">10J869</string>
- <string key="IBDocument.InterfaceBuilderVersion">1306</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1305</string>
<string key="IBDocument.AppKitVersion">1038.35</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">1306</string>
+ <string key="NS.object.0">1305</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSTextField</string>
@@ -44,22 +44,56 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
+ <object class="NSTextField" id="1048122547">
+ <reference key="NSNextResponder" ref="1056980084"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{19, 306}, {369, 14}}</string>
+ <reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="658327944">
+ <int key="NSCellFlags">68288064</int>
+ <int key="NSCellFlags2">272630784</int>
+ <string key="NSContents">Type text and drag name elements to create a custom name format.</string>
+ <object class="NSFont" key="NSSupport" id="115310829">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">11</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="NSControlView" ref="1048122547"/>
+ <object class="NSColor" key="NSBackgroundColor" id="314505115">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlColor</string>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ </object>
+ </object>
+ <object class="NSColor" key="NSTextColor" id="552919332">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlTextColor</string>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ </object>
+ </object>
+ </object>
+ </object>
<object class="NSButton" id="830040855">
<reference key="NSNextResponder" ref="1056980084"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{19, 149}, {245, 18}}</string>
+ <string key="NSFrame">{{19, 151}, {245, 18}}</string>
<reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="401818986"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="369834959">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents">Use Nick exclusively if available</string>
- <object class="NSFont" key="NSSupport" id="115310829">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">11</double>
- <int key="NSfFlags">16</int>
- </object>
+ <reference key="NSSupport" ref="115310829"/>
<reference key="NSControlView" ref="830040855"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
@@ -79,8 +113,9 @@
<object class="NSButton" id="940660">
<reference key="NSNextResponder" ref="1056980084"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{19, 169}, {245, 18}}</string>
+ <string key="NSFrame">{{19, 171}, {245, 18}}</string>
<reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="830040855"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="79274371">
@@ -112,6 +147,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 15}, {70, 14}}</string>
<reference key="NSSuperview" ref="636212990"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="287063788"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="781720128">
@@ -120,24 +156,8 @@
<string key="NSContents">Middle</string>
<reference key="NSSupport" ref="115310829"/>
<reference key="NSControlView" ref="970388425"/>
- <object class="NSColor" key="NSBackgroundColor" id="314505115">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor" id="552919332">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- </object>
+ <reference key="NSBackgroundColor" ref="314505115"/>
+ <reference key="NSTextColor" ref="552919332"/>
</object>
</object>
<object class="NSTextField" id="23064184">
@@ -145,6 +165,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 40}, {70, 14}}</string>
<reference key="NSSuperview" ref="636212990"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="195663535"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="258882054">
@@ -162,6 +183,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{179, 40}, {70, 14}}</string>
<reference key="NSSuperview" ref="636212990"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="576439752"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1061240405">
@@ -179,6 +201,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{179, 15}, {70, 14}}</string>
<reference key="NSSuperview" ref="636212990"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="909944675"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="922932982">
@@ -199,6 +222,7 @@
</set>
<string key="NSFrame">{{79, 39}, {93, 17}}</string>
<reference key="NSSuperview" ref="636212990"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="981902426"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="728397387">
@@ -263,6 +287,7 @@
</set>
<string key="NSFrame">{{79, 9}, {93, 22}}</string>
<reference key="NSSuperview" ref="636212990"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="968337851"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="190851223">
@@ -315,6 +340,7 @@
</set>
<string key="NSFrame">{{245, 39}, {120, 17}}</string>
<reference key="NSSuperview" ref="636212990"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="970388425"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="98995285">
@@ -367,6 +393,7 @@
</set>
<string key="NSFrame">{{245, 14}, {120, 17}}</string>
<reference key="NSSuperview" ref="636212990"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="940660"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="922378431">
@@ -414,11 +441,13 @@
</array>
<string key="NSFrame">{{1, 1}, {368, 61}}</string>
<reference key="NSSuperview" ref="49347676"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="23064184"/>
</object>
</array>
- <string key="NSFrame">{{18, 189}, {370, 77}}</string>
+ <string key="NSFrame">{{18, 191}, {370, 77}}</string>
<reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="636212990"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -448,8 +477,9 @@
<set class="NSMutableSet" key="NSDragTypes">
<string>NSStringPboardType</string>
</set>
- <string key="NSFrame">{{120, 275}, {264, 21}}</string>
+ <string key="NSFrame">{{20, 277}, {365, 21}}</string>
<reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="49347676"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="798460398">
@@ -470,29 +500,12 @@
</object>
<int key="NSTokenFieldVersion">2</int>
</object>
- <object class="NSTextField" id="951279381">
- <reference key="NSNextResponder" ref="1056980084"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 278}, {99, 14}}</string>
- <reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSNextKeyView" ref="365339894"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="504239461">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Format names as:</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="951279381"/>
- <reference key="NSBackgroundColor" ref="314505115"/>
- <reference key="NSTextColor" ref="552919332"/>
- </object>
- </object>
<object class="NSButton" id="485817221">
<reference key="NSNextResponder" ref="1056980084"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{0, 304}, {306, 18}}</string>
+ <string key="NSFrame">{{0, 326}, {306, 18}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSNextKeyView" ref="951279381"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="758199240">
<int key="NSCellFlags">67239424</int>
@@ -513,8 +526,9 @@
<object class="NSTextField" id="293344676">
<reference key="NSNextResponder" ref="1056980084"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{0, 326}, {307, 14}}</string>
+ <string key="NSFrame">{{0, 348}, {307, 14}}</string>
<reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="908619062"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="420548907">
@@ -534,8 +548,9 @@
<object class="NSTextField" id="401818986">
<reference key="NSNextResponder" ref="1056980084"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{0, 127}, {307, 14}}</string>
+ <string key="NSFrame">{{0, 129}, {307, 14}}</string>
<reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="274895758"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="906057447">
@@ -551,8 +566,9 @@
<object class="NSBox" id="274895758">
<reference key="NSNextResponder" ref="1056980084"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{3, 125}, {402, 5}}</string>
+ <string key="NSFrame">{{3, 127}, {402, 5}}</string>
<reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="908159057"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -574,8 +590,9 @@
<object class="NSButton" id="908159057">
<reference key="NSNextResponder" ref="1056980084"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{0, 103}, {306, 18}}</string>
+ <string key="NSFrame">{{0, 105}, {306, 18}}</string>
<reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="350360009"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="973467239">
@@ -597,8 +614,9 @@
<object class="NSButton" id="349756092">
<reference key="NSNextResponder" ref="1056980084"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{0, 63}, {306, 18}}</string>
+ <string key="NSFrame">{{0, 65}, {306, 18}}</string>
<reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="533129817"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="180231265">
@@ -620,8 +638,9 @@
<object class="NSButton" id="350360009">
<reference key="NSNextResponder" ref="1056980084"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 83}, {288, 18}}</string>
+ <string key="NSFrame">{{18, 85}, {288, 18}}</string>
<reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="349756092"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="618425859">
@@ -643,8 +662,9 @@
<object class="NSTextField" id="533129817">
<reference key="NSNextResponder" ref="1056980084"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{0, 40}, {307, 14}}</string>
+ <string key="NSFrame">{{0, 42}, {307, 14}}</string>
<reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="685860409"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="239031865">
@@ -660,8 +680,9 @@
<object class="NSButton" id="197595407">
<reference key="NSNextResponder" ref="1056980084"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{0, 16}, {298, 18}}</string>
+ <string key="NSFrame">{{0, 18}, {298, 18}}</string>
<reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="545570160">
<int key="NSCellFlags">67239424</int>
@@ -682,8 +703,9 @@
<object class="NSBox" id="685860409">
<reference key="NSNextResponder" ref="1056980084"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{3, 38}, {402, 5}}</string>
+ <string key="NSFrame">{{3, 40}, {402, 5}}</string>
<reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="197595407"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -705,8 +727,9 @@
<object class="NSBox" id="908619062">
<reference key="NSNextResponder" ref="1056980084"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{3, 324}, {402, 5}}</string>
+ <string key="NSFrame">{{3, 346}, {402, 5}}</string>
<reference key="NSSuperview" ref="1056980084"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="485817221"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -726,8 +749,9 @@
<bool key="NSTransparent">NO</bool>
</object>
</array>
- <string key="NSFrameSize">{405, 340}</string>
+ <string key="NSFrameSize">{405, 362}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="293344676"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
@@ -828,14 +852,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">label_formatNamesAs</string>
- <reference key="source" ref="186189435"/>
- <reference key="destination" ref="951279381"/>
- </object>
- <int key="connectionID">162</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">label_names</string>
<reference key="source" ref="186189435"/>
<reference key="destination" ref="293344676"/>
@@ -978,6 +994,14 @@
</object>
<int key="connectionID">251</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">label_instructions</string>
+ <reference key="source" ref="186189435"/>
+ <reference key="destination" ref="1048122547"/>
+ </object>
+ <int key="connectionID">254</int>
+ </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -1003,7 +1027,6 @@
<int key="objectID">30</int>
<reference key="object" ref="1056980084"/>
<array class="NSMutableArray" key="children">
- <reference ref="951279381"/>
<reference ref="293344676"/>
<reference ref="908619062"/>
<reference ref="485817221"/>
@@ -1019,19 +1042,12 @@
<reference ref="830040855"/>
<reference ref="274895758"/>
<reference ref="685860409"/>
+ <reference ref="1048122547"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">addressBookPrefsView</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">82</int>
- <reference key="object" ref="951279381"/>
- <array class="NSMutableArray" key="children">
- <reference ref="504239461"/>
- </array>
- <reference key="parent" ref="1056980084"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">91</int>
<reference key="object" ref="485817221"/>
<array class="NSMutableArray" key="children">
@@ -1147,11 +1163,6 @@
<reference key="parent" ref="908619062"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">194</int>
- <reference key="object" ref="504239461"/>
- <reference key="parent" ref="951279381"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">195</int>
<reference key="object" ref="758199240"/>
<reference key="parent" ref="485817221"/>
@@ -1360,6 +1371,19 @@
<reference key="object" ref="369834959"/>
<reference key="parent" ref="830040855"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">252</int>
+ <reference key="object" ref="1048122547"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="658327944"/>
+ </array>
+ <reference key="parent" ref="1056980084"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">253</int>
+ <reference key="object" ref="658327944"/>
+ <reference key="parent" ref="1048122547"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1421,7 +1445,6 @@
<boolean value="YES" key="191.ImportedFromIB2"/>
<string key="192.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="192.ImportedFromIB2"/>
- <string key="194.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="195.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="196.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="197.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1467,12 +1490,12 @@
<string key="235.CustomClassName">AILocalizationButton</string>
<string key="235.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="236.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="252.CustomClassName">AILocalizationTextField</string>
+ <string key="252.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="253.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="30.IBEditorWindowLastContentRect">{{0, 449}, {405, 296}}</string>
<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="30.ImportedFromIB2"/>
- <string key="82.CustomClassName">AILocalizationTextField</string>
- <string key="82.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="82.ImportedFromIB2"/>
<string key="91.CustomClassName">AILocalizationButton</string>
<string key="91.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="91.ImportedFromIB2"/>
@@ -1481,9 +1504,247 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">251</int>
+ <int key="maxID">254</int>
</object>
- <object class="IBClassDescriber" key="IBDocument.Classes"/>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <array class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <object class="IBPartialClassDescription">
+ <string key="className">AIAdvancedPreferencePane</string>
+ <string key="superclassName">AIModularPane</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIAdvancedPreferencePane.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AILocalizationButton</string>
+ <string key="superclassName">NSButton</string>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="view_anchorToLeftSide">NSView</string>
+ <string key="view_anchorToRightSide">NSView</string>
+ <string key="window_anchorOnLeftSide">NSWindow</string>
+ <string key="window_anchorOnRightSide">NSWindow</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
+ <string key="name">view_anchorToLeftSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view_anchorToRightSide">
+ <string key="name">view_anchorToRightSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
+ <string key="name">window_anchorOnLeftSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
+ <string key="name">window_anchorOnRightSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AILocalizationButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AILocalizationTextField</string>
+ <string key="superclassName">NSTextField</string>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="view_anchorToLeftSide">NSView</string>
+ <string key="view_anchorToRightSide">NSView</string>
+ <string key="window_anchorOnLeftSide">NSWindow</string>
+ <string key="window_anchorOnRightSide">NSWindow</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
+ <string key="name">view_anchorToLeftSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view_anchorToRightSide">
+ <string key="name">view_anchorToRightSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
+ <string key="name">window_anchorOnLeftSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
+ <string key="name">window_anchorOnRightSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AILocalizationTextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIModularPane</string>
+ <string key="superclassName">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">changePreference:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">changePreference:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">changePreference:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">view</string>
+ <string key="NS.object.0">NSView</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">view</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">view</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIModularPane.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">ESAddressBookIntegrationAdvancedPreferences</string>
+ <string key="superclassName">AIAdvancedPreferencePane</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">changePreference:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">changePreference:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">changePreference:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="box_nameElements">NSBox</string>
+ <string key="checkBox_enableImport">NSButton</string>
+ <string key="checkBox_enableNoteSync">NSButton</string>
+ <string key="checkBox_metaContacts">NSButton</string>
+ <string key="checkBox_preferABImages">NSButton</string>
+ <string key="checkBox_syncAutomatic">NSButton</string>
+ <string key="checkBox_useABImages">NSButton</string>
+ <string key="checkBox_useFirstName">NSButton</string>
+ <string key="checkBox_useNickName">NSButton</string>
+ <string key="label_contacts">AILocalizationTextField</string>
+ <string key="label_firstToken">AILocalizationTextField</string>
+ <string key="label_images">AILocalizationTextField</string>
+ <string key="label_instructions">AILocalizationTextField</string>
+ <string key="label_lastToken">AILocalizationTextField</string>
+ <string key="label_middleToken">AILocalizationTextField</string>
+ <string key="label_names">AILocalizationTextField</string>
+ <string key="label_nickToken">AILocalizationTextField</string>
+ <string key="tokenField_firstToken">NSTokenField</string>
+ <string key="tokenField_format">NSTokenField</string>
+ <string key="tokenField_lastToken">NSTokenField</string>
+ <string key="tokenField_middleToken">NSTokenField</string>
+ <string key="tokenField_nickToken">NSTokenField</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="box_nameElements">
+ <string key="name">box_nameElements</string>
+ <string key="candidateClassName">NSBox</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_enableImport">
+ <string key="name">checkBox_enableImport</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_enableNoteSync">
+ <string key="name">checkBox_enableNoteSync</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_metaContacts">
+ <string key="name">checkBox_metaContacts</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_preferABImages">
+ <string key="name">checkBox_preferABImages</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_syncAutomatic">
+ <string key="name">checkBox_syncAutomatic</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_useABImages">
+ <string key="name">checkBox_useABImages</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_useFirstName">
+ <string key="name">checkBox_useFirstName</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_useNickName">
+ <string key="name">checkBox_useNickName</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_contacts">
+ <string key="name">label_contacts</string>
+ <string key="candidateClassName">AILocalizationTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_firstToken">
+ <string key="name">label_firstToken</string>
+ <string key="candidateClassName">AILocalizationTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_images">
+ <string key="name">label_images</string>
+ <string key="candidateClassName">AILocalizationTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_instructions">
+ <string key="name">label_instructions</string>
+ <string key="candidateClassName">AILocalizationTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_lastToken">
+ <string key="name">label_lastToken</string>
+ <string key="candidateClassName">AILocalizationTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_middleToken">
+ <string key="name">label_middleToken</string>
+ <string key="candidateClassName">AILocalizationTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_names">
+ <string key="name">label_names</string>
+ <string key="candidateClassName">AILocalizationTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_nickToken">
+ <string key="name">label_nickToken</string>
+ <string key="candidateClassName">AILocalizationTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="tokenField_firstToken">
+ <string key="name">tokenField_firstToken</string>
+ <string key="candidateClassName">NSTokenField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="tokenField_format">
+ <string key="name">tokenField_format</string>
+ <string key="candidateClassName">NSTokenField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="tokenField_lastToken">
+ <string key="name">tokenField_lastToken</string>
+ <string key="candidateClassName">NSTokenField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="tokenField_middleToken">
+ <string key="name">tokenField_middleToken</string>
+ <string key="candidateClassName">NSTokenField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="tokenField_nickToken">
+ <string key="name">tokenField_nickToken</string>
+ <string key="candidateClassName">NSTokenField</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/ESAddressBookIntegrationAdvancedPreferences.h</string>
+ </object>
+ </object>
+ </array>
+ </object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
diff -r 3b1b884f27c0 -r b88499df0305 Resources/AddressBookPrefs.nib/keyedobjects.nib
Binary file Resources/AddressBookPrefs.nib/keyedobjects.nib has changed
diff -r 3b1b884f27c0 -r b88499df0305 Source/ESAddressBookIntegrationAdvancedPreferences.h
--- a/Source/ESAddressBookIntegrationAdvancedPreferences.h Thu May 26 12:48:45 2011 +0200
+++ b/Source/ESAddressBookIntegrationAdvancedPreferences.h Tue May 31 01:26:12 2011 +0200
@@ -31,7 +31,7 @@
IBOutlet NSButton *checkBox_metaContacts;
- IBOutlet AILocalizationTextField *label_formatNamesAs;
+ IBOutlet AILocalizationTextField *label_instructions;
IBOutlet AILocalizationTextField *label_names;
IBOutlet AILocalizationTextField *label_images;
IBOutlet AILocalizationTextField *label_contacts;
diff -r 3b1b884f27c0 -r b88499df0305 Source/ESAddressBookIntegrationAdvancedPreferences.m
--- a/Source/ESAddressBookIntegrationAdvancedPreferences.m Thu May 26 12:48:45 2011 +0200
+++ b/Source/ESAddressBookIntegrationAdvancedPreferences.m Tue May 31 01:26:12 2011 +0200
@@ -78,7 +78,7 @@
*/
- (void)viewDidLoad
{
- [label_formatNamesAs setLocalizedString:AILocalizedString(@"Format name as:", "Format name as: [tokens like 'First', 'Last']")];
+ [label_instructions setLocalizedString:AILocalizedString(@"Type text and drag name elements to create a custom name format.", nil)];
[label_names setLocalizedString:AILocalizedString(@"Names",nil)];
[label_images setLocalizedString:AILocalizedString(@"Images",nil)];
[label_contacts setLocalizedString:AILocalizedString(@"Contacts",nil)];
More information about the commits
mailing list