From 541effd7433929012fa80a8094109421b2b81c02 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Mon, 21 Feb 2011 04:18:58 +0000
Subject: [PATCH] slightly simplify filter code

---
 macosx/Controller.m          | 23 ++++++++-------
 macosx/en.lproj/MainMenu.xib | 56 ++----------------------------------
 2 files changed, 15 insertions(+), 64 deletions(-)

diff --git a/macosx/Controller.m b/macosx/Controller.m
index a5b82a1ab..59c03eb35 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1987,9 +1987,10 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     const NSInteger groupFilterValue = [fDefaults integerForKey: @"FilterGroup"];
     const BOOL filterGroup = groupFilterValue != GROUP_FILTER_ALL_TAG;
     
-    NSString * searchString = fFilterBar ? [fFilterBar searchString] : @"";
-    const BOOL filterText = ![searchString isEqualToString: @""],
-            filterTracker = filterText && [[fDefaults stringForKey: @"FilterSearchType"] isEqualToString: FILTER_TYPE_TRACKER];
+    NSString * searchString = [fFilterBar searchString];
+    if (searchString && [searchString isEqualToString: @""])
+        searchString = nil;
+    const BOOL filterTracker = searchString && [[fDefaults stringForKey: @"FilterSearchType"] isEqualToString: FILTER_TYPE_TRACKER];
     
     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];
             if (isActive)
-                active++;
+                ++active;
             
             if ([torrent isSeeding])
             {
-                seeding++;
+                ++seeding;
                 if (filterStatus && !((filterActive && isActive) || filterSeed))
                     continue;
             }
             else
             {
-                downloading++;
+                ++downloading;
                 if (filterStatus && !((filterActive && isActive) || filterDownload))
                     continue;
             }
         }
         else
         {
-            paused++;
+            ++paused;
             if (filterStatus && !filterPause)
                 continue;
         }
@@ -2029,7 +2030,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
                 continue;
         
         //check text field
-        if (filterText)
+        if (searchString)
         {
             if (filterTracker)
             {
@@ -2092,7 +2093,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
                 group = nil;
                 
                 //try to see if the group already exists
-                for (; currentOldGroupIndex < [oldTorrentGroups count]; currentOldGroupIndex++)
+                for (; currentOldGroupIndex < [oldTorrentGroups count]; ++currentOldGroupIndex)
                 {
                     TorrentGroup * currentGroup = [oldTorrentGroups objectAtIndex: currentOldGroupIndex];
                     const NSInteger currentGroupValue = [currentGroup groupIndex];
@@ -2101,7 +2102,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
                         group = currentGroup;
                         [[currentGroup torrents] removeAllObjects];
                         
-                        currentOldGroupIndex++;
+                        ++currentOldGroupIndex;
                     }
                     
                     if (currentGroupValue >= groupValue)
@@ -2138,7 +2139,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     [fTableView selectValues: selectedValues];
     [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];
 }
diff --git a/macosx/en.lproj/MainMenu.xib b/macosx/en.lproj/MainMenu.xib
index 027b67918..f88f8e1eb 100644
--- a/macosx/en.lproj/MainMenu.xib
+++ b/macosx/en.lproj/MainMenu.xib
@@ -12,9 +12,8 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="589"/>
-			<integer value="1684"/>
-			<integer value="21"/>
+			<integer value="1400"/>
+			<integer value="2"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -105,28 +104,6 @@
 									<object class="NSMutableArray" key="NSMenuItems">
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<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>
 								<bool key="NSPullDown">YES</bool>
@@ -5422,27 +5399,15 @@ AAAAAAAAAAAAAAAAA</bytes>
 						<reference key="object" ref="97165992"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1041175657"/>
 							<reference ref="824838798"/>
-							<reference ref="420710921"/>
 						</object>
 						<reference key="parent" ref="1063285887"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2686</int>
-						<reference key="object" ref="1041175657"/>
-						<reference key="parent" ref="97165992"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2685</int>
 						<reference key="object" ref="824838798"/>
 						<reference key="parent" ref="97165992"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2684</int>
-						<reference key="object" ref="420710921"/>
-						<reference key="parent" ref="97165992"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3077</int>
 						<reference key="object" ref="1000086369"/>
@@ -6087,12 +6052,8 @@ AAAAAAAAAAAAAAAAA</bytes>
 					<string>2683.IBEditorWindowLastContentRect</string>
 					<string>2683.IBPluginDependency</string>
 					<string>2683.ImportedFromIB2</string>
-					<string>2684.IBPluginDependency</string>
-					<string>2684.ImportedFromIB2</string>
 					<string>2685.IBPluginDependency</string>
 					<string>2685.ImportedFromIB2</string>
-					<string>2686.IBPluginDependency</string>
-					<string>2686.ImportedFromIB2</string>
 					<string>2690.IBPluginDependency</string>
 					<string>2690.ImportedFromIB2</string>
 					<string>2700.IBPluginDependency</string>
@@ -6591,11 +6552,7 @@ AAAAAAAAAAAAAAAAA</bytes>
 						<bytes key="NSTransformStruct">P4AAAL+AAABAwAAAwZgAAA</bytes>
 					</object>
 					<integer value="1"/>
-					<string>{{346, 449}, {108, 63}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
+					<string>{{66, 710}, {105, 23}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -6809,7 +6766,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 							<string>revealFile:</string>
 							<string>selectedToolbarClicked:</string>
 							<string>setGroup:</string>
-							<string>setGroupFilter:</string>
 							<string>setInfoTab:</string>
 							<string>setLimitGlobalEnabled:</string>
 							<string>setQuickLimitGlobal:</string>
@@ -6889,7 +6845,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -6918,7 +6873,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 							<string>revealFile:</string>
 							<string>selectedToolbarClicked:</string>
 							<string>setGroup:</string>
-							<string>setGroupFilter:</string>
 							<string>setInfoTab:</string>
 							<string>setLimitGlobalEnabled:</string>
 							<string>setQuickLimitGlobal:</string>
@@ -7037,10 +6991,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 								<string key="name">setGroup:</string>
 								<string key="candidateClassName">id</string>
 							</object>
-							<object class="IBActionInfo">
-								<string key="name">setGroupFilter:</string>
-								<string key="candidateClassName">id</string>
-							</object>
 							<object class="IBActionInfo">
 								<string key="name">setInfoTab:</string>
 								<string key="candidateClassName">id</string>