Changeset 22571

Timestamp:

02/08/2008 02:10:10 PM (10 months ago)

Author:

evands

Message:

Merged [22570]: Fixes and optimizations for AIContactMenu which fix a number of problems seen primarily in the account/contact selection view in chat windows; fixed initial contact selection there, as well. Fixes #9013. I am fairly sure this fixes #8638. Probably fixes some other odd, intermittent issues with multiple-possible-source-account-or-destination-contact messaging, too, as the UI wasn't matching reality in all cases -and- could randomly change.

Files:

• branches/adium-1.2/Frameworks/Adium Framework/Source/AIContactMenu.h (modified) (2 diffs)
• branches/adium-1.2/Frameworks/Adium Framework/Source/AIContactMenu.m (modified) (11 diffs)
• branches/adium-1.2/Plugins/Dual Window Interface/AIAccountSelectionView.m (modified) (5 diffs)

branches/adium-1.2/Frameworks/Adium Framework/Source/AIContactMenu.h

@@ -17 +17 @@
-        BOOL                                    delegateRespondsToDidSelectContact;
-        BOOL                                    delegateRespondsToShouldIncludeContact; 
+        BOOL                                    delegateRespondsToValidateContact;
-        BOOL                                    shouldUseDisplayName;
-        BOOL                                    shouldDisplayGroupHeaders;
@@ -33 +34 @@
-- (void)contactMenu:(AIContactMenu *)inContactMenu didRebuildMenuItems:(NSArray *)menuItems;
-- (void)contactMenu:(AIContactMenu *)inContactMenu didSelectContact:(AIListContact *)inContact; //Optional
+- (AIListContact *)contactMenu:(AIContactMenu *)inContactMenu validateContact:(AIListContact *)inContact; //Optional
-- (BOOL)contactMenu:(AIContactMenu *)inContactMenu shouldIncludeContact:(AIListContact *)inContact; //Optional
-- (BOOL)contactMenuShouldUseUserIcon:(AIContactMenu *)inContactMenu; //Optional

branches/adium-1.2/Frameworks/Adium Framework/Source/AIContactMenu.m

