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

revert the last commit

This commit is contained in:
Mitchell Livingston 2011-02-26 14:59:05 +00:00
parent 39709abd6e
commit 6092362c1e
5 changed files with 10 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libtransmission/completion.c
View File

@ -304,9 +304,6 @@ tr_cpSizeWhenDone( const tr_completion * ccp )
void
tr_cpGetAmountDone( const tr_completion * cp, float * tab, int tabCount )
{
if( tabCount <= 0 )
return;
int i, b;
const int span = cp->tor->blockCount / tabCount;

4
libtransmission/torrent.h
View File

@ -219,8 +219,8 @@ struct tr_torrent
time_t startDate;
time_t anyDate;
int secondsDownloading;
int secondsSeeding;
time_t secondsDownloading;
time_t secondsSeeding;
tr_torrent_metadata_func * metadata_func;
void * metadata_func_user_data;

2
macosx/Controller.h
View File

@ -70,7 +70,7 @@ typedef enum
NSTimer * fTimer;
IBOutlet NSMenuItem * fOpenIgnoreDownloadFolder;
IBOutlet NSButton * fActionButton, * fSpeedLimitButton, * fClearCompletedButton;
IBOutlet NSButton * fActionButton, * fSpeedLimitButton;
IBOutlet NSTextField * fTotalTorrentsField;
StatusBarController * fStatusBar;

13
macosx/Controller.m
View File

@ -406,8 +406,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
"Main window -> 1st bottom left button (action) tooltip")];
[fSpeedLimitButton setToolTip: NSLocalizedString(@"Speed Limit overrides the total bandwidth limits with its own limits.",
"Main window -> 2nd bottom left button (turtle) tooltip")];
[fClearCompletedButton setToolTip: NSLocalizedString(@"Cleanup transfers that have completed seeding.",
"Main window -> 3rd bottom left button (cleanup) tooltip")];
[fTableView registerForDraggedTypes: [NSArray arrayWithObject: TORRENT_TABLE_VIEW_DATA_TYPE]];
[fWindow registerForDraggedTypes: [NSArray arrayWithObjects: NSFilenamesPboardType, NSURLPboardType, nil]];
@ -1604,13 +1602,10 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
//pull the upload and download speeds - most consistent by using current stats
CGFloat dlRate = 0.0, ulRate = 0.0;
BOOL completed = NO;
for (Torrent * torrent in fTorrents)
{
dlRate += [torrent downloadRate];
ulRate += [torrent uploadRate];
completed |= [torrent isFinishedSeeding];
}
if (![NSApp isHidden])
@ -1620,8 +1615,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[self sortTorrents];
[fStatusBar updateWithDownload: dlRate upload: ulRate];
[fClearCompletedButton setHidden: !completed];
}
//update non-constant parts of info window
@ -3372,21 +3365,21 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
return NO;
}
//set info item
//set info image
if ([ident isEqualToString: TOOLBAR_INFO])
{
[(NSButton *)[toolbarItem view] setState: [[fInfoController window] isVisible]];
return YES;
}
//set filter item
//set filter image
if ([ident isEqualToString: TOOLBAR_FILTER])
{
[(NSButton *)[toolbarItem view] setState: fFilterBar != nil];
return YES;
}
//set quick look item
//set quick look image
if ([ident isEqualToString: TOOLBAR_QUICKLOOK])
{
[(NSButton *)[toolbarItem view] setState: [NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanelSL sharedPreviewPanelExists]

84
macosx/en.lproj/MainMenu.xib
View File

@ -12,6 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1400"/>
<integer value="2"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
@ -130,7 +131,7 @@
<reference key="NSControlView" ref="673219624"/>
<int key="NSButtonFlags">-935051009</int>
<int key="NSButtonFlags2">160</int>
<object class="NSCustomResource" key="NSNormalImage" id="492840309">
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">TurtleTemplate</string>
</object>
@ -140,31 +141,10 @@
<int key="NSPeriodicInterval">75</int>
</object>
</object>
<object class="NSButton" id="52857407">
<reference key="NSNextResponder" ref="303120456"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{85, 3}, {36, 18}}</string>
<reference key="NSSuperview" ref="303120456"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="617399467">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">134348800</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="52857407"/>
<int key="NSButtonFlags">138690815</int>
<int key="NSButtonFlags2">160</int>
<reference key="NSNormalImage" ref="492840309"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
</object>
<object class="NSTextField" id="403739499">
<reference key="NSNextResponder" ref="303120456"/>
<int key="NSvFlags">258</int>
<string key="NSFrame">{{126, 5}, {263, 14}}</string>
<string key="NSFrame">{{86, 5}, {339, 14}}</string>
<reference key="NSSuperview" ref="303120456"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="696487414">
@ -4071,22 +4051,6 @@ AAAAAAAAAAAAAAAAA</bytes>
</object>
<int key="connectionID">3409</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">clearCompleted:</string>
<reference key="source" ref="30116300"/>
<reference key="destination" ref="52857407"/>
</object>
<int key="connectionID">3424</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">fClearCompletedButton</string>
<reference key="source" ref="30116300"/>
<reference key="destination" ref="52857407"/>
</object>
<int key="connectionID">3425</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -4136,7 +4100,6 @@ AAAAAAAAAAAAAAAAA</bytes>
<reference ref="673219624"/>
<reference ref="87647552"/>
<reference ref="403739499"/>
<reference ref="52857407"/>
</object>
<reference key="parent" ref="405103408"/>
</object>
@ -5744,20 +5707,6 @@ AAAAAAAAAAAAAAAAA</bytes>
<reference key="object" ref="245039314"/>
<reference key="parent" ref="335948734"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3420</int>
<reference key="object" ref="52857407"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="617399467"/>
</object>
<reference key="parent" ref="303120456"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3421</int>
<reference key="object" ref="617399467"/>
<reference key="parent" ref="52857407"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -6106,10 +6055,8 @@ AAAAAAAAAAAAAAAAA</bytes>
<string>2685.IBPluginDependency</string>
<string>2685.ImportedFromIB2</string>
<string>2690.IBPluginDependency</string>
<string>2690.IBViewBoundsToFrameTransform</string>
<string>2690.ImportedFromIB2</string>
<string>2700.IBPluginDependency</string>
<string>2700.IBViewBoundsToFrameTransform</string>
<string>2700.ImportedFromIB2</string>
<string>2839.IBPluginDependency</string>
<string>2839.ImportedFromIB2</string>
@ -6211,10 +6158,6 @@ AAAAAAAAAAAAAAAAA</bytes>
<string>3407.IBPluginDependency</string>
<string>3408.IBPluginDependency</string>
<string>3408.ImportedFromIB2</string>
<string>3420.IBPluginDependency</string>
<string>3420.IBViewBoundsToFrameTransform</string>
<string>3420.ImportedFromIB2</string>
<string>3421.IBPluginDependency</string>
<string>418.IBPluginDependency</string>
<string>418.ImportedFromIB2</string>
<string>456.IBEditorWindowLastContentRect</string>
@ -6615,14 +6558,8 @@ AAAAAAAAAAAAAAAAA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCNAAAwZgAAA</bytes>
</object>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCrAAAwYgAAA</bytes>
</object>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
@ -6725,12 +6662,6 @@ AAAAAAAAAAAAAAAAA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCSAAAwWAAAA</bytes>
</object>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{586, 242}, {291, 313}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -6801,7 +6732,7 @@ AAAAAAAAAAAAAAAAA</bytes>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">3425</int>
<int key="maxID">3409</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -7176,7 +7107,6 @@ AAAAAAAAAAAAAAAAA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<string>fActionButton</string>
<string>fCheckRatioItem</string>
<string>fClearCompletedButton</string>
<string>fDockMenu</string>
<string>fDownloadLimitItem</string>
<string>fDownloadMenu</string>
@ -7202,7 +7132,6 @@ AAAAAAAAAAAAAAAAA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSButton</string>
<string>NSMenuItem</string>
<string>NSButton</string>
<string>NSMenu</string>
<string>NSMenuItem</string>
<string>NSMenu</string>
@ -7231,7 +7160,6 @@ AAAAAAAAAAAAAAAAA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<string>fActionButton</string>
<string>fCheckRatioItem</string>
<string>fClearCompletedButton</string>
<string>fDockMenu</string>
<string>fDownloadLimitItem</string>
<string>fDownloadMenu</string>
@ -7263,10 +7191,6 @@ AAAAAAAAAAAAAAAAA</bytes>
<string key="name">fCheckRatioItem</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fClearCompletedButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fDockMenu</string>
<string key="candidateClassName">NSMenu</string>