Changeset 14701

Timestamp:

01/01/2006 08:06:36 PM (3 years ago)

Author:

evands

Message:

Added a "Show Offline Group" item to the View menu which, if enabled, groups all offline contacts into an Offline group.

Closes #2366

Files:

• trunk/Source/AIContactController.h (modified) (3 diffs)
• trunk/Source/AIContactController.m (modified) (11 diffs)
• trunk/Source/AIOfflineContactHidingPlugin.h (modified) (1 diff)
• trunk/Source/AIOfflineContactHidingPlugin.m (modified) (8 diffs)

trunk/Source/AIContactController.h

@@ -75 +75 @@
-@end
-
-
+, AIListObjectObserver
-        //Contacts and metaContacts
-        NSMutableDictionary             *contactDict;
@@ -84 +84 @@
-    AIListGroup                         *contactList;
-        NSMutableDictionary             *groupDict;
-    AIListGroup                         *strangerGroup;
-        BOOL                                    useContactListGroups;
-
+
+
+
-        
-        //Status and Attribute updates
@@ -125 +126 @@
-- (NSMenu *)menuOfAllGroupsInGroup:(AIListGroup *)inGroup withTarget:(id)target;
-- (NSSet *)allContactsWithService:(AIService *)service UID:(NSString *)inUID existingOnly:(BOOL)existingOnly;
+- (AIListGroup *)offlineGroup;
-
-- (AIMetaContact *)groupUIDs:(NSArray *)UIDsArray forServices:(NSArray *)servicesArray;

trunk/Source/AIContactController.m

@@ -77 +77 @@
-
-#define KEY_HIDE_CONTACT_LIST_GROUPS    @"Hide Contact List Groups"
+#define KEY_USE_OFFLINE_GROUP                   @"Use Offline Group"
+#define KEY_SHOW_OFFLINE_CONTACTS               @"Show Offline Contacts"
+
-#define PREF_GROUP_CONTACT_LIST_DISPLAY @"Contact List Display"
-
@@ -121 +124 @@
-
-- (void)_addMenuItemsFromArray:(NSArray *)contactArray toMenu:(NSMenu *)contactMenu target:(id)target offlineContacts:(BOOL)offlineContacts;
+
+- (void)_performChangeOfUseOfflineGroup;
+
-@end
-
@@ -175 +181 @@
-        [self loadContactList];
-        [self sortContactList];
+
+        [[adium preferenceController] registerPreferenceObserver:self forGroup:PREF_GROUP_CONTACT_LIST_DISPLAY];
-}
-
@@ -186 +194 @@
-- (void)dealloc
-{
+        [[adium preferenceController] unregisterPreferenceObserver:self];
+
-    [contactList release];
-    [contactObservers release]; contactObservers = nil;
@@ -496 +506 @@
-                        AIListGroup *targetGroup;
-
-
+
+
+
-
-                        [targetGroup addObject:containingObject];
@@ -507 +519 @@
-                        AIListGroup *localGroup;
-
-
+
+
+
+
-                        [self _moveContactLocally:inContact
-                                                          toGroup:localGroup];
@@ -617 +632 @@
-{
-        if (inFlag != useContactListGroups) {
-
-                useContactListGroups = inFlag;
-
@@ -682 +696 @@
-
-        //Show offline contacts menu item
-showGroupsMenuItem
+menuItem_showGroups
-                                                                                                        target:self
-                                                                                                        action:@selector(toggleShowGroups:)
-                                                                                         keyEquivalent:@""];
-showGroupsMenuItem
-showGroupsMenuItem
+menuItem_showGroups
+menuItem_showGroups
-
-        //Toolbar
@@ -710 +724 @@
-        //Flip-flop.
-        useContactListGroups = !useContactListGroups;
-showGroupsMenuItem
+menuItem_showGroups
-
-        //Update the contact list.  Do it on the next run loop for better menu responsiveness, as it may be a lengthy procedure.
@@ -726 +740 @@
-                                                                                  @"togglegroups")
-                                                                forClass:[self class]]];
+}
+
+- (BOOL)useOfflineGroup
+{
+        return useOfflineGroup;
+}
+
+- (void)setUseOfflineGroup:(BOOL)inFlag
+{
+        if (inFlag != useOfflineGroup) {
+                useOfflineGroup = inFlag;
+                
+                if (useOfflineGroup) {
+                        [self registerListObjectObserver:self]; 
+                } else {
+                        [self updateAllListObjectsForObserver:self];
+                        [self unregisterListObjectObserver:self];       
+                }
+        }
+}
+
+- (AIListGroup *)offlineGroup
+{
+        return [self groupWithUID:AILocalizedString(@"Offline", "Name of offline group")];
-}
-
@@ -1232 +1270 @@
-        return listObject;
-}
+
+#pragma mark Preference observing
+/*!
+* @brief Preferences changed
+ */
+- (void)preferencesChangedForGroup:(NSString *)group key:(NSString *)key
+                                                        object:(AIListObject *)object preferenceDict:(NSDictionary *)prefDict firstTime:(BOOL)firstTime
+{
+        if (firstTime ||
+                [key isEqualToString:KEY_USE_OFFLINE_GROUP]) {
+
+                [self setUseOfflineGroup:[[prefDict objectForKey:KEY_USE_OFFLINE_GROUP] boolValue]];
+        }
+}
+
+- (NSSet *)updateListObject:(AIListObject *)inObject keys:(NSSet *)inModifiedKeys silent:(BOOL)silent
+{
+        if (!inModifiedKeys ||
+                [inModifiedKeys containsObject:@"Online"]) {
+
+                if ([inObject isKindOfClass:[AIListContact class]]) {                   
+                        //If this contact is not its own parent contact, don't bother since we'll get an update for the parent if appropriate
+                        if (inObject == [(AIListContact *)inObject parentContact]) {
+                                if (useOfflineGroup) {
+                                        AIListObject *containingObject = [inObject containingObject];
+                                        
+                                        if ([inObject online] &&
+                                                (containingObject == [self offlineGroup])) {
+                                                [inObject restoreGrouping];
+                                                
+                                        } else if (![inObject online] &&
+                                                           containingObject &&
+                                                           (containingObject != [self offlineGroup])) {
+                                                [self _moveContactLocally:inObject
+                                                                                  toGroup:[self offlineGroup]];
+                                        }
+                                        
+                                } else {
+                                        if ([inObject containingObject] == [self offlineGroup]) {
+                                                [inObject restoreGrouping];
+                                        }
+                                }
+                        }
+                }
+        }
+        
+        return nil;
+}
+
-//Contact Info --------------------------------------------------------------------------------
-#pragma mark Contact Info

