Changeset 16472

Timestamp:

06/29/2006 05:17:38 PM (2 years ago)

Author:

evands

Message:

Smart upgrading of the message styles we removed from 0.8x to the appropiate styles in 1.0. Closes #3980

Files:

• trunk/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m (modified) (2 diffs)
• trunk/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m (modified) (4 diffs)

trunk/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m

@@ -110 +110 @@
-}
-
+- (NSBundle *)defaultMessageStyleBundleBasedOnFailedIdentifier:(NSString *)identifier
+{
+        NSDictionary *styles = [self availableMessageStyles];
+        NSBundle         *defaultMessageStyleBundle = nil;
+
+        if ([identifier isEqualToString:@"com.adiumx.eclipse.style"]) {
+                defaultMessageStyleBundle = [styles objectForKey:@"com.adiumx.gonedark.style"];
+        } else if ([identifier isEqualToString:@"com.adiumx.plastic.style"]) {
+                defaultMessageStyleBundle = [styles objectForKey:@"com.adiumx.stockholm.style"];
+        } else if ([identifier isEqualToString:@"com.adiumx.minimal.style"]) {
+                defaultMessageStyleBundle = [styles objectForKey:@"com.adiumx.minimal_2.0.style"];
+        } 
+
+        if (!defaultMessageStyleBundle) {
+                defaultMessageStyleBundle = [styles objectForKey:WEBKIT_DEFAULT_STYLE];
+        }
+        
+        if (!defaultMessageStyleBundle) {
+                defaultMessageStyleBundle = [[styles allValues] lastObject];
+        }
+        
+        return defaultMessageStyleBundle;
+}
+
-- (NSBundle *)messageStyleBundleWithIdentifier:(NSString *)identifier
-{       
@@ -117 +141 @@
-        //If the style isn't available, use our default.  Or, failing that, any available style
-        if (!bundle) {
-
-
-
+
-        } 
-

trunk/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m

@@ -150 +150 @@
-                style = [prefDict objectForKey:KEY_WEBKIT_STYLE];
-                if (!style || ![popUp_styles selectItemWithRepresentedObject:style]) {
-WEBKIT_DEFAULT_STYLE
+[[plugin messageStyleBundleWithIdentifier:style] bundleIdentifier]
-                        [popUp_styles selectItemWithRepresentedObject:style];
-                }
@@ -157 +157 @@
-                if (!key || [key isEqualToString:KEY_WEBKIT_STYLE]) {
-                        [popUp_variants setMenu:[self _variantsMenu]];
+                        
+                        //Only enable if there are multiple variant choices
+                        [popUp_variants setEnabled:([popUp_variants numberOfItems] > 1)];
-                }
-
@@ -198 +201 @@
-                [checkBox_showUserIcons setEnabled:[[previewController messageStyle] allowsUserIcons]];
-        }
-        
-}
-
@@ -269 +271 @@
-        [imageView_backgroundImage setEnabled:customBackground];
-        [colorWell_customBackgroundColor setEnabled:customBackground];
-        [popUp_variants setEnabled:([popUp_variants numberOfItems] > 0)];
-}
-