Changeset 23581

Timestamp:

05/22/2008 11:04:46 PM (6 months ago)

Author:

zacw

Message:

Add an advanced status preference option to "Count unread conversations instead of unread messages". Fixes #8599.

Files:

• trunk/Frameworks/Adium Framework/Source/AIChatControllerProtocol.h (modified) (1 diff)
• trunk/Frameworks/Adium Framework/Source/AIStatusControllerProtocol.h (modified) (1 diff)
• trunk/Plugins/Dock Icon Badging/AIDockBadger.h (modified) (1 diff)
• trunk/Plugins/Dock Icon Badging/AIDockBadger.m (modified) (5 diffs)
• trunk/Plugins/Status Menu Item/CBStatusMenuItemController.h (modified) (1 diff)
• trunk/Plugins/Status Menu Item/CBStatusMenuItemController.m (modified) (3 diffs)
• trunk/Resources/StatusPreferencesAdvanced.nib/classes.nib (modified) (3 diffs)
• trunk/Resources/StatusPreferencesAdvanced.nib/info.nib (modified) (1 diff)
• trunk/Resources/StatusPreferencesAdvanced.nib/keyedobjects.nib (modified) (previous)
• trunk/Source/AIChatController.m (modified) (1 diff)
• trunk/Source/ESStatusAdvancedPreferences.h (modified) (1 diff)
• trunk/Source/ESStatusAdvancedPreferences.m (modified) (1 diff)

trunk/Frameworks/Adium Framework/Source/AIChatControllerProtocol.h

@@ -40 +40 @@
-- (AIChat *)mostRecentUnviewedChat;
-- (int)unviewedContentCount;
+- (int)unviewedConversationCount;
-- (void)switchChat:(AIChat *)chat toAccount:(AIAccount *)newAccount;
-- (void)switchChat:(AIChat *)chat toListContact:(AIListContact *)inContact usingContactAccount:(BOOL)useContactAccount;

trunk/Frameworks/Adium Framework/Source/AIStatusControllerProtocol.h

@@ -31 +31 @@
-
-#define PREF_GROUP_STATUS_PREFERENCES                   @"Status Preferences"
+#define KEY_STATUS_CONVERSATION_COUNT                   @"Unread Conversations"
-#define KEY_STATUS_REPORT_IDLE                                  @"Report Idle"
-#define KEY_STATUS_REPORT_IDLE_INTERVAL                 @"Report Idle Interval"

trunk/Plugins/Dock Icon Badging/AIDockBadger.h

@@ -26 +26 @@
-        
-        BOOL                                            shouldBadge;
+        BOOL                                            showConversationCount;
-}
-

trunk/Plugins/Dock Icon Badging/AIDockBadger.m