trunk/Source/AIOfflineContactHidingPlugin.h

@@ -20 +20 @@
-
-@interface AIOfflineContactHidingPlugin : AIPlugin <AIListObjectObserver> {
-
+
+
+
-        BOOL                    showOfflineContacts;
-        BOOL                    useContactListGroups;
-
+
-}
-

trunk/Source/AIOfflineContactHidingPlugin.m

@@ -30 +30 @@
-#define SHOW_OFFLINE_MENU_TITLE                         AILocalizedString(@"Show Offline Contacts",nil)
-#define KEY_SHOW_OFFLINE_CONTACTS                       @"Show Offline Contacts"
+
+#define USE_OFFLINE_GROUP_MENU_TITLE            AILocalizedString(@"Show Offline Group",nil)
+#define KEY_USE_OFFLINE_GROUP                           @"Use Offline Group"
+
-#define OFFLINE_CONTACTS_IDENTIFER                      @"OfflineContacts"
-#define KEY_HIDE_CONTACT_LIST_GROUPS            @"Hide Contact List Groups"
@@ -50 +54 @@
-{       
-        //Show offline contacts menu item
-showOfflineMenuItem
+menuItem_showOffline
-                                                                                                         target:self
-                                                                                                         action:@selector(toggleOfflineContactsMenu:)
-                                                                                          keyEquivalent:@"H"];
-
-
+
+
+
+
+
+
+
+
-        //Register preference observer first so values will be correct for the following calls
-        [[adium preferenceController] registerPreferenceObserver:self forGroup:PREF_GROUP_CONTACT_LIST_DISPLAY];
@@ -94 +104 @@
-- (void)dealloc
-{
-showOfflineMenuItem release]; showOfflineMenuItem
+menuItem_showOffline release]; menuItem_showOffline
-        [[NSNotificationCenter defaultCenter] removeObserver:self];
-        
@@ -108 +118 @@
-        showOfflineContacts = [[prefDict objectForKey:KEY_SHOW_OFFLINE_CONTACTS] boolValue];
-        useContactListGroups = ![[prefDict objectForKey:KEY_HIDE_CONTACT_LIST_GROUPS] boolValue];
+        useOfflineGroup = [[prefDict objectForKey:KEY_USE_OFFLINE_GROUP] boolValue];
-
-        if (firstTime) {
@@ -122 +133 @@
-
-        //Update our menu to reflect the current preferences
-
+
+
-}
-
@@ -164 +176 @@
- */
-- (NSSet *)updateListObject:(AIListObject *)inObject keys:(NSSet *)inModifiedKeys silent:(BOOL)silent
-    
+
-    if (inModifiedKeys == nil ||
-           [inModifiedKeys containsObject:@"Online"] ||
@@ -190 +202 @@
-
-                        [inObject setVisible:((useContactListGroups) &&
-
+
+
-                }
-        }
@@ -197 +210 @@
-}
-
+#pragma mark Offline group
+
+- (IBAction)toggleUseOfflineGroup:(id)sender
+{
+        //Store the preference
+        [[adium preferenceController] setPreference:[NSNumber numberWithBool:!useOfflineGroup]
+                                                                                 forKey:KEY_USE_OFFLINE_GROUP
+                                                                                  group:PREF_GROUP_CONTACT_LIST_DISPLAY];
+}
+
+- (BOOL)validateMenuItem:(id <NSMenuItem>)menuItem
+{
+        if (menuItem == menuItem_useOfflineGroup) {
+                return (useContactListGroups && showOfflineContacts);
+        }
+        
+        return YES;
+}
-@end