diff --git a/NEWS b/NEWS
index 72f2aa7db..99ed09857 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ NEWS file for Transmission
+ Leopard: Group dividers
+ Use the file icon as the per-torrent action button
+ Updated images in the inspector
+ + Optional display of remaining time while seeding in Minimal View
1.05 (2008/02/08)
- All Platforms:
diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj
index 86da1eba6..6a8e4462b 100644
--- a/Transmission.xcodeproj/project.pbxproj
+++ b/Transmission.xcodeproj/project.pbxproj
@@ -137,8 +137,8 @@
A29576030D11D63C0093B167 /* Creator.xib in Resources */ = {isa = PBXBuildFile; fileRef = A29576010D11D63C0093B167 /* Creator.xib */; };
A29576080D11D70E0093B167 /* MessageWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A29576060D11D70E0093B167 /* MessageWindow.xib */; };
A29576130D11D8DD0093B167 /* InfoWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A29576110D11D8DD0093B167 /* InfoWindow.xib */; };
- A29AF4F70D01BADC00D097EC /* DownArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = A29AF4F60D01BADC00D097EC /* DownArrow.png */; };
- A29AF4F90D01BAEB00D097EC /* UpArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = A29AF4F80D01BAEB00D097EC /* UpArrow.png */; };
+ A29AF4F70D01BADC00D097EC /* DownArrowTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A29AF4F60D01BADC00D097EC /* DownArrowTemplate.png */; };
+ A29AF4F90D01BAEB00D097EC /* UpArrowTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A29AF4F80D01BAEB00D097EC /* UpArrowTemplate.png */; };
A29B0C270BD15FEF0006F230 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = A2F8951E0A2D4BA500ED2127 /* Credits.rtf */; };
A29C8B370ACC6EB3000ED9F9 /* PortChecker.m in Sources */ = {isa = PBXBuildFile; fileRef = A29C8B350ACC6EB3000ED9F9 /* PortChecker.m */; };
A2A1CB7A0BF29D5500AE959F /* PeerProgressIndicatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A1CB780BF29D5500AE959F /* PeerProgressIndicatorCell.m */; };
@@ -548,8 +548,8 @@
A29576020D11D63C0093B167 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = macosx/English.lproj/Creator.xib; sourceTree = ""; };
A29576070D11D70E0093B167 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = macosx/English.lproj/MessageWindow.xib; sourceTree = ""; };
A29576120D11D8DD0093B167 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = macosx/English.lproj/InfoWindow.xib; sourceTree = ""; };
- A29AF4F60D01BADC00D097EC /* DownArrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownArrow.png; path = macosx/Images/DownArrow.png; sourceTree = ""; };
- A29AF4F80D01BAEB00D097EC /* UpArrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = UpArrow.png; path = macosx/Images/UpArrow.png; sourceTree = ""; };
+ A29AF4F60D01BADC00D097EC /* DownArrowTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownArrowTemplate.png; path = macosx/Images/DownArrowTemplate.png; sourceTree = ""; };
+ A29AF4F80D01BAEB00D097EC /* UpArrowTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = UpArrowTemplate.png; path = macosx/Images/UpArrowTemplate.png; sourceTree = ""; };
A29C8B340ACC6EB3000ED9F9 /* PortChecker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PortChecker.h; path = macosx/PortChecker.h; sourceTree = ""; };
A29C8B350ACC6EB3000ED9F9 /* PortChecker.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PortChecker.m; path = macosx/PortChecker.m; sourceTree = ""; };
A2A1CB770BF29D5500AE959F /* PeerProgressIndicatorCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PeerProgressIndicatorCell.h; path = macosx/PeerProgressIndicatorCell.h; sourceTree = ""; };
@@ -921,8 +921,8 @@
A2FB06950BFF484A0095564D /* Globe.png */,
A261A8250C6A0D68003BAFDA /* Error.png */,
A2F1511F0CD438BA001F3B0E /* Lock.png */,
- A29AF4F80D01BAEB00D097EC /* UpArrow.png */,
- A29AF4F60D01BADC00D097EC /* DownArrow.png */,
+ A29AF4F80D01BAEB00D097EC /* UpArrowTemplate.png */,
+ A29AF4F60D01BADC00D097EC /* DownArrowTemplate.png */,
A2F41DAA0D0B916B006CE378 /* YingYangTemplate.png */,
A20152630D1C1BE70081714F /* PinTemplate.png */,
A2F151150CD438A4001F3B0E /* YellowDot.png */,
@@ -1627,8 +1627,8 @@
A25892770CF1FCE800CCCDDF /* StatsWindow.xib in Resources */,
A22D3AA60D00D1790079CFED /* Turtle.png in Resources */,
A22D3AA70D00D1790079CFED /* TurtleBlue.png in Resources */,
- A29AF4F70D01BADC00D097EC /* DownArrow.png in Resources */,
- A29AF4F90D01BAEB00D097EC /* UpArrow.png in Resources */,
+ A29AF4F70D01BADC00D097EC /* DownArrowTemplate.png in Resources */,
+ A29AF4F90D01BAEB00D097EC /* UpArrowTemplate.png in Resources */,
A2F41DA90D0B9152006CE378 /* ActionGear.png in Resources */,
A2F41DAB0D0B916B006CE378 /* YingYangTemplate.png in Resources */,
A2F41DBC0D0B96C0006CE378 /* FilterBlue.png in Resources */,
diff --git a/macosx/Controller.m b/macosx/Controller.m
index dda461384..fdcd75e5c 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2478,8 +2478,29 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
{
if (![item isKindOfClass: [Torrent class]])
{
- int group = [[item objectForKey: @"Group"] intValue];
- return group != -1 ? [[GroupsWindowController groups] nameForIndex: group] : NSLocalizedString(@"No Group", "Group table row");
+ NSString * ident = [tableColumn identifier];
+ if ([ident isEqualToString: @"Group"])
+ {
+ int group = [[item objectForKey: @"Group"] intValue];
+ return group != -1 ? [[GroupsWindowController groups] nameForIndex: group]
+ : NSLocalizedString(@"No Group", "Group table row");
+ }
+ else if ([ident isEqualToString: @"UL Image"])
+ return [NSImage imageNamed: @"UpArrowTemplate.png"];
+ else if ([ident isEqualToString: @"DL Image"])
+ return [NSImage imageNamed: @"DownArrowTemplate.png"];
+ else
+ {
+ BOOL upload = [ident isEqualToString: @"UL"];
+
+ float rate = 0.0;
+ NSEnumerator * enumerator = [[item objectForKey: @"Torrents"] objectEnumerator];
+ Torrent * torrent;
+ while ((torrent = [enumerator nextObject]))
+ rate += upload ? [torrent uploadRate] : [torrent downloadRate];
+
+ return [NSString stringForSpeed: rate];
+ }
}
else
return [item hashString];
diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib
index 0065f82d8..20a88bcf4 100644
--- a/macosx/English.lproj/MainMenu.xib
+++ b/macosx/English.lproj/MainMenu.xib
@@ -2,17 +2,18 @@
1050
- 9B18
+ 9C31
629
- 949
- 343.00
+ 949.26
+ 352.00
@@ -1235,8 +2875,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
submenuAction:
_NSWindowsMenu
@@ -1386,8 +3026,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
submenuAction:
@@ -1447,7 +3087,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
_NSMainMenu
@@ -1589,8 +3229,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
@@ -1644,8 +3284,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
@@ -1698,8 +3338,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
@@ -2302,7 +3952,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
{457, 23}
-
+
@@ -2477,8 +4127,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
submenuAction:
@@ -2524,8 +4174,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
@@ -2580,8 +4230,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
@@ -2710,8 +4360,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
submenuAction:
@@ -2767,8 +4417,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
submenuAction:
@@ -2826,8 +4476,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
@@ -2894,8 +4544,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
@@ -2911,8 +4561,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
401
@@ -2938,9 +4588,9 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
-
+
+
+
-1
@@ -2994,8 +4644,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
1048576
2147483647
-
-
+
+
-999
@@ -3308,7 +4958,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
@@ -6582,6 +8236,62 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
+
+
+
+
+
+
+
+
@@ -7739,165 +9453,14 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
- 3123
+ 3139
+
+
+
+
+
-
-
-
-
-
diff --git a/macosx/Images/DownArrow.png b/macosx/Images/DownArrowTemplate.png
similarity index 100%
rename from macosx/Images/DownArrow.png
rename to macosx/Images/DownArrowTemplate.png
diff --git a/macosx/Images/UpArrow.png b/macosx/Images/UpArrowTemplate.png
similarity index 100%
rename from macosx/Images/UpArrow.png
rename to macosx/Images/UpArrowTemplate.png
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 4d6349c7e..2570d0b09 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -1090,7 +1090,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
&& !(fRatioSetting == NSOnState || (fRatioSetting == NSMixedState && [fDefaults boolForKey: @"RatioCheck"]))))
return [self shortStatusString];
- int eta = fStat->status == TR_STATUS_DOWNLOAD ? [self eta] : [self etaRatio];
+ int eta = [self isSeeding] ? [self etaRatio] : [self eta];
return eta >= 0 ? [self etaString: eta] : NSLocalizedString(@"Unknown", "Torrent -> remaining time");
}
diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index 0d4e86fdb..530bf5d30 100644
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -134,15 +134,13 @@
- (NSCell *) outlineView: (NSOutlineView *) outlineView dataCellForTableColumn: (NSTableColumn *) tableColumn item: (id) item
{
- if (!tableColumn)
- return nil;
- return [item isKindOfClass: [Torrent class]] ? fTorrentCell : nil;
+ return !tableColumn && [item isKindOfClass: [Torrent class]] ? fTorrentCell : nil;
}
- (void) outlineView: (NSOutlineView *) outlineView willDisplayCell: (id) cell forTableColumn: (NSTableColumn *) tableColumn
item: (id) item
{
- if (![item isKindOfClass: [Torrent class]])
+ if (![item isKindOfClass: [Torrent class]] || tableColumn)
return;
[cell setRepresentedObject: item];
@@ -156,21 +154,16 @@
- (NSRect) frameOfCellAtColumn: (NSInteger) column row: (NSInteger) row
{
- NSRect rect = [super frameOfCellAtColumn: column row: row];
-
if ([[self itemAtRow: row] isKindOfClass: [Torrent class]])
- {
- rect.size.width += rect.origin.x;
- rect.origin.x = 0.0;
- }
-
- return rect;
+ return [self rectOfRow: row];
+ else
+ return [super frameOfCellAtColumn: column row: row];
}
- (NSString *) outlineView: (NSOutlineView *) outlineView typeSelectStringForTableColumn: (NSTableColumn *) tableColumn item: (id) item
{
return [item isKindOfClass: [Torrent class]] ? [item name]
- : [[self preparedCellAtColumn: 0 row: [self rowForItem: item]] stringValue];
+ : [[self preparedCellAtColumn: -1 row: [self rowForItem: item]] stringValue];
}
- (void) updateTrackingAreas
@@ -191,7 +184,7 @@
continue;
NSDictionary * userInfo = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt: row] forKey: @"Row"];
- TorrentCell * cell = (TorrentCell *)[self preparedCellAtColumn: 0 row: row];
+ TorrentCell * cell = (TorrentCell *)[self preparedCellAtColumn: -1 row: row];
[cell addTrackingAreasForView: self inRect: [self frameOfCellAtColumn: 0 row: row] withUserInfo: userInfo
mouseLocation: mouseLocation];
}
@@ -690,7 +683,7 @@
TorrentCell * cell;
if ([NSApp isOnLeopardOrBetter])
- cell = (TorrentCell *)[self preparedCellAtColumn: 0 row: row];
+ cell = (TorrentCell *)[self preparedCellAtColumn: -1 row: row];
else
{
cell = fTorrentCell;
@@ -707,7 +700,7 @@
TorrentCell * cell;
if ([NSApp isOnLeopardOrBetter])
- cell = (TorrentCell *)[self preparedCellAtColumn: 0 row: row];
+ cell = (TorrentCell *)[self preparedCellAtColumn: -1 row: row];
else
{
cell = fTorrentCell;