adium 2391:a08219246e38: Work around (by disabling the shortcut ...

commits at adium.im commits at adium.im
Fri May 29 15:11:31 UTC 2009


details:	http://hg.adium.im/adium/rev/a08219246e38
revision:	2391:a08219246e38
author:		Zachary West <zacw at adium.im>
date:		Fri May 29 11:11:21 2009 -0400

Work around (by disabling the shortcut recorder—sorry :() the rsrc keyboard layouts not being supported in the 64-bit keyboard layout API. Fixes #12192.

This forces a nib reset on GeneralPreferences.nib so that the text below the shortcut recorder is changeable (as it wasn't linked to anything before). We say to the user, "You are using an old-style (rsrc) keyboard layout which Adium does not support." if it is the case.

diffs (truncated from 2849 to 1000 lines):

diff -r 9099dc0ec476 -r a08219246e38 Plugins/General Preferences/ESGeneralPreferences.h
--- a/Plugins/General Preferences/ESGeneralPreferences.h	Fri May 29 01:07:08 2009 -0400
+++ b/Plugins/General Preferences/ESGeneralPreferences.h	Fri May 29 11:11:21 2009 -0400
@@ -33,6 +33,8 @@
 	IBOutlet	NSTextField		*label_messagesSendOn;
 	IBOutlet	NSTextField		*label_messagesTabs;
 	IBOutlet	NSTextField		*label_switchTabsWith;	
+	
+	IBOutlet	NSTextField		*label_shortcutRecorder;
 
     IBOutlet	SRRecorderControl	*shortcutRecorder;		
 }
diff -r 9099dc0ec476 -r a08219246e38 Plugins/General Preferences/ESGeneralPreferences.m
--- a/Plugins/General Preferences/ESGeneralPreferences.m	Fri May 29 01:07:08 2009 -0400
+++ b/Plugins/General Preferences/ESGeneralPreferences.m	Fri May 29 11:11:21 2009 -0400
@@ -116,11 +116,20 @@
 	//																			group:PREF_GROUP_CONFIRMATIONS] boolValue]];
 	
 	//Global hotkey
-	PTKeyCombo *keyCombo = [[[PTKeyCombo alloc] initWithPlistRepresentation:[adium.preferenceController preferenceForKey:KEY_GENERAL_HOTKEY
-																													 group:PREF_GROUP_GENERAL]] autorelease];
-	[shortcutRecorder setKeyCombo:SRMakeKeyCombo([keyCombo keyCode], [shortcutRecorder carbonToCocoaFlags:[keyCombo modifiers]])];
-	[shortcutRecorder setAnimates:YES];
-	[shortcutRecorder setStyle:SRGreyStyle];
+	TISInputSourceRef currentLayout = TISCopyCurrentKeyboardLayoutInputSource();
+	
+	if (TISGetInputSourceProperty(currentLayout, kTISPropertyUnicodeKeyLayoutData)) {
+		PTKeyCombo *keyCombo = [[[PTKeyCombo alloc] initWithPlistRepresentation:[adium.preferenceController preferenceForKey:KEY_GENERAL_HOTKEY
+																														 group:PREF_GROUP_GENERAL]] autorelease];
+		[shortcutRecorder setKeyCombo:SRMakeKeyCombo([keyCombo keyCode], [shortcutRecorder carbonToCocoaFlags:[keyCombo modifiers]])];
+		[shortcutRecorder setAnimates:YES];
+		[shortcutRecorder setStyle:SRGreyStyle];
+		
+		[label_shortcutRecorder setLocalizedString:AILocalizedString(@"When pressed, this key combination will bring Adium to the front", nil)];
+	} else {
+		[shortcutRecorder setEnabled:NO];
+		[label_shortcutRecorder setLocalizedString:AILocalizedString(@"You are using an old-style (rsrc) keyboard layout which Adium does not support.", nil)];
+	}
 
     [self configureControlDimming];
 }
diff -r 9099dc0ec476 -r a08219246e38 Resources/ca.lproj/GeneralPreferences.nib/classes.nib
--- a/Resources/ca.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/ca.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 11:11:21 2009 -0400
@@ -42,6 +42,14 @@
 			<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>
@@ -88,6 +96,22 @@
 			<string>NSResponder</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSMenuItem</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>configureMessageHistory</key>
@@ -115,6 +139,8 @@
 				<string>NSTextField</string>
 				<key>label_messagesTabs</key>
 				<string>NSTextField</string>
+				<key>label_shortcutRecorder</key>
+				<string>NSTextField</string>
 				<key>label_switchTabsWith</key>
 				<string>NSTextField</string>
 				<key>popUp_sendKeys</key>
@@ -146,6 +172,14 @@
 			<string>AIModularPane</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>changePreference</key>
@@ -188,11 +222,11 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
-			<string>AISmartStepper</string>
+			<string>NSPopUpButton</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
 			<key>SUPERCLASS</key>
-			<string>NSStepper</string>
+			<string>NSButton</string>
 		</dict>
 		<dict>
 			<key>CLASS</key>
@@ -209,6 +243,14 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
+			<string>NSPopUpButtonCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSMenuItemCell</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
 			<string>AILocalizationTextField</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
diff -r 9099dc0ec476 -r a08219246e38 Resources/ca.lproj/GeneralPreferences.nib/info.nib
--- a/Resources/ca.lproj/GeneralPreferences.nib/info.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/ca.lproj/GeneralPreferences.nib/info.nib	Fri May 29 11:11:21 2009 -0400
@@ -13,7 +13,7 @@
 		<integer>5</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>9G55</string>
+	<string>9J61</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>
diff -r 9099dc0ec476 -r a08219246e38 Resources/ca.lproj/GeneralPreferences.nib/keyedobjects.nib
Binary file Resources/ca.lproj/GeneralPreferences.nib/keyedobjects.nib has changed
diff -r 9099dc0ec476 -r a08219246e38 Resources/cs.lproj/GeneralPreferences.nib/classes.nib
--- a/Resources/cs.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/cs.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 11:11:21 2009 -0400
@@ -42,6 +42,14 @@
 			<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>
@@ -88,6 +96,22 @@
 			<string>NSResponder</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSMenuItem</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>configureMessageHistory</key>
@@ -115,6 +139,8 @@
 				<string>NSTextField</string>
 				<key>label_messagesTabs</key>
 				<string>NSTextField</string>
+				<key>label_shortcutRecorder</key>
+				<string>NSTextField</string>
 				<key>label_switchTabsWith</key>
 				<string>NSTextField</string>
 				<key>popUp_sendKeys</key>
@@ -146,6 +172,14 @@
 			<string>AIModularPane</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>changePreference</key>
@@ -188,11 +222,11 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
-			<string>AISmartStepper</string>
+			<string>NSPopUpButton</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
 			<key>SUPERCLASS</key>
-			<string>NSStepper</string>
+			<string>NSButton</string>
 		</dict>
 		<dict>
 			<key>CLASS</key>
@@ -209,6 +243,14 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
+			<string>NSPopUpButtonCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSMenuItemCell</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
 			<string>AILocalizationTextField</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
diff -r 9099dc0ec476 -r a08219246e38 Resources/cs.lproj/GeneralPreferences.nib/info.nib
--- a/Resources/cs.lproj/GeneralPreferences.nib/info.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/cs.lproj/GeneralPreferences.nib/info.nib	Fri May 29 11:11:21 2009 -0400
@@ -13,7 +13,7 @@
 		<integer>5</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>9G55</string>
+	<string>9J61</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>
diff -r 9099dc0ec476 -r a08219246e38 Resources/cs.lproj/GeneralPreferences.nib/keyedobjects.nib
Binary file Resources/cs.lproj/GeneralPreferences.nib/keyedobjects.nib has changed
diff -r 9099dc0ec476 -r a08219246e38 Resources/da.lproj/GeneralPreferences.nib/classes.nib
--- a/Resources/da.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/da.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 11:11:21 2009 -0400
@@ -42,6 +42,14 @@
 			<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>
@@ -88,6 +96,22 @@
 			<string>NSResponder</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSMenuItem</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>configureMessageHistory</key>
@@ -115,6 +139,8 @@
 				<string>NSTextField</string>
 				<key>label_messagesTabs</key>
 				<string>NSTextField</string>
+				<key>label_shortcutRecorder</key>
+				<string>NSTextField</string>
 				<key>label_switchTabsWith</key>
 				<string>NSTextField</string>
 				<key>popUp_sendKeys</key>
@@ -146,6 +172,14 @@
 			<string>AIModularPane</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>changePreference</key>
@@ -188,11 +222,11 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
-			<string>AISmartStepper</string>
+			<string>NSPopUpButton</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
 			<key>SUPERCLASS</key>
-			<string>NSStepper</string>
+			<string>NSButton</string>
 		</dict>
 		<dict>
 			<key>CLASS</key>
@@ -209,6 +243,14 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
+			<string>NSPopUpButtonCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSMenuItemCell</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
 			<string>AILocalizationTextField</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
diff -r 9099dc0ec476 -r a08219246e38 Resources/da.lproj/GeneralPreferences.nib/info.nib
--- a/Resources/da.lproj/GeneralPreferences.nib/info.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/da.lproj/GeneralPreferences.nib/info.nib	Fri May 29 11:11:21 2009 -0400
@@ -13,7 +13,7 @@
 		<integer>5</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>9G55</string>
+	<string>9J61</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>
diff -r 9099dc0ec476 -r a08219246e38 Resources/da.lproj/GeneralPreferences.nib/keyedobjects.nib
Binary file Resources/da.lproj/GeneralPreferences.nib/keyedobjects.nib has changed
diff -r 9099dc0ec476 -r a08219246e38 Resources/de.lproj/GeneralPreferences.nib/classes.nib
--- a/Resources/de.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/de.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 11:11:21 2009 -0400
@@ -42,6 +42,14 @@
 			<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>
@@ -88,6 +96,22 @@
 			<string>NSResponder</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSMenuItem</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>configureMessageHistory</key>
@@ -115,6 +139,8 @@
 				<string>NSTextField</string>
 				<key>label_messagesTabs</key>
 				<string>NSTextField</string>
+				<key>label_shortcutRecorder</key>
+				<string>NSTextField</string>
 				<key>label_switchTabsWith</key>
 				<string>NSTextField</string>
 				<key>popUp_sendKeys</key>
@@ -146,6 +172,14 @@
 			<string>AIModularPane</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>changePreference</key>
@@ -188,11 +222,11 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
-			<string>AISmartStepper</string>
+			<string>NSPopUpButton</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
 			<key>SUPERCLASS</key>
-			<string>NSStepper</string>
+			<string>NSButton</string>
 		</dict>
 		<dict>
 			<key>CLASS</key>
@@ -209,6 +243,14 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
+			<string>NSPopUpButtonCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSMenuItemCell</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
 			<string>AILocalizationTextField</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
diff -r 9099dc0ec476 -r a08219246e38 Resources/de.lproj/GeneralPreferences.nib/info.nib
--- a/Resources/de.lproj/GeneralPreferences.nib/info.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/de.lproj/GeneralPreferences.nib/info.nib	Fri May 29 11:11:21 2009 -0400
@@ -13,7 +13,7 @@
 		<integer>5</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>9G55</string>
+	<string>9J61</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>
diff -r 9099dc0ec476 -r a08219246e38 Resources/de.lproj/GeneralPreferences.nib/keyedobjects.nib
Binary file Resources/de.lproj/GeneralPreferences.nib/keyedobjects.nib has changed
diff -r 9099dc0ec476 -r a08219246e38 Resources/el_GR.lproj/GeneralPreferences.nib/classes.nib
--- a/Resources/el_GR.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/el_GR.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 11:11:21 2009 -0400
@@ -42,6 +42,14 @@
 			<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>
@@ -88,6 +96,22 @@
 			<string>NSResponder</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSMenuItem</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>configureMessageHistory</key>
@@ -115,6 +139,8 @@
 				<string>NSTextField</string>
 				<key>label_messagesTabs</key>
 				<string>NSTextField</string>
+				<key>label_shortcutRecorder</key>
+				<string>NSTextField</string>
 				<key>label_switchTabsWith</key>
 				<string>NSTextField</string>
 				<key>popUp_sendKeys</key>
@@ -146,6 +172,14 @@
 			<string>AIModularPane</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>changePreference</key>
@@ -188,11 +222,11 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
-			<string>AISmartStepper</string>
+			<string>NSPopUpButton</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
 			<key>SUPERCLASS</key>
-			<string>NSStepper</string>
+			<string>NSButton</string>
 		</dict>
 		<dict>
 			<key>CLASS</key>
@@ -209,6 +243,14 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
+			<string>NSPopUpButtonCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSMenuItemCell</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
 			<string>AILocalizationTextField</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
diff -r 9099dc0ec476 -r a08219246e38 Resources/el_GR.lproj/GeneralPreferences.nib/info.nib
--- a/Resources/el_GR.lproj/GeneralPreferences.nib/info.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/el_GR.lproj/GeneralPreferences.nib/info.nib	Fri May 29 11:11:21 2009 -0400
@@ -13,7 +13,7 @@
 		<integer>5</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>9G55</string>
+	<string>9J61</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>
diff -r 9099dc0ec476 -r a08219246e38 Resources/el_GR.lproj/GeneralPreferences.nib/keyedobjects.nib
Binary file Resources/el_GR.lproj/GeneralPreferences.nib/keyedobjects.nib has changed
diff -r 9099dc0ec476 -r a08219246e38 Resources/en.lproj/GeneralPreferences.nib/classes.nib
--- a/Resources/en.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/en.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 11:11:21 2009 -0400
@@ -42,6 +42,14 @@
 			<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>
@@ -88,6 +96,22 @@
 			<string>NSResponder</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSMenuItem</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>configureMessageHistory</key>
@@ -115,6 +139,8 @@
 				<string>NSTextField</string>
 				<key>label_messagesTabs</key>
 				<string>NSTextField</string>
+				<key>label_shortcutRecorder</key>
+				<string>NSTextField</string>
 				<key>label_switchTabsWith</key>
 				<string>NSTextField</string>
 				<key>popUp_sendKeys</key>
@@ -146,6 +172,14 @@
 			<string>AIModularPane</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>changePreference</key>
@@ -188,11 +222,11 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
-			<string>AISmartStepper</string>
+			<string>NSPopUpButton</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
 			<key>SUPERCLASS</key>
-			<string>NSStepper</string>
+			<string>NSButton</string>
 		</dict>
 		<dict>
 			<key>CLASS</key>
@@ -209,6 +243,14 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
+			<string>NSPopUpButtonCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSMenuItemCell</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
 			<string>AILocalizationTextField</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
diff -r 9099dc0ec476 -r a08219246e38 Resources/en.lproj/GeneralPreferences.nib/info.nib
--- a/Resources/en.lproj/GeneralPreferences.nib/info.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/en.lproj/GeneralPreferences.nib/info.nib	Fri May 29 11:11:21 2009 -0400
@@ -13,7 +13,7 @@
 		<integer>5</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>9G55</string>
+	<string>9J61</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>
diff -r 9099dc0ec476 -r a08219246e38 Resources/en.lproj/GeneralPreferences.nib/keyedobjects.nib
Binary file Resources/en.lproj/GeneralPreferences.nib/keyedobjects.nib has changed
diff -r 9099dc0ec476 -r a08219246e38 Resources/en_GB.lproj/GeneralPreferences.nib/classes.nib
--- a/Resources/en_GB.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/en_GB.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 11:11:21 2009 -0400
@@ -42,6 +42,14 @@
 			<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>
@@ -88,6 +96,22 @@
 			<string>NSResponder</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSMenuItem</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>configureMessageHistory</key>
@@ -115,6 +139,8 @@
 				<string>NSTextField</string>
 				<key>label_messagesTabs</key>
 				<string>NSTextField</string>
+				<key>label_shortcutRecorder</key>
+				<string>NSTextField</string>
 				<key>label_switchTabsWith</key>
 				<string>NSTextField</string>
 				<key>popUp_sendKeys</key>
@@ -146,6 +172,14 @@
 			<string>AIModularPane</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>changePreference</key>
@@ -188,11 +222,11 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
-			<string>AISmartStepper</string>
+			<string>NSPopUpButton</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
 			<key>SUPERCLASS</key>
-			<string>NSStepper</string>
+			<string>NSButton</string>
 		</dict>
 		<dict>
 			<key>CLASS</key>
@@ -209,6 +243,14 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
+			<string>NSPopUpButtonCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSMenuItemCell</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
 			<string>AILocalizationTextField</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
diff -r 9099dc0ec476 -r a08219246e38 Resources/en_GB.lproj/GeneralPreferences.nib/info.nib
--- a/Resources/en_GB.lproj/GeneralPreferences.nib/info.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/en_GB.lproj/GeneralPreferences.nib/info.nib	Fri May 29 11:11:21 2009 -0400
@@ -13,7 +13,7 @@
 		<integer>5</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>9G55</string>
+	<string>9J61</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>
diff -r 9099dc0ec476 -r a08219246e38 Resources/en_GB.lproj/GeneralPreferences.nib/keyedobjects.nib
Binary file Resources/en_GB.lproj/GeneralPreferences.nib/keyedobjects.nib has changed
diff -r 9099dc0ec476 -r a08219246e38 Resources/es.lproj/GeneralPreferences.nib/classes.nib
--- a/Resources/es.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/es.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 11:11:21 2009 -0400
@@ -42,6 +42,14 @@
 			<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>
@@ -88,6 +96,22 @@
 			<string>NSResponder</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSMenuItem</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>configureMessageHistory</key>
@@ -115,6 +139,8 @@
 				<string>NSTextField</string>
 				<key>label_messagesTabs</key>
 				<string>NSTextField</string>
+				<key>label_shortcutRecorder</key>
+				<string>NSTextField</string>
 				<key>label_switchTabsWith</key>
 				<string>NSTextField</string>
 				<key>popUp_sendKeys</key>
@@ -146,6 +172,14 @@
 			<string>AIModularPane</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>changePreference</key>
@@ -188,11 +222,11 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
-			<string>AISmartStepper</string>
+			<string>NSPopUpButton</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
 			<key>SUPERCLASS</key>
-			<string>NSStepper</string>
+			<string>NSButton</string>
 		</dict>
 		<dict>
 			<key>CLASS</key>
@@ -209,6 +243,14 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
+			<string>NSPopUpButtonCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSMenuItemCell</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
 			<string>AILocalizationTextField</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
diff -r 9099dc0ec476 -r a08219246e38 Resources/es.lproj/GeneralPreferences.nib/info.nib
--- a/Resources/es.lproj/GeneralPreferences.nib/info.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/es.lproj/GeneralPreferences.nib/info.nib	Fri May 29 11:11:21 2009 -0400
@@ -13,7 +13,7 @@
 		<integer>5</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>9G55</string>
+	<string>9J61</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>
diff -r 9099dc0ec476 -r a08219246e38 Resources/es.lproj/GeneralPreferences.nib/keyedobjects.nib
Binary file Resources/es.lproj/GeneralPreferences.nib/keyedobjects.nib has changed
diff -r 9099dc0ec476 -r a08219246e38 Resources/fi.lproj/GeneralPreferences.nib/classes.nib
--- a/Resources/fi.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 01:07:08 2009 -0400
+++ b/Resources/fi.lproj/GeneralPreferences.nib/classes.nib	Fri May 29 11:11:21 2009 -0400
@@ -42,6 +42,14 @@
 			<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>
@@ -88,6 +96,22 @@
 			<string>NSResponder</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSMenuItem</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>configureMessageHistory</key>
@@ -115,6 +139,8 @@
 				<string>NSTextField</string>
 				<key>label_messagesTabs</key>
 				<string>NSTextField</string>
+				<key>label_shortcutRecorder</key>
+				<string>NSTextField</string>
 				<key>label_switchTabsWith</key>
 				<string>NSTextField</string>
 				<key>popUp_sendKeys</key>
@@ -146,6 +172,14 @@
 			<string>AIModularPane</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>NSCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>changePreference</key>
@@ -188,11 +222,11 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
-			<string>AISmartStepper</string>
+			<string>NSPopUpButton</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
 			<key>SUPERCLASS</key>
-			<string>NSStepper</string>
+			<string>NSButton</string>
 		</dict>
 		<dict>
 			<key>CLASS</key>
@@ -209,6 +243,14 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
+			<string>NSPopUpButtonCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSMenuItemCell</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
 			<string>AILocalizationTextField</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
diff -r 9099dc0ec476 -r a08219246e38 Resources/fi.lproj/GeneralPreferences.nib/info.nib


More information about the commits mailing list