adium 3881:2c1203c77b19: Brazilian Portuguese update from Helv?c...

commits at adium.im commits at adium.im
Wed Apr 27 19:26:56 UTC 2011


details:	http://hg.adium.im/adium/rev/2c1203c77b19
revision:	3881:2c1203c77b19
branch:		(none)
author:		Evan Schoenberg
date:		Fri Apr 22 13:00:57 2011 -0500

Brazilian Portuguese update from Helv?cio Mafra
(transplanted from 56c3a87b82bcc7c457db2311a08895ebc892cab0)
Subject: adium 3882:81cd7615fff5: 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

details:	http://hg.adium.im/adium/rev/81cd7615fff5
revision:	3882:81cd7615fff5
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

diffs (truncated from 33972 to 1000 lines):

diff -r a003b663e3fa -r 81cd7615fff5 Plugins/General Preferences/ESGeneralPreferences.h
--- a/Plugins/General Preferences/ESGeneralPreferences.h	Sat Apr 23 01:21:52 2011 +0200
+++ 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 a003b663e3fa -r 81cd7615fff5 Plugins/General Preferences/ESGeneralPreferences.m
--- a/Plugins/General Preferences/ESGeneralPreferences.m	Sat Apr 23 01:21:52 2011 +0200
+++ 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 a003b663e3fa -r 81cd7615fff5 Plugins/Purple Service/pt.lproj/ESPurpleAIMAccountView.nib/classes.nib
--- a/Plugins/Purple Service/pt.lproj/ESPurpleAIMAccountView.nib/classes.nib	Sat Apr 23 01:21:52 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +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>AIObject</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>sendContent</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>AISendingTextView</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>target</key>
-				<string>id</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSTextView</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>pasteAsRichText</key>
-				<string>id</string>
-				<key>scrollPageDown</key>
-				<string>id</string>
-				<key>scrollPageUp</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>AIMessageEntryTextView</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>AISendingTextView</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>FirstResponder</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>AIPurpleAIMAccountViewController</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>textView_textProfile</key>
-				<string>NSTextView</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>AIAccountViewController</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>AIAutoScrollView</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSScrollView</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>changedPreference</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>AIAccountViewController</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>checkBox_checkMail</key>
-				<string>NSButton</string>
-				<key>checkBox_sendTyping</key>
-				<string>NSButton</string>
-				<key>label_alias</key>
-				<string>NSTextField</string>
-				<key>label_encryption</key>
-				<string>NSTextField</string>
-				<key>label_password</key>
-				<string>NSTextField</string>
-				<key>label_port</key>
-				<string>NSTextField</string>
-				<key>label_server</key>
-				<string>NSTextField</string>
-				<key>label_typing</key>
-				<string>NSTextField</string>
-				<key>popUp_encryption</key>
-				<string>NSPopUpButton</string>
-				<key>textField_accountUID</key>
-				<string>NSTextField</string>
-				<key>textField_accountUIDLabel</key>
-				<string>NSTextField</string>
-				<key>textField_alias</key>
-				<string>NSTextField</string>
-				<key>textField_connectHost</key>
-				<string>NSTextField</string>
-				<key>textField_connectPort</key>
-				<string>NSTextField</string>
-				<key>textField_password</key>
-				<string>NSTextField</string>
-				<key>view_auxiliaryTabView</key>
-				<string>NSTabView</string>
-				<key>view_options</key>
-				<string>NSView</string>
-				<key>view_privacy</key>
-				<string>NSView</string>
-				<key>view_profile</key>
-				<string>NSView</string>
-				<key>view_setup</key>
-				<string>NSView</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>AIObject</string>
-		</dict>
-	</array>
-	<key>IBVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff -r a003b663e3fa -r 81cd7615fff5 Plugins/Purple Service/pt.lproj/ESPurpleAIMAccountView.nib/designable.nib
--- a/Plugins/Purple Service/pt.lproj/ESPurpleAIMAccountView.nib/designable.nib	Sat Apr 23 01:21:52 2011 +0200
+++ b/Plugins/Purple Service/pt.lproj/ESPurpleAIMAccountView.nib/designable.nib	Wed Apr 27 15:22:56 2011 -0400
@@ -2,16 +2,25 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10F569</string>
-		<string key="IBDocument.InterfaceBuilderVersion">804</string>
-		<string key="IBDocument.AppKitVersion">1038.29</string>
+		<string key="IBDocument.SystemVersion">10J3250</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
+		<string key="IBDocument.AppKitVersion">1038.35</string>
 		<string key="IBDocument.HIToolboxVersion">461.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">804</string>
