Changeset 11993
- Timestamp:
- Feb 20, 2011, 3:58:50 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Transmission.xcodeproj/project.pbxproj
r11990 r11993 281 281 A2E57ABB1310822C00A7DAB1 /* StatusBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2E57ABA1310822C00A7DAB1 /* StatusBarController.m */; }; 282 282 A2E57AC61310831400A7DAB1 /* StatusBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = A2E57AC51310831400A7DAB1 /* StatusBar.xib */; }; 283 A2E57B9C13109DC200A7DAB1 /* FilterBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = A2E57B9B13109DC200A7DAB1 /* FilterBar.xib */; }; 284 A2E57BA713109E6B00A7DAB1 /* FilterBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2E57BA613109E6B00A7DAB1 /* FilterBarController.m */; }; 283 285 A2E669790F5B8E5A00B4251A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A2E669780F5B8E5A00B4251A /* Security.framework */; }; 284 286 A2E9AA760C249AF400085DCF /* ToolbarCreateTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A2E9AA750C249AF400085DCF /* ToolbarCreateTemplate.png */; }; … … 864 866 A2E57ABA1310822C00A7DAB1 /* StatusBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatusBarController.m; path = macosx/StatusBarController.m; sourceTree = "<group>"; }; 865 867 A2E57AC51310831400A7DAB1 /* StatusBar.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = StatusBar.xib; path = macosx/StatusBar.xib; sourceTree = "<group>"; }; 868 A2E57B9B13109DC200A7DAB1 /* FilterBar.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = FilterBar.xib; path = macosx/FilterBar.xib; sourceTree = "<group>"; }; 869 A2E57BA513109E6B00A7DAB1 /* FilterBarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FilterBarController.h; path = macosx/FilterBarController.h; sourceTree = "<group>"; }; 870 A2E57BA613109E6B00A7DAB1 /* FilterBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FilterBarController.m; path = macosx/FilterBarController.m; sourceTree = "<group>"; }; 866 871 A2E669780F5B8E5A00B4251A /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; 867 872 A2E9AA750C249AF400085DCF /* ToolbarCreateTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ToolbarCreateTemplate.png; path = macosx/Images/ToolbarCreateTemplate.png; sourceTree = "<group>"; }; … … 1111 1116 A21282A50CA6C66800EAEE0F /* StatusBarView.h */, 1112 1117 A21282A60CA6C66800EAEE0F /* StatusBarView.m */, 1118 A2E57BA513109E6B00A7DAB1 /* FilterBarController.h */, 1119 A2E57BA613109E6B00A7DAB1 /* FilterBarController.m */, 1113 1120 A2661D3A12D0E51A004F69D5 /* FilterBarView.h */, 1114 1121 A2661D3B12D0E51B004F69D5 /* FilterBarView.m */, … … 1194 1201 A231274B0D11D0B7003F9AFF /* AboutWindow.xib */, 1195 1202 A2E57AC51310831400A7DAB1 /* StatusBar.xib */, 1203 A2E57B9B13109DC200A7DAB1 /* FilterBar.xib */, 1196 1204 A2F7CF5413035F7B0016FF10 /* URLSheetWindow.xib */, 1197 1205 A2D307B00D9EC9F50051FD27 /* BlocklistStatusWindow.xib */, … … 2085 2093 A2F7CF5513035F7B0016FF10 /* URLSheetWindow.xib in Resources */, 2086 2094 A2E57AC61310831400A7DAB1 /* StatusBar.xib in Resources */, 2095 A2E57B9C13109DC200A7DAB1 /* FilterBar.xib in Resources */, 2087 2096 ); 2088 2097 runOnlyForDeploymentPostprocessing = 0; … … 2277 2286 A2F7CF5F13035FFD0016FF10 /* URLSheetWindowController.m in Sources */, 2278 2287 A2E57ABB1310822C00A7DAB1 /* StatusBarController.m in Sources */, 2288 A2E57BA713109E6B00A7DAB1 /* FilterBarController.m in Sources */, 2279 2289 ); 2280 2290 runOnlyForDeploymentPostprocessing = 0; -
trunk/macosx/Controller.h
r11990 r11993 32 32 @class Badger; 33 33 @class DragOverlayWindow; 34 @class FilterBarView; 35 @class FilterButton; 34 @class FilterBarController; 36 35 @class InfoWindowController; 37 36 @class MessageWindowController; … … 75 74 IBOutlet NSTextField * fTotalTorrentsField; 76 75 77 IBOutlet StatusBarController * fStatusBar; 78 79 IBOutlet FilterBarView * fFilterBar; 80 IBOutlet FilterButton * fNoFilterButton, * fActiveFilterButton, * fDownloadFilterButton, 81 * fSeedFilterButton, * fPauseFilterButton; 82 IBOutlet NSSearchField * fSearchFilterField; 83 IBOutlet NSMenuItem * fNextFilterItem, * fPrevFilterItem; 76 StatusBarController * fStatusBar; 77 78 FilterBarController * fFilterBar; 79 IBOutlet NSMenuItem * fNextFilterItem; 84 80 85 81 IBOutlet NSMenuItem * fNextInfoTabItem, * fPrevInfoTabItem; … … 92 88 IBOutlet NSMenuItem * fCheckRatioItem, * fNoCheckRatioItem; 93 89 94 IBOutlet NSMenu * fGroupsSetMenu, * fGroupsSetContextMenu, * fGroupFilterMenu; 95 IBOutlet NSPopUpButton * fGroupsButton; 90 IBOutlet NSMenu * fGroupsSetMenu, * fGroupsSetContextMenu; 96 91 97 92 #warning change to QLPreviewPanel … … 196 191 - (void) updateTorrentHistory; 197 192 198 - (void) applyFilter : (id) sender;193 - (void) applyFilter; 199 194 200 195 - (void) sortTorrents; … … 204 199 - (void) setSortReverse: (id) sender; 205 200 206 - (void) setFilter: (id) sender;207 - (void) setFilterSearchType: (id) sender;208 201 - (void) switchFilter: (id) sender; 209 202 210 203 - (void) setGroup: (id) sender; //used by delegate-generated menu items 211 - (void) setGroupFilter: (id) sender;212 - (void) updateGroupsFilterButton;213 - (void) updateGroupsFilters: (NSNotification *) notification;214 204 215 205 - (void) toggleSpeedLimit: (id) sender; … … 248 238 - (void) setWindowSizeToFit; 249 239 - (NSRect) sizedWindowFrame; 250 251 - (void) resizeFilterBar;252 240 253 241 - (void) updateForExpandCollape; -
trunk/macosx/Controller.m
r11992 r11993 46 46 #import "BlocklistDownloader.h" 47 47 #import "StatusBarController.h" 48 #import "FilterBarView.h" 49 #import "FilterButton.h" 48 #import "FilterBarController.h" 50 49 #import "BonjourController.h" 51 50 #import "Badger.h" … … 108 107 } sortOrderTag; 109 108 110 #define FILTER_NONE @"None"111 #define FILTER_ACTIVE @"Active"112 #define FILTER_DOWNLOAD @"Download"113 #define FILTER_SEED @"Seed"114 #define FILTER_PAUSE @"Pause"115 116 #define FILTER_TYPE_NAME @"Name"117 #define FILTER_TYPE_TRACKER @"Tracker"118 119 #define FILTER_TYPE_TAG_NAME 401120 #define FILTER_TYPE_TAG_TRACKER 402121 122 #define GROUP_FILTER_ALL_TAG -2123 124 109 #define GROWL_DOWNLOAD_COMPLETE @"Download Complete" 125 110 #define GROWL_SEEDING_COMPLETE @"Seeding Complete" … … 132 117 #define ROW_HEIGHT_SMALL 22.0 133 118 #define WINDOW_REGULAR_WIDTH 468.0 134 135 #define SEARCH_FILTER_MIN_WIDTH 48.0136 #define SEARCH_FILTER_MAX_WIDTH 95.0137 119 138 120 #define UPDATE_UI_SECONDS 1.0 … … 415 397 [[fTotalTorrentsField cell] setBackgroundStyle: NSBackgroundStyleRaised]; 416 398 417 [self updateGroupsFilterButton];418 419 399 //set up filter bar 420 NSView * contentView = [fWindow contentView];421 NSSize windowSize = [contentView convertSize: [fWindow frame].size fromView: nil];422 [fFilterBar setHidden: YES];423 424 NSRect filterBarFrame = [fFilterBar frame];425 filterBarFrame.size.width = windowSize.width;426 [fFilterBar setFrame: filterBarFrame];427 428 [contentView addSubview: fFilterBar];429 [fFilterBar setFrameOrigin: NSMakePoint(0, NSMaxY([contentView frame]))];430 431 400 [self showFilterBar: [fDefaults boolForKey: @"FilterBar"] animate: NO]; 432 401 … … 473 442 } 474 443 475 //set filter476 NSString * filterType = [fDefaults stringForKey: @"Filter"];477 478 NSButton * currentFilterButton;479 if ([filterType isEqualToString: FILTER_ACTIVE])480 currentFilterButton = fActiveFilterButton;481 else if ([filterType isEqualToString: FILTER_PAUSE])482 currentFilterButton = fPauseFilterButton;483 else if ([filterType isEqualToString: FILTER_SEED])484 currentFilterButton = fSeedFilterButton;485 else if ([filterType isEqualToString: FILTER_DOWNLOAD])486 currentFilterButton = fDownloadFilterButton;487 else488 {489 //safety490 if (![filterType isEqualToString: FILTER_NONE])491 [fDefaults setObject: FILTER_NONE forKey: @"Filter"];492 currentFilterButton = fNoFilterButton;493 }494 [currentFilterButton setState: NSOnState];495 496 //set filter search type497 NSString * filterSearchType = [fDefaults stringForKey: @"FilterSearchType"];498 499 NSMenu * filterSearchMenu = [[fSearchFilterField cell] searchMenuTemplate];500 NSString * filterSearchTypeTitle;501 if ([filterSearchType isEqualToString: FILTER_TYPE_TRACKER])502 filterSearchTypeTitle = [[filterSearchMenu itemWithTag: FILTER_TYPE_TAG_TRACKER] title];503 else504 {505 //safety506 if (![filterType isEqualToString: FILTER_TYPE_NAME])507 [fDefaults setObject: FILTER_TYPE_NAME forKey: @"FilterSearchType"];508 filterSearchTypeTitle = [[filterSearchMenu itemWithTag: FILTER_TYPE_TAG_NAME] title];509 }510 [[fSearchFilterField cell] setPlaceholderString: filterSearchTypeTitle];511 512 444 fBadger = [[Badger alloc] initWithLib: fLib]; 513 445 … … 546 478 name: @"UpdateQueue" object: nil]; 547 479 480 [nc addObserver: self selector: @selector(applyFilter) 481 name: @"ApplyFilter" object: nil]; 482 548 483 //open newly created torrent file 549 484 [nc addObserver: self selector: @selector(beginCreateFile:) … … 553 488 [nc addObserver: self selector: @selector(openCreatedFile:) 554 489 name: @"OpenCreatedTorrentFile" object: nil]; 555 556 //update when groups change557 [nc addObserver: self selector: @selector(updateGroupsFilters:)558 name: @"UpdateGroups" object: nil];559 490 560 491 //timer to update the interface every second … … 565 496 [[NSRunLoop currentRunLoop] addTimer: fTimer forMode: NSEventTrackingRunLoopMode]; 566 497 567 [self applyFilter : nil];498 [self applyFilter]; 568 499 569 500 [fWindow makeKeyAndOrderFront: nil]; 570 501 502 #warning still needed? 571 503 //can't be done earlier 572 if (![fFilterBar isHidden])573 [self resizeFilterBar]; 504 /*if (![fFilterBar isHidden]) 505 [self resizeFilterBar];*/ 574 506 575 507 if ([fDefaults boolForKey: @"InfoVisible"]) … … 1267 1199 1268 1200 [self updateUI]; 1269 [self applyFilter : nil];1201 [self applyFilter]; 1270 1202 [[fWindow toolbar] validateVisibleItems]; 1271 1203 [self updateTorrentHistory]; … … 1291 1223 1292 1224 [self updateUI]; 1293 [self applyFilter : nil];1225 [self applyFilter]; 1294 1226 [[fWindow toolbar] validateVisibleItems]; 1295 1227 [self updateTorrentHistory]; … … 1606 1538 [torrent resetCache]; 1607 1539 1608 [self applyFilter : nil];1540 [self applyFilter]; 1609 1541 } 1610 1542 … … 1761 1693 1762 1694 [self updateUI]; 1763 [self applyFilter : nil];1695 [self applyFilter]; 1764 1696 [[fWindow toolbar] validateVisibleItems]; 1765 1697 [self updateTorrentHistory]; … … 1924 1856 1925 1857 [fDefaults setObject: sortType forKey: @"Sort"]; 1926 [self applyFilter : nil]; //better than calling sortTorrents because it will even apply to queue order1858 [self applyFilter]; //better than calling sortTorrents because it will even apply to queue order 1927 1859 } 1928 1860 … … 1936 1868 [fTableView removeAllCollapsedGroups]; 1937 1869 1938 [self applyFilter : nil];1870 [self applyFilter]; 1939 1871 } 1940 1872 … … 2028 1960 } 2029 1961 2030 - (void) applyFilter : (id) sender1962 - (void) applyFilter 2031 1963 { 2032 1964 //get all the torrents in the table … … 2061 1993 const BOOL filterGroup = groupFilterValue != GROUP_FILTER_ALL_TAG; 2062 1994 2063 NSString * searchString = [fSearchFilterField stringValue];2064 const BOOL filterText = [searchString length] > 0,1995 NSString * searchString = fFilterBar ? [fFilterBar searchString] : @""; 1996 const BOOL filterText = ![searchString isEqualToString: @""], 2065 1997 filterTracker = filterText && [[fDefaults stringForKey: @"FilterSearchType"] isEqualToString: FILTER_TYPE_TRACKER]; 2066 1998 … … 2133 2065 2134 2066 //set button tooltips 2135 [fNoFilterButton setCount: [fTorrents count]]; 2136 [fActiveFilterButton setCount: active]; 2137 [fDownloadFilterButton setCount: downloading]; 2138 [fSeedFilterButton setCount: seeding]; 2139 [fPauseFilterButton setCount: paused]; 2067 [fFilterBar setCountAll: [fTorrents count] active: active downloading: downloading seeding: seeding paused: paused]; 2140 2068 2141 2069 //clear display cache for not-shown torrents … … 2220 2148 } 2221 2149 2222 //resets filter and sorts torrents2223 - (void) setFilter: (id) sender2224 {2225 NSString * oldFilterType = [fDefaults stringForKey: @"Filter"];2226 2227 NSButton * prevFilterButton;2228 if ([oldFilterType isEqualToString: FILTER_PAUSE])2229 prevFilterButton = fPauseFilterButton;2230 else if ([oldFilterType isEqualToString: FILTER_ACTIVE])2231 prevFilterButton = fActiveFilterButton;2232 else if ([oldFilterType isEqualToString: FILTER_SEED])2233 prevFilterButton = fSeedFilterButton;2234 else if ([oldFilterType isEqualToString: FILTER_DOWNLOAD])2235 prevFilterButton = fDownloadFilterButton;2236 else2237 prevFilterButton = fNoFilterButton;2238 2239 if (sender != prevFilterButton)2240 {2241 [prevFilterButton setState: NSOffState];2242 [sender setState: NSOnState];2243 2244 NSString * filterType;2245 if (sender == fActiveFilterButton)2246 filterType = FILTER_ACTIVE;2247 else if (sender == fDownloadFilterButton)2248 filterType = FILTER_DOWNLOAD;2249 else if (sender == fPauseFilterButton)2250 filterType = FILTER_PAUSE;2251 else if (sender == fSeedFilterButton)2252 filterType = FILTER_SEED;2253 else2254 filterType = FILTER_NONE;2255 2256 [fDefaults setObject: filterType forKey: @"Filter"];2257 }2258 else2259 [sender setState: NSOnState];2260 2261 [self applyFilter: nil];2262 }2263 2264 - (void) setFilterSearchType: (id) sender2265 {2266 NSString * oldFilterType = [fDefaults stringForKey: @"FilterSearchType"];2267 2268 NSInteger prevTag, currentTag = [sender tag];2269 if ([oldFilterType isEqualToString: FILTER_TYPE_TRACKER])2270 prevTag = FILTER_TYPE_TAG_TRACKER;2271 else2272 prevTag = FILTER_TYPE_TAG_NAME;2273 2274 if (currentTag != prevTag)2275 {2276 NSString * filterType;2277 if (currentTag == FILTER_TYPE_TAG_TRACKER)2278 filterType = FILTER_TYPE_TRACKER;2279 else2280 filterType = FILTER_TYPE_NAME;2281 2282 [fDefaults setObject: filterType forKey: @"FilterSearchType"];2283 2284 [[fSearchFilterField cell] setPlaceholderString: [sender title]];2285 }2286 2287 [self applyFilter: nil];2288 }2289 2290 2150 - (void) switchFilter: (id) sender 2291 2151 { 2292 NSString * filterType = [fDefaults stringForKey: @"Filter"]; 2293 2294 NSButton * button; 2295 if ([filterType isEqualToString: FILTER_NONE]) 2296 button = sender == fNextFilterItem ? fActiveFilterButton : fPauseFilterButton; 2297 else if ([filterType isEqualToString: FILTER_ACTIVE]) 2298 button = sender == fNextFilterItem ? fDownloadFilterButton : fNoFilterButton; 2299 else if ([filterType isEqualToString: FILTER_DOWNLOAD]) 2300 button = sender == fNextFilterItem ? fSeedFilterButton : fActiveFilterButton; 2301 else if ([filterType isEqualToString: FILTER_SEED]) 2302 button = sender == fNextFilterItem ? fPauseFilterButton : fDownloadFilterButton; 2303 else if ([filterType isEqualToString: FILTER_PAUSE]) 2304 button = sender == fNextFilterItem ? fNoFilterButton : fSeedFilterButton; 2305 else 2306 button = fNoFilterButton; 2307 2308 [self setFilter: button]; 2152 [fFilterBar switchFilter: sender == fNextFilterItem]; 2309 2153 } 2310 2154 2311 2155 - (void) menuNeedsUpdate: (NSMenu *) menu 2312 2156 { 2313 if (menu == fGroupsSetMenu || menu == fGroupsSetContextMenu || menu == fGroupFilterMenu) 2314 { 2315 const BOOL filter = menu == fGroupFilterMenu; 2316 2317 const NSInteger remaining = filter ? 3 : 0; 2318 for (NSInteger i = [menu numberOfItems]-1; i >= remaining; i--) 2157 if (menu == fGroupsSetMenu || menu == fGroupsSetContextMenu) 2158 { 2159 for (NSInteger i = [menu numberOfItems]-1; i >= 0; i--) 2319 2160 [menu removeItemAtIndex: i]; 2320 2161 2321 NSMenu * groupMenu; 2322 if (!filter) 2323 groupMenu = [[GroupsController groups] groupMenuWithTarget: self action: @selector(setGroup:) isSmall: NO]; 2324 else 2325 groupMenu = [[GroupsController groups] groupMenuWithTarget: self action: @selector(setGroupFilter:) isSmall: YES]; 2162 NSMenu * groupMenu = [[GroupsController groups] groupMenuWithTarget: self action: @selector(setGroup:) isSmall: NO]; 2326 2163 2327 2164 const NSInteger groupMenuCount = [groupMenu numberOfItems]; … … 2383 2220 } 2384 2221 2385 [self applyFilter : nil];2222 [self applyFilter]; 2386 2223 [self updateUI]; 2387 2224 [self updateTorrentHistory]; 2388 }2389 2390 - (void) setGroupFilter: (id) sender2391 {2392 [fDefaults setInteger: [sender tag] forKey: @"FilterGroup"];2393 [self updateGroupsFilterButton];2394 [self applyFilter: nil];2395 }2396 2397 - (void) updateGroupsFilterButton2398 {2399 NSInteger groupIndex = [fDefaults integerForKey: @"FilterGroup"];2400 2401 NSImage * icon;2402 NSString * toolTip;2403 if (groupIndex == GROUP_FILTER_ALL_TAG)2404 {2405 icon = [NSImage imageNamed: @"PinTemplate.png"];2406 toolTip = NSLocalizedString(@"All Groups", "Groups -> Button");2407 }2408 else2409 {2410 icon = [[GroupsController groups] imageForIndex: groupIndex];2411 NSString * groupName = groupIndex != -1 ? [[GroupsController groups] nameForIndex: groupIndex]2412 : NSLocalizedString(@"None", "Groups -> Button");2413 toolTip = [NSLocalizedString(@"Group", "Groups -> Button") stringByAppendingFormat: @": %@", groupName];2414 }2415 2416 [[fGroupFilterMenu itemAtIndex: 0] setImage: icon];2417 [fGroupsButton setToolTip: toolTip];2418 }2419 2420 - (void) updateGroupsFilters: (NSNotification *) notification2421 {2422 [self updateGroupsFilterButton];2423 [self applyFilter: nil];2424 2225 } 2425 2226 … … 2787 2588 } 2788 2589 2789 [self applyFilter : nil];2590 [self applyFilter]; 2790 2591 [fTableView selectValues: selectedValues]; 2791 2592 } … … 2985 2786 if (!fStatusBar) 2986 2787 maxSize.height -= [[fStatusBar view] frame].size.height; 2987 if ( [fFilterBar isHidden])2988 maxSize.height -= [ fFilterBarframe].size.height;2788 if (!fFilterBar) 2789 maxSize.height -= [[fFilterBar view] frame].size.height; 2989 2790 if (windowSize.height > maxSize.height) 2990 2791 windowSize.height = maxSize.height; … … 3026 2827 3027 2828 [contentView addSubview: [fStatusBar view]]; 3028 [[fStatusBar view] setFrameOrigin: NSMakePoint(0 , NSMaxY([contentView frame]))];2829 [[fStatusBar view] setFrameOrigin: NSMakePoint(0.0, NSMaxY([contentView frame]))]; 3029 2830 } 3030 2831 … … 3055 2856 const NSUInteger statsMask = [[fStatusBar view] autoresizingMask]; 3056 2857 [[fStatusBar view] setAutoresizingMask: NSViewNotSizable]; 3057 const NSUInteger filterMask = [fFilterBar autoresizingMask]; 3058 [fFilterBar setAutoresizingMask: NSViewNotSizable]; 2858 NSUInteger filterMask; 2859 if (fFilterBar) 2860 { 2861 filterMask = [[fFilterBar view] autoresizingMask]; 2862 [[fFilterBar view] setAutoresizingMask: NSViewNotSizable]; 2863 } 3059 2864 const NSUInteger scrollMask = [scrollView autoresizingMask]; 3060 2865 [scrollView setAutoresizingMask: NSViewNotSizable]; … … 3065 2870 //re-enable autoresize 3066 2871 [[fStatusBar view] setAutoresizingMask: statsMask]; 3067 [fFilterBar setAutoresizingMask: filterMask]; 2872 if (fFilterBar) 2873 [[fFilterBar view] setAutoresizingMask: filterMask]; 3068 2874 [scrollView setAutoresizingMask: scrollMask]; 3069 2875 … … 3075 2881 if (!show) 3076 2882 { 2883 [[fStatusBar view] removeFromSuperview]; 3077 2884 [fStatusBar release]; 3078 2885 fStatusBar = nil; … … 3082 2889 - (void) toggleFilterBar: (id) sender 3083 2890 { 2891 const BOOL show = fFilterBar == nil; 2892 2893 [self showFilterBar: show animate: YES]; 2894 [fDefaults setBool: show forKey: @"FilterBar"]; 2895 [[fWindow toolbar] validateVisibleItems]; 2896 3084 2897 //disable filtering when hiding 3085 if (![fFilterBar isHidden]) 3086 { 3087 [fSearchFilterField setStringValue: @""]; 3088 [self setFilter: fNoFilterButton]; 3089 [self setGroupFilter: [fGroupFilterMenu itemWithTag: GROUP_FILTER_ALL_TAG]]; 3090 } 3091 3092 [self showFilterBar: [fFilterBar isHidden] animate: YES]; 3093 [fDefaults setBool: ![fFilterBar isHidden] forKey: @"FilterBar"]; 3094 [[fWindow toolbar] validateVisibleItems]; 2898 if (!show) 2899 { 2900 [[NSUserDefaults standardUserDefaults] setObject: FILTER_NONE forKey: @"Filter"]; 2901 [[NSUserDefaults standardUserDefaults] setInteger: GROUP_FILTER_ALL_TAG forKey: @"FilterGroup"]; 2902 [self applyFilter]; 2903 } 3095 2904 } 3096 2905 … … 3098 2907 - (void) showFilterBar: (BOOL) show animate: (BOOL) animate 3099 2908 { 3100 if (show != [fFilterBar isHidden]) 2909 const BOOL prevShown = fFilterBar != nil; 2910 if (show == prevShown) 3101 2911 return; 3102 2912 3103 2913 if (show) 3104 [fFilterBar setHidden: NO]; 3105 3106 NSRect frame; 3107 CGFloat heightChange = [fFilterBar frame].size.height; 2914 { 2915 fFilterBar = [[FilterBarController alloc] init]; 2916 2917 NSView * contentView = [fWindow contentView]; 2918 const NSSize windowSize = [contentView convertSize: [fWindow frame].size fromView: nil]; 2919 2920 NSRect filterBarFrame = [[fFilterBar view] frame]; 2921 filterBarFrame.size.width = windowSize.width; 2922 [[fFilterBar view] setFrame: filterBarFrame]; 2923 2924 if (fStatusBar) 2925 [contentView addSubview: [fFilterBar view] positioned: NSWindowBelow relativeTo: [fStatusBar view]]; 2926 else 2927 [contentView addSubview: [fFilterBar view]]; 2928 const CGFloat originY = fStatusBar ? NSMinY([[fStatusBar view] frame]) : NSMaxY([contentView frame]); 2929 [[fFilterBar view] setFrameOrigin: NSMakePoint(0.0, originY)]; 2930 } 2931 2932 CGFloat heightChange = NSHeight([[fFilterBar view] frame]); 3108 2933 if (!show) 3109 2934 heightChange *= -1; … … 3112 2937 if (show && ![fDefaults boolForKey: @"AutoSize"]) 3113 2938 { 3114 frame = [self windowFrameByAddingHeight: heightChange checkLimits: NO];3115 CGFloat change = [[fWindow screen] visibleFrame].size.height - frame.size.height;2939 NSRect frame = [self windowFrameByAddingHeight: heightChange checkLimits: NO]; 2940 const CGFloat change = NSHeight([[fWindow screen] visibleFrame]) - NSHeight(frame); 3116 2941 if (change < 0.0) 3117 2942 { … … 3126 2951 3127 2952 //set views to not autoresize 3128 NSUInteger filterMask = [fFilterBarautoresizingMask];3129 NSUInteger scrollMask = [scrollView autoresizingMask];3130 [ fFilterBarsetAutoresizingMask: NSViewNotSizable];2953 const NSUInteger filterMask = [[fFilterBar view] autoresizingMask]; 2954 const NSUInteger scrollMask = [scrollView autoresizingMask]; 2955 [[fFilterBar view] setAutoresizingMask: NSViewNotSizable]; 3131 2956 [scrollView setAutoresizingMask: NSViewNotSizable]; 3132 2957 3133 frame = [self windowFrameByAddingHeight: heightChange checkLimits: NO];2958 const NSRect frame = [self windowFrameByAddingHeight: heightChange checkLimits: NO]; 3134 2959 [fWindow setFrame: frame display: YES animate: animate]; 3135 2960 3136 2961 //re-enable autoresize 3137 [ fFilterBarsetAutoresizingMask: filterMask];2962 [[fFilterBar view] setAutoresizingMask: filterMask]; 3138 2963 [scrollView setAutoresizingMask: scrollMask]; 3139 2964 … … 3145 2970 if (!show) 3146 2971 { 3147 [fFilterBar setHidden: YES]; 2972 [[fFilterBar view] removeFromSuperview]; 2973 [fFilterBar release]; 2974 fFilterBar = nil; 3148 2975 [fWindow makeFirstResponder: fTableView]; 3149 2976 } 3150 2977 } 3151 2978 2979 #warning fix? 3152 2980 - (void) focusFilterField 3153 2981 { 3154 [fWindow makeFirstResponder: fSearchFilterField];2982 /*[fWindow makeFirstResponder: fSearchFilterField]; 3155 2983 if ([fFilterBar isHidden]) 3156 [self toggleFilterBar: self]; 2984 [self toggleFilterBar: self];*/ 3157 2985 } 3158 2986 … … 3551 3379 if ([ident isEqualToString: TOOLBAR_FILTER]) 3552 3380 { 3553 [(NSButton *)[toolbarItem view] setState: ![fFilterBar isHidden]];3381 [(NSButton *)[toolbarItem view] setState: fFilterBar != nil]; 3554 3382 return YES; 3555 3383 } … … 3634 3462 } 3635 3463 3636 if (action == @selector(setGroupFilter:))3637 {3638 [menuItem setState: [menuItem tag] == [fDefaults integerForKey: @"FilterGroup"] ? NSOnState : NSOffState];3639 return YES;3640 }3641 3642 3464 if (action == @selector(toggleSmallView:)) 3643 3465 { … … 3725 3547 if (action == @selector(toggleFilterBar:)) 3726 3548 { 3727 NSString * title = [fFilterBar isHidden]? NSLocalizedString(@"Show Filter Bar", "View menu -> Filter Bar")3549 NSString * title = !fFilterBar ? NSLocalizedString(@"Show Filter Bar", "View menu -> Filter Bar") 3728 3550 : NSLocalizedString(@"Hide Filter Bar", "View menu -> Filter Bar"); 3729 3551 [menuItem setTitle: title]; … … 3734 3556 //enable prev/next filter button 3735 3557 if (action == @selector(switchFilter:)) 3736 return [fWindow isVisible] && ![fFilterBar isHidden];3558 return [fWindow isVisible] && fFilterBar; 3737 3559 3738 3560 //enable reveal in finder … … 3904 3726 { 3905 3727 [menuItem setState: [fDefaults boolForKey: @"SortByGroup"] ? NSOnState : NSOffState]; 3906 return YES;3907 }3908 3909 //check proper filter search item3910 if (action == @selector(setFilterSearchType:))3911 {3912 NSString * filterType = [fDefaults stringForKey: @"FilterSearchType"];3913 3914 BOOL state;3915 if ([menuItem tag] == FILTER_TYPE_TAG_TRACKER)3916 state = [filterType isEqualToString: FILTER_TYPE_TRACKER];3917 else3918 state = [filterType isEqualToString: FILTER_TYPE_NAME];3919 3920 [menuItem setState: state ? NSOnState : NSOffState];3921 3728 return YES; 3922 3729 } … … 4086 3893 } 4087 3894 4088 - (void) resizeFilterBar4089 {4090 //replace all buttons4091 [fNoFilterButton sizeToFit];4092 [fActiveFilterButton sizeToFit];4093 [fDownloadFilterButton sizeToFit];4094 [fSeedFilterButton sizeToFit];4095 [fPauseFilterButton sizeToFit];4096 4097 NSRect allRect = [fNoFilterButton frame];4098 NSRect activeRect = [fActiveFilterButton frame];4099 NSRect downloadRect = [fDownloadFilterButton frame];4100 NSRect seedRect = [fSeedFilterButton frame];4101 NSRect pauseRect = [fPauseFilterButton frame];4102 4103 //size search filter to not overlap buttons4104 NSRect searchFrame = [fSearchFilterField frame];4105 searchFrame.origin.x = NSMaxX(pauseRect) + 5.0;4106 searchFrame.size.width = [fFilterBar frame].size.width - searchFrame.origin.x - 5.0;4107 4108 //make sure it is not too long4109 if (searchFrame.size.width > SEARCH_FILTER_MAX_WIDTH)4110 {4111 searchFrame.origin.x += searchFrame.size.width - SEARCH_FILTER_MAX_WIDTH;4112 searchFrame.size.width = SEARCH_FILTER_MAX_WIDTH;4113 }4114 else if (searchFrame.size.width < SEARCH_FILTER_MIN_WIDTH)4115 {4116 searchFrame.origin.x += searchFrame.size.width - SEARCH_FILTER_MIN_WIDTH;4117 searchFrame.size.width = SEARCH_FILTER_MIN_WIDTH;4118 4119 //calculate width the buttons can take up4120 const CGFloat allowedWidth = (searchFrame.origin.x - 5.0) - allRect.origin.x;4121 const CGFloat currentWidth = NSWidth(allRect) + NSWidth(activeRect) + NSWidth(downloadRect) + NSWidth(seedRect)4122 + NSWidth(pauseRect) + 4.0; //add 4 for space between buttons4123 const CGFloat ratio = allowedWidth / currentWidth;4124 4125 //decrease button widths proportionally4126 allRect.size.width = NSWidth(allRect) * ratio;4127 activeRect.size.width = NSWidth(activeRect) * ratio;4128 downloadRect.size.width = NSWidth(downloadRect) * ratio;4129 seedRect.size.width = NSWidth(seedRect) * ratio;4130 pauseRect.size.width = NSWidth(pauseRect) * ratio;4131 }4132 else;4133 4134 activeRect.origin.x = NSMaxX(allRect) + 1.0;4135 downloadRect.origin.x = NSMaxX(activeRect) + 1.0;4136 seedRect.origin.x = NSMaxX(downloadRect) + 1.0;4137 pauseRect.origin.x = NSMaxX(seedRect) + 1.0;4138 4139 [fNoFilterButton setFrame: allRect];4140 [fActiveFilterButton setFrame: activeRect];4141 [fDownloadFilterButton setFrame: downloadRect];4142 [fSeedFilterButton setFrame: seedRect];4143 [fPauseFilterButton setFrame: pauseRect];4144 4145 [fSearchFilterField setFrame: searchFrame];4146 }4147 4148 3895 - (void) updateForExpandCollape 4149 3896 { … … 4169 3916 proposedFrameSize.height = [fWindow frame].size.height; 4170 3917 return proposedFrameSize; 4171 }4172 4173 - (void) windowDidResize: (NSNotification *) notification4174 {4175 if (![fFilterBar isHidden])4176 [self resizeFilterBar];4177 3918 } 4178 3919 … … 4350 4091 4351 4092 [self updateUI]; 4352 [self applyFilter : nil];4093 [self applyFilter]; 4353 4094 [self updateTorrentHistory]; 4354 4095 } -
trunk/macosx/Makefile.am
r11990 r11993 73 73 FilePriorityCell.h \ 74 74 FilePriorityCell.m \ 75 FilterBarController.h \ 76 FilterBarController.m \ 75 77 FilterBarView.h \ 76 78 FilterBarView.m \ -
trunk/macosx/en.lproj/MainMenu.xib
r11990 r11993 14 14 <bool key="EncodedWithXMLCoder">YES</bool> 15 15 <integer value="589"/> 16 <integer value="1684"/> 16 17 <integer value="21"/> 17 <integer value="29"/>18 18 </object> 19 19 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 62 62 <int key="NSCellFlags">-2076049856</int> 63 63 <int key="NSCellFlags2">134219776</int> 64 <object class="NSFont" key="NSSupport" id="622385820">64 <object class="NSFont" key="NSSupport"> 65 65 <string key="NSName">LucidaGrande</string> 66 66 <double key="NSSize">13</double> … … 2191 2191 <string key="NSName"/> 2192 2192 </object> 2193 <object class="NSCustomView" id="793806362">2194 <nil key="NSNextResponder"/>2195 <int key="NSvFlags">266</int>2196 <object class="NSMutableArray" key="NSSubviews">2197 <bool key="EncodedWithXMLCoder">YES</bool>2198 <object class="NSSearchField" id="994793607">2199 <reference key="NSNextResponder" ref="793806362"/>2200 <int key="NSvFlags">257</int>2201 <string key="NSFrame">{{357, 4}, {95, 15}}</string>2202 <reference key="NSSuperview" ref="793806362"/>2203 <bool key="NSEnabled">YES</bool>2204 <object class="NSSearchFieldCell" key="NSCell" id="186597542">2205 <int key="NSCellFlags">343014976</int>2206 <int key="NSCellFlags2">268698624</int>2207 <string key="NSContents"/>2208 <object class="NSFont" key="NSSupport">2209 <string key="NSName">LucidaGrande</string>2210 <double key="NSSize">9</double>2211 <int key="NSfFlags">3614</int>2212 </object>2213 <reference key="NSControlView" ref="994793607"/>2214 <bool key="NSDrawsBackground">YES</bool>2215 <int key="NSTextBezelStyle">1</int>2216 <object class="NSColor" key="NSBackgroundColor" id="570792161">2217 <int key="NSColorSpace">6</int>2218 <string key="NSCatalogName">System</string>2219 <string key="NSColorName">textBackgroundColor</string>2220 <reference key="NSColor" ref="162898637"/>2221 </object>2222 <reference key="NSTextColor" ref="911300388"/>2223 <object class="NSButtonCell" key="NSSearchButtonCell">2224 <int key="NSCellFlags">130560</int>2225 <int key="NSCellFlags2">0</int>2226 <string key="NSContents">search</string>2227 <reference key="NSControlView" ref="994793607"/>2228 <string key="NSAction">_searchFieldSearch:</string>2229 <reference key="NSTarget" ref="186597542"/>2230 <int key="NSButtonFlags">138690815</int>2231 <int key="NSButtonFlags2">0</int>2232 <string key="NSKeyEquivalent"/>2233 <int key="NSPeriodicDelay">400</int>2234 <int key="NSPeriodicInterval">75</int>2235 </object>2236 <object class="NSButtonCell" key="NSCancelButtonCell">2237 <int key="NSCellFlags">130560</int>2238 <int key="NSCellFlags2">0</int>2239 <string key="NSContents">clear</string>2240 <object class="NSMutableArray" key="NSAccessibilityOverriddenAttributes">2241 <bool key="EncodedWithXMLCoder">YES</bool>2242 <object class="NSMutableDictionary">2243 <bool key="EncodedWithXMLCoder">YES</bool>2244 <object class="NSArray" key="dict.sortedKeys">2245 <bool key="EncodedWithXMLCoder">YES</bool>2246 <string>AXDescription</string>2247 <string>NSAccessibilityEncodedAttributesValueType</string>2248 </object>2249 <object class="NSMutableArray" key="dict.values">2250 <bool key="EncodedWithXMLCoder">YES</bool>2251 <string>cancel</string>2252 <integer value="1"/>2253 </object>2254 </object>2255 </object>2256 <string key="NSAction">_searchFieldCancel:</string>2257 <reference key="NSTarget" ref="186597542"/>2258 <int key="NSButtonFlags">138428671</int>2259 <int key="NSButtonFlags2">0</int>2260 <string key="NSKeyEquivalent"/>2261 <int key="NSPeriodicDelay">400</int>2262 <int key="NSPeriodicInterval">75</int>2263 </object>2264 <int key="NSMaximumRecents">255</int>2265 </object>2266 </object>2267 <object class="NSButton" id="1072598079">2268 <reference key="NSNextResponder" ref="793806362"/>2269 <int key="NSvFlags">268</int>2270 <string key="NSFrame">{{42, 2}, {30, 17}}</string>2271 <reference key="NSSuperview" ref="793806362"/>2272 <bool key="NSEnabled">YES</bool>2273 <object class="NSButtonCell" key="NSCell" id="724632485">2274 <int key="NSCellFlags">67239488</int>2275 <int key="NSCellFlags2">134481920</int>2276 <string key="NSContents">All</string>2277 <object class="NSFont" key="NSSupport" id="660344964">2278 <string key="NSName">LucidaGrande-Bold</string>2279 <double key="NSSize">11</double>2280 <int key="NSfFlags">16</int>2281 </object>2282 <reference key="NSControlView" ref="1072598079"/>2283 <int key="NSButtonFlags">-1232846593</int>2284 <int key="NSButtonFlags2">173</int>2285 <string key="NSAlternateContents"/>2286 <string key="NSKeyEquivalent"/>2287 <int key="NSPeriodicDelay">400</int>2288 <int key="NSPeriodicInterval">75</int>2289 </object>2290 </object>2291 <object class="NSButton" id="141200275">2292 <reference key="NSNextResponder" ref="793806362"/>2293 <int key="NSvFlags">268</int>2294 <string key="NSFrame">{{123, 2}, {89, 17}}</string>2295 <reference key="NSSuperview" ref="793806362"/>2296 <bool key="NSEnabled">YES</bool>2297 <object class="NSButtonCell" key="NSCell" id="494573874">2298 <int key="NSCellFlags">67239488</int>2299 <int key="NSCellFlags2">134481920</int>2300 <string key="NSContents">Downloading</string>2301 <reference key="NSSupport" ref="660344964"/>2302 <reference key="NSControlView" ref="141200275"/>2303 <int key="NSButtonFlags">-1232846593</int>2304 <int key="NSButtonFlags2">173</int>2305 <string key="NSAlternateContents"/>2306 <string key="NSKeyEquivalent"/>2307 <int key="NSPeriodicDelay">400</int>2308 <int key="NSPeriodicInterval">75</int>2309 </object>2310 </object>2311 <object class="NSButton" id="716795844">2312 <reference key="NSNextResponder" ref="793806362"/>2313 <int key="NSvFlags">268</int>2314 <string key="NSFrame">{{213, 2}, {59, 17}}</string>2315 <reference key="NSSuperview" ref="793806362"/>2316 <bool key="NSEnabled">YES</bool>2317 <object class="NSButtonCell" key="NSCell" id="938004552">2318 <int key="NSCellFlags">67239488</int>2319 <int key="NSCellFlags2">134481920</int>2320 <string key="NSContents">Seeding</string>2321 <reference key="NSSupport" ref="660344964"/>2322 <reference key="NSControlView" ref="716795844"/>2323 <int key="NSButtonFlags">-1232846593</int>2324 <int key="NSButtonFlags2">173</int>2325 <string key="NSAlternateContents"/>2326 <string key="NSKeyEquivalent"/>2327 <int key="NSPeriodicDelay">400</int>2328 <int key="NSPeriodicInterval">75</int>2329 </object>2330 </object>2331 <object class="NSButton" id="247598189">2332 <reference key="NSNextResponder" ref="793806362"/>2333 <int key="NSvFlags">268</int>2334 <string key="NSFrame">{{273, 2}, {55, 17}}</string>2335 <reference key="NSSuperview" ref="793806362"/>2336 <bool key="NSEnabled">YES</bool>2337 <object class="NSButtonCell" key="NSCell" id="371449771">2338 <int key="NSCellFlags">67239488</int>2339 <int key="NSCellFlags2">134481920</int>2340 <string key="NSContents">Paused</string>2341 <reference key="NSSupport" ref="660344964"/>2342 <reference key="NSControlView" ref="247598189"/>2343 <int key="NSButtonFlags">-1229700865</int>2344 <int key="NSButtonFlags2">173</int>2345 <string key="NSAlternateContents"/>2346 <string key="NSKeyEquivalent"/>2347 <int key="NSPeriodicDelay">400</int>2348 <int key="NSPeriodicInterval">75</int>2349 </object>2350 </object>2351 <object class="NSBox" id="9278263">2352 <reference key="NSNextResponder" ref="793806362"/>2353 <int key="NSvFlags">268</int>2354 <string key="NSFrame">{{34, 5}, {5, 12}}</string>2355 <reference key="NSSuperview" ref="793806362"/>2356 <string key="NSOffsets">{0, 0}</string>2357 <object class="NSTextFieldCell" key="NSTitleCell">2358 <int key="NSCellFlags">67239424</int>2359 <int key="NSCellFlags2">0</int>2360 <string key="NSContents">Box</string>2361 <reference key="NSSupport" ref="622385820"/>2362 <reference key="NSBackgroundColor" ref="570792161"/>2363 <object class="NSColor" key="NSTextColor">2364 <int key="NSColorSpace">3</int>2365 <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>2366 </object>2367 </object>2368 <int key="NSBorderType">3</int>2369 <int key="NSBoxType">2</int>2370 <int key="NSTitlePosition">0</int>2371 <bool key="NSTransparent">NO</bool>2372 </object>2373 <object class="NSPopUpButton" id="522511347">2374 <reference key="NSNextResponder" ref="793806362"/>2375 <int key="NSvFlags">268</int>2376 <string key="NSFrame">{{5, 4}, {26, 14}}</string>2377 <reference key="NSSuperview" ref="793806362"/>2378 <bool key="NSEnabled">YES</bool>2379 <object class="NSPopUpButtonCell" key="NSCell" id="189668006">2380 <int key="NSCellFlags">-2076049856</int>2381 <int key="NSCellFlags2">133120</int>2382 <object class="NSFont" key="NSSupport">2383 <string key="NSName">LucidaGrande</string>2384 <double key="NSSize">12</double>2385 <int key="NSfFlags">16</int>2386 </object>2387 <reference key="NSControlView" ref="522511347"/>2388 <int key="NSButtonFlags">-1229438721</int>2389 <int key="NSButtonFlags2">173</int>2390 <string key="NSAlternateContents"/>2391 <string key="NSKeyEquivalent"/>2392 <int key="NSPeriodicDelay">400</int>2393 <int key="NSPeriodicInterval">75</int>2394 <object class="NSMenuItem" key="NSMenuItem" id="658740949">2395 <reference key="NSMenu" ref="135534639"/>2396 <bool key="NSIsHidden">YES</bool>2397 <string key="NSTitle"/>2398 <string key="NSKeyEquiv"/>2399 <int key="NSKeyEquivModMask">1048576</int>2400 <int key="NSMnemonicLoc">2147483647</int>2401 <int key="NSState">1</int>2402 <reference key="NSOnImage" ref="322614661"/>2403 <reference key="NSMixedImage" ref="3851078"/>2404 <string key="NSAction">_popUpItemAction:</string>2405 <reference key="NSTarget" ref="189668006"/>2406 </object>2407 <bool key="NSMenuItemRespectAlignment">YES</bool>2408 <object class="NSMenu" key="NSMenu" id="135534639">2409 <string key="NSTitle">OtherViews</string>2410 <object class="NSMutableArray" key="NSMenuItems">2411 <bool key="EncodedWithXMLCoder">YES</bool>2412 <reference ref="658740949"/>2413 <object class="NSMenuItem" id="372587306">2414 <reference key="NSMenu" ref="135534639"/>2415 <string key="NSTitle">Item 2</string>2416 <string key="NSKeyEquiv"/>2417 <int key="NSKeyEquivModMask">1048576</int>2418 <int key="NSMnemonicLoc">2147483647</int>2419 <reference key="NSOnImage" ref="322614661"/>2420 <reference key="NSMixedImage" ref="3851078"/>2421 <string key="NSAction">_popUpItemAction:</string>2422 <reference key="NSTarget" ref="189668006"/>2423 </object>2424 <object class="NSMenuItem" id="689628169">2425 <reference key="NSMenu" ref="135534639"/>2426 <string key="NSTitle">Item 3</string>2427 <string key="NSKeyEquiv"/>2428 <int key="NSKeyEquivModMask">1048576</int>2429 <int key="NSMnemonicLoc">2147483647</int>2430 <reference key="NSOnImage" ref="322614661"/>2431 <reference key="NSMixedImage" ref="3851078"/>2432 <string key="NSAction">_popUpItemAction:</string>2433 <reference key="NSTarget" ref="189668006"/>2434 </object>2435 </object>2436 </object>2437 <bool key="NSPullDown">YES</bool>2438 <int key="NSPreferredEdge">1</int>2439 <bool key="NSUsesItemFromMenu">YES</bool>2440 <bool key="NSAltersState">YES</bool>2441 </object>2442 </object>2443 <object class="NSButton" id="128892418">2444 <reference key="NSNextResponder" ref="793806362"/>2445 <int key="NSvFlags">268</int>2446 <string key="NSFrame">{{73, 2}, {49, 17}}</string>2447 <reference key="NSSuperview" ref="793806362"/>2448 <bool key="NSEnabled">YES</bool>2449 <object class="NSButtonCell" key="NSCell" id="745428997">2450 <int key="NSCellFlags">67239488</int>2451 <int key="NSCellFlags2">134481920</int>2452 <string key="NSContents">Active</string>2453 <reference key="NSSupport" ref="660344964"/>2454 <reference key="NSControlView" ref="128892418"/>2455 <int key="NSButtonFlags">-1232846593</int>2456 <int key="NSButtonFlags2">173</int>2457 <string key="NSAlternateContents"/>2458 <string key="NSKeyEquivalent"/>2459 <int key="NSPeriodicDelay">400</int>2460 <int key="NSPeriodicInterval">75</int>2461 </object>2462 </object>2463 </object>2464 <string key="NSFrameSize">{457, 23}</string>2465 <string key="NSClassName">FilterBarView</string>2466 <string key="NSExtension">NSView</string>2467 </object>2468 2193 <object class="NSCustomObject" id="456998591"> 2469 2194 <string key="NSClassName">SUUpdater</string> … … 3034 2759 <bool key="NSNoAutoenable">YES</bool> 3035 2760 </object> 3036 <object class="NSMenu" id="242528882">3037 <string key="NSTitle">Menu</string>3038 <object class="NSMutableArray" key="NSMenuItems">3039 <bool key="EncodedWithXMLCoder">YES</bool>3040 <object class="NSMenuItem" id="1006001887">3041 <reference key="NSMenu" ref="242528882"/>3042 <string key="NSTitle">Name</string>3043 <string key="NSKeyEquiv"/>3044 <int key="NSKeyEquivModMask">1048576</int>3045 <int key="NSMnemonicLoc">2147483647</int>3046 <reference key="NSOnImage" ref="322614661"/>3047 <reference key="NSMixedImage" ref="3851078"/>3048 <int key="NSTag">401</int>3049 </object>3050 <object class="NSMenuItem" id="370586641">3051 <reference key="NSMenu" ref="242528882"/>3052 <string key="NSTitle">Tracker</string>3053 <string key="NSKeyEquiv"/>3054 <int key="NSKeyEquivModMask">1048576</int>3055 <int key="NSMnemonicLoc">2147483647</int>3056 <reference key="NSOnImage" ref="322614661"/>3057 <reference key="NSMixedImage" ref="3851078"/>3058 <int key="NSTag">402</int>3059 </object>3060 </object>3061 <string key="NSName"/>3062 </object>3063 <object class="NSMenu" id="1051299321">3064 <string key="NSTitle">StatusMenu</string>3065 <object class="NSMutableArray" key="NSMenuItems">3066 <bool key="EncodedWithXMLCoder">YES</bool>3067 <object class="NSMenuItem" id="942659265">3068 <reference key="NSMenu" ref="1051299321"/>3069 <string key="NSTitle"/>3070 <string key="NSKeyEquiv"/>3071 <int key="NSKeyEquivModMask">1048576</int>3072 <int key="NSMnemonicLoc">2147483647</int>3073 <reference key="NSOnImage" ref="322614661"/>3074 <reference key="NSMixedImage" ref="3851078"/>3075 <int key="NSTag">-999</int>3076 </object>3077 <object class="NSMenuItem" id="61181590">3078 <reference key="NSMenu" ref="1051299321"/>3079 <string key="NSTitle">All Groups</string>3080 <string key="NSKeyEquiv"/>3081 <int key="NSKeyEquivModMask">1048576</int>3082 <int key="NSMnemonicLoc">2147483647</int>3083 <reference key="NSOnImage" ref="322614661"/>3084 <reference key="NSMixedImage" ref="3851078"/>3085 <int key="NSTag">-2</int>3086 </object>3087 <object class="NSMenuItem" id="809007870">3088 <reference key="NSMenu" ref="1051299321"/>3089 <bool key="NSIsDisabled">YES</bool>3090 <bool key="NSIsSeparator">YES</bool>3091 <string key="NSTitle"/>3092 <string key="NSKeyEquiv"/>3093 <int key="NSKeyEquivModMask">1048576</int>3094 <int key="NSMnemonicLoc">2147483647</int>3095 <reference key="NSOnImage" ref="322614661"/>3096 <reference key="NSMixedImage" ref="3851078"/>3097 <int key="NSTag">-999</int>3098 </object>3099 </object>3100 </object>3101 2761 </object> 3102 2762 <object class="IBObjectContainer" key="IBDocument.Objects"> … … 3496 3156 </object> 3497 3157 <object class="IBConnectionRecord"> 3498 <object class="IBOutletConnection" key="connection">3499 <string key="label">fFilterBar</string>3500 <reference key="source" ref="30116300"/>3501 <reference key="destination" ref="793806362"/>3502 </object>3503 <int key="connectionID">1613</int>3504 </object>3505 <object class="IBConnectionRecord">3506 3158 <object class="IBActionConnection" key="connection"> 3507 3159 <string key="label">toggleFilterBar:</string> … … 3657 3309 <object class="IBConnectionRecord"> 3658 3310 <object class="IBOutletConnection" key="connection"> 3659 <string key="label">fPrevFilterItem</string>3660 <reference key="source" ref="30116300"/>3661 <reference key="destination" ref="505888664"/>3662 </object>3663 <int key="connectionID">1800</int>3664 </object>3665 <object class="IBConnectionRecord">3666 <object class="IBOutletConnection" key="connection">3667 3311 <string key="label">fNextFilterItem</string> 3668 3312 <reference key="source" ref="30116300"/> … … 3857 3501 <object class="IBConnectionRecord"> 3858 3502 <object class="IBActionConnection" key="connection"> 3859 <string key="label">setFilterSearchType:</string>3860 <reference key="source" ref="30116300"/>3861 <reference key="destination" ref="1006001887"/>3862 </object>3863 <int key="connectionID">2051</int>3864 </object>3865 <object class="IBConnectionRecord">3866 <object class="IBActionConnection" key="connection">3867 <string key="label">setFilterSearchType:</string>3868 <reference key="source" ref="30116300"/>3869 <reference key="destination" ref="370586641"/>3870 </object>3871 <int key="connectionID">2052</int>3872 </object>3873 <object class="IBConnectionRecord">3874 <object class="IBOutletConnection" key="connection">3875 <string key="label">fSearchFilterField</string>3876 <reference key="source" ref="30116300"/>3877 <reference key="destination" ref="994793607"/>3878 </object>3879 <int key="connectionID">2082</int>3880 </object>3881 <object class="IBConnectionRecord">3882 <object class="IBOutletConnection" key="connection">3883 <string key="label">searchMenuTemplate</string>3884 <reference key="source" ref="994793607"/>3885 <reference key="destination" ref="242528882"/>3886 </object>3887 <int key="connectionID">2121</int>3888 </object>3889 <object class="IBConnectionRecord">3890 <object class="IBActionConnection" key="connection">3891 3503 <string key="label">announceSelectedTorrents:</string> 3892 3504 <reference key="source" ref="30116300"/> … … 3918 3530 </object> 3919 3531 <int key="connectionID">2186</int> 3920 </object>3921 <object class="IBConnectionRecord">3922 <object class="IBOutletConnection" key="connection">3923 <string key="label">fNoFilterButton</string>3924 <reference key="source" ref="30116300"/>3925 <reference key="destination" ref="1072598079"/>3926 </object>3927 <int key="connectionID">2216</int>3928 </object>3929 <object class="IBConnectionRecord">3930 <object class="IBOutletConnection" key="connection">3931 <string key="label">fDownloadFilterButton</string>3932 <reference key="source" ref="30116300"/>3933 <reference key="destination" ref="141200275"/>3934 </object>3935 <int key="connectionID">2217</int>3936 </object>3937 <object class="IBConnectionRecord">3938 <object class="IBOutletConnection" key="connection">3939 <string key="label">fSeedFilterButton</string>3940 <reference key="source" ref="30116300"/>3941 <reference key="destination" ref="716795844"/>3942 </object>3943 <int key="connectionID">2218</int>3944 </object>3945 <object class="IBConnectionRecord">3946 <object class="IBOutletConnection" key="connection">3947 <string key="label">fPauseFilterButton</string>3948 <reference key="source" ref="30116300"/>3949 <reference key="destination" ref="247598189"/>3950 </object>3951 <int key="connectionID">2219</int>3952 </object>3953 <object class="IBConnectionRecord">3954 <object class="IBActionConnection" key="connection">3955 <string key="label">setFilter:</string>3956 <reference key="source" ref="30116300"/>3957 <reference key="destination" ref="1072598079"/>3958 </object>3959 <int key="connectionID">2230</int>3960 </object>3961 <object class="IBConnectionRecord">3962 <object class="IBActionConnection" key="connection">3963 <string key="label">setFilter:</string>3964 <reference key="source" ref="30116300"/>3965 <reference key="destination" ref="141200275"/>3966 </object>3967 <int key="connectionID">2231</int>3968 </object>3969 <object class="IBConnectionRecord">3970 <object class="IBActionConnection" key="connection">3971 <string key="label">setFilter:</string>3972 <reference key="source" ref="30116300"/>3973 <reference key="destination" ref="716795844"/>3974 </object>3975 <int key="connectionID">2232</int>3976 </object>3977 <object class="IBConnectionRecord">3978 <object class="IBActionConnection" key="connection">3979 <string key="label">setFilter:</string>3980 <reference key="source" ref="30116300"/>3981 <reference key="destination" ref="247598189"/>3982 </object>3983 <int key="connectionID">2233</int>3984 3532 </object> 3985 3533 <object class="IBConnectionRecord"> … … 4088 3636 </object> 4089 3637 <object class="IBConnectionRecord"> 4090 <object class="IBOutletConnection" key="connection">4091 <string key="label">fGroupFilterMenu</string>4092 <reference key="source" ref="30116300"/>4093 <reference key="destination" ref="1051299321"/>4094 </object>4095 <int key="connectionID">2949</int>4096 </object>4097 <object class="IBConnectionRecord">4098 <object class="IBOutletConnection" key="connection">4099 <string key="label">menu</string>4100 <reference key="source" ref="522511347"/>4101 <reference key="destination" ref="1051299321"/>4102 </object>4103 <int key="connectionID">2982</int>4104 </object>4105 <object class="IBConnectionRecord">4106 <object class="IBOutletConnection" key="connection">4107 <string key="label">delegate</string>4108 <reference key="source" ref="1051299321"/>4109 <reference key="destination" ref="30116300"/>4110 </object>4111 <int key="connectionID">2983</int>4112 </object>4113 <object class="IBConnectionRecord">4114 <object class="IBActionConnection" key="connection">4115 <string key="label">setGroupFilter:</string>4116 <reference key="source" ref="30116300"/>4117 <reference key="destination" ref="61181590"/>4118 </object>4119 <int key="connectionID">2984</int>4120 </object>4121 <object class="IBConnectionRecord">4122 <object class="IBOutletConnection" key="connection">4123 <string key="label">fGroupsButton</string>4124 <reference key="source" ref="30116300"/>4125 <reference key="destination" ref="522511347"/>4126 </object>4127 <int key="connectionID">2985</int>4128 </object>4129 <object class="IBConnectionRecord">4130 <object class="IBOutletConnection" key="connection">4131 <string key="label">fActiveFilterButton</string>4132 <reference key="source" ref="30116300"/>4133 <reference key="destination" ref="128892418"/>4134 </object>4135 <int key="connectionID">3013</int>4136 </object>4137 <object class="IBConnectionRecord">4138 <object class="IBActionConnection" key="connection">4139 <string key="label">setFilter:</string>4140 <reference key="source" ref="30116300"/>4141 <reference key="destination" ref="128892418"/>4142 </object>4143 <int key="connectionID">3014</int>4144 </object>4145 <object class="IBConnectionRecord">4146 3638 <object class="IBActionConnection" key="connection"> 4147 3639 <string key="label">setRatioGlobalEnabled:</string> … … 4222 3714 </object> 4223 3715 <int key="connectionID">3081</int> 4224 </object>4225 <object class="IBConnectionRecord">4226 <object class="IBActionConnection" key="connection">4227 <string key="label">applyFilter:</string>4228 <reference key="source" ref="30116300"/>4229 <reference key="destination" ref="994793607"/>4230 </object>4231 <int key="connectionID">3083</int>4232 3716 </object> 4233 3717 <object class="IBConnectionRecord"> … … 5772 5256 </object> 5773 5257 <object class="IBObjectRecord"> 5774 <int key="objectID">1603</int>5775 <reference key="object" ref="793806362"/>5776 <object class="NSMutableArray" key="children">5777 <bool key="EncodedWithXMLCoder">YES</bool>5778 <reference ref="994793607"/>5779 <reference ref="1072598079"/>5780 <reference ref="141200275"/>5781 <reference ref="716795844"/>5782 <reference ref="247598189"/>5783 <reference ref="9278263"/>5784 <reference ref="522511347"/>5785 <reference ref="128892418"/>5786 </object>5787 <reference key="parent" ref="0"/>5788 <string key="objectName">FilterBar</string>5789 </object>5790 <object class="IBObjectRecord">5791 <int key="objectID">2071</int>5792 <reference key="object" ref="994793607"/>5793 <object class="NSMutableArray" key="children">5794 <bool key="EncodedWithXMLCoder">YES</bool>5795 <reference ref="186597542"/>5796 </object>5797 <reference key="parent" ref="793806362"/>5798 </object>5799 <object class="IBObjectRecord">5800 <int key="objectID">2208</int>5801 <reference key="object" ref="1072598079"/>5802 <object class="NSMutableArray" key="children">5803 <bool key="EncodedWithXMLCoder">YES</bool>5804 <reference ref="724632485"/>5805 </object>5806 <reference key="parent" ref="793806362"/>5807 </object>5808 <object class="IBObjectRecord">5809 <int key="objectID">2210</int>5810 <reference key="object" ref="141200275"/>5811 <object class="NSMutableArray" key="children">5812 <bool key="EncodedWithXMLCoder">YES</bool>5813 <reference ref="494573874"/>5814 </object>5815 <reference key="parent" ref="793806362"/>5816 </object>5817 <object class="IBObjectRecord">5818 <int key="objectID">2212</int>5819 <reference key="object" ref="716795844"/>5820 <object class="NSMutableArray" key="children">5821 <bool key="EncodedWithXMLCoder">YES</bool>5822 <reference ref="938004552"/>5823 </object>5824 <reference key="parent" ref="793806362"/>5825 </object>5826 <object class="IBObjectRecord">5827 <int key="objectID">2214</int>5828 <reference key="object" ref="247598189"/>5829 <object class="NSMutableArray" key="children">5830 <bool key="EncodedWithXMLCoder">YES</bool>5831 <reference ref="371449771"/>5832 </object>5833 <reference key="parent" ref="793806362"/>5834 </object>5835 <object class="IBObjectRecord">5836 <int key="objectID">2916</int>5837 <reference key="object" ref="9278263"/>5838 <reference key="parent" ref="793806362"/>5839 </object>5840 <object class="IBObjectRecord">5841 <int key="objectID">2976</int>5842 <reference key="object" ref="522511347"/>5843 <object class="NSMutableArray" key="children">5844 <bool key="EncodedWithXMLCoder">YES</bool>5845 <reference ref="189668006"/>5846 </object>5847 <reference key="parent" ref="793806362"/>5848 </object>5849 <object class="IBObjectRecord">5850 <int key="objectID">3011</int>5851 <reference key="object" ref="128892418"/>5852 <object class="NSMutableArray" key="children">5853 <bool key="EncodedWithXMLCoder">YES</bool>5854 <reference ref="745428997"/>5855 </object>5856 <reference key="parent" ref="793806362"/>5857 </object>5858 <object class="IBObjectRecord">5859 5258 <int key="objectID">1812</int> 5860 5259 <reference key="object" ref="456998591"/> … … 6001 5400 </object> 6002 5401 <object class="IBObjectRecord"> 6003 <int key="objectID">2043</int>6004 <reference key="object" ref="242528882"/>6005 <object class="NSMutableArray" key="children">6006 <bool key="EncodedWithXMLCoder">YES</bool>6007 <reference ref="370586641"/>6008 <reference ref="1006001887"/>6009 </object>6010 <reference key="parent" ref="0"/>6011 <string key="objectName">SearchFilterMenu</string>6012 </object>6013 <object class="IBObjectRecord">6014 <int key="objectID">2044</int>6015 <reference key="object" ref="370586641"/>6016 <reference key="parent" ref="242528882"/>6017 </object>6018 <object class="IBObjectRecord">6019 <int key="objectID">2045</int>6020 <reference key="object" ref="1006001887"/>6021 <reference key="parent" ref="242528882"/>6022 </object>6023 <object class="IBObjectRecord">6024 <int key="objectID">2942</int>6025 <reference key="object" ref="1051299321"/>6026 <object class="NSMutableArray" key="children">6027 <bool key="EncodedWithXMLCoder">YES</bool>6028 <reference ref="61181590"/>6029 <reference ref="942659265"/>6030 <reference ref="809007870"/>6031 </object>6032 <reference key="parent" ref="0"/>6033 <string key="objectName">GroupFilterMenu</string>6034 </object>6035 <object class="IBObjectRecord">6036 <int key="objectID">2946</int>6037 <reference key="object" ref="61181590"/>6038 <reference key="parent" ref="1051299321"/>6039 </object>6040 <object class="IBObjectRecord">6041 <int key="objectID">2947</int>6042 <reference key="object" ref="942659265"/>6043 <reference key="parent" ref="1051299321"/>6044 </object>6045 <object class="IBObjectRecord">6046 <int key="objectID">2948</int>6047 <reference key="object" ref="809007870"/>6048 <reference key="parent" ref="1051299321"/>6049 </object>6050 <object class="IBObjectRecord">6051 5402 <int key="objectID">3047</int> 6052 5403 <reference key="object" ref="1063285887"/> … … 6068 5419 </object> 6069 5420 <object class="IBObjectRecord"> 6070 <int key="objectID">3057</int>6071 <reference key="object" ref="186597542"/>6072 <reference key="parent" ref="994793607"/>6073 </object>6074 <object class="IBObjectRecord">6075 <int key="objectID">3058</int>6076 <reference key="object" ref="724632485"/>6077 <reference key="parent" ref="1072598079"/>6078 </object>6079 <object class="IBObjectRecord">6080 <int key="objectID">3059</int>6081 <reference key="object" ref="494573874"/>6082 <reference key="parent" ref="141200275"/>6083 </object>6084 <object class="IBObjectRecord">6085 <int key="objectID">3060</int>6086 <reference key="object" ref="938004552"/>6087 <reference key="parent" ref="716795844"/>6088 </object>6089 <object class="IBObjectRecord">6090 <int key="objectID">3061</int>6091 <reference key="object" ref="371449771"/>6092 <reference key="parent" ref="247598189"/>6093 </object>6094 <object class="IBObjectRecord">6095 <int key="objectID">3062</int>6096 <reference key="object" ref="189668006"/>6097 <object class="NSMutableArray" key="children">6098 <bool key="EncodedWithXMLCoder">YES</bool>6099 <reference ref="135534639"/>6100 </object>6101 <reference key="parent" ref="522511347"/>6102 </object>6103 <object class="IBObjectRecord">6104 <int key="objectID">3063</int>6105 <reference key="object" ref="745428997"/>6106 <reference key="parent" ref="128892418"/>6107 </object>6108 <object class="IBObjectRecord">6109 5421 <int key="objectID">2683</int> 6110 5422 <reference key="object" ref="97165992"/> … … 6131 5443 <reference key="object" ref="420710921"/> 6132 5444 <reference key="parent" ref="97165992"/> 6133 </object>6134 <object class="IBObjectRecord">6135 <int key="objectID">2978</int>6136 <reference key="object" ref="135534639"/>6137 <object class="NSMutableArray" key="children">6138 <bool key="EncodedWithXMLCoder">YES</bool>6139 <reference ref="689628169"/>6140 <reference ref="372587306"/>6141 <reference ref="658740949"/>6142 </object>6143 <reference key="parent" ref="189668006"/>6144 </object>6145 <object class="IBObjectRecord">6146 <int key="objectID">2981</int>6147 <reference key="object" ref="689628169"/>6148 <reference key="parent" ref="135534639"/>6149 </object>6150 <object class="IBObjectRecord">6151 <int key="objectID">2980</int>6152 <reference key="object" ref="372587306"/>6153 <reference key="parent" ref="135534639"/>6154 </object>6155 <object class="IBObjectRecord">6156 <int key="objectID">2979</int>6157 <reference key="object" ref="658740949"/>6158 <reference key="parent" ref="135534639"/>6159 5445 </object> 6160 5446 <object class="IBObjectRecord"> … … 6604 5890 <string>160.IBPluginDependency</string> 6605 5891 <string>160.ImportedFromIB2</string> 6606 <string>1603.IBEditorWindowLastContentRect</string>6607 <string>1603.IBPluginDependency</string>6608 <string>1603.ImportedFromIB2</string>6609 <string>1603.editorWindowContentRectSynchronizationRect</string>6610 5892 <string>1620.IBPluginDependency</string> 6611 5893 <string>1620.ImportedFromIB2</string> … … 6776 6058 <string>2031.IBPluginDependency</string> 6777 6059 <string>2031.ImportedFromIB2</string> 6778 <string>2043.IBEditorWindowLastContentRect</string>6779 <string>2043.IBPluginDependency</string>6780 <string>2043.ImportedFromIB2</string>6781 <string>2044.IBPluginDependency</string>6782 <string>2044.ImportedFromIB2</string>6783 <string>2045.IBPluginDependency</string>6784 <string>2045.ImportedFromIB2</string>6785 6060 <string>206.ImportedFromIB2</string> 6786 <string>2071.IBPluginDependency</string>6787 <string>2071.ImportedFromIB2</string>6788 6061 <string>21.IBEditorWindowLastContentRect</string> 6789 6062 <string>21.IBPluginDependency</string> … … 6801 6074 <string>2185.IBPluginDependency</string> 6802 6075 <string>2185.ImportedFromIB2</string> 6803 <string>2208.CustomClassName</string>6804 <string>2208.IBPluginDependency</string>6805 <string>2208.ImportedFromIB2</string>6806 <string>2210.CustomClassName</string>6807 <string>2210.IBPluginDependency</string>6808 <string>2210.ImportedFromIB2</string>6809 <string>2212.CustomClassName</string>6810 <string>2212.IBPluginDependency</string>6811 <string>2212.ImportedFromIB2</string>6812 <string>2214.CustomClassName</string>6813 <string>2214.IBPluginDependency</string>6814 <string>2214.ImportedFromIB2</string>6815 6076 <string>2279.IBPluginDependency</string> 6816 6077 <string>2279.ImportedFromIB2</string> … … 6860 6121 <string>29.ImportedFromIB2</string> 6861 6122 <string>29.editorWindowContentRectSynchronizationRect</string> 6862 <string>2916.IBPluginDependency</string>6863 <string>2916.ImportedFromIB2</string>6864 <string>2942.IBEditorWindowLastContentRect</string>6865 <string>2942.IBPluginDependency</string>6866 <string>2942.ImportedFromIB2</string>6867 <string>2946.IBPluginDependency</string>6868 <string>2946.ImportedFromIB2</string>6869 <string>2947.IBPluginDependency</string>6870 <string>2947.ImportedFromIB2</string>6871 <string>2948.IBPluginDependency</string>6872 <string>2948.ImportedFromIB2</string>6873 <string>2976.IBPluginDependency</string>6874 <string>2976.ImportedFromIB2</string>6875 <string>2978.IBPluginDependency</string>6876 <string>2978.ImportedFromIB2</string>6877 <string>2979.IBPluginDependency</string>6878 <string>2979.ImportedFromIB2</string>6879 <string>2980.IBPluginDependency</string>6880 <string>2980.ImportedFromIB2</string>6881 <string>2981.IBPluginDependency</string>6882 <string>2981.ImportedFromIB2</string>6883 6123 <string>301.IBPluginDependency</string> 6884 6124 <string>301.ImportedFromIB2</string> 6885 <string>3011.CustomClassName</string>6886 <string>3011.IBPluginDependency</string>6887 <string>3011.ImportedFromIB2</string>6888 6125 <string>302.IBEditorWindowLastContentRect</string> 6889 6126 <string>302.IBPluginDependency</string> … … 6893 6130 <string>3048.IBPluginDependency</string> 6894 6131 <string>3049.IBPluginDependency</string> 6895 <string>3057.IBPluginDependency</string>6896 <string>3058.IBPluginDependency</string>6897 <string>3059.IBPluginDependency</string>6898 <string>3060.IBPluginDependency</string>6899 <string>3061.IBPluginDependency</string>6900 <string>3062.IBPluginDependency</string>6901 <string>3063.IBPluginDependency</string>6902 6132 <string>3077.IBPluginDependency</string> 6903 6133 <string>3078.IBPluginDependency</string> … … 7165 6395 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7166 6396 <integer value="1"/> 7167 <string>{{382, 705}, {457, 23}}</string>7168 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7169 <integer value="1"/>7170 <string>{{0, 972}, {457, 23}}</string>7171 6397 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7172 6398 <integer value="1"/> … … 7199 6425 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7200 6426 <integer value="1"/> 7201 <string>{{ 719, 638}, {249, 243}}</string>6427 <string>{{550, 498}, {249, 243}}</string> 7202 6428 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7203 6429 <integer value="1"/> … … 7337 6563 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7338 6564 <integer value="1"/> 7339 <string>{{0, 952}, {118, 43}}</string>7340 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7341 <integer value="1"/>7342 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7343 <integer value="1"/>7344 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7345 <integer value="1"/>7346 <integer value="1"/>7347 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7348 6565 <integer value="1"/> 7349 6566 <string>{{71, 712}, {515, 248}}</string> … … 7362 6579 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7363 6580 <integer value="1"/> 7364 <string>FilterButton</string>7365 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7366 <integer value="1"/>7367 <string>FilterButton</string>7368 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7369 <integer value="1"/>7370 <string>FilterButton</string>7371 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7372 <integer value="1"/>7373 <string>FilterButton</string>7374 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7375 <integer value="1"/>7376 6581 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7377 6582 <integer value="1"/> … … 7425 6630 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7426 6631 <integer value="1"/> 7427 <string>{{0, 756}, {141, 53}}</string>7428 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7429 <integer value="1"/>7430 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7431 <integer value="1"/>7432 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7433 <integer value="1"/>7434 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7435 <integer value="1"/>7436 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7437 <integer value="1"/>7438 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7439 <integer value="1"/>7440 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7441 <integer value="1"/>7442 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7443 <integer value="1"/>7444 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7445 <integer value="1"/>7446 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7447 <integer value="1"/>7448 <string>FilterButton</string>7449 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7450 <integer value="1"/>7451 6632 <string>{{587, 638}, {233, 243}}</string> 7452 6633 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7453 6634 <integer value="1"/> 7454 6635 <string>{{396, 658}, {236, 243}}</string> 7455 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7456 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7457 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7458 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7459 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7460 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7461 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>7462 6636 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7463 6637 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> … … 7616 6790 <string>allToolbarClicked:</string> 7617 6791 <string>announceSelectedTorrents:</string> 7618 <string>applyFilter:</string>7619 6792 <string>clearCompleted:</string> 7620 6793 <string>copyMagnetLinks:</string> … … 7636 6809 <string>revealFile:</string> 7637 6810 <string>selectedToolbarClicked:</string> 7638 <string>setFilter:</string>7639 <string>setFilterSearchType:</string>7640 6811 <string>setGroup:</string> 7641 6812 <string>setGroupFilter:</string> … … 7720 6891 <string>id</string> 7721 6892 <string>id</string> 7722 <string>id</string>7723 <string>id</string>7724 <string>id</string>7725 6893 </object> 7726 6894 </object> … … 7731 6899 <string>allToolbarClicked:</string> 7732 6900 <string>announceSelectedTorrents:</string> 7733 <string>applyFilter:</string>7734 6901 <string>clearCompleted:</string> 7735 6902 <string>copyMagnetLinks:</string> … … 7751 6918 <string>revealFile:</string> 7752 6919 <string>selectedToolbarClicked:</string> 7753 <string>setFilter:</string>7754 <string>setFilterSearchType:</string>7755 6920 <string>setGroup:</string> 7756 6921 <string>setGroupFilter:</string> … … 7794 6959 </object> 7795 6960 <object class="IBActionInfo"> 7796 <string key="name">applyFilter:</string>7797 <string key="candidateClassName">id</string>7798 </object>7799 <object class="IBActionInfo">7800 6961 <string key="name">clearCompleted:</string> 7801 6962 <string key="candidateClassName">id</string> … … 7871 7032 <object class="IBActionInfo"> 7872 7033 <string key="name">selectedToolbarClicked:</string> 7873 <string key="candidateClassName">id</string>7874 </object>7875 <object class="IBActionInfo">7876 <string key="name">setFilter:</string>7877 <string key="candidateClassName">id</string>7878 </object>7879 <object class="IBActionInfo">7880 <string key="name">setFilterSearchType:</string>7881 7034 <string key="candidateClassName">id</string> 7882 7035 </object> … … 8004 7157 <bool key="EncodedWithXMLCoder">YES</bool> 8005 7158 <string>fActionButton</string> 8006 <string>fActiveFilterButton</string>8007 7159 <string>fCheckRatioItem</string> 8008 7160 <string>fDockMenu</string> 8009 <string>fDownloadFilterButton</string>8010 7161 <string>fDownloadLimitItem</string> 8011 7162 <string>fDownloadMenu</string> 8012 7163 <string>fDownloadNoLimitItem</string> 8013 <string>fFilterBar</string>8014 <string>fGroupFilterMenu</string>8015 <string>fGroupsButton</string>8016 7164 <string>fGroupsSetContextMenu</string> 8017 7165 <string>fGroupsSetMenu</string> … … 8019 7167 <string>fNextInfoTabItem</string> 8020 7168 <string>fNoCheckRatioItem</string> 8021 <string>fNoFilterButton</string>8022 7169 <string>fOpenIgnoreDownloadFolder</string> 8023 <string>fPauseFilterButton</string>8024 <string>fPrevFilterItem</string>8025 7170 <string>fPrevInfoTabItem</string> 8026 7171 <string>fPreviewPanel</string> 8027 7172 <string>fRatioStopMenu</string> 8028 <string>fSearchFilterField</string>8029 <string>fSeedFilterButton</string>8030 7173 <string>fSpeedLimitButton</string> 8031 <string>fStatusBar</string>8032 7174 <string>fTableView</string> 8033 7175 <string>fTotalTorrentsField</string> … … 8040 7182 <bool key="EncodedWithXMLCoder">YES</bool> 8041 7183 <string>NSButton</string> 8042 <string>FilterButton</string>8043 <string>NSMenuItem</string>8044 <string>NSMenu</string>8045 <string>FilterButton</string>8046 7184 <string>NSMenuItem</string> 8047 7185 <string>NSMenu</string> 8048 7186 <string>NSMenuItem</string> 8049 <string>FilterBarView</string>8050 7187 <string>NSMenu</string> 8051 <string>NS PopUpButton</string>7188 <string>NSMenuItem</string> 8052 7189 <string>NSMenu</string> 8053 7190 <string>NSMenu</string> … … 8055 7192 <string>NSMenuItem</string> 8056 7193 <string>NSMenuItem</string> 8057 <string>FilterButton</string>8058 <string>NSMenuItem</string>8059 <string>FilterButton</string>8060 7194 <string>NSMenuItem</string> 8061 7195 <string>NSMenuItem</string> 8062 7196 <string>id</string> 8063 7197 <string>NSMenu</string> 8064 <string>NSSearchField</string>8065 <string>FilterButton</string>8066 7198 <string>NSButton</string> 8067 <string>StatusBarController</string>8068 7199 <string>TorrentTableView</string> 8069 7200 <string>NSTextField</string> … … 8079 7210 <bool key="EncodedWithXMLCoder">YES</bool> 8080 7211 <string>fActionButton</string> 8081 <string>fActiveFilterButton</string>8082 7212 <string>fCheckRatioItem</string> 8083 7213 <string>fDockMenu</string> 8084 <string>fDownloadFilterButton</string>8085 7214 <string>fDownloadLimitItem</string> 8086 7215 <string>fDownloadMenu</string> 8087 7216 <string>fDownloadNoLimitItem</string> 8088 <string>fFilterBar</string>8089 <string>fGroupFilterMenu</string>8090 <string>fGroupsButton</string>8091 7217 <string>fGroupsSetContextMenu</string> 8092 7218 <string>fGroupsSetMenu</string> … … 8094 7220 <string>fNextInfoTabItem</string> 8095 7221 <string>fNoCheckRatioItem</string> 8096 <string>fNoFilterButton</string>8097 7222 <string>fOpenIgnoreDownloadFolder</string> 8098 <string>fPauseFilterButton</string>8099 <string>fPrevFilterItem</string>8100 7223 <string>fPrevInfoTabItem</string> 8101 7224 <string>fPreviewPanel</string> 8102 7225 <string>fRatioStopMenu</string> 8103 <string>fSearchFilterField</string>8104 <string>fSeedFilterButton</string>8105 7226 <string>fSpeedLimitButton</string> 8106 <string>fStatusBar</string>8107 7227 <string>fTableView</string> 8108 7228 <string>fTotalTorrentsField</string> … … 8119 7239 </object> 8120 7240 <object class="IBToOneOutletInfo"> 8121 <string key="name">fActiveFilterButton</string>8122 <string key="candidateClassName">FilterButton</string>8123 </object>8124 <object class="IBToOneOutletInfo">8125 7241 <string key="name">fCheckRatioItem</string> 8126 7242 <string key="candidateClassName">NSMenuItem</string> … … 8131 7247 </object> 8132 7248 <object class="IBToOneOutletInfo"> 8133 <string key="name">fDownloadFilterButton</string>8134 <string key="candidateClassName">FilterButton</string>8135 </object>8136 <object class="IBToOneOutletInfo">8137 7249 <string key="name">fDownloadLimitItem</string> 8138 7250 <string key="candidateClassName">NSMenuItem</string> … … 8147 7259 </object> 8148 7260 <object class="IBToOneOutletInfo"> 8149 <string key="name">fFilterBar</string>8150 <string key="candidateClassName">FilterBarView</string>8151 </object>8152 <object class="IBToOneOutletInfo">8153 <string key="name">fGroupFilterMenu</string>8154 <string key="candidateClassName">NSMenu</string>8155 </object>8156 <object class="IBToOneOutletInfo">8157 <string key="name">fGroupsButton</string>8158 <string key="candidateClassName">NSPopUpButton</string>8159 </object>8160 <object class="IBToOneOutletInfo">8161 7261 <string key="name">fGroupsSetContextMenu</string> 8162 7262 <string key="candidateClassName">NSMenu</string> … … 8179 7279 </object> 8180 7280 <object class="IBToOneOutletInfo"> 8181 <string key="name">fNoFilterButton</string>8182 <string key="candidateClassName">FilterButton</string>8183 </object>8184 <object class="IBToOneOutletInfo">8185 7281 <string key="name">fOpenIgnoreDownloadFolder</string> 8186 <string key="candidateClassName">NSMenuItem</string>8187 </object>8188 <object class="IBToOneOutletInfo">8189 <string key="name">fPauseFilterButton</string>8190 <string key="candidateClassName">FilterButton</string>8191 </object>8192 <object class="IBToOneOutletInfo">8193 <string key="name">fPrevFilterItem</string>8194 7282 <string key="candidateClassName">NSMenuItem</string> 8195 7283 </object> … … 8207 7295 </object> 8208 7296 <object class="IBToOneOutletInfo"> 8209 <string key="name">fSearchFilterField</string>8210 <string key="candidateClassName">NSSearchField</string>8211 </object>8212 <object class="IBToOneOutletInfo">8213 <string key="name">fSeedFilterButton</string>8214 <string key="candidateClassName">FilterButton</string>8215 </object>8216 <object class="IBToOneOutletInfo">8217 7297 <string key="name">fSpeedLimitButton</string> 8218 7298 <string key="candidateClassName">NSButton</string> 8219 </object>8220 <object class="IBToOneOutletInfo">8221 <string key="name">fStatusBar</string>8222 <string key="candidateClassName">StatusBarController</string>8223 7299 </object> 8224 7300 <object class="IBToOneOutletInfo"> … … 8523 7599 </object> 8524 7600 <object class="IBPartialClassDescription"> 8525 <string key="className">FilterBarView</string>8526 <string key="superclassName">NSView</string>8527 <object class="IBClassDescriptionSource" key="sourceIdentifier">8528 <string key="majorKey">IBProjectSource</string>8529 <string key="minorKey">macosx/FilterBarView.h</string>8530 </object>8531 </object>8532 <object class="IBPartialClassDescription">8533 <string key="className">FilterButton</string>8534 <string key="superclassName">NSButton</string>8535 <object class="IBClassDescriptionSource" key="sourceIdentifier">8536 <string key="majorKey">IBProjectSource</string>8537 <string key="minorKey">macosx/FilterButton.h</string>8538 </object>8539 </object>8540 <object class="IBPartialClassDescription">8541 <string key="className">FilterButton</string>8542 <string key="superclassName">NSButton</string>8543 <object class="IBClassDescriptionSource" key="sourceIdentifier">8544 <string key="majorKey">IBUserSource</string>8545 <string key="minorKey"/>8546 </object>8547 </object>8548 <object class="IBPartialClassDescription">8549 7601 <string key="className">FirstResponder</string> 8550 7602 <string key="superclassName">NSObject</string> … … 8657 7709 <string key="majorKey">IBUserSource</string> 8658 7710 <string key="minorKey"/> 8659 </object>8660 </object>8661 <object class="IBPartialClassDescription">8662 <string key="className">StatusBarController</string>8663 <string key="superclassName">NSViewController</string>8664 <object class="NSMutableDictionary" key="actions">8665 <string key="NS.key.0">setStatusLabel:</string>8666 <string key="NS.object.0">id</string>8667 </object>8668 <object class="NSMutableDictionary" key="actionInfosByName">8669 <string key="NS.key.0">setStatusLabel:</string>8670 <object class="IBActionInfo" key="NS.object.0">8671 <string key="name">setStatusLabel:</string>8672 <string key="candidateClassName">id</string>8673 </object>8674 </object>8675 <object class="NSMutableDictionary" key="outlets">8676 <bool key="EncodedWithXMLCoder">YES</bool>8677 <object class="NSArray" key="dict.sortedKeys">8678 <bool key="EncodedWithXMLCoder">YES</bool>8679 <string>fStatusButton</string>8680 <string>fTotalDLField</string>8681 <string>fTotalDLImageView</string>8682 <string>fTotalULField</string>8683 </object>8684 <object class="NSMutableArray" key="dict.values">8685 <bool key="EncodedWithXMLCoder">YES</bool>8686 <string>NSButton</string>8687 <string>NSTextField</string>8688 <string>NSImageView</string>8689 <string>NSTextField</string>8690 </object>8691 </object>8692 <object class="NSMutableDictionary" key="toOneOutletInfosByName">8693 <bool key="EncodedWithXMLCoder">YES</bool>8694 <object class="NSArray" key="dict.sortedKeys">8695 <bool key="EncodedWithXMLCoder">YES</bool>8696 <string>fStatusButton</string>8697 <string>fTotalDLField</string>8698 <string>fTotalDLImageView</string>8699 <string>fTotalULField</string>8700 </object>8701 <object class="NSMutableArray" key="dict.values">8702 <bool key="EncodedWithXMLCoder">YES</bool>8703 <object class="IBToOneOutletInfo">8704 <string key="name">fStatusButton</string>8705 <string key="candidateClassName">NSButton</string>8706 </object>8707 <object class="IBToOneOutletInfo">8708 <string key="name">fTotalDLField</string>8709 <string key="candidateClassName">NSTextField</string>8710 </object>8711 <object class="IBToOneOutletInfo">8712 <string key="name">fTotalDLImageView</string>8713 <string key="candidateClassName">NSImageView</string>8714 </object>8715 <object class="IBToOneOutletInfo">8716 <string key="name">fTotalULField</string>8717 <string key="candidateClassName">NSTextField</string>8718 </object>8719 </object>8720 </object>8721 <object class="IBClassDescriptionSource" key="sourceIdentifier">8722 <string key="majorKey">IBProjectSource</string>8723 <string key="minorKey">macosx/StatusBarController.h</string>8724 7711 </object> 8725 7712 </object> … … 8982 7969 </object> 8983 7970 <object class="IBPartialClassDescription"> 8984 <string key="className">NSBox</string>8985 <string key="superclassName">NSView</string>8986 <object class="IBClassDescriptionSource" key="sourceIdentifier">8987 <string key="majorKey">IBFrameworkSource</string>8988 <string key="minorKey">AppKit.framework/Headers/NSBox.h</string>8989 </object>8990 </object>8991 <object class="IBPartialClassDescription">8992 7971 <string key="className">NSBrowser</string> 8993 7972 <string key="superclassName">NSControl</string> … … 9544 8523 </object> 9545 8524 <object class="IBPartialClassDescription"> 9546 <string key="className">NSSearchField</string>9547 <string key="superclassName">NSTextField</string>9548 <object class="IBClassDescriptionSource" key="sourceIdentifier">9549 <string key="majorKey">IBFrameworkSource</string>9550 <string key="minorKey">AppKit.framework/Headers/NSSearchField.h</string>9551 </object>9552 </object>9553 <object class="IBPartialClassDescription">9554 <string key="className">NSSearchFieldCell</string>9555 <string key="superclassName">NSTextFieldCell</string>9556 <object class="IBClassDescriptionSource" key="sourceIdentifier">9557 <string key="majorKey">IBFrameworkSource</string>9558 <string key="minorKey">AppKit.framework/Headers/NSSearchFieldCell.h</string>9559 </object>9560 </object>9561 <object class="IBPartialClassDescription">9562 8525 <string key="className">NSSegmentedControl</string> 9563 8526 <string key="superclassName">NSControl</string> … … 9642 8605 <string key="superclassName">NSResponder</string> 9643 8606 <reference key="sourceIdentifier" ref="543656968"/> 9644 </object>9645 <object class="IBPartialClassDescription">9646 <string key="className">NSViewController</string>9647 <string key="superclassName">NSResponder</string>9648 <object class="NSMutableDictionary" key="outlets">9649 <string key="NS.key.0">view</string>9650 <string key="NS.object.0">NSView</string>9651 </object>9652 <object class="NSMutableDictionary" key="toOneOutletInfosByName">9653 <string key="NS.key.0">view</string>9654 <object class="IBToOneOutletInfo" key="NS.object.0">9655 <string key="name">view</string>9656 <string key="candidateClassName">NSView</string>9657 </object>9658 </object>9659 <object class="IBClassDescriptionSource" key="sourceIdentifier">9660 <string key="majorKey">IBFrameworkSource</string>9661 <string key="minorKey">AppKit.framework/Headers/NSViewController.h</string>9662 </object>9663 8607 </object> 9664 8608 <object class="IBPartialClassDescription">
Note: See TracChangeset
for help on using the changeset viewer.