Changeset 12046
- Timestamp:
- Feb 26, 2011, 2:59:05 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
-
libtransmission/completion.c (modified) (1 diff)
-
libtransmission/torrent.h (modified) (1 diff)
-
macosx/Controller.h (modified) (1 diff)
-
macosx/Controller.m (modified) (6 diffs)
-
macosx/en.lproj/MainMenu.xib (modified) (15 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/libtransmission/completion.c
r12045 r12046 305 305 tr_cpGetAmountDone( const tr_completion * cp, float * tab, int tabCount ) 306 306 { 307 if( tabCount <= 0 )308 return;309 310 307 int i, b; 311 308 const int span = cp->tor->blockCount / tabCount; -
trunk/libtransmission/torrent.h
r12045 r12046 220 220 time_t anyDate; 221 221 222 intsecondsDownloading;223 intsecondsSeeding;222 time_t secondsDownloading; 223 time_t secondsSeeding; 224 224 225 225 tr_torrent_metadata_func * metadata_func; -
trunk/macosx/Controller.h
r12045 r12046 71 71 72 72 IBOutlet NSMenuItem * fOpenIgnoreDownloadFolder; 73 IBOutlet NSButton * fActionButton, * fSpeedLimitButton , * fClearCompletedButton;73 IBOutlet NSButton * fActionButton, * fSpeedLimitButton; 74 74 IBOutlet NSTextField * fTotalTorrentsField; 75 75 -
trunk/macosx/Controller.m
r12045 r12046 407 407 [fSpeedLimitButton setToolTip: NSLocalizedString(@"Speed Limit overrides the total bandwidth limits with its own limits.", 408 408 "Main window -> 2nd bottom left button (turtle) tooltip")]; 409 [fClearCompletedButton setToolTip: NSLocalizedString(@"Cleanup transfers that have completed seeding.",410 "Main window -> 3rd bottom left button (cleanup) tooltip")];411 409 412 410 [fTableView registerForDraggedTypes: [NSArray arrayWithObject: TORRENT_TABLE_VIEW_DATA_TYPE]]; … … 1605 1603 //pull the upload and download speeds - most consistent by using current stats 1606 1604 CGFloat dlRate = 0.0, ulRate = 0.0; 1607 BOOL completed = NO;1608 1605 for (Torrent * torrent in fTorrents) 1609 1606 { 1610 1607 dlRate += [torrent downloadRate]; 1611 1608 ulRate += [torrent uploadRate]; 1612 1613 completed |= [torrent isFinishedSeeding];1614 1609 } 1615 1610 … … 1621 1616 1622 1617 [fStatusBar updateWithDownload: dlRate upload: ulRate]; 1623 1624 [fClearCompletedButton setHidden: !completed];1625 1618 } 1626 1619 … … 3373 3366 } 3374 3367 3375 //set info i tem3368 //set info image 3376 3369 if ([ident isEqualToString: TOOLBAR_INFO]) 3377 3370 { … … 3380 3373 } 3381 3374 3382 //set filter i tem3375 //set filter image 3383 3376 if ([ident isEqualToString: TOOLBAR_FILTER]) 3384 3377 { … … 3387 3380 } 3388 3381 3389 //set quick look i tem3382 //set quick look image 3390 3383 if ([ident isEqualToString: TOOLBAR_QUICKLOOK]) 3391 3384 { -
trunk/macosx/en.lproj/MainMenu.xib
r12045 r12046 13 13 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 14 14 <bool key="EncodedWithXMLCoder">YES</bool> 15 <integer value="1400"/> 15 16 <integer value="2"/> 16 17 </object> … … 131 132 <int key="NSButtonFlags">-935051009</int> 132 133 <int key="NSButtonFlags2">160</int> 133 <object class="NSCustomResource" key="NSNormalImage" id="492840309">134 <object class="NSCustomResource" key="NSNormalImage"> 134 135 <string key="NSClassName">NSImage</string> 135 136 <string key="NSResourceName">TurtleTemplate</string> … … 141 142 </object> 142 143 </object> 143 <object class="NSButton" id="52857407">144 <reference key="NSNextResponder" ref="303120456"/>145 <int key="NSvFlags">292</int>146 <string key="NSFrame">{{85, 3}, {36, 18}}</string>147 <reference key="NSSuperview" ref="303120456"/>148 <bool key="NSEnabled">YES</bool>149 <object class="NSButtonCell" key="NSCell" id="617399467">150 <int key="NSCellFlags">-2080244224</int>151 <int key="NSCellFlags2">134348800</int>152 <string key="NSContents"/>153 <reference key="NSSupport" ref="26"/>154 <reference key="NSControlView" ref="52857407"/>155 <int key="NSButtonFlags">138690815</int>156 <int key="NSButtonFlags2">160</int>157 <reference key="NSNormalImage" ref="492840309"/>158 <string key="NSAlternateContents"/>159 <string key="NSKeyEquivalent"/>160 <int key="NSPeriodicDelay">400</int>161 <int key="NSPeriodicInterval">75</int>162 </object>163 </object>164 144 <object class="NSTextField" id="403739499"> 165 145 <reference key="NSNextResponder" ref="303120456"/> 166 146 <int key="NSvFlags">258</int> 167 <string key="NSFrame">{{ 126, 5}, {263, 14}}</string>147 <string key="NSFrame">{{86, 5}, {339, 14}}</string> 168 148 <reference key="NSSuperview" ref="303120456"/> 169 149 <bool key="NSEnabled">YES</bool> … … 4072 4052 <int key="connectionID">3409</int> 4073 4053 </object> 4074 <object class="IBConnectionRecord">4075 <object class="IBActionConnection" key="connection">4076 <string key="label">clearCompleted:</string>4077 <reference key="source" ref="30116300"/>4078 <reference key="destination" ref="52857407"/>4079 </object>4080 <int key="connectionID">3424</int>4081 </object>4082 <object class="IBConnectionRecord">4083 <object class="IBOutletConnection" key="connection">4084 <string key="label">fClearCompletedButton</string>4085 <reference key="source" ref="30116300"/>4086 <reference key="destination" ref="52857407"/>4087 </object>4088 <int key="connectionID">3425</int>4089 </object>4090 4054 </object> 4091 4055 <object class="IBMutableOrderedSet" key="objectRecords"> … … 4137 4101 <reference ref="87647552"/> 4138 4102 <reference ref="403739499"/> 4139 <reference ref="52857407"/>4140 4103 </object> 4141 4104 <reference key="parent" ref="405103408"/> … … 5744 5707 <reference key="object" ref="245039314"/> 5745 5708 <reference key="parent" ref="335948734"/> 5746 </object>5747 <object class="IBObjectRecord">5748 <int key="objectID">3420</int>5749 <reference key="object" ref="52857407"/>5750 <object class="NSMutableArray" key="children">5751 <bool key="EncodedWithXMLCoder">YES</bool>5752 <reference ref="617399467"/>5753 </object>5754 <reference key="parent" ref="303120456"/>5755 </object>5756 <object class="IBObjectRecord">5757 <int key="objectID">3421</int>5758 <reference key="object" ref="617399467"/>5759 <reference key="parent" ref="52857407"/>5760 5709 </object> 5761 5710 </object> … … 6107 6056 <string>2685.ImportedFromIB2</string> 6108 6057 <string>2690.IBPluginDependency</string> 6109 <string>2690.IBViewBoundsToFrameTransform</string>6110 6058 <string>2690.ImportedFromIB2</string> 6111 6059 <string>2700.IBPluginDependency</string> 6112 <string>2700.IBViewBoundsToFrameTransform</string>6113 6060 <string>2700.ImportedFromIB2</string> 6114 6061 <string>2839.IBPluginDependency</string> … … 6212 6159 <string>3408.IBPluginDependency</string> 6213 6160 <string>3408.ImportedFromIB2</string> 6214 <string>3420.IBPluginDependency</string>6215 <string>3420.IBViewBoundsToFrameTransform</string>6216 <string>3420.ImportedFromIB2</string>6217 <string>3421.IBPluginDependency</string>6218 6161 <string>418.IBPluginDependency</string> 6219 6162 <string>418.ImportedFromIB2</string> … … 6616 6559 <integer value="1"/> 6617 6560 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6618 <object class="NSAffineTransform"> 6619 <bytes key="NSTransformStruct">P4AAAL+AAABCNAAAwZgAAA</bytes> 6620 </object> 6621 <integer value="1"/> 6622 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6623 <object class="NSAffineTransform"> 6624 <bytes key="NSTransformStruct">P4AAAL+AAABCrAAAwYgAAA</bytes> 6625 </object> 6561 <integer value="1"/> 6562 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6626 6563 <integer value="1"/> 6627 6564 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> … … 6725 6662 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6726 6663 <integer value="1"/> 6727 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>6728 <object class="NSAffineTransform">6729 <bytes key="NSTransformStruct">P4AAAL+AAABCSAAAwWAAAA</bytes>6730 </object>6731 <integer value="1"/>6732 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>6733 6664 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6734 6665 <integer value="1"/> … … 6802 6733 </object> 6803 6734 <nil key="sourceID"/> 6804 <int key="maxID">34 25</int>6735 <int key="maxID">3409</int> 6805 6736 </object> 6806 6737 <object class="IBClassDescriber" key="IBDocument.Classes"> … … 7177 7108 <string>fActionButton</string> 7178 7109 <string>fCheckRatioItem</string> 7179 <string>fClearCompletedButton</string>7180 7110 <string>fDockMenu</string> 7181 7111 <string>fDownloadLimitItem</string> … … 7203 7133 <string>NSButton</string> 7204 7134 <string>NSMenuItem</string> 7205 <string>NSButton</string>7206 7135 <string>NSMenu</string> 7207 7136 <string>NSMenuItem</string> … … 7232 7161 <string>fActionButton</string> 7233 7162 <string>fCheckRatioItem</string> 7234 <string>fClearCompletedButton</string>7235 7163 <string>fDockMenu</string> 7236 7164 <string>fDownloadLimitItem</string> … … 7263 7191 <string key="name">fCheckRatioItem</string> 7264 7192 <string key="candidateClassName">NSMenuItem</string> 7265 </object>7266 <object class="IBToOneOutletInfo">7267 <string key="name">fClearCompletedButton</string>7268 <string key="candidateClassName">NSButton</string>7269 7193 </object> 7270 7194 <object class="IBToOneOutletInfo">
Note: See TracChangeset
for help on using the changeset viewer.