+			<string key="NS.object.0">1306</string>
 		</object>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSScrollView</string>
+			<string>NSCustomView</string>
+			<string>NSTextView</string>
+			<string>NSButtonCell</string>
+			<string>NSButton</string>
+			<string>NSScroller</string>
+			<string>NSCustomObject</string>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -33,7 +42,7 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSCustomView" id="16687925">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -42,6 +51,8 @@
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{64, 125}, {276, 22}}</string>
 						<reference key="NSSuperview" ref="16687925"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="288904903"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="173753159">
 							<int key="NSCellFlags">-1804468671</int>
@@ -79,6 +90,8 @@
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{-3, 127}, {62, 17}}</string>
 						<reference key="NSSuperview" ref="16687925"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="881507800"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="254269816">
 							<int key="NSCellFlags">67239424</int>
@@ -108,6 +121,8 @@
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{7, 102}, {52, 17}}</string>
 						<reference key="NSSuperview" ref="16687925"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="1035473668"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="972128128">
 							<int key="NSCellFlags">67239424</int>
@@ -153,10 +168,13 @@
 												<string>NeXT font pasteboard type</string>
 												<string>NeXT ruler pasteboard type</string>
 												<string>WebURLsWithTitlesPboardType</string>
+												<string>public.url</string>
 											</object>
 										</object>
 										<string key="NSFrameSize">{274, 115}</string>
 										<reference key="NSSuperview" ref="82226756"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView"/>
 										<object class="NSTextContainer" key="NSTextContainer" id="570874940">
 											<object class="NSLayoutManager" key="NSLayoutManager">
 												<object class="NSTextStorage" key="NSTextStorage">
@@ -235,6 +253,7 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {274, 115}}</string>
 								<reference key="NSSuperview" ref="1035473668"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="179802126"/>
 								<reference key="NSDocView" ref="179802126"/>
 								<reference key="NSBGColor" ref="177736427"/>
@@ -249,6 +268,8 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-30, 1}, {15, 210}}</string>
 								<reference key="NSSuperview" ref="1035473668"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="82226756"/>
 								<reference key="NSTarget" ref="1035473668"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSCurValue">1</double>
@@ -258,6 +279,8 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 								<reference key="NSSuperview" ref="1035473668"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="680113760"/>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="1035473668"/>
 								<string key="NSAction">_doScroller:</string>
@@ -267,7 +290,8 @@
 						</object>
 						<string key="NSFrame">{{64, 0}, {276, 117}}</string>
 						<reference key="NSSuperview" ref="16687925"/>
-						<reference key="NSNextKeyView" ref="82226756"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="536560174"/>
 						<int key="NSsFlags">530</int>
 						<reference key="NSVScroller" ref="680113760"/>
 						<reference key="NSHScroller" ref="536560174"/>
@@ -275,21 +299,25 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{340, 147}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="866672122"/>
 				<object class="NSMutableString" key="NSClassName">
 					<characters key="NS.bytes">NSView</characters>
 				</object>
 				<string key="NSExtension">NSResponder</string>
 			</object>
 			<object class="NSCustomView" id="1026295536">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="NSButton" id="237322130">
 						<reference key="NSNextResponder" ref="1026295536"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{140, 19}, {204, 18}}</string>
+						<string key="NSFrame">{{140, 91}, {204, 18}}</string>
 						<reference key="NSSuperview" ref="1026295536"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="227928416">
 							<int key="NSCellFlags">67239424</int>
@@ -315,13 +343,15 @@
 					<object class="NSButton" id="443201901">
 						<reference key="NSNextResponder" ref="1026295536"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{123, -6}, {326, 18}}</string>
+						<string key="NSFrame">{{140, 42}, {326, 43}}</string>
 						<reference key="NSSuperview" ref="1026295536"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="2170725">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">0</int>
-							<string key="NSContents">Sempre usar proxy para transferências de arquivos e IM Direto</string>
+							<string type="base64-UTF8" key="NSContents">U2VtcHJlIHVzYXIgcHJveHkgcGFyYSB0cmFuc2ZlcsOqbmNpYXMgZGUKYXJxdWl2b3MgZSBJTSBEaXJl
+dG8</string>
 							<reference key="NSSupport" ref="1048539632"/>
 							<reference key="NSControlView" ref="443201901"/>
 							<int key="NSButtonFlags">1211912703</int>
