]> granicus.if.org Git - transmission/commitdiff
#3962 Update the inspector's button bar's look
authorMitchell Livingston <livings124@transmissionbt.com>
Sun, 30 Jan 2011 02:01:05 +0000 (02:01 +0000)
committerMitchell Livingston <livings124@transmissionbt.com>
Sun, 30 Jan 2011 02:01:05 +0000 (02:01 +0000)
12 files changed:
NEWS
Transmission.xcodeproj/project.pbxproj
macosx/Images/InfoTabBack.png [deleted file]
macosx/Images/InfoTabBackBlue.png [deleted file]
macosx/Images/InfoTabBackGraphite.png [deleted file]
macosx/Images/InfoTabBorder.png [deleted file]
macosx/InfoTabButtonBack.h [new file with mode: 0644]
macosx/InfoTabButtonBack.m [new file with mode: 0644]
macosx/InfoTabButtonCell.m
macosx/InfoWindow.xib
macosx/Makefile.am
macosx/Torrent.m

diff --git a/NEWS b/NEWS
index b727386936e629f03218c6313c48973ae6224bf8..41de5f656d2402be1240f2e206c9ee42c5946c4f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@
   * Show the total downloading and seeding time per torrent
   * Fix webseeds
   * Better support for IPv6-only trackers
-  * Add the ability to shut down Transmission sessions via RPC
+  * Add the ability to shutdown Transmission sessions via RPC
   * NAT-PMP and UPnP now also map the UDP port
   * Update the DHT code to dht-0.18
   * Improve support for running scripts when a torrent finishes downloading
index 7625a32c9493372ce09e8f195c05b896b4374ae4..565266ffd25f7c7d1f0ef5b0ed773d6b4c5b5725 100644 (file)
                A25963E11068376200453B31 /* FavIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = A25963E01068376200453B31 /* FavIcon.png */; };
                A25964A6106D73A800453B31 /* announcer.c in Sources */ = {isa = PBXBuildFile; fileRef = A25964A4106D73A800453B31 /* announcer.c */; };
                A25964A7106D73A800453B31 /* announcer.h in Headers */ = {isa = PBXBuildFile; fileRef = A25964A5106D73A800453B31 /* announcer.h */; };
+               A25BB02A12F4F517004B724E /* InfoTabButtonBack.m in Sources */ = {isa = PBXBuildFile; fileRef = A25BB02912F4F517004B724E /* InfoTabButtonBack.m */; };
                A25D2CBD0CF4C73E0096A262 /* stats.c in Sources */ = {isa = PBXBuildFile; fileRef = A25D2CBB0CF4C7190096A262 /* stats.c */; };
                A25D2CBE0CF4C73E0096A262 /* stats.h in Headers */ = {isa = PBXBuildFile; fileRef = A25D2CBA0CF4C7190096A262 /* stats.h */; };
                A25E03D90E4015100086C225 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
                A2F151190CD438A4001F3B0E /* RedDot.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F151160CD438A4001F3B0E /* RedDot.png */; };
                A2F1511A0CD438A4001F3B0E /* GreenDot.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F151170CD438A4001F3B0E /* GreenDot.png */; };
                A2F151200CD438BA001F3B0E /* Lock.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F1511F0CD438BA001F3B0E /* Lock.png */; };
-               A2F151240CD438DE001F3B0E /* InfoTabBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F151210CD438DE001F3B0E /* InfoTabBorder.png */; };
-               A2F151250CD438DE001F3B0E /* InfoTabBack.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F151220CD438DE001F3B0E /* InfoTabBack.png */; };
-               A2F151260CD438DE001F3B0E /* InfoTabBackBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F151230CD438DE001F3B0E /* InfoTabBackBlue.png */; };
                A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; };
                A2F41DAB0D0B916B006CE378 /* YingYangTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F41DAA0D0B916B006CE378 /* YingYangTemplate.png */; };
                A2F41F8E0D73595100B82116 /* InfoTracker.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F41F8D0D73595100B82116 /* InfoTracker.png */; };
                A2F8CD430F3D0F4A00DB356A /* miniupnpcstrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A2F8CD420F3D0F4A00DB356A /* miniupnpcstrings.h */; };
                A2FB057F0BFEB6800095564D /* DragOverlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2FB057D0BFEB6800095564D /* DragOverlayView.m */; };
                A2FB701C0D95CAEA0001F331 /* GroupsController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2FB701B0D95CAEA0001F331 /* GroupsController.m */; };
