From: Mitchell Livingston Date: Sun, 30 Jan 2011 02:01:05 +0000 (+0000) Subject: #3962 Update the inspector's button bar's look X-Git-Tag: 2.20b3~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5eed4bd0576e44c2c8bc2a2200c89bfa1c15fa6;p=transmission #3962 Update the inspector's button bar's look --- diff --git a/NEWS b/NEWS index b72738693..41de5f656 100644 --- 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 diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index 7625a32c9..565266ffd 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -170,6 +170,7 @@ 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 */; }; @@ -274,16 +275,12 @@ 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 */; }; @@ -655,6 +652,8 @@ A25963E01068376200453B31 /* FavIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FavIcon.png; path = macosx/Images/FavIcon.png; sourceTree = ""; }; A25964A4106D73A800453B31 /* announcer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = announcer.c; path = libtransmission/announcer.c; sourceTree = ""; }; A25964A5106D73A800453B31 /* announcer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = announcer.h; path = libtransmission/announcer.h; sourceTree = ""; }; + A25BB02812F4F517004B724E /* InfoTabButtonBack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InfoTabButtonBack.h; path = macosx/InfoTabButtonBack.h; sourceTree = ""; }; + A25BB02912F4F517004B724E /* InfoTabButtonBack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = InfoTabButtonBack.m; path = macosx/InfoTabButtonBack.m; sourceTree = ""; }; A25D2CBA0CF4C7190096A262 /* stats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stats.h; path = libtransmission/stats.h; sourceTree = ""; }; A25D2CBB0CF4C7190096A262 /* stats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stats.c; path = libtransmission/stats.c; sourceTree = ""; }; A25E03E00E4015380086C225 /* tr-getopt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "tr-getopt.h"; path = "libtransmission/tr-getopt.h"; sourceTree = ""; }; @@ -845,9 +844,6 @@ A2F151160CD438A4001F3B0E /* RedDot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RedDot.png; path = macosx/Images/RedDot.png; sourceTree = ""; }; A2F151170CD438A4001F3B0E /* GreenDot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = GreenDot.png; path = macosx/Images/GreenDot.png; sourceTree = ""; }; A2F1511F0CD438BA001F3B0E /* Lock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Lock.png; path = macosx/Images/Lock.png; sourceTree = ""; }; - A2F151210CD438DE001F3B0E /* InfoTabBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTabBorder.png; path = macosx/Images/InfoTabBorder.png; sourceTree = ""; }; - A2F151220CD438DE001F3B0E /* InfoTabBack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTabBack.png; path = macosx/Images/InfoTabBack.png; sourceTree = ""; }; - A2F151230CD438DE001F3B0E /* InfoTabBackBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTabBackBlue.png; path = macosx/Images/InfoTabBackBlue.png; sourceTree = ""; }; A2F41DAA0D0B916B006CE378 /* YingYangTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = YingYangTemplate.png; path = macosx/Images/YingYangTemplate.png; sourceTree = ""; }; A2F41F8D0D73595100B82116 /* InfoTracker.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTracker.png; path = macosx/Images/InfoTracker.png; sourceTree = ""; }; A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = ""; }; @@ -857,7 +853,6 @@ A2FB06950BFF484A0095564D /* Globe.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Globe.png; path = macosx/Images/Globe.png; sourceTree = ""; }; A2FB701A0D95CAEA0001F331 /* GroupsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupsController.h; path = macosx/GroupsController.h; sourceTree = ""; }; A2FB701B0D95CAEA0001F331 /* GroupsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GroupsController.m; path = macosx/GroupsController.m; sourceTree = ""; }; - A2FE61D70CD3D0A500D683E1 /* InfoTabBackGraphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTabBackGraphite.png; path = macosx/Images/InfoTabBackGraphite.png; sourceTree = ""; }; 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 = ""; }; BE11834E0CE160C50002D0F3 /* declspec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = declspec.h; path = "third-party/miniupnp/declspec.h"; sourceTree = ""; }; @@ -1217,10 +1212,6 @@ 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 */, @@ -1526,6 +1517,8 @@ A257C1800CAD3003004E121C /* PeerTableView.m */, A2E23AC30CB5E1930002BB25 /* InfoTabButtonCell.h */, A2E23AC40CB5E1930002BB25 /* InfoTabButtonCell.m */, + A25BB02812F4F517004B724E /* InfoTabButtonBack.h */, + A25BB02912F4F517004B724E /* InfoTabButtonBack.m */, A200B8390A2263BA007BBB1E /* InfoWindowController.h */, A200B83A0A2263BA007BBB1E /* InfoWindowController.m */, A2A1CB770BF29D5500AE959F /* PeerProgressIndicatorCell.h */, @@ -1940,14 +1933,10 @@ 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 */, @@ -2180,6 +2169,7 @@ 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 index 470628e15..000000000 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 index 903f490ae..000000000 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 index 19dbdf9d3..000000000 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 index aa91efdb3..000000000 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 index 000000000..1e0b4fb8b --- /dev/null +++ b/macosx/InfoTabButtonBack.h @@ -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 + +@interface InfoTabButtonBack : NSView +{ +} + +@end diff --git a/macosx/InfoTabButtonBack.m b/macosx/InfoTabButtonBack.m new file mode 100644 index 000000000..883b7116e --- /dev/null +++ b/macosx/InfoTabButtonBack.m @@ -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 diff --git a/macosx/InfoTabButtonCell.m b/macosx/InfoTabButtonCell.m index f7e91b9bf..287b60784 100644 --- a/macosx/InfoTabButtonCell.m +++ b/macosx/InfoTabButtonCell.m @@ -29,11 +29,7 @@ - (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]; } @@ -53,22 +47,45 @@ { 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]; } @@ -77,10 +94,4 @@ [tabImage release]; } -- (void) updateControlTint: (NSNotification *) notification -{ - if (fSelected) - [self setSelectedTab: YES]; -} - @end diff --git a/macosx/InfoWindow.xib b/macosx/InfoWindow.xib index 669d8ca1e..75c4263c2 100644 --- a/macosx/InfoWindow.xib +++ b/macosx/InfoWindow.xib @@ -2,13 +2,13 @@ 1050 - 10D573 - 762 - 1038.29 - 460.00 + 10J567 + 823 + 1038.35 + 462.00 com.apple.InterfaceBuilder.CocoaPlugin - 762 + 823 YES @@ -19,13 +19,8 @@ com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -163,7 +158,7 @@ 1044 - 108282111 + 108806399 6 NSImage @@ -181,7 +176,7 @@ 1 - 108282111 + 108806399 6 NSImage @@ -217,7 +212,7 @@ 3 - 108282111 + 108806399 6 NSImage @@ -406,37 +401,12 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA - + 266 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - {{330, 0}, {73, 25}} - YES - - 130560 - 33554432 - - NSImage - InfoTabBorder - - 0 - 1 - 0 - YES - - YES + InfoTabButtonBack {403, 75} @@ -512,7 +482,9 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA YES 0 - + + YES + @@ -552,8 +524,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA - + @@ -624,15 +596,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA - - 1273 - - - YES - - - - 1481 @@ -648,11 +611,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA - - 1484 - - - 1562 @@ -663,6 +621,11 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA + + 1830 + + + @@ -671,18 +634,17 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA YES -3.IBPluginDependency -3.ImportedFromIB2 - 1273.IBPluginDependency - 1273.ImportedFromIB2 1481.IBPluginDependency 1482.IBPluginDependency 1483.IBPluginDependency - 1484.IBPluginDependency 15.CustomClassName 15.IBPluginDependency 15.ImportedFromIB2 1562.IBPluginDependency 1726.CustomClassName 1726.IBPluginDependency + 1830.IBPluginDependency + 1830.IBViewBoundsToFrameTransform 28.IBPluginDependency 28.ImportedFromIB2 29.CustomClassName @@ -722,9 +684,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin InfoTextField @@ -734,6 +693,10 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA InfoTabButtonCell com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + AUOLAAAAAAAAA + + com.apple.InterfaceBuilder.CocoaPlugin InfoTextField com.apple.InterfaceBuilder.CocoaPlugin @@ -784,7 +747,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA - 1829 + 1830 @@ -797,6 +760,14 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA + + InfoTabButtonBack + NSView + + IBProjectSource + macosx/InfoTabButtonBack.h + + InfoTabButtonCell NSButtonCell @@ -828,6 +799,13 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA setTab: id + + setTab: + + setTab: + id + + YES @@ -845,6 +823,35 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA NSMatrix + + YES + + YES + fBasicInfoField + fImageView + fNameField + fTabMatrix + + + YES + + fBasicInfoField + NSTextField + + + fImageView + NSImageView + + + fNameField + NSTextField + + + fTabMatrix + NSMatrix + + + IBProjectSource macosx/InfoWindowController.h @@ -1449,6 +1456,13 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA showWindow: id + + showWindow: + + showWindow: + id + + IBFrameworkSource AppKit.framework/Headers/NSWindowController.h @@ -1482,19 +1496,17 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA InfoGeneral InfoOptions InfoPeers - InfoTabBorder InfoTracker NSApplicationIcon YES - {20.2475, 20.2475} {20, 20} {20, 20} {20, 20} {20, 20} - {1, 25} - {20.2475, 20.2475} + {20, 20} + {20, 20} {512, 512} diff --git a/macosx/Makefile.am b/macosx/Makefile.am index e32ae90fe..b6e75c853 100644 --- a/macosx/Makefile.am +++ b/macosx/Makefile.am @@ -81,6 +81,8 @@ EXTRA_DIST = \ GroupsPrefsController.m \ GroupToolbarItem.h \ GroupToolbarItem.m \ + InfoTabButtonBack.h \ + InfoTabButtonBack.m \ InfoTabButtonCell.h \ InfoTabButtonCell.m \ InfoTextField.h \ diff --git a/macosx/Torrent.m b/macosx/Torrent.m index 5f49893f4..4d788ce47 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -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];