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

(mac) initial support for adding and removing trackers

This commit is contained in:
Mitchell Livingston 2008-06-02 17:26:02 +00:00
parent 53a426c738
commit 88d357539e
8 changed files with 372 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macosx/CreatorWindowController.m
View File

@ -25,7 +25,7 @@
#import "CreatorWindowController.h"
#import "NSApplicationAdditions.h"
#import "NSStringAdditions.h"
#include "utils.h" //tr_httpParseURL
#include "utils.h" //tr_httpIsValidURL
@interface CreatorWindowController (Private)

181
macosx/English.lproj/InfoWindow.xib
View File

@ -2,14 +2,14 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">9C7010</string>
<string key="IBDocument.InterfaceBuilderVersion">658</string>
<string key="IBDocument.AppKitVersion">949.26</string>
<string key="IBDocument.SystemVersion">9D34</string>
<string key="IBDocument.InterfaceBuilderVersion">667</string>
<string key="IBDocument.AppKitVersion">949.33</string>
<string key="IBDocument.HIToolboxVersion">352.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1066"/>
<integer value="1615"/>
<integer value="6"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -39,7 +39,7 @@
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{350, 73}</string>
<object class="NSView" key="NSWindowView" id="429007171">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -404,7 +404,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
</object>
</object>
<string key="NSFrameSize">{350, 75}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{350, 89}</string>
@ -1592,7 +1591,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSSegmentedCell" key="NSCell" id="342789913">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">262144</int>
<object class="NSFont" key="NSSupport">
<object class="NSFont" key="NSSupport" id="22">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">9.000000e+00</double>
<int key="NSfFlags">3614</int>
@ -1729,7 +1728,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSTextField" id="560564691">
<reference key="NSNextResponder" ref="296911506"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{114, 147}, {256, 14}}</string>
<string key="NSFrame">{{114, 147}, {258, 14}}</string>
<reference key="NSSuperview" ref="296911506"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="985231956">
@ -1746,7 +1745,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSTextField" id="190866252">
<reference key="NSNextResponder" ref="296911506"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{114, 131}, {256, 14}}</string>
<string key="NSFrame">{{114, 131}, {258, 14}}</string>
<reference key="NSSuperview" ref="296911506"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="547310904">
@ -1816,7 +1815,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSTextField" id="690569376">
<reference key="NSNextResponder" ref="296911506"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{114, 99}, {256, 14}}</string>
<string key="NSFrame">{{114, 99}, {258, 14}}</string>
<reference key="NSSuperview" ref="296911506"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="897792403">
@ -1833,7 +1832,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSBox" id="350634625">
<reference key="NSNextResponder" ref="296911506"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{10, 91}, {360, 5}}</string>
<string key="NSFrame">{{10, 91}, {362, 5}}</string>
<reference key="NSSuperview" ref="296911506"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@ -1871,7 +1870,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSTextField" id="118267814">
<reference key="NSNextResponder" ref="296911506"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{114, 115}, {256, 14}}</string>
<string key="NSFrame">{{114, 115}, {258, 14}}</string>
<reference key="NSSuperview" ref="296911506"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="739620098">
@ -1888,7 +1887,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSTextField" id="466367554">
<reference key="NSNextResponder" ref="296911506"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{114, 58}, {256, 14}}</string>
<string key="NSFrame">{{114, 58}, {258, 14}}</string>
<reference key="NSSuperview" ref="296911506"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="169082117">
@ -1937,7 +1936,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSTextField" id="1028584309">
<reference key="NSNextResponder" ref="296911506"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{114, 26}, {256, 14}}</string>
<string key="NSFrame">{{114, 26}, {258, 14}}</string>
<reference key="NSSuperview" ref="296911506"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="992617652">
@ -1954,7 +1953,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSTextField" id="823536534">
<reference key="NSNextResponder" ref="296911506"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{114, 10}, {256, 14}}</string>
<string key="NSFrame">{{114, 10}, {258, 14}}</string>
<reference key="NSSuperview" ref="296911506"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="598595608">
@ -1971,7 +1970,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSTextField" id="723947029">
<reference key="NSNextResponder" ref="296911506"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{114, 42}, {256, 14}}</string>
<string key="NSFrame">{{114, 42}, {258, 14}}</string>
<reference key="NSSuperview" ref="296911506"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="534346458">
@ -2067,18 +2066,18 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSTableView" id="423972458">
<reference key="NSNextResponder" ref="198254095"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{358, 86}</string>
<string key="NSFrameSize">{360, 143}</string>
<reference key="NSSuperview" ref="198254095"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{373, 1}, {16, 17}}</string>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{350, 0}, {12, 17}}</string>
</object>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="874876446">
<double key="NSWidth">3.550000e+02</double>
<double key="NSWidth">3.570000e+02</double>
<double key="NSMinWidth">4.000000e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@ -2115,7 +2114,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
</object>
<reference key="NSTextColor" ref="534079857"/>
</object>
<int key="NSResizingMask">3</int>
<int key="NSResizingMask">1</int>
<bool key="NSIsResizeable">YES</bool>
<bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="423972458"/>
@ -2134,14 +2133,14 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
</object>
</object>
<double key="NSRowHeight">1.400000e+01</double>
<int key="NSTvFlags">306184192</int>
<int key="NSTvFlags">440401920</int>
<int key="NSColumnAutoresizingStyle">4</int>
<int key="NSDraggingSourceMaskForLocal">15</int>
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">NO</bool>
</object>
</object>
<string key="NSFrame">{{1, 1}, {358, 86}}</string>
<string key="NSFrame">{{1, 1}, {360, 143}}</string>
<reference key="NSSuperview" ref="754568592"/>
<reference key="NSNextKeyView" ref="423972458"/>
<reference key="NSDocView" ref="423972458"/>
@ -2151,12 +2150,12 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSScroller" id="964808471">
<reference key="NSNextResponder" ref="754568592"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{377, 1}, {11, 125}}</string>
<string key="NSFrame">{{350, 1}, {11, 138}}</string>
<reference key="NSSuperview" ref="754568592"/>
<int key="NSsFlags">256</int>
<reference key="NSTarget" ref="754568592"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">9.921260e-01</double>
<double key="NSPercent">9.928058e-01</double>
</object>
<object class="NSScroller" id="265048045">
<reference key="NSNextResponder" ref="754568592"/>
@ -2166,10 +2165,11 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="754568592"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">2.777778e-03</double>
<double key="NSPercent">9.973190e-01</double>
</object>
</object>
<string key="NSFrame">{{10, 182}, {360, 88}}</string>
<string key="NSFrame">{{10, 202}, {362, 145}}</string>
<reference key="NSSuperview" ref="296911506"/>
<reference key="NSNextKeyView" ref="198254095"/>
<int key="NSsFlags">530</int>
@ -2178,8 +2178,45 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference key="NSContentView" ref="198254095"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBgAAAQYAAAA</bytes>
</object>
<object class="NSSegmentedControl" id="899994514">
<reference key="NSNextResponder" ref="296911506"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{10, 181}, {67, 19}}</string>
<reference key="NSSuperview" ref="296911506"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSegmentedCell" key="NSCell" id="586936794">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">262144</int>
<reference key="NSSupport" ref="22"/>
<reference key="NSControlView" ref="899994514"/>
<object class="NSMutableArray" key="NSSegmentImages">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSSegmentItem">
<double key="NSSegmentItemWidth">3.200000e+01</double>
<object class="NSCustomResource" key="NSSegmentItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSAddTemplate</string>
</object>
<string key="NSSegmentItemLabel"/>
<int key="NSSegmentItemImageScaling">0</int>
</object>
<object class="NSSegmentItem">
<double key="NSSegmentItemWidth">3.200000e+01</double>
<object class="NSCustomResource" key="NSSegmentItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSRemoveTemplate</string>
</object>
<string key="NSSegmentItemLabel"/>
<int key="NSSegmentItemTag">1</int>
<int key="NSSegmentItemImageScaling">0</int>
</object>
</object>
<int key="NSTrackingMode">2</int>
<int key="NSSegmentStyle">6</int>
</object>
</object>
</object>
<string key="NSFrameSize">{380, 275}</string>
<string key="NSFrameSize">{382, 352}</string>
<reference key="NSSuperview"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
@ -4299,14 +4336,14 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSCustomView" id="1005910882">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">258</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="924921889">
<reference key="NSNextResponder" ref="1005910882"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{214, 54}, {45, 20}}</string>
<string key="NSFrame">{{207, 54}, {45, 20}}</string>
<reference key="NSSuperview" ref="1005910882"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="940767778">
@ -4405,7 +4442,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<object class="NSTextField" id="100640892">
<reference key="NSNextResponder" ref="1005910882"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{9, 141}, {278, 14}}</string>
<string key="NSFrame">{{9, 142}, {278, 14}}</string>
<reference key="NSSuperview" ref="1005910882"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="788714097">
@ -4421,7 +4458,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<object class="NSTextField" id="185087800">
<reference key="NSNextResponder" ref="1005910882"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{222, 98}, {35, 20}}</string>
<string key="NSFrame">{{216, 98}, {35, 20}}</string>
<reference key="NSSuperview" ref="1005910882"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="73221689">
@ -4485,7 +4522,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<object class="NSTextField" id="622120141">
<reference key="NSNextResponder" ref="1005910882"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{262, 101}, {29, 14}}</string>
<string key="NSFrame">{{256, 101}, {29, 14}}</string>
<reference key="NSSuperview" ref="1005910882"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="916928751">
@ -4501,15 +4538,15 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<object class="NSPopUpButton" id="307561255">
<reference key="NSNextResponder" ref="1005910882"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{98, 96}, {119, 22}}</string>
<string key="NSFrame">{{98, 96}, {116, 22}}</string>
<reference key="NSSuperview" ref="1005910882"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="271393508">
<int key="NSCellFlags">-2076049856</int>
<int key="NSCellFlags2">133120</int>
<int key="NSCellFlags2">134350848</int>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="307561255"/>
<int key="NSButtonFlags">109199615</int>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="615908458"/>
<string key="NSAlternateContents"/>
@ -4593,7 +4630,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<object class="NSTextField" id="46700455">
<reference key="NSNextResponder" ref="1005910882"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{222, 120}, {35, 20}}</string>
<string key="NSFrame">{{216, 120}, {35, 20}}</string>
<reference key="NSSuperview" ref="1005910882"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="354305258">
@ -4657,7 +4694,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<object class="NSTextField" id="812134257">
<reference key="NSNextResponder" ref="1005910882"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{262, 123}, {29, 14}}</string>
<string key="NSFrame">{{256, 123}, {29, 14}}</string>
<reference key="NSSuperview" ref="1005910882"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="3119739">
@ -4673,15 +4710,15 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<object class="NSPopUpButton" id="188523528">
<reference key="NSNextResponder" ref="1005910882"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{98, 118}, {119, 22}}</string>
<string key="NSFrame">{{98, 118}, {116, 22}}</string>
<reference key="NSSuperview" ref="1005910882"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="646947417">
<int key="NSCellFlags">-2076049856</int>
<int key="NSCellFlags2">133120</int>
<int key="NSCellFlags2">134350848</int>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="188523528"/>
<int key="NSButtonFlags">109199615</int>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="615908458"/>
<string key="NSAlternateContents"/>
@ -4759,15 +4796,15 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<object class="NSPopUpButton" id="535987563">
<reference key="NSNextResponder" ref="1005910882"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{89, 52}, {120, 22}}</string>
<string key="NSFrame">{{89, 52}, {116, 22}}</string>
<reference key="NSSuperview" ref="1005910882"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="380288231">
<int key="NSCellFlags">-2076049856</int>
<int key="NSCellFlags2">133120</int>
<int key="NSCellFlags2">134350848</int>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="535987563"/>
<int key="NSButtonFlags">109199615</int>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="615908458"/>
<string key="NSAlternateContents"/>
@ -4953,7 +4990,8 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
</object>
</object>
</object>
<string key="NSFrameSize">{351, 160}</string>
<string key="NSFrameSize">{351, 161}</string>
<reference key="NSSuperview"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
</object>
@ -5654,6 +5692,22 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
</object>
<int key="connectionID">1749</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">fTrackerAddRemoveControl</string>
<reference key="source" ref="1016287627"/>
<reference key="destination" ref="899994514"/>
</object>
<int key="connectionID">1758</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">addRemoveTracker:</string>
<reference key="source" ref="1016287627"/>
<reference key="destination" ref="899994514"/>
</object>
<int key="connectionID">1765</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -6669,7 +6723,6 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<reference key="object" ref="1005910882"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="924921889"/>
<reference ref="473586865"/>
<reference ref="100640892"/>
<reference ref="185087800"/>
@ -6680,12 +6733,13 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<reference ref="812134257"/>
<reference ref="188523528"/>
<reference ref="925511277"/>
<reference ref="535987563"/>
<reference ref="409725024"/>
<reference ref="336556993"/>
<reference ref="903981168"/>
<reference ref="79835260"/>
<reference ref="51607095"/>
<reference ref="924921889"/>
<reference ref="535987563"/>
</object>
<reference key="parent" ref="261172737"/>
<string key="objectName">Options</string>
@ -7526,6 +7580,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<reference ref="528006672"/>
<reference ref="618198612"/>
<reference ref="754568592"/>
<reference ref="899994514"/>
</object>
<reference key="parent" ref="261172737"/>
<string key="objectName">Tracker</string>
@ -7896,6 +7951,20 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<reference key="object" ref="927236344"/>
<reference key="parent" ref="876850876"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1753</int>
<reference key="object" ref="899994514"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="586936794"/>
</object>
<reference key="parent" ref="296911506"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1754</int>
<reference key="object" ref="586936794"/>
<reference key="parent" ref="899994514"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -8019,6 +8088,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<string>1055.ImportedFromIB2</string>
<string>1056.IBPluginDependency</string>
<string>1056.ImportedFromIB2</string>
<string>1057.IBEditorWindowLastContentRect</string>
<string>1057.IBPluginDependency</string>
<string>1057.ImportedFromIB2</string>
<string>1057.editorWindowContentRectSynchronizationRect</string>
@ -8035,6 +8105,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<string>1063.ImportedFromIB2</string>
<string>1064.IBPluginDependency</string>
<string>1064.ImportedFromIB2</string>
<string>1066.IBEditorWindowLastContentRect</string>
<string>1066.IBPluginDependency</string>
<string>1066.ImportedFromIB2</string>
<string>1066.editorWindowContentRectSynchronizationRect</string>
@ -8050,6 +8121,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<string>1073.ImportedFromIB2</string>
<string>1074.IBPluginDependency</string>
<string>1074.ImportedFromIB2</string>
<string>1075.IBEditorWindowLastContentRect</string>
<string>1075.IBPluginDependency</string>
<string>1075.ImportedFromIB2</string>
<string>1076.IBPluginDependency</string>
@ -8078,6 +8150,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<string>1088.ImportedFromIB2</string>
<string>1089.IBPluginDependency</string>
<string>1089.ImportedFromIB2</string>
<string>1090.IBEditorWindowLastContentRect</string>
<string>1090.IBPluginDependency</string>
<string>1090.ImportedFromIB2</string>
<string>1091.IBPluginDependency</string>
@ -8179,6 +8252,8 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<string>1747.IBShouldRemoveOnLegacySave</string>
<string>1748.IBPluginDependency</string>
<string>1748.ImportedFromIB2</string>
<string>1753.IBPluginDependency</string>
<string>1754.IBPluginDependency</string>
<string>28.IBPluginDependency</string>
<string>28.ImportedFromIB2</string>
<string>29.IBPluginDependency</string>
@ -8401,6 +8476,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{0, 648}, {340, 347}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{0, 648}, {340, 347}}</string>
@ -8417,6 +8493,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{0, 835}, {351, 161}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{519, 803}, {351, 160}}</string>
@ -8432,6 +8509,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{87, 899}, {138, 54}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -8460,6 +8538,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{78, 855}, {138, 54}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -8501,7 +8580,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{0, 720}, {380, 275}}</string>
<string>{{464, 366}, {382, 352}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{476, 437}, {380, 275}}</string>
@ -8562,6 +8641,8 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
@ -8685,7 +8766,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">1752</int>
<int key="maxID">1765</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -8774,6 +8855,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addRemoveTracker:</string>
<string>revealDataFile:</string>
<string>revealTorrentFile:</string>
<string>setPeersConnectLimit:</string>
@ -8795,6 +8877,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
@ -8855,6 +8938,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<string>fSwarmSpeedField</string>
<string>fTabMatrix</string>
<string>fTorrentLocationField</string>
<string>fTrackerAddRemoveControl</string>
<string>fTrackerField</string>
<string>fTrackerTable</string>
<string>fTrackerView</string>
@ -8920,6 +9004,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
<string>NSTextField</string>
<string>NSMatrix</string>
<string>NSTextField</string>
<string>NSSegmentedControl</string>
<string>NSTextField</string>
<string>TrackerTableView</string>
<string>NSView</string>

