Changeset 4253

Timestamp:

Dec 20, 2007, 8:53:55 PM (14 years ago)

Author:

livings124

Message:

remove bindings from the global ratio menu items

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (4 diffs)
• macosx/ActionMenuRatioToDisplayRatioTransformer.h (deleted)
• macosx/ActionMenuRatioToDisplayRatioTransformer.m (deleted)
• macosx/Controller.h (modified) (2 diffs)
• macosx/Controller.m (modified) (5 diffs)
• macosx/English.lproj/MainMenu.nib/classes.nib (modified) (5 diffs)
• macosx/English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• macosx/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -81 +81 @@
                 A219798B0D07B78400438EA7 /* GroupToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A219798A0D07B78400438EA7 /* GroupToolbarItem.m */; };
                 A21DFF100A292B2B007C5F76 /* Transfers.png in Resources */ = {isa = PBXBuildFile; fileRef = A21DFF0F0A292B2B007C5F76 /* Transfers.png */; };
-                A21F5B890AF25FB6008CE5CE /* ActionMenuRatioToDisplayRatioTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = A21F5B870AF25FB6008CE5CE /* ActionMenuRatioToDisplayRatioTransformer.m */; };
                 A22180980D148A71007D09ED /* GroupsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A22180970D148A71007D09ED /* GroupsWindowController.m */; };
                 A22180B60D148F0F007D09ED /* GroupsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A22180B50D148F0F007D09ED /* GroupsWindow.xib */; };
@@ -432 +431 @@
                 A219798A0D07B78400438EA7 /* GroupToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GroupToolbarItem.m; path = macosx/GroupToolbarItem.m; sourceTree = "<group>"; };
                 A21DFF0F0A292B2B007C5F76 /* Transfers.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Transfers.png; path = macosx/Images/Transfers.png; sourceTree = "<group>"; };
-                A21F5B860AF25FB6008CE5CE /* ActionMenuRatioToDisplayRatioTransformer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ActionMenuRatioToDisplayRatioTransformer.h; path = macosx/ActionMenuRatioToDisplayRatioTransformer.h; sourceTree = "<group>"; };
-                A21F5B870AF25FB6008CE5CE /* ActionMenuRatioToDisplayRatioTransformer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ActionMenuRatioToDisplayRatioTransformer.m; path = macosx/ActionMenuRatioToDisplayRatioTransformer.m; sourceTree = "<group>"; };
                 A22180960D148A71007D09ED /* GroupsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupsWindowController.h; path = macosx/GroupsWindowController.h; sourceTree = "<group>"; };
                 A22180970D148A71007D09ED /* GroupsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GroupsWindowController.m; path = macosx/GroupsWindowController.m; sourceTree = "<group>"; };
@@ -772 +769 @@
                                 A2BF078E0B066E0800757C92 /* SpeedLimitToTurtleIconTransformer.h */,
                                 A2BF078F0B066E0800757C92 /* SpeedLimitToTurtleIconTransformer.m */,
-                                A21F5B860AF25FB6008CE5CE /* ActionMenuRatioToDisplayRatioTransformer.h */,
-                                A21F5B870AF25FB6008CE5CE /* ActionMenuRatioToDisplayRatioTransformer.m */,
                                 A25E74450AF5089E006F11AE /* ExpandedPathToPathTransformer.h */,
                                 A25E74440AF5089E006F11AE /* ExpandedPathToPathTransformer.m */,
@@ -1688 +1683 @@
                                 A29C8B370ACC6EB3000ED9F9 /* PortChecker.m in Sources */,
                                 A2AA579D0ADFCAB400CA59F6 /* PiecesView.m in Sources */,
-                                A21F5B890AF25FB6008CE5CE /* ActionMenuRatioToDisplayRatioTransformer.m in Sources */,
                                 A25E74650AF5097C006F11AE /* ExpandedPathToPathTransformer.m in Sources */,
                                 A25E74660AF5097D006F11AE /* ExpandedPathToIconTransformer.m in Sources */,

trunk/macosx/Controller.h

@@ -82 +82 @@
                                     * fDownloadLimitItem, * fDownloadNoLimitItem;
     
+    IBOutlet NSMenuItem             * fCheckRatioItem, * fNoCheckRatioItem;
+    
     IBOutlet NSMenu                 * fGroupsSetMenu, * fGroupsSetContextMenu, * fGroupFilterMenu;
     IBOutlet NSPopUpButton          * fGroupsButton;