@@ -337,8 +367,9 @@
 					<object class="NSButton" id="362993702">
 						<reference key="NSNextResponder" ref="1026295536"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{123, -31}, {284, 18}}</string>
+						<string key="NSFrame">{{140, 18}, {284, 18}}</string>
 						<reference key="NSSuperview" ref="1026295536"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="694905663">
 							<int key="NSCellFlags">67239424</int>
@@ -359,8 +390,9 @@
 					<object class="NSTextField" id="827062666">
 						<reference key="NSNextResponder" ref="1026295536"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{-3, 48}, {140, 17}}</string>
+						<string key="NSFrame">{{-3, 120}, {140, 17}}</string>
 						<reference key="NSSuperview" ref="1026295536"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="215999662">
 							<int key="NSCellFlags">67239424</int>
@@ -375,8 +407,9 @@
 					<object class="NSTextField" id="276530917">
 						<reference key="NSNextResponder" ref="1026295536"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{142, 45}, {200, 22}}</string>
+						<string key="NSFrame">{{142, 117}, {200, 22}}</string>
 						<reference key="NSSuperview" ref="1026295536"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1054353884">
 							<int key="NSCellFlags">-1804468671</int>
@@ -392,8 +425,9 @@
 					<object class="NSTextField" id="856994896">
 						<reference key="NSNextResponder" ref="1026295536"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{394, 45}, {51, 22}}</string>
+						<string key="NSFrame">{{394, 117}, {51, 22}}</string>
 						<reference key="NSSuperview" ref="1026295536"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="798802356">
 							<int key="NSCellFlags">-1804468671</int>
@@ -409,8 +443,9 @@
 					<object class="NSTextField" id="831273185">
 						<reference key="NSNextResponder" ref="1026295536"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{347, 47}, {42, 17}}</string>
+						<string key="NSFrame">{{347, 119}, {42, 17}}</string>
 						<reference key="NSSuperview" ref="1026295536"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="395800788">
 							<int key="NSCellFlags">67239424</int>
@@ -425,8 +460,9 @@
 					<object class="NSTextField" id="376821">
 						<reference key="NSNextResponder" ref="1026295536"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{-3, 20}, {140, 17}}</string>
+						<string key="NSFrame">{{-3, 92}, {140, 17}}</string>
 						<reference key="NSSuperview" ref="1026295536"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="158348486">
 							<int key="NSCellFlags">67239424</int>
@@ -441,8 +477,9 @@
 					<object class="NSTextField" id="673184139">
 						<reference key="NSNextResponder" ref="1026295536"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{-20, -5}, {140, 17}}</string>
+						<string key="NSFrame">{{2, 50}, {135, 34}}</string>
 						<reference key="NSSuperview" ref="1026295536"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="162941854">
 							<int key="NSCellFlags">67239424</int>
@@ -457,8 +494,9 @@
 					<object class="NSTextField" id="1064312927">
 						<reference key="NSNextResponder" ref="1026295536"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{-20, -30}, {140, 17}}</string>
+						<string key="NSFrame">{{-3, 19}, {140, 17}}</string>
 						<reference key="NSSuperview" ref="1026295536"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="115493567">
 							<int key="NSCellFlags">67239424</int>
@@ -471,7 +509,9 @@
 						</object>
 					</object>
 				</object>
-				<string key="NSFrameSize">{465, 67}</string>
+				<string key="NSFrameSize">{483, 139}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<object class="NSMutableString" key="NSClassName">
 					<characters key="NS.bytes">NSView</characters>
 				</object>
@@ -708,8 +748,8 @@
 							<reference ref="376821"/>
 							<reference ref="673184139"/>
 							<reference ref="443201901"/>
+							<reference ref="1064312927"/>
 							<reference ref="362993702"/>
-							<reference ref="1064312927"/>
 						</object>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Options</string>
@@ -973,17 +1013,13 @@
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
+				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="activeLocalization"/>
 			<object class="NSMutableDictionary" key="localizations">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
+				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
 			<int key="maxID">242</int>
