Changeset 852 for trunk

Timestamp:

Sep 8, 2006, 1:14:31 AM (16 years ago)

Author:

livings124

Message:

Menu item to switch between filters.
Enable some menu items a little differently.

Location:

trunk/macosx

Files:

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

trunk/macosx/Controller.h

@@ -79 +79 @@
                                     * fSeedFilterButton, * fDownloadFilterButton;
     IBOutlet NSSearchField          * fSearchFilterField;
+    IBOutlet NSMenuItem             * fNextFilterItem, * fPrevFilterItem;
                                 
     IBOutlet NSMenuItem             * fNextInfoTabItem, * fPrevInfoTabItem;
@@ -148 +149 @@
 - (void) applyFilter: (id) sender;
 - (void) setFilter: (id) sender;
+- (void) switchFilter: (id) sender;
 
 - (void) toggleSpeedLimit: (id) sender;

trunk/macosx/Controller.m

@@ -149 +149 @@
     [fWindow setContentMinSize: contentMinSize];
     
-    //set info keyboard shortcuts
-    unichar ch = NSRightArrowFunctionKey;
-    [fNextInfoTabItem setKeyEquivalent: [NSString stringWithCharacters: & ch length: 1]];
-    ch = NSLeftArrowFunctionKey;
-    [fPrevInfoTabItem setKeyEquivalent: [NSString stringWithCharacters: & ch length: 1]];
+    //set info and filter keyboard shortcuts
+    unichar rightChar = NSRightArrowFunctionKey, leftChar = NSLeftArrowFunctionKey;
+    [fNextInfoTabItem setKeyEquivalent: [NSString stringWithCharacters: & rightChar length: 1]];
+    [fPrevInfoTabItem setKeyEquivalent: [NSString stringWithCharacters: & leftChar length: 1]];
+    
+    [fNextFilterItem setKeyEquivalent: [NSString stringWithCharacters: & rightChar length: 1]];
+    [fNextFilterItem setKeyEquivalentModifierMask: NSCommandKeyMask + NSAlternateKeyMask];
+    [fPrevFilterItem setKeyEquivalent: [NSString stringWithCharacters: & leftChar length: 1]];
+    [fPrevFilterItem setKeyEquivalentModifierMask: NSCommandKeyMask + NSAlternateKeyMask];
     
     //set up filter bar
@@ -1246 +1250 @@
 }
 
+- (void) switchFilter: (id) sender
+{
+    NSButton * button;
+    if ([fFilterType isEqualToString: @"None"])
+        button = sender == fNextFilterItem ? fDownloadFilterButton : fPauseFilterButton;
+    else if ([fFilterType isEqualToString: @"Download"])
+        button = sender == fNextFilterItem ? fSeedFilterButton : fNoFilterButton;
+    else if ([fFilterType isEqualToString: @"Seed"])
+        button = sender == fNextFilterItem ? fPauseFilterButton : fDownloadFilterButton;
+    else if ([fFilterType isEqualToString: @"Pause"])
+        button = sender == fNextFilterItem ? fNoFilterButton : fSeedFilterButton;
+    else
+        button = fNoFilterButton;
+    
+    [self setFilter: button];
+}
+
 - (void) toggleSpeedLimit: (id) sender
 {
@@ -2005 +2026 @@
 
     //only enable some items if it is in a context menu or the window is useable 
-    BOOL canUseMenu = [fWindow isKeyWindow] || [[[menuItem menu] title] isEqualToString: @"Context"];
+    BOOL canUseTable = [fWindow isKeyWindow] || [[[menuItem menu] title] isEqualToString: @"Context"];
 
     //enable open items
     if (action == @selector(openShowSheet:))
         return [fWindow attachedSheet] == nil;
+    
+    //enable sort and advanced bar items
+    if (action == @selector(setSort:) || action == @selector(toggleAdvancedBar:) || action == @selector(toggleSmallView:))
+        return [fWindow isVisible];
 
     //enable show info
@@ -2032 +2057 @@
                 [menuItem setTitle: title];
 
-        return canUseMenu;
+        return [fWindow isVisible];
     }
     
@@ -2042 +2067 @@
                 [menuItem setTitle: title];
 
-        return canUseMenu;
-    }
+        return [fWindow isVisible];
+    }
+    
+    //enable prev/next filter button
+    if (action == @selector(switchFilter:))
+        return [fWindow isVisible];
 
     //enable reveal in finder
     if (action == @selector(revealFile:))
-        return canUseMenu && [fTableView numberOfSelectedRows] > 0;
+        return canUseTable && [fTableView numberOfSelectedRows] > 0;
 
     //enable remove items
@@ -2090 +2119 @@
         }
         
-        return canUseMenu && canDelete && [fTableView numberOfSelectedRows] > 0;
+        return canUseTable && canDelete && [fTableView numberOfSelectedRows] > 0;
     }
 
@@ -2132 +2161 @@
     if (action == @selector(stopSelectedTorrents:))
     {
-        if (!canUseMenu)
+        if (!canUseTable)
             return NO;
     
@@ -2151 +2180 @@
     if (action == @selector(resumeSelectedTorrents:))
     {
-        if (!canUseMenu)
+        if (!canUseTable)
             return NO;
     
@@ -2167 +2196 @@
     }
     
-    //enable sort and advanced bar items
-    if (action == @selector(setSort:) || action == @selector(toggleAdvancedBar:)
-            || action == @selector(toggleSmallView:))
-        return canUseMenu;
-    
     //enable copy torrent file item
     if (action == @selector(copyTorrentFile:))
-        return canUseMenu && [fTableView numberOfSelectedRows] > 0;
+        return canUseTable && [fTableView numberOfSelectedRows] > 0;
 
     return YES;

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

@@ -31 +31 @@
                 stopAllTorrents = id; 
                 stopSelectedTorrents = id; 
+                switchFilter = id; 
                 toggleAdvancedBar = id; 
                 toggleFilterBar = id; 
@@ -51 +52 @@
                 fNameSortActionItem = NSMenuItem; 
                 fNameSortItem = NSMenuItem; 
+                fNextFilterItem = NSMenuItem; 
                 fNextInfoTabItem = NSMenuItem; 
                 fNoFilterButton = BarButton; 
@@ -57 +59 @@
                 fOrderSortItem = NSMenuItem; 
                 fPauseFilterButton = BarButton; 
+                fPrevFilterItem = NSMenuItem; 
                 fPrevInfoTabItem = NSMenuItem; 
                 fProgressSortActionItem = NSMenuItem; 

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

@@ -32 +32 @@
         <key>IBOpenObjects</key>
         <array>
+                <integer>21</integer>
                 <integer>29</integer>
-                <integer>21</integer>
         </array>
         <key>IBSystem Version</key>