@@ -18 +18 @@
-- (id)initWithDelegate:(id)inDelegate forContactsInObject:(AIListObject *)inContainingObject;
-- (NSArray *)contactMenusForListObjects:(NSArray *)listObjects;
-Contained
+MenuFromArrayOfList
-- (void)_updateMenuItem:(NSMenuItem *)menuItem;
-@end
@@ -50 +50 @@
-                // Register for contact list order notifications (so we can update our sorting)
-                [[adium notificationCenter] addObserver:self
-   selector:@selector(rebuildMenu
-
-
+          selector:@selector(contactOrderChanged:
+       
+       
-
-                [self rebuildMenu];
@@ -82 +82 @@
-}
-
+- (void)contactOrderChanged:(NSNotification *)notification
+{
+        AIListObject *changedObject = [notification object];
+        if (changedObject == containingObject) {
+                [self rebuildMenu];
+        }
+}
-
-//Delegate -------------------------------------------------------------------------------------------------------------
@@ -96 +103 @@
-        delegateRespondsToDidSelectContact = [delegate respondsToSelector:@selector(contactMenu:didSelectContact:)];
-        delegateRespondsToShouldIncludeContact = [delegate respondsToSelector:@selector(contactMenu:shouldIncludeContact:)];
-
+
+
-        shouldUseUserIcon = ([delegate respondsToSelector:@selector(contactMenuShouldUseUserIcon:)] &&
-                                                                 [delegate contactMenuShouldUseUserIcon:self]);
@@ -160 +168 @@
-                 */
-                if (!shouldDisplayGroupHeaders) {
-Contained
+MenuFromArrayOfList
-                }
-
@@ -167 +175 @@
-        } else {
-                // We can assume these are already sorted
-
- 
-   [NSArray arrayWithObject:containingObject])
+[self listObjectsForMenuFromArrayOfListObjects:
+                                                                                               
+                                                                                                 [NSArray arrayWithObject:containingObject])]
-        }
-        
@@ -179 +187 @@
-* @brief Creates an array of list objects which should be presented in the menu, expanding any containing objects
- */
-Contained
+MenuFromArrayOfList
-{
-        NSMutableArray  *listObjectArray = [NSMutableArray array];
@@ -187 +195 @@
-        while ((listObject = [enumerator nextObject])) {
-                if ([listObject isKindOfClass:[AIListContact class]]) {
-
+
+
+
-                        if (!delegateRespondsToShouldIncludeContact || [delegate contactMenu:self shouldIncludeContact:(AIListContact *)listObject]) {
+                                if (delegateRespondsToValidateContact)
+                                        listObject = [delegate contactMenu:self validateContact:(AIListContact *)listObject];
+        
-                                [listObjectArray addObject:listObject];
-                        }
-
- && [listObject conformsToProtocol:@protocol(AIContainingObject)]
-ContainedObjects:[(AIListObject<AIContainingObject>
+
+
+MenuFromArrayOfListObjects:[(AIListGroup
-                }
-        }
@@ -211 +224 @@
-        while ((listObject = [enumerator nextObject])) {
-                // Display groups inline
- && [listObject conformsToProtocol:@protocol(AIContainingObject)]
-Contained
+
+MenuFromArrayOfList
-                        
-                        // If there's any contained list objects, add ourself as a group and add the contained objects.
@@ -277 +290 @@
-{
-        if ([inObject isKindOfClass:[AIListContact class]]) {
+                //Note that this will return nil if we don't ahve a menu item for inObject
-                NSMenuItem      *menuItem = [self menuItemForContact:(AIListContact *)inObject];
-                
@@ -285 +299 @@
-                   [inModifiedKeys containsObject:@"IdleSince"] ||
-                   [inModifiedKeys containsObject:@"StatusType"]) {
-
+
-                        //Update the changed menu item (or rebuild the entire menu if this item should be removed or added)
-                        if (delegateRespondsToShouldIncludeContact) {

branches/adium-1.2/Plugins/Dual Window Interface/AIAccountSelectionView.m

@@ -37 +37 @@
-@interface AIAccountSelectionView (PRIVATE)
-- (id)_init;
-hatMetaContactChanged
+onfigureForCurrentChat
-- (void)chatDestinationChanged:(NSNotification *)notification;
-- (void)chatSourceChanged:(NSNotification *)notification;
@@ -157 +157 @@
-                        
-                        //Update source and destination menus
-hatMetaContactChanged
+onfigureForCurrentChat
-                }                       
-        }
@@ -163 +163 @@
-
-/*!
-
-
-
-
+
+
+
+
+
+
-        //Rebuild 'To' contact menu
-([self choicesAvailableForContact])
+ ([self choicesAvailableForContact]) 
-                [self _createContactMenu];
-else
+ else 
-                [self _destroyContactMenu];
-        }
@@ -183 +185 @@
-- (void)chatDestinationChanged:(NSNotification *)notification
-{
+        AILogWithSignature(@"popUp_contacts selecting %@ (%@)", [chat listObject], [notification object]);
+
-        //Update selection in contact menu
-        [popUp_contacts selectItemWithRepresentedObjectUsingCompare:[chat listObject]];
@@ -343 +347 @@
- */
-- (void)contactMenu:(AIContactMenu *)inContactMenu didRebuildMenuItems:(NSArray *)menuItems {
+        AILogWithSignature(@"");
-        [popUp_contacts setMenu:[inContactMenu menu]];
+        [self chatDestinationChanged:nil];
-}
-- (void)contactMenu:(AIContactMenu *)inContactMenu didSelectContact:(AIListContact *)inContact {
-        [[adium chatController] switchChat:chat toListContact:inContact usingContactAccount:YES];
-}
-
+
+
+
+
+
-/*!
- * @brief Create the contact menu and add it to our view