7
macosx/GroupsWindowController.m
View File

@ -28,11 +28,8 @@
#define GROUP_TABLE_VIEW_DATA_TYPE @"GroupTableViewDataType"
typedef enum
{
ADD_TAG = 0,
REMOVE_TAG = 1
} controlTag;
#define ADD_TAG 0
#define REMOVE_TAG 1
@interface GroupsWindowController (Private)

6
macosx/InfoWindowController.h
View File

@ -32,7 +32,8 @@
@interface InfoWindowController : NSWindowController
{
NSArray * fTorrents, * fPeers, * fTrackers;
NSArray * fTorrents, * fPeers;
NSMutableArray * fTrackers;
IBOutlet NSView * fInfoView, * fActivityView, * fTrackerView, * fPeersView, * fFilesView, * fOptionsView;
int fCurrentTabTag;
@ -52,6 +53,7 @@
IBOutlet NSButton * fRevealDataButton, * fRevealTorrentButton;
IBOutlet TrackerTableView * fTrackerTable;
IBOutlet NSSegmentedControl * fTrackerAddRemoveControl;
IBOutlet NSTextField * fAnnounceAddressField, * fAnnounceLastField, * fAnnounceResponseField, * fAnnounceNextField,
* fScrapeAddressField, * fScrapeLastField, * fScrapeResponseField, * fScrapeNextField;
@ -80,6 +82,8 @@
- (void) setNextTab;
- (void) setPreviousTab;
- (void) addRemoveTracker: (id) sender;
- (BOOL) shouldQuickLookFileView;
- (NSArray *) quickLookURLs;
- (BOOL) canQuickLook;

128
macosx/InfoWindowController.m
View File

@ -49,6 +49,9 @@
#define INVALID -99
#define TRACKER_ADD_TAG 0
#define TRACKER_REMOVE_TAG 1
typedef enum
{
TAB_INFO_TAG = 0,
@ -70,6 +73,9 @@ typedef enum
- (NSView *) tabViewForTag: (int) tag;
- (NSArray *) peerSortDescriptors;
- (void) addTrackers;
- (void) removeTrackers;
@end
@implementation InfoWindowController
@ -346,6 +352,9 @@ typedef enum
[fTrackers release];
fTrackers = nil;
[fTrackerAddRemoveControl setEnabled: NO forSegment: TRACKER_ADD_TAG];
[fTrackerAddRemoveControl setEnabled: NO forSegment: TRACKER_REMOVE_TAG];
}
else
{
@ -428,6 +437,10 @@ typedef enum
//get trackers for table
[fTrackers release];
fTrackers = [[torrent allTrackers: YES] retain];
[fTrackerTable deselectAll: self];
[fTrackerAddRemoveControl setEnabled: YES forSegment: TRACKER_ADD_TAG];
[fTrackerAddRemoveControl setEnabled: NO forSegment: TRACKER_REMOVE_TAG];
}
//update stats and settings
@ -436,6 +449,7 @@ typedef enum
[fTrackerTable setTrackers: fTrackers];
[fTrackerTable reloadData];
[fPeerTable reloadData];
}
@ -786,7 +800,13 @@ typedef enum
{
id item = [fTrackers objectAtIndex: row];
if ([item isKindOfClass: [NSNumber class]])
return [NSString stringWithFormat: NSLocalizedString(@"Tier %d", "Inspector -> tracker table"), [item intValue]+1];
{
int tier = [item intValue];
if (tier == 0)
return NSLocalizedString(@"User-Added", "Inspector -> tracker table");
else
return [NSString stringWithFormat: NSLocalizedString(@"Tier %d", "Inspector -> tracker table"), tier];
}
else
return item;
}
@ -809,7 +829,17 @@ typedef enum
- (BOOL) tableView: (NSTableView *) tableView shouldSelectRow: (int) row
{
return NO;
return tableView == fTrackerTable;
}
- (void) tableViewSelectionDidChange: (NSNotification *) notification
{
if ([notification object] == fTrackerTable)
{
#warning disable when all selected
int numSelected = [fTrackerTable numberOfSelectedRows];
[fTrackerAddRemoveControl setEnabled: numSelected > 0 forSegment: TRACKER_REMOVE_TAG];
}
}
- (BOOL) tableView: (NSTableView *) tableView isGroupRow: (NSInteger) row
@ -894,6 +924,44 @@ typedef enum
return nil;
}
- (void) tableView: (NSTableView *) tableView setObjectValue: (id) object forTableColumn: (NSTableColumn *) tableColumn
row: (NSInteger) row
{
if (tableView != fTrackerTable)
return;
[fTrackers replaceObjectAtIndex: row withObject: object];
Torrent * torrent= [fTorrents objectAtIndex: 0];
if (![torrent updateAllTrackers: fTrackers forAdd: YES])
NSBeep();
//reset table with either new or old value
[fTrackers release];
fTrackers = [[torrent allTrackers: YES] retain];
[fTrackerTable deselectAll: self];
[fTrackerTable setTrackers: fTrackers];
[fTrackerTable reloadData];
}
- (void) addRemoveTracker: (id) sender
{
//don't allow add/remove when currently adding - it leads to weird results
if ([fTrackerTable editedRow] != -1)
return;
if ([[sender cell] tagForSegment: [sender selectedSegment]] == TRACKER_REMOVE_TAG)
[self removeTrackers];
else
[self addTrackers];
}
- (BOOL) tableView: (NSTableView *) tableView shouldEditTableColumn: (NSTableColumn *) tableColumn row: (NSInteger) row
{
return ![[fTrackers objectAtIndex: row] isKindOfClass: [NSNumber class]];
}
- (BOOL) shouldQuickLookFileView
{
return [[self window] isVisible] && fCurrentTabTag == TAB_FILES_TAG && [[fFileController outlineView] numberOfSelectedRows] > 0;
@ -1357,4 +1425,60 @@ typedef enum
return descriptors;
}
- (void) addTrackers
{
[[self window] makeKeyWindow];
int i;
if ([[fTorrents objectAtIndex: 0] hasAddedTrackers])
{
for (i = 1; i < [fTrackers count]; i++)
if ([[fTrackers objectAtIndex: i] isKindOfClass: [NSNumber class]])
break;
}
else
{
[fTrackers insertObject: [NSNumber numberWithInt: 0] atIndex: 0];
i = 1;
}
[fTrackers insertObject: @"" atIndex: i];
[fTrackerTable reloadData];
[fTrackerTable selectRow: i byExtendingSelection: NO];
[fTrackerTable editColumn: 0 row: i withEvent: nil select: YES];
}
#warning warning when removing built-in
- (void) removeTrackers
{
NSMutableIndexSet * indexes = [[fTrackerTable selectedRowIndexes] mutableCopy];
NSUInteger i;
for (i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
{
if ([[fTrackers objectAtIndex: i] isKindOfClass: [NSNumber class]])
{
for (i = i+1; i < [fTrackers count] && ![[fTrackers objectAtIndex: i] isKindOfClass: [NSNumber class]]; i++)
[indexes addIndex: i];
i--;
}
}
[fTrackers removeObjectsAtIndexes: indexes];
[indexes release];
Torrent * torrent = [fTorrents objectAtIndex: 0];
if (![torrent updateAllTrackers: fTrackers forAdd: NO])
NSBeep();
else
[fTrackerTable deselectAll: self];
//reset table with either new or old value
[fTrackers release];
fTrackers = [[torrent allTrackers: YES] retain];
[fTrackerTable setTrackers: fTrackers];
[fTrackerTable reloadData];
}
@end

6
macosx/Torrent.h
View File

@ -67,6 +67,8 @@ typedef enum
int fOrderValue, fGroupValue;
BOOL fAddedTrackers;
NSDictionary * fQuickPauseDict;
}
@ -148,7 +150,9 @@ typedef enum
- (int) nextScrapeTime;
- (NSString *) scrapeResponse;
- (NSArray *) allTrackers: (BOOL) separators;
- (NSMutableArray *) allTrackers: (BOOL) separators;
- (BOOL) updateAllTrackers: (NSMutableArray *) trackers forAdd: (BOOL) add;
- (BOOL) hasAddedTrackers;
- (NSString *) comment;
- (NSString *) creator;

