Changeset 3214

Timestamp:

04/20/06 02:30:38 (2 years ago)

Author:

timothy

Message:

New message counts in the drawer/sidebar.

Files:

• trunk/Colloquy.xcodeproj/project.pbxproj (modified) (3 diffs)
• trunk/Controllers/JVChatWindowController.m (modified) (1 diff)
• trunk/Panels/JVDirectChatPanel.m (modified) (3 diffs)
• trunk/Views/JVDetailCell.h (modified) (2 diffs)
• trunk/Views/JVDetailCell.m (modified) (6 diffs)
• trunk/Views/JVSideStatusView.m (modified) (1 diff)

trunk/Colloquy.xcodeproj/project.pbxproj

@@ -650 +650 @@
-                1CBA4E64062CCDA90082D1BF /* infoWidget.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = infoWidget.png; path = Resources/infoWidget.png; sourceTree = SOURCE_ROOT; };
-                1CBA4E65062CCDA90082D1BF /* infoWidgetPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = infoWidgetPressed.png; path = Resources/infoWidgetPressed.png; sourceTree = SOURCE_ROOT; };
-file
-file
+image.png
+image.png
-                1CBB23D504EFE24C000001C8 /* viewAlert.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = viewAlert.png; path = Resources/viewAlert.png; sourceTree = SOURCE_ROOT; };
-                1CBB23D604EFE24C000001C8 /* viewAlertSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = viewAlertSelected.png; path = Resources/viewAlertSelected.png; sourceTree = SOURCE_ROOT; };
@@ -2914 +2914 @@
-                        baseConfigurationReference = 1C6A13ED08666E62009EE6D2 /* Common Settings.xcconfig */;
-                        buildSettings = {
+                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                                GCC_OPTIMIZATION_LEVEL = 0;
-                                GCC_PREFIX_HEADER = Colloquy.pch;
@@ -2924 +2925 @@
-                                PRODUCT_NAME = Colloquy;
-                                WRAPPER_EXTENSION = app;
+                                ZERO_LINK = YES;
-                        };
-                        name = Development;

trunk/Controllers/JVChatWindowController.m

@@ -675 +675 @@
-                [cell setEnabled:[item isEnabled]];
-        } else [cell setEnabled:YES];
+
+        if( [item respondsToSelector:@selector( newMessagesWaiting )] ) {
+                [(JVDetailCell *) cell setStatusNumber:[item newMessagesWaiting]];
+        } else [(JVDetailCell *) cell setStatusNumber:0];
+
+        if( [item respondsToSelector:@selector( newHighlightMessagesWaiting )] ) {
+                [(JVDetailCell *) cell setImportantStatusNumber:[item newHighlightMessagesWaiting]];
+        } else [(JVDetailCell *) cell setImportantStatusNumber:0];
-}
-

trunk/Panels/JVDirectChatPanel.m

