adium-1.4 3481:b6b99b09738b: GeneralPreferences.nib no longer us...
commits at adium.im
commits at adium.im
Tue May 3 02:55:56 UTC 2011
details: http://hg.adium.im/adium-1.4/rev/b6b99b09738b
revision: 3481:b6b99b09738b
branch: (none)
author: Evan Schoenberg
date: Wed Apr 27 15:22:56 2011 -0400
GeneralPreferences.nib no longer uses a custom Interface Builder plugin; the SRRecorderControl is instead instatiated at run time and swapped into the view heirarchy in place of a placeholder view. Fixes #15155
(transplanted from 81cd7615fff57686e6c06058da4f70a6c7408829)
diffs (truncated from 35030 to 1000 lines):
diff -r 3fd5458a9fe7 -r b6b99b09738b Plugins/General Preferences/ESGeneralPreferences.h
--- a/Plugins/General Preferences/ESGeneralPreferences.h Fri Apr 29 16:17:16 2011 +0300
+++ b/Plugins/General Preferences/ESGeneralPreferences.h Wed Apr 27 15:22:56 2011 -0400
@@ -36,9 +36,12 @@
IBOutlet NSTextField *label_shortcutRecorder;
- IBOutlet SRRecorderControl *shortcutRecorder;
+ IBOutlet NSView *placeholder_shortcutRecorder;
+ SRRecorderControl *shortcutRecorder;
}
- (IBAction)configureLogCertainAccounts:(id)sender;
+ at property (nonatomic, retain) SRRecorderControl *shortcutRecorder;
+
@end
diff -r 3fd5458a9fe7 -r b6b99b09738b Plugins/General Preferences/ESGeneralPreferences.m
--- a/Plugins/General Preferences/ESGeneralPreferences.m Fri Apr 29 16:17:16 2011 +0300
+++ b/Plugins/General Preferences/ESGeneralPreferences.m Wed Apr 27 15:22:56 2011 -0400
@@ -45,6 +45,8 @@
@implementation ESGeneralPreferences
+ at synthesize shortcutRecorder;
+
// XXX in order to edit the nib, you need the ShortcutReporter palette
// You can download it at http://evands.penguinmilitia.net/ShortcutRecorder.palette.zip
// This comes from http://wafflesoftware.net/shortcut/
@@ -112,6 +114,10 @@
[popUp_tabPositionMenu selectItemWithTag:[[adium.preferenceController preferenceForKey:KEY_TABBAR_POSITION
group:PREF_GROUP_DUAL_WINDOW_INTERFACE] intValue]];
+ self.shortcutRecorder = [[[SRRecorderControl alloc] initWithFrame:placeholder_shortcutRecorder.frame] autorelease];
+ shortcutRecorder.delegate = self;
+ [[placeholder_shortcutRecorder superview] addSubview:shortcutRecorder];
+
//Global hotkey
TISInputSourceRef currentLayout = TISCopyCurrentKeyboardLayoutInputSource();
@@ -134,6 +140,13 @@
[self configureControlDimming];
}
+- (void)dealloc
+{
+ self.shortcutRecorder = nil;
+
+ [super dealloc];
+}
+
//Called in response to all preference controls, applies new settings
- (IBAction)changePreference:(id)sender
{
diff -r 3fd5458a9fe7 -r b6b99b09738b Resources/ca.lproj/GeneralPreferences.nib/keyedobjects.nib
Binary file Resources/ca.lproj/GeneralPreferences.nib/keyedobjects.nib has changed
diff -r 3fd5458a9fe7 -r b6b99b09738b Resources/cs.lproj/GeneralPreferences.nib/designable.nib
--- a/Resources/cs.lproj/GeneralPreferences.nib/designable.nib Fri Apr 29 16:17:16 2011 +0300
+++ b/Resources/cs.lproj/GeneralPreferences.nib/designable.nib Wed Apr 27 15:22:56 2011 -0400
@@ -2,22 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10C540</string>
- <string key="IBDocument.InterfaceBuilderVersion">740</string>
- <string key="IBDocument.AppKitVersion">1038.25</string>
- <string key="IBDocument.HIToolboxVersion">458.00</string>
+ <string key="IBDocument.SystemVersion">10J3250</string>
+ <string key="IBDocument.InterfaceBuilderVersion">851</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>net.wafflesoftware.ShortcutRecorder.IB.Leopard</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>740</string>
- <string>1</string>
- </object>
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="NS.object.0">851</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -26,16 +17,10 @@
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>net.wafflesoftware.ShortcutRecorder.IB.Leopard</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="527983524">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -53,6 +38,13 @@
<int key="NSvFlags">258</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSCustomView" id="383727812">
+ <reference key="NSNextResponder" ref="928042108"/>
+ <int key="NSvFlags">258</int>
+ <string key="NSFrame">{{180, 41}, {223, 22}}</string>
+ <reference key="NSSuperview" ref="928042108"/>
+ <string key="NSClassName">NSView</string>
+ </object>
<object class="NSTextField" id="88004181">
<reference key="NSNextResponder" ref="928042108"/>
<int key="NSvFlags">256</int>
@@ -321,27 +313,6 @@
<reference key="NSTextColor" ref="730625081"/>
</object>
</object>
- <object class="SRRecorderControl" id="1047300771">
- <reference key="NSNextResponder" ref="928042108"/>
- <int key="NSvFlags">258</int>
- <string key="NSFrame">{{180, 39}, {223, 22}}</string>
- <reference key="NSSuperview" ref="928042108"/>
- <bool key="NSEnabled">YES</bool>
- <object class="SRRecorderCell" key="NSCell" id="12768836">
- <int key="NSCellFlags">130560</int>
- <int key="NSCellFlags2">0</int>
- <reference key="NSControlView" ref="1047300771"/>
- <nil key="autosaveName"/>
- <integer value="-1" key="keyComboCode"/>
- <integer value="0" key="keyComboFlags"/>
- <integer value="10354688" key="allowedFlags"/>
- <integer value="0" key="requiredFlags"/>
- <boolean value="NO" key="allowsKeyOnly"/>
- <boolean value="NO" key="escapeKeysRecord"/>
- <boolean value="NO" key="isAnimating"/>
- <integer value="0" key="style"/>
- </object>
- </object>
<object class="NSButton" id="425414821">
<reference key="NSNextResponder" ref="928042108"/>
<int key="NSvFlags">256</int>
@@ -699,17 +670,19 @@
<boolean value="YES"/>
<object class="NSAttributedString" id="304923518">
<string key="NSString">0</string>
- <object class="NSDictionary" key="NSAttributes" id="1025485086">
+ <object class="NSDictionary" key="NSAttributes" id="42012072">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
</object>
+ <string>.</string>
+ <integer value="1000"/>
<string>,</string>
- <integer value="1000"/>
- <string type="base64-UTF8">wqA</string>
<real value="400"/>
<object class="NSDecimalNumberPlaceholder" id="456566815">
<int key="NS.exponent">0</int>
@@ -749,13 +722,13 @@
</object>
<object class="NSAttributedString" key="NS.nan">
<string key="NSString">NaN</string>
- <reference key="NSAttributes" ref="1025485086"/>
+ <reference key="NSAttributes" ref="42012072"/>
</object>
<reference key="NS.min" ref="456566815"/>
<real value="400" key="NS.max"/>
<nil key="NS.rounding"/>
- <string key="NS.decimal">,</string>
- <string type="base64-UTF8" key="NS.thousand">wqA</string>
+ <string key="NS.decimal">.</string>
+ <string key="NS.thousand">,</string>
<bool key="NS.hasthousands">NO</bool>
<bool key="NS.localized">YES</bool>
<bool key="NS.allowsfloats">YES</bool>
@@ -893,22 +866,6 @@
<int key="connectionID">170</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">shortcutRecorder</string>
- <reference key="source" ref="915251056"/>
- <reference key="destination" ref="1047300771"/>
- </object>
- <int key="connectionID">174</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="1047300771"/>
- <reference key="destination" ref="915251056"/>
- </object>
- <int key="connectionID">175</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: adium.preferenceController.Interface.Tabbed Chatting</string>
<reference key="source" ref="1018443507"/>
@@ -1248,6 +1205,14 @@
</object>
<int key="connectionID">337</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">placeholder_shortcutRecorder</string>
+ <reference key="source" ref="915251056"/>
+ <reference key="destination" ref="383727812"/>
+ </object>
+ <int key="connectionID">365</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -1293,7 +1258,6 @@
<reference ref="610328537"/>
<reference ref="317682041"/>
<reference ref="876602302"/>
- <reference ref="1047300771"/>
<reference ref="425414821"/>
<reference ref="301978444"/>
<reference ref="140377237"/>
@@ -1305,6 +1269,7 @@
<reference ref="136251571"/>
<reference ref="541646031"/>
<reference ref="390051922"/>
+ <reference ref="383727812"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">View</string>
@@ -1418,15 +1383,6 @@
<reference key="parent" ref="928042108"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">173</int>
- <reference key="object" ref="1047300771"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="12768836"/>
- </object>
- <reference key="parent" ref="928042108"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">177</int>
<reference key="object" ref="425414821"/>
<object class="NSMutableArray" key="children">
@@ -1600,11 +1556,6 @@
<reference key="parent" ref="876602302"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">352</int>
- <reference key="object" ref="12768836"/>
- <reference key="parent" ref="1047300771"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">353</int>
<reference key="object" ref="693904898"/>
<reference key="parent" ref="425414821"/>
@@ -1723,6 +1674,11 @@
<reference key="object" ref="699219019"/>
<reference key="parent" ref="286078951"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">364</int>
+ <reference key="object" ref="383727812"/>
+ <reference key="parent" ref="928042108"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1762,8 +1718,6 @@
<string>161.CustomClassName</string>
<string>161.IBPluginDependency</string>
<string>161.ImportedFromIB2</string>
- <string>173.IBPluginDependency</string>
- <string>173.ImportedFromIB2</string>
<string>177.CustomClassName</string>
<string>177.IBPluginDependency</string>
<string>177.ImportedFromIB2</string>
@@ -1808,6 +1762,31 @@
<string>279.CustomClassName</string>
<string>279.IBPluginDependency</string>
<string>279.ImportedFromIB2</string>
+ <string>340.IBPluginDependency</string>
+ <string>341.IBPluginDependency</string>
+ <string>342.IBPluginDependency</string>
+ <string>343.IBPluginDependency</string>
+ <string>344.IBPluginDependency</string>
+ <string>345.IBPluginDependency</string>
+ <string>346.IBPluginDependency</string>
+ <string>347.IBPluginDependency</string>
+ <string>348.IBPluginDependency</string>
+ <string>349.IBPluginDependency</string>
+ <string>350.IBPluginDependency</string>
+ <string>351.IBPluginDependency</string>
+ <string>353.IBPluginDependency</string>
+ <string>354.IBPluginDependency</string>
+ <string>355.IBPluginDependency</string>
+ <string>356.IBPluginDependency</string>
+ <string>357.IBPluginDependency</string>
+ <string>358.IBPluginDependency</string>
+ <string>359.IBPluginDependency</string>
+ <string>360.IBPluginDependency</string>
+ <string>361.IBPluginDependency</string>
+ <string>362.IBPluginDependency</string>
+ <string>363.IBPluginDependency</string>
+ <string>364.IBPluginDependency</string>
+ <string>364.IBViewBoundsToFrameTransform</string>
<string>5.IBEditorWindowLastContentRect</string>
<string>5.IBPluginDependency</string>
<string>5.ImportedFromIB2</string>
@@ -1853,8 +1832,6 @@
<string>AILocalizationTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>net.wafflesoftware.ShortcutRecorder.IB.Leopard</string>
- <boolean value="YES"/>
<string>AILocalizationButton</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
@@ -1899,6 +1876,33 @@
<string>AILocalizationButton</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">AUM5AABCCAAAA</bytes>
+ </object>
<string>{{168, 403}, {540, 408}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
@@ -1926,7 +1930,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">363</int>
+ <int key="maxID">365</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1951,6 +1955,35 @@
<string>NSWindow</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>view_anchorToLeftSide</string>
+ <string>view_anchorToRightSide</string>
+ <string>window_anchorOnLeftSide</string>
+ <string>window_anchorOnRightSide</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_anchorToLeftSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_anchorToRightSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">window_anchorOnLeftSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">window_anchorOnRightSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1976,6 +2009,35 @@
<string>NSWindow</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>view_anchorToLeftSide</string>
+ <string>view_anchorToRightSide</string>
+ <string>window_anchorOnLeftSide</string>
+ <string>window_anchorOnRightSide</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_anchorToLeftSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_anchorToRightSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">window_anchorOnLeftSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">window_anchorOnRightSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1988,6 +2050,13 @@
<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">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@@ -2001,6 +2070,25 @@
<string>NSView</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>plugin</string>
+ <string>view</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">plugin</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2021,41 +2109,22 @@
<string key="NS.key.0">configureMessageHistory:</string>
<string key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">configureMessageHistory:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">configureMessageHistory:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>checkBox_arrangeByGroup</string>
- <string>checkBox_messagesInTabs</string>
- <string>checkBox_updatesAutomatic</string>
- <string>checkBox_updatesIncludeBetas</string>
- <string>checkBox_updatesProfileInfo</string>
- <string>label_logging</string>
- <string>label_messagesSendOn</string>
- <string>label_messagesTabs</string>
- <string>label_shortcutRecorder</string>
- <string>label_switchTabsWith</string>
- <string>popUp_sendKeys</string>
- <string>popUp_tabKeys</string>
- <string>popUp_tabPositionMenu</string>
- <string>shortcutRecorder</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSButton</string>
- <string>NSButton</string>
- <string>NSButton</string>
- <string>NSButton</string>
- <string>NSButton</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSPopUpButton</string>
- <string>NSPopUpButton</string>
- <string>NSPopUpButton</string>
- <string>SRRecorderControl</string>
+ <string key="NS.key.0">shortcutRecorder</string>
+ <string key="NS.object.0">SRRecorderControl</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">shortcutRecorder</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">shortcutRecorder</string>
+ <string key="candidateClassName">SRRecorderControl</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -2065,6 +2134,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstResponder</string>
+ <string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2072,6 +2142,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
+ <string key="superclassName">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2079,6 +2150,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSButton</string>
+ <string key="superclassName">NSControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2086,6 +2158,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSButtonCell</string>
+ <string key="superclassName">NSActionCell</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2093,6 +2166,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSCell</string>
+ <string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2100,6 +2174,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSMenu</string>
+ <string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2107,6 +2182,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSMenuItem</string>
+ <string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2133,6 +2209,40 @@
<string>RBSplitView</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>adiumPrint:</string>
+ <string>didAdjustSubviews:</string>
+ <string>prefsWindowWillClose:</string>
+ <string>toggleFindPanel:</string>
+ <string>willAdjustSubviews:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">adiumPrint:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">didAdjustSubviews:</string>
+ <string key="candidateClassName">RBSplitView</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">prefsWindowWillClose:</string>
+ <string key="candidateClassName">SS_PrefsController</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">toggleFindPanel:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">willAdjustSubviews:</string>
+ <string key="candidateClassName">RBSplitView</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2140,6 +2250,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSPopUpButton</string>
+ <string key="superclassName">NSButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2147,6 +2258,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSPopUpButtonCell</string>
+ <string key="superclassName">NSMenuItemCell</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2154,6 +2266,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSTextField</string>
+ <string key="superclassName">NSControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2161,6 +2274,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSView</string>
+ <string key="superclassName">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2168,6 +2282,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSWindow</string>
+ <string key="superclassName">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2188,17 +2303,12 @@
<string key="NS.key.0">delegate</string>
<string key="NS.object.0">id</string>
</object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">SRRecorderCell</string>
- <string key="superclassName">NSActionCell</string>
- <object class="NSMutableDictionary" key="outlets">
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">delegate</string>
- <string key="NS.object.0">id</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">delegate</string>
+ <string key="candidateClassName">id</string>
+ </object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
@@ -2207,10 +2317,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">SRRecorderControl</string>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">delegate</string>
- <string key="NS.object.0">id</string>
- </object>
+ <string key="superclassName">NSControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2223,14 +2330,160 @@
<string key="NS.key.0">delegate</string>
<string key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">delegate</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">delegate</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
</object>
</object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">ESGeneralPreferences</string>
+ <string key="superclassName">AIPreferencePane</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">configureLogCertainAccounts:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">configureLogCertainAccounts:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">configureLogCertainAccounts:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>checkBox_arrangeByGroup</string>
+ <string>checkBox_messagesInTabs</string>
+ <string>checkBox_updatesAutomatic</string>
+ <string>checkBox_updatesIncludeBetas</string>
+ <string>checkBox_updatesProfileInfo</string>
+ <string>label_logging</string>
+ <string>label_messagesSendOn</string>
+ <string>label_messagesTabs</string>
+ <string>label_shortcutRecorder</string>
+ <string>label_switchTabsWith</string>
+ <string>placeholder_shortcutRecorder</string>
+ <string>popUp_sendKeys</string>
+ <string>popUp_tabKeys</string>
+ <string>popUp_tabPositionMenu</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSButton</string>
+ <string>NSButton</string>
+ <string>NSButton</string>
+ <string>NSButton</string>
+ <string>NSButton</string>
+ <string>NSTextField</string>
+ <string>NSTextField</string>
+ <string>NSTextField</string>
+ <string>NSTextField</string>
+ <string>NSTextField</string>
+ <string>NSView</string>
+ <string>NSPopUpButton</string>
+ <string>NSPopUpButton</string>
+ <string>NSPopUpButton</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>checkBox_arrangeByGroup</string>
+ <string>checkBox_messagesInTabs</string>
+ <string>checkBox_updatesAutomatic</string>
+ <string>checkBox_updatesIncludeBetas</string>
+ <string>checkBox_updatesProfileInfo</string>
+ <string>label_logging</string>
+ <string>label_messagesSendOn</string>
+ <string>label_messagesTabs</string>
+ <string>label_shortcutRecorder</string>
+ <string>label_switchTabsWith</string>
+ <string>placeholder_shortcutRecorder</string>
+ <string>popUp_sendKeys</string>
+ <string>popUp_tabKeys</string>
+ <string>popUp_tabPositionMenu</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkBox_arrangeByGroup</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkBox_messagesInTabs</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkBox_updatesAutomatic</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkBox_updatesIncludeBetas</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkBox_updatesProfileInfo</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_logging</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_messagesSendOn</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_messagesTabs</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_shortcutRecorder</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_switchTabsWith</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">placeholder_shortcutRecorder</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">popUp_sendKeys</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">popUp_tabKeys</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">popUp_tabPositionMenu</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBDocumentRelativeSource</string>
+ <string key="minorKey">../../Plugins/General Preferences/ESGeneralPreferences.h</string>
+ </object>
+ </object>
+ </object>
</object>
<int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1050" key="NS.object.0"/>
@@ -2242,5 +2495,18 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../../Adium.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSMenuCheckmark</string>
+ <string>NSMenuMixedState</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{9, 8}</string>
+ <string>{7, 2}</string>
+ </object>
+ </object>
</data>
</archive>
diff -r 3fd5458a9fe7 -r b6b99b09738b Resources/cs.lproj/GeneralPreferences.nib/keyedobjects.nib
Binary file Resources/cs.lproj/GeneralPreferences.nib/keyedobjects.nib has changed
diff -r 3fd5458a9fe7 -r b6b99b09738b Resources/da.lproj/GeneralPreferences.nib/classes.nib
--- a/Resources/da.lproj/GeneralPreferences.nib/classes.nib Fri Apr 29 16:17:16 2011 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IBClasses</key>
- <array>
- <dict>
- <key>CLASS</key>
- <string>NSApplication</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSResponder</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>RBSplitView</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>delegate</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>RBSplitSubview</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSTextField</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSControl</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>RBSplitSubview</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSView</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSMenu</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>adiumPrint</key>
- <string>id</string>
- <key>didAdjustSubviews</key>
- <string>RBSplitView</string>
- <key>prefsWindowWillClose</key>
- <string>SS_PrefsController</string>
- <key>toggleFindPanel</key>
- <string>id</string>
- <key>willAdjustSubviews</key>
- <string>RBSplitView</string>
- </dict>
- <key>CLASS</key>
- <string>NSObject</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>AILocalizationButton</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>view_anchorToLeftSide</key>
- <string>NSView</string>
- <key>view_anchorToRightSide</key>
- <string>NSView</string>
- <key>window_anchorOnLeftSide</key>
- <string>NSWindow</string>
- <key>window_anchorOnRightSide</key>
- <string>NSWindow</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSButton</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSWindow</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSResponder</string>
More information about the commits
mailing list