101
macosx/Torrent.m
View File

@ -27,6 +27,7 @@
#import "FileListNode.h"
#import "NSApplicationAdditions.h"
#import "NSStringAdditions.h"
#include "utils.h" //tr_httpIsValidURL
@interface Torrent (Private)
@ -38,7 +39,7 @@
dateActivity: (NSDate *) dateActivity
ratioSetting: (NSNumber *) ratioSetting ratioLimit: (NSNumber *) ratioLimit
waitToStart: (NSNumber *) waitToStart
orderValue: (NSNumber *) orderValue groupValue: (NSNumber *) groupValue;
orderValue: (NSNumber *) orderValue groupValue: (NSNumber *) groupValue addedTrackers: (NSNumber *) addedTrackers;
- (BOOL) shouldUseIncompleteFolderForName: (NSString *) name;
- (void) updateDownloadFolder;
@ -78,7 +79,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
dateAdded: nil dateCompleted: nil
dateActivity: nil
ratioSetting: nil ratioLimit: nil
waitToStart: nil orderValue: nil groupValue: nil];
waitToStart: nil orderValue: nil groupValue: nil addedTrackers: nil];
if (self)
{
@ -97,7 +98,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
dateAdded: nil dateCompleted: nil
dateActivity: nil
ratioSetting: nil ratioLimit: nil
waitToStart: nil orderValue: nil groupValue: nil];
waitToStart: nil orderValue: nil groupValue: nil addedTrackers: nil];
return self;
}
@ -117,7 +118,8 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
ratioLimit: [history objectForKey: @"RatioLimit"]
waitToStart: [history objectForKey: @"WaitToStart"]
orderValue: [history objectForKey: @"OrderValue"]
groupValue: [history objectForKey: @"GroupValue"]];
groupValue: [history objectForKey: @"GroupValue"]
addedTrackers: [history objectForKey: @"AddedTrackers"]];
if (self)
{
@ -145,7 +147,8 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
[NSNumber numberWithFloat: fRatioLimit], @"RatioLimit",
[NSNumber numberWithBool: fWaitToStart], @"WaitToStart",
[NSNumber numberWithInt: fOrderValue], @"OrderValue",
[NSNumber numberWithInt: fGroupValue], @"GroupValue", nil];
[NSNumber numberWithInt: fGroupValue], @"GroupValue",
[NSNumber numberWithBool: fAddedTrackers], @"AddedTrackers", nil];
if (fIncompleteFolder)
[history setObject: fIncompleteFolder forKey: @"IncompleteFolder"];
@ -778,7 +781,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
return [NSString stringWithUTF8String: fStat->scrapeResponse];
}
- (NSArray *) allTrackers: (BOOL) separators
- (NSMutableArray *) allTrackers: (BOOL) separators
{
int count = fInfo->trackerCount, capacity = count;
if (separators)
@ -791,7 +794,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
if (separators && tier != fInfo->trackers[i].tier)
{
tier = fInfo->trackers[i].tier;
[allTrackers addObject: [NSNumber numberWithInt: tier]];
[allTrackers addObject: [NSNumber numberWithInt: fAddedTrackers ? tier : tier + 1]];
}
[allTrackers addObject: [NSString stringWithUTF8String: fInfo->trackers[i].announce]];
@ -800,6 +803,86 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
return allTrackers;
}
- (BOOL) updateAllTrackers: (NSMutableArray *) trackers forAdd: (BOOL) add
{
#warning break up into methods
if (add)
{
//find added tracker at end of first tier
int i;
for (i = 1; i < [trackers count]; i++)
if ([[trackers objectAtIndex: i] isKindOfClass: [NSNumber class]])
break;
i--;
NSString * tracker = [trackers objectAtIndex: i];
if ([tracker rangeOfString: @"://"].location == NSNotFound)
{
tracker = [@"http://" stringByAppendingString: tracker];
[trackers replaceObjectAtIndex: i withObject: tracker];
}
if (!tr_httpIsValidURL([tracker UTF8String]))
return NO;
fAddedTrackers = YES;
}
else
{
//remove empty groups
int i;
for (i = 0; i < [trackers count]; i++)
if ([[trackers objectAtIndex: i] isKindOfClass: [NSNumber class]]
&& (i+1 == [trackers count] || [[trackers objectAtIndex: i+1] isKindOfClass: [NSNumber class]]))
{
[trackers removeObjectAtIndex: i];
i--;
}
if ([trackers count] == 0)
return NO;
//check if any user-added groups
if ([[trackers objectAtIndex: 0] intValue] != 0)
fAddedTrackers = NO;
}
//get count
int count = 0;
NSEnumerator * enumerator = [trackers objectEnumerator];
id object;
while ((object = [enumerator nextObject]))
if (![object isKindOfClass: [NSNumber class]])
count++;
//recreate the tracker structure
tr_tracker_info * trackerStructs = tr_new(tr_tracker_info, count);
int tier = 0;
int i = 0;
enumerator = [trackers objectEnumerator];
while ((object = [enumerator nextObject]))
{
if (![object isKindOfClass: [NSNumber class]])
{
trackerStructs[i].tier = tier;
trackerStructs[i].announce = (char *)[object UTF8String];
i++;
}
else
tier++;
}
tr_torrentSetAnnounceList(fHandle, trackerStructs, count);
tr_free(trackerStructs);
return YES;
}
- (BOOL) hasAddedTrackers
{
return fAddedTrackers;
}
- (NSString *) comment
{
return [NSString stringWithUTF8String: fInfo->comment];
@ -1538,7 +1621,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
dateActivity: (NSDate *) dateActivity
ratioSetting: (NSNumber *) ratioSetting ratioLimit: (NSNumber *) ratioLimit
waitToStart: (NSNumber *) waitToStart
orderValue: (NSNumber *) orderValue groupValue: (NSNumber *) groupValue;
orderValue: (NSNumber *) orderValue groupValue: (NSNumber *) groupValue addedTrackers: (NSNumber *) addedTrackers
{
if (!(self = [super init]))
return nil;
@ -1636,6 +1719,8 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
fOrderValue = orderValue ? [orderValue intValue] : tr_sessionCountTorrents(lib) - 1;
fGroupValue = groupValue ? [groupValue intValue] : -1;
fAddedTrackers = addedTrackers ? [addedTrackers boolValue] : NO;
[self createFileList];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(checkGroupValueForRemoval:)

8
macosx/TrackerTableView.m
View File

@ -26,6 +26,12 @@
@implementation TrackerTableView
- (void) mouseDown: (NSEvent *) event
{
[[self window] makeKeyWindow];
[super mouseDown: event];
}
- (void) setTrackers: (NSArray *) trackers
{
fTrackers = trackers;
@ -68,7 +74,7 @@
continue;
}
if (!start)
if (!start && ![self isRowSelected: i])
NSRectFill([self rectOfRow: i]);
start = !start;