Changeset 491

Timestamp:

Jul 1, 2006, 12:29:26 AM (17 years ago)

Author:

livings124

Message:

The Almighty Turtle!

Speed Limit can now be accessed from the main window, among smaller changes.

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (4 diffs)
• macosx/Controller.h (modified) (1 diff)
• macosx/Controller.m (modified) (2 diffs)
• macosx/English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
• macosx/English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• macosx/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• macosx/English.lproj/PrefsWindow.nib/info.nib (modified) (1 diff)
• macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib (modified) (previous)
• macosx/Images/SpeedLimitButton.png (added)
• macosx/Images/SpeedLimitButtonPressed.tiff (added)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -110 +110 @@
                 A2D0E0490A54A97C003C72CF /* Bandwidth.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D0E0480A54A97C003C72CF /* Bandwidth.png */; };
                 A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; };
+                A2F6DB080A55F31C0058D1E5 /* SpeedLimitButtonPressed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2F6DB060A55F31C0058D1E5 /* SpeedLimitButtonPressed.tiff */; };
+                A2F6DB090A55F31C0058D1E5 /* SpeedLimitButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */; };
                 A2F8951F0A2D4BA500ED2127 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = A2F8951E0A2D4BA500ED2127 /* Credits.rtf */; };
 /* End PBXBuildFile section */
@@ -291 +293 @@
                 A2C655640A04FEDC00E9FD82 /* BottomBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BottomBorder.png; path = macosx/Images/BottomBorder.png; sourceTree = "<group>"; };
                 A2D0E0480A54A97C003C72CF /* Bandwidth.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Bandwidth.png; path = macosx/Images/Bandwidth.png; sourceTree = "<group>"; };
+                A2F6DB060A55F31C0058D1E5 /* SpeedLimitButtonPressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = SpeedLimitButtonPressed.tiff; path = macosx/Images/SpeedLimitButtonPressed.tiff; sourceTree = "<group>"; };
+                A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButton.png; path = macosx/Images/SpeedLimitButton.png; sourceTree = "<group>"; };
                 A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -429 +433 @@
                                 A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */,
                                 A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */,
+                                A2F6DB060A55F31C0058D1E5 /* SpeedLimitButtonPressed.tiff */,
+                                A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */,
                                 A27A53560A06A76400E1F16F /* StatusSep.png */,
                                 A27A53650A06AEDB00E1F16F /* StatusBorder.png */,
@@ -681 +687 @@
                                 A28C43F40A4A5D700091A302 /* Transmission Help in Resources */,
                                 A2D0E0490A54A97C003C72CF /* Bandwidth.png in Resources */,
+                                A2F6DB080A55F31C0058D1E5 /* SpeedLimitButtonPressed.tiff in Resources */,
+                                A2F6DB090A55F31C0058D1E5 /* SpeedLimitButton.png in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/macosx/Controller.h

@@ -51 +51 @@
     
     IBOutlet NSMenuItem         * fAdvancedBarItem, * fSpeedLimitItem;
-    IBOutlet NSButton           * fActionButton;
+    IBOutlet NSButton           * fActionButton, * fSpeedLimitButton;
     
     IBOutlet SmoothAquaView     * fStatusBar;

trunk/macosx/Controller.m

@@ -129 +129 @@
     BOOL speedLimit = [fDefaults boolForKey: @"SpeedLimit"];
     [fSpeedLimitItem setState: speedLimit];
+    if (speedLimit)
+        [fSpeedLimitButton setState: NSOnState];
     
     [fActionButton setToolTip: @"Shortcuts for changing global settings."];
+    [fSpeedLimitButton setToolTip: @"Speed Limit overrides the total bandwidth limits with its own limits."];
 
     [fTableView setTorrents: fTorrents];
-    [[fTableView tableColumnWithIdentifier: @"Torrent"] setDataCell:
-        [[TorrentCell alloc] init]];
-
-    [fTableView registerForDraggedTypes:
-        [NSArray arrayWithObject: NSFilenamesPboardType]];
+    [[fTableView tableColumnWithIdentifier: @"Torrent"] setDataCell: [[TorrentCell alloc] init]];
+
+    [fTableView registerForDraggedTypes: [NSArray arrayWithObject: NSFilenamesPboardType]];
 
     //register for sleep notifications
@@ -922 +923 @@
 - (void) toggleSpeedLimit: (id) sender
 {
-    BOOL enable = [fSpeedLimitItem state] == NSOffState;
-
-    [fSpeedLimitItem setState: enable];
-    [fDefaults setBool: enable forKey: @"SpeedLimit"];
-
-    [fPrefsController enableSpeedLimit: enable];
+    int state = [fSpeedLimitItem state] ? NSOffState : NSOnState;
+
+    [fSpeedLimitItem setState: state];
+    [fSpeedLimitButton setState: state];
+    
+    [fPrefsController enableSpeedLimit: state];
 }
 

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

@@ -47 +47 @@
                 fRatioSetItem = NSMenuItem; 
                 fScrollView = NSScrollView; 
+                fSpeedLimitButton = NSButton; 
                 fSpeedLimitItem = NSMenuItem; 
                 fStateSortItem = NSMenuItem; 

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

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

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

@@ -8 +8 @@
         <dict>
                 <key>153</key>
-                <string>302 469 548 217 0 0 1152 842 </string>
+                <string>138 451 554 217 0 0 1152 842 </string>
                 <key>28</key>
-                <string>122 427 548 254 0 0 1152 842 </string>
+                <string>197 449 554 254 0 0 1152 842 </string>
                 <key>41</key>
-                <string>130 394 548 297 0 0 1152 842 </string>
+                <string>144 392 554 297 0 0 1152 842 </string>
                 <key>66</key>
-                <string>182 510 548 104 0 0 1152 842 </string>
+                <string>241 503 554 104 0 0 1152 842 </string>
         </dict>
         <key>IBFramework Version</key>