Changeset 23957

Timestamp:

06/13/2008 08:04:05 PM (6 months ago)

Author:

evands

Message:

Added AIWebKitPreviewMessageViewController to factor out some code needed only for the preview and allow easy modification of its behavior. Disabled the contextual menu in the preview. Fixes #10016

Files:

• trunk/Adium.xcodeproj/project.pbxproj (modified) (4 diffs)
• trunk/Plugins/WebKit Message View/AIWebKitMessageViewController.h (modified) (2 diffs)
• trunk/Plugins/WebKit Message View/AIWebKitMessageViewController.m (modified) (3 diffs)
• trunk/Plugins/WebKit Message View/AIWebKitPreviewMessageViewController.h (added)
• trunk/Plugins/WebKit Message View/AIWebKitPreviewMessageViewController.m (added)
• trunk/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.h (modified) (2 diffs)
• trunk/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m (modified) (2 diffs)

trunk/Adium.xcodeproj/project.pbxproj

@@ -575 +575 @@
-                34A1AEEE0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1AEED0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.nib */; };
-                34A1B2C30DFDBA1200AC78CF /* AIStringDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1B2C20DFDBA1200AC78CF /* AIStringDebug.m */; };
+                34A1B5A00E03409F00AC78CF /* AIWebKitPreviewMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1B59F0E03409F00AC78CF /* AIWebKitPreviewMessageViewController.m */; };
-                34A1EDAF0DD3AF220090667A /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C103FAE057127A500F3C158 /* WebKit.framework */; };
-                34A1EE990DD3BFB00090667A /* AIFacebookBuddyListManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1EE980DD3BFB00090667A /* AIFacebookBuddyListManager.m */; };
@@ -3076 +3077 @@
-                34A1B2C10DFDBA1200AC78CF /* AIStringDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIStringDebug.h; path = Source/AIStringDebug.h; sourceTree = "<group>"; };
-                34A1B2C20DFDBA1200AC78CF /* AIStringDebug.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIStringDebug.m; path = Source/AIStringDebug.m; sourceTree = "<group>"; };
+                34A1B59E0E03409F00AC78CF /* AIWebKitPreviewMessageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIWebKitPreviewMessageViewController.h; path = "Plugins/WebKit Message View/AIWebKitPreviewMessageViewController.h"; sourceTree = "<group>"; };
+                34A1B59F0E03409F00AC78CF /* AIWebKitPreviewMessageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIWebKitPreviewMessageViewController.m; path = "Plugins/WebKit Message View/AIWebKitPreviewMessageViewController.m"; sourceTree = "<group>"; };
-                34A1EE970DD3BFB00090667A /* AIFacebookBuddyListManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIFacebookBuddyListManager.h; path = "Plugins/Facebook Service/AIFacebookBuddyListManager.h"; sourceTree = "<group>"; };
-                34A1EE980DD3BFB00090667A /* AIFacebookBuddyListManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIFacebookBuddyListManager.m; path = "Plugins/Facebook Service/AIFacebookBuddyListManager.m"; sourceTree = "<group>"; };
@@ -7384 +7387 @@
-                                4B539C5105EFD6FA00E5921A /* AIWebKitMessageViewController.h */,
-                                4B539C5205EFD6FB00E5921A /* AIWebKitMessageViewController.m */,
+                                34A1B59E0E03409F00AC78CF /* AIWebKitPreviewMessageViewController.h */,
+                                34A1B59F0E03409F00AC78CF /* AIWebKitPreviewMessageViewController.m */,
-                                4B539C4B05EFD6CD00E5921A /* AIWebKitMessageViewPlugin.h */,
-                                4B539C4C05EFD6CD00E5921A /* AIWebKitMessageViewPlugin.m */,
@@ -9328 +9333 @@
-                                6360B25A0BF2EB93004CD99B /* AIWebKitDelegate.m in Sources */,
-                                34FA28110C820C3A00FEA944 /* AIPreviewContentMessage.m in Sources */,
+                                34A1B5A00E03409F00AC78CF /* AIWebKitPreviewMessageViewController.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/Plugins/WebKit Message View/AIWebKitMessageViewController.h

@@ -32 +32 @@
-        id                                                      plugin;
-        ESWebView                                       *webView;
-        id                                                      preferencesChangedDelegate;
-        AIChat                                          *chat;
-        BOOL                                            shouldReflectPreferenceChanges;
@@ -107 +106 @@
-- (NSString *)chatContentSource;
-
-
+
+
+
-@end

trunk/Plugins/WebKit Message View/AIWebKitMessageViewController.m

@@ -173 +173 @@
-        [self releaseAllCachedIcons];
-
-        [preferencesChangedDelegate release]; preferencesChangedDelegate = nil;
-        [plugin release]; plugin = nil;
-        [objectsWithUserIconsArray release]; objectsWithUserIconsArray = nil;
@@ -210 +209 @@
-        } else {
-                [storedContentObjects release]; storedContentObjects = nil;
-        }
-}
-
-- (void)setPreferencesChangedDelegate:(id)inDelegate
-{
-        if (inDelegate != preferencesChangedDelegate) {
-                [preferencesChangedDelegate release];
-                preferencesChangedDelegate = [inDelegate retain];
-                
-                [preferencesChangedDelegate preferencesChangedForGroup:PREF_GROUP_WEBKIT_MESSAGE_DISPLAY
-                                                                                                                   key:nil
-                                                                                                                object:nil
-                                                                                                preferenceDict:[[adium preferenceController] preferencesForGroup:PREF_GROUP_WEBKIT_MESSAGE_DISPLAY]
-                                                                                                         firstTime:YES];
-                
-                [preferencesChangedDelegate preferencesChangedForGroup:PREF_GROUP_WEBKIT_BACKGROUND_IMAGES
-                                                                                                                   key:nil
-                                                                                                                object:nil
-                                                                                                preferenceDict:[[adium preferenceController] preferencesForGroup:PREF_GROUP_WEBKIT_BACKGROUND_IMAGES]
-                                                                                                         firstTime:YES];
-        }
-}
@@ -309 +288 @@
-                        isUpdatingWebViewForCurrentPreferences = NO;
-                }
-
-
-
-
-
-
-
-
-
+
-}
-

trunk/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.h

@@ -17 +17 @@
-#import <Adium/AIPreferencePane.h>
-
-
+Preview
-@class JVFontPreviewField, AIImageViewWithImagePicker;
-
@@ -40 +40 @@
-        IBOutlet        NSView                          *view_previewLocation;
-        NSMutableDictionary                             *previewListObjectsDict;
-
+Preview
-        ESWebView                                               *preview;
-        

trunk/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m

@@ -18 +18 @@
-#import "AIWebKitMessageViewPlugin.h"
-#import "AIWebkitMessageViewStyle.h"
-
+Preview
-#import "AIPreviewChat.h"
-#import "ESWebView.h"
@@ -461 +461 @@
-        NSDictionary *listObjects;
-        previewChat = [self previewChatWithDictionary:previewDict fromPath:previewPath listObjects:&listObjects];
-
-  
+Preview
+                       
-
-        //Enable live refreshing of our preview
-        [previewController setShouldReflectPreferenceChanges:YES];      
-        [previewController setPreferencesChangedDelegate:self];
-
+
-        //Add fake users and content to our chat
-        [self _fillContentOfChat:previewChat withDictionary:previewDict fromPath:previewPath listObjects:listObjects];