adium-1.4 3565:d84669ba22b8: Made the instructions field of the ...
commits at adium.im
commits at adium.im
Wed Jun 29 22:00:34 UTC 2011
details: http://hg.adium.im/adium-1.4/rev/d84669ba22b8
revision: 3565:d84669ba22b8
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Thu Jun 30 00:00:23 2011 +0200
Made the instructions field of the Facebook account window a normal NSTextField, instead of an AILocalizationTextField.
I can't get the automatic resizing to behalve well with this field. At least this will do the right thing for strings that are not too much longer...
Fixes #15299
diffs (936 lines):
diff -r 37767c60487e -r d84669ba22b8 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Tue Jun 28 19:38:11 2011 -0500
+++ b/Adium.xcodeproj/project.pbxproj Thu Jun 30 00:00:23 2011 +0200
@@ -9594,7 +9594,6 @@
};
buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
compatibilityVersion = "Xcode 3.1";
- developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
en,
diff -r 37767c60487e -r d84669ba22b8 Frameworks/Adium Framework/Resources/nl.lproj/EditStateSheet.nib/designable.nib
--- a/Frameworks/Adium Framework/Resources/nl.lproj/EditStateSheet.nib/designable.nib Tue Jun 28 19:38:11 2011 -0500
+++ b/Frameworks/Adium Framework/Resources/nl.lproj/EditStateSheet.nib/designable.nib Thu Jun 30 00:00:23 2011 +0200
@@ -2,33 +2,15 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10J4138</string>
- <string key="IBDocument.InterfaceBuilderVersion">1306</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">1306</string>
+ <string key="NS.object.0">804</string>
</object>
- <array key="IBDocument.IntegratedClassDependencies">
- <string>NSTextField</string>
- <string>NSPopUpButtonCell</string>
- <string>NSScroller</string>
- <string>NSPopUpButton</string>
- <string>NSButton</string>
- <string>NSMenu</string>
- <string>NSScrollView</string>
- <string>NSButtonCell</string>
- <string>NSTextFieldCell</string>
- <string>NSBox</string>
- <string>NSMenuItem</string>
- <string>NSCustomObject</string>
- <string>NSTextView</string>
- <string>NSView</string>
- <string>NSWindowTemplate</string>
- <string>NSStepper</string>
- <string>NSStepperCell</string>
- </array>
+ <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</array>
@@ -796,7 +778,7 @@
</object>
<bool key="NSMenuItemRespectAlignment">YES</bool>
<object class="NSMenu" key="NSMenu" id="1057255754">
- <string key="NSTitle">OtherViews</string>
+ <string key="NSTitle">Andere weergaven</string>
<array class="NSMutableArray" key="NSMenuItems">
<reference ref="275256642"/>
<object class="NSMenuItem" id="483807693">
@@ -1903,6 +1885,10 @@
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="9.IBWindowTemplateEditedContentRect">{{0, 624}, {403, 521}}</string>
<boolean value="YES" key="9.ImportedFromIB2"/>
+ <boolean value="YES" key="9.windowTemplate.hasMaxSize"/>
+ <boolean value="YES" key="9.windowTemplate.hasMinSize"/>
+ <string key="9.windowTemplate.maxSize">{403, 527}</string>
+ <string key="9.windowTemplate.minSize">{403, 477}</string>
<string key="96.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="96.ImportedFromIB2"/>
</dictionary>
@@ -1918,8 +1904,8 @@
<string key="className">AIAutoScrollView</string>
<string key="superclassName">NSScrollView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AIAutoScrollView.h</string>
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -2084,8 +2070,8 @@
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AIEditStateWindowController.h</string>
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -2116,8 +2102,8 @@
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AILocalizationTextField.h</string>
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -2143,8 +2129,8 @@
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AIMessageEntryTextView.h</string>
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -2173,16 +2159,16 @@
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AISendingTextView.h</string>
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">AITextViewWithPlaceholder</string>
<string key="superclassName">NSTextView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AITextViewWithPlaceholder.h</string>
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -2200,8 +2186,64 @@
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AIWindowController.h</string>
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </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"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSApplication</string>
+ <string key="superclassName">NSResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSButton</string>
+ <string key="superclassName">NSControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSButtonCell</string>
+ <string key="superclassName">NSActionCell</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </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"/>
+ </object>
+ </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"/>
+ </object>
+ </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"/>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -2236,16 +2278,80 @@
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/NSObject.h</string>
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </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"/>
+ </object>
+ </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"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSScrollView</string>
+ <string key="superclassName">NSView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSTextField</string>
+ <string key="superclassName">NSControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSTextView</string>
+ <string key="superclassName">NSText</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </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"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSWindow</string>
+ <string key="superclassName">NSResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSWindowController</string>
+ <string key="superclassName">NSResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">RBSplitSubview</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/RBSplitSubview.h</string>
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -2263,8 +2369,8 @@
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/RBSplitView.h</string>
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -2282,8 +2388,8 @@
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/SS_PrefsController.h</string>
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
</object>
</object>
</array>
@@ -2295,6 +2401,7 @@
<integer value="1050" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../../../../Adium.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NSMenuCheckmark">{9, 8}</string>
diff -r 37767c60487e -r d84669ba22b8 Frameworks/Adium Framework/Resources/nl.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/nl.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 37767c60487e -r d84669ba22b8 Plugins/Purple Service/AIFacebookXMPPAccountView.xib
--- a/Plugins/Purple Service/AIFacebookXMPPAccountView.xib Tue Jun 28 19:38:11 2011 -0500
+++ b/Plugins/Purple Service/AIFacebookXMPPAccountView.xib Thu Jun 30 00:00:23 2011 +0200
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10J4138</string>
- <string key="IBDocument.InterfaceBuilderVersion">851</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.SystemVersion">10K540</string>
+ <string key="IBDocument.InterfaceBuilderVersion">762</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">851</string>
+ <string key="NS.object.0">762</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -40,8 +40,8 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="511623407">
<reference key="NSNextResponder" ref="610496814"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{8, 147}, {378, 51}}</string>
+ <int key="NSvFlags">282</int>
+ <string key="NSFrame">{{8, 121}, {378, 91}}</string>
<reference key="NSSuperview" ref="610496814"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="12458334">
@@ -77,7 +77,7 @@
<object class="NSTextField" id="444720455">
<reference key="NSNextResponder" ref="610496814"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{8, 22}, {347, 17}}</string>
+ <string key="NSFrame">{{8, 20}, {347, 17}}</string>
<reference key="NSSuperview" ref="610496814"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1047490784">
@@ -93,7 +93,7 @@
<object class="NSButton" id="290214125">
<reference key="NSNextResponder" ref="610496814"/>
<int key="NSvFlags">269</int>
- <string key="NSFrame">{{119, 99}, {157, 32}}</string>
+ <string key="NSFrame">{{118, 73}, {157, 32}}</string>
<reference key="NSSuperview" ref="610496814"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="119278707">
@@ -118,7 +118,7 @@
<reference key="NSNextResponder" ref="610496814"/>
<int key="NSvFlags">-2147482356</int>
<object class="NSPSMatrix" key="NSDrawMatrix"/>
- <string key="NSFrame">{{189, 71}, {16, 16}}</string>
+ <string key="NSFrame">{{189, 45}, {16, 16}}</string>
<reference key="NSSuperview" ref="610496814"/>
<int key="NSpiFlags">20746</int>
<double key="NSMinValue">16</double>
@@ -145,7 +145,7 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{394, 201}</string>
+ <string key="NSFrameSize">{396, 215}</string>
<reference key="NSSuperview"/>
</object>
</object>
@@ -208,6 +208,14 @@
</object>
<int key="connectionID">98</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">label_instructions</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="511623407"/>
+ </object>
+ <int key="connectionID">99</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -244,10 +252,10 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="511623407"/>
+ <reference ref="901696267"/>
+ <reference ref="444720455"/>
<reference ref="290214125"/>
- <reference ref="901696267"/>
<reference ref="249247989"/>
- <reference ref="444720455"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">Setup</string>
@@ -324,7 +332,6 @@
<string>-3.IBPluginDependency</string>
<string>43.IBEditorWindowLastContentRect</string>
<string>43.IBPluginDependency</string>
- <string>44.CustomClassName</string>
<string>44.IBPluginDependency</string>
<string>45.IBPluginDependency</string>
<string>46.CustomClassName</string>
@@ -332,6 +339,7 @@
<string>47.IBPluginDependency</string>
<string>48.IBPluginDependency</string>
<string>49.IBPluginDependency</string>
+ <string>50.CustomClassName</string>
<string>50.IBPluginDependency</string>
<string>95.IBPluginDependency</string>
<string>96.IBPluginDependency</string>
@@ -341,9 +349,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{361, 481}, {394, 201}}</string>
+ <string>{{342, 253}, {396, 215}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>AILocalizationTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>AILocalizationButton</string>
@@ -351,6 +358,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>AIL</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -372,7 +380,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">98</int>
+ <int key="maxID">104</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -384,13 +392,6 @@
<string key="NS.key.0">changedPreference:</string>
<string key="NS.object.0">id</string>
</object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">changedPreference:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">changedPreference:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@@ -444,125 +445,6 @@
<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>checkBox_checkMail</string>
- <string>checkBox_sendTyping</string>
- <string>label_alias</string>
- <string>label_encryption</string>
- <string>label_password</string>
- <string>label_port</string>
- <string>label_server</string>
- <string>label_typing</string>
- <string>popUp_encryption</string>
- <string>progressIndicator_registering</string>
- <string>textField_accountUID</string>
- <string>textField_accountUIDLabel</string>
- <string>textField_alias</string>
- <string>textField_connectHost</string>
- <string>textField_connectPort</string>
- <string>textField_password</string>
- <string>textField_registering</string>
- <string>view_auxiliaryTabView</string>
- <string>view_options</string>
- <string>view_privacy</string>
- <string>view_profile</string>
- <string>view_setup</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBToOneOutletInfo">
- <string key="name">checkBox_checkMail</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">checkBox_sendTyping</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">label_alias</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">label_encryption</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">label_password</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">label_port</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">label_server</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">label_typing</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">popUp_encryption</string>
- <string key="candidateClassName">NSPopUpButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">progressIndicator_registering</string>
- <string key="candidateClassName">NSProgressIndicator</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_accountUID</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_accountUIDLabel</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_alias</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_connectHost</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_connectPort</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_password</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_registering</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">view_auxiliaryTabView</string>
- <string key="candidateClassName">NSTabView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">view_options</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">view_privacy</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">view_profile</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">view_setup</string>
- <string key="candidateClassName">NSView</string>
- </object>
- </object>
- </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/Adium Framework/Source/AIAccountViewController.h</string>
@@ -575,59 +457,25 @@
<string key="NS.key.0">showHelp:</string>
<string key="NS.object.0">id</string>
</object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">showHelp:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">showHelp:</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>button_OAuthStart</string>
<string>button_help</string>
+ <string>label_instructions</string>
<string>spinner</string>
<string>textField_OAuthStatus</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>AILocalizationButton</string>
<string>NSButton</string>
- <string>NSButton</string>
+ <string>NSTextField</string>
<string>NSProgressIndicator</string>
<string>NSTextField</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>button_OAuthStart</string>
- <string>button_help</string>
- <string>spinner</string>
- <string>textField_OAuthStatus</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBToOneOutletInfo">
- <string key="name">button_OAuthStart</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">button_help</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">spinner</string>
- <string key="candidateClassName">NSProgressIndicator</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_OAuthStatus</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- </object>
- </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Plugins/Purple Service/AIFacebookXMPPAccountViewController.h</string>
@@ -653,95 +501,12 @@
<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" id="487331329">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">AILocalizationTextField</string>
- <string key="superclassName">NSTextField</string>
- <object class="NSMutableDictionary" key="outlets">
- <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>
- <string>NSView</string>
- <string>NSView</string>
- <string>NSWindow</string>
- <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" id="467327776">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationTextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@@ -825,13 +590,6 @@
<string key="NS.key.0">toggleFindPanel:</string>
<string key="NS.object.0">id</string>
</object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">toggleFindPanel:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">toggleFindPanel:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/Adium Framework/Source/AIAbstractListController.h</string>
@@ -864,13 +622,6 @@
<string key="NS.key.0">adiumPrint:</string>
<string key="NS.object.0">id</string>
</object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">adiumPrint:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">adiumPrint:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h</string>
@@ -938,13 +689,6 @@
<string key="NS.key.0">prefsWindowWillClose:</string>
<string key="NS.object.0">SS_PrefsController</string>
</object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">prefsWindowWillClose:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">prefsWindowWillClose:</string>
- <string key="candidateClassName">SS_PrefsController</string>
- </object>
- </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="361540154">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/Adium Framework/Source/SS_PrefsController.h</string>
@@ -965,25 +709,6 @@
<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>didAdjustSubviews:</string>
- <string>willAdjustSubviews:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">didAdjustSubviews:</string>
- <string key="candidateClassName">RBSplitView</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">willAdjustSubviews:</string>
- <string key="candidateClassName">RBSplitView</string>
- </object>
- </object>
- </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="218912176">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/RBSplitView/Source/RBSplitView.h</string>
@@ -1103,7 +828,10 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSTextField</string>
- <reference key="sourceIdentifier" ref="467327776"/>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationTextField.h</string>
+ </object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSView</string>
@@ -1142,25 +870,6 @@
<string>NSButton</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_broadcastMusic</string>
- <string>checkBox_displayCustomEmoticons</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBToOneOutletInfo">
- <string key="name">checkBox_broadcastMusic</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">checkBox_displayCustomEmoticons</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- </object>
- </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Plugins/Purple Service/PurpleAccountViewController.h</string>
@@ -1181,13 +890,6 @@
<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>
<reference key="sourceIdentifier" ref="218912176"/>
</object>
<object class="IBPartialClassDescription">
@@ -1197,13 +899,6 @@
<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>
<reference key="sourceIdentifier" ref="361540154"/>
</object>
</object>
diff -r 37767c60487e -r d84669ba22b8 Plugins/Purple Service/AIFacebookXMPPAccountViewController.h
--- a/Plugins/Purple Service/AIFacebookXMPPAccountViewController.h Tue Jun 28 19:38:11 2011 -0500
+++ b/Plugins/Purple Service/AIFacebookXMPPAccountViewController.h Thu Jun 30 00:00:23 2011 +0200
@@ -10,7 +10,7 @@
#import <WebKit/WebKit.h>
@interface AIFacebookXMPPAccountViewController : PurpleAccountViewController {
- AILocalizationTextField *label_instructions;
+ NSTextField *label_instructions;
AILocalizationButton *button_OAuthStart;
NSTextField *textField_OAuthStatus;
NSProgressIndicator *spinner;
@@ -18,6 +18,7 @@
NSButton *button_help;
}
+ at property (assign) IBOutlet NSTextField *label_instructions;
@property (assign) IBOutlet NSProgressIndicator *spinner;
@property (assign) IBOutlet NSTextField *textField_OAuthStatus;
@property (assign) IBOutlet AILocalizationButton *button_OAuthStart;
diff -r 37767c60487e -r d84669ba22b8 Plugins/Purple Service/AIFacebookXMPPAccountViewController.m
--- a/Plugins/Purple Service/AIFacebookXMPPAccountViewController.m Tue Jun 28 19:38:11 2011 -0500
+++ b/Plugins/Purple Service/AIFacebookXMPPAccountViewController.m Thu Jun 30 00:00:23 2011 +0200
@@ -16,7 +16,7 @@
@implementation AIFacebookXMPPAccountViewController
- at synthesize spinner, textField_OAuthStatus, button_OAuthStart, button_help;
+ at synthesize label_instructions, spinner, textField_OAuthStatus, button_OAuthStart, button_help;
- (void)dealloc
{
@@ -49,7 +49,7 @@
[super localizeStrings];
- [label_instructions setLocalizedString:
+ [label_instructions setStringValue:
AILocalizedString(@"To connect to Facebook Chat, you must give Adium permission. A secure Facebook login screen will be shown when you click Allow Access.",
"Instructions in the Facebook account configuration window")];
More information about the commits
mailing list