mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

#1408 display elapsed time in the Mac UI

This commit is contained in:
Mitchell Livingston 2010-12-23 20:07:41 +00:00
parent 16a5fa4073
commit cb99607614
6 changed files with 640 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
macosx/InfoActivityViewController.h
View File

@ -37,7 +37,8 @@
IBOutlet NSTextField * fDateAddedField, * fDateCompletedField, * fDateActivityField,
* fStateField, * fProgressField,
* fHaveField, * fDownloadedTotalField, * fUploadedTotalField, * fFailedHashField,
* fRatioField;
* fRatioField,
* fDownloadTimeField, * fSeedTimeField;
IBOutlet NSTextView * fErrorMessageView;

6
macosx/InfoActivityViewController.m
View File

@ -142,6 +142,9 @@
[fDateCompletedField setObjectValue: [torrent dateCompleted]];
[fDownloadTimeField setStringValue: [NSString timeString: [torrent secondsDownloading] showSeconds: YES]];
[fSeedTimeField setStringValue: [NSString timeString: [torrent secondsSeeding] showSeconds: YES]];
[fPiecesView updateView];
}
else if (numberSelected > 1)
@ -190,6 +193,9 @@
[fDateAddedField setStringValue: @""];
[fDateCompletedField setStringValue: @""];
[fDownloadTimeField setStringValue: @""];
[fSeedTimeField setStringValue: @""];
[fPiecesControl setSelected: NO forSegment: PIECES_CONTROL_AVAILABLE];
[fPiecesControl setSelected: NO forSegment: PIECES_CONTROL_PROGRESS];
[fPiecesControl setEnabled: NO];

3
macosx/Torrent.h
View File

@ -226,6 +226,9 @@
- (NSDate *) dateActivity;
- (NSDate *) dateActivityOrAdd;
- (NSInteger) secondsDownloading;
- (NSInteger) secondsSeeding;
- (NSInteger) stalledMinutes;
- (BOOL) isStalled;

10
macosx/Torrent.m
View File