@@ -430 +430 @@
-                return ( [_waitingAlerts count] ? [NSImage imageNamed:@"AlertCautionIcon"] : ( _newMessageCount ? ( _newHighlightMessageCount ? [NSImage imageNamed:@"privateChatTabNewMessage"] : [NSImage imageNamed:@"privateChatTabNewMessage"] ) : nil ) );
-
-( _newMessageCount ? ( _newHighlightMessageCount ? [NSImage imageNamed:@"newHighlightMessage"] : [NSImage imageNamed:@"newMessage"] ) : nil )
+nil
-}
-
@@ -448 +448 @@
-}
-
+- (void) willSelect {
+        _newMessageCount = 0;
+        _newHighlightMessageCount = 0;
+}
+
-- (void) didSelect {
-        if( ! [[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatInputAutoResizes"] ) {
@@ -456 +461 @@
-        _newHighlightMessageCount = 0;
-        _isActive = YES;
+
-        [super didSelect];
+
-        [_windowController reloadListItem:self andChildren:NO];
-        [[[self view] window] makeFirstResponder:send];
+
-        if( [_waitingAlerts count] )
-                [[NSApplication sharedApplication] beginSheet:[_waitingAlerts objectAtIndex:0] modalForWindow:[_windowController window] modalDelegate:self didEndSelector:@selector( _alertSheetDidEnd:returnCode:contextInfo: ) contextInfo:NULL];

trunk/Views/JVDetailCell.h

@@ -6 +6 @@
-        NSString *_infoText;
-        NSLineBreakMode _lineBreakMode;
+        unsigned _statusNumber;
+        unsigned _importantStatusNumber;
-}
-- (void) setStatusImage:(NSImage *) image;
@@ -21 +23 @@
-- (void) setLineBreakMode:(NSLineBreakMode) mode;
-- (NSLineBreakMode) lineBreakMode;
+
+- (void) setStatusNumber:(unsigned) number;
+- (unsigned) statusNumber;
+
+- (void) setImportantStatusNumber:(unsigned) number;
+- (unsigned) importantStatusNumber;
-@end

trunk/Views/JVDetailCell.m

@@ -55 +55 @@
-#pragma mark -
-
+- (void) setStatusNumber:(unsigned) number {
+        _statusNumber = number;
+}
+
+- (unsigned) statusNumber {
+        return _statusNumber;
+}
+
+#pragma mark -
+
+- (void) setImportantStatusNumber:(unsigned) number {
+        _importantStatusNumber = number;
+}
+
+- (unsigned) importantStatusNumber {
+        return _importantStatusNumber;
+}
+
+#pragma mark -
+
-- (void) setHighlightedImage:(NSImage *) image {
-        [_altImage autorelease];
@@ -129 +149 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#define JVDetailCellImageLabelPadding 5.
-2
+3
-#define JVDetailCellStatusImageLeftPadding 2.
-#define JVDetailCellStatusImageRightPadding JVDetailCellStatusImageLeftPadding
-
+        float statusWidth = ( _statusImage ? [_statusImage size].width + JVDetailCellStatusImageRightPadding : 0. );
+        if( ! _statusImage && _statusNumber || _importantStatusNumber ) {
+                NSColor *textColor = [NSColor whiteColor];
+                NSColor *backgroundColor = [NSColor colorWithCalibratedRed:0.5803921568627451 green:0.6705882352941176 blue:0.7882352941176471 alpha:1.];
+                NSColor *importantColor = [NSColor colorWithCalibratedRed:0.831372549019608 green:0.572549019607843 blue:0.541176470588235 alpha:1.];
+
+                if( ! _statusNumber && _importantStatusNumber )
+                        backgroundColor = importantColor;
+
+                if( [self isHighlighted] ) {
+                        textColor = [backgroundColor shadowWithLevel:0.2];
+                        backgroundColor = [backgroundColor highlightWithLevel:0.7];
+                }
+
+                NSFont *font = [[NSFontManager sharedFontManager] fontWithFamily:@"Helvetica" traits:NSBoldFontMask weight:9 size:11.];
+                NSMutableParagraphStyle *numberParaStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] autorelease];
+                [numberParaStyle setAlignment:NSCenterTextAlignment];
+
+                NSDictionary *statusNumberAttributes = [NSDictionary dictionaryWithObjectsAndKeys:font, NSFontAttributeName, numberParaStyle, NSParagraphStyleAttributeName, textColor, NSForegroundColorAttributeName, [NSNumber numberWithFloat:1.0], NSKernAttributeName, nil];
+
+                NSString *statusText = [NSString stringWithFormat:@"%d", ( _statusNumber ? _statusNumber : _importantStatusNumber )];
+                NSSize numberSize = [statusText sizeWithAttributes:statusNumberAttributes];
+                statusWidth = numberSize.width + 12.;
+
+                if( imageWidth + ( imageWidth ? JVDetailCellImageLabelPadding : JVDetailCellLabelPadding ) + statusWidth < NSWidth( cellFrame ) ) {
+                        float radius = 8.;
+                        NSRect mainRect = NSMakeRect( NSMinX( cellFrame ) + NSWidth( cellFrame ) - statusWidth - 2., NSMinY( cellFrame ) + ( ( NSHeight( cellFrame ) / 2 ) - 8 ), statusWidth, 16. );
+                        NSRect pathRect = NSInsetRect( mainRect, radius, radius );
+
+                        NSBezierPath *mainPath = [NSBezierPath bezierPath];
+                        [mainPath appendBezierPathWithArcWithCenter:NSMakePoint( NSMinX( pathRect ), NSMinY( pathRect ) ) radius:radius startAngle:180. endAngle:270.];
+                        [mainPath appendBezierPathWithArcWithCenter:NSMakePoint( NSMaxX( pathRect ), NSMinY( pathRect ) ) radius:radius startAngle:270. endAngle:360.];
+                        [mainPath appendBezierPathWithArcWithCenter:NSMakePoint( NSMaxX( pathRect ), NSMaxY( pathRect ) ) radius:radius startAngle:0. endAngle:90.];
+                        [mainPath appendBezierPathWithArcWithCenter:NSMakePoint( NSMinX( pathRect ), NSMaxY( pathRect ) ) radius:radius startAngle:90. endAngle:180.];
+                        [mainPath closePath];
+
+                        if( _importantStatusNumber ) {
+                                NSString *importantStatusText = [NSString stringWithFormat:@"%d", _importantStatusNumber];
+                                numberSize = [importantStatusText sizeWithAttributes:statusNumberAttributes];
+                                float mainStatusWidth = statusWidth;
+                                statusWidth += numberSize.width + 10.;
+                                radius = 7.;
+
+                                NSRect rect = NSMakeRect( NSMinX( cellFrame ) + NSWidth( cellFrame ) - statusWidth - 2., NSMinY( cellFrame ) + ( ( NSHeight( cellFrame ) / 2 ) - 7 ), statusWidth - mainStatusWidth + 10., 14. );
+                                pathRect = NSInsetRect( rect, radius, radius );
+
+                                NSBezierPath *path = [NSBezierPath bezierPath];
+                                [path appendBezierPathWithArcWithCenter:NSMakePoint( NSMinX( pathRect ), NSMinY( pathRect ) ) radius:radius startAngle:180. endAngle:270.];
+                                [path appendBezierPathWithArcWithCenter:NSMakePoint( NSMaxX( pathRect ), NSMinY( pathRect ) ) radius:radius startAngle:270. endAngle:360.];
+                                [path appendBezierPathWithArcWithCenter:NSMakePoint( NSMaxX( pathRect ), NSMaxY( pathRect ) ) radius:radius startAngle:0. endAngle:90.];
+                                [path appendBezierPathWithArcWithCenter:NSMakePoint( NSMinX( pathRect ), NSMaxY( pathRect ) ) radius:radius startAngle:90. endAngle:180.];
+                                [path closePath];
+
+                                if( [self isHighlighted] ) [[NSColor whiteColor] set];
+                                else [[NSColor colorWithCalibratedRed:0.92156862745098 green:0.231372549019608 blue:0.243137254901961 alpha:0.85] set];
+                                [path fill];
+
+                                rect.origin.x -= 3.;
+                                [importantStatusText drawInRect:rect withAttributes:statusNumberAttributes];
+                        }
+
+                        [backgroundColor set];
+                        [mainPath fill];
+
+                        if( _importantStatusNumber ) {
+                                if( [self isHighlighted] ) [[NSColor colorWithCalibratedRed:0.5803921568627451 green:0.6705882352941176 blue:0.7882352941176471 alpha:1.] set];
+                                else [[NSColor whiteColor] set];
+
+                                [mainPath setLineWidth:1.25];
+                                [mainPath stroke];
+                        }
+
+                        mainRect.origin.y += 1.;
+                        [statusText drawInRect:mainRect withAttributes:statusNumberAttributes];
+
+                        statusWidth += JVDetailCellStatusImageRightPadding + 3.;
+
+                } else statusWidth = 0.;
+        }
+
-        if( ( ! [_infoText length] && [_mainText length] ) || ( ( subStringSize.height + mainStringSize.height ) >= NSHeight( cellFrame ) - 2. ) ) {
-                float mainYLocation = 0.;
@@ -155 +257 @@
-                if( NSHeight( cellFrame ) >= mainStringSize.height ) {
-                        mainYLocation = NSMinY( cellFrame ) + ( NSHeight( cellFrame ) / 2 ) - ( mainStringSize.height / 2 );
-( _statusImage ? [_statusImage size].width + JVDetailCellStatusImageRightPadding : 0. )
+statusWidth
-                }
-        } else if( [_infoText length] && [_mainText length] ) {
@@ -162 +264 @@
-                if( NSHeight( cellFrame ) >= mainStringSize.height ) {
-                        mainYLocation = NSMinY( cellFrame ) + ( NSHeight( cellFrame ) / 2 ) - mainStringSize.height + ( JVDetailCellTextLeading / 2. );
-( _statusImage ? [_statusImage size].width + JVDetailCellStatusImageRightPadding : 0. )
+statusWidth
-
-                        subYLocation = NSMinY( cellFrame ) + ( NSHeight( cellFrame ) / 2 ) + subStringSize.height - mainStringSize.height + ( JVDetailCellTextLeading / 2. );
-( _statusImage ? [_statusImage size].width + JVDetailCellStatusImageRightPadding : 0. )
+statusWidth
-                }
-        }
-
-        if( _statusImage && NSHeight( cellFrame ) >= [_statusImage size].height ) {
-[_statusImage size].width - JVDetailCellStatusImageRightPadding
+statusWidth
-        }
-}
@@ -190 +292 @@
-- (NSLineBreakMode) lineBreakMode {
-        return _lineBreakMode;
+}
+
+- (void) setStringValue:(NSString *) string {
+        [self setMainText:string];
-}
-
@@ -203 +309 @@
-        return _mainText;
-}
-
-- (void) setStringValue:(NSString *) string {
-        [self setMainText:string];
-}
-@end

trunk/Views/JVSideStatusView.m

@@ -64 +64 @@
-                newFrame.size.width = MIN( max, newFrame.size.width );
-        }
-
+
-        [[self superview] setFrame:newFrame];
-