-               A2FE61D80CD3D0A500D683E1 /* InfoTabBackGraphite.png in Resources */ = {isa = PBXBuildFile; fileRef = A2FE61D70CD3D0A500D683E1 /* InfoTabBackGraphite.png */; };
                BE1183570CE160C50002D0F3 /* bsdqueue.h in Headers */ = {isa = PBXBuildFile; fileRef = BE11834D0CE160C50002D0F3 /* bsdqueue.h */; };
                BE1183580CE160C50002D0F3 /* declspec.h in Headers */ = {isa = PBXBuildFile; fileRef = BE11834E0CE160C50002D0F3 /* declspec.h */; };
                BE1183590CE160C50002D0F3 /* igd_desc_parse.h in Headers */ = {isa = PBXBuildFile; fileRef = BE11834F0CE160C50002D0F3 /* igd_desc_parse.h */; };
                A25963E01068376200453B31 /* FavIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FavIcon.png; path = macosx/Images/FavIcon.png; sourceTree = "<group>"; };
                A25964A4106D73A800453B31 /* announcer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = announcer.c; path = libtransmission/announcer.c; sourceTree = "<group>"; };
                A25964A5106D73A800453B31 /* announcer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = announcer.h; path = libtransmission/announcer.h; sourceTree = "<group>"; };
+               A25BB02812F4F517004B724E /* InfoTabButtonBack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InfoTabButtonBack.h; path = macosx/InfoTabButtonBack.h; sourceTree = "<group>"; };
+               A25BB02912F4F517004B724E /* InfoTabButtonBack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = InfoTabButtonBack.m; path = macosx/InfoTabButtonBack.m; sourceTree = "<group>"; };
                A25D2CBA0CF4C7190096A262 /* stats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stats.h; path = libtransmission/stats.h; sourceTree = "<group>"; };
                A25D2CBB0CF4C7190096A262 /* stats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stats.c; path = libtransmission/stats.c; sourceTree = "<group>"; };
                A25E03E00E4015380086C225 /* tr-getopt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "tr-getopt.h"; path = "libtransmission/tr-getopt.h"; sourceTree = "<group>"; };
                A2F151160CD438A4001F3B0E /* RedDot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RedDot.png; path = macosx/Images/RedDot.png; sourceTree = "<group>"; };
                A2F151170CD438A4001F3B0E /* GreenDot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = GreenDot.png; path = macosx/Images/GreenDot.png; sourceTree = "<group>"; };
                A2F1511F0CD438BA001F3B0E /* Lock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Lock.png; path = macosx/Images/Lock.png; sourceTree = "<group>"; };
-               A2F151210CD438DE001F3B0E /* InfoTabBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTabBorder.png; path = macosx/Images/InfoTabBorder.png; sourceTree = "<group>"; };
-               A2F151220CD438DE001F3B0E /* InfoTabBack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTabBack.png; path = macosx/Images/InfoTabBack.png; sourceTree = "<group>"; };
-               A2F151230CD438DE001F3B0E /* InfoTabBackBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTabBackBlue.png; path = macosx/Images/InfoTabBackBlue.png; sourceTree = "<group>"; };
                A2F41DAA0D0B916B006CE378 /* YingYangTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = YingYangTemplate.png; path = macosx/Images/YingYangTemplate.png; sourceTree = "<group>"; };
                A2F41F8D0D73595100B82116 /* InfoTracker.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTracker.png; path = macosx/Images/InfoTracker.png; sourceTree = "<group>"; };
                A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = "<group>"; };
                A2FB06950BFF484A0095564D /* Globe.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Globe.png; path = macosx/Images/Globe.png; sourceTree = "<group>"; };
                A2FB701A0D95CAEA0001F331 /* GroupsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupsController.h; path = macosx/GroupsController.h; sourceTree = "<group>"; };
                A2FB701B0D95CAEA0001F331 /* GroupsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GroupsController.m; path = macosx/GroupsController.m; sourceTree = "<group>"; };
-               A2FE61D70CD3D0A500D683E1 /* InfoTabBackGraphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTabBackGraphite.png; path = macosx/Images/InfoTabBackGraphite.png; sourceTree = "<group>"; };
                BE1183480CE160960002D0F3 /* libminiupnp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libminiupnp.a; sourceTree = BUILT_PRODUCTS_DIR; };
                BE11834D0CE160C50002D0F3 /* bsdqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bsdqueue.h; path = "third-party/miniupnp/bsdqueue.h"; sourceTree = "<group>"; };
                BE11834E0CE160C50002D0F3 /* declspec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = declspec.h; path = "third-party/miniupnp/declspec.h"; sourceTree = "<group>"; };
                                A25FCDDE0A37695F002BCBBE /* ToolbarResumeSelectedTemplate.png */,
                                4DE5CCB90981D27700BE280E /* ToolbarPauseAllTemplate.png */,
                                A25FCDDD0A37695F002BCBBE /* ToolbarPauseSelectedTemplate.png */,
