Changeset 453

Timestamp:

04/20/07 08:44:04 (1 year ago)

Author:

gbooker

Message:

Merged over [452]

Files:

• branches/perian-1.0/CPFPerianPrefPaneController.m (modified) (5 diffs)
• branches/perian-1.0/Plists/PerianPane-Info.plist (modified) (1 diff)
• branches/perian-1.0/Plists/PerianUpdateChecker-Info.plist (modified) (1 diff)

branches/perian-1.0/CPFPerianPrefPaneController.m

@@ -7 +7 @@
-#define LastInstalledVersionKey CFSTR("LastInstalledVersion")
-
+@interface NSString (VersionStringCompare)
+- (BOOL)isVersionStringOlderThan:(NSString *)older;
+@end
+
+@implementation NSString (VersionStringCompare)
+- (BOOL)isVersionStringOlderThan:(NSString *)older
+{
+        if([self compare:older] == NSOrderedAscending)
+                return TRUE;
+        if([self hasPrefix:older] && [self length] > [older length] && [self characterAtIndex:[older length]] == 'b')
+                //1.0b1 < 1.0, so check for it.
+                return TRUE;
+        return FALSE;
+}
+@end
+
-@interface CPFPerianPrefPaneController(_private)
-- (void)setAC3DynamicRange:(float)newVal;
@@ -132 +148 @@
-        {
-                NSString *currentVersion = [infoDict objectForKey:BundleVersionKey];
-compare:myVersion] == NSOrderedAscending
+isVersionStringOlderThan:myVersion]
-                        ret = InstallStatusOutdated;
-
-ret = InstallStatusInstalled;          
+else
+       ret = InstallStatusInstalled;
-        }
-        
@@ -147 +163 @@
-        
-        return setWrongLocationInstalled(ret);
+}
+
+- (void)setInstalledVersionString
+{
+        NSString *path = [[self basePathForType:ComponentTypeQuickTime user:userInstalled] stringByAppendingPathComponent:@"Perian.component"];
+        
+        NSDictionary *infoDict = [NSDictionary dictionaryWithContentsOfFile:[path stringByAppendingPathComponent:@"Contents/Info.plist"]];
+        if(infoDict != nil)
+        {
+                NSString *currentVersion = [infoDict objectForKey:BundleVersionKey];
+                [textField_currentVersion setStringValue:currentVersion];
+        }
+        else
+                [textField_currentVersion setStringValue:@"-"];
-}
-
@@ -175 +205 @@
-{
-        NSDictionary *infoDict = [[self bundle] infoDictionary];
-
+
+
+
+
-        if(currentInstallStatus(installStatus) == InstallStatusNotInstalled)
-        {
@@ -242 +275 @@
-    NSString *lastInstVersion = [self getStringFromKey:LastInstalledVersionKey forAppID:perianAppID];
-    NSString *myVersion = [[[self bundle] infoDictionary] objectForKey:BundleVersionKey];
-compare:myVersion] == NSOrderedAscending
+isVersionStringOlderThan:myVersion]
-    {
-        /*Check for temp after an update */

branches/perian-1.0/Plists/PerianPane-Info.plist

@@ -33 +33 @@
-        <string>????</string>
-        <key>CFBundleVersion</key>
-
+b1
-        <key>CFBundleName</key>
-        <string>Perian</string>

branches/perian-1.0/Plists/PerianUpdateChecker-Info.plist

@@ -18 +18 @@
-        <string>????</string>
-        <key>CFBundleVersion</key>
-0.5
+1.0b1
-        <key>NSMainNibFile</key>
-        <string>UpdateCheckerMainMenu</string>