Changeset 923 for branches/perian-1.1/CPFPerianPrefPaneController.m

Timestamp:

08/02/08 16:24:20 (4 months ago)

Author:

astrange

Message:

Merge trunk to the branch.
Disable ssse3 qpel stuff (https://roundup.mplayerhq.hu/roundup/ffmpeg/issue463)

Files:

• branches/perian-1.1 (modified) (1 prop)
• branches/perian-1.1/CPFPerianPrefPaneController.m (modified) (7 diffs)

branches/perian-1.1/CPFPerianPrefPaneController.m

@@ -403 +403 @@
-
-- (void) dealloc {
+        [[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:UPDATE_STATUS_NOTIFICATION object:nil];
-        [perianForumURL release];
-        [perianDonateURL release];
@@ -657 +658 @@
-                auth = nil;
-        
-        int tag = 0;
-        componentPath = [[self quickTimeComponentDir:userInstalled] stringByAppendingPathComponent:@"Perian.component"];
-        if(auth != nil && !userInstalled)
@@ -688 +688 @@
-- (IBAction)installUninstall:(id)sender
-{
-        [progress_install startAnimation:sender];
-        if(installStatus == InstallStatusInstalled)
-                [NSThread detachNewThreadSelector:@selector(uninstall:) toTarget:self withObject:nil];
@@ -697 +696 @@
-- (void)installComplete:(id)sender
-{
-        [progress_install stopAnimation:sender];
-        [self checkForInstallation];
-}
@@ -779 +777 @@
-
-#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);
@@ -800 +816 @@
-        else
-                CFPreferencesSetAppValue(key, [NSDate distantFuture], perianAppID);
+    
+    CFPreferencesAppSynchronize(perianAppID);
-} 
-
@@ -901 +919 @@
-{       
-        [self setKey:ExternalSubtitlesKey forAppID:perianAppID fromBool:(BOOL)[sender state]];
+    CFPreferencesAppSynchronize(perianAppID);
-}
-