Changeset 2180

Timestamp:

12/30/04 22:55:01 (4 years ago)

Author:

timothy

Message:

* Made the scrollbar marks more accurately aligned, if the knob is covering marks that means the highlighted messages are always visible now.
* Added a jump to next/previous highlight so you can quickly skip back and see where you were mentioned. Command-[ and Command-]. Also available in the scrollbar's context menu.
* Added a Clear Scrollback menu item under View as Command-K (this matches Terminal.app's key combo.)
Note to localizers: 3 new menu items need translated in the View menu. And 2 new localized string items.

Files:

• trunk/JVChatTranscript.m (modified) (1 diff)
• trunk/JVMarkedScroller.h (modified) (1 diff)
• trunk/JVMarkedScroller.m (modified) (6 diffs)
• trunk/Languages/Dutch.lproj/Colloquy.nib/classes.nib (modified) (2 diffs)
• trunk/Languages/Dutch.lproj/Colloquy.nib/info.nib (modified) (1 diff)
• trunk/Languages/Dutch.lproj/Colloquy.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/English.lproj/Colloquy.nib/classes.nib (modified) (2 diffs)
• trunk/Languages/English.lproj/Colloquy.nib/info.nib (modified) (1 diff)
• trunk/Languages/English.lproj/Colloquy.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/German.lproj/Colloquy.nib/classes.nib (modified) (2 diffs)
• trunk/Languages/German.lproj/Colloquy.nib/info.nib (modified) (1 diff)
• trunk/Languages/German.lproj/Colloquy.nib/keyedobjects.nib (modified) (previous)

trunk/JVChatTranscript.m

@@ -670 +670 @@
-        else if( ! [[NSUserDefaults standardUserDefaults] boolForKey:@"MVChatIgnoreColors"] && [[toolbarItem itemIdentifier] isEqualToString:NSToolbarShowColorsItemIdentifier] ) return YES;
-        return YES;
+}
+
+#pragma mark -
+#pragma mark Highlight Jumping
+
+- (IBAction) jumpToPreviousHighlight:(id) sender {
+        JVMarkedScroller *scroller = (JVMarkedScroller *)[[[[[display mainFrame] frameView] documentView] enclosingScrollView] verticalScroller];
+        if( [scroller isMemberOfClass:[JVMarkedScroller class]] )
+                [scroller jumpToPreviousMark:sender];
+}
+
+- (IBAction) jumpToNextHighlight:(id) sender {
+        JVMarkedScroller *scroller = (JVMarkedScroller *)[[[[[display mainFrame] frameView] documentView] enclosingScrollView] verticalScroller];
+        if( [scroller isMemberOfClass:[JVMarkedScroller class]] )
+                [scroller jumpToNextMark:sender];
-}
-

trunk/JVMarkedScroller.h

@@ -3 +3 @@
-        NSMutableSet *_marks;
-        NSMutableArray *_shades;
+        unsigned long long _nearestPreviousMark;
+        unsigned long long _nearestNextMark;
+        unsigned long long _currentMark;
+        BOOL _jumpingToMark;
-}
+- (IBAction) jumpToPreviousMark:(id) sender;
+- (IBAction) jumpToNextMark:(id) sender;
+
-- (void) shiftMarksAndShadedAreasBy:(long long) displacement;
-

trunk/JVMarkedScroller.m

