Changeset 711

Timestamp:

Jul 30, 2006, 9:49:58 PM (17 years ago)

Author:

livings124

Message:

No delay in updating dock badge when changing setting in prefs.

Location:

trunk/macosx

Files:

• Badger.h (modified) (1 diff)
• Badger.m (modified) (2 diffs)
• Controller.h (modified) (1 diff)
• Controller.m (modified) (3 diffs)
• PrefsController.m (modified) (1 diff)

trunk/macosx/Badger.h

@@ -39 +39 @@
 }
 
-- (void) updateBadgeWithCompleted: (int) completed
-                    uploadRate: (float) uploadRate
-                    downloadRate: (float) downloadRate;
+- (void) updateBadgeWithCompleted: (int) completed uploadRate: (float) uploadRate downloadRate: (float) downloadRate;
 - (void) clearBadge;
 

trunk/macosx/Badger.m

@@ -73 +73 @@
 }
 
-- (void) updateBadgeWithCompleted: (int) completed
-                    uploadRate: (float) uploadRate
-                    downloadRate: (float) downloadRate
+- (void) updateBadgeWithCompleted: (int) completed uploadRate: (float) uploadRate downloadRate: (float) downloadRate
 {
     NSImage * dockIcon = nil;
@@ -187 +185 @@
 
     [NSApp setApplicationIconImage: fDockIcon];
+    
+    fCompleted = 0;
+    fSpeedShown = NO;
 }
 

trunk/macosx/Controller.h

@@ -177 +177 @@
 - (void) toggleAdvancedBar: (id) sender;
 
+- (void) resetDockBadge: (NSNotification *) notification;
+
 - (void) setWindowSizeToFit;
 - (NSRect) sizedWindowFrame;

trunk/macosx/Controller.m

@@ -327 +327 @@
     [nc addObserver: self selector: @selector(reloadInspectorSettings:)
                     name: @"TorrentSettingChange" object: nil];
+    
+    //change that just impacts the dock badge
+    [nc addObserver: self selector: @selector(resetDockBadge:)
+                    name: @"DockBadgeChange" object: nil];
 
     //timer to update the interface every second
@@ -2097 +2101 @@
 }
 
+- (void) resetDockBadge: (NSNotification *) notification
+{
+    float downloadRate, uploadRate;
+    tr_torrentRates(fLib, & downloadRate, & uploadRate);
+    
+    [fBadger updateBadgeWithCompleted: fCompleted uploadRate: uploadRate downloadRate: downloadRate];
+}
+
 - (NSRect) windowWillUseStandardFrame: (NSWindow *) window defaultFrame: (NSRect) defaultFrame
 {
@@ -2150 +2162 @@
     {
         fCompleted = 0;
-        [self updateUI: nil];
+        [self resetDockBadge: nil];
     }
     

trunk/macosx/PrefsController.m

@@ -498 +498 @@
         [fDefaults setBool: [sender state] forKey: @"BadgeUploadRate"];
     else;
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"DockBadgeChange" object: self];
 }