Changeset 652

Timestamp:

Jul 22, 2006, 2:08:35 PM (16 years ago)

Author:

livings124

Message:

Sort in the action menu.

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (3 diffs)
• English.lproj/MainMenu.nib/classes.nib (modified) (3 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)

trunk/macosx/Controller.h

@@ -64 +64 @@
     NSString                        * fSortType;
     IBOutlet NSMenuItem             * fNameSortItem, * fStateSortItem, * fProgressSortItem,
-                                    * fDateSortItem, * fOrderSortItem;
+                                    * fDateSortItem, * fOrderSortItem,
+                                    * fNameSortActionItem, * fStateSortActionItem, * fProgressSortActionItem,
+                                    * fDateSortActionItem, * fOrderSortActionItem;
     
     IBOutlet ImageBackgroundView    * fFilterBar;

trunk/macosx/Controller.m

@@ -218 +218 @@
     fSortType = [[fDefaults stringForKey: @"Sort"] retain];
     
-    NSMenuItem * currentSortItem;
+    NSMenuItem * currentSortItem, * currentSortActionItem;
     if ([fSortType isEqualToString: @"Name"])
+    {
         currentSortItem = fNameSortItem;
+        currentSortActionItem = fNameSortActionItem;
+    }
     else if ([fSortType isEqualToString: @"State"])
+    {
         currentSortItem = fStateSortItem;
+        currentSortActionItem = fStateSortActionItem;
+    }
     else if ([fSortType isEqualToString: @"Progress"])
+    {
         currentSortItem = fProgressSortItem;
+        currentSortActionItem = fProgressSortActionItem;
+    }
     else if ([fSortType isEqualToString: @"Date"])
+    {
         currentSortItem = fDateSortItem;
+        currentSortActionItem = fDateSortActionItem;
+    }
     else
+    {
         currentSortItem = fOrderSortItem;
+        currentSortActionItem = fOrderSortActionItem;
+    }
     [currentSortItem setState: NSOnState];
+    [currentSortActionItem setState: NSOnState];
     
     //set filter
@@ -974 +990 @@
 - (void) setSort: (id) sender
 {
-    NSMenuItem * prevSortItem;
+    //get checked items
+    NSMenuItem * prevSortItem, * prevSortActionItem;
     if ([fSortType isEqualToString: @"Name"])
+    {
         prevSortItem = fNameSortItem;
+        prevSortActionItem = fNameSortActionItem;
+    }
     else if ([fSortType isEqualToString: @"State"])
+    {
         prevSortItem = fStateSortItem;
+        prevSortActionItem = fStateSortActionItem;
+    }
     else if ([fSortType isEqualToString: @"Progress"])
+    {
         prevSortItem = fProgressSortItem;
+        prevSortActionItem = fProgressSortActionItem;
+    }
     else if ([fSortType isEqualToString: @"Date"])
+    {
         prevSortItem = fDateSortItem;
+        prevSortActionItem = fDateSortActionItem;
+    }
     else
+    {
         prevSortItem = fOrderSortItem;
-    
-    if (sender != prevSortItem)
-    {
+        prevSortActionItem = fOrderSortActionItem;
+    }
+    
+    if (sender != prevSortItem && sender != prevSortActionItem)
+    {
+        [fSortType release];
+        
+        //get new items to check
+        NSMenuItem * currentSortItem, * currentSortActionItem;
+        if (sender == fNameSortItem || sender == fNameSortActionItem)
+        {
+            currentSortItem = fNameSortItem;
+            currentSortActionItem = fNameSortActionItem;
+            fSortType = [[NSString alloc] initWithString: @"Name"];
+        }
+        else if (sender == fStateSortItem || sender == fStateSortActionItem)
+        {
+            currentSortItem = fStateSortItem;
+            currentSortActionItem = fStateSortActionItem;
+            fSortType = [[NSString alloc] initWithString: @"State"];
+        }
+        else if (sender == fProgressSortItem || sender == fProgressSortActionItem)
+        {
+            currentSortItem = fProgressSortItem;
+            currentSortActionItem = fProgressSortActionItem;
+            fSortType = [[NSString alloc] initWithString: @"Progress"];
+        }
+        else if (sender == fDateSortItem || sender == fDateSortActionItem)
+        {
+            currentSortItem = fDateSortItem;
+            currentSortActionItem = fDateSortActionItem;
+            fSortType = [[NSString alloc] initWithString: @"Date"];
+        }
+        else
+        {
+            currentSortItem = fOrderSortItem;
+            currentSortActionItem = fOrderSortActionItem;
+            fSortType = [[NSString alloc] initWithString: @"Order"];
+        }
+    
         [prevSortItem setState: NSOffState];
-        [sender setState: NSOnState];
-
-        [fSortType release];
-        if (sender == fNameSortItem)
-            fSortType = [[NSString alloc] initWithString: @"Name"];
-        else if (sender == fStateSortItem)
-            fSortType = [[NSString alloc] initWithString: @"State"];
-        else if (sender == fProgressSortItem)
-            fSortType = [[NSString alloc] initWithString: @"Progress"];
-        else if (sender == fDateSortItem)
-            fSortType = [[NSString alloc] initWithString: @"Date"];
-        else
-            fSortType = [[NSString alloc] initWithString: @"Order"];
-           
+        [prevSortActionItem setState: NSOffState];
+        [currentSortItem setState: NSOnState];
+        [currentSortActionItem setState: NSOnState];
+        
         [fDefaults setObject: fSortType forKey: @"Sort"];
     }
@@ -1668 +1725 @@
     [fAdvancedBarItem setState: state];
     [fDefaults setBool: state forKey: @"UseAdvancedBar"];
-
+    
     [fTableView display];
 }

trunk/macosx/English.lproj/MainMenu.nib/classes.nib

@@ -40 +40 @@
                 fActionButton = NSButton; 
                 fAdvancedBarItem = NSMenuItem; 
+                fDateSortActionItem = NSMenuItem; 
                 fDateSortItem = NSMenuItem; 
                 fDownloadFilterButton = BarButton; 
@@ -46 +47 @@
                 fDownloadNoLimitItem = NSMenuItem; 
                 fFilterBar = ImageBackgroundView; 
+                fNameSortActionItem = NSMenuItem; 
                 fNameSortItem = NSMenuItem; 
                 fNextInfoTabItem = NSMenuItem; 
                 fNoFilterButton = BarButton; 
+                fOrderSortActionItem = NSMenuItem; 
                 fOrderSortItem = NSMenuItem; 
                 fPauseFilterButton = BarButton; 
                 fPrevInfoTabItem = NSMenuItem; 
+                fProgressSortActionItem = NSMenuItem; 
                 fProgressSortItem = NSMenuItem; 
                 fRatioNotSetItem = NSMenuItem; 
@@ -62 +66 @@
                 fSpeedLimitDockItem = NSMenuItem; 
                 fSpeedLimitItem = NSMenuItem; 
+                fStateSortActionItem = NSMenuItem; 
                 fStateSortItem = NSMenuItem; 
                 fStatusBar = ImageBackgroundView; 

trunk/macosx/English.lproj/MainMenu.nib/info.nib

@@ -8 +8 @@
         <dict>
                 <key>1041</key>
-                <string>344 478 208 99 0 0 1152 842 </string>
+                <string>344 478 208 130 0 0 1152 842 </string>
                 <key>1480</key>
                 <string>366 546 420 63 0 0 1152 842 </string>
@@ -32 +32 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>21</integer>
-                <integer>1480</integer>
                 <integer>29</integer>
+                <integer>1041</integer>
                 <integer>1603</integer>
         </array>