@ -1509,6 +1509,16 @@ int trashDataFile(const char * filename)
return date ? date : [self dateAdded];
}
- (NSInteger) secondsDownloading
{
return fStat->secondsDownloading;
}
- (NSInteger) secondsSeeding
{
return fStat->secondsSeeding;
}
- (NSInteger) stalledMinutes
{
if (fStat->idleSecs == -1)

646
macosx/en.lproj/InfoActivityView.xib
View File

File diff suppressed because it is too large Load Diff

122
macosx/en.lproj/InfoGeneralView.xib
View File

@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1060</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">10H574</string>
<string key="IBDocument.InterfaceBuilderVersion">823</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.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>
@ -19,13 +19,8 @@
<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="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -46,7 +41,7 @@
<object class="NSTextField" id="986371149">
<reference key="NSNextResponder" ref="923140800"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{37, 175}, {41, 14}}</string>
<string key="NSFrame">{{37, 176}, {41, 14}}</string>
<reference key="NSSuperview" ref="923140800"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="101027857">
@ -82,7 +77,7 @@
<object class="NSTextField" id="954789442">
<reference key="NSNextResponder" ref="923140800"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{79, 175}, {261, 14}}</string>
<string key="NSFrame">{{79, 176}, {261, 14}}</string>
<reference key="NSSuperview" ref="923140800"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="437884172">
@ -133,7 +128,7 @@
<object class="NSTextField" id="438336412">
<reference key="NSNextResponder" ref="923140800"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{9, 188}, {118, 17}}</string>
<string key="NSFrame">{{9, 189}, {118, 17}}</string>
<reference key="NSSuperview" ref="923140800"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="868205360">
@ -153,7 +148,7 @@
<object class="NSTextField" id="895565412">
<reference key="NSNextResponder" ref="923140800"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{35, 143}, {43, 14}}</string>
<string key="NSFrame">{{35, 144}, {43, 14}}</string>
<reference key="NSSuperview" ref="923140800"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="344393505">
@ -169,7 +164,7 @@
<object class="NSTextField" id="30608565">
<reference key="NSNextResponder" ref="923140800"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{79, 143}, {261, 14}}</string>
<string key="NSFrame">{{79, 144}, {261, 14}}</string>
<reference key="NSSuperview" ref="923140800"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="229545903">
@ -202,7 +197,7 @@
<object class="NSTextField" id="99378388">
<reference key="NSNextResponder" ref="923140800"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{79, 10}, {242, 14}}</string>
<string key="NSFrame">{{79, 11}, {242, 14}}</string>
<reference key="NSSuperview" ref="923140800"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="85533753">
@ -235,7 +230,7 @@
<object class="NSButton" id="178285891">
<reference key="NSNextResponder" ref="923140800"/>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{326, 10}, {14, 14}}</string>
<string key="NSFrame">{{326, 11}, {14, 14}}</string>
<reference key="NSSuperview" ref="923140800"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="555982601">
@ -267,7 +262,7 @@
<object class="NSTextField" id="258860752">
<reference key="NSNextResponder" ref="923140800"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{30, 127}, {48, 14}}</string>
<string key="NSFrame">{{30, 128}, {48, 14}}</string>
<reference key="NSSuperview" ref="923140800"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1059899188">
@ -283,7 +278,7 @@
<object class="NSTextField" id="118425947">
<reference key="NSNextResponder" ref="923140800"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{79, 127}, {261, 14}}</string>
<string key="NSFrame">{{79, 128}, {261, 14}}</string>
<reference key="NSSuperview" ref="923140800"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="113845566">
@ -300,7 +295,7 @@
<object class="NSTextField" id="945225777">
<reference key="NSNextResponder" ref="923140800"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 111}, {68, 14}}</string>
<string key="NSFrame">{{10, 112}, {68, 14}}</string>
<reference key="NSSuperview" ref="923140800"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="525375036">
@ -316,7 +311,7 @@
<object class="NSTextField" id="580612458">
<reference key="NSNextResponder" ref="923140800"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{79, 111}, {261, 14}}</string>
<string key="NSFrame">{{79, 112}, {261, 14}}</string>
<reference key="NSSuperview" ref="923140800"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="164334776">
@ -351,7 +346,7 @@
<object class="NSTextField" id="700837161">
<reference key="NSNextResponder" ref="923140800"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{18, 95}, {60, 14}}</string>
<string key="NSFrame">{{18, 96}, {60, 14}}</string>
<reference key="NSSuperview" ref="923140800"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="749252977">
@ -367,7 +362,7 @@
<object class="NSTextField" id="93257596">
<reference key="NSNextResponder" ref="923140800"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{43, 159}, {35, 14}}</string>
<string key="NSFrame">{{43, 160}, {35, 14}}</string>
<reference key="NSSuperview" ref="923140800"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="534820931">
@ -383,7 +378,7 @@
<object class="NSTextField" id="784374990">
<reference key="NSNextResponder" ref="923140800"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{79, 159}, {261, 14}}</string>
<string key="NSFrame">{{79, 160}, {261, 14}}</string>
<reference key="NSSuperview" ref="923140800"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="254935115">
@ -517,7 +512,7 @@
<double key="NSPercent">0.94565220000000005</double>
</object>
</object>
<string key="NSFrame">{{79, 50}, {261, 58}}</string>
<string key="NSFrame">{{79, 51}, {261, 58}}</string>
<reference key="NSSuperview" ref="923140800"/>
<reference key="NSNextKeyView" ref="883901988"/>
<int key="NSsFlags">18</int>
@ -526,7 +521,7 @@
<reference key="NSContentView" ref="883901988"/>
</object>
</object>
<string key="NSFrameSize">{350, 210}</string>
<string key="NSFrameSize">{350, 211}</string>
<reference key="NSSuperview"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
@ -623,7 +618,9 @@
<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="1000"/>
<nil key="parent"/>
</object>
@ -1058,7 +1055,7 @@
<string>InfoTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{389, 674}, {350, 210}}</string>
<string>{{389, 673}, {350, 211}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{519, 533}, {350, 268}}</string>
@ -1137,6 +1134,13 @@
<string key="NS.key.0">revealDataFile:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">revealDataFile:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">revealDataFile:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@ -1162,6 +1166,55 @@
<string>NSTextField</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>fCommentView</string>
<string>fCreatorField</string>
<string>fDataLocationField</string>
<string>fDateCreatedField</string>
<string>fHashField</string>
<string>fPiecesField</string>
<string>fRevealDataButton</string>
<string>fSecureField</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">fCommentView</string>
<string key="candidateClassName">NSTextView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fCreatorField</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fDataLocationField</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fDateCreatedField</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fHashField</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fPiecesField</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fRevealDataButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fSecureField</string>
<string key="candidateClassName">NSTextField</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">macosx/InfoGeneralViewController.h</string>
@ -1745,6 +1798,13 @@
<string key="NS.key.0">view</string>
<string key="NS.object.0">NSView</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">view</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">view</string>
<string key="candidateClassName">NSView</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSViewController.h</string>
@ -1775,7 +1835,7 @@
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{14, 14}</string>
<string>{14.1732, 14.1732}</string>
<string>{14, 14}</string>
</object>
</object>
</data>