Changeset 3570

Timestamp:

01/26/07 21:45:40 (2 years ago)

Author:

timothy

Message:

Allows a user to enable/disable all notifications on a per-channel basis. At the moment, the only access is through the channel context menu. Details at http://tim.littlebluefrog.com/?p=561. Patch by tpokorny. #977

Files:

• trunk/Panels/JVChatRoomPanel.m (modified) (9 diffs)
• trunk/Panels/JVDirectChatPanel.h (modified) (1 diff)
• trunk/Panels/JVDirectChatPanel.m (modified) (7 diffs)

trunk/Panels/JVChatRoomPanel.m

@@ -242 +242 @@
-        }
-
+        [menu addItem:[NSMenuItem separatorItem]];
+
+        item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Ignore Notifications", "lists whether or not notifications are enabled") action:@selector( toggleNotifications: ) keyEquivalent:@""];
+        [item setEnabled:YES];
+        [item setTarget:self];
+        [menu addItem:item];
+        [item release];
+        
-        return [menu autorelease];
-}
@@ -267 +275 @@
-        }
-        
-YES
+[super validateMenuItem: menuItem]
-}
-
@@ -332 +340 @@
-                [context setObject:self forKey:@"target"];
-                [context setObject:NSStringFromSelector( @selector( activate: ) ) forKey:@"action"];
-[JVNotificationController defaultController]
+self
-        }
-
@@ -342 +350 @@
-                [context setObject:self forKey:@"target"];
-                [context setObject:NSStringFromSelector( @selector( activate: ) ) forKey:@"action"];
-[JVNotificationController defaultController]
+self
-
-                [_nextMessageAlertMembers removeObject:[message sender]];
@@ -958 +966 @@
-        [context setObject:self forKey:@"target"];
-        [context setObject:NSStringFromSelector( @selector( activate: ) ) forKey:@"action"];
-[JVNotificationController defaultController]
+self
-
-        [listItem release];
@@ -993 +1001 @@
-        [context setObject:self forKey:@"target"];
-        [context setObject:NSStringFromSelector( @selector( activate: ) ) forKey:@"action"];
-[JVNotificationController defaultController]
+self
-
-        [_preferredTabCompleteNicknames removeObject:[mbr nickname]];
@@ -1036 +1044 @@
-        [context setObject:self forKey:@"target"];
-        [context setObject:NSStringFromSelector( @selector( activate: ) ) forKey:@"action"];
-[JVNotificationController defaultController]
+self
-
-        // auto-rejoin on kick
@@ -1090 +1098 @@
-        [context setObject:self forKey:@"target"];
-        [context setObject:NSStringFromSelector( @selector( activate: ) ) forKey:@"action"];
-[JVNotificationController defaultController]
+self
-
-        [mbr release];
@@ -1314 +1322 @@
-                [context setObject:self forKey:@"target"];
-                [context setObject:NSStringFromSelector( @selector( activate: ) ) forKey:@"action"];
-[JVNotificationController defaultController]
+self
-        }
-}

trunk/Panels/JVDirectChatPanel.h

@@ -63 +63 @@
-- (JVMutableChatMessage *) currentMessage;
-
+- (void) performNotification:(NSString *) identifier withContextInfo:(NSDictionary *) context;
+
-- (unsigned int) newMessagesWaiting;
-- (unsigned int) newHighlightMessagesWaiting;

trunk/Panels/JVDirectChatPanel.m

@@ -462 +462 @@
-        [menu addItem:[NSMenuItem separatorItem]];
-
+        item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Ignore Notifications", "lists whether or not notifications are enabled for this conversation") action:@selector( toggleNotifications: ) keyEquivalent:@""];
+        [item setTarget:self];
+        [menu addItem:item];
+        [item release];
+        
+        [menu addItem:[NSMenuItem separatorItem]];
+
-        if( [[[self windowController] allChatViewControllers] count] > 1 ) {
-                item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Detach From Window", "detach from window contextual menu item title" ) action:@selector( detachView: ) keyEquivalent:@""];
@@ -483 +490 @@
-
-        return [menu autorelease];
+}
+
+- (BOOL) validateMenuItem:(NSMenuItem *) menuItem {
+        if( [menuItem action] == @selector( toggleNotifications: ) ) {
+                if( [[self preferenceForKey:@"muted"] boolValue] )
+                        [menuItem setState:NSOnState];
+                else [menuItem setState:NSOffState];
+        }
+        
+        return YES;
-}
-
@@ -830 +847 @@
-                [context setObject:self forKey:@"target"];
-                [context setObject:NSStringFromSelector( @selector( activate: ) ) forKey:@"action"];
-[JVNotificationController defaultController]
+self
-        }
-
@@ -839 +856 @@
-                else [context setObject:[NSString stringWithFormat:NSLocalizedString( @"%@'s message was ignored.", "direct chat user ignored bubble text" ), user] forKey:@"description"];
-                [context setObject:[NSImage imageNamed:@"activity"] forKey:@"image"];
-[JVNotificationController defaultController]
+self
-        }
-
@@ -889 +906 @@
-                        [context setObject:self forKey:@"target"];
-                        [context setObject:NSStringFromSelector( @selector( activate: ) ) forKey:@"action"];
-[JVNotificationController defaultController]
+self
-                } else if( [message ignoreStatus] == JVNotIgnored ) {
-                        NSMutableDictionary *context = [NSMutableDictionary dictionary];
@@ -899 +916 @@
-                        [context setObject:self forKey:@"target"];
-                        [context setObject:NSStringFromSelector( @selector( activate: ) ) forKey:@"action"];
-[JVNotificationController defaultController]
+self
-                }
-        }
@@ -944 +961 @@
-- (JVMutableChatMessage *) currentMessage {
-        return _currentMessage;
+}
+
+#pragma mark -
+#pragma mark Notifications Handling
+
+/**
+ * This method should be used to handle all notification processing. It will check to see if
+ * notifications have been muted for the given chat room, and if they have, it will not pass
+ * the notification request on to the JVNotificationController.
+ */
+- (void) performNotification:(NSString *) identifier withContextInfo:(NSDictionary *) context {
+        if( ![[self preferenceForKey:@"muted"] boolValue] )
+                [[JVNotificationController defaultController] performNotification:identifier withContextInfo:context];
+}
+
+/**
+ * Toggles notifications (this is for private, direct user-user chats)
+ */
+- (IBAction) toggleNotifications:(id) sender {
+        if( [self preferenceForKey:@"muted"] == [NSNumber numberWithBool:YES] )
+                [self setPreference:[NSNumber numberWithBool:NO] forKey:@"muted"];
+        else [self setPreference:[NSNumber numberWithBool:YES] forKey:@"muted"];
-}
-