From 3e7521963de7627183c67d4cb65de8951b15c3e7 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 13 Jun 2011 22:32:55 +0000 Subject: [PATCH] remove the custom alternating row code in the tracker table, since it isn't futureproof --- macosx/InfoTrackersView.xib | 640 ++---------------------------------- macosx/TrackerTableView.m | 71 ---- 2 files changed, 26 insertions(+), 685 deletions(-) diff --git a/macosx/InfoTrackersView.xib b/macosx/InfoTrackersView.xib index dc40f39be..288e9ecb9 100644 --- a/macosx/InfoTrackersView.xib +++ b/macosx/InfoTrackersView.xib @@ -2,17 +2,25 @@ 1060 - 10J567 - 823 + 10J4138 + 1306 1038.35 - 462.00 + 461.00 com.apple.InterfaceBuilder.CocoaPlugin - 823 + 1306 - + YES - + NSCustomObject + NSSegmentedControl + NSScrollView + NSSegmentedCell + NSTextFieldCell + NSCustomView + NSTableColumn + NSScroller + NSTableView YES @@ -53,6 +61,7 @@ 256 {360, 318} + YES @@ -134,7 +143,7 @@ 57 - 440401920 + 448790528 4 @@ -146,6 +155,7 @@ {{1, 1}, {360, 318}} + @@ -156,6 +166,7 @@ -2147483392 {{350, 1}, {11, 138}} + 256 _doScroller: @@ -166,6 +177,7 @@ -2147483392 {{-100, -100}, {372, 15}} + 1 _doScroller: @@ -175,6 +187,7 @@ {{10, 27}, {362, 320}} + 530 @@ -187,6 +200,7 @@ 292 {{9, 8}, {71, 18}} + YES -2080244224 @@ -226,6 +240,7 @@ {382, 352} + NSView @@ -432,17 +447,13 @@ YES - - YES - + YES - - YES - + 16 @@ -453,17 +464,6 @@ InfoTrackersViewController NSViewController - - addRemoveTracker: - id - - - addRemoveTracker: - - addRemoveTracker: - id - - YES @@ -498,602 +498,15 @@ IBProjectSource - macosx/InfoTrackersViewController.h - - - - NSApplication - - IBProjectSource - macosx/NSApplicationAdditions.h - - - - NSObject - - IBProjectSource - macosx/UKKQueue/UKFileWatcher.h - - - - NSObject - - IBProjectSource - macosx/UKKQueue/UKKQueue.h - - - - NSObject - - IBProjectSource - macosx/UKKQueue/UKMainThreadProxy.h + ./Classes/InfoTrackersViewController.h TrackerTableView NSTableView - - YES - - YES - copy: - paste: - - - YES - id - id - - - - YES - - YES - copy: - paste: - - - YES - - copy: - id - - - paste: - id - - - IBProjectSource - macosx/TrackerTableView.h - - - - - YES - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSCell - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSCell.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSObject - - IBFrameworkSource - Growl.framework/Headers/GrowlApplicationBridge.h - - - - NSObject - - IBFrameworkSource - ImageKit.framework/Headers/IKImageBrowserView.h - - - - NSObject - - IBFrameworkSource - ImageKit.framework/Headers/IKSaveOptions.h - - - - NSObject - - IBFrameworkSource - ImageKit.framework/Headers/ImageKitDeprecated.h - - - - NSObject - - IBFrameworkSource - PDFKit.framework/Headers/PDFDocument.h - - - - NSObject - - IBFrameworkSource - PDFKit.framework/Headers/PDFView.h - - - - NSObject - - IBFrameworkSource - QuartzComposer.framework/Headers/QCCompositionParameterView.h - - - - NSObject - - IBFrameworkSource - QuartzComposer.framework/Headers/QCCompositionPickerView.h - - - - NSObject - - IBFrameworkSource - QuartzFilters.framework/Headers/QuartzFilterManager.h - - - - NSObject - - IBFrameworkSource - QuickLookUI.framework/Headers/QLPreviewPanel.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUAppcast.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUUpdater.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSScrollView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSScrollView.h - - - - NSScroller - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSScroller.h - - - - NSSegmentedCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSSegmentedCell.h - - - - NSSegmentedControl - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSSegmentedControl.h - - - - NSTableColumn - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableColumn.h - - - - NSTableView - NSControl - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSViewController - NSResponder - - view - NSView - - - view - - view - NSView - - - - IBFrameworkSource - AppKit.framework/Headers/NSViewController.h + ./Classes/TrackerTableView.h @@ -1109,7 +522,6 @@ YES - ../Transmission.xcodeproj 3 YES diff --git a/macosx/TrackerTableView.m b/macosx/TrackerTableView.m index 7130a842f..2fffce929 100644 --- a/macosx/TrackerTableView.m +++ b/macosx/TrackerTableView.m @@ -126,75 +126,4 @@ return YES; } -//alternating rows - first row after group row is white -- (void) highlightSelectionInClipRect: (NSRect) clipRect -{ - NSRect visibleRect = clipRect; - NSRange rows = [self rowsInRect: visibleRect]; - BOOL start = YES; - - const CGFloat totalRowHeight = [self rowHeight] + [self intercellSpacing].height; - - NSRect gridRects[(NSInteger)(ceil(NSHeight(visibleRect) / totalRowHeight / 2.0)) + 1]; //add one if partial rows at top and bottom - NSInteger rectNum = 0; - - if (rows.length > 0) - { - //determine what the first row color should be - if ([[fTrackers objectAtIndex: rows.location] isKindOfClass: [TrackerNode class]] || [self editedRow] == rows.location) - { - for (NSInteger i = rows.location-1; i>=0; i--) - { - if (![[fTrackers objectAtIndex: i] isKindOfClass: [TrackerNode class]]) - break; - start = !start; - } - } - else - { - rows.location++; - rows.length--; - } - - NSInteger i; - for (i = rows.location; i < NSMaxRange(rows); i++) - { - if (![[fTrackers objectAtIndex: i] isKindOfClass: [TrackerNode class]] && [self editedRow] != i) - { - start = YES; - continue; - } - - if (!start && ![self isRowSelected: i]) - gridRects[rectNum++] = [self rectOfRow: i]; - - start = !start; - } - - const CGFloat newY = NSMaxY([self rectOfRow: i-1]); - visibleRect.size.height -= newY - visibleRect.origin.y; - visibleRect.origin.y = newY; - } - - const NSInteger numberBlankRows = ceil(visibleRect.size.height / totalRowHeight); - - //remaining visible rows continue alternating - visibleRect.size.height = totalRowHeight; - if (start) - visibleRect.origin.y += totalRowHeight; - - for (NSInteger i = start ? 1 : 0; i < numberBlankRows; i += 2) - { - gridRects[rectNum++] = visibleRect; - visibleRect.origin.y += 2.0 * totalRowHeight; - } - - NSAssert([[NSColor controlAlternatingRowBackgroundColors] count] >= 2, @"There should be 2 alternating row colors"); - - [(NSColor *)[[NSColor controlAlternatingRowBackgroundColors] objectAtIndex: 1] set]; - NSRectFillList(gridRects, rectNum); - - [super highlightSelectionInClipRect: clipRect]; -} - @end