@@ -1178,16 +1214,16 @@
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/AIAccountViewController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">AIAutoScrollView</string>
 					<string key="superclassName">NSScrollView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/AIAutoScrollView.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1233,8 +1269,8 @@
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/AIMessageEntryTextView.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1280,8 +1316,8 @@
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/AIPurpleAIMAccountViewController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1320,8 +1356,8 @@
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/AIPurpleOscarAccountViewController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1350,32 +1386,8 @@
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<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">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"/>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/AISendingTextView.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1434,16 +1446,8 @@
 						</object>
 					</object>
 					<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"/>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSObject.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1461,16 +1465,16 @@
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/PurpleAccountViewController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">RBSplitSubview</string>
 					<string key="superclassName">NSView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/RBSplitSubview.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1488,8 +1492,8 @@
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/RBSplitView.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1507,8 +1511,8 @@
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/SS_PrefsController.h</string>
 					</object>
 				</object>
 			</object>
@@ -1524,7 +1528,6 @@
 			<integer value="3000" key="NS.object.0"/>
 		</object>
 		<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">
 			<string key="NS.key.0">NSSwitch</string>
diff -r a003b663e3fa -r 81cd7615fff5 Plugins/Purple Service/pt.lproj/ESPurpleAIMAccountView.nib/info.nib
--- a/Plugins/Purple Service/pt.lproj/ESPurpleAIMAccountView.nib/info.nib	Sat Apr 23 01:21:52 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +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>IBFramework Version</key>
-	<string>677</string>
-	<key>IBOldestOS</key>
-	<integer>5</integer>
-	<key>IBOpenObjects</key>
-	<array/>
-	<key>IBSystem Version</key>
-	<string>9G55</string>
-	<key>targetFramework</key>
-	<string>IBCocoaFramework</string>
-</dict>
-</plist>
diff -r a003b663e3fa -r 81cd7615fff5 Plugins/Purple Service/pt.lproj/ESPurpleAIMAccountView.nib/keyedobjects.nib
Binary file Plugins/Purple Service/pt.lproj/ESPurpleAIMAccountView.nib/keyedobjects.nib has changed
diff -r a003b663e3fa -r 81cd7615fff5 Plugins/Purple Service/pt.lproj/ESPurpleZephyrAccountView.nib/classes.nib
--- a/Plugins/Purple Service/pt.lproj/ESPurpleZephyrAccountView.nib/classes.nib	Sat Apr 23 01:21:52 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +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>AIPlasticButton</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSPopUpButton</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>AIPlasticMinusButton</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>AIPlasticButton</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>AIObject</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>addRowToServerList</key>
-				<string>id</string>
-				<key>removeSelectedRowFromServerList</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>ESGaimZephyrAccountViewController</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>checkBox_exportAnyone</key>
-				<string>NSButton</string>
-				<key>checkBox_exportSubs</key>
-				<string>NSButton</string>
-				<key>checkBox_launchZhm</key>
-				<string>NSButton</string>
-				<key>minus_servers</key>
-				<string>NSButton</string>
-				<key>plus_servers</key>
-				<string>NSButton</string>
-				<key>tableView_servers</key>
-				<string>NSTableView</string>
-				<key>textField_encoding</key>
-				<string>NSTextField</string>
-				<key>textField_exposure</key>
-				<string>NSTextField</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>AIAccountViewController</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>AIDelayedTextField</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSTextField</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>FirstResponder</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>AIPlasticPlusButton</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>AIPlasticButton</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>changedPreference</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>AIAccountViewController</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>checkBox_checkMail</key>
-				<string>NSButton</string>
-				<key>textField_accountUID</key>
-				<string>NSTextField</string>
-				<key>textField_accountUIDLabel</key>
-				<string>NSTextField</string>
-				<key>textField_alias</key>
-				<string>NSTextField</string>
-				<key>textField_connectHost</key>
-				<string>NSTextField</string>
-				<key>textField_connectPort</key>
-				<string>NSTextField</string>
-				<key>textField_password</key>
-				<string>NSTextField</string>
-				<key>view_auxiliaryTabView</key>
-				<string>NSTabView</string>
-				<key>view_options</key>
-				<string>NSView</string>
-				<key>view_profile</key>
-				<string>NSView</string>
-				<key>view_setup</key>
-				<string>NSView</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>AIObject</string>
-		</dict>
-	</array>
-	<key>IBVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff -r a003b663e3fa -r 81cd7615fff5 Resources/ca.lproj/GeneralPreferences.nib/keyedobjects.nib
Binary file Resources/ca.lproj/GeneralPreferences.nib/keyedobjects.nib has changed
diff -r a003b663e3fa -r 81cd7615fff5 Resources/cs.lproj/GeneralPreferences.nib/designable.nib
--- a/Resources/cs.lproj/GeneralPreferences.nib/designable.nib	Sat Apr 23 01:21:52 2011 +0200
+++ 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"/>




More information about the commits mailing list