@@ -19 +19 @@
-#import <Adium/AIContactControllerProtocol.h>
-#import <Adium/AIContentControllerProtocol.h>
+#import <Adium/AIStatusControllerProtocol.h>
-#import "AIDockController.h"
-#import <Adium/AIInterfaceControllerProtocol.h>
@@ -56 +57 @@
-        //Observe pref changes
-        [[adium preferenceController] registerPreferenceObserver:self forGroup:PREF_GROUP_APPEARANCE];
+        
+        // Register as an observer of the status preferences for unread conversation count
+        [[adium preferenceController] registerPreferenceObserver:self
+                                                                                                        forGroup:PREF_GROUP_STATUS_PREFERENCES];
-}
-
@@ -98 +103 @@
-                                                        object:(AIListObject *)object preferenceDict:(NSDictionary *)prefDict firstTime:(BOOL)firstTime
-{
-!key || [key isEqualToString:KEY_BADGE_DOCK_ICON]
+[group isEqualToString:PREF_GROUP_APPEARANCE] && (!key || [key isEqualToString:KEY_BADGE_DOCK_ICON])
-                BOOL    newShouldBadge = [[prefDict objectForKey:KEY_BADGE_DOCK_ICON] boolValue];
-                if (newShouldBadge != shouldBadge) {
@@ -121 +126 @@
-                }
-        }
+        
+        if ([group isEqualToString:PREF_GROUP_STATUS_PREFERENCES]) {
+                showConversationCount = [[prefDict objectForKey:KEY_STATUS_CONVERSATION_COUNT] boolValue];
+        }
-}       
-
@@ -186 +195 @@
-- (void)_setOverlay
-{
-
+
+
-
-        if (contentCount != lastUnviewedContentCount) {

trunk/Plugins/Status Menu Item/CBStatusMenuItemController.h

@@ -46 +46 @@
-        NSTimer                                 *unviewedContentFlash;
-        
+        BOOL                                    showConversationCount;
+        
-        BOOL                                    showBadge;
-        BOOL                                    showUnreadCount;

trunk/Plugins/Status Menu Item/CBStatusMenuItemController.m

@@ -136 +136 @@
-            [[adium contactController] registerListObjectObserver:self];
-                
-offline
+groups
-                [[adium preferenceController] registerPreferenceObserver:self
-                                                                                                                forGroup:PREF_GROUP_CONTACT_LIST_DISPLAY];
-                
+                // Register as an observer of the status preferences for unread conversation count
+                [[adium preferenceController] registerPreferenceObserver:self
+                                                                                                                forGroup:PREF_GROUP_STATUS_PREFERENCES];                
+                
-                // Register as an observer of our own preference group
-                [[adium preferenceController] registerPreferenceObserver:self
-         
+
-                
-                //Register to recieve active state changed notifications
@@ -250 +254 @@
-- (void)updateUnreadCount
-{
-
+
+
-
-        // Only show if enabled and greater-than zero; otherwise, set to nil.
@@ -843 +848 @@
-                [self updateStatusItemLength];
-        }
+        
+        if ([group isEqualToString:PREF_GROUP_STATUS_PREFERENCES]) {
+                showConversationCount = [[prefDict objectForKey:KEY_STATUS_CONVERSATION_COUNT] boolValue];
+        }
-}
-

trunk/Resources/StatusPreferencesAdvanced.nib/classes.nib

@@ -15 +15 @@
-                <dict>
-                        <key>CLASS</key>
+                        <string>RBSplitView</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                        <key>OUTLETS</key>
+                        <dict>
+                                <key>delegate</key>
+                                <string>id</string>
+                        </dict>
+                        <key>SUPERCLASS</key>
+                        <string>RBSplitSubview</string>
+                </dict>
+                <dict>
+                        <key>CLASS</key>
-                        <string>NSTextField</string>
-                        <key>LANGUAGE</key>
@@ -30 +43 @@
-                </dict>
-                <dict>
+                        <key>CLASS</key>
+                        <string>RBSplitSubview</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                        <key>SUPERCLASS</key>
+                        <string>NSView</string>
+                </dict>
+                <dict>
-                        <key>ACTIONS</key>
-                        <dict>
-                                <key>adiumPrint</key>
-                                <string>id</string>
+                                <key>didAdjustSubviews</key>
+                                <string>RBSplitView</string>
-                                <key>prefsWindowWillClose</key>
-                                <string>SS_PrefsController</string>
+                                <key>toggleFindPanel</key>
+                                <string>id</string>
+                                <key>willAdjustSubviews</key>
+                                <string>RBSplitView</string>
-                        </dict>
-                        <key>CLASS</key>
@@ -127 +154 @@
-                                <string>NSButton</string>
-                                <key>checkBox_statusWindowHideInBackground</key>
+                                <string>NSButton</string>
+                                <key>checkBox_unreadConversations</key>
-                                <string>NSButton</string>
-                                <key>label_quitConfirmation</key>

trunk/Resources/StatusPreferencesAdvanced.nib/info.nib

@@ -14 +14 @@
-        </array>
-        <key>IBSystem Version</key>
-B18
+C7010
-        <key>targetFramework</key>
-        <string>IBCocoaFramework</string>

trunk/Source/AIChatController.m

@@ -720 +720 @@
-
-/*!
+ * @brief Gets the total number of conversations with unviewed messages
+ * 
+ * @result The number of conversations with unviewed messages
+ */
+- (int)unviewedConversationCount
+{
+        int                             count = 0;
+        AIChat                  *chat;
+        NSEnumerator    *enumerator;
+        
+        enumerator = [[self openChats] objectEnumerator];
+        while ((chat = [enumerator nextObject])) {
+                if ([chat unviewedContentCount] > 0)
+                        count++;
+        }
+        return count;
+}
+
+/*!
- * @brief Is the passed contact in a group chat?
- *

trunk/Source/ESStatusAdvancedPreferences.h

@@ -9 +9 @@
-
-@interface ESStatusAdvancedPreferences : AIAdvancedPreferencePane {
+        IBOutlet        NSButton        *checkBox_unreadConversations;
+        
-        IBOutlet        NSTextField     *label_statusWindow;
-        IBOutlet        NSButton        *checkBox_statusWindowHideInBackground;

trunk/Source/ESStatusAdvancedPreferences.m

@@ -51 +51 @@
-- (void)viewDidLoad
-{
+        [checkBox_unreadConversations setLocalizedString:AILocalizedString(@"Count unread conversations instead of unread messages", nil)];
+        
-        [label_statusWindow setLocalizedString:AILocalizedString(@"Away Status Window", nil)];
-        [checkBox_statusWindowHideInBackground setLocalizedString:AILocalizedString(@"Hide the status window when Adium is not active", nil)];