From 445869725983ca77c32c938a444cc1e9c6db9a1c Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 13 Jun 2011 22:26:43 +0000 Subject: [PATCH] remove the custom alternating row code, since it isn't futureproof --- macosx/TorrentTableView.m | 74 --------------------------------- macosx/de.lproj/MainMenu.xib | 2 +- macosx/en.lproj/MainMenu.xib | 7 ++-- macosx/es.lproj/MainMenu.xib | 2 +- macosx/fr.lproj/MainMenu.xib | 2 +- macosx/it.lproj/MainMenu.xib | 2 +- macosx/nl.lproj/MainMenu.xib | 2 +- macosx/pt.lproj/MainMenu.xib | 2 +- macosx/pt_PT.lproj/MainMenu.xib | 4 +- macosx/ru.lproj/MainMenu.xib | 2 +- macosx/zh_CN.lproj/MainMenu.xib | 2 +- 11 files changed, 13 insertions(+), 88 deletions(-) diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m index c44fef5b6..f17e0ba20 100644 --- a/macosx/TorrentTableView.m +++ b/macosx/TorrentTableView.m @@ -683,80 +683,6 @@ } } -//alternating rows - first row after group row is white -- (void) highlightSelectionInClipRect: (NSRect) clipRect -{ - if (![fDefaults boolForKey: @"SmallView"]) - { - NSRect visibleRect = clipRect; - NSRange rows = [self rowsInRect: visibleRect]; - BOOL start = YES; - - const CGFloat totalRowHeight = [self rowHeight] + [self intercellSpacing].height; - - NSRect gridRects[(NSInteger)(ceil(visibleRect.size.height / 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 ([[self itemAtRow: rows.location] isKindOfClass: [Torrent class]]) - { - for (NSInteger i = rows.location-1; i>=0; i--) - { - if (![[self itemAtRow: i] isKindOfClass: [Torrent class]]) - break; - start = !start; - } - } - else - { - rows.location++; - rows.length--; - } - - NSInteger i; - for (i = rows.location; i < NSMaxRange(rows); i++) - { - if (![[self itemAtRow: i] isKindOfClass: [Torrent class]]) - { - 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]; -} - - (void) setQuickLimitMode: (id) sender { const BOOL limit = [sender tag] == ACTION_MENU_LIMIT_TAG; diff --git a/macosx/de.lproj/MainMenu.xib b/macosx/de.lproj/MainMenu.xib index cc0ed2655..64516a4df 100644 --- a/macosx/de.lproj/MainMenu.xib +++ b/macosx/de.lproj/MainMenu.xib @@ -701,7 +701,7 @@ AAAAAAAAAAAAAAAAA MC44MDI0MTkzNgA 62 - 440434688 + 448823296 1 diff --git a/macosx/en.lproj/MainMenu.xib b/macosx/en.lproj/MainMenu.xib index 02a9a1a44..0fbe0dad5 100644 --- a/macosx/en.lproj/MainMenu.xib +++ b/macosx/en.lproj/MainMenu.xib @@ -182,7 +182,6 @@ {{118, 5}, {279, 14}} - YES 67239488 @@ -228,7 +227,7 @@ {515, 224} - + YES @@ -655,7 +654,7 @@ AAAAAAAAAAAAAAAAA MC44MDI0MTkzNgA 62 - 440434688 + 448823296 1 @@ -702,7 +701,7 @@ AAAAAAAAAAAAAAAAA {{0, 24}, {515, 224}} - + 528 diff --git a/macosx/es.lproj/MainMenu.xib b/macosx/es.lproj/MainMenu.xib index eb2c44340..1417d6d30 100644 --- a/macosx/es.lproj/MainMenu.xib +++ b/macosx/es.lproj/MainMenu.xib @@ -647,7 +647,7 @@ AACcWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA MC44MDI0MTkzNgA 62 - 440434688 + 448823296 1 diff --git a/macosx/fr.lproj/MainMenu.xib b/macosx/fr.lproj/MainMenu.xib index 54947a1d3..87772963a 100644 --- a/macosx/fr.lproj/MainMenu.xib +++ b/macosx/fr.lproj/MainMenu.xib @@ -701,7 +701,7 @@ AAAAAAAAAAAAAAAAA MC44MDI0MTkzNgA 62 - 440434688 + 448823296 1 diff --git a/macosx/it.lproj/MainMenu.xib b/macosx/it.lproj/MainMenu.xib index b6d2ae489..368e9ce23 100644 --- a/macosx/it.lproj/MainMenu.xib +++ b/macosx/it.lproj/MainMenu.xib @@ -701,7 +701,7 @@ AAAAAAAAAAAAAAAAA MC44MDI0MTkzNgA 62 - 440434688 + 448823296 1 diff --git a/macosx/nl.lproj/MainMenu.xib b/macosx/nl.lproj/MainMenu.xib index 50fcd49d5..d9213893f 100644 --- a/macosx/nl.lproj/MainMenu.xib +++ b/macosx/nl.lproj/MainMenu.xib @@ -701,7 +701,7 @@ AAAAAAAAAAAAAAAAA MC44MDI0MTkzNgA 62 - 440434688 + 448823296 1 diff --git a/macosx/pt.lproj/MainMenu.xib b/macosx/pt.lproj/MainMenu.xib index 79e3eb4a0..e11788a49 100644 --- a/macosx/pt.lproj/MainMenu.xib +++ b/macosx/pt.lproj/MainMenu.xib @@ -653,7 +653,7 @@ JYAAAAzAAABQAAAAVEAAAjMzAAIzMwACMzMAAAAAAAAAAHNmMzIAAAAAAAEMcgAABfj///MdAAAHugAA MC44MDI0MTkzNgA 62 - 440434688 + 448823296 1 diff --git a/macosx/pt_PT.lproj/MainMenu.xib b/macosx/pt_PT.lproj/MainMenu.xib index af0f02476..39374c3b6 100644 --- a/macosx/pt_PT.lproj/MainMenu.xib +++ b/macosx/pt_PT.lproj/MainMenu.xib @@ -701,7 +701,7 @@ AAAAAAAAAAAAAAAAA MC44MDI0MTkzNgA 62 - 440434688 + 448823296 1 @@ -761,7 +761,7 @@ AAAAAAAAAAAAAAAAA - {{0, 0}, {1680, 1028}} + {{0, 0}, {2560, 1418}} {350, 27} {1e+13, 1e+13} TransmissionWindow diff --git a/macosx/ru.lproj/MainMenu.xib b/macosx/ru.lproj/MainMenu.xib index f640f8328..54620006f 100644 --- a/macosx/ru.lproj/MainMenu.xib +++ b/macosx/ru.lproj/MainMenu.xib @@ -698,7 +698,7 @@ AAAAAAAAAAAAAA MC44MDI0MTkzNgA 62 - 440434688 + 448823296 1 diff --git a/macosx/zh_CN.lproj/MainMenu.xib b/macosx/zh_CN.lproj/MainMenu.xib index f60fb0791..e5b8f3988 100644 --- a/macosx/zh_CN.lproj/MainMenu.xib +++ b/macosx/zh_CN.lproj/MainMenu.xib @@ -699,7 +699,7 @@ AAAAAAAAAAAAAAAAA MC44MDI0MTkzNgA 62 - 440434688 + 448823296 1