Changeset 917 for trunk/CPFPerianPrefPaneController.m

Timestamp:

07/29/08 16:35:01 (4 months ago)

Author:

astrange

Message:

Delete progress indicators from the prefpane, they're ugly and pointless.
Get rid of alert panels in the update checker and use IPC to show them in the prefpane instead.
Fix the update checker never cleaning up its locks.
Synchronize user defaults more often since it seems necessary.
Delete code for not running too often in the update checker, it's a duplicate of the same more-maintained code in Perian.

This requires merging the nib into release branch again...

Files:

• trunk/CPFPerianPrefPaneController.m (modified) (4 diffs)

trunk/CPFPerianPrefPaneController.m

@@ -401 +401 @@
-
-- (void) dealloc {
+        [[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:UPDATE_STATUS_NOTIFICATION object:nil];
-        [perianForumURL release];
-        [perianDonateURL release];
@@ -654 +655 @@
-                auth = nil;
-        
-        int tag = 0;
-        componentPath = [[self quickTimeComponentDir:userInstalled] stringByAppendingPathComponent:@"Perian.component"];
-        if(auth != nil && !userInstalled)
@@ -685 +685 @@
-- (IBAction)installUninstall:(id)sender
-{
-        [progress_install startAnimation:sender];
-        if(installStatus == InstallStatusInstalled)
-                [NSThread detachNewThreadSelector:@selector(uninstall:) toTarget:self withObject:nil];
@@ -694 +693 @@
-- (void)installComplete:(id)sender
-{
-        [progress_install stopAnimation:sender];
-        [self checkForInstallation];
-}
-
-#pragma mark Check Updates
+- (void)updateCheckStatusChanged:(NSNotification*)notification
+{
+        NSString *status = [notification object];
+        
+        //FIXME localize these
+        if ([status isEqualToString:@"Starting"]) {
+                [textField_updateStatus setStringValue:@"Checking..."];
+        } else if ([status isEqualToString:@"Error"]) {
+                [textField_updateStatus setStringValue:@"Couldn't reach the update server."];
+        } else if ([status isEqualToString:@"NoUpdates"]) {
+                [textField_updateStatus setStringValue:@"There are no updates."];
+        } else if ([status isEqualToString:@"NoUpdates"]) {
+                [textField_updateStatus setStringValue:@"Updates found!"];
+        }
+}
+
-- (IBAction)updateCheck:(id)sender 
-{
-        FSRef updateCheckRef;
-        
+        [[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:UPDATE_STATUS_NOTIFICATION object:nil];
+        [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(updateCheckStatusChanged:) name:UPDATE_STATUS_NOTIFICATION object:nil];
-        CFPreferencesSetAppValue((CFStringRef)NEXT_RUN_KEY, NULL, perianAppID);
-        CFPreferencesSetAppValue((CFStringRef)MANUAL_RUN_KEY, [NSNumber numberWithBool:YES], perianAppID);