]> granicus.if.org Git - transmission/commitdiff
remove the custom alternating row code, since it isn't futureproof
authorMitchell Livingston <livings124@transmissionbt.com>
Mon, 13 Jun 2011 22:26:43 +0000 (22:26 +0000)
committerMitchell Livingston <livings124@transmissionbt.com>
Mon, 13 Jun 2011 22:26:43 +0000 (22:26 +0000)
macosx/TorrentTableView.m
macosx/de.lproj/MainMenu.xib
macosx/en.lproj/MainMenu.xib
macosx/es.lproj/MainMenu.xib
macosx/fr.lproj/MainMenu.xib
macosx/it.lproj/MainMenu.xib
macosx/nl.lproj/MainMenu.xib
macosx/pt.lproj/MainMenu.xib
macosx/pt_PT.lproj/MainMenu.xib
macosx/ru.lproj/MainMenu.xib
macosx/zh_CN.lproj/MainMenu.xib

index c44fef5b61aa07b8d1dd26e1571d825bfb38e3c9..f17e0ba20887a408ea98a22d121471c0d91c9531 100644 (file)
     }
 }
 
-//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;
index cc0ed265539bce13a8f84f37926be5eda6deebbc..64516a4df9d57a024acbb30b2205016fcee8cb44 100644 (file)
@@ -701,7 +701,7 @@ AAAAAAAAAAAAAAAAA</bytes>
                                                                                                <bytes key="NSWhite">MC44MDI0MTkzNgA</bytes>
                                                                                        </object>
                                                                                        <double key="NSRowHeight">62</double>
-                                                                                       <int key="NSTvFlags">440434688</int>
+                                                                                       <int key="NSTvFlags">448823296</int>
                                                                                        <reference key="NSDelegate"/>
                                                                                        <reference key="NSDataSource"/>
                                                                                        <int key="NSColumnAutoresizingStyle">1</int>
index 02a9a1a4431f1b23f8844337eb0a04d7c88a293e..0fbe0dad50bee56d6acebb63d04bab23b6650bb1 100644 (file)
                                                        <string key="NSFrame">{{118, 5}, {279, 14}}</string>
                                                        <reference key="NSSuperview" ref="303120456"/>
                                                        <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="696487414">
                                                                <int key="NSCellFlags">67239488</int>
                                                                                        <string key="NSFrameSize">{515, 224}</string>
                                                                                        <reference key="NSSuperview" ref="306237956"/>
                                                                                        <reference key="NSWindow"/>
-                                                                                       <reference key="NSNextKeyView" ref="1068338331"/>
+                                                                                       <reference key="NSNextKeyView" ref="365285506"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="_NSCornerView" key="NSCornerView">
                                                                                                <nil key="NSNextResponder"/>
@@ -655,7 +654,7 @@ AAAAAAAAAAAAAAAAA</bytes>
                                                                                                <bytes key="NSWhite">MC44MDI0MTkzNgA</bytes>
                                                                                        </object>
                                                                                        <double key="NSRowHeight">62</double>
-                                                                                       <int key="NSTvFlags">440434688</int>
+                                                                                       <int key="NSTvFlags">448823296</int>
                                                                                        <reference key="NSDelegate"/>
                                                                                        <reference key="NSDataSource"/>
                                                                                        <int key="NSColumnAutoresizingStyle">1</int>
@@ -702,7 +701,7 @@ AAAAAAAAAAAAAAAAA</bytes>
                                                        <string key="NSFrame">{{0, 24}, {515, 224}}</string>
                                                        <reference key="NSSuperview" ref="303120456"/>
                                                        <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView" ref="365285506"/>
+                                                       <reference key="NSNextKeyView" ref="306237956"/>
                                                        <int key="NSsFlags">528</int>
                                                        <reference key="NSVScroller" ref="1068338331"/>
                                                        <reference key="NSHScroller" ref="365285506"/>
index eb2c44340fa330512856f0d6f2afb19dbaefda69..1417d6d3012e7be4d38269a3e8212771671738de 100644 (file)
@@ -647,7 +647,7 @@ AACcWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</bytes>
                                                                                                <bytes key="NSWhite">MC44MDI0MTkzNgA</bytes>
                                                                                        </object>
                                                                                        <double key="NSRowHeight">62</double>
-                                                                                       <int key="NSTvFlags">440434688</int>
+                                                                                       <int key="NSTvFlags">448823296</int>
                                                                                        <reference key="NSDelegate"/>
                                                                                        <reference key="NSDataSource"/>
                                                                                        <int key="NSColumnAutoresizingStyle">1</int>
index 54947a1d3a63910e6153e6928f00fd2012138fe4..87772963a861ee673d9d11bcea7c3414c34dc133 100644 (file)
@@ -701,7 +701,7 @@ AAAAAAAAAAAAAAAAA</bytes>
                                                                                                <bytes key="NSWhite">MC44MDI0MTkzNgA</bytes>
                                                                                        </object>
                                                                                        <double key="NSRowHeight">62</double>
-                                                                                       <int key="NSTvFlags">440434688</int>
+                                                                                       <int key="NSTvFlags">448823296</int>
                                                                                        <reference key="NSDelegate"/>
                                                                                        <reference key="NSDataSource"/>
                                                                                        <int key="NSColumnAutoresizingStyle">1</int>
