Changeset 5998
- Timestamp:
- Jun 2, 2008, 5:26:02 PM (14 years ago)
- Location:
- trunk/macosx
- Files:
-
- 8 edited
-
CreatorWindowController.m (modified) (1 diff)
-
English.lproj/InfoWindow.xib (modified) (51 diffs)
-
GroupsWindowController.m (modified) (1 diff)
-
InfoWindowController.h (modified) (3 diffs)
-
InfoWindowController.m (modified) (9 diffs)
-
Torrent.h (modified) (2 diffs)
-
Torrent.m (modified) (11 diffs)
-
TrackerTableView.m (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/CreatorWindowController.m
r5993 r5998 26 26 #import "NSApplicationAdditions.h" 27 27 #import "NSStringAdditions.h" 28 #include "utils.h" //tr_http ParseURL28 #include "utils.h" //tr_httpIsValidURL 29 29 30 30 @interface CreatorWindowController (Private) -
trunk/macosx/English.lproj/InfoWindow.xib
r5935 r5998 3 3 <data> 4 4 <int key="IBDocument.SystemTarget">1050</int> 5 <string key="IBDocument.SystemVersion">9 C7010</string>6 <string key="IBDocument.InterfaceBuilderVersion">6 58</string>7 <string key="IBDocument.AppKitVersion">949. 26</string>5 <string key="IBDocument.SystemVersion">9D34</string> 6 <string key="IBDocument.InterfaceBuilderVersion">667</string> 7 <string key="IBDocument.AppKitVersion">949.33</string> 8 8 <string key="IBDocument.HIToolboxVersion">352.00</string> 9 9 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 10 10 <bool key="EncodedWithXMLCoder">YES</bool> 11 <integer value="1066"/> 11 12 <integer value="1615"/> 12 <integer value="6"/>13 13 </object> 14 14 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 40 40 <string key="NSWindowContentMinSize">{350, 73}</string> 41 41 <object class="NSView" key="NSWindowView" id="429007171"> 42 < referencekey="NSNextResponder"/>42 <nil key="NSNextResponder"/> 43 43 <int key="NSvFlags">256</int> 44 44 <object class="NSMutableArray" key="NSSubviews"> … … 405 405 </object> 406 406 <string key="NSFrameSize">{350, 75}</string> 407 <reference key="NSSuperview"/>408 407 </object> 409 408 <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> … … 1593 1592 <int key="NSCellFlags">67239424</int> 1594 1593 <int key="NSCellFlags2">262144</int> 1595 <object class="NSFont" key="NSSupport" >1594 <object class="NSFont" key="NSSupport" id="22"> 1596 1595 <string key="NSName">LucidaGrande</string> 1597 1596 <double key="NSSize">9.000000e+00</double> … … 1730 1729 <reference key="NSNextResponder" ref="296911506"/> 1731 1730 <int key="NSvFlags">290</int> 1732 <string key="NSFrame">{{114, 147}, {25 6, 14}}</string>1731 <string key="NSFrame">{{114, 147}, {258, 14}}</string> 1733 1732 <reference key="NSSuperview" ref="296911506"/> 1734 1733 <bool key="NSEnabled">YES</bool> … … 1747 1746 <reference key="NSNextResponder" ref="296911506"/> 1748 1747 <int key="NSvFlags">290</int> 1749 <string key="NSFrame">{{114, 131}, {25 6, 14}}</string>1748 <string key="NSFrame">{{114, 131}, {258, 14}}</string> 1750 1749 <reference key="NSSuperview" ref="296911506"/> 1751 1750 <bool key="NSEnabled">YES</bool> … … 1817 1816 <reference key="NSNextResponder" ref="296911506"/> 1818 1817 <int key="NSvFlags">290</int> 1819 <string key="NSFrame">{{114, 99}, {25 6, 14}}</string>1818 <string key="NSFrame">{{114, 99}, {258, 14}}</string> 1820 1819 <reference key="NSSuperview" ref="296911506"/> 1821 1820 <bool key="NSEnabled">YES</bool> … … 1834 1833 <reference key="NSNextResponder" ref="296911506"/> 1835 1834 <int key="NSvFlags">290</int> 1836 <string key="NSFrame">{{10, 91}, {36 0, 5}}</string>1835 <string key="NSFrame">{{10, 91}, {362, 5}}</string> 1837 1836 <reference key="NSSuperview" ref="296911506"/> 1838 1837 <string key="NSOffsets">{0, 0}</string> … … 1872 1871 <reference key="NSNextResponder" ref="296911506"/> 1873 1872 <int key="NSvFlags">290</int> 1874 <string key="NSFrame">{{114, 115}, {25 6, 14}}</string>1873 <string key="NSFrame">{{114, 115}, {258, 14}}</string> 1875 1874 <reference key="NSSuperview" ref="296911506"/> 1876 1875 <bool key="NSEnabled">YES</bool> … … 1889 1888 <reference key="NSNextResponder" ref="296911506"/> 1890 1889 <int key="NSvFlags">290</int> 1891 <string key="NSFrame">{{114, 58}, {25 6, 14}}</string>1890 <string key="NSFrame">{{114, 58}, {258, 14}}</string> 1892 1891 <reference key="NSSuperview" ref="296911506"/> 1893 1892 <bool key="NSEnabled">YES</bool> … … 1938 1937 <reference key="NSNextResponder" ref="296911506"/> 1939 1938 <int key="NSvFlags">290</int> 1940 <string key="NSFrame">{{114, 26}, {25 6, 14}}</string>1939 <string key="NSFrame">{{114, 26}, {258, 14}}</string> 1941 1940 <reference key="NSSuperview" ref="296911506"/> 1942 1941 <bool key="NSEnabled">YES</bool> … … 1955 1954 <reference key="NSNextResponder" ref="296911506"/> 1956 1955 <int key="NSvFlags">290</int> 1957 <string key="NSFrame">{{114, 10}, {25 6, 14}}</string>1956 <string key="NSFrame">{{114, 10}, {258, 14}}</string> 1958 1957 <reference key="NSSuperview" ref="296911506"/> 1959 1958 <bool key="NSEnabled">YES</bool> … … 1972 1971 <reference key="NSNextResponder" ref="296911506"/> 1973 1972 <int key="NSvFlags">290</int> 1974 <string key="NSFrame">{{114, 42}, {25 6, 14}}</string>1973 <string key="NSFrame">{{114, 42}, {258, 14}}</string> 1975 1974 <reference key="NSSuperview" ref="296911506"/> 1976 1975 <bool key="NSEnabled">YES</bool> … … 2068 2067 <reference key="NSNextResponder" ref="198254095"/> 2069 2068 <int key="NSvFlags">256</int> 2070 <string key="NSFrameSize">{3 58, 86}</string>2069 <string key="NSFrameSize">{360, 143}</string> 2071 2070 <reference key="NSSuperview" ref="198254095"/> 2072 2071 <bool key="NSEnabled">YES</bool> 2073 2072 <object class="_NSCornerView" key="NSCornerView"> 2074 2073 <nil key="NSNextResponder"/> 2075 <int key="NSvFlags"> 256</int>2076 <string key="NSFrame">{{3 73, 1}, {16, 17}}</string>2074 <int key="NSvFlags">-2147483392</int> 2075 <string key="NSFrame">{{350, 0}, {12, 17}}</string> 2077 2076 </object> 2078 2077 <object class="NSMutableArray" key="NSTableColumns"> 2079 2078 <bool key="EncodedWithXMLCoder">YES</bool> 2080 2079 <object class="NSTableColumn" id="874876446"> 2081 <double key="NSWidth">3.5 50000e+02</double>2080 <double key="NSWidth">3.570000e+02</double> 2082 2081 <double key="NSMinWidth">4.000000e+01</double> 2083 2082 <double key="NSMaxWidth">1.000000e+03</double> … … 2116 2115 <reference key="NSTextColor" ref="534079857"/> 2117 2116 </object> 2118 <int key="NSResizingMask"> 3</int>2117 <int key="NSResizingMask">1</int> 2119 2118 <bool key="NSIsResizeable">YES</bool> 2120 2119 <bool key="NSIsEditable">YES</bool> … … 2135 2134 </object> 2136 2135 <double key="NSRowHeight">1.400000e+01</double> 2137 <int key="NSTvFlags"> 306184192</int>2136 <int key="NSTvFlags">440401920</int> 2138 2137 <int key="NSColumnAutoresizingStyle">4</int> 2139 2138 <int key="NSDraggingSourceMaskForLocal">15</int> … … 2142 2141 </object> 2143 2142 </object> 2144 <string key="NSFrame">{{1, 1}, {3 58, 86}}</string>2143 <string key="NSFrame">{{1, 1}, {360, 143}}</string> 2145 2144 <reference key="NSSuperview" ref="754568592"/> 2146 2145 <reference key="NSNextKeyView" ref="423972458"/> … … 2152 2151 <reference key="NSNextResponder" ref="754568592"/> 2153 2152 <int key="NSvFlags">-2147483392</int> 2154 <string key="NSFrame">{{3 77, 1}, {11, 125}}</string>2153 <string key="NSFrame">{{350, 1}, {11, 138}}</string> 2155 2154 <reference key="NSSuperview" ref="754568592"/> 2156 2155 <int key="NSsFlags">256</int> 2157 2156 <reference key="NSTarget" ref="754568592"/> 2158 2157 <string key="NSAction">_doScroller:</string> 2159 <double key="NSPercent">9.92 1260e-01</double>2158 <double key="NSPercent">9.928058e-01</double> 2160 2159 </object> 2161 2160 <object class="NSScroller" id="265048045"> … … 2167 2166 <reference key="NSTarget" ref="754568592"/> 2168 2167 <string key="NSAction">_doScroller:</string> 2168 <double key="NSCurValue">2.777778e-03</double> 2169 2169 <double key="NSPercent">9.973190e-01</double> 2170 2170 </object> 2171 2171 </object> 2172 <string key="NSFrame">{{10, 182}, {360, 88}}</string>2172 <string key="NSFrame">{{10, 202}, {362, 145}}</string> 2173 2173 <reference key="NSSuperview" ref="296911506"/> 2174 2174 <reference key="NSNextKeyView" ref="198254095"/> … … 2179 2179 <bytes key="NSScrollAmts">QSAAAEEgAABBgAAAQYAAAA</bytes> 2180 2180 </object> 2181 </object> 2182 <string key="NSFrameSize">{380, 275}</string> 2181 <object class="NSSegmentedControl" id="899994514"> 2182 <reference key="NSNextResponder" ref="296911506"/> 2183 <int key="NSvFlags">292</int> 2184 <string key="NSFrame">{{10, 181}, {67, 19}}</string> 2185 <reference key="NSSuperview" ref="296911506"/> 2186 <bool key="NSEnabled">YES</bool> 2187 <object class="NSSegmentedCell" key="NSCell" id="586936794"> 2188 <int key="NSCellFlags">-2080244224</int> 2189 <int key="NSCellFlags2">262144</int> 2190 <reference key="NSSupport" ref="22"/> 2191 <reference key="NSControlView" ref="899994514"/> 2192 <object class="NSMutableArray" key="NSSegmentImages"> 2193 <bool key="EncodedWithXMLCoder">YES</bool> 2194 <object class="NSSegmentItem"> 2195 <double key="NSSegmentItemWidth">3.200000e+01</double> 2196 <object class="NSCustomResource" key="NSSegmentItemImage"> 2197 <string key="NSClassName">NSImage</string> 2198 <string key="NSResourceName">NSAddTemplate</string> 2199 </object> 2200 <string key="NSSegmentItemLabel"/> 2201 <int key="NSSegmentItemImageScaling">0</int> 2202 </object> 2203 <object class="NSSegmentItem"> 2204 <double key="NSSegmentItemWidth">3.200000e+01</double> 2205 <object class="NSCustomResource" key="NSSegmentItemImage"> 2206 <string key="NSClassName">NSImage</string> 2207 <string key="NSResourceName">NSRemoveTemplate</string> 2208 </object> 2209 <string key="NSSegmentItemLabel"/> 2210 <int key="NSSegmentItemTag">1</int> 2211 <int key="NSSegmentItemImageScaling">0</int> 2212 </object> 2213 </object> 2214 <int key="NSTrackingMode">2</int> 2215 <int key="NSSegmentStyle">6</int> 2216 </object> 2217 </object> 2218 </object> 2219 <string key="NSFrameSize">{382, 352}</string> 2183 2220 <reference key="NSSuperview"/> 2184 2221 <object class="NSMutableString" key="NSClassName"> … … 4300 4337 </object> 4301 4338 <object class="NSCustomView" id="1005910882"> 4302 < nilkey="NSNextResponder"/>4339 <reference key="NSNextResponder"/> 4303 4340 <int key="NSvFlags">258</int> 4304 4341 <object class="NSMutableArray" key="NSSubviews"> … … 4307 4344 <reference key="NSNextResponder" ref="1005910882"/> 4308 4345 <int key="NSvFlags">268</int> 4309 <string key="NSFrame">{{2 14, 54}, {45, 20}}</string>4346 <string key="NSFrame">{{207, 54}, {45, 20}}</string> 4310 4347 <reference key="NSSuperview" ref="1005910882"/> 4311 4348 <bool key="NSEnabled">YES</bool> … … 4406 4443 <reference key="NSNextResponder" ref="1005910882"/> 4407 4444 <int key="NSvFlags">266</int> 4408 <string key="NSFrame">{{9, 14 1}, {278, 14}}</string>4445 <string key="NSFrame">{{9, 142}, {278, 14}}</string> 4409 4446 <reference key="NSSuperview" ref="1005910882"/> 4410 4447 <bool key="NSEnabled">YES</bool> … … 4422 4459 <reference key="NSNextResponder" ref="1005910882"/> 4423 4460 <int key="NSvFlags">268</int> 4424 <string key="NSFrame">{{2 22, 98}, {35, 20}}</string>4461 <string key="NSFrame">{{216, 98}, {35, 20}}</string> 4425 4462 <reference key="NSSuperview" ref="1005910882"/> 4426 4463 <bool key="NSEnabled">YES</bool> … … 4486 4523 <reference key="NSNextResponder" ref="1005910882"/> 4487 4524 <int key="NSvFlags">268</int> 4488 <string key="NSFrame">{{2 62, 101}, {29, 14}}</string>4525 <string key="NSFrame">{{256, 101}, {29, 14}}</string> 4489 4526 <reference key="NSSuperview" ref="1005910882"/> 4490 4527 <bool key="NSEnabled">YES</bool> … … 4502 4539 <reference key="NSNextResponder" ref="1005910882"/> 4503 4540 <int key="NSvFlags">268</int> 4504 <string key="NSFrame">{{98, 96}, {11 9, 22}}</string>4541 <string key="NSFrame">{{98, 96}, {116, 22}}</string> 4505 4542 <reference key="NSSuperview" ref="1005910882"/> 4506 4543 <bool key="NSEnabled">YES</bool> 4507 4544 <object class="NSPopUpButtonCell" key="NSCell" id="271393508"> 4508 4545 <int key="NSCellFlags">-2076049856</int> 4509 <int key="NSCellFlags2">13 3120</int>4546 <int key="NSCellFlags2">134350848</int> 4510 4547 <reference key="NSSupport" ref="26"/> 4511 4548 <reference key="NSControlView" ref="307561255"/> 4512 <int key="NSButtonFlags"> 109199615</int>4549 <int key="NSButtonFlags">-2038284033</int> 4513 4550 <int key="NSButtonFlags2">1</int> 4514 4551 <reference key="NSAlternateImage" ref="615908458"/> … … 4594 4631 <reference key="NSNextResponder" ref="1005910882"/> 4595 4632 <int key="NSvFlags">268</int> 4596 <string key="NSFrame">{{2 22, 120}, {35, 20}}</string>4633 <string key="NSFrame">{{216, 120}, {35, 20}}</string> 4597 4634 <reference key="NSSuperview" ref="1005910882"/> 4598 4635 <bool key="NSEnabled">YES</bool> … … 4658 4695 <reference key="NSNextResponder" ref="1005910882"/> 4659 4696 <int key="NSvFlags">268</int> 4660 <string key="NSFrame">{{2 62, 123}, {29, 14}}</string>4697 <string key="NSFrame">{{256, 123}, {29, 14}}</string> 4661 4698 <reference key="NSSuperview" ref="1005910882"/> 4662 4699 <bool key="NSEnabled">YES</bool> … … 4674 4711 <reference key="NSNextResponder" ref="1005910882"/> 4675 4712 <int key="NSvFlags">268</int> 4676 <string key="NSFrame">{{98, 118}, {11 9, 22}}</string>4713 <string key="NSFrame">{{98, 118}, {116, 22}}</string> 4677 4714 <reference key="NSSuperview" ref="1005910882"/> 4678 4715 <bool key="NSEnabled">YES</bool> 4679 4716 <object class="NSPopUpButtonCell" key="NSCell" id="646947417"> 4680 4717 <int key="NSCellFlags">-2076049856</int> 4681 <int key="NSCellFlags2">13 3120</int>4718 <int key="NSCellFlags2">134350848</int> 4682 4719 <reference key="NSSupport" ref="26"/> 4683 4720 <reference key="NSControlView" ref="188523528"/> 4684 <int key="NSButtonFlags"> 109199615</int>4721 <int key="NSButtonFlags">-2038284033</int> 4685 4722 <int key="NSButtonFlags2">1</int> 4686 4723 <reference key="NSAlternateImage" ref="615908458"/> … … 4760 4797 <reference key="NSNextResponder" ref="1005910882"/> 4761 4798 <int key="NSvFlags">268</int> 4762 <string key="NSFrame">{{89, 52}, {1 20, 22}}</string>4799 <string key="NSFrame">{{89, 52}, {116, 22}}</string> 4763 4800 <reference key="NSSuperview" ref="1005910882"/> 4764 4801 <bool key="NSEnabled">YES</bool> 4765 4802 <object class="NSPopUpButtonCell" key="NSCell" id="380288231"> 4766 4803 <int key="NSCellFlags">-2076049856</int> 4767 <int key="NSCellFlags2">13 3120</int>4804 <int key="NSCellFlags2">134350848</int> 4768 4805 <reference key="NSSupport" ref="26"/> 4769 4806 <reference key="NSControlView" ref="535987563"/> 4770 <int key="NSButtonFlags"> 109199615</int>4807 <int key="NSButtonFlags">-2038284033</int> 4771 4808 <int key="NSButtonFlags2">1</int> 4772 4809 <reference key="NSAlternateImage" ref="615908458"/> … … 4954 4991 </object> 4955 4992 </object> 4956 <string key="NSFrameSize">{351, 160}</string> 4993 <string key="NSFrameSize">{351, 161}</string> 4994 <reference key="NSSuperview"/> 4957 4995 <object class="NSMutableString" key="NSClassName"> 4958 4996 <characters key="NS.bytes">NSView</characters> … … 5654 5692 </object> 5655 5693 <int key="connectionID">1749</int> 5694 </object> 5695 <object class="IBConnectionRecord"> 5696 <object class="IBOutletConnection" key="connection"> 5697 <string key="label">fTrackerAddRemoveControl</string> 5698 <reference key="source" ref="1016287627"/> 5699 <reference key="destination" ref="899994514"/> 5700 </object> 5701 <int key="connectionID">1758</int> 5702 </object> 5703 <object class="IBConnectionRecord"> 5704 <object class="IBActionConnection" key="connection"> 5705 <string key="label">addRemoveTracker:</string> 5706 <reference key="source" ref="1016287627"/> 5707 <reference key="destination" ref="899994514"/> 5708 </object> 5709 <int key="connectionID">1765</int> 5656 5710 </object> 5657 5711 </object> … … 6670 6724 <object class="NSMutableArray" key="children"> 6671 6725 <bool key="EncodedWithXMLCoder">YES</bool> 6672 <reference ref="924921889"/>6673 6726 <reference ref="473586865"/> 6674 6727 <reference ref="100640892"/> … … 6681 6734 <reference ref="188523528"/> 6682 6735 <reference ref="925511277"/> 6683 <reference ref="535987563"/>6684 6736 <reference ref="409725024"/> 6685 6737 <reference ref="336556993"/> … … 6687 6739 <reference ref="79835260"/> 6688 6740 <reference ref="51607095"/> 6741 <reference ref="924921889"/> 6742 <reference ref="535987563"/> 6689 6743 </object> 6690 6744 <reference key="parent" ref="261172737"/> … … 7527 7581 <reference ref="618198612"/> 7528 7582 <reference ref="754568592"/> 7583 <reference ref="899994514"/> 7529 7584 </object> 7530 7585 <reference key="parent" ref="261172737"/> … … 7896 7951 <reference key="object" ref="927236344"/> 7897 7952 <reference key="parent" ref="876850876"/> 7953 </object> 7954 <object class="IBObjectRecord"> 7955 <int key="objectID">1753</int> 7956 <reference key="object" ref="899994514"/> 7957 <object class="NSMutableArray" key="children"> 7958 <bool key="EncodedWithXMLCoder">YES</bool> 7959 <reference ref="586936794"/> 7960 </object> 7961 <reference key="parent" ref="296911506"/> 7962 </object> 7963 <object class="IBObjectRecord"> 7964 <int key="objectID">1754</int> 7965 <reference key="object" ref="586936794"/> 7966 <reference key="parent" ref="899994514"/> 7898 7967 </object> 7899 7968 </object> … … 8020 8089 <string>1056.IBPluginDependency</string> 8021 8090 <string>1056.ImportedFromIB2</string> 8091 <string>1057.IBEditorWindowLastContentRect</string> 8022 8092 <string>1057.IBPluginDependency</string> 8023 8093 <string>1057.ImportedFromIB2</string> … … 8036 8106 <string>1064.IBPluginDependency</string> 8037 8107 <string>1064.ImportedFromIB2</string> 8108 <string>1066.IBEditorWindowLastContentRect</string> 8038 8109 <string>1066.IBPluginDependency</string> 8039 8110 <string>1066.ImportedFromIB2</string> … … 8051 8122 <string>1074.IBPluginDependency</string> 8052 8123 <string>1074.ImportedFromIB2</string> 8124 <string>1075.IBEditorWindowLastContentRect</string> 8053 8125 <string>1075.IBPluginDependency</string> 8054 8126 <string>1075.ImportedFromIB2</string> … … 8079 8151 <string>1089.IBPluginDependency</string> 8080 8152 <string>1089.ImportedFromIB2</string> 8153 <string>1090.IBEditorWindowLastContentRect</string> 8081 8154 <string>1090.IBPluginDependency</string> 8082 8155 <string>1090.ImportedFromIB2</string> … … 8180 8253 <string>1748.IBPluginDependency</string> 8181 8254 <string>1748.ImportedFromIB2</string> 8255 <string>1753.IBPluginDependency</string> 8256 <string>1754.IBPluginDependency</string> 8182 8257 <string>28.IBPluginDependency</string> 8183 8258 <string>28.ImportedFromIB2</string> … … 8402 8477 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8403 8478 <reference ref="9"/> 8404 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>8405 <reference ref="9"/>8406 8479 <string>{{0, 648}, {340, 347}}</string> 8407 8480 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8408 8481 <reference ref="9"/> 8482 <string>{{0, 648}, {340, 347}}</string> 8483 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8484 <reference ref="9"/> 8409 8485 <string>FileOutlineView</string> 8410 8486 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> … … 8418 8494 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8419 8495 <reference ref="9"/> 8496 <string>{{0, 835}, {351, 161}}</string> 8420 8497 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8421 8498 <reference ref="9"/> … … 8433 8510 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8434 8511 <reference ref="9"/> 8435 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8436 <reference ref="9"/> 8437 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8438 <reference ref="9"/> 8439 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8440 <reference ref="9"/> 8441 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8442 <reference ref="9"/> 8443 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8444 <reference ref="9"/> 8445 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8446 <reference ref="9"/> 8447 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8448 <reference ref="9"/> 8449 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8450 <reference ref="9"/> 8451 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8452 <reference ref="9"/> 8453 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8454 <reference ref="9"/> 8455 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8456 <reference ref="9"/> 8457 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8458 <reference ref="9"/> 8459 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8460 <reference ref="9"/> 8461 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8462 <reference ref="9"/> 8463 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8464 <reference ref="9"/> 8465 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8466 <reference ref="9"/> 8467 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8468 <reference ref="9"/> 8469 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8470 <reference ref="9"/> 8471 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8472 <reference ref="9"/> 8473 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8474 <reference ref="9"/> 8475 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8476 <reference ref="9"/> 8477 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8478 <reference ref="9"/> 8479 <reference ref="9"/> 8480 <reference ref="9"/> 8481 <reference ref="9"/> 8482 <reference ref="9"/> 8483 <reference ref="9"/> 8484 <reference ref="9"/> 8485 <reference ref="9"/> 8486 <reference ref="9"/> 8487 <reference ref="9"/> 8488 <reference ref="9"/> 8489 <reference ref="9"/> 8490 <reference ref="9"/> 8491 <reference ref="9"/> 8492 <reference ref="9"/> 8493 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8494 <reference ref="9"/> 8495 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8496 <reference ref="9"/> 8497 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8498 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8499 <reference ref="9"/> 8500 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8501 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8502 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8503 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8504 <string>{{0, 720}, {380, 275}}</string> 8512 <string>{{87, 899}, {138, 54}}</string> 8513 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8514 <reference ref="9"/> 8515 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8516 <reference ref="9"/> 8517 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8518 <reference ref="9"/> 8519 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8520 <reference ref="9"/> 8521 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8522 <reference ref="9"/> 8523 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8524 <reference ref="9"/> 8525 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8526 <reference ref="9"/> 8527 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8528 <reference ref="9"/> 8529 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8530 <reference ref="9"/> 8531 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8532 <reference ref="9"/> 8533 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8534 <reference ref="9"/> 8535 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8536 <reference ref="9"/> 8537 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8538 <reference ref="9"/> 8539 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8540 <reference ref="9"/> 8541 <string>{{78, 855}, {138, 54}}</string> 8542 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8543 <reference ref="9"/> 8544 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8545 <reference ref="9"/> 8546 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8547 <reference ref="9"/> 8548 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8549 <reference ref="9"/> 8550 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8551 <reference ref="9"/> 8552 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8553 <reference ref="9"/> 8554 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8555 <reference ref="9"/> 8556 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8557 <reference ref="9"/> 8558 <reference ref="9"/> 8559 <reference ref="9"/> 8560 <reference ref="9"/> 8561 <reference ref="9"/> 8562 <reference ref="9"/> 8563 <reference ref="9"/> 8564 <reference ref="9"/> 8565 <reference ref="9"/> 8566 <reference ref="9"/> 8567 <reference ref="9"/> 8568 <reference ref="9"/> 8569 <reference ref="9"/> 8570 <reference ref="9"/> 8571 <reference ref="9"/> 8572 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8573 <reference ref="9"/> 8574 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8575 <reference ref="9"/> 8576 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8577 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8578 <reference ref="9"/> 8579 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8580 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8581 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8582 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8583 <string>{{464, 366}, {382, 352}}</string> 8505 8584 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8506 8585 <reference ref="9"/> … … 8562 8641 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8563 8642 <reference ref="9"/> 8643 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8644 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8564 8645 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8565 8646 <reference ref="9"/> … … 8686 8767 </object> 8687 8768 <nil key="sourceID"/> 8688 <int key="maxID">17 52</int>8769 <int key="maxID">1765</int> 8689 8770 </object> 8690 8771 <object class="IBClassDescriber" key="IBDocument.Classes"> … … 8775 8856 <object class="NSMutableArray" key="dict.sortedKeys"> 8776 8857 <bool key="EncodedWithXMLCoder">YES</bool> 8858 <string>addRemoveTracker:</string> 8777 8859 <string>revealDataFile:</string> 8778 8860 <string>revealTorrentFile:</string> … … 8787 8869 <object class="NSMutableArray" key="dict.values"> 8788 8870 <bool key="EncodedWithXMLCoder">YES</bool> 8871 <string>id</string> 8789 8872 <string>id</string> 8790 8873 <string>id</string> … … 8856 8939 <string>fTabMatrix</string> 8857 8940 <string>fTorrentLocationField</string> 8941 <string>fTrackerAddRemoveControl</string> 8858 8942 <string>fTrackerField</string> 8859 8943 <string>fTrackerTable</string> … … 8921 9005 <string>NSMatrix</string> 8922 9006 <string>NSTextField</string> 9007 <string>NSSegmentedControl</string> 8923 9008 <string>NSTextField</string> 8924 9009 <string>TrackerTableView</string> -
trunk/macosx/GroupsWindowController.m
r5982 r5998 29 29 #define GROUP_TABLE_VIEW_DATA_TYPE @"GroupTableViewDataType" 30 30 31 typedef enum 32 { 33 ADD_TAG = 0, 34 REMOVE_TAG = 1 35 } controlTag; 31 #define ADD_TAG 0 32 #define REMOVE_TAG 1 36 33 37 34 @interface GroupsWindowController (Private) -
trunk/macosx/InfoWindowController.h
r5920 r5998 33 33 @interface InfoWindowController : NSWindowController 34 34 { 35 NSArray * fTorrents, * fPeers, * fTrackers; 35 NSArray * fTorrents, * fPeers; 36 NSMutableArray * fTrackers; 36 37 37 38 IBOutlet NSView * fInfoView, * fActivityView, * fTrackerView, * fPeersView, * fFilesView, * fOptionsView; … … 53 54 54 55 IBOutlet TrackerTableView * fTrackerTable; 56 IBOutlet NSSegmentedControl * fTrackerAddRemoveControl; 55 57 IBOutlet NSTextField * fAnnounceAddressField, * fAnnounceLastField, * fAnnounceResponseField, * fAnnounceNextField, 56 58 * fScrapeAddressField, * fScrapeLastField, * fScrapeResponseField, * fScrapeNextField; … … 81 83 - (void) setPreviousTab; 82 84 85 - (void) addRemoveTracker: (id) sender; 86 83 87 - (BOOL) shouldQuickLookFileView; 84 88 - (NSArray *) quickLookURLs; -
trunk/macosx/InfoWindowController.m
r5973 r5998 50 50 #define INVALID -99 51 51 52 #define TRACKER_ADD_TAG 0 53 #define TRACKER_REMOVE_TAG 1 54 52 55 typedef enum 53 56 { … … 70 73 - (NSView *) tabViewForTag: (int) tag; 71 74 - (NSArray *) peerSortDescriptors; 75 76 - (void) addTrackers; 77 - (void) removeTrackers; 72 78 73 79 @end … … 347 353 [fTrackers release]; 348 354 fTrackers = nil; 355 356 [fTrackerAddRemoveControl setEnabled: NO forSegment: TRACKER_ADD_TAG]; 357 [fTrackerAddRemoveControl setEnabled: NO forSegment: TRACKER_REMOVE_TAG]; 349 358 } 350 359 else … … 429 438 [fTrackers release]; 430 439 fTrackers = [[torrent allTrackers: YES] retain]; 440 [fTrackerTable deselectAll: self]; 441 442 [fTrackerAddRemoveControl setEnabled: YES forSegment: TRACKER_ADD_TAG]; 443 [fTrackerAddRemoveControl setEnabled: NO forSegment: TRACKER_REMOVE_TAG]; 431 444 } 432 445 … … 437 450 [fTrackerTable setTrackers: fTrackers]; 438 451 [fTrackerTable reloadData]; 452 439 453 [fPeerTable reloadData]; 440 454 } … … 787 801 id item = [fTrackers objectAtIndex: row]; 788 802 if ([item isKindOfClass: [NSNumber class]]) 789 return [NSString stringWithFormat: NSLocalizedString(@"Tier %d", "Inspector -> tracker table"), [item intValue]+1]; 803 { 804 int tier = [item intValue]; 805 if (tier == 0) 806 return NSLocalizedString(@"User-Added", "Inspector -> tracker table"); 807 else 808 return [NSString stringWithFormat: NSLocalizedString(@"Tier %d", "Inspector -> tracker table"), tier]; 809 } 790 810 else 791 811 return item; … … 810 830 - (BOOL) tableView: (NSTableView *) tableView shouldSelectRow: (int) row 811 831 { 812 return NO; 832 return tableView == fTrackerTable; 833 } 834 835 - (void) tableViewSelectionDidChange: (NSNotification *) notification 836 { 837 if ([notification object] == fTrackerTable) 838 { 839 #warning disable when all selected 840 int numSelected = [fTrackerTable numberOfSelectedRows]; 841 [fTrackerAddRemoveControl setEnabled: numSelected > 0 forSegment: TRACKER_REMOVE_TAG]; 842 } 813 843 } 814 844 … … 893 923 } 894 924 return nil; 925 } 926 927 - (void) tableView: (NSTableView *) tableView setObjectValue: (id) object forTableColumn: (NSTableColumn *) tableColumn 928 row: (NSInteger) row 929 { 930 if (tableView != fTrackerTable) 931 return; 932 933 [fTrackers replaceObjectAtIndex: row withObject: object]; 934 935 Torrent * torrent= [fTorrents objectAtIndex: 0]; 936 if (![torrent updateAllTrackers: fTrackers forAdd: YES]) 937 NSBeep(); 938 939 //reset table with either new or old value 940 [fTrackers release]; 941 fTrackers = [[torrent allTrackers: YES] retain]; 942 [fTrackerTable deselectAll: self]; 943 944 [fTrackerTable setTrackers: fTrackers]; 945 [fTrackerTable reloadData]; 946 } 947 948 - (void) addRemoveTracker: (id) sender 949 { 950 //don't allow add/remove when currently adding - it leads to weird results 951 if ([fTrackerTable editedRow] != -1) 952 return; 953 954 if ([[sender cell] tagForSegment: [sender selectedSegment]] == TRACKER_REMOVE_TAG) 955 [self removeTrackers]; 956 else 957 [self addTrackers]; 958 } 959 960 - (BOOL) tableView: (NSTableView *) tableView shouldEditTableColumn: (NSTableColumn *) tableColumn row: (NSInteger) row 961 { 962 return ![[fTrackers objectAtIndex: row] isKindOfClass: [NSNumber class]]; 895 963 } 896 964 … … 1358 1426 } 1359 1427 1428 - (void) addTrackers 1429 { 1430 [[self window] makeKeyWindow]; 1431 1432 int i; 1433 if ([[fTorrents objectAtIndex: 0] hasAddedTrackers]) 1434 { 1435 for (i = 1; i < [fTrackers count]; i++) 1436 if ([[fTrackers objectAtIndex: i] isKindOfClass: [NSNumber class]]) 1437 break; 1438 } 1439 else 1440 { 1441 [fTrackers insertObject: [NSNumber numberWithInt: 0] atIndex: 0]; 1442 i = 1; 1443 } 1444 1445 [fTrackers insertObject: @"" atIndex: i]; 1446 [fTrackerTable reloadData]; 1447 [fTrackerTable selectRow: i byExtendingSelection: NO]; 1448 [fTrackerTable editColumn: 0 row: i withEvent: nil select: YES]; 1449 } 1450 1451 #warning warning when removing built-in 1452 - (void) removeTrackers 1453 { 1454 NSMutableIndexSet * indexes = [[fTrackerTable selectedRowIndexes] mutableCopy]; 1455 1456 NSUInteger i; 1457 for (i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i]) 1458 { 1459 if ([[fTrackers objectAtIndex: i] isKindOfClass: [NSNumber class]]) 1460 { 1461 for (i = i+1; i < [fTrackers count] && ![[fTrackers objectAtIndex: i] isKindOfClass: [NSNumber class]]; i++) 1462 [indexes addIndex: i]; 1463 i--; 1464 } 1465 } 1466 1467 [fTrackers removeObjectsAtIndexes: indexes]; 1468 [indexes release]; 1469 1470 Torrent * torrent = [fTorrents objectAtIndex: 0]; 1471 if (![torrent updateAllTrackers: fTrackers forAdd: NO]) 1472 NSBeep(); 1473 else 1474 [fTrackerTable deselectAll: self]; 1475 1476 //reset table with either new or old value 1477 [fTrackers release]; 1478 fTrackers = [[torrent allTrackers: YES] retain]; 1479 1480 [fTrackerTable setTrackers: fTrackers]; 1481 [fTrackerTable reloadData]; 1482 } 1483 1360 1484 @end -
trunk/macosx/Torrent.h
r5973 r5998 68 68 int fOrderValue, fGroupValue; 69 69 70 BOOL fAddedTrackers; 71 70 72 NSDictionary * fQuickPauseDict; 71 73 } … … 149 151 - (NSString *) scrapeResponse; 150 152 151 - (NSArray *) allTrackers: (BOOL) separators; 153 - (NSMutableArray *) allTrackers: (BOOL) separators; 154 - (BOOL) updateAllTrackers: (NSMutableArray *) trackers forAdd: (BOOL) add; 155 - (BOOL) hasAddedTrackers; 152 156 153 157 - (NSString *) comment; -
trunk/macosx/Torrent.m
r5973 r5998 28 28 #import "NSApplicationAdditions.h" 29 29 #import "NSStringAdditions.h" 30 #include "utils.h" //tr_httpIsValidURL 30 31 31 32 @interface Torrent (Private) … … 39 40 ratioSetting: (NSNumber *) ratioSetting ratioLimit: (NSNumber *) ratioLimit 40 41 waitToStart: (NSNumber *) waitToStart 41 orderValue: (NSNumber *) orderValue groupValue: (NSNumber *) groupValue ;42 orderValue: (NSNumber *) orderValue groupValue: (NSNumber *) groupValue addedTrackers: (NSNumber *) addedTrackers; 42 43 43 44 - (BOOL) shouldUseIncompleteFolderForName: (NSString *) name; … … 79 80 dateActivity: nil 80 81 ratioSetting: nil ratioLimit: nil 81 waitToStart: nil orderValue: nil groupValue: nil ];82 waitToStart: nil orderValue: nil groupValue: nil addedTrackers: nil]; 82 83 83 84 if (self) … … 98 99 dateActivity: nil 99 100 ratioSetting: nil ratioLimit: nil 100 waitToStart: nil orderValue: nil groupValue: nil ];101 waitToStart: nil orderValue: nil groupValue: nil addedTrackers: nil]; 101 102 102 103 return self; … … 118 119 waitToStart: [history objectForKey: @"WaitToStart"] 119 120 orderValue: [history objectForKey: @"OrderValue"] 120 groupValue: [history objectForKey: @"GroupValue"]]; 121 groupValue: [history objectForKey: @"GroupValue"] 122 addedTrackers: [history objectForKey: @"AddedTrackers"]]; 121 123 122 124 if (self) … … 146 148 [NSNumber numberWithBool: fWaitToStart], @"WaitToStart", 147 149 [NSNumber numberWithInt: fOrderValue], @"OrderValue", 148 [NSNumber numberWithInt: fGroupValue], @"GroupValue", nil]; 150 [NSNumber numberWithInt: fGroupValue], @"GroupValue", 151 [NSNumber numberWithBool: fAddedTrackers], @"AddedTrackers", nil]; 149 152 150 153 if (fIncompleteFolder) … … 779 782 } 780 783 781 - (NS Array *) allTrackers: (BOOL) separators784 - (NSMutableArray *) allTrackers: (BOOL) separators 782 785 { 783 786 int count = fInfo->trackerCount, capacity = count; … … 792 795 { 793 796 tier = fInfo->trackers[i].tier; 794 [allTrackers addObject: [NSNumber numberWithInt: tier]];797 [allTrackers addObject: [NSNumber numberWithInt: fAddedTrackers ? tier : tier + 1]]; 795 798 } 796 799 … … 799 802 800 803 return allTrackers; 804 } 805 806 - (BOOL) updateAllTrackers: (NSMutableArray *) trackers forAdd: (BOOL) add 807 { 808 #warning break up into methods 809 if (add) 810 { 811 //find added tracker at end of first tier 812 int i; 813 for (i = 1; i < [trackers count]; i++) 814 if ([[trackers objectAtIndex: i] isKindOfClass: [NSNumber class]]) 815 break; 816 i--; 817 818 NSString * tracker = [trackers objectAtIndex: i]; 819 if ([tracker rangeOfString: @"://"].location == NSNotFound) 820 { 821 tracker = [@"http://" stringByAppendingString: tracker]; 822 [trackers replaceObjectAtIndex: i withObject: tracker]; 823 } 824 825 if (!tr_httpIsValidURL([tracker UTF8String])) 826 return NO; 827 828 fAddedTrackers = YES; 829 } 830 else 831 { 832 //remove empty groups 833 int i; 834 for (i = 0; i < [trackers count]; i++) 835 if ([[trackers objectAtIndex: i] isKindOfClass: [NSNumber class]] 836 && (i+1 == [trackers count] || [[trackers objectAtIndex: i+1] isKindOfClass: [NSNumber class]])) 837 { 838 [trackers removeObjectAtIndex: i]; 839 i--; 840 } 841 842 if ([trackers count] == 0) 843 return NO; 844 845 //check if any user-added groups 846 if ([[trackers objectAtIndex: 0] intValue] != 0) 847 fAddedTrackers = NO; 848 } 849 850 //get count 851 int count = 0; 852 NSEnumerator * enumerator = [trackers objectEnumerator]; 853 id object; 854 while ((object = [enumerator nextObject])) 855 if (![object isKindOfClass: [NSNumber class]]) 856 count++; 857 858 //recreate the tracker structure 859 tr_tracker_info * trackerStructs = tr_new(tr_tracker_info, count); 860 int tier = 0; 861 int i = 0; 862 enumerator = [trackers objectEnumerator]; 863 while ((object = [enumerator nextObject])) 864 { 865 if (![object isKindOfClass: [NSNumber class]]) 866 { 867 trackerStructs[i].tier = tier; 868 trackerStructs[i].announce = (char *)[object UTF8String]; 869 i++; 870 } 871 else 872 tier++; 873 } 874 875 tr_torrentSetAnnounceList(fHandle, trackerStructs, count); 876 tr_free(trackerStructs); 877 878 return YES; 879 } 880 881 - (BOOL) hasAddedTrackers 882 { 883 return fAddedTrackers; 801 884 } 802 885 … … 1539 1622 ratioSetting: (NSNumber *) ratioSetting ratioLimit: (NSNumber *) ratioLimit 1540 1623 waitToStart: (NSNumber *) waitToStart 1541 orderValue: (NSNumber *) orderValue groupValue: (NSNumber *) groupValue ;1624 orderValue: (NSNumber *) orderValue groupValue: (NSNumber *) groupValue addedTrackers: (NSNumber *) addedTrackers 1542 1625 { 1543 1626 if (!(self = [super init])) … … 1636 1719 fOrderValue = orderValue ? [orderValue intValue] : tr_sessionCountTorrents(lib) - 1; 1637 1720 fGroupValue = groupValue ? [groupValue intValue] : -1; 1721 1722 fAddedTrackers = addedTrackers ? [addedTrackers boolValue] : NO; 1638 1723 1639 1724 [self createFileList]; -
trunk/macosx/TrackerTableView.m
r5959 r5998 26 26 27 27 @implementation TrackerTableView 28 29 - (void) mouseDown: (NSEvent *) event 30 { 31 [[self window] makeKeyWindow]; 32 [super mouseDown: event]; 33 } 28 34 29 35 - (void) setTrackers: (NSArray *) trackers … … 69 75 } 70 76 71 if (!start )77 if (!start && ![self isRowSelected: i]) 72 78 NSRectFill([self rectOfRow: i]); 73 79
Note: See TracChangeset
for help on using the changeset viewer.