@@ -207 +209 @@
 - (void) setQuickLimitGlobal: (id) sender;
 
+- (void) setRatioGlobalEnabled: (id) sender;
 - (void) setQuickRatioGlobal: (id) sender;
 

trunk/macosx/Controller.m

@@ -40 +40 @@
 #import "NSMenuAdditions.h"
 #import "UKKQueue.h"
-#import "ActionMenuRatioToDisplayRatioTransformer.h"
 #import "ExpandedPathToPathTransformer.h"
 #import "ExpandedPathToIconTransformer.h"
@@ -177 +176 @@
     
     //set custom value transformers
-    ActionMenuRatioToDisplayRatioTransformer * ratioTransformer =
-                        [[[ActionMenuRatioToDisplayRatioTransformer alloc] init] autorelease];
-    [NSValueTransformer setValueTransformer: ratioTransformer forName: @"ActionMenuRatioToDisplayRatioTransformer"];
-    
     ExpandedPathToPathTransformer * pathTransformer =
                         [[[ExpandedPathToPathTransformer alloc] init] autorelease];
@@ -2204 +2199 @@
     [fDefaults setBool: sender == ([sender menu] == fUploadMenu ? fUploadLimitItem : fDownloadLimitItem)
         forKey: [sender menu] == fUploadMenu ? @"CheckUpload" : @"CheckDownload"];
+    
     [fPrefsController applySpeedSettings: nil];
 }
@@ -2216 +2212 @@
 }
 
-#warning get rid of bindings :(
+- (void) setRatioGlobalEnabled: (id) sender
+{
+    [fDefaults setBool: sender == fCheckRatioItem forKey: @"RatioCheck"];
+}
+
 - (void) setQuickRatioGlobal: (id) sender
 {
@@ -3208 +3208 @@
         
         [menuItem setState: [fDefaults boolForKey: upload ? @"CheckUpload" : @"CheckDownload"] ? limit : !limit];
+        return YES;
+    }
+    
+    if (action == @selector(setRatioGlobalEnabled:))
+    {
+        BOOL check = menuItem == fCheckRatioItem;
+        if (check)
+            [menuItem setTitle: [NSString stringWithFormat: NSLocalizedString(@"Stop at Ratio (%.2f)",
+                                    "Action context menu -> ratio stop"), [fDefaults floatForKey: @"RatioLimit"]]];
+        
+        [menuItem setState: [fDefaults boolForKey: @"RatioCheck"] ? check : !check];
         return YES;
     }

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

@@ -123 +123 @@
                                 <key>setQuickRatioGlobal</key>
                                 <string>id</string>
+                                <key>setRatioGlobalEnabled</key>
+                                <string>id</string>
                                 <key>setSort</key>
                                 <string>id</string>
@@ -178 +180 @@
                                 <key>fBottomTigerLine</key>
                                 <string>NSBox</string>
+                                <key>fCheckRatioItem</key>
+                                <string>NSMenuItem</string>
                                 <key>fDockMenu</key>
                                 <string>NSMenu</string>
@@ -201 +205 @@
                                 <string>NSMenuItem</string>
                                 <key>fNextInfoTabItem</key>
+                                <string>NSMenuItem</string>
+                                <key>fNoCheckRatioItem</key>
                                 <string>NSMenuItem</string>
                                 <key>fNoFilterButton</key>
@@ -268 +274 @@
                 </dict>
                 <dict>
+                        <key>CLASS</key>
+                        <string>FilterButton</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                        <key>SUPERCLASS</key>
+                        <string>NSButton</string>
+                </dict>
+                <dict>
                         <key>ACTIONS</key>
                         <dict>
@@ -304 +318 @@
                         <key>SUPERCLASS</key>
                         <string>NSTableView</string>
-                </dict>
-                <dict>
-                        <key>CLASS</key>
-                        <string>FilterButton</string>
-                        <key>LANGUAGE</key>
-                        <string>ObjC</string>
-                        <key>SUPERCLASS</key>
-                        <string>NSButton</string>
                 </dict>
                 <dict>

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

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>1060</integer>
+                <integer>1310</integer>
         </array>
         <key>IBSystem Version</key>