adium 2141:2db630070494: Set the "add group" button to have a po...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/2db630070494
revision:	2141:2db630070494
author:		Zachary West <zacw at adium.im>
date:		Mon May 11 00:10:44 2009 -0400

Set the "add group" button to have a popup menu of available groups. Remove some unused code.

diffstat:

 Resources/en.lproj/AIAdvancedInspectorPane.nib/classes.nib      |  16 +++++
 Resources/en.lproj/AIAdvancedInspectorPane.nib/keyedobjects.nib |     
 Source/AIAdvancedInspectorPane.m                                |  34 ++++-------
 3 files changed, 28 insertions(+), 22 deletions(-)

diffs (86 lines):

diff -r 9ff9883ffd2f -r 2db630070494 Resources/en.lproj/AIAdvancedInspectorPane.nib/classes.nib
--- a/Resources/en.lproj/AIAdvancedInspectorPane.nib/classes.nib	Sun May 10 23:25:49 2009 -0400
+++ b/Resources/en.lproj/AIAdvancedInspectorPane.nib/classes.nib	Mon May 11 00:10:44 2009 -0400
@@ -50,6 +50,14 @@
 			<string>NSObject</string>
 		</dict>
 		<dict>
+			<key>CLASS</key>
+			<string>AIPlasticPlusButton</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>AIPlasticButton</string>
+		</dict>
+		<dict>
 			<key>ACTIONS</key>
 			<dict>
 				<key>adiumPrint</key>
@@ -193,6 +201,14 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
+			<string>AIPlasticButton</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSButton</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
 			<string>NSPopUpButton</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
diff -r 9ff9883ffd2f -r 2db630070494 Resources/en.lproj/AIAdvancedInspectorPane.nib/keyedobjects.nib
Binary file Resources/en.lproj/AIAdvancedInspectorPane.nib/keyedobjects.nib has changed
diff -r 9ff9883ffd2f -r 2db630070494 Source/AIAdvancedInspectorPane.m
--- a/Source/AIAdvancedInspectorPane.m	Sun May 10 23:25:49 2009 -0400
+++ b/Source/AIAdvancedInspectorPane.m	Mon May 11 00:10:44 2009 -0400
@@ -157,28 +157,7 @@
 	}
 }
 
-- (NSArray *)contactsForCurrentObjectCompatibleWithAccount:(AIAccount *)inAccount
-{
-	if ([displayedObject isKindOfClass:[AIMetaContact class]]) {
-		NSMutableArray *array = [NSMutableArray array];
-		for (AIListContact *contact in (((AIMetaContact *)displayedObject).uniqueContainedObjects)) {
-			if ([contact.service.serviceClass isEqualToString:inAccount.service.serviceClass]) {
-				[array addObject:[adium.contactController contactWithService:contact.service account:inAccount UID:contact.UID]];
-			}
-		}
-		
-		return array;
-
-	} else 	if ([displayedObject isKindOfClass:[AIListContact class]]) {
-		return [NSArray arrayWithObject:displayedObject];
-		
-	} else {
-		return nil;
-	}
-}
-
-#pragma mark Account/Contact Menu
-
+#pragma mark Menus
 -(void)reloadPopup
 {
 	[contactMenu release]; contactMenu = nil;
@@ -188,6 +167,17 @@
 	accounts = [[self accountsForCurrentObject] retain];
 	
 	[accountMenu rebuildMenu];
+	
+	[button_addGroup setMenu:[adium.contactController groupMenuWithTarget:self]];
+}
+
+- (void)selectGroup:(id)sender
+{
+	AIListGroup *group = [sender representedObject];
+	
+	[currentSelectedAccount addContact:currentSelectedContact toGroup:group];
+	
+	[tableView_groups reloadData];
 }
 
 - (void)accountMenu:(AIAccountMenu *)inAccountMenu didSelectAccount:(AIAccount *)inAccount