adium 5176:345c99a95c4d: Fix a few misalignments where the label...
commits at adium.im
commits at adium.im
Mon Oct 22 16:30:22 UTC 2012
details: http://hg.adium.im/adium/rev/345c99a95c4d
revision: 5176:345c99a95c4d
branch: adium-1.6
author: Paul Wilde <me at paulwilde.co.uk>
date: Mon Oct 22 17:30:14 2012 +0100
Fix a few misalignments where the labels didn't align correctly with the checkbox/textfield.
diffs (truncated from 1048 to 1000 lines):
diff -r 2423ecb09b19 -r 345c99a95c4d Resources/Preferences-General.xib
--- a/Resources/Preferences-General.xib Mon Oct 22 18:07:45 2012 +0200
+++ b/Resources/Preferences-General.xib Mon Oct 22 17:30:14 2012 +0100
@@ -2,24 +2,24 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">11D50</string>
- <string key="IBDocument.InterfaceBuilderVersion">2166</string>
- <string key="IBDocument.AppKitVersion">1138.32</string>
- <string key="IBDocument.HIToolboxVersion">568.00</string>
+ <string key="IBDocument.SystemVersion">12C54</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2843</string>
+ <string key="IBDocument.AppKitVersion">1187.34</string>
+ <string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2166</string>
+ <string key="NS.object.0">2843</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
+ <string>NSBox</string>
+ <string>NSButton</string>
+ <string>NSButtonCell</string>
+ <string>NSCustomObject</string>
+ <string>NSCustomView</string>
+ <string>NSMatrix</string>
<string>NSTextField</string>
- <string>NSMatrix</string>
<string>NSTextFieldCell</string>
- <string>NSBox</string>
- <string>NSCustomView</string>
- <string>NSButtonCell</string>
- <string>NSButton</string>
<string>NSUserDefaultsController</string>
- <string>NSCustomObject</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -51,7 +51,7 @@
<reference key="NSNextKeyView" ref="267563463"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="520021468">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">138412032</int>
<string key="NSContents">When pressed, this key combination will bring Adium to the front</string>
<object class="NSFont" key="NSSupport">
@@ -79,6 +79,7 @@
</object>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSBox" id="780162078">
<reference key="NSNextResponder" ref="1005"/>
@@ -89,7 +90,7 @@
<reference key="NSNextKeyView" ref="861567250"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<object class="NSFont" key="NSSupport" id="849168441">
@@ -125,7 +126,7 @@
<reference key="NSNextKeyView" ref="401607612"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="849168441"/>
@@ -149,7 +150,7 @@
<reference key="NSNextKeyView" ref="593286664"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="849168441"/>
@@ -173,7 +174,7 @@
<reference key="NSNextKeyView" ref="140834015"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="849168441"/>
@@ -197,12 +198,12 @@
<reference key="NSNextKeyView" ref="733787607"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="627147548">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Confirm before closing chat windows</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="141367468"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage" id="92983315">
<string key="NSClassName">NSImage</string>
@@ -216,6 +217,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSMatrix" id="733787607">
<reference key="NSNextResponder" ref="1005"/>
@@ -223,18 +225,18 @@
<string key="NSFrame">{{196, 20}, {263, 38}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSNumRows">2</int>
<int key="NSNumCols">1</int>
<array class="NSMutableArray" key="NSCells">
<object class="NSButtonCell" id="524870056">
- <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Always</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="733787607"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">0</int>
<object class="NSButtonImageSource" key="NSAlternateImage" id="258950840">
<string key="NSImageName">NSRadioButton</string>
@@ -247,13 +249,13 @@
<int key="NSPeriodicInterval">25</int>
</object>
<object class="NSButtonCell" id="340870423">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Only when there are unread messages</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="733787607"/>
<int key="NSTag">1</int>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">0</int>
<reference key="NSAlternateImage" ref="258950840"/>
<string key="NSAlternateContents"/>
@@ -267,11 +269,11 @@
<int key="NSMatrixFlags">1143480320</int>
<string key="NSCellClass">NSActionCell</string>
<object class="NSButtonCell" key="NSProtoCell" id="1060938686">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Radio</string>
<reference key="NSSupport" ref="849168441"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">0</int>
<object class="NSImage" key="NSNormalImage">
<int key="NSImageFlags">549453824</int>
@@ -332,16 +334,17 @@
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="429481306"/>
<bool key="NSEnabled">YES</bool>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSNumRows">2</int>
<int key="NSNumCols">1</int>
<array class="NSMutableArray" key="NSCells">
<object class="NSButtonCell" id="920107669">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Always</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="105876458"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">0</int>
<reference key="NSAlternateImage" ref="258950840"/>
<string key="NSAlternateContents"/>
@@ -352,13 +355,13 @@
<int key="NSPeriodicInterval">25</int>
</object>
<object class="NSButtonCell" id="12612205">
- <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Only whenâ¦</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="105876458"/>
<int key="NSTag">1</int>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">0</int>
<reference key="NSAlternateImage" ref="258950840"/>
<string key="NSAlternateContents"/>
@@ -372,11 +375,11 @@
<int key="NSMatrixFlags">1143480320</int>
<string key="NSCellClass">NSActionCell</string>
<object class="NSButtonCell" key="NSProtoCell" id="297276160">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Radio</string>
<reference key="NSSupport" ref="849168441"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">0</int>
<object class="NSImage" key="NSNormalImage">
<int key="NSImageFlags">549453824</int>
@@ -436,12 +439,12 @@
<reference key="NSNextKeyView" ref="543283964"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="32871785">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">File transfers are in progress</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="429481306"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="92983315"/>
<reference key="NSAlternateImage" ref="819374040"/>
@@ -450,6 +453,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="543283964">
<reference key="NSNextResponder" ref="1005"/>
@@ -460,12 +464,12 @@
<reference key="NSNextKeyView" ref="212460568"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="969412371">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">There are unread messages</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="543283964"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="819374040"/>
<string key="NSAlternateContents"/>
@@ -473,6 +477,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="212460568">
<reference key="NSNextResponder" ref="1005"/>
@@ -483,12 +488,12 @@
<reference key="NSNextKeyView" ref="141367468"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="678710413">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">There are open chat windows</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="212460568"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="819374040"/>
<string key="NSAlternateContents"/>
@@ -496,6 +501,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="90992064">
<reference key="NSNextResponder" ref="1005"/>
@@ -506,12 +512,12 @@
<reference key="NSNextKeyView" ref="105876458"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="913845772">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Confirm before quitting Adium</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="90992064"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="92983315"/>
<reference key="NSAlternateImage" ref="819374040"/>
@@ -520,17 +526,18 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="861567250">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{76, 188}, {98, 17}}</string>
+ <string key="NSFrame">{{76, 189}, {98, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="90992064"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="107848119">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Confirmations:</string>
<reference key="NSSupport" ref="849168441"/>
@@ -538,6 +545,7 @@
<reference key="NSBackgroundColor" ref="793318718"/>
<reference key="NSTextColor" ref="307999638"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="192769835">
<reference key="NSNextResponder" ref="1005"/>
@@ -548,18 +556,19 @@
<reference key="NSNextKeyView" ref="241398256"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="587719349">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Make Adium default application</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="192769835"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="241398256">
<reference key="NSNextResponder" ref="1005"/>
@@ -570,18 +579,19 @@
<reference key="NSNextKeyView" ref="780162078"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="701386204">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Customize...</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="241398256"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="401607612">
<reference key="NSNextResponder" ref="1005"/>
@@ -592,7 +602,7 @@
<reference key="NSNextKeyView" ref="192769835"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="638307978">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Open IM links:</string>
<reference key="NSSupport" ref="849168441"/>
@@ -600,6 +610,7 @@
<reference key="NSBackgroundColor" ref="793318718"/>
<reference key="NSTextColor" ref="307999638"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSCustomView" id="521212237">
<reference key="NSNextResponder" ref="1005"/>
@@ -619,7 +630,7 @@
<reference key="NSNextKeyView" ref="521212237"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="842089131">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Global Shortcut:</string>
<reference key="NSSupport" ref="849168441"/>
@@ -627,6 +638,7 @@
<reference key="NSBackgroundColor" ref="793318718"/>
<reference key="NSTextColor" ref="307999638"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="329872387">
<reference key="NSNextResponder" ref="1005"/>
@@ -637,7 +649,7 @@
<reference key="NSNextKeyView" ref="428798774"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="608405887">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Status:</string>
<reference key="NSSupport" ref="849168441"/>
@@ -645,6 +657,7 @@
<reference key="NSBackgroundColor" ref="793318718"/>
<reference key="NSTextColor" ref="307999638"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="428798774">
<reference key="NSNextResponder" ref="1005"/>
@@ -655,12 +668,12 @@
<reference key="NSNextKeyView" ref="529712699"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="208827672">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Show Adium status in menu bar</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="428798774"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="819374040"/>
<string key="NSAlternateContents"/>
@@ -668,6 +681,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="267563463">
<reference key="NSNextResponder" ref="1005"/>
@@ -678,7 +692,7 @@
<reference key="NSNextKeyView" ref="64878862"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="48771413">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Updates:</string>
<reference key="NSSupport" ref="849168441"/>
@@ -686,6 +700,7 @@
<reference key="NSBackgroundColor" ref="793318718"/>
<reference key="NSTextColor" ref="307999638"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="64878862">
<reference key="NSNextResponder" ref="1005"/>
@@ -696,12 +711,12 @@
<reference key="NSNextKeyView" ref="23656998"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="595794682">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Automatically check for updates</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="64878862"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="819374040"/>
<string key="NSAlternateContents"/>
@@ -709,6 +724,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="23656998">
<reference key="NSNextResponder" ref="1005"/>
@@ -719,12 +735,12 @@
<reference key="NSNextKeyView" ref="388348229"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="925450846">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Include anonymous system profile</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="23656998"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="819374040"/>
<string key="NSAlternateContents"/>
@@ -732,6 +748,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="388348229">
<reference key="NSNextResponder" ref="1005"/>
@@ -742,12 +759,12 @@
<reference key="NSNextKeyView" ref="489921222"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="25216321">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Update to beta versions when available</string>
<reference key="NSSupport" ref="849168441"/>
<reference key="NSControlView" ref="388348229"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="819374040"/>
<string key="NSAlternateContents"/>
@@ -755,6 +772,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrameSize">{600, 490}</string>
@@ -1897,6 +1915,24 @@
<string key="minorKey">./Classes/ESGeneralPreferences.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>
@@ -1905,10 +1941,6 @@
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1060" key="NS.object.0"/>
</object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <real value="1060" key="NS.object.0"/>
- </object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
<real value="3200" key="NS.object.0"/>
diff -r 2423ecb09b19 -r 345c99a95c4d Resources/Preferences-Messages.xib
--- a/Resources/Preferences-Messages.xib Mon Oct 22 18:07:45 2012 +0200
+++ b/Resources/Preferences-Messages.xib Mon Oct 22 17:30:14 2012 +0100
@@ -146,7 +146,6 @@
<string key="NSFrame">{{262, 17}, {283, 26}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="525401209">
<int key="NSCellFlags">-2076180416</int>
@@ -422,7 +421,7 @@
<object class="NSTextField" id="73179250">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 178}, {105, 17}}</string>
+ <string key="NSFrame">{{17, 179}, {105, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="424174386"/>
diff -r 2423ecb09b19 -r 345c99a95c4d Resources/en.lproj/ProfilePreferences.xib
--- a/Resources/en.lproj/ProfilePreferences.xib Mon Oct 22 18:07:45 2012 +0200
+++ b/Resources/en.lproj/ProfilePreferences.xib Mon Oct 22 17:30:14 2012 +0100
@@ -2,29 +2,29 @@
<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.InterfaceBuilderVersion">2182</string>
- <string key="IBDocument.AppKitVersion">1138.32</string>
- <string key="IBDocument.HIToolboxVersion">568.00</string>
+ <string key="IBDocument.SystemVersion">12C54</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2843</string>
+ <string key="IBDocument.AppKitVersion">1187.34</string>
+ <string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2182</string>
+ <string key="NS.object.0">2843</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
+ <string>NSBox</string>
+ <string>NSButton</string>
+ <string>NSButtonCell</string>
+ <string>NSCustomObject</string>
+ <string>NSCustomView</string>
+ <string>NSImageCell</string>
+ <string>NSImageView</string>
+ <string>NSMatrix</string>
+ <string>NSScrollView</string>
<string>NSScroller</string>
- <string>NSButton</string>
- <string>NSScrollView</string>
- <string>NSButtonCell</string>
- <string>NSImageView</string>
- <string>NSBox</string>
- <string>NSImageCell</string>
+ <string>NSTextField</string>
<string>NSTextFieldCell</string>
- <string>NSMatrix</string>
- <string>NSCustomView</string>
<string>NSTextView</string>
- <string>NSCustomObject</string>
<string>NSView</string>
- <string>NSTextField</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -44,7 +44,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="116640955">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSImageView" id="916737237">
@@ -60,16 +60,18 @@
</set>
<string key="NSFrame">{{39, 66}, {104, 104}}</string>
<reference key="NSSuperview" ref="116640955"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="906401707"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="737788302">
- <int key="NSCellFlags">270663168</int>
+ <int key="NSCellFlags">404750336</int>
<int key="NSCellFlags2">0</int>
<int key="NSAlign">0</int>
<int key="NSScale">0</int>
<int key="NSStyle">2</int>
<bool key="NSAnimates">YES</bool>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSEditable">YES</bool>
</object>
<object class="NSButton" id="210032694">
@@ -77,10 +79,11 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{26, 30}, {130, 32}}</string>
<reference key="NSSuperview" ref="116640955"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="259090014"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1062592610">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Choose Icon...</string>
<object class="NSFont" key="NSSupport" id="485325570">
@@ -89,7 +92,7 @@
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="210032694"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="485325570"/>
<string key="NSAlternateContents"/>
@@ -99,24 +102,27 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSMatrix" id="723824318">
<reference key="NSNextResponder" ref="116640955"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{19, 178}, {118, 38}}</string>
<reference key="NSSuperview" ref="116640955"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="335522952"/>
<bool key="NSEnabled">YES</bool>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSNumRows">2</int>
<int key="NSNumCols">1</int>
<array class="NSMutableArray" key="NSCells">
<object class="NSButtonCell" id="889482052">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Use no icon</string>
<reference key="NSSupport" ref="485325570"/>
<reference key="NSControlView" ref="723824318"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">0</int>
<object class="NSButtonImageSource" key="NSAlternateImage" id="655764744">
<string key="NSImageName">NSRadioButton</string>
@@ -129,13 +135,13 @@
<int key="NSPeriodicInterval">25</int>
</object>
<object class="NSButtonCell" id="154391503">
- <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Use this icon:</string>
<reference key="NSSupport" ref="485325570"/>
<reference key="NSControlView" ref="723824318"/>
<int key="NSTag">1</int>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">0</int>
<reference key="NSAlternateImage" ref="655764744"/>
<string key="NSAlternateContents"/>
@@ -149,11 +155,11 @@
<int key="NSMatrixFlags">1143472128</int>
<string key="NSCellClass">NSActionCell</string>
<object class="NSButtonCell" key="NSProtoCell" id="854428258">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Radio</string>
<reference key="NSSupport" ref="485325570"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">0</int>
<reference key="NSAlternateImage" ref="655764744"/>
<int key="NSPeriodicDelay">400</int>
@@ -179,12 +185,13 @@
<object class="NSTextField" id="906401707">
<reference key="NSNextResponder" ref="116640955"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{163, 168}, {74, 17}}</string>
+ <string key="NSFrame">{{163, 166}, {74, 17}}</string>
<reference key="NSSuperview" ref="116640955"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="210032694"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="132595847">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Profile:</string>
<reference key="NSSupport" ref="485325570"/>
@@ -200,6 +207,7 @@
</object>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSScrollView" id="309788567">
<reference key="NSNextResponder" ref="116640955"/>
@@ -231,8 +239,9 @@
<string>WebURLsWithTitlesPboardType</string>
<string>public.url</string>
</set>
- <string key="NSFrame">{{0, 18}, {336, 80}}</string>
+ <string key="NSFrameSize">{336, 163}</string>
<reference key="NSSuperview" ref="192489308"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="226686736"/>
<object class="NSTextContainer" key="NSTextContainer" id="452458961">
<object class="NSLayoutManager" key="NSLayoutManager">
@@ -245,7 +254,7 @@
<array class="NSMutableArray" key="NSTextContainers">
<reference ref="452458961"/>
</array>
- <int key="NSLMFlags">6</int>
+ <int key="NSLMFlags">38</int>
<nil key="NSDelegate"/>
</object>
<reference key="NSTextView" ref="255399918"/>
@@ -253,7 +262,7 @@
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
- <int key="NSFlags">100675559</int>
+ <int key="NSFlags">67121127</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<reference key="NSBackgroundColor" ref="296247606"/>
@@ -289,12 +298,12 @@
</object>
<int key="NSTVFlags">6</int>
<string key="NSMaxSize">{353, 10000000}</string>
- <string key="NSMinize">{237, 80}</string>
<nil key="NSDelegate"/>
</object>
</array>
<string key="NSFrame">{{1, 1}, {336, 163}}</string>
<reference key="NSSuperview" ref="309788567"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="255399918"/>
<reference key="NSDocView" ref="255399918"/>
<reference key="NSBGColor" ref="296247606"/>
@@ -329,7 +338,9 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-30, 1}, {15, 210}}</string>
<reference key="NSSuperview" ref="309788567"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="192489308"/>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="309788567"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
@@ -339,7 +350,9 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="309788567"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="788908579"/>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="309788567"/>
<string key="NSAction">_doScroller:</string>
@@ -349,21 +362,26 @@
</array>
<string key="NSFrame">{{242, 20}, {338, 165}}</string>
<reference key="NSSuperview" ref="116640955"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="192489308"/>
<int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="788908579"/>
<reference key="NSHScroller" ref="226686736"/>
<reference key="NSContentView" ref="192489308"/>
+ <double key="NSMinMagnification">0.25</double>
+ <double key="NSMaxMagnification">4</double>
+ <double key="NSMagnification">1</double>
</object>
<object class="NSTextField" id="110246893">
<reference key="NSNextResponder" ref="116640955"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{242, 193}, {338, 22}}</string>
<reference key="NSSuperview" ref="116640955"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="309788567"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="25770924">
- <int key="NSCellFlags">-1805517311</int>
+ <int key="NSCellFlags">-1805647871</int>
<int key="NSCellFlags2">4194304</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="485325570"/>
@@ -382,16 +400,18 @@
<reference key="NSColor" ref="165430047"/>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="335522952">
<reference key="NSNextResponder" ref="116640955"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{163, 196}, {74, 17}}</string>
+ <string key="NSFrame">{{163, 195}, {74, 17}}</string>
<reference key="NSSuperview" ref="116640955"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="916737237"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="266010005">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Name:</string>
<reference key="NSSupport" ref="485325570"/>
@@ -399,16 +419,18 @@
<reference key="NSBackgroundColor" ref="1037639369"/>
<reference key="NSTextColor" ref="1061318098"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSBox" id="259090014">
<reference key="NSNextResponder" ref="116640955"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{168, 20}, {5, 195}}</string>
<reference key="NSSuperview" ref="116640955"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="110246893"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="485325570"/>
@@ -425,6 +447,8 @@
</object>
</array>
<string key="NSFrameSize">{600, 235}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="723824318"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
@@ -840,44 +864,6 @@
</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">AIPreferencePane</string>
- <string key="superclassName">AIModularPane</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AIPreferencePane.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">AISendingTextView</string>
<string key="superclassName">AITextViewWithPlaceholder</string>
<object class="NSMutableDictionary" key="actions">
@@ -905,65 +891,21 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">ESPersonalPreferences</string>
- <string key="superclassName">AIPreferencePane</string>
- <dictionary class="NSMutableDictionary" key="outlets">
- <string key="button_chooseIcon">NSButton</string>
- <string key="button_enableMusicProfile">NSButton</string>
- <string key="imageView_userIcon">AIImageViewWithImagePicker</string>
- <string key="label_localAlias">NSTextField</string>
- <string key="label_profile">NSTextField</string>
- <string key="label_remoteAlias">NSTextField</string>
- <string key="matrix_userIcon">NSMatrix</string>
- <string key="textField_alias">AIDelayedTextField</string>
- <string key="textField_displayName">AIDelayedTextField</string>
- <string key="textView_profile">NSTextView</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="button_chooseIcon">
- <string key="name">button_chooseIcon</string>
- <string key="candidateClassName">NSButton</string>
+ <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 class="IBToOneOutletInfo" key="button_enableMusicProfile">
- <string key="name">button_enableMusicProfile</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo" key="imageView_userIcon">
- <string key="name">imageView_userIcon</string>
- <string key="candidateClassName">AIImageViewWithImagePicker</string>
- </object>
More information about the commits
mailing list