Changeset 13422

Timestamp:

09/11/2005 10:20:05 PM (3 years ago)

Author:

evands

Message:

Merged [13408]: Fixed problems in the Add Contact window when no groups exist. Added a New Group... item to the Groups popup menu.
Fixes #1551. Closes #1552.

Files:

• branches/adium-0.8/Source/AdiumChatEvents.m (modified) (1 diff)
• branches/adium-0.8/Source/AIContactController.h (modified) (1 diff)
• branches/adium-0.8/Source/AIContactController.m (modified) (2 diffs)
• branches/adium-0.8/Source/AIContentController.h (modified) (2 diffs)
• branches/adium-0.8/Source/AINewContactWindowController.m (modified) (4 diffs)
• branches/adium-0.8/Source/AINewGroupWindowController.h (modified) (1 diff)
• branches/adium-0.8/Source/AINewGroupWindowController.m (modified) (4 diffs)

branches/adium-0.8/Source/AdiumChatEvents.m

@@ -11 +11 @@
-#import <Adium/AIListContact.h>
-#import <Adium/AIListObject.h>
-AI
+ES
-
-@implementation AdiumChatEvents

branches/adium-0.8/Source/AIContactController.h

@@ -120 +120 @@
-- (AIListContact *)existingContactWithService:(AIService *)inService account:(AIAccount *)inAccount UID:(NSString *)inUID;
-- (AIListGroup *)groupWithUID:(NSString *)groupUID;
+- (AIListGroup *)existingGroupWithUID:(NSString *)groupUID;
-- (NSMutableArray *)allContactsInGroup:(AIListGroup *)inGroup subgroups:(BOOL)subGroups onAccount:(AIAccount *)inAccount;
-- (NSMenu *)menuOfAllContactsInContainingObject:(AIListObject<AIContainingObject> *)inGroup withTarget:(id)target;

branches/adium-0.8/Source/AIContactController.m

@@ -2034 +2034 @@
-        } else {
-                if(!(group = [groupDict objectForKey:groupUID])) {
-                        //NSArray               *groupNest = [groupUID componentsSeparatedByString:@":"];
-                        //NSString      *groupName = [groupNest lastObject];
-                        //AIListGroup *targetGroup;
-
-                        //Create
-                        group = [[AIListGroup alloc] initWithUID:groupUID];
-                        //[group setStatusObject:groupName forKey:@"FormattedUID" notify:YES];
-
-                        //Place new groups at the bottom of our list (by giving them the largest ordering index)
-//                      largestOrder += 1.0;
-//                      [group setOrderIndex:largestOrder];
-                        float orderIndex = [group orderIndex];
-                        if (orderIndex > nextOrderIndex) nextOrderIndex = orderIndex + 1;
-
-a
+A
-                        [self _updateAllAttributesOfObject:group];
-                        [groupDict setObject:group forKey:groupUID];
-
-                        //Add to target group
-//if([groupNest count] == 1) {
-//     targetGroup = contactList
-//} else {
-     targetGroup = [self groupWithUID:[groupUID substringToIndex:[groupUID length] - ([groupName length] + 1)]];
-//}
-/*targetGroup*/contactList addO
-
+[contactList addObject:group];
+[self _listChangedGroup:contactList object:group]
+
+Add to the contact list
+[contactList addObject:group];
+self _listChangedGroup:contactList o
+
-                        [group release];
-                }
@@ -2065 +2058 @@
-
-        return(group);
+}
+
+- (AIListGroup *)existingGroupWithUID:(NSString *)groupUID
+{
+        AIListGroup             *group;
+
+        if (!groupUID || ![groupUID length] || [groupUID isEqualToString:ADIUM_ROOT_GROUP_NAME]) {
+                //Return our root group if it is requested
+                group = contactList;
+        } else {
+                group = [groupDict objectForKey:groupUID];
+        }
+        
+        return group;
-}
-

branches/adium-0.8/Source/AIContentController.h

@@ -25 +25 @@
-@protocol AITextEntryView, AIEventHandler;
-
-
+, AdiumChatEvents
-
-typedef enum {
@@ -90 +90 @@
-        
-        AdiumContentFiltering   *adiumContentFiltering;
+        AdiumChatEvents                 *adiumChatEvents;
-
-    NSMutableSet                        *openChats;

branches/adium-0.8/Source/AINewContactWindowController.m

@@ -18 +18 @@
-#import "AIContactController.h"
-#import "AINewContactWindowController.h"
+#import "AINewGroupWindowController.h"
+#import <AIUtilities/AIMenuAdditions.h>
-#import <AIUtilities/AIPopUpButtonAdditions.h>
+#import <AIUtilities/AIStringAdditions.h>
-#import <Adium/AIAccount.h>
-#import <Adium/AIListContact.h>
@@ -26 +29 @@
-
-#define ADD_CONTACT_PROMPT_NIB  @"AddContact"
+#define DEFAULT_GROUP_NAME              AILocalizedString(@"Contacts",nil)
-
-@interface AINewContactWindowController (PRIVATE)
@@ -180 +184 @@
-                        [[popUp_targetGroup selectedItem] representedObject] : 
-                        nil);
-
+
+
+
-        while(account = [enumerator nextObject]){
-                if([account contactListEditable] &&
@@ -299 +305 @@
-{
-        AIListObject    *selectedObject;
-
-
+
-        //Rebuild the menu
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        //Select the group of the currently selected object on the contact list
-        selectedObject = [[adium contactController] selectedListObject];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

branches/adium-0.8/Source/AINewGroupWindowController.h

@@ -27 +27 @@
-}
-
-
+
+
-- (IBAction)cancel:(id)sender;
-- (IBAction)addGroup:(id)sender;

branches/adium-0.8/Source/AINewGroupWindowController.m

@@ -31 +31 @@
- * @param parentWindow Window on which to show as a sheet. Pass nil for a panel prompt.
- */
-void
+AINewGroupWindowController *
-{
-
+Controller
-        
-
+Controller
-        
-        if(parentWindow){
-
+Controller
-                   modalForWindow:parentWindow
-
+Controller
-                   didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:)
-                          contextInfo:nil];
-        }else{
-
+Controller
-        }
-        
+        return newGroupWindowController;
-}
-
@@ -69 +70 @@
-- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
-{
+        [[adium notificationCenter] postNotificationName:@"NewGroupWindowControllerDidEnd"
+                                                                                          object:sheet];
-    [sheet orderOut:nil];
-}
@@ -84 +87 @@
-}
-
+/*
+ * @brief UID of the new group
+ */
+- (NSString *)newGroupUID
+{
+        return [[[textField_groupName stringValue] copy] autorelease];
+}
+
-/*!
- * @brief Add the group
@@ -89 +100 @@
-- (IBAction)addGroup:(id)sender
-{
-[[adium contactController] groupWithUID:[textField_groupName stringValue
+AIListGroup *group = [[adium contactController] groupWithUID:[self newGroupUID
-        
-        if([[self window] isSheet]){