Changeset 23481

Timestamp:

05/17/2008 11:21:00 PM (7 months ago)

Author:

zacw

Message:

Save and restore the buffered HTML contents of chats along with their containers. This exposes a few things: <AIMessageDisplayController> gain a way to set or get the contents of the "content source"—whatever arbitrary NSString representation of the view they want to store. This is passed back in to "restore" the last save. This also includes a mechanism to state the version/implementation of the "source" so that it doesn't restore the wrong info (i.e., style changes—styles are the identifier for the webkit view). AIMessageView gains a mechanism to reveal its <AIMessageDisplayController>.

Someone more familiar with WebKit stuff able to tell me why it doesn't scroll to the bottom where it's set to do so in AIWebKitMessageViewController.m?

Refs #8360.

Files:

• trunk/Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h (modified) (1 diff)
• trunk/Plugins/Dual Window Interface/AIMessageViewController.h (modified) (1 diff)
• trunk/Plugins/Dual Window Interface/AIMessageViewController.m (modified) (1 diff)
• trunk/Plugins/WebKit Message View/AIWebKitMessageViewController.h (modified) (2 diffs)
• trunk/Plugins/WebKit Message View/AIWebKitMessageViewController.m (modified) (1 diff)
• trunk/Source/AIInterfaceController.h (modified) (1 diff)
• trunk/Source/AIInterfaceController.m (modified) (5 diffs)

trunk/Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h

@@ -396 +396 @@
- */
-@protocol AIMessageDisplayController <NSObject>
+- (void)setChatContentSource:(NSString *)source;
+- (NSString *)chatContentSource;
+- (NSString *)contentSourceName; // Unique name for this particular style of "content source".
+
-- (NSView *)messageView;
-- (NSView *)messageScrollView;

trunk/Plugins/Dual Window Interface/AIMessageViewController.h

@@ -79 +79 @@
-
-//Message Display
+- (NSObject<AIMessageDisplayController> *)messageDisplayController;
-- (NSView *)view;
-- (void)adiumPrint:(id)sender;

trunk/Plugins/Dual Window Interface/AIMessageViewController.m

@@ -372 +372 @@
-
-        [controllerView_messages setNextResponder:textView_outgoing];
+}
+
+/*!
+ * @brief The message display controller
+ */
+- (NSObject<AIMessageDisplayController> *)messageDisplayController
+{
+        return messageDisplayController;
-}
-

trunk/Plugins/WebKit Message View/AIWebKitMessageViewController.h

@@ -1 @@
-
+ 
- * Adium is the legal property of its developers, whose names are listed in the copyright file included
- * with this source distribution.
@@ -97 +97 @@
-- (void)setShouldReflectPreferenceChanges:(BOOL)inValue;
-
+/*!
+ * @brief Set the HTML content for the "Chat" area.
+ */
+- (void)setChatContentSource:(NSString *)source;
+
+/*!
+ * @brief Get the HTML content for the "Chat" area.
+ */
+- (NSString *)chatContentSource;
+
-- (void)setPreferencesChangedDelegate:(id)inDelegate;
-@end

trunk/Plugins/WebKit Message View/AIWebKitMessageViewController.m

@@ -1358 +1358 @@
-}
-
+/*!
+ * @brief Set the HTML content for the "Chat" area.
+ */
+- (void)setChatContentSource:(NSString *)source
+{
+        if (!webViewIsReady) {
+                // If the webview isn't ready yet, wait a very short amount of time before trying again
+                [self performSelector:@selector(setChatContentSource:)
+                                   withObject:source
+                                   afterDelay:0.01];
+        } else {
+                // Add the old "Chat" element to the window.
+                [(DOMHTMLElement *)[[[webView mainFrame] DOMDocument] getElementById:@"Chat"] setOuterHTML:source];
+
+                NSString        *scrollToBottomScript;          
+                if ((scrollToBottomScript = [messageStyle scriptForScrollingAfterAddingMultipleContentObjects])) {
+                        [webView stringByEvaluatingJavaScriptFromString:scrollToBottomScript];
+                }
+        }
+}
+
+/*!
+ * @brief Get the HTML content for the "Chat" area.
+ */
+- (NSString *)chatContentSource
+{
+        return [(DOMHTMLElement *)[[[webView mainFrame] DOMDocument] getElementById:@"Chat"] outerHTML];
+}
+
+/*!
+ * @brief The unique name for this style of "content source"
+ */
+- (NSString *)contentSourceName
+{
+        return [[[messageStyle bundle] bundlePath] lastPathComponent];
+}
+
-@end

trunk/Source/AIInterfaceController.h

@@ -18 +18 @@
-#import <Adium/AIAdiumProtocol.h>
-
-
+, AIMessageViewController
-
-@interface AIInterfaceController : NSObject <AIInterfaceController> {

trunk/Source/AIInterfaceController.m

@@ -44 +44 @@
-#import <Adium/AIServiceIcons.h>
-#import <Adium/AISortController.h>
+#import "AIMessageTabViewItem.h"
-#import "KFTypeSelectTableView.h"
-#import <KNShelfSplitview.h>
+
+#import "AIMessageViewController.h"
-
-#define ERROR_MESSAGE_WINDOW_TITLE              AILocalizedString(@"Adium : Error","Error message window title")
@@ -256 +259 @@
-                //Restore saved containers
-                [self restoreSavedContainers];  
+        } else if (!saveContainers) {
+                [[adium preferenceController] setPreference:nil
+                                                                                         forKey:KEY_CONTAINERS
+                                                                                          group:PREF_GROUP_INTERFACE];
-        }
-}
@@ -414 +421 @@
-                        
-                        // Open the chat into the container we've created above.
-
+
+
+
+
+
+
+
+
+
-                }
-        
@@ -431 +446 @@
-        // end of session.
-        if (!saveContainers) {
-                [[adium preferenceController] setPreference:nil
-                                                                                         forKey:KEY_CONTAINERS
-                                                                                          group:PREF_GROUP_INTERFACE];
-                return;
-        }
@@ -443 +455 @@
-        
-        while ((dict = [enumerator nextObject])) {
-           
+
-                NSEnumerator            *containedEnumerator = [[dict objectForKey:@"Content"] objectEnumerator];
-                AIChat                          *chat;
-                
-                while ((chat = [containedEnumerator nextObject])) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
+                        
+                        [containerContents addObject:newContainerDict];
-                }
-