-                               A2F151210CD438DE001F3B0E /* InfoTabBorder.png */,
-                               A2F151220CD438DE001F3B0E /* InfoTabBack.png */,
-                               A2F151230CD438DE001F3B0E /* InfoTabBackBlue.png */,
-                               A2FE61D70CD3D0A500D683E1 /* InfoTabBackGraphite.png */,
                                A26E75950CB6AB4800226674 /* InfoGeneral.png */,
                                A26E75870CB6AA7500226674 /* InfoOptions.png */,
                                A2DA36270CBC674900C2ED41 /* InfoActivity.png */,
                                A257C1800CAD3003004E121C /* PeerTableView.m */,
                                A2E23AC30CB5E1930002BB25 /* InfoTabButtonCell.h */,
                                A2E23AC40CB5E1930002BB25 /* InfoTabButtonCell.m */,
+                               A25BB02812F4F517004B724E /* InfoTabButtonBack.h */,
+                               A25BB02912F4F517004B724E /* InfoTabButtonBack.m */,
                                A200B8390A2263BA007BBB1E /* InfoWindowController.h */,
                                A200B83A0A2263BA007BBB1E /* InfoWindowController.m */,
                                A2A1CB770BF29D5500AE959F /* PeerProgressIndicatorCell.h */,
                                A2DA362A0CBC674900C2ED41 /* InfoActivity.png in Resources */,
                                A2DA362B0CBC674900C2ED41 /* InfoFiles.png in Resources */,
                                A2DA362C0CBC674900C2ED41 /* InfoPeers.png in Resources */,
-                               A2FE61D80CD3D0A500D683E1 /* InfoTabBackGraphite.png in Resources */,
                                A2F151180CD438A4001F3B0E /* YellowDot.png in Resources */,
                                A2F151190CD438A4001F3B0E /* RedDot.png in Resources */,
                                A2F1511A0CD438A4001F3B0E /* GreenDot.png in Resources */,
                                A2F151200CD438BA001F3B0E /* Lock.png in Resources */,