@@ -6 +6 @@
-                _marks = [[NSMutableSet set] retain];
-                _shades = [[NSMutableArray array] retain];
+                _nearestPreviousMark = NSNotFound;
+                _nearestNextMark = NSNotFound;
+                _currentMark = NSNotFound;
-        }
-        return self;
@@ -20 +23 @@
-}
-
+#pragma mark -
+
-- (void) drawRect:(NSRect) rect {
-        NSEraseRect( rect );
-        [super drawRect:rect];
-
@@ -27 +31 @@
-        float width = [[self class] scrollerWidthForControlSize:[self controlSize]];
-
-
-
+
-        [transform scaleXBy:( sFlags.isHoriz ? scale : 1. ) yBy:( sFlags.isHoriz ? 1. : scale )];
-
- + 6.
+
-        [transform translateXBy:( sFlags.isHoriz ? offset / scale : 0. ) yBy:( sFlags.isHoriz ? 0. : offset / scale )];
-
-
-
+
-
-        NSBezierPath *shades = [NSBezierPath bezierPath];
@@ -73 +75 @@
-        [shades fill];
-
-
-
+
-
-        NSBezierPath *lines = [NSBezierPath bezierPath];
-        enumerator = [_marks objectEnumerator];
-
+        unsigned long long currentPosition = ( _currentMark != NSNotFound ? _currentMark : [self floatValue] * ( NSHeight( [self frame] ) / [self knobProportion] ) );
+        BOOL foundNext = NO, foundPrevious = NO;
+        NSRect knobRect = [self rectForPart:NSScrollerKnob];
+
-        while( ( startNum = [enumerator nextObject] ) ) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                point = [transform transformPoint:point];
-                point.x = ( sFlags.isHoriz ? roundf( point.x ) + 0.5 : point.x );
-                point.y = ( sFlags.isHoriz ? point.y : roundf( point.y ) + 0.5 );
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        [[NSColor selectedKnobColor] set];
-        [lines stroke];
-
-        [self drawKnob];
-}
-
-- (void) setFloatValue:(float) position knobProportion:(float) percent {
+        if( ! _jumpingToMark ) _currentMark = NSNotFound;
-        [self setNeedsDisplayInRect:[self rectForPart:NSScrollerKnobSlot]];
-        [super setFloatValue:position knobProportion:percent];
@@ -128 +149 @@
-        }
-
+        [menu addItem:[NSMenuItem separatorItem]];
+
+        item = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Jump to Previous Mark", "jump to previous mark contextual menu") action:@selector( jumpToPreviousMark: ) keyEquivalent:@"["] autorelease];
+        [item setTarget:self];
+        [menu addItem:item];
+
+        item = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Jump to Next Mark", "jump to next mark contextual menu") action:@selector( jumpToNextMark: ) keyEquivalent:@"]"] autorelease];
+        [item setTarget:self];
+        [menu addItem:item];
+
-        return menu;
-}
+
+#pragma mark -
-
-- (IBAction) clearMarksHereLess:(id) sender {
-        NSEvent *event = [[NSApplication sharedApplication] currentEvent];
-        NSPoint where = [self convertPoint:[event locationInWindow] fromView:nil];
-
-
+
-        [self removeMarksLessThan:( ( sFlags.isHoriz ? where.x : where.y ) / scale )];
-}
@@ -142 +174 @@
-        NSEvent *event = [[NSApplication sharedApplication] currentEvent];
-        NSPoint where = [self convertPoint:[event locationInWindow] fromView:nil];
-
-
+
-        [self removeMarksGreaterThan:( ( sFlags.isHoriz ? where.x : where.y ) / scale )];
+}
+
+#pragma mark -
+
+- (IBAction) jumpToPreviousMark:(id) sender {
+        if( _nearestPreviousMark != NSNotFound ) {
+                _currentMark = _nearestPreviousMark;
+                _jumpingToMark = YES;
+                float scale = NSHeight( [self rectForPart:NSScrollerKnobSlot] ) / ( NSHeight( [self frame] ) / [self knobProportion] );
+                float shift = ( NSHeight( [self rectForPart:NSScrollerKnob] ) / 2. ) / scale;
+                [[(NSScrollView *)[self superview] documentView] scrollPoint:NSMakePoint( 0., _nearestPreviousMark - shift )];
+                _jumpingToMark = NO;
+        }
+}
+
+- (IBAction) jumpToNextMark:(id) sender {
+        if( _nearestNextMark != NSNotFound ) {
+                _currentMark = _nearestNextMark;
+                _jumpingToMark = YES;
+                float scale = NSHeight( [self rectForPart:NSScrollerKnobSlot] ) / ( NSHeight( [self frame] ) / [self knobProportion] );
+                float shift = ( NSHeight( [self rectForPart:NSScrollerKnob] ) / 2. ) / scale;
+                [[(NSScrollView *)[self superview] documentView] scrollPoint:NSMakePoint( 0., _nearestNextMark - shift )];
+                _jumpingToMark = NO;
+        }
-}
-

