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

slightly simplify filter code

This commit is contained in:
Mitchell Livingston 2011-02-21 04:18:58 +00:00
parent 5ecebd1bea
commit 541effd743
2 changed files with 15 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
macosx/Controller.m
View File

@ -1987,9 +1987,10 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
const NSInteger groupFilterValue = [fDefaults integerForKey: @"FilterGroup"]; const NSInteger groupFilterValue = [fDefaults integerForKey: @"FilterGroup"];
const BOOL filterGroup = groupFilterValue != GROUP_FILTER_ALL_TAG; const BOOL filterGroup = groupFilterValue != GROUP_FILTER_ALL_TAG;
NSString * searchString = fFilterBar ? [fFilterBar searchString] : @""; NSString * searchString = [fFilterBar searchString];
const BOOL filterText = ![searchString isEqualToString: @""], if (searchString && [searchString isEqualToString: @""])
filterTracker = filterText && [[fDefaults stringForKey: @"FilterSearchType"] isEqualToString: FILTER_TYPE_TRACKER]; searchString = nil;
const BOOL filterTracker = searchString && [[fDefaults stringForKey: @"FilterSearchType"] isEqualToString: FILTER_TYPE_TRACKER];
NSMutableArray * allTorrents = [NSMutableArray arrayWithCapacity: [fTorrents count]]; NSMutableArray * allTorrents = [NSMutableArray arrayWithCapacity: [fTorrents count]];
@ -2001,24 +2002,24 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
{ {
const BOOL isActive = ![torrent isStalled]; const BOOL isActive = ![torrent isStalled];
if (isActive) if (isActive)
active++; ++active;
if ([torrent isSeeding]) if ([torrent isSeeding])
{ {
seeding++; ++seeding;
if (filterStatus && !((filterActive && isActive) || filterSeed)) if (filterStatus && !((filterActive && isActive) || filterSeed))
continue; continue;
} }
else else
{ {
downloading++; ++downloading;
if (filterStatus && !((filterActive && isActive) || filterDownload)) if (filterStatus && !((filterActive && isActive) || filterDownload))
continue; continue;
} }
} }
else else
{ {
paused++; ++paused;
if (filterStatus && !filterPause) if (filterStatus && !filterPause)
continue; continue;
} }
@ -2029,7 +2030,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
continue; continue;
//check text field //check text field
if (filterText) if (searchString)
{ {
if (filterTracker) if (filterTracker)
{ {
@ -2092,7 +2093,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
group = nil; group = nil;
//try to see if the group already exists //try to see if the group already exists
for (; currentOldGroupIndex < [oldTorrentGroups count]; currentOldGroupIndex++) for (; currentOldGroupIndex < [oldTorrentGroups count]; ++currentOldGroupIndex)
{ {
TorrentGroup * currentGroup = [oldTorrentGroups objectAtIndex: currentOldGroupIndex]; TorrentGroup * currentGroup = [oldTorrentGroups objectAtIndex: currentOldGroupIndex];
const NSInteger currentGroupValue = [currentGroup groupIndex]; const NSInteger currentGroupValue = [currentGroup groupIndex];
@ -2101,7 +2102,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
group = currentGroup; group = currentGroup;
[[currentGroup torrents] removeAllObjects]; [[currentGroup torrents] removeAllObjects];
currentOldGroupIndex++; ++currentOldGroupIndex;
} }
if (currentGroupValue >= groupValue) if (currentGroupValue >= groupValue)
@ -2138,7 +2139,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[fTableView selectValues: selectedValues]; [fTableView selectValues: selectedValues];
[self resetInfo]; //if group is already selected, but the torrents in it change [self resetInfo]; //if group is already selected, but the torrents in it change
[self setBottomCountText: groupRows || filterStatus || filterGroup || filterText]; [self setBottomCountText: groupRows || filterStatus || filterGroup || searchString];
[self setWindowSizeToFit]; [self setWindowSizeToFit];
} }

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

@ -12,9 +12,8 @@
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="589"/> <integer value="1400"/>
<integer value="1684"/> <integer value="2"/>
<integer value="21"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
@ -105,28 +104,6 @@
<object class="NSMutableArray" key="NSMenuItems"> <object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="824838798"/> <reference ref="824838798"/>
<object class="NSMenuItem" id="420710921">
<reference key="NSMenu" ref="97165992"/>
<string key="NSTitle">Item2</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="322614661"/>
<reference key="NSMixedImage" ref="3851078"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="1063285887"/>
</object>
<object class="NSMenuItem" id="1041175657">
<reference key="NSMenu" ref="97165992"/>
<string key="NSTitle">Item3</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="322614661"/>
<reference key="NSMixedImage" ref="3851078"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="1063285887"/>
</object>
</object> </object>
</object> </object>
<bool key="NSPullDown">YES</bool> <bool key="NSPullDown">YES</bool>
@ -5422,27 +5399,15 @@ AAAAAAAAAAAAAAAAA</bytes>
<reference key="object" ref="97165992"/> <reference key="object" ref="97165992"/>
<object class="NSMutableArray" key="children"> <object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1041175657"/>
<reference ref="824838798"/> <reference ref="824838798"/>
<reference ref="420710921"/>
</object> </object>
<reference key="parent" ref="1063285887"/> <reference key="parent" ref="1063285887"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">2686</int>
<reference key="object" ref="1041175657"/>
<reference key="parent" ref="97165992"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">2685</int> <int key="objectID">2685</int>
<reference key="object" ref="824838798"/> <reference key="object" ref="824838798"/>
<reference key="parent" ref="97165992"/> <reference key="parent" ref="97165992"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">2684</int>
<reference key="object" ref="420710921"/>
<reference key="parent" ref="97165992"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">3077</int> <int key="objectID">3077</int>
<reference key="object" ref="1000086369"/> <reference key="object" ref="1000086369"/>
@ -6087,12 +6052,8 @@ AAAAAAAAAAAAAAAAA</bytes>
<string>2683.IBEditorWindowLastContentRect</string> <string>2683.IBEditorWindowLastContentRect</string>
<string>2683.IBPluginDependency</string> <string>2683.IBPluginDependency</string>
<string>2683.ImportedFromIB2</string> <string>2683.ImportedFromIB2</string>
<string>2684.IBPluginDependency</string>
<string>2684.ImportedFromIB2</string>
<string>2685.IBPluginDependency</string> <string>2685.IBPluginDependency</string>
<string>2685.ImportedFromIB2</string> <string>2685.ImportedFromIB2</string>
<string>2686.IBPluginDependency</string>
<string>2686.ImportedFromIB2</string>
<string>2690.IBPluginDependency</string> <string>2690.IBPluginDependency</string>
<string>2690.ImportedFromIB2</string> <string>2690.ImportedFromIB2</string>
<string>2700.IBPluginDependency</string> <string>2700.IBPluginDependency</string>
@ -6591,11 +6552,7 @@ AAAAAAAAAAAAAAAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABAwAAAwZgAAA</bytes> <bytes key="NSTransformStruct">P4AAAL+AAABAwAAAwZgAAA</bytes>
</object> </object>
<integer value="1"/> <integer value="1"/>
<string>{{346, 449}, {108, 63}}</string> <string>{{66, 710}, {105, 23}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/> <integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -6809,7 +6766,6 @@ AAAAAAAAAAAAAAAAA</bytes>
<string>revealFile:</string> <string>revealFile:</string>
<string>selectedToolbarClicked:</string> <string>selectedToolbarClicked:</string>
<string>setGroup:</string> <string>setGroup:</string>
<string>setGroupFilter:</string>
<string>setInfoTab:</string> <string>setInfoTab:</string>
<string>setLimitGlobalEnabled:</string> <string>setLimitGlobalEnabled:</string>
<string>setQuickLimitGlobal:</string> <string>setQuickLimitGlobal:</string>
@ -6889,7 +6845,6 @@ AAAAAAAAAAAAAAAAA</bytes>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="actionInfosByName"> <object class="NSMutableDictionary" key="actionInfosByName">
@ -6918,7 +6873,6 @@ AAAAAAAAAAAAAAAAA</bytes>
<string>revealFile:</string> <string>revealFile:</string>
<string>selectedToolbarClicked:</string> <string>selectedToolbarClicked:</string>
<string>setGroup:</string> <string>setGroup:</string>
<string>setGroupFilter:</string>
<string>setInfoTab:</string> <string>setInfoTab:</string>
<string>setLimitGlobalEnabled:</string> <string>setLimitGlobalEnabled:</string>
<string>setQuickLimitGlobal:</string> <string>setQuickLimitGlobal:</string>
@ -7037,10 +6991,6 @@ AAAAAAAAAAAAAAAAA</bytes>
<string key="name">setGroup:</string> <string key="name">setGroup:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBActionInfo">
<string key="name">setGroupFilter:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo"> <object class="IBActionInfo">
<string key="name">setInfoTab:</string> <string key="name">setInfoTab:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>