-                               A2F151240CD438DE001F3B0E /* InfoTabBorder.png in Resources */,
-                               A2F151250CD438DE001F3B0E /* InfoTabBack.png in Resources */,
-                               A2F151260CD438DE001F3B0E /* InfoTabBackBlue.png in Resources */,
                                A22D3AA60D00D1790079CFED /* TurtleTemplate.png in Resources */,
                                A29AF4F70D01BADC00D097EC /* DownArrowTemplate.png in Resources */,
                                A29AF4F90D01BAEB00D097EC /* UpArrowTemplate.png in Resources */,
                                A209EBF91142FEEE002B02D1 /* InfoOptionsViewController.m in Sources */,
                                A21F15AC11729A8B00CF5A9C /* AddMagnetWindowController.m in Sources */,
                                A2661D6112D0E8D9004F69D5 /* FilterBarView.m in Sources */,
+                               A25BB02A12F4F517004B724E /* InfoTabButtonBack.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
diff --git a/macosx/Images/InfoTabBack.png b/macosx/Images/InfoTabBack.png
deleted file mode 100644 (file)
index 470628e..0000000
Binary files a/macosx/Images/InfoTabBack.png and /dev/null differ
diff --git a/macosx/Images/InfoTabBackBlue.png b/macosx/Images/InfoTabBackBlue.png
deleted file mode 100644 (file)
index 903f490..0000000
Binary files a/macosx/Images/InfoTabBackBlue.png and /dev/null differ
diff --git a/macosx/Images/InfoTabBackGraphite.png b/macosx/Images/InfoTabBackGraphite.png
deleted file mode 100644 (file)
index 19dbdf9..0000000
Binary files a/macosx/Images/InfoTabBackGraphite.png and /dev/null differ
diff --git a/macosx/Images/InfoTabBorder.png b/macosx/Images/InfoTabBorder.png
deleted file mode 100644 (file)
index aa91efd..0000000
Binary files a/macosx/Images/InfoTabBorder.png and /dev/null differ
diff --git a/macosx/InfoTabButtonBack.h b/macosx/InfoTabButtonBack.h
new file mode 100644 (file)
index 0000000..1e0b4fb
--- /dev/null
@@ -0,0 +1,31 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Copyright (c) 2011 Transmission authors and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+@interface InfoTabButtonBack : NSView
+{
+}
+
+@end
diff --git a/macosx/InfoTabButtonBack.m b/macosx/InfoTabButtonBack.m
new file mode 100644 (file)
index 0000000..883b711
--- /dev/null
@@ -0,0 +1,42 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Copyright (c) 2011 Transmission authors and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *****************************************************************************/
+
+#import "InfoTabButtonBack.h"
+
+@implementation InfoTabButtonBack
+
+- (void) drawRect: (NSRect) rect
+{
+    NSColor * lightColor = [NSColor colorWithCalibratedRed: 255.0/255.0 green: 255.0/255.0 blue: 255.0/255.0 alpha: 1.0];
+    NSColor * darkColor = [NSColor colorWithCalibratedRed: 225.0/255.0 green: 225.0/255.0 blue: 225.0/255.0 alpha: 1.0];
+    NSGradient * gradient = [[NSGradient alloc] initWithStartingColor: darkColor endingColor: lightColor];
+    [gradient drawInRect: rect angle: 90.0];
+    [gradient release];
+    
+    [[NSColor grayColor] set];
+    NSRectFill(NSMakeRect(0.0, 0.0, NSWidth(rect), 1.0));
+    NSRectFill(NSMakeRect(0.0, NSHeight(rect) - 1.0, NSWidth(rect), 1.0));
+}
+
+@end
index f7e91b9bf38ac511fe02a6fbe7da3f7350be7cd2..287b6078408459af9c385149160c7dc4f8159e82 100644 (file)
 - (void) awakeFromNib
 {
     [(NSMatrix *)[self controlView] setToolTip: [self title] forCell: self];
-    
-    NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
-    [nc addObserver: self selector: @selector(updateControlTint:)
-        name: NSControlTintDidChangeNotification object: NSApp];
-    
+        
     fSelected = NO;
     
     //expects the icon to currently be set as the image
@@ -43,8 +39,6 @@
 
 - (void) dealloc
 {
-    [[NSNotificationCenter defaultCenter] removeObserver: self];
-    
     [fIcon release];
     [super dealloc];
 }
 {
     fSelected = selected;
     
-    NSImage * tabImage;
-    if (fSelected)
-        tabImage = [NSColor currentControlTint] == NSGraphiteControlTint
-                    ? [[NSImage imageNamed: @"InfoTabBackGraphite.png"] copy] : [[NSImage imageNamed: @"InfoTabBackBlue.png"] copy];
+    NSInteger row, col;
+    [(NSMatrix *)[self controlView] getRow: &row column: &col ofCell: self];
+    const NSSize tabSize = [(NSMatrix *)[self controlView] cellFrameAtRow: row column: col].size;
+    const NSRect tabRect = NSMakeRect(0.0, 0.0, tabSize.width, tabSize.height);
+    
+    NSImage * tabImage = [[NSImage alloc] initWithSize: tabSize];
+        
+    [tabImage lockFocus];
+    
+    if (!fSelected)
+    {
+        NSColor * lightColor = [NSColor colorWithCalibratedRed: 255.0/255.0 green: 255.0/255.0 blue: 255.0/255.0 alpha: 1.0];
+        NSColor * darkColor = [NSColor colorWithCalibratedRed: 225.0/255.0 green: 225.0/255.0 blue: 225.0/255.0 alpha: 1.0];
+        NSGradient * gradient = [[NSGradient alloc] initWithStartingColor: darkColor endingColor: lightColor];
+        [gradient drawInRect: tabRect angle: 90.0];
+        [gradient release];
+    }
     else
-        tabImage = [[NSImage imageNamed: @"InfoTabBack.png"] copy];
+    {
+        NSColor * lightColor = [NSColor colorWithCalibratedRed: 160.0/255.0 green: 160.0/255.0 blue: 160.0/255.0 alpha: 1.0];
+        NSColor * darkColor = [NSColor colorWithCalibratedRed: 150.0/255.0 green: 150.0/255.0 blue: 150.0/255.0 alpha: 1.0];
+        NSGradient * gradient = [[NSGradient alloc] initWithStartingColor: darkColor endingColor: lightColor];
+        [gradient drawInRect: tabRect angle: 90.0];
+        [gradient release];
+    }
+    
+    [[NSColor grayColor] set];
+    NSRectFill(NSMakeRect(0.0, 0.0, NSWidth(tabRect), 1.0));
+    NSRectFill(NSMakeRect(0.0, NSHeight(tabRect) - 1.0, NSWidth(tabRect), 1.0));
+    NSRectFill(NSMakeRect(NSWidth(tabRect) - 1.0, 1.0, NSWidth(tabRect) - 1.0, NSHeight(tabRect) - 2.0));
     
     if (fIcon)
     {
-        const NSSize iconSize = [fIcon size], tabSize = [tabImage size];
+        const NSSize iconSize = [fIcon size];
         
         const NSRect iconRect = NSMakeRect(floor((tabSize.width - iconSize.width) * 0.5),
                                             floor((tabSize.height - iconSize.height) * 0.5),
                                             iconSize.width, iconSize.height);
         
-        [tabImage lockFocus];
         [fIcon drawInRect: iconRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
         [tabImage unlockFocus];
     }
     [tabImage release];
 }
 
-- (void) updateControlTint: (NSNotification *) notification
-{
-    if (fSelected)
-        [self setSelectedTab: YES];
-}
-
 @end
index 669d8ca1e4cd560f59f3412d62a9f9677edef379..75c4263c2e0c4833ddf7da4453068439d41c2f4a 100644 (file)
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
        <data>
                <int key="IBDocument.SystemTarget">1050</int>
-               <string key="IBDocument.SystemVersion">10D573</string>
-               <string key="IBDocument.InterfaceBuilderVersion">762</string>
-               <string key="IBDocument.AppKitVersion">1038.29</string>
-               <string key="IBDocument.HIToolboxVersion">460.00</string>
+               <string key="IBDocument.SystemVersion">10J567</string>
+               <string key="IBDocument.InterfaceBuilderVersion">823</string>
+               <string key="IBDocument.AppKitVersion">1038.35</string>
+               <string key="IBDocument.HIToolboxVersion">462.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                       <string key="NS.object.0">762</string>
+                       <string key="NS.object.0">823</string>
                </object>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                </object>
                <object class="NSMutableDictionary" key="IBDocument.Metadata">
-                       <bool key="EncodedWithXMLCoder">YES</bool>
-                       <object class="NSArray" key="dict.sortedKeys" id="0">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                       </object>
-                       <object class="NSMutableArray" key="dict.values">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                       </object>
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
                </object>
                <object class="NSMutableArray" key="IBDocument.RootObjects" id="417638779">
                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                <int key="NSfFlags">1044</int>
                                                                        </object>
                                                                        <reference key="NSControlView" ref="1020839921"/>
-                                                                       <int key="NSButtonFlags">108282111</int>
+                                                                       <int key="NSButtonFlags">108806399</int>
                                                                        <int key="NSButtonFlags2">6</int>
                                                                        <object class="NSCustomResource" key="NSNormalImage">
                                                                                <string key="NSClassName">NSImage</string>
                                                                        <reference key="NSSupport" ref="737793924"/>
                                                                        <reference key="NSControlView" ref="1020839921"/>
                                                                        <int key="NSTag">1</int>
-                                                                       <int key="NSButtonFlags">108282111</int>
+                                                                       <int key="NSButtonFlags">108806399</int>
                                                                        <int key="NSButtonFlags2">6</int>
                                                                        <object class="NSCustomResource" key="NSNormalImage">
                                                                                <string key="NSClassName">NSImage</string>
                                                                        <reference key="NSSupport" ref="737793924"/>
                                                                        <reference key="NSControlView" ref="1020839921"/>
                                                                        <int key="NSTag">3</int>
-                                                                       <int key="NSButtonFlags">108282111</int>
+                                                                       <int key="NSButtonFlags">108806399</int>
                                                                        <int key="NSButtonFlags2">6</int>
                                                                        <object class="NSCustomResource" key="NSNormalImage">
                                                                                <string key="NSClassName">NSImage</string>
@@ -406,37 +401,12 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        </object>
                                                        <reference key="NSFont" ref="737793924"/>
                                                </object>
-                                               <object class="NSImageView" id="80002672">
+                                               <object class="NSCustomView" id="9173479">
                                                        <reference key="NSNextResponder" ref="429007171"/>
                                                        <int key="NSvFlags">266</int>
-                                                       <object class="NSMutableSet" key="NSDragTypes">
-                                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                                               <object class="NSArray" key="set.sortedObjects">
-                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                       <string>Apple PDF pasteboard type</string>
-                                                                       <string>Apple PICT pasteboard type</string>
-                                                                       <string>Apple PNG pasteboard type</string>
-                                                                       <string>NSFilenamesPboardType</string>
-                                                                       <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
-                                                                       <string>NeXT TIFF v4.0 pasteboard type</string>
-                                                               </object>
-                                                       </object>
                                                        <string key="NSFrame">{{330, 0}, {73, 25}}</string>
                                                        <reference key="NSSuperview" ref="429007171"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSImageCell" key="NSCell" id="1024147571">
-                                                               <int key="NSCellFlags">130560</int>
-                                                               <int key="NSCellFlags2">33554432</int>
-                                                               <object class="NSCustomResource" key="NSContents">
-                                                                       <string key="NSClassName">NSImage</string>
-                                                                       <string key="NSResourceName">InfoTabBorder</string>
-                                                               </object>
-                                                               <int key="NSAlign">0</int>
-                                                               <int key="NSScale">1</int>
-                                                               <int key="NSStyle">0</int>
-                                                               <bool key="NSAnimates">YES</bool>
-                                                       </object>
-                                                       <bool key="NSEditable">YES</bool>
+                                                       <string key="NSClassName">InfoTabButtonBack</string>
                                                </object>
                                        </object>
                                        <string key="NSFrameSize">{403, 75}</string>
@@ -512,7 +482,9 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">0</int>
-                                               <reference key="object" ref="0"/>
+                                               <object class="NSArray" key="object" id="0">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                               </object>
                                                <reference key="children" ref="417638779"/>
                                                <nil key="parent"/>
                                        </object>
@@ -552,8 +524,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <reference ref="974784210"/>
                                                        <reference ref="40615128"/>
                                                        <reference ref="1020839921"/>
-                                                       <reference ref="80002672"/>
                                                        <reference ref="843033231"/>
+                                                       <reference ref="9173479"/>
                                                </object>
                                                <reference key="parent" ref="571546118"/>
                                        </object>
@@ -624,15 +596,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <reference key="object" ref="530185020"/>
                                                <reference key="parent" ref="1020839921"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1273</int>
-                                               <reference key="object" ref="80002672"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="1024147571"/>
-                                               </object>
-                                               <reference key="parent" ref="429007171"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">1481</int>
                                                <reference key="object" ref="585844623"/>
@@ -648,11 +611,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <reference key="object" ref="615989236"/>
                                                <reference key="parent" ref="843033231"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1484</int>
-                                               <reference key="object" ref="1024147571"/>
-                                               <reference key="parent" ref="80002672"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">1562</int>
                                                <reference key="object" ref="645033959"/>
@@ -663,6 +621,11 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <reference key="object" ref="219666447"/>
                                                <reference key="parent" ref="1020839921"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">1830</int>
+                                               <reference key="object" ref="9173479"/>
+                                               <reference key="parent" ref="429007171"/>
+                                       </object>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="flattenedProperties">
@@ -671,18 +634,17 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                        <string>-3.IBPluginDependency</string>
                                        <string>-3.ImportedFromIB2</string>
-                                       <string>1273.IBPluginDependency</string>
-                                       <string>1273.ImportedFromIB2</string>
                                        <string>1481.IBPluginDependency</string>
                                        <string>1482.IBPluginDependency</string>
                                        <string>1483.IBPluginDependency</string>
-                                       <string>1484.IBPluginDependency</string>
                                        <string>15.CustomClassName</string>
                                        <string>15.IBPluginDependency</string>
                                        <string>15.ImportedFromIB2</string>
                                        <string>1562.IBPluginDependency</string>
                                        <string>1726.CustomClassName</string>
                                        <string>1726.IBPluginDependency</string>
+                                       <string>1830.IBPluginDependency</string>
+                                       <string>1830.IBViewBoundsToFrameTransform</string>
                                        <string>28.IBPluginDependency</string>
                                        <string>28.ImportedFromIB2</string>
                                        <string>29.CustomClassName</string>
@@ -722,9 +684,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>InfoTextField</string>
@@ -734,6 +693,10 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <string>InfoTabButtonCell</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <object class="NSAffineTransform">
+                                               <bytes key="NSTransformStruct">AUOLAAAAAAAAA</bytes>
+                                       </object>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>InfoTextField</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -784,7 +747,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">1829</int>
+                       <int key="maxID">1830</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -797,6 +760,14 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <string key="minorKey"/>
                                        </object>
                                </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">InfoTabButtonBack</string>
+                                       <string key="superclassName">NSView</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBProjectSource</string>
+                                               <string key="minorKey">macosx/InfoTabButtonBack.h</string>
+                                       </object>
+                               </object>
                                <object class="IBPartialClassDescription">
                                        <string key="className">InfoTabButtonCell</string>
                                        <string key="superclassName">NSButtonCell</string>
@@ -828,6 +799,13 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <string key="NS.key.0">setTab:</string>
                                                <string key="NS.object.0">id</string>
                                        </object>
+                                       <object class="NSMutableDictionary" key="actionInfosByName">
+                                               <string key="NS.key.0">setTab:</string>
+                                               <object class="IBActionInfo" key="NS.object.0">
+                                                       <string key="name">setTab:</string>
+                                                       <string key="candidateClassName">id</string>
+                                               </object>
+                                       </object>
                                        <object class="NSMutableDictionary" key="outlets">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
                                                <object class="NSArray" key="dict.sortedKeys">
@@ -845,6 +823,35 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <string>NSMatrix</string>
                                                </object>
                                        </object>
+                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" key="dict.sortedKeys">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>fBasicInfoField</string>
+                                                       <string>fImageView</string>
+                                                       <string>fNameField</string>
+                                                       <string>fTabMatrix</string>
+                                               </object>
+                                               <object class="NSMutableArray" key="dict.values">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <object class="IBToOneOutletInfo">
+                                                               <string key="name">fBasicInfoField</string>
+                                                               <string key="candidateClassName">NSTextField</string>
+                                                       </object>
+                                                       <object class="IBToOneOutletInfo">
+                                                               <string key="name">fImageView</string>
+                                                               <string key="candidateClassName">NSImageView</string>
+                                                       </object>
+                                                       <object class="IBToOneOutletInfo">
+                                                               <string key="name">fNameField</string>
+                                                               <string key="candidateClassName">NSTextField</string>
+                                                       </object>
+                                                       <object class="IBToOneOutletInfo">
+                                                               <string key="name">fTabMatrix</string>
+                                                               <string key="candidateClassName">NSMatrix</string>
+                                                       </object>
+                                               </object>
+                                       </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
                                                <string key="minorKey">macosx/InfoWindowController.h</string>
@@ -1449,6 +1456,13 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <string key="NS.key.0">showWindow:</string>
                                                <string key="NS.object.0">id</string>
                                        </object>
+                                       <object class="NSMutableDictionary" key="actionInfosByName">
+                                               <string key="NS.key.0">showWindow:</string>
+                                               <object class="IBActionInfo" key="NS.object.0">
+                                                       <string key="name">showWindow:</string>
+                                                       <string key="candidateClassName">id</string>
+                                               </object>
+                                       </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBFrameworkSource</string>
                                                <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
@@ -1482,19 +1496,17 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                <string>InfoGeneral</string>
                                <string>InfoOptions</string>
                                <string>InfoPeers</string>
-                               <string>InfoTabBorder</string>
                                <string>InfoTracker</string>
                                <string>NSApplicationIcon</string>
                        </object>
                        <object class="NSMutableArray" key="dict.values">
                                <bool key="EncodedWithXMLCoder">YES</bool>
-                               <string>{20.2475, 20.2475}</string>
                                <string>{20, 20}</string>
                                <string>{20, 20}</string>
                                <string>{20, 20}</string>
                                <string>{20, 20}</string>
-                               <string>{1, 25}</string>
-                               <string>{20.2475, 20.2475}</string>
+                               <string>{20, 20}</string>
+                               <string>{20, 20}</string>
                                <string>{512, 512}</string>
                        </object>
                </object>
index e32ae90fe268ca293e7618ddb0d7cae7a9c35884..b6e75c8536ad2812047e343087853cf1d8348d63 100644 (file)
@@ -81,6 +81,8 @@ EXTRA_DIST = \
     GroupsPrefsController.m \
     GroupToolbarItem.h \
     GroupToolbarItem.m \
+    InfoTabButtonBack.h \
+    InfoTabButtonBack.m \
     InfoTabButtonCell.h \
     InfoTabButtonCell.m \
     InfoTextField.h \
index 5f49893f4a9bd991e160bfb2ed2e175ccf3b4a5b..4d788ce47757df5ced3c60c7603c3cdc59ad689c 100644 (file)
@@ -1691,7 +1691,7 @@ int trashDataFile(const char * filename)
     
     if ([self isFolder])
     {
-        NSInteger count = [self fileCount];
+        const NSInteger count = [self fileCount];
         NSMutableArray * fileList = [NSMutableArray arrayWithCapacity: count],
                     * flatFileList = [NSMutableArray arrayWithCapacity: count];