adium/adium

Parents b9ffdf44f4b4
Children 24bf857ed22d
Disable scrolling elasticity on the pref rows and move the text closer to the image. Fixes #15978
--- a/Resources/Preferences.xib Wed Apr 25 22:07:07 2012 +0300
+++ b/Resources/Preferences.xib Wed Apr 25 17:59:50 2012 -0400
@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">11D50b</string>
+ <string key="IBDocument.SystemVersion">11D50</string>
<string key="IBDocument.InterfaceBuilderVersion">2182</string>
<string key="IBDocument.AppKitVersion">1138.32</string>
<string key="IBDocument.HIToolboxVersion">568.00</string>
@@ -257,6 +257,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{12, 81}, {260, 17}}</string>
<reference key="NSSuperview" ref="1002282308"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="525118075"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="826851912">
@@ -294,6 +295,7 @@
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{567, 70}</string>
<reference key="NSSuperview" ref="5418178"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="788772947"/>
<string key="NSMinGridSize">{0, 0}</string>
<string key="NSMaxGridSize">{0, 0}</string>
@@ -312,6 +314,7 @@
</array>
<string key="NSFrameSize">{567, 70}</string>
<reference key="NSSuperview" ref="525118075"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="203493995"/>
<reference key="NSDocView" ref="203493995"/>
<reference key="NSBGColor" ref="336428557"/>
@@ -322,6 +325,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{234, 1}, {15, 143}}</string>
<reference key="NSSuperview" ref="525118075"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="908707050"/>
<reference key="NSTarget" ref="525118075"/>
<string key="NSAction">_doScroller:</string>
@@ -333,6 +337,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 144}, {233, 15}}</string>
<reference key="NSSuperview" ref="525118075"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="885674362"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="525118075"/>
@@ -342,8 +347,9 @@
</array>
<string key="NSFrame">{{18, 0}, {567, 70}}</string>
<reference key="NSSuperview" ref="1002282308"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="5418178"/>
- <int key="NSsFlags">133680</int>
+ <int key="NSsFlags">154160</int>
<reference key="NSVScroller" ref="788772947"/>
<reference key="NSHScroller" ref="908707050"/>
<reference key="NSContentView" ref="5418178"/>
@@ -351,11 +357,13 @@
</array>
<string key="NSFrame">{{1, 1}, {600, 102}}</string>
<reference key="NSSuperview" ref="665881285"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="162329376"/>
</object>
</array>
<string key="NSFrame">{{-1, 208}, {602, 104}}</string>
<reference key="NSSuperview" ref="835971553"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1002282308"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -400,6 +408,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{12, 81}, {260, 17}}</string>
<reference key="NSSuperview" ref="4799332"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="193916419"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="629310918">
@@ -425,6 +434,7 @@
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{567, 70}</string>
<reference key="NSSuperview" ref="469953501"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSMinGridSize">{0, 0}</string>
<string key="NSMaxGridSize">{0, 0}</string>
@@ -443,6 +453,7 @@
</array>
<string key="NSFrameSize">{567, 70}</string>
<reference key="NSSuperview" ref="193916419"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="214584110"/>
<reference key="NSDocView" ref="214584110"/>
<reference key="NSBGColor" ref="336428557"/>
@@ -453,6 +464,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {15, 143}}</string>
<reference key="NSSuperview" ref="193916419"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="506759106"/>
<reference key="NSTarget" ref="193916419"/>
<string key="NSAction">_doScroller:</string>
@@ -464,6 +476,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {233, 15}}</string>
<reference key="NSSuperview" ref="193916419"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="469953501"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="193916419"/>
@@ -473,8 +486,9 @@
</array>
<string key="NSFrame">{{18, 0}, {567, 70}}</string>
<reference key="NSSuperview" ref="4799332"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="528592647"/>
- <int key="NSsFlags">133632</int>
+ <int key="NSsFlags">154112</int>
<reference key="NSVScroller" ref="528592647"/>
<reference key="NSHScroller" ref="506759106"/>
<reference key="NSContentView" ref="469953501"/>
@@ -482,11 +496,13 @@
</array>
<string key="NSFrame">{{1, 1}, {600, 102}}</string>
<reference key="NSSuperview" ref="435621713"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="130157636"/>
</object>
</array>
<string key="NSFrame">{{-1, 0}, {602, 104}}</string>
<reference key="NSSuperview" ref="835971553"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="4799332"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -527,6 +543,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{12, 81}, {262, 17}}</string>
<reference key="NSSuperview" ref="918780946"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="585163712"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="989064721">
@@ -552,6 +569,7 @@
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{568, 70}</string>
<reference key="NSSuperview" ref="517880766"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="435621713"/>
<string key="NSMinGridSize">{0, 0}</string>
<string key="NSMaxGridSize">{0, 0}</string>
@@ -570,6 +588,7 @@
</array>
<string key="NSFrameSize">{568, 70}</string>
<reference key="NSSuperview" ref="585163712"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="471916954"/>
<reference key="NSDocView" ref="471916954"/>
<reference key="NSBGColor" ref="336428557"/>
@@ -580,6 +599,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {15, 143}}</string>
<reference key="NSSuperview" ref="585163712"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="137621108"/>
<reference key="NSTarget" ref="585163712"/>
<string key="NSAction">_doScroller:</string>
@@ -591,6 +611,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {482, 15}}</string>
<reference key="NSSuperview" ref="585163712"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="517880766"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="585163712"/>
@@ -600,8 +621,9 @@
</array>
<string key="NSFrame">{{18, 0}, {568, 70}}</string>
<reference key="NSSuperview" ref="918780946"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="685129026"/>
- <int key="NSsFlags">133680</int>
+ <int key="NSsFlags">154160</int>
<reference key="NSVScroller" ref="685129026"/>
<reference key="NSHScroller" ref="137621108"/>
<reference key="NSContentView" ref="517880766"/>
@@ -609,11 +631,13 @@
</array>
<string key="NSFrameSize">{602, 104}</string>
<reference key="NSSuperview" ref="885674362"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="536701065"/>
</object>
</array>
<string key="NSFrame">{{-1, 104}, {602, 104}}</string>
<reference key="NSSuperview" ref="835971553"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="918780946"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -646,6 +670,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{12, 81}, {260, 17}}</string>
<reference key="NSSuperview" ref="770264877"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="749047149"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1027628963">
@@ -671,6 +696,7 @@
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{568, 70}</string>
<reference key="NSSuperview" ref="1039332667"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="160227818"/>
<string key="NSMinGridSize">{0, 0}</string>
<string key="NSMaxGridSize">{0, 0}</string>
@@ -689,6 +715,7 @@
</array>
<string key="NSFrameSize">{568, 70}</string>
<reference key="NSSuperview" ref="749047149"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="987081900"/>
<reference key="NSDocView" ref="987081900"/>
<reference key="NSBGColor" ref="336428557"/>
@@ -699,6 +726,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{234, 1}, {15, 143}}</string>
<reference key="NSSuperview" ref="749047149"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="81315836"/>
<reference key="NSTarget" ref="749047149"/>
<string key="NSAction">_doScroller:</string>
@@ -710,6 +738,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 144}, {233, 15}}</string>
<reference key="NSSuperview" ref="749047149"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="665881285"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="749047149"/>
@@ -719,8 +748,9 @@
</array>
<string key="NSFrame">{{18, 0}, {568, 70}}</string>
<reference key="NSSuperview" ref="770264877"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1039332667"/>
- <int key="NSsFlags">133680</int>
+ <int key="NSsFlags">154160</int>
<reference key="NSVScroller" ref="160227818"/>
<reference key="NSHScroller" ref="81315836"/>
<reference key="NSContentView" ref="1039332667"/>
@@ -728,11 +758,13 @@
</array>
<string key="NSFrameSize">{602, 104}</string>
<reference key="NSSuperview" ref="190449231"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1071416232"/>
</object>
</array>
<string key="NSFrame">{{-1, 312}, {602, 104}}</string>
<reference key="NSSuperview" ref="835971553"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="770264877"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -755,6 +787,7 @@
</array>
<string key="NSFrameSize">{600, 416}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="190449231"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
@@ -763,7 +796,7 @@
<bool key="NSWindowIsRestorable">NO</bool>
</object>
<object class="NSView" id="680653249">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSImageView" id="184967249">
@@ -779,7 +812,8 @@
</set>
<string key="NSFrame">{{28, 38}, {32, 32}}</string>
<reference key="NSSuperview" ref="680653249"/>
- <reference key="NSNextKeyView" ref="824477982"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="539048852">
<int key="NSCellFlags">130560</int>
@@ -798,8 +832,10 @@
<object class="NSTextField" id="824477982">
<reference key="NSNextResponder" ref="680653249"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{-3, 5}, {94, 28}}</string>
+ <string key="NSFrame">{{-3, 11}, {94, 28}}</string>
<reference key="NSSuperview" ref="680653249"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="184967249"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="834103842">
<int key="NSCellFlags">67239424</int>
@@ -817,7 +853,9 @@
</object>
</array>
<string key="NSFrameSize">{88, 70}</string>
- <reference key="NSNextKeyView" ref="184967249"/>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="824477982"/>
</object>
<object class="NSCollectionViewItem" id="768600824"/>
<object class="NSArrayController" id="623245347">
@@ -1706,7 +1744,163 @@
<nil key="sourceID"/>
<int key="maxID">878</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">AIPreferenceCollectionItem</string>
+ <string key="superclassName">NSCollectionViewItem</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">image</string>
+ <string key="NS.object.0">NSImage</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">image</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">image</string>
+ <string key="candidateClassName">NSImage</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIPreferenceCollectionItem.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIPreferenceCollectionView</string>
+ <string key="superclassName">NSCollectionView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIPreferenceCollectionView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIPreferenceWindowController</string>
+ <string key="superclassName">NSWindowController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">showAllPanes:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">showAllPanes:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">showAllPanes:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="advancedCV">AIPreferenceCollectionView</string>
+ <string key="advancedController">NSArrayController</string>
+ <string key="allPanes">NSView</string>
+ <string key="appearanceCV">AIPreferenceCollectionView</string>
+ <string key="appearanceController">NSArrayController</string>
+ <string key="button_showAll">NSButton</string>
+ <string key="eventsCV">AIPreferenceCollectionView</string>
+ <string key="eventsController">NSArrayController</string>
+ <string key="generalCV">AIPreferenceCollectionView</string>
+ <string key="generalController">NSArrayController</string>
+ <string key="itemPrototypeView">NSView</string>
+ <string key="label_advanced">NSTextField</string>
+ <string key="label_appearance">NSTextField</string>
+ <string key="label_events">NSTextField</string>
+ <string key="label_general">NSTextField</string>
+ <string key="searchField">NSSearchField</string>
+ <string key="window">NSWindow</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="advancedCV">
+ <string key="name">advancedCV</string>
+ <string key="candidateClassName">AIPreferenceCollectionView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="advancedController">
+ <string key="name">advancedController</string>
+ <string key="candidateClassName">NSArrayController</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="allPanes">
+ <string key="name">allPanes</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="appearanceCV">
+ <string key="name">appearanceCV</string>
+ <string key="candidateClassName">AIPreferenceCollectionView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="appearanceController">
+ <string key="name">appearanceController</string>
+ <string key="candidateClassName">NSArrayController</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="button_showAll">
+ <string key="name">button_showAll</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="eventsCV">
+ <string key="name">eventsCV</string>
+ <string key="candidateClassName">AIPreferenceCollectionView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="eventsController">
+ <string key="name">eventsController</string>
+ <string key="candidateClassName">NSArrayController</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="generalCV">
+ <string key="name">generalCV</string>
+ <string key="candidateClassName">AIPreferenceCollectionView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="generalController">
+ <string key="name">generalController</string>
+ <string key="candidateClassName">NSArrayController</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="itemPrototypeView">
+ <string key="name">itemPrototypeView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_advanced">
+ <string key="name">label_advanced</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_appearance">
+ <string key="name">label_appearance</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_events">
+ <string key="name">label_events</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_general">
+ <string key="name">label_general</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="searchField">
+ <string key="name">searchField</string>
+ <string key="candidateClassName">NSSearchField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window">
+ <string key="name">window</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIPreferenceWindowController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">selectServiceType:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">selectServiceType:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">selectServiceType:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/NSObject.h</string>
+ </object>
+ </object>
+ </array>
+ </object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">