trunk/Languages/Dutch.lproj/Colloquy.nib/classes.nib

@@ -4 +4 @@
-            ACTIONS = {
-                bold = id; 
+                clearDisplay = id; 
-                closeCurrentPanel = id; 
-                detachCurrentPanel = id; 
@@ -9 +10 @@
-                italic = id; 
-                joinRoom = id; 
+                jumpToNextHighlight = id; 
+                jumpToPreviousHighlight = id; 
-                newConnection = id; 
-                selectNextActivePanel = id; 

trunk/Languages/Dutch.lproj/Colloquy.nib/info.nib

@@ -4 +4 @@
-<dict>
-        <key>IBDocumentLocation</key>
-69 78 356 240 0 0 1280 832
+74 98 356 240 0 0 1344 986
-        <key>IBEditorPositions</key>
-        <dict>
-                <key>29</key>
-368 614 468 44 0 0 1280 832
+215 828 468 44 0 0 1344 986
-        </dict>
-        <key>IBFramework Version</key>
-2
+4
-        <key>IBOpenObjects</key>
-        <array>

trunk/Languages/English.lproj/Colloquy.nib/classes.nib

@@ -4 +4 @@
-            ACTIONS = {
-                bold = id; 
+                clearDisplay = id; 
-                closeCurrentPanel = id; 
-                detachCurrentPanel = id; 
@@ -9 +10 @@
-                italic = id; 
-                joinRoom = id; 
+                jumpToNextHighlight = id; 
+                jumpToPreviousHighlight = id; 
-                newConnection = id; 
-                selectNextActivePanel = id; 

trunk/Languages/English.lproj/Colloquy.nib/info.nib

@@ -4 +4 @@
-<dict>
-        <key>IBDocumentLocation</key>
-69 78 356 240 0 0 1280 832
+150 118 356 240 0 0 1344 986
-        <key>IBEditorPositions</key>
-        <dict>
-                <key>29</key>
-68 614 366 44 0 0 1280 832
+1 715 366 44 0 0 1344 986
-        </dict>
-        <key>IBFramework Version</key>
-        <string>364.0</string>
+        <key>IBOpenObjects</key>
+        <array>
+                <integer>29</integer>
+        </array>
-        <key>IBSystem Version</key>
-H63
+S215
-</dict>
-</plist>

trunk/Languages/German.lproj/Colloquy.nib/classes.nib

@@ -4 +4 @@
-            ACTIONS = {
-                bold = id; 
+                clearDisplay = id; 
-                closeCurrentPanel = id; 
-                detachCurrentPanel = id; 
@@ -9 +10 @@
-                italic = id; 
-                joinRoom = id; 
+                jumpToNextHighlight = id; 
+                jumpToPreviousHighlight = id; 
-                newConnection = id; 
-                selectNextActivePanel = id; 

trunk/Languages/German.lproj/Colloquy.nib/info.nib

@@ -4 +4 @@
-<dict>
-        <key>IBDocumentLocation</key>
-69 78 356 240 0 0 1280 832
+74 98 356 240 0 0 1344 986
-        <key>IBEditorPositions</key>
-        <dict>
-                <key>29</key>
-368 614 366 44 0 0 1280 832
+84 828 482 44 0 0 1344 986
-        </dict>
-        <key>IBFramework Version</key>
-        <string>364.0</string>
+        <key>IBOpenObjects</key>
+        <array>
+                <integer>29</integer>
+        </array>
-        <key>IBSystem Version</key>
-R28
+S215
-</dict>
-</plist>