adium 4082:1d46ca9df856: Backout of 4063:b2f504303835 ("Added Cm...
commits at adium.im
commits at adium.im
Thu Jul 28 18:41:51 UTC 2011
details: http://hg.adium.im/adium/rev/1d46ca9df856
revision: 4082:1d46ca9df856
branch: (none)
author: Patrick Steinhardt <steinhardt.p at me.com>
date: Thu Jul 28 19:17:55 2011 +0200
Backout of 4063:b2f504303835 ("Added Cmd-Shift-Arrows and Cmd-Shift-Brackets to cycle tabs."). Refs #15221, refs #15344.
Subject: adium 4083:97b1da37d5c7: Backout of 4057:546c8a28502f ("Selecting next(previous) chat now corresponds to Safris keybinding Ctrl(+Shift)+Tab. The preference regarding this shortcut has been removed."). Refs #15221, refs #15344.
details: http://hg.adium.im/adium/rev/97b1da37d5c7
revision: 4083:97b1da37d5c7
branch: (none)
author: Patrick Steinhardt <steinhardt.p at me.com>
date: Thu Jul 28 19:20:35 2011 +0200
Backout of 4057:546c8a28502f ("Selecting next(previous) chat now corresponds to Safris keybinding Ctrl(+Shift)+Tab. The preference regarding this shortcut has been removed."). Refs #15221, refs #15344.
Subject: adium 4084:295cfdd71c39: Added the Ctrl(+Shift)+Tab shortcut for Next(Previous) Chat. Fixes #15221.
details: http://hg.adium.im/adium/rev/295cfdd71c39
revision: 4084:295cfdd71c39
branch: (none)
author: Patrick Steinhardt <steinhardt.p at me.com>
date: Thu Jul 28 20:40:39 2011 +0200
Added the Ctrl(+Shift)+Tab shortcut for Next(Previous) Chat. Fixes #15221.
diffs (truncated from 2785 to 1000 lines):
diff -r 2494adc0d5f9 -r 295cfdd71c39 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Wed Jul 27 22:36:07 2011 +0300
+++ b/ChangeLogs/Changes.txt Thu Jul 28 20:40:39 2011 +0200
@@ -46,8 +46,6 @@
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)
- * Selecting next/previous chat now corresponds to Safaris keybinding Ctrl(+Shift)+Tab. The 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 2494adc0d5f9 -r 295cfdd71c39 Plugins/General Preferences/ESGeneralPreferences.h
--- a/Plugins/General Preferences/ESGeneralPreferences.h Wed Jul 27 22:36:07 2011 +0300
+++ b/Plugins/General Preferences/ESGeneralPreferences.h Thu Jul 28 20:40:39 2011 +0200
@@ -25,6 +25,7 @@
IBOutlet NSButton *checkBox_updatesProfileInfo;
IBOutlet NSButton *checkBox_updatesIncludeBetas;
+ IBOutlet NSPopUpButton *popUp_tabKeys;
IBOutlet NSPopUpButton *popUp_sendKeys;
IBOutlet NSPopUpButton *popUp_tabPositionMenu;
diff -r 2494adc0d5f9 -r 295cfdd71c39 Plugins/General Preferences/ESGeneralPreferences.m
--- a/Plugins/General Preferences/ESGeneralPreferences.m Wed Jul 27 22:36:07 2011 +0300
+++ b/Plugins/General Preferences/ESGeneralPreferences.m Thu Jul 28 20:40:39 2011 +0200
@@ -37,6 +37,7 @@
#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;
@@ -89,6 +90,11 @@
[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];
@@ -144,7 +150,14 @@
//Called in response to all preference controls, applies new settings
- (IBAction)changePreference:(id)sender
{
- if (sender == popUp_sendKeys) {
+ 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) {
AISendKeys keySelect = (AISendKeys)[[sender selectedItem] tag];
BOOL sendOnEnter = (keySelect == AISendOnEnter || keySelect == AISendOnBoth);
BOOL sendOnReturn = (keySelect == AISendOnReturn || keySelect == AISendOnBoth);
@@ -178,6 +191,70 @@
#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"
+#define TAB_KEY "\u21E5"
+
+ [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Ctrl + Tab (%@ and %@)","Ctrl/Ctrl+Shift + Tab key word"),
+ [NSString stringWithUTF8String:"^" TAB_KEY],
+ [NSString stringWithUTF8String:"^" SHIFT_ARROW TAB_KEY]]
+ target:nil
+ action:nil
+ keyEquivalent:@""
+ tag:AICtrlTab];
+
+ [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 2494adc0d5f9 -r 295cfdd71c39 Plugins/General Preferences/ESGeneralPreferencesPlugin.h
--- a/Plugins/General Preferences/ESGeneralPreferencesPlugin.h Wed Jul 27 22:36:07 2011 +0300
+++ b/Plugins/General Preferences/ESGeneralPreferencesPlugin.h Thu Jul 28 20:40:39 2011 +0200
@@ -22,7 +22,8 @@
AISwitchShiftArrows,
AIBrackets,
AIBraces,
- AIOptArrows
+ AIOptArrows,
+ AICtrlTab
} AITabKeys;
typedef enum {
@@ -31,6 +32,9 @@
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 2494adc0d5f9 -r 295cfdd71c39 Plugins/General Preferences/ESGeneralPreferencesPlugin.m
--- a/Plugins/General Preferences/ESGeneralPreferencesPlugin.m Wed Jul 27 22:36:07 2011 +0300
+++ b/Plugins/General Preferences/ESGeneralPreferencesPlugin.m Thu Jul 28 20:40:39 2011 +0200
@@ -19,6 +19,7 @@
- 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 2494adc0d5f9 -r 295cfdd71c39 Resources/en.lproj/GeneralPreferences.nib/designable.nib
--- a/Resources/en.lproj/GeneralPreferences.nib/designable.nib Wed Jul 27 22:36:07 2011 +0300
+++ b/Resources/en.lproj/GeneralPreferences.nib/designable.nib Thu Jul 28 20:40:39 2011 +0200
@@ -2,30 +2,17 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10K540</string>
- <string key="IBDocument.InterfaceBuilderVersion">1305</string>
- <string key="IBDocument.AppKitVersion">1038.36</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">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">1305</string>
+ <string key="NS.object.0">851</string>
</object>
- <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <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>
+ <integer value="5"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -54,17 +41,15 @@
<object class="NSCustomView" id="727659852">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">258</int>
- <string key="NSFrame">{{180, 56}, {223, 22}}</string>
+ <string key="NSFrame">{{180, 40}, {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, 404}, {158, 17}}</string>
+ <string key="NSFrame">{{17, 422}, {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>
@@ -99,9 +84,8 @@
<object class="NSButton" id="866289369">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{178, 403}, {345, 18}}</string>
+ <string key="NSFrame">{{178, 421}, {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>
@@ -120,12 +104,81 @@
<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, 165}, {158, 17}}</string>
+ <string key="NSFrame">{{17, 149}, {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>
@@ -140,9 +193,8 @@
<object class="NSButton" id="968411985">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{178, 164}, {345, 18}}</string>
+ <string key="NSFrame">{{178, 148}, {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>
@@ -162,9 +214,8 @@
<object class="NSTextField" id="765263822">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 204}, {158, 17}}</string>
+ <string key="NSFrame">{{17, 222}, {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>
@@ -179,9 +230,8 @@
<object class="NSPopUpButton" id="317131823">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{177, 198}, {283, 26}}</string>
+ <string key="NSFrame">{{177, 216}, {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>
@@ -204,14 +254,8 @@
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
- <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>
+ <reference key="NSOnImage" ref="921332473"/>
+ <reference key="NSMixedImage" ref="208335321"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">2</int>
<reference key="NSTarget" ref="239510870"/>
@@ -235,9 +279,8 @@
<object class="NSTextField" id="457706126">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 61}, {158, 17}}</string>
+ <string key="NSFrame">{{17, 45}, {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>
@@ -252,9 +295,8 @@
<object class="NSTextField" id="395798763">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{177, 20}, {347, 28}}</string>
+ <string key="NSFrame">{{177, 4}, {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>
@@ -274,9 +316,8 @@
<object class="NSButton" id="147301537">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{379, 319}, {108, 32}}</string>
+ <string key="NSFrame">{{379, 337}, {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>
@@ -295,9 +336,8 @@
<object class="NSButton" id="680415872">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{195, 353}, {328, 18}}</string>
+ <string key="NSFrame">{{195, 371}, {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>
@@ -317,9 +357,8 @@
<object class="NSButton" id="958453719">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{195, 328}, {184, 18}}</string>
+ <string key="NSFrame">{{195, 346}, {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>
@@ -339,9 +378,8 @@
<object class="NSButton" id="1028402368">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{195, 379}, {55, 18}}</string>
+ <string key="NSFrame">{{195, 397}, {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>
@@ -361,9 +399,8 @@
<object class="NSButton" id="715645352">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{178, 279}, {345, 18}}</string>
+ <string key="NSFrame">{{178, 297}, {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>
@@ -383,9 +420,8 @@
<object class="NSButton" id="9325956">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{195, 232}, {328, 18}}</string>
+ <string key="NSFrame">{{195, 250}, {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>
@@ -405,9 +441,8 @@
<object class="NSPopUpButton" id="838555988">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{315, 249}, {147, 26}}</string>
+ <string key="NSFrame">{{315, 267}, {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>
@@ -430,8 +465,8 @@
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
- <reference key="NSOnImage" ref="333738638"/>
- <reference key="NSMixedImage" ref="697894495"/>
+ <reference key="NSOnImage" ref="921332473"/>
+ <reference key="NSMixedImage" ref="208335321"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="156626493"/>
</object>
@@ -449,8 +484,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="333738638"/>
- <reference key="NSMixedImage" ref="697894495"/>
+ <reference key="NSOnImage" ref="921332473"/>
+ <reference key="NSMixedImage" ref="208335321"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">1</int>
<reference key="NSTarget" ref="156626493"/>
@@ -461,8 +496,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="333738638"/>
- <reference key="NSMixedImage" ref="697894495"/>
+ <reference key="NSOnImage" ref="921332473"/>
+ <reference key="NSMixedImage" ref="208335321"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">2</int>
<reference key="NSTarget" ref="156626493"/>
@@ -473,8 +508,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="333738638"/>
- <reference key="NSMixedImage" ref="697894495"/>
+ <reference key="NSOnImage" ref="921332473"/>
+ <reference key="NSMixedImage" ref="208335321"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">3</int>
<reference key="NSTarget" ref="156626493"/>
@@ -490,9 +525,8 @@
<object class="NSTextField" id="209177718">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{196, 256}, {117, 17}}</string>
+ <string key="NSFrame">{{196, 274}, {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>
@@ -507,9 +541,8 @@
<object class="NSTextField" id="1022912864">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 137}, {158, 17}}</string>
+ <string key="NSFrame">{{17, 121}, {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>
@@ -524,9 +557,8 @@
<object class="NSButton" id="55874791">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{178, 136}, {345, 18}}</string>
+ <string key="NSFrame">{{178, 120}, {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>
@@ -546,9 +578,8 @@
<object class="NSButton" id="379579225">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{195, 113}, {328, 18}}</string>
+ <string key="NSFrame">{{195, 97}, {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>
@@ -568,9 +599,8 @@
<object class="NSButton" id="876436028">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{195, 91}, {328, 18}}</string>
+ <string key="NSFrame">{{195, 75}, {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>
@@ -590,9 +620,8 @@
<object class="NSTextField" id="606751019">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{254, 377}, {32, 22}}</string>
+ <string key="NSFrame">{{254, 395}, {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>
@@ -621,9 +650,8 @@
<object class="NSStepper" id="149624680">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{286, 374}, {19, 28}}</string>
+ <string key="NSFrame">{{286, 392}, {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>
@@ -639,9 +667,8 @@
<object class="NSTextField" id="202374623">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{303, 380}, {221, 17}}</string>
+ <string key="NSFrame">{{303, 398}, {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>
@@ -656,9 +683,8 @@
<object class="NSButton" id="223591434">
<reference key="NSNextResponder" ref="974184333"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{178, 303}, {345, 18}}</string>
+ <string key="NSFrame">{{178, 321}, {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>
@@ -676,9 +702,8 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{541, 441}</string>
+ <string key="NSFrameSize">{541, 459}</string>
<reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
@@ -706,12 +731,14 @@
<boolean value="YES"/>
<object class="NSAttributedString" id="988854257">
<string key="NSString">0</string>
- <object class="NSDictionary" key="NSAttributes" id="915947900">
+ <object class="NSDictionary" key="NSAttributes" id="361423666">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
- <reference key="dict.values" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
</object>
</object>
<string>.</string>
@@ -728,15 +755,19 @@
</object>
<string>-0</string>
<string>0</string>
- <object class="NSDictionary" id="415289445">
+ <object class="NSDictionary" id="242794499">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
- <reference key="dict.values" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
</object>
<object class="NSDictionary">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
- <reference key="dict.values" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
</object>
<boolean value="NO"/>
<string>0</string>
@@ -745,14 +776,14 @@
<string key="NS.positiveformat">0</string>
<string key="NS.negativeformat">-0</string>
<nil key="NS.positiveattrs"/>
- <reference key="NS.negativeattrs" ref="415289445"/>
+ <reference key="NS.negativeattrs" ref="242794499"/>
<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="915947900"/>
+ <reference key="NSAttributes" ref="361423666"/>
</object>
<reference key="NS.min" ref="653808996"/>
<real value="400" key="NS.max"/>
@@ -795,6 +826,22 @@
<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"/>
@@ -804,6 +851,14 @@
</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"/>
@@ -1371,6 +1426,8 @@
<reference ref="715645352"/>
<reference ref="666833680"/>
<reference ref="866289369"/>
+ <reference ref="685592821"/>
+ <reference ref="550877228"/>
<reference ref="968411985"/>
<reference ref="509204869"/>
<reference ref="765263822"/>
@@ -1433,6 +1490,24 @@
<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">
@@ -1451,6 +1526,24 @@
<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">
@@ -1594,6 +1687,20 @@
<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"/>
@@ -1604,6 +1711,20 @@
<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"/>
@@ -1673,6 +1794,34 @@
<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">
@@ -1756,52 +1905,6 @@
<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">
@@ -1831,6 +1934,11 @@
<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>
@@ -1841,10 +1949,14 @@
<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>
@@ -1928,6 +2040,11 @@
<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>
@@ -1956,6 +2073,10 @@
<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"/>
@@ -2020,13 +2141,17 @@
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
- <reference key="dict.values" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
- <reference key="dict.values" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
</object>
<nil key="sourceID"/>
<int key="maxID">404</int>
@@ -2083,9 +2208,17 @@
</object>
</object>
</object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1051298428">
+ <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">IBProjectSource</string>
- <string key="minorKey">./Classes/AILocalizationButton.h</string>
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -2137,9 +2270,17 @@
More information about the commits
mailing list