Changeset 740 for trunk/macosx

Timestamp:

Aug 8, 2006, 2:11:51 AM (16 years ago)

Author:

livings124

Message:

Allow scheduling of speed limit.
Preference window saves when closing again.

Location:

trunk/macosx

Files:

• Controller.h (modified) (2 diffs)
• Controller.m (modified) (4 diffs)
• Defaults.plist (modified) (1 diff)
• English.lproj/PrefsWindow.nib/classes.nib (modified) (3 diffs)
• English.lproj/PrefsWindow.nib/info.nib (modified) (2 diffs)
• English.lproj/PrefsWindow.nib/keyedobjects.nib (modified) (previous)
• PrefsController.h (modified) (2 diffs)
• PrefsController.m (modified) (5 diffs)
• PrefsWindow.m (modified) (1 diff)

trunk/macosx/Controller.h

@@ -61 +61 @@
     BOOL                            fSpeedLimitEnabled;
     NSImage                         * fSpeedLimitNormalImage, * fSpeedLimitBlueImage, * fSpeedLimitGraphiteImage;
+    NSTimer                         * fSpeedLimitTimer;
     
     IBOutlet ImageBackgroundView    * fStatusBar;
@@ -147 +148 @@
 
 - (void) toggleSpeedLimit: (id) sender;
+- (void) autoSpeedLimit: (NSTimer *) timer;
 
 - (void) setLimitGlobalEnabled: (id) sender;

trunk/macosx/Controller.m

@@ -52 +52 @@
 #define WINDOW_REGULAR_WIDTH    468.0
 
+#define AUTO_SPEED_LIMIT_SECONDS    10.0
+
 #define WEBSITE_URL @"http://transmission.m0k.org/"
 #define FORUM_URL   @"http://transmission.m0k.org/forum/"
@@ -345 +347 @@
         [self showInfo: nil];
     
+    //timer to auto toggle speed limit
+    fSpeedLimitTimer = [NSTimer scheduledTimerWithTimeInterval: AUTO_SPEED_LIMIT_SECONDS target: self 
+        selector: @selector(autoSpeedLimit:) userInfo: nil repeats: YES];
+    
     //timer to check for auto import every 15 seconds, must do after everything else is set up
     fAutoImportTimer = [NSTimer scheduledTimerWithTimeInterval: 15.0 target: self 
@@ -398 +404 @@
     //stop timers
     [fAutoImportTimer invalidate];
+    [fSpeedLimitTimer invalidate];
     [fTimer invalidate];
     
@@ -1202 +1209 @@
 }
 
