adium 4057:546c8a28502f: Selecting next(previous) chat now corre...
commits at adium.im
commits at adium.im
Sun Jul 17 16:57:22 UTC 2011
details: http://hg.adium.im/adium/rev/546c8a28502f
revision: 4057:546c8a28502f
branch: (none)
author: Patrick Steinhardt <steinhardt.p at me.com>
date: Sun Jul 17 18:57:10 2011 +0200
Selecting next(previous) chat now corresponds to Safaris keybinding Ctrl(+Shift)+Tab. The preference regarding this shortcut has been removed. Fixes #15221.
diffs (truncated from 2716 to 1000 lines):
diff -r 859e25a23dba -r 546c8a28502f ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Sun Jul 17 13:21:43 2011 +0200
+++ b/ChangeLogs/Changes.txt Sun Jul 17 18:57:10 2011 +0200
@@ -45,6 +45,7 @@
Chat Window
* Rounded user icon in the chat window toolbar. (#3757)
+ * Changing tabs now corresponds to Safari with Ctrl+Tab. Preference regarding this shortcut has been removed. (#15221)
Messaging
* Added a "Reopen Closed Tab" menu item to the File menu that will restore the most recently closed tab. (#12537)
diff -r 859e25a23dba -r 546c8a28502f Plugins/General Preferences/ESGeneralPreferences.h
--- a/Plugins/General Preferences/ESGeneralPreferences.h Sun Jul 17 13:21:43 2011 +0200
+++ b/Plugins/General Preferences/ESGeneralPreferences.h Sun Jul 17 18:57:10 2011 +0200
@@ -25,7 +25,6 @@
IBOutlet NSButton *checkBox_updatesProfileInfo;
IBOutlet NSButton *checkBox_updatesIncludeBetas;
- IBOutlet NSPopUpButton *popUp_tabKeys;
IBOutlet NSPopUpButton *popUp_sendKeys;
IBOutlet NSPopUpButton *popUp_tabPositionMenu;
diff -r 859e25a23dba -r 546c8a28502f Plugins/General Preferences/ESGeneralPreferences.m
--- a/Plugins/General Preferences/ESGeneralPreferences.m Sun Jul 17 13:21:43 2011 +0200
+++ b/Plugins/General Preferences/ESGeneralPreferences.m Sun Jul 17 18:57:10 2011 +0200
@@ -37,7 +37,6 @@
#define KEY_TABBAR_POSITION @"Tab Bar Position"
@interface ESGeneralPreferences ()
-- (NSMenu *)tabChangeKeysMenu;
- (NSMenu *)sendKeysMenu;
- (NSMenu *)tabPositionMenu;
- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
@@ -90,11 +89,6 @@
[checkBox_updatesProfileInfo setState:[[NSUserDefaults standardUserDefaults] boolForKey:@"SUSendProfileInfo"]];
[checkBox_updatesIncludeBetas setState:[[NSUserDefaults standardUserDefaults] boolForKey:@"AIAlwaysUpdateToBetas"]];
- //Chat Cycling
- [popUp_tabKeys setMenu:[self tabChangeKeysMenu]];
- [popUp_tabKeys selectItemWithTag:[[adium.preferenceController preferenceForKey:KEY_TAB_SWITCH_KEYS
- group:PREF_GROUP_CHAT_CYCLING] intValue]];
-
//General
sendOnEnter = [[adium.preferenceController preferenceForKey:SEND_ON_ENTER
group:PREF_GROUP_GENERAL] boolValue];
@@ -150,14 +144,7 @@
//Called in response to all preference controls, applies new settings
- (IBAction)changePreference:(id)sender
{
- if (sender == popUp_tabKeys) {
- AITabKeys keySelect = (AITabKeys)[[sender selectedItem] tag];
-
- [adium.preferenceController setPreference:[NSNumber numberWithInt:keySelect]
- forKey:KEY_TAB_SWITCH_KEYS
- group:PREF_GROUP_CHAT_CYCLING];
-
- } else if (sender == popUp_sendKeys) {
+ if (sender == popUp_sendKeys) {
AISendKeys keySelect = (AISendKeys)[[sender selectedItem] tag];
BOOL sendOnEnter = (keySelect == AISendOnEnter || keySelect == AISendOnBoth);
BOOL sendOnReturn = (keySelect == AISendOnReturn || keySelect == AISendOnBoth);
@@ -191,52 +178,6 @@
#endif
}
-/*!
- * @brief Construct our menu by hand for easy localization
- */
-- (NSMenu *)tabChangeKeysMenu
-{
- NSMenu *menu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
-#define PLACE_OF_INTEREST_SIGN "\u2318"
-#define LEFTWARDS_ARROW "\u2190"
-#define RIGHTWARDS_ARROW "\u2192"
-#define SHIFT_ARROW "\u21E7"
-#define OPTION_KEY "\u2325"
-
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Arrows (%@ and %@)","Directional arrow keys word"), [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW], [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
- target:nil
- action:nil
- keyEquivalent:@""
- tag:AISwitchArrows];
-
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Shift + Arrows (%@ and %@)","Shift key word + Directional arrow keys word"), [NSString stringWithUTF8String:SHIFT_ARROW PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW], [NSString stringWithUTF8String:SHIFT_ARROW PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
- target:nil
- action:nil
- keyEquivalent:@""
- tag:AISwitchShiftArrows];
-
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Option + Arrows (%@ and %@)","Option key word + Directional arrow keys word"), [NSString stringWithUTF8String:OPTION_KEY PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW], [NSString stringWithUTF8String:OPTION_KEY PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
- target:nil
- action:nil
- keyEquivalent:@""
- tag:AIOptArrows];
-
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Brackets (%@ and %@)","Word for [ and ] keys"), [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "["], [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "]"]]
- target:nil
- action:nil
- keyEquivalent:@""
- tag:AIBrackets];
-
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Curly braces (%@ and %@)","Word for { and } keys"), [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "{"], [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "}"]]
- target:nil
- action:nil
- keyEquivalent:@""
- tag:AIBraces];
-
-
- return [menu autorelease];
-}
-
- (BOOL)shortcutRecorder:(SRRecorderControl *)aRecorder isKeyCode:(signed short)keyCode andFlagsTaken:(NSUInteger)flags reason:(NSString **)aReason
{
return NO;
diff -r 859e25a23dba -r 546c8a28502f Plugins/General Preferences/ESGeneralPreferencesPlugin.h
--- a/Plugins/General Preferences/ESGeneralPreferencesPlugin.h Sun Jul 17 13:21:43 2011 +0200
+++ b/Plugins/General Preferences/ESGeneralPreferencesPlugin.h Sun Jul 17 18:57:10 2011 +0200
@@ -31,9 +31,6 @@
AISendOnBoth
} AISendKeys;
-#define PREF_GROUP_CHAT_CYCLING @"Chat Cycling"
-#define KEY_TAB_SWITCH_KEYS @"Tab Switching Keys"
-
#define SEND_ON_RETURN @"Send On Return"
#define SEND_ON_ENTER @"Send On Enter"
diff -r 859e25a23dba -r 546c8a28502f Plugins/General Preferences/ESGeneralPreferencesPlugin.m
--- a/Plugins/General Preferences/ESGeneralPreferencesPlugin.m Sun Jul 17 13:21:43 2011 +0200
+++ b/Plugins/General Preferences/ESGeneralPreferencesPlugin.m Sun Jul 17 18:57:10 2011 +0200
@@ -19,7 +19,6 @@
- Logging enable/disable
- Message sending key (enter, return)
- Message tabs (create in tabs, organize tabs by group, sort tabs)
- - Tab switching keys
- Sound:
- Volume
- Status icon packs
diff -r 859e25a23dba -r 546c8a28502f Resources/en.lproj/GeneralPreferences.nib/designable.nib
--- a/Resources/en.lproj/GeneralPreferences.nib/designable.nib Sun Jul 17 13:21:43 2011 +0200
+++ b/Resources/en.lproj/GeneralPreferences.nib/designable.nib Sun Jul 17 18:57:10 2011 +0200
@@ -2,17 +2,30 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10J3250</string>
- <string key="IBDocument.InterfaceBuilderVersion">851</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.SystemVersion">10K540</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1305</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">1305</string>
</object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="5"/>
+ <string>NSUserDefaultsController</string>
+ <string>NSNumberFormatter</string>
+ <string>NSPopUpButton</string>
+ <string>NSButton</string>
+ <string>NSMenu</string>
+ <string>NSTextFieldCell</string>
+ <string>NSButtonCell</string>
+ <string>NSMenuItem</string>
+ <string>NSCustomObject</string>
+ <string>NSCustomView</string>
+ <string>NSPopUpButtonCell</string>
+ <string>NSStepperCell</string>
+ <string>NSTextField</string>
+ <string>NSStepper</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -41,15 +54,17 @@
<object class="NSCustomView" id="727659852">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">258</int>
- <string key="NSFrame">{{180, 40}, {223, 22}}</string>
+ <string key="NSFrame">{{180, 56}, {223, 22}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSTextField" id="666833680">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 422}, {158, 17}}</string>
+ <string key="NSFrame">{{17, 404}, {158, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="554074539">
<int key="NSCellFlags">67239424</int>
@@ -84,8 +99,9 @@
<object class="NSButton" id="866289369">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{178, 421}, {345, 18}}</string>
+ <string key="NSFrame">{{178, 403}, {345, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="64001217">
<int key="NSCellFlags">67239424</int>
@@ -104,81 +120,12 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSTextField" id="685592821">
- <reference key="NSNextResponder" ref="974184333"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 186}, {158, 17}}</string>
- <reference key="NSSuperview" ref="974184333"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="604695771">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Switch tabs with:</string>
- <reference key="NSSupport" ref="679211629"/>
- <reference key="NSControlView" ref="685592821"/>
- <reference key="NSBackgroundColor" ref="170402507"/>
- <reference key="NSTextColor" ref="927266986"/>
- </object>
- </object>
- <object class="NSPopUpButton" id="550877228">
- <reference key="NSNextResponder" ref="974184333"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{177, 180}, {283, 26}}</string>
- <reference key="NSSuperview" ref="974184333"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="346932475">
- <int key="NSCellFlags">-2076049856</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="679211629"/>
- <reference key="NSControlView" ref="550877228"/>
- <int key="NSButtonFlags">109199615</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="679211629"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="669365429">
- <reference key="NSMenu" ref="408552163"/>
- <string type="base64-UTF8" key="NSTitle">IA</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <object class="NSCustomResource" key="NSOnImage" id="921332473">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage" id="208335321">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="346932475"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="408552163">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="669365429"/>
- </object>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- </object>
<object class="NSTextField" id="509204869">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 149}, {158, 17}}</string>
+ <string key="NSFrame">{{17, 165}, {158, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="220626710">
<int key="NSCellFlags">67239424</int>
@@ -193,8 +140,9 @@
<object class="NSButton" id="968411985">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{178, 148}, {345, 18}}</string>
+ <string key="NSFrame">{{178, 164}, {345, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="96418576">
<int key="NSCellFlags">67239424</int>
@@ -214,8 +162,9 @@
<object class="NSTextField" id="765263822">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 222}, {158, 17}}</string>
+ <string key="NSFrame">{{17, 204}, {158, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1048718565">
<int key="NSCellFlags">67239424</int>
@@ -230,8 +179,9 @@
<object class="NSPopUpButton" id="317131823">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{177, 216}, {283, 26}}</string>
+ <string key="NSFrame">{{177, 198}, {283, 26}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="239510870">
<int key="NSCellFlags">-2076049856</int>
@@ -254,8 +204,14 @@
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
- <reference key="NSOnImage" ref="921332473"/>
- <reference key="NSMixedImage" ref="208335321"/>
+ <object class="NSCustomResource" key="NSOnImage" id="333738638">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuCheckmark</string>
+ </object>
+ <object class="NSCustomResource" key="NSMixedImage" id="697894495">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuMixedState</string>
+ </object>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">2</int>
<reference key="NSTarget" ref="239510870"/>
@@ -279,8 +235,9 @@
<object class="NSTextField" id="457706126">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 45}, {158, 17}}</string>
+ <string key="NSFrame">{{17, 61}, {158, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="305595294">
<int key="NSCellFlags">67239424</int>
@@ -295,8 +252,9 @@
<object class="NSTextField" id="395798763">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{177, 4}, {347, 28}}</string>
+ <string key="NSFrame">{{177, 20}, {347, 28}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="169795752">
<int key="NSCellFlags">67239424</int>
@@ -316,8 +274,9 @@
<object class="NSButton" id="147301537">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{379, 337}, {108, 32}}</string>
+ <string key="NSFrame">{{379, 319}, {108, 32}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="23840310">
<int key="NSCellFlags">67239424</int>
@@ -336,8 +295,9 @@
<object class="NSButton" id="680415872">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{195, 371}, {328, 18}}</string>
+ <string key="NSFrame">{{195, 353}, {328, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="468254486">
<int key="NSCellFlags">67239424</int>
@@ -357,8 +317,9 @@
<object class="NSButton" id="958453719">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{195, 346}, {184, 18}}</string>
+ <string key="NSFrame">{{195, 328}, {184, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="482404893">
<int key="NSCellFlags">67239424</int>
@@ -378,8 +339,9 @@
<object class="NSButton" id="1028402368">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{195, 397}, {55, 18}}</string>
+ <string key="NSFrame">{{195, 379}, {55, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="685173519">
<int key="NSCellFlags">67239424</int>
@@ -399,8 +361,9 @@
<object class="NSButton" id="715645352">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{178, 297}, {345, 18}}</string>
+ <string key="NSFrame">{{178, 279}, {345, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="839881608">
<int key="NSCellFlags">67239424</int>
@@ -420,8 +383,9 @@
<object class="NSButton" id="9325956">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{195, 250}, {328, 18}}</string>
+ <string key="NSFrame">{{195, 232}, {328, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="54678259">
<int key="NSCellFlags">67239424</int>
@@ -441,8 +405,9 @@
<object class="NSPopUpButton" id="838555988">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{315, 267}, {147, 26}}</string>
+ <string key="NSFrame">{{315, 249}, {147, 26}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="156626493">
<int key="NSCellFlags">-2076049856</int>
@@ -465,8 +430,8 @@
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
- <reference key="NSOnImage" ref="921332473"/>
- <reference key="NSMixedImage" ref="208335321"/>
+ <reference key="NSOnImage" ref="333738638"/>
+ <reference key="NSMixedImage" ref="697894495"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="156626493"/>
</object>
@@ -484,8 +449,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="921332473"/>
- <reference key="NSMixedImage" ref="208335321"/>
+ <reference key="NSOnImage" ref="333738638"/>
+ <reference key="NSMixedImage" ref="697894495"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">1</int>
<reference key="NSTarget" ref="156626493"/>
@@ -496,8 +461,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="921332473"/>
- <reference key="NSMixedImage" ref="208335321"/>
+ <reference key="NSOnImage" ref="333738638"/>
+ <reference key="NSMixedImage" ref="697894495"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">2</int>
<reference key="NSTarget" ref="156626493"/>
@@ -508,8 +473,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="921332473"/>
- <reference key="NSMixedImage" ref="208335321"/>
+ <reference key="NSOnImage" ref="333738638"/>
+ <reference key="NSMixedImage" ref="697894495"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">3</int>
<reference key="NSTarget" ref="156626493"/>
@@ -525,8 +490,9 @@
<object class="NSTextField" id="209177718">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{196, 274}, {117, 17}}</string>
+ <string key="NSFrame">{{196, 256}, {117, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1046230780">
<int key="NSCellFlags">67239424</int>
@@ -541,8 +507,9 @@
<object class="NSTextField" id="1022912864">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 121}, {158, 17}}</string>
+ <string key="NSFrame">{{17, 137}, {158, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="637601550">
<int key="NSCellFlags">67239424</int>
@@ -557,8 +524,9 @@
<object class="NSButton" id="55874791">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{178, 120}, {345, 18}}</string>
+ <string key="NSFrame">{{178, 136}, {345, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="399560084">
<int key="NSCellFlags">67239424</int>
@@ -578,8 +546,9 @@
<object class="NSButton" id="379579225">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{195, 97}, {328, 18}}</string>
+ <string key="NSFrame">{{195, 113}, {328, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="122113635">
<int key="NSCellFlags">67239424</int>
@@ -599,8 +568,9 @@
<object class="NSButton" id="876436028">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{195, 75}, {328, 18}}</string>
+ <string key="NSFrame">{{195, 91}, {328, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="839973176">
<int key="NSCellFlags">67239424</int>
@@ -620,8 +590,9 @@
<object class="NSTextField" id="606751019">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{254, 395}, {32, 22}}</string>
+ <string key="NSFrame">{{254, 377}, {32, 22}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="623150519">
<int key="NSCellFlags">-1804468671</int>
@@ -650,8 +621,9 @@
<object class="NSStepper" id="149624680">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{286, 392}, {19, 28}}</string>
+ <string key="NSFrame">{{286, 374}, {19, 28}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="166405478">
<int key="NSCellFlags">917024</int>
@@ -667,8 +639,9 @@
<object class="NSTextField" id="202374623">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{303, 398}, {221, 17}}</string>
+ <string key="NSFrame">{{303, 380}, {221, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="9023852">
<int key="NSCellFlags">67239424</int>
@@ -683,8 +656,9 @@
<object class="NSButton" id="223591434">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{178, 321}, {345, 18}}</string>
+ <string key="NSFrame">{{178, 303}, {345, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="538262951">
<int key="NSCellFlags">67239424</int>
@@ -702,8 +676,9 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{541, 459}</string>
+ <string key="NSFrameSize">{541, 441}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
@@ -731,14 +706,12 @@
<boolean value="YES"/>
<object class="NSAttributedString" id="988854257">
<string key="NSString">0</string>
- <object class="NSDictionary" key="NSAttributes" id="361423666">
+ <object class="NSDictionary" key="NSAttributes" id="915947900">
<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>
+ <reference key="dict.values" ref="0"/>
</object>
</object>
<string>.</string>
@@ -755,19 +728,15 @@
</object>
<string>-0</string>
<string>0</string>
- <object class="NSDictionary" id="242794499">
+ <object class="NSDictionary" id="415289445">
<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>
<object class="NSDictionary">
<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>
<boolean value="NO"/>
<string>0</string>
@@ -776,14 +745,14 @@
<string key="NS.positiveformat">0</string>
<string key="NS.negativeformat">-0</string>
<nil key="NS.positiveattrs"/>
- <reference key="NS.negativeattrs" ref="242794499"/>
+ <reference key="NS.negativeattrs" ref="415289445"/>
<reference key="NS.zero" ref="988854257"/>
<object class="NSAttributedString" key="NS.nil">
<string key="NSString"/>
</object>
<object class="NSAttributedString" key="NS.nan">
<string key="NSString">NaN</string>
- <reference key="NSAttributes" ref="361423666"/>
+ <reference key="NSAttributes" ref="915947900"/>
</object>
<reference key="NS.min" ref="653808996"/>
<real value="400" key="NS.max"/>
@@ -826,22 +795,6 @@
<int key="connectionID">38</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">popUp_tabKeys</string>
- <reference key="source" ref="836442907"/>
- <reference key="destination" ref="550877228"/>
- </object>
- <int key="connectionID">40</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">changePreference:</string>
- <reference key="source" ref="836442907"/>
- <reference key="destination" ref="550877228"/>
- </object>
- <int key="connectionID">44</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">changePreference:</string>
<reference key="source" ref="836442907"/>
@@ -851,14 +804,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">label_switchTabsWith</string>
- <reference key="source" ref="836442907"/>
- <reference key="destination" ref="685592821"/>
- </object>
- <int key="connectionID">110</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">label_logging</string>
<reference key="source" ref="836442907"/>
<reference key="destination" ref="666833680"/>
@@ -1426,8 +1371,6 @@
<reference ref="715645352"/>
<reference ref="666833680"/>
<reference ref="866289369"/>
- <reference ref="685592821"/>
- <reference ref="550877228"/>
<reference ref="968411985"/>
<reference ref="509204869"/>
<reference ref="765263822"/>
@@ -1490,24 +1433,6 @@
<reference key="parent" ref="974184333"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">15</int>
- <reference key="object" ref="685592821"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="604695771"/>
- </object>
- <reference key="parent" ref="974184333"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">19</int>
- <reference key="object" ref="550877228"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="346932475"/>
- </object>
- <reference key="parent" ref="974184333"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">103</int>
<reference key="object" ref="968411985"/>
<object class="NSMutableArray" key="children">
@@ -1526,24 +1451,6 @@
<reference key="parent" ref="974184333"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">123</int>
- <reference key="object" ref="765263822"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1048718565"/>
- </object>
- <reference key="parent" ref="974184333"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">124</int>
- <reference key="object" ref="317131823"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="239510870"/>
- </object>
- <reference key="parent" ref="974184333"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">160</int>
<reference key="object" ref="457706126"/>
<object class="NSMutableArray" key="children">
@@ -1687,20 +1594,6 @@
<reference key="parent" ref="866289369"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">344</int>
- <reference key="object" ref="604695771"/>
- <reference key="parent" ref="685592821"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">345</int>
- <reference key="object" ref="346932475"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="408552163"/>
- </object>
- <reference key="parent" ref="550877228"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">346</int>
<reference key="object" ref="96418576"/>
<reference key="parent" ref="968411985"/>
@@ -1711,20 +1604,6 @@
<reference key="parent" ref="509204869"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">348</int>
- <reference key="object" ref="1048718565"/>
- <reference key="parent" ref="765263822"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">349</int>
- <reference key="object" ref="239510870"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="411015497"/>
- </object>
- <reference key="parent" ref="317131823"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">350</int>
<reference key="object" ref="305595294"/>
<reference key="parent" ref="457706126"/>
@@ -1794,34 +1673,6 @@
<reference key="parent" ref="223591434"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">18</int>
- <reference key="object" ref="408552163"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="669365429"/>
- </object>
- <reference key="parent" ref="346932475"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">16</int>
- <reference key="object" ref="669365429"/>
- <reference key="parent" ref="408552163"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">125</int>
- <reference key="object" ref="411015497"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="258787045"/>
- </object>
- <reference key="parent" ref="239510870"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">128</int>
- <reference key="object" ref="258787045"/>
- <reference key="parent" ref="411015497"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">189</int>
<reference key="object" ref="616087860"/>
<object class="NSMutableArray" key="children">
@@ -1905,6 +1756,52 @@
<reference key="object" ref="727659852"/>
<reference key="parent" ref="974184333"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">124</int>
+ <reference key="object" ref="317131823"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="239510870"/>
+ </object>
+ <reference key="parent" ref="974184333"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">349</int>
+ <reference key="object" ref="239510870"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="411015497"/>
+ </object>
+ <reference key="parent" ref="317131823"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">125</int>
+ <reference key="object" ref="411015497"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="258787045"/>
+ </object>
+ <reference key="parent" ref="239510870"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">128</int>
+ <reference key="object" ref="258787045"/>
+ <reference key="parent" ref="411015497"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">123</int>
+ <reference key="object" ref="765263822"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="1048718565"/>
+ </object>
+ <reference key="parent" ref="974184333"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">348</int>
+ <reference key="object" ref="1048718565"/>
+ <reference key="parent" ref="765263822"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1934,11 +1831,6 @@
<string>125.ImportedFromIB2</string>
<string>128.IBPluginDependency</string>
<string>128.ImportedFromIB2</string>
- <string>15.CustomClassName</string>
- <string>15.IBPluginDependency</string>
- <string>15.ImportedFromIB2</string>
- <string>16.IBPluginDependency</string>
- <string>16.ImportedFromIB2</string>
<string>160.IBPluginDependency</string>
<string>160.ImportedFromIB2</string>
<string>161.CustomClassName</string>
@@ -1949,14 +1841,10 @@
<string>177.IBPluginDependency</string>
<string>177.IBViewBoundsToFrameTransform</string>
<string>177.ImportedFromIB2</string>
- <string>18.IBPluginDependency</string>
- <string>18.ImportedFromIB2</string>
<string>188.IBPluginDependency</string>
<string>188.ImportedFromIB2</string>
<string>189.IBPluginDependency</string>
<string>189.ImportedFromIB2</string>
- <string>19.IBPluginDependency</string>
- <string>19.ImportedFromIB2</string>
<string>190.IBPluginDependency</string>
<string>190.ImportedFromIB2</string>
<string>191.IBPluginDependency</string>
@@ -2040,11 +1928,6 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>AILocalizationTextField</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>AILocalizationTextField</string>
@@ -2073,10 +1956,6 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>AILocalizationTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
@@ -2141,17 +2020,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">404</int>
@@ -2208,17 +2083,9 @@
</object>
</object>
</object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1051298428">
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">AILocalizationButton</string>
- <string key="superclassName">NSButton</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
+ <string key="minorKey">./Classes/AILocalizationButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -2270,17 +2137,9 @@
</object>
</object>
</object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="752452961">
+ <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">AILocalizationTextField</string>
- <string key="superclassName">NSTextField</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
+ <string key="minorKey">./Classes/AILocalizationTextField.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -2298,48 +2157,19 @@
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>plugin</string>
- <string>view</string>
- </object>
More information about the commits
mailing list