adium 5185:eba92c0e1f90: Merged adium-1.6 into default.
commits at adium.im
commits at adium.im
Tue Oct 23 20:22:31 UTC 2012
details: http://hg.adium.im/adium/rev/eba92c0e1f90
revision: 5185:eba92c0e1f90
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Tue Oct 23 22:22:18 2012 +0200
Merged adium-1.6 into default.
diffs (truncated from 2196 to 1000 lines):
diff -r e1e9a30c2a9e -r eba92c0e1f90 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Tue Oct 23 22:12:44 2012 +0200
+++ b/Adium.xcodeproj/project.pbxproj Tue Oct 23 22:22:18 2012 +0200
@@ -1353,6 +1353,9 @@
6EC1684D06C170A000F9FAD3 /* DCInviteToChatPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684806C170A000F9FAD3 /* DCInviteToChatPlugin.m */; };
6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; };
6EC1685006C170A000F9FAD3 /* InviteToChatWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.xib */; };
+ 761D58801636C60100210B12 /* AINewMessageTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D587F1636C60100210B12 /* AINewMessageTableView.m */; };
+ 761D58831636EDE100210B12 /* AINewMessageTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D58821636EDE100210B12 /* AINewMessageTextFieldCell.m */; };
+ 761D58861636F94300210B12 /* AINewMessageSearchField.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D58851636F94200210B12 /* AINewMessageSearchField.m */; };
765F5DC51635934400C57904 /* AIRejoinGroupChatTopBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 765F5DC71635934400C57904 /* AIRejoinGroupChatTopBar.xib */; };
7664EAA5162E086A008CF995 /* libffi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
7664EAA6162E0874008CF995 /* libffi.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
@@ -4395,6 +4398,12 @@
6FB330A20C7235BF00B001A8 /* EKEzvIncomingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvIncomingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m; sourceTree = SOURCE_ROOT; };
6FB330A30C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = EKEzvOutgoingFileTransfer.h; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.h; sourceTree = SOURCE_ROOT; };
6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvOutgoingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m; sourceTree = SOURCE_ROOT; };
+ 761D587E1636C60100210B12 /* AINewMessageTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AINewMessageTableView.h; path = Source/AINewMessageTableView.h; sourceTree = "<group>"; };
+ 761D587F1636C60100210B12 /* AINewMessageTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AINewMessageTableView.m; path = Source/AINewMessageTableView.m; sourceTree = "<group>"; };
+ 761D58811636EDE100210B12 /* AINewMessageTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AINewMessageTextFieldCell.h; path = Source/AINewMessageTextFieldCell.h; sourceTree = "<group>"; };
+ 761D58821636EDE100210B12 /* AINewMessageTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AINewMessageTextFieldCell.m; path = Source/AINewMessageTextFieldCell.m; sourceTree = "<group>"; };
+ 761D58841636F94200210B12 /* AINewMessageSearchField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AINewMessageSearchField.h; path = Source/AINewMessageSearchField.h; sourceTree = "<group>"; };
+ 761D58851636F94200210B12 /* AINewMessageSearchField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AINewMessageSearchField.m; path = Source/AINewMessageSearchField.m; sourceTree = "<group>"; };
765F5DC61635934400C57904 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/AIRejoinGroupChatTopBar.xib; sourceTree = "<group>"; };
7664EAA4162E086A008CF995 /* libffi.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libffi.framework; path = Frameworks/libffi.framework; sourceTree = "<group>"; };
766ABAB41306D1020049FFB7 /* AIUnreadMessagesTooltip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIUnreadMessagesTooltip.h; path = Source/AIUnreadMessagesTooltip.h; sourceTree = "<group>"; };
@@ -6817,10 +6826,16 @@
isa = PBXGroup;
children = (
34E0EA0B07CC53FE00A82198 /* AINewMessagePanelPlugin.m */,
- 34E0EA0C07CC53FE00A82198 /* AINewMessagePromptController.m */,
34E0EA0D07CC53FE00A82198 /* AINewMessagePanelPlugin.h */,
34E0EA0E07CC53FE00A82198 /* AINewMessagePromptController.h */,
+ 34E0EA0C07CC53FE00A82198 /* AINewMessagePromptController.m */,
34E0EA0707CC53EC00A82198 /* NewMessagePrompt.xib */,
+ 761D587E1636C60100210B12 /* AINewMessageTableView.h */,
+ 761D587F1636C60100210B12 /* AINewMessageTableView.m */,
+ 761D58811636EDE100210B12 /* AINewMessageTextFieldCell.h */,
+ 761D58821636EDE100210B12 /* AINewMessageTextFieldCell.m */,
+ 761D58841636F94200210B12 /* AINewMessageSearchField.h */,
+ 761D58851636F94200210B12 /* AINewMessageSearchField.m */,
);
name = "New Message Panel";
sourceTree = "<group>";
@@ -10457,6 +10472,9 @@
767870E41634045D00BD0E4D /* AIMessageViewTopBarController.m in Sources */,
76AA110D1635585E00A6EC4B /* AIAccountSelectionViewController.m in Sources */,
76AA1110163558B200A6EC4B /* AIRejoinGroupChatViewController.m in Sources */,
+ 761D58801636C60100210B12 /* AINewMessageTableView.m in Sources */,
+ 761D58831636EDE100210B12 /* AINewMessageTextFieldCell.m in Sources */,
+ 761D58861636F94300210B12 /* AINewMessageSearchField.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff -r e1e9a30c2a9e -r eba92c0e1f90 Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m Tue Oct 23 22:12:44 2012 +0200
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m Tue Oct 23 22:22:18 2012 +0200
@@ -61,13 +61,13 @@
- (void)_configureTextEntryView;
- (void)_updateTextEntryViewHeight;
- (CGFloat)_textEntryViewProperHeightIgnoringUserMininum:(BOOL)ignoreUserMinimum;
-- (void)_showUserListView;
-- (void)_hideUserListView;
+- (void)_showUserListViewAnimate:(BOOL)useAnimation;
+- (void)_hideUserListViewAnimate:(BOOL)useAnimation;
- (void)_configureUserList;
- (CGFloat)_userListViewDividerPositionIgnoringUserMinimum:(BOOL)ignoreUserMinimum;
- (void)saveUserListMinimumSize;
- (BOOL)userListInitiallyVisible;
-- (void)setUserListVisible:(BOOL)inVisible;
+- (void)setUserListVisible:(BOOL)inVisible animate:(BOOL)useAnimation;
- (void)updateUserCount;
- (NSArray *)contactsMatchingBeginningString:(NSString *)partialWord;
@@ -130,7 +130,7 @@
/* Update chat status and participating list objects to configure the user list if necessary
* Call chatParticipatingListObjectsChanged first, which will set up the user list. This allows other sizing to match.
*/
- [self setUserListVisible:(chat.isGroupChat && [self userListInitiallyVisible])];
+ [self setUserListVisible:(chat.isGroupChat && [self userListInitiallyVisible]) animate:NO];
[self chatParticipatingListObjectsChanged:nil];
@@ -938,12 +938,12 @@
/*!
* @brief Set visibility of the user list
*/
-- (void)setUserListVisible:(BOOL)inVisible
+- (void)setUserListVisible:(BOOL)inVisible animate:(BOOL)useAnimation
{
if (inVisible) {
- [self _showUserListView];
+ [self _showUserListViewAnimate:useAnimation];
} else {
- [self _hideUserListView];
+ [self _hideUserListViewAnimate:useAnimation];
}
[adium.preferenceController setPreference:[NSNumber numberWithBool:inVisible]
@@ -967,7 +967,7 @@
- (void)toggleUserList
{
if (chat.isGroupChat)
- [self setUserListVisible:![self userListVisible]];
+ [self setUserListVisible:![self userListVisible] animate:YES];
}
- (void)toggleUserListSide
@@ -985,25 +985,42 @@
/*!
* @brief Show the user list
*/
-- (void)_showUserListView
+- (void)_showUserListViewAnimate:(BOOL)useAnimation
{
if (chat.isGroupChat && view_userList.superview == nil) {
[splitView_verticalSplit addSubview:view_userList];
}
[self updateUserCount];
[userListController reloadData];
-
+
[view_userList setHidden:NO];
- //Manually set the divider's position otherwise view_userList will shrink
- [splitView_verticalSplit setPosition:[self _userListViewDividerPositionIgnoringUserMinimum:NO]
- ofDividerAtIndex:0];
- [splitView_verticalSplit adjustSubviews];
+
+ CGFloat newPosition = [self _userListViewDividerPositionIgnoringUserMinimum:NO];
+
+ if (useAnimation) {
+ NSView *view0 = [splitView_verticalSplit.subviews objectAtIndex:0];
+ NSView *view1 = [splitView_verticalSplit.subviews objectAtIndex:1];
+
+ NSRect view0TargetFrame = NSMakeRect(view0.frame.origin.x, view0.frame.origin.y, newPosition - splitView_verticalSplit.dividerThickness, view0.frame.size.height);
+ NSRect view1TargetFrame = NSMakeRect(newPosition, view1.frame.origin.y, NSMaxX(view1.frame) - newPosition, view1.frame.size.height);
+
+ [NSAnimationContext beginGrouping];
+ [[NSAnimationContext currentContext] setDuration:0.1];
+
+ [view0.animator setFrame:view0TargetFrame];
+ [view1.animator setFrame:view1TargetFrame];
+ [NSAnimationContext endGrouping];
+ } else {
+ [splitView_verticalSplit setPosition:newPosition ofDividerAtIndex:0];
+ }
+
+ [splitView_verticalSplit performSelector:@selector(adjustSubviews) withObject:nil afterDelay:0.2];
}
/*!
* @brief Hide the user list.
*/
-- (void)_hideUserListView
+- (void)_hideUserListViewAnimate:(BOOL)useAnimation
{
if (!chat.isGroupChat) {
NSRect frame = view_userList.frame;
@@ -1011,7 +1028,24 @@
view_userList.frame = frame;
[view_userList removeFromSuperview];
}
- [view_userList setHidden:YES];
+
+ userListMinWidth = NSWidth(view_userList.frame);
+ CGFloat newPosition = NSWidth(splitView_verticalSplit.frame);
+
+ if (useAnimation) {
+ NSRect view0TargetFrame = NSMakeRect(view_messages.frame.origin.x, view_messages.frame.origin.y, newPosition, view_messages.frame.size.height);
+ NSRect view1TargetFrame = NSMakeRect(newPosition, view_userList.frame.origin.y, 0.0f, view_userList.frame.size.height);
+
+ [NSAnimationContext beginGrouping];
+ [[NSAnimationContext currentContext] setDuration:0.1];
+ [view_messages setFrame:view0TargetFrame];
+ [view_userList.animator setFrame:view1TargetFrame];
+ [view_userList.animator setHidden:YES];
+ [NSAnimationContext endGrouping];
+ } else {
+ [view_userList setHidden:YES];
+ }
+
[splitView_verticalSplit adjustSubviews];
}
@@ -1146,13 +1180,7 @@
*/
- (void)splitViewWillResizeSubviews:(NSNotification *)aNotification
{
- if ([aNotification object] == splitView_verticalSplit) {
- if (NSWidth(view_userList.frame) > 0) {
- userListMinWidth = NSWidth(view_userList.frame);
- [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(saveUserListMinimumSize) object:nil];
- [self performSelector:@selector(saveUserListMinimumSize) withObject:nil afterDelay:0.5];
- }
- } else if ([aNotification object] == splitView_textEntryHorizontal && [splitView_textEntryHorizontal inLiveResize]) {
+ if ([aNotification object] == splitView_textEntryHorizontal && [splitView_textEntryHorizontal inLiveResize]) {
entryMinHeight = NSHeight(textView_outgoing.frame);
}
}
@@ -1170,7 +1198,7 @@
}
}
-/*
+/*
* @brief Keep the userlist and text entry view the same size when the window is resized.
*/
- (void)splitView:(NSSplitView *)splitView resizeSubviewsWithOldSize:(NSSize)oldSize
@@ -1213,6 +1241,10 @@
[view_userList setFrame:userFrame];
[[splitView_textEntryHorizontal superview] setFrame:msgFrame];
+
+ userListMinWidth = NSWidth(view_userList.frame);
+ [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(saveUserListMinimumSize) object:nil];
+ [self performSelector:@selector(saveUserListMinimumSize) withObject:nil afterDelay:0.5];
// divition between text entry and message view
} else if (splitView == splitView_textEntryHorizontal) {
diff -r e1e9a30c2a9e -r eba92c0e1f90 Resources/NewMessagePrompt.xib
--- a/Resources/NewMessagePrompt.xib Tue Oct 23 22:12:44 2012 +0200
+++ b/Resources/NewMessagePrompt.xib Tue Oct 23 22:22:18 2012 +0200
@@ -2,26 +2,33 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">11D50b</string>
- <string key="IBDocument.InterfaceBuilderVersion">2182</string>
- <string key="IBDocument.AppKitVersion">1138.32</string>
- <string key="IBDocument.HIToolboxVersion">568.00</string>
+ <string key="IBDocument.SystemVersion">12C54</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2843</string>
+ <string key="IBDocument.AppKitVersion">1187.34</string>
+ <string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2182</string>
+ <string key="NS.object.0">2843</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
- <string>NSTextField</string>
- <string>NSView</string>
- <string>NSWindowTemplate</string>
- <string>NSTextFieldCell</string>
+ <string>NSButton</string>
+ <string>NSButtonCell</string>
+ <string>NSCustomObject</string>
+ <string>NSImageCell</string>
<string>NSMenu</string>
<string>NSMenuItem</string>
<string>NSPopUpButton</string>
- <string>NSButtonCell</string>
<string>NSPopUpButtonCell</string>
- <string>NSButton</string>
- <string>NSCustomObject</string>
+ <string>NSScrollView</string>
+ <string>NSScroller</string>
+ <string>NSSearchField</string>
+ <string>NSSearchFieldCell</string>
+ <string>NSTableColumn</string>
+ <string>NSTableView</string>
+ <string>NSTextField</string>
+ <string>NSTextFieldCell</string>
+ <string>NSView</string>
+ <string>NSWindowTemplate</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -41,9 +48,9 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSWindowTemplate" id="65469044">
- <int key="NSWindowStyleMask">3</int>
+ <int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{463, 428}, {312, 128}}</string>
+ <string key="NSWindowRect">{{463, 428}, {450, 328}}</string>
<int key="NSWTFlags">1886912512</int>
<string key="NSWindowTitle"/>
<string key="NSWindowClass">NSWindow</string>
@@ -51,19 +58,21 @@
<characters key="NS.bytes">View</characters>
</object>
<nil key="NSUserInterfaceItemIdentifier"/>
- <string key="NSWindowContentMinSize">{156.19800000000001, 5}</string>
+ <string key="NSWindowContentMinSize">{260, 180}</string>
<object class="NSView" key="NSWindowView" id="475194834">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSButton" id="908480541">
<reference key="NSNextResponder" ref="475194834"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{203, 12}, {95, 32}}</string>
+ <string key="NSFrame">{{341, 13}, {95, 32}}</string>
<reference key="NSSuperview" ref="475194834"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="72683203">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Message</string>
<object class="NSFont" key="NSSupport" id="135502423">
@@ -72,7 +81,7 @@
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="908480541"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="135502423"/>
<string key="NSAlternateContents"/>
@@ -80,53 +89,23 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
- </object>
- <object class="NSTextField" id="776538681">
- <reference key="NSNextResponder" ref="475194834"/>
- <int key="NSvFlags">267</int>
- <string key="NSFrame">{{63, 60}, {229, 22}}</string>
- <reference key="NSSuperview" ref="475194834"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="894754052">
- <int key="NSCellFlags">-1804468671</int>
- <int key="NSCellFlags2">4195328</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="135502423"/>
- <reference key="NSControlView" ref="776538681"/>
- <bool key="NSDrawsBackground">YES</bool>
- <object class="NSColor" key="NSBackgroundColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">textBackgroundColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">textColor</string>
- <object class="NSColor" key="NSColor" id="333808705">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- </object>
- </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="609432773">
<reference key="NSNextResponder" ref="475194834"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{108, 12}, {95, 32}}</string>
+ <string key="NSFrame">{{246, 13}, {95, 32}}</string>
<reference key="NSSuperview" ref="475194834"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="908480541"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="817792663">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Cancel</string>
<reference key="NSSupport" ref="135502423"/>
<reference key="NSControlView" ref="609432773"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="135502423"/>
<string key="NSAlternateContents"/>
@@ -134,117 +113,366 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
- <object class="NSPopUpButton" id="494787671">
+ <object class="NSSearchField" id="35607775">
<reference key="NSNextResponder" ref="475194834"/>
- <int key="NSvFlags">259</int>
- <string key="NSFrame">{{60, 84}, {235, 26}}</string>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{7, 298}, {436, 22}}</string>
<reference key="NSSuperview" ref="475194834"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="340761095"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="949036754">
- <int key="NSCellFlags">-2076049856</int>
- <int key="NSCellFlags2">1024</int>
+ <object class="NSSearchFieldCell" key="NSCell" id="791210820">
+ <int key="NSCellFlags">342884416</int>
+ <int key="NSCellFlags2">268469312</int>
+ <string key="NSContents"/>
<reference key="NSSupport" ref="135502423"/>
- <reference key="NSControlView" ref="494787671"/>
- <int key="NSButtonFlags">109199615</int>
- <int key="NSButtonFlags2">1</int>
- <object class="NSFont" key="NSAlternateImage">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSMutableString" key="NSAlternateContents">
- <characters key="NS.bytes"/>
- </object>
- <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="440459507">
- <reference key="NSMenu" ref="354531515"/>
- <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">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="949036754"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="354531515">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="440459507"/>
- </array>
- </object>
- <int key="NSSelectedIndex">-1</int>
- <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="742339314">
- <reference key="NSNextResponder" ref="475194834"/>
- <int key="NSvFlags">260</int>
- <string key="NSFrame">{{17, 90}, {41, 17}}</string>
- <reference key="NSSuperview" ref="475194834"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="198223296">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">From:</string>
- <reference key="NSSupport" ref="135502423"/>
- <reference key="NSControlView" ref="742339314"/>
- <object class="NSColor" key="NSBackgroundColor" id="332029192">
+ <string key="NSCellIdentifier">_NS:9</string>
+ <reference key="NSControlView" ref="35607775"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <int key="NSTextBezelStyle">1</int>
+ <object class="NSColor" key="NSBackgroundColor" id="725505679">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
- <string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor">
+ <string key="NSColorName">textBackgroundColor</string>
+ <object class="NSColor" key="NSColor" id="27862019">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ <bytes key="NSWhite">MQA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="111653140">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
- <reference key="NSColor" ref="333808705"/>
+ <object class="NSColor" key="NSColor" id="333808705">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ </object>
</object>
+ <object class="NSButtonCell" key="NSSearchButtonCell">
+ <int key="NSCellFlags">0</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">search</string>
+ <reference key="NSControlView" ref="35607775"/>
+ <string key="NSAction">_searchFieldSearch:</string>
+ <reference key="NSTarget" ref="791210820"/>
+ <int key="NSButtonFlags">138690560</int>
+ <int key="NSButtonFlags2">0</int>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ <object class="NSButtonCell" key="NSCancelButtonCell">
+ <int key="NSCellFlags">0</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">clear</string>
+ <array class="NSMutableArray" key="NSAccessibilityOverriddenAttributes">
+ <dictionary class="NSMutableDictionary">
+ <string key="AXDescription">cancel</string>
+ <integer value="1" key="NSAccessibilityEncodedAttributesValueType"/>
+ </dictionary>
+ </array>
+ <reference key="NSControlView" ref="35607775"/>
+ <string key="NSAction">_searchFieldCancel:</string>
+ <reference key="NSTarget" ref="791210820"/>
+ <int key="NSButtonFlags">138690560</int>
+ <int key="NSButtonFlags2">0</int>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ <int key="NSMaximumRecents">255</int>
+ <bytes key="NSSearchFieldFlags">CAAAAA</bytes>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
- <object class="NSTextField" id="172098350">
+ <object class="NSScrollView" id="340761095">
<reference key="NSNextResponder" ref="475194834"/>
- <int key="NSvFlags">260</int>
- <string key="NSFrame">{{17, 62}, {41, 17}}</string>
+ <int key="NSvFlags">4370</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSClipView" id="447086285">
+ <reference key="NSNextResponder" ref="340761095"/>
+ <int key="NSvFlags">2304</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSTableView" id="873154579">
+ <reference key="NSNextResponder" ref="447086285"/>
+ <int key="NSvFlags">4352</int>
+ <string key="NSFrameSize">{450, 190}</string>
+ <reference key="NSSuperview" ref="447086285"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="1035036399"/>
+ <string key="NSReuseIdentifierKey">_NS:13</string>
+ <bool key="NSEnabled">YES</bool>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <bool key="NSControlAllowsExpansionToolTips">YES</bool>
+ <object class="_NSCornerView" key="NSCornerView">
+ <nil key="NSNextResponder"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{224, 0}, {16, 17}}</string>
+ <reference key="NSNextKeyView" ref="447086285"/>
+ <string key="NSReuseIdentifierKey">_NS:19</string>
+ </object>
+ <array class="NSMutableArray" key="NSTableColumns">
+ <object class="NSTableColumn" id="1001365665">
+ <string key="NSIdentifier">icon</string>
+ <double key="NSWidth">45</double>
+ <double key="NSMinWidth">40</double>
+ <double key="NSMaxWidth">1000</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75497536</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents"/>
+ <object class="NSFont" key="NSSupport" id="26">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">11</double>
+ <int key="NSfFlags">3100</int>
+ </object>
+ <object class="NSColor" key="NSBackgroundColor" id="480678702">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+ </object>
+ <object class="NSColor" key="NSTextColor" id="662349957">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">headerTextColor</string>
+ <reference key="NSColor" ref="333808705"/>
+ </object>
+ </object>
+ <object class="NSImageCell" key="NSDataCell" id="650901814">
+ <int key="NSCellFlags">134217728</int>
+ <int key="NSCellFlags2">33554432</int>
+ <string key="NSCellIdentifier">_NS:9</string>
+ <int key="NSAlign">0</int>
+ <int key="NSScale">0</int>
+ <int key="NSStyle">0</int>
+ <bool key="NSAnimates">NO</bool>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <reference key="NSTableView" ref="873154579"/>
+ </object>
+ <object class="NSTableColumn" id="960593490">
+ <string key="NSIdentifier">name</string>
+ <double key="NSWidth">362</double>
+ <double key="NSMinWidth">40</double>
+ <double key="NSMaxWidth">1000</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75497536</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSBackgroundColor" ref="480678702"/>
+ <reference key="NSTextColor" ref="662349957"/>
+ </object>
+ <object class="NSTextFieldCell" key="NSDataCell" id="684785406">
+ <int key="NSCellFlags">337641536</int>
+ <int key="NSCellFlags2">6144</int>
+ <string key="NSContents">Text Cell</string>
+ <reference key="NSSupport" ref="135502423"/>
+ <reference key="NSControlView" ref="873154579"/>
+ <reference key="NSBackgroundColor" ref="725505679"/>
+ <reference key="NSTextColor" ref="111653140"/>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <reference key="NSTableView" ref="873154579"/>
+ </object>
+ </array>
+ <double key="NSIntercellSpacingWidth">3</double>
+ <double key="NSIntercellSpacingHeight">2</double>
+ <reference key="NSBackgroundColor" ref="27862019"/>
+ <object class="NSColor" key="NSGridColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">gridColor</string>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC41AA</bytes>
+ </object>
+ </object>
+ <double key="NSRowHeight">36</double>
+ <int key="NSTvFlags">-1029701632</int>
+ <reference key="NSDelegate"/>
+ <reference key="NSDataSource"/>
+ <int key="NSColumnAutoresizingStyle">0</int>
+ <int key="NSDraggingSourceMaskForLocal">15</int>
+ <int key="NSDraggingSourceMaskForNonLocal">0</int>
+ <bool key="NSAllowsTypeSelect">NO</bool>
+ <int key="NSTableViewDraggingDestinationStyle">1</int>
+ <int key="NSTableViewGroupRowStyle">1</int>
+ </object>
+ </array>
+ <string key="NSFrame">{{1, 1}, {450, 190}}</string>
+ <reference key="NSSuperview" ref="340761095"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="873154579"/>
+ <string key="NSReuseIdentifierKey">_NS:11</string>
+ <reference key="NSDocView" ref="873154579"/>
+ <object class="NSColor" key="NSBGColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlBackgroundColor</string>
+ <object class="NSColor" key="NSColor" id="860198252">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ </object>
+ </object>
+ <int key="NScvFlags">4</int>
+ </object>
+ <object class="NSScroller" id="1035036399">
+ <reference key="NSNextResponder" ref="340761095"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{441, 1}, {15, 206}}</string>
+ <reference key="NSSuperview" ref="340761095"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="210405386"/>
+ <string key="NSReuseIdentifierKey">_NS:58</string>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <reference key="NSTarget" ref="340761095"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSPercent">0.9107142857142857</double>
+ </object>
+ <object class="NSScroller" id="892141472">
+ <reference key="NSNextResponder" ref="340761095"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-100, -100}, {223, 15}}</string>
+ <reference key="NSSuperview" ref="340761095"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="447086285"/>
+ <string key="NSReuseIdentifierKey">_NS:60</string>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <int key="NSsFlags">1</int>
+ <reference key="NSTarget" ref="340761095"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSPercent">0.99758454106280192</double>
+ </object>
+ </array>
+ <string key="NSFrame">{{-1, 99}, {452, 192}}</string>
<reference key="NSSuperview" ref="475194834"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="892141472"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <int key="NSsFlags">133650</int>
+ <reference key="NSVScroller" ref="1035036399"/>
+ <reference key="NSHScroller" ref="892141472"/>
+ <reference key="NSContentView" ref="447086285"/>
+ <bytes key="NSScrollAmts">QSAAAEEgAABCGAAAQhgAAA</bytes>
+ <double key="NSMinMagnification">0.25</double>
+ <double key="NSMaxMagnification">4</double>
+ <double key="NSMagnification">1</double>
+ </object>
+ <object class="NSPopUpButton" id="542931200">
+ <reference key="NSNextResponder" ref="475194834"/>
+ <int key="NSvFlags">290</int>
+ <string key="NSFrame">{{79, 58}, {354, 26}}</string>
+ <reference key="NSSuperview" ref="475194834"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="609432773"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="239963716">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">To:</string>
+ <object class="NSPopUpButtonCell" key="NSCell" id="807990878">
+ <int key="NSCellFlags">-2076180416</int>
+ <int key="NSCellFlags2">2048</int>
<reference key="NSSupport" ref="135502423"/>
- <reference key="NSControlView" ref="172098350"/>
- <reference key="NSBackgroundColor" ref="332029192"/>
+ <string key="NSCellIdentifier">_NS:9</string>
+ <reference key="NSControlView" ref="542931200"/>
+ <int key="NSButtonFlags">109199360</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ <object class="NSMenuItem" key="NSMenuItem" id="183779131">
+ <reference key="NSMenu" ref="154800302"/>
+ <string key="NSTitle">Item 1</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="678353007">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuCheckmark</string>
+ </object>
+ <object class="NSCustomResource" key="NSMixedImage" id="321937682">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuMixedState</string>
+ </object>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="807990878"/>
+ </object>
+ <bool key="NSMenuItemRespectAlignment">YES</bool>
+ <object class="NSMenu" key="NSMenu" id="154800302">
+ <string key="NSTitle">OtherViews</string>
+ <array class="NSMutableArray" key="NSMenuItems">
+ <reference ref="183779131"/>
+ <object class="NSMenuItem" id="258896593">
+ <reference key="NSMenu" ref="154800302"/>
+ <string key="NSTitle">Item 2</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="678353007"/>
+ <reference key="NSMixedImage" ref="321937682"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="807990878"/>
+ </object>
+ <object class="NSMenuItem" id="812329514">
+ <reference key="NSMenu" ref="154800302"/>
+ <string key="NSTitle">Item 3</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="678353007"/>
+ <reference key="NSMixedImage" ref="321937682"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="807990878"/>
+ </object>
+ </array>
+ <reference key="NSMenuFont" ref="135502423"/>
+ </object>
+ <int key="NSPreferredEdge">1</int>
+ <bool key="NSUsesItemFromMenu">YES</bool>
+ <bool key="NSAltersState">YES</bool>
+ <int key="NSArrowPosition">2</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSTextField" id="210405386">
+ <reference key="NSNextResponder" ref="475194834"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{17, 64}, {60, 17}}</string>
+ <reference key="NSSuperview" ref="475194834"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="542931200"/>
+ <string key="NSReuseIdentifierKey">_NS:1535</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="1043152795">
+ <int key="NSCellFlags">68157504</int>
+ <int key="NSCellFlags2">272630784</int>
+ <string key="NSContents">Account:</string>
+ <reference key="NSSupport" ref="135502423"/>
+ <string key="NSCellIdentifier">_NS:1535</string>
+ <reference key="NSControlView" ref="210405386"/>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlColor</string>
+ <reference key="NSColor" ref="860198252"/>
+ </object>
<reference key="NSTextColor" ref="111653140"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
- <string key="NSFrameSize">{312, 128}</string>
+ <string key="NSFrameSize">{450, 328}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="35607775"/>
</object>
- <string key="NSScreenRect">{{0, 0}, {1400, 1050}}</string>
- <string key="NSMinSize">{156.19800000000001, 27}</string>
+ <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+ <string key="NSMinSize">{260, 202}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
@@ -260,22 +488,6 @@
<int key="connectionID">8</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">textField_handle</string>
- <reference key="source" ref="853528324"/>
- <reference key="destination" ref="776538681"/>
- </object>
- <int key="connectionID">16</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">popUp_service</string>
- <reference key="source" ref="853528324"/>
- <reference key="destination" ref="494787671"/>
- </object>
- <int key="connectionID">37</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">okay:</string>
<reference key="source" ref="853528324"/>
@@ -284,20 +496,60 @@
<int key="connectionID">43</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">label_from</string>
+ <object class="IBActionConnection" key="connection">
+ <string key="label">closeWindow:</string>
<reference key="source" ref="853528324"/>
- <reference key="destination" ref="742339314"/>
+ <reference key="destination" ref="609432773"/>
</object>
- <int key="connectionID">44</int>
+ <int key="connectionID">48</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">textUpdated:</string>
+ <reference key="source" ref="853528324"/>
+ <reference key="destination" ref="35607775"/>
+ </object>
+ <int key="connectionID">66</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">label_to</string>
+ <string key="label">field_search</string>
<reference key="source" ref="853528324"/>
- <reference key="destination" ref="172098350"/>
+ <reference key="destination" ref="35607775"/>
</object>
- <int key="connectionID">45</int>
+ <int key="connectionID">78</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">table_results</string>
+ <reference key="source" ref="853528324"/>
+ <reference key="destination" ref="873154579"/>
+ </object>
+ <int key="connectionID">79</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">button_ok</string>
+ <reference key="source" ref="853528324"/>
+ <reference key="destination" ref="908480541"/>
+ </object>
+ <int key="connectionID">80</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">button_cancel</string>
+ <reference key="source" ref="853528324"/>
+ <reference key="destination" ref="609432773"/>
+ </object>
+ <int key="connectionID">81</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">button_okey</string>
+ <reference key="source" ref="853528324"/>
+ <reference key="destination" ref="908480541"/>
+ </object>
+ <int key="connectionID">82</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -305,23 +557,15 @@
<reference key="source" ref="853528324"/>
<reference key="destination" ref="908480541"/>
</object>
- <int key="connectionID">46</int>
+ <int key="connectionID">83</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">button_cancel</string>
+ <string key="label">popup_account</string>
<reference key="source" ref="853528324"/>
- <reference key="destination" ref="609432773"/>
+ <reference key="destination" ref="542931200"/>
</object>
- <int key="connectionID">47</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">closeWindow:</string>
- <reference key="source" ref="853528324"/>
- <reference key="destination" ref="609432773"/>
- </object>
- <int key="connectionID">48</int>
+ <int key="connectionID">100</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -335,9 +579,9 @@
<object class="IBOutletConnection" key="connection">
<string key="label">initialFirstResponder</string>
<reference key="source" ref="65469044"/>
- <reference key="destination" ref="776538681"/>
+ <reference key="destination" ref="35607775"/>
</object>
- <int key="connectionID">33</int>
+ <int key="connectionID">77</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -361,23 +605,7 @@
<reference key="source" ref="908480541"/>
<reference key="destination" ref="609432773"/>
</object>
- <int key="connectionID">51</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">nextKeyView</string>
- <reference key="source" ref="776538681"/>
- <reference key="destination" ref="908480541"/>
- </object>
- <int key="connectionID">50</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="776538681"/>
- <reference key="destination" ref="853528324"/>
- </object>
- <int key="connectionID">56</int>
+ <int key="connectionID">87</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -391,49 +619,65 @@
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="609432773"/>
- <reference key="destination" ref="494787671"/>
+ <reference key="destination" ref="35607775"/>
</object>
- <int key="connectionID">52</int>
+ <int key="connectionID">88</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">controller</string>
+ <reference key="source" ref="35607775"/>
+ <reference key="destination" ref="853528324"/>
+ </object>
+ <int key="connectionID">84</int>
More information about the commits
mailing list