Changeset 3660

Timestamp:

Oct 30, 2007, 8:19:22 PM (15 years ago)

Author:

livings124

Message:

phase 2 of updating menu items to remove bindings

Location:

trunk/macosx

Files:

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

trunk/macosx/Controller.h

@@ -187 +187 @@
 - (void) switchFilter: (id) sender;
 
-- (void) applySpeedLimit: (id) sender;
 - (void) toggleSpeedLimit: (id) sender;
 - (void) autoSpeedLimitChange: (NSNotification *) notification;

trunk/macosx/Controller.m

@@ -2026 +2026 @@
 }
 
-#warning look into
-- (void) applySpeedLimit: (id) sender
-{
+- (void) toggleSpeedLimit: (id) sender
+{
+    [fDefaults setBool: ![fDefaults boolForKey: @"SpeedLimit"] forKey: @"SpeedLimit"];
     [fPrefsController applySpeedSettings: nil];
-}
-
-- (void) toggleSpeedLimit: (id) sender
-{
-    [fDefaults setBool: ![fDefaults boolForKey: @"SpeedLimit"] forKey: @"SpeedLimit"];
-    [self applySpeedLimit: nil];
 }
 
@@ -2849 +2843 @@
 {
     SEL action = [menuItem action];
+    
+    if (action == @selector(toggleSpeedLimit:))
+    {
+        [menuItem setState: [fDefaults boolForKey: @"SpeedLimit"] ? NSOnState : NSOffState];
+        return YES;
+    }
     
     //only enable some items if it is in a context menu or the window is useable

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

@@ -71 +71 @@
                                 <string>id</string>
                                 <key>applyFilter</key>
-                                <string>id</string>
-                                <key>applySpeedLimit</key>
                                 <string>id</string>
                                 <key>copyTorrentFiles</key>

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

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>1639</integer>
+                <integer>1326</integer>
         </array>
         <key>IBSystem Version</key>