index b6d2ae489049174059bb04f37d0e3a5344c289e7..368e9ce23a5613f955fd494c44eb35ec84c0d2b4 100644 (file)
@@ -701,7 +701,7 @@ AAAAAAAAAAAAAAAAA</bytes>
                                                                                                <bytes key="NSWhite">MC44MDI0MTkzNgA</bytes>
                                                                                        </object>
                                                                                        <double key="NSRowHeight">62</double>
-                                                                                       <int key="NSTvFlags">440434688</int>
+                                                                                       <int key="NSTvFlags">448823296</int>
                                                                                        <reference key="NSDelegate"/>
                                                                                        <reference key="NSDataSource"/>
                                                                                        <int key="NSColumnAutoresizingStyle">1</int>
index 50fcd49d52ecb8e737b3e92c91a494c4a9a64cf1..d9213893f122cdd0212367f103f3fc3aaee8d24d 100644 (file)
@@ -701,7 +701,7 @@ AAAAAAAAAAAAAAAAA</bytes>
                                                                                                <bytes key="NSWhite">MC44MDI0MTkzNgA</bytes>
                                                                                        </object>
                                                                                        <double key="NSRowHeight">62</double>
-                                                                                       <int key="NSTvFlags">440434688</int>
+                                                                                       <int key="NSTvFlags">448823296</int>
                                                                                        <reference key="NSDelegate"/>
                                                                                        <reference key="NSDataSource"/>
                                                                                        <int key="NSColumnAutoresizingStyle">1</int>
index 79e3eb4a06fd8e723e0bf5233735d5fafecf2fcb..e11788a490831acc06dec8f916184a8544daf1bd 100644 (file)
@@ -653,7 +653,7 @@ JYAAAAzAAABQAAAAVEAAAjMzAAIzMwACMzMAAAAAAAAAAHNmMzIAAAAAAAEMcgAABfj///MdAAAHugAA
                                                                                                <bytes key="NSWhite">MC44MDI0MTkzNgA</bytes>
                                                                                        </object>
                                                                                        <double key="NSRowHeight">62</double>
-                                                                                       <int key="NSTvFlags">440434688</int>
+                                                                                       <int key="NSTvFlags">448823296</int>
                                                                                        <reference key="NSDelegate"/>
                                                                                        <reference key="NSDataSource"/>
                                                                                        <int key="NSColumnAutoresizingStyle">1</int>
index af0f02476856af037863df0330498044f28b71d3..39374c3b6a0973a8e520facc27ab5d72acfee1f2 100644 (file)
@@ -701,7 +701,7 @@ AAAAAAAAAAAAAAAAA</bytes>
                                                                                                <bytes key="NSWhite">MC44MDI0MTkzNgA</bytes>
                                                                                        </object>
                                                                                        <double key="NSRowHeight">62</double>
-                                                                                       <int key="NSTvFlags">440434688</int>
+                                                                                       <int key="NSTvFlags">448823296</int>
                                                                                        <reference key="NSDelegate"/>
                                                                                        <reference key="NSDataSource"/>
                                                                                        <int key="NSColumnAutoresizingStyle">1</int>
@@ -761,7 +761,7 @@ AAAAAAAAAAAAAAAAA</bytes>
                                        <reference key="NSWindow"/>
                                        <reference key="NSNextKeyView" ref="87647552"/>
                                </object>
-                               <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+                               <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
                                <string key="NSMinSize">{350, 27}</string>
                                <string key="NSMaxSize">{1e+13, 1e+13}</string>
                                <string key="NSFrameAutosaveName">TransmissionWindow</string>
index f640f83283969ad5a7b6e07dc377d4c8a7585be7..54620006f7cce17c2b48fc030d3df20d92edee83 100644 (file)
@@ -698,7 +698,7 @@ AAAAAAAAAAAAAA</bytes>
                                                                                                <bytes key="NSWhite">MC44MDI0MTkzNgA</bytes>
                                                                                        </object>
                                                                                        <double key="NSRowHeight">62</double>
-                                                                                       <int key="NSTvFlags">440434688</int>
+                                                                                       <int key="NSTvFlags">448823296</int>
                                                                                        <reference key="NSDelegate"/>
                                                                                        <reference key="NSDataSource"/>
                                                                                        <int key="NSColumnAutoresizingStyle">1</int>
index f60fb0791c9bd2e841fe0d477416c666e43d25f2..e5b8f39880dd98a4bcf5c4635e5a425ef406884c 100644 (file)
@@ -699,7 +699,7 @@ AAAAAAAAAAAAAAAAA</bytes>
                                                                                                <bytes key="NSWhite">MC44MDI0MTkzNgA</bytes>
                                                                                        </object>
                                                                                        <double key="NSRowHeight">62</double>
-                                                                                       <int key="NSTvFlags">440434688</int>
+                                                                                       <int key="NSTvFlags">448823296</int>
                                                                                        <reference key="NSDelegate"/>
                                                                                        <reference key="NSDataSource"/>
                                                                                        <int key="NSColumnAutoresizingStyle">1</int>