+- (void) autoSpeedLimit: (NSTimer *) timer
+{
+    BOOL autoOn, autoOff;
+    if (!(autoOn = [fDefaults boolForKey: @"SpeedLimitAutoOn"])
+            && !(autoOff = [fDefaults boolForKey: @"SpeedLimitAutoOff"]))
+        return;
+ 
+    //do nothing if time to turn on and off are equal
+    int onHour, offHour;
+    if ((onHour = [fDefaults integerForKey: @"SpeedLimitAutoOnHour"])
+            == (offHour = [fDefaults integerForKey: @"SpeedLimitAutoOffHour"]) && autoOn && autoOff)
+        return;
+    
+    NSCalendarDate * currentDate = [NSCalendarDate calendarDate];
+    //do nothing if not within first few seconds of hour
+    if ([currentDate minuteOfHour] > 0 || [currentDate secondOfMinute] >= AUTO_SPEED_LIMIT_SECONDS)
+        return;
+    
+    if ([currentDate hourOfDay] == (fSpeedLimitEnabled ? offHour : onHour))
+        [self toggleSpeedLimit: nil];
+}
+
 - (void) setLimitGlobalEnabled: (id) sender
 {

trunk/macosx/Defaults.plist

@@ -75 +75 @@
         <key>SpeedLimit</key>
         <false/>
+        <key>SpeedLimitAutoOff</key>
+        <false/>
+        <key>SpeedLimitAutoOffHour</key>
+        <integer>0</integer>
+        <key>SpeedLimitAutoOn</key>
+        <false/>
+        <key>SpeedLimitAutoOnHour</key>
+        <integer>12</integer>
         <key>SpeedLimitDownloadLimit</key>
         <integer>10</integer>

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

@@ -3 +3 @@
         {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
         {CLASS = MenuButton; LANGUAGE = ObjC; SUPERCLASS = NSButton; }, 
+        {CLASS = NSDatePicker; LANGUAGE = ObjC; SUPERCLASS = NSControl; }, 
         {
             ACTIONS = {
@@ -9 +10 @@
                 setAutoImport = id; 
                 setAutoSize = id; 
+                setAutoSpeedLimitCheck = id; 
+                setAutoSpeedLimitHour = id; 
                 setBadge = id; 
                 setDownloadLocation = id; 
@@ -52 +55 @@
                 fRemoveDownloadingCheck = NSButton; 
                 fSeedingSoundPopUp = NSPopUpButton; 
+                fSpeedLimitAutoOffCheck = NSButton; 
+                fSpeedLimitAutoOffField = NSTextField; 
+                fSpeedLimitAutoOnCheck = NSButton; 
+                fSpeedLimitAutoOnField = NSTextField; 
                 fSpeedLimitDownloadField = NSTextField; 
                 fSpeedLimitUploadField = NSTextField; 

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

@@ -8 +8 @@
         <dict>
                 <key>153</key>
-                <string>59 422 582 217 0 0 1152 842 </string>
+                <string>95 422 582 291 0 0 1152 842 </string>
                 <key>28</key>
                 <string>58 372 582 290 0 0 1152 842 </string>
                 <key>41</key>
-                <string>84 320 582 304 0 0 1152 842 </string>
+                <string>138 419 582 304 0 0 1152 842 </string>
                 <key>66</key>
                 <string>179 527 582 104 0 0 1152 842 </string>
@@ -24 +24 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>41</integer>
+                <integer>153</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/PrefsController.h

@@ -46 +46 @@
 
     IBOutlet NSTextField    * fUploadField, * fDownloadField,
-                            * fSpeedLimitUploadField, * fSpeedLimitDownloadField;
-    IBOutlet NSButton       * fUploadCheck, * fDownloadCheck;
+                            * fSpeedLimitUploadField, * fSpeedLimitDownloadField,
+                            * fSpeedLimitAutoOnField, * fSpeedLimitAutoOffField;
+    IBOutlet NSButton       * fUploadCheck, * fDownloadCheck,
+                            * fSpeedLimitAutoOnCheck, * fSpeedLimitAutoOffCheck;
 
     IBOutlet NSTextField    * fPortField;
@@ -82 +84 @@
 - (void) setSpeedLimit: (id) sender;
 
+- (void) setAutoSpeedLimitCheck: (id) sender;
+- (void) setAutoSpeedLimitHour: (id) sender;
+
 - (void) setLimit:          (id) sender;
 - (void) setLimitCheck:     (id) sender;

trunk/macosx/PrefsController.m

@@ -78 +78 @@
         fHandle = handle;
         
-        [[self window] update]; //make sure nib is loaded right away
+        NSWindow * window = [self window];
+        [window setDelegate: window];
+        [window update]; //make sure nib is loaded right away
     }
     return self;
@@ -169 +171 @@
         tr_setDownloadLimit(fHandle, checkDownload ? downloadLimit : -1);
     }
+    
+    //set auto speed limit
+    BOOL speedLimitAutoOn = [fDefaults boolForKey: @"SpeedLimitAutoOn"];
+    int speedLimitAutoOnHour = [fDefaults integerForKey: @"SpeedLimitAutoOnHour"];
+    
+    [fSpeedLimitAutoOnCheck setState: speedLimitAutoOn];
+    [fSpeedLimitAutoOnField setIntValue: speedLimitAutoOnHour];
+    [fSpeedLimitAutoOnField setEnabled: speedLimitAutoOn];
+    
+    BOOL speedLimitAutoOff = [fDefaults boolForKey: @"SpeedLimitAutoOff"];
+    int speedLimitAutoOffHour = [fDefaults integerForKey: @"SpeedLimitAutoOffHour"];
+    
+    [fSpeedLimitAutoOffCheck setState: speedLimitAutoOff];
+    [fSpeedLimitAutoOffField setIntValue: speedLimitAutoOffHour];
+    [fSpeedLimitAutoOffField setEnabled: speedLimitAutoOff];
     
     //set ratio limit
@@ -376 +393 @@
         if (![fDefaults boolForKey: @"SpeedLimit"])
         {
+            int realLimit = [check state] ? limit : -1;
             if (sender == fUploadField)
-                tr_setUploadLimit(fHandle, [fUploadCheck state] ? limit : -1);
+                tr_setUploadLimit(fHandle, realLimit);
             else
-                tr_setDownloadLimit(fHandle, [fDownloadCheck state] ? limit : -1);
+                tr_setDownloadLimit(fHandle, realLimit);
         }
         
@@ -482 +500 @@
 }
 
+- (void) setAutoSpeedLimitCheck: (id) sender
+{
+    NSString * key;
+    NSTextField * field;
+    if (sender == fSpeedLimitAutoOnCheck)
+    {
+        key = @"SpeedLimitAutoOn";
+        field = fSpeedLimitAutoOnField;
+    }
+    else
+    {
+        key = @"SpeedLimitAutoOff";
+        field = fSpeedLimitAutoOffField;
+    }
+    
+    BOOL check = [sender state] == NSOnState;
+    [self setAutoSpeedLimitHour: field];
+    [field setEnabled: check];
+    
+    [fDefaults setBool: check forKey: key];
+}
+
+- (void) setAutoSpeedLimitHour: (id) sender
+{
+    NSString * key = (sender == fSpeedLimitAutoOnField) ? @"SpeedLimitAutoOnHour" : @"SpeedLimitAutoOffHour";
+
+    int hour = [sender intValue];
+    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", hour]] || hour < 0 || hour > 23)
+    {
+        NSBeep();
+        hour = [fDefaults integerForKey: key];
+        [sender setIntValue: hour];
+    }
+    else
+        [fDefaults setInteger: hour forKey: key];
+}
+
 - (void) setRatio: (id) sender
 {
@@ -733 +788 @@
 }
 
-- (void) windowWillClose: (NSNotification *) notification
-{
-    [[self window] makeFirstResponder: nil];
-}
-
 @end
 

trunk/macosx/PrefsWindow.m

@@ -27 +27 @@
 @implementation PrefsWindow
 
--(void) keyDown: (NSEvent *) event
+- (void) keyDown: (NSEvent *) event
 {
+    [super keyDown: event];
     if ([event keyCode] == 53) //esc key
         [self close];
 }
 
+- (void) windowWillClose: (NSNotification *) notification
+{
+    [self makeFirstResponder: nil]; //essentially saves changes on window close
+}
+
 @end