Changeset 11640 for trunk/macosx/Controller.m

Timestamp:

Jan 6, 2011, 4:09:04 AM (11 years ago)

Author:

livings124

Message:

replace the "Reverse Sort Order" menu item with "Ascending" and "Descending" menu items

File:

• trunk/macosx/Controller.m (modified) (3 diffs)

trunk/macosx/Controller.m

@@ -99 +99 @@
     SORT_ACTIVITY_TAG = 6
 } sortTag;
+
+typedef enum
+{
+    SORT_ASC_TAG = 0,
+    SORT_DESC_TAG = 1
+} sortOrderTag;
+
 
 #define FILTER_NONE     @"None"
@@ -2058 +2065 @@
 - (void) setSortReverse: (id) sender
 {
-    [fDefaults setBool: ![fDefaults boolForKey: @"SortReverse"] forKey: @"SortReverse"];
-    [self sortTorrents];
+    const BOOL setReverse = [sender tag] == SORT_DESC_TAG;
+    if (setReverse != [fDefaults boolForKey: @"SortReverse"])
+    {
+        [fDefaults setBool: setReverse forKey: @"SortReverse"];
+        [self sortTorrents];
+    }
 }
 
@@ -4022 +4033 @@
     if (action == @selector(setSortReverse:))
     {
-        [menuItem setState: [fDefaults boolForKey: @"SortReverse"] ? NSOnState : NSOffState];
+        const BOOL isReverse = [menuItem tag] == SORT_DESC_TAG;
+        [menuItem setState: (isReverse == [fDefaults boolForKey: @"SortReverse"]) ? NSOnState : NSOffState];
         return ![[fDefaults stringForKey: @"Sort"] isEqualToString: SORT_ORDER];
     }