Changeset 1304

Timestamp:

Dec 31, 2006, 9:38:35 PM (16 years ago)

Author:

livings124

Message:

bindings + formatters = trouble....revert to glue code for speed limit, torrent limit, and port fields in prefs...more to come later

Location:

trunk

Files:

• libtransmission/clients.c (modified) (1 diff)
• macosx/English.lproj/PrefsWindow.nib/classes.nib (modified) (5 diffs)
• macosx/English.lproj/PrefsWindow.nib/info.nib (modified) (1 diff)
• macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib (modified) (previous)
• macosx/PrefsController.h (modified) (2 diffs)
• macosx/PrefsController.m (modified) (3 diffs)

trunk/libtransmission/clients.c

@@ -79 +79 @@
         else if( !memcmp( &id[1], "BOW", 3 ) )
         {
-            asprintf( &ret, "Bits on Wheels (%c%c)",
-                      id[5], id[6] );
+            asprintf( &ret, "Bits on Wheels (%c%c%c)",
+                      id[4], id[5], id[6] );
         }
         else if( !memcmp( &id[1], "BR", 2 ) )

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

@@ -7 +7 @@
             ACTIONS = {
                 applySpeedSettings = id; 
-                applyTorrentSpeedSetting = id; 
+                applyTorrentLimitSetting = id; 
                 folderSheetShow = id; 
                 helpForNetwork = id; 
@@ -21 +21 @@
                 setQueueNumber = id; 
                 setSound = id; 
+                setSpeedLimit = id; 
+                setTorrentLimit = id; 
                 setUpdate = id; 
             }; 
@@ -30 +32 @@
                 fDownloadField = NSTextField; 
                 fDownloadSoundPopUp = NSPopUpButton; 
+                fDownloadTorrentField = NSTextField; 
                 fFolderPopUp = NSPopUpButton; 
                 fGeneralView = NSView; 
@@ -38 +41 @@
                 fNatStatusImage = NSImageView; 
                 fNetworkView = NSView; 
+                fPortField = NSTextField; 
                 fPortStatusField = NSTextField; 
                 fPortStatusImage = NSImageView; 
@@ -48 +52 @@
                 fUploadCheck = NSButton; 
                 fUploadField = NSTextField; 
+                fUploadTorrentField = NSTextField; 
             }; 
             SUPERCLASS = NSWindowController; 

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

@@ -8 +8 @@
         <dict>
                 <key>153</key>
-                <string>119 428 571 335 0 0 1152 842 </string>
+                <string>290 411 571 335 0 0 1152 842 </string>
                 <key>28</key>
-                <string>99 386 571 290 0 0 1152 842 </string>
+                <string>290 434 571 290 0 0 1152 842 </string>
                 <key>41</key>
                 <string>290 426 571 305 0 0 1152 842 </string>
                 <key>66</key>
-                <string>139 501 571 144 0 0 1152 842 </string>
+                <string>290 507 571 144 0 0 1152 842 </string>
         </dict>
         <key>IBFramework Version</key>

trunk/macosx/PrefsController.h

@@ -46 +46 @@
 
     IBOutlet NSTextField    * fUploadField, * fDownloadField,
+                            * fUploadTorrentField, * fDownloadTorrentField,
                             * fSpeedLimitUploadField, * fSpeedLimitDownloadField;
     IBOutlet NSButton       * fUploadCheck, * fDownloadCheck;
 
-    IBOutlet NSTextField            * fNatStatusField,
-                                    * fPortStatusField;
+    IBOutlet NSTextField            * fPortField, * fNatStatusField, * fPortStatusField;
     IBOutlet NSButton               * fNatCheck;
     IBOutlet NSImageView            * fNatStatusImage, * fPortStatusImage;
@@ -77 +77 @@
 - (void) updateNatStatus;
 
+- (void) applySpeedSettings: (id) sender;
+
+- (void) applyTorrentLimitSetting: (id) sender;
+- (void) setTorrentLimit: (id) sender;
+
+- (void) setSpeedLimit: (id) sender;
 - (void) setAutoSpeedLimit: (id) sender;
-
-- (void) applySpeedSettings: (id) sender;
-- (void) applyTorrentSpeedSetting: (id) sender;
 
 - (void) setAutoImport: (id) sender;

trunk/macosx/PrefsController.m

@@ -134 +134 @@
         [fFolderPopUp selectItemAtIndex: DOWNLOAD_ASK];
     
+    //set torrent limits
+    [fUploadTorrentField setIntValue: [fDefaults integerForKey: @"UploadLimitTorrent"]];
+    [fDownloadTorrentField setIntValue: [fDefaults integerForKey: @"DownloadLimitTorrent"]];
+    
+    //set speed limit
+    [fSpeedLimitUploadField setIntValue: [fDefaults integerForKey: @"SpeedLimitUploadLimit"]];
+    [fSpeedLimitDownloadField setIntValue: [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]];
+    
+    //set port
+    [fPortField setIntValue: [fDefaults integerForKey: @"BindPort"]];
+    
     [self updatePortStatus];
     
@@ -221 +232 @@
 - (void) setPort: (id) sender
 {
+    int port = [sender intValue];
+    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", port]])
+    {
+        NSBeep();
+        [sender setIntValue: [fDefaults integerForKey: @"BindPort"]];
+        return;
+    }
+    
+    [fDefaults setInteger: port forKey: @"BindPort"];
+    
     tr_setBindPort(fHandle, [fDefaults integerForKey: @"BindPort"]);
     [self updateNatStatus];
@@ -314 +335 @@
 }
 
-- (void) applyTorrentSpeedSetting: (id) sender
+- (void) applyTorrentLimitSetting: (id) sender
 {
     [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateSpeedSetting" object: self];
+}
+
+- (void) setTorrentLimit: (id) sender
+{
+    BOOL upload = sender == fUploadTorrentField;
+    
+    int limit = [sender intValue];
+    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", limit]])
+    {
+        NSBeep();
+        [sender setIntValue: [fDefaults integerForKey: upload ? @"UploadLimitTorrent" : @"DownloadLimitTorrent"]];
+        return;
+    }
+    
+    [fDefaults setInteger: limit forKey: upload ? @"UploadLimitTorrent" : @"DownloadLimitTorrent"];
+    
+    [self applyTorrentLimitSetting: self];
+}
+
+- (void) setSpeedLimit: (id) sender
+{
+    BOOL upload = sender == fSpeedLimitUploadField;
+    
+    int limit = [sender intValue];
+    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", limit]])
+    {
+        NSBeep();
+        [sender setIntValue: [fDefaults integerForKey: upload ? @"SpeedLimitUploadLimit" : @"SpeedLimitDownloadLimit"]];
+        return;
+    }
+    
+    [fDefaults setInteger: limit forKey: upload ? @"SpeedLimitUploadLimit" : @"SpeedLimitDownloadLimit"];
+    
+    [self applySpeedSettings: self];
 }