adium 3856:f9382684911b: Extend the border around the entire mes...
commits at adium.im
commits at adium.im
Tue Apr 12 21:22:37 UTC 2011
details: http://hg.adium.im/adium/rev/f9382684911b
revision: 3856:f9382684911b
branch: RemoveRBSplitView
author: Frank Dowsett <wixardy at adium.im>
date: Tue Apr 12 15:48:09 2011 -0400
Extend the border around the entire message view so that top and bottom tabs have a divider between them and their content.
Subject: adium 3857:7ed7a2365153: Save the user list's size on resize.
details: http://hg.adium.im/adium/rev/7ed7a2365153
revision: 3857:7ed7a2365153
branch: RemoveRBSplitView
author: Frank Dowsett <wixardy at adium.im>
date: Tue Apr 12 15:48:13 2011 -0400
Save the user list's size on resize.
Subject: adium 3858:5bcce1949906: Setup the userlist in init for when the view is resized from hidden.
details: http://hg.adium.im/adium/rev/5bcce1949906
revision: 3858:5bcce1949906
branch: RemoveRBSplitView
author: Frank Dowsett <wixardy at adium.im>
date: Tue Apr 12 15:48:22 2011 -0400
Setup the userlist in init for when the view is resized from hidden.
Subject: adium 3859:36e5308aa1ee: Close RemoveRBSplitView.
details: http://hg.adium.im/adium/rev/36e5308aa1ee
revision: 3859:36e5308aa1ee
branch: RemoveRBSplitView
author: Frank Dowsett <wixardy at adium.im>
date: Tue Apr 12 15:59:45 2011 -0400
Close RemoveRBSplitView.
Subject: adium 3860:8833833b61ff: Merging RemoveRBSplitView into default.
details: http://hg.adium.im/adium/rev/8833833b61ff
revision: 3860:8833833b61ff
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Tue Apr 12 16:07:18 2011 -0400
Merging RemoveRBSplitView into default.
Subject: adium 3861:ee01675e683f: Merge default into FloatingMessageWindowTextField.
details: http://hg.adium.im/adium/rev/ee01675e683f
revision: 3861:ee01675e683f
branch: FloatingMessageWindowTextField
author: Frank Dowsett <wixardy at adium.im>
date: Tue Apr 12 17:20:25 2011 -0400
Merge default into FloatingMessageWindowTextField.
diffs (truncated from 25761 to 1000 lines):
diff -r 61535d0ccea6 -r ee01675e683f Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Fri Apr 01 02:48:31 2011 -0400
+++ b/Adium.xcodeproj/project.pbxproj Tue Apr 12 17:20:25 2011 -0400
@@ -1421,6 +1421,7 @@
6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; };
6EC1685006C170A000F9FAD3 /* InviteToChatWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.nib */; };
766ABAB61306D1020049FFB7 /* AIUnreadMessagesTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */; };
+ 767EFD221345D5EE00957582 /* AIMessageEntryScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 767EFD211345D5ED00957582 /* AIMessageEntryScrollView.m */; };
76889DEB12D3CA17007AEF00 /* GetInfo.png in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEA12D3CA17007AEF00 /* GetInfo.png */; };
76889DEF12D3CA40007AEF00 /* Personal.png in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEE12D3CA40007AEF00 /* Personal.png */; };
76C1AF9C125A906A00D269A9 /* AIAdiumURLProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 76C1AF9B125A906A00D269A9 /* AIAdiumURLProtocol.m */; };
@@ -4634,6 +4635,8 @@
6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvOutgoingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m; sourceTree = SOURCE_ROOT; };
766ABAB41306D1020049FFB7 /* AIUnreadMessagesTooltip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIUnreadMessagesTooltip.h; path = Source/AIUnreadMessagesTooltip.h; sourceTree = "<group>"; };
766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIUnreadMessagesTooltip.m; path = Source/AIUnreadMessagesTooltip.m; sourceTree = "<group>"; };
+ 767EFD201345D5ED00957582 /* AIMessageEntryScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMessageEntryScrollView.h; path = Source/AIMessageEntryScrollView.h; sourceTree = "<group>"; };
+ 767EFD211345D5ED00957582 /* AIMessageEntryScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMessageEntryScrollView.m; path = Source/AIMessageEntryScrollView.m; sourceTree = "<group>"; };
76889DEA12D3CA17007AEF00 /* GetInfo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = GetInfo.png; path = Resources/GetInfo.png; sourceTree = "<group>"; };
76889DEE12D3CA40007AEF00 /* Personal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Personal.png; path = Resources/Personal.png; sourceTree = "<group>"; };
76C1AF9A125A906A00D269A9 /* AIAdiumURLProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAdiumURLProtocol.h; path = "Plugins/WebKit Message View/AIAdiumURLProtocol.h"; sourceTree = "<group>"; };
@@ -6903,6 +6906,8 @@
F55B416E03AB8C3201A8010A /* AIPasswordPromptController.h */,
F55B416603AB8BFC01A8010A /* AIPasswordPromptController.m */,
349DDD5206406A7D00542726 /* stackImage.png */,
+ 767EFD201345D5ED00957582 /* AIMessageEntryScrollView.h */,
+ 767EFD211345D5ED00957582 /* AIMessageEntryScrollView.m */,
);
name = Interface;
sourceTree = "<group>";
@@ -10592,6 +10597,7 @@
5A5F8BBD12D560E400019727 /* AIDockNameOverlay.m in Sources */,
5A17D65D130F76B4002C852F /* AIGradientView.m in Sources */,
97AF5CDB13191DE200550C41 /* AIContactListUserPictureMenuController.m in Sources */,
+ 767EFD221345D5EE00957582 /* AIMessageEntryScrollView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff -r 61535d0ccea6 -r ee01675e683f ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Fri Apr 01 02:48:31 2011 -0400
+++ b/ChangeLogs/Changes.txt Tue Apr 12 17:20:25 2011 -0400
@@ -44,10 +44,11 @@
* Rounded user icon in the chat window toolbar. (#3757)
Message View
- * Added the "lastFocus" class for message styles to the latest message received while the chat didn't have focus.
+ * Added the "lastFocus" class for message styles to the latest message received while the chat didn't have focus, and "regainedFocus" for the first message received while the chat has regained focus after having previously lost it.
Transcript Viewer
* Added next/previous buttons for highlighted search terms within a transcript (similar to Safari).
+ * Greatly improved reliability and speed of log indexing and search.
User Picture (Buddy Icons)
* Ability to resize animated gifs that are too large (#9885)
@@ -72,12 +73,15 @@
* Debug logging: All GLib's errors and messages, and all exceptions are now logged to the Debug Window.
-Version 1.4.2 (X/X/201X)
- * Updated to libpurple 2.x.x. Highlights of applicable changes:
- *
+Version 1.4.2 (X/X/2011)
+ * Updated to libpurple 2.7.11. Highlights of applicable changes:
+ * MSN: Fixed bug that prevented adding contacts to your contact list in certain circumstances. (#14965)
+ * MSN: Added support for MSNP16 including multiple points of presence (MPOP) which allows multiple simultaneous sign-ins and which should resolve connection problems involving the "Signed in from another location" error. (#13654)
+ * MSN: Fixed crash related to Direct Connections. (#14650)
+ * ICQ: Fixed a bug where some contacts from your contact list might not show up. Affected non-English users the most. (#14901)
Logging
- * Added a "Log only certain accounts" setting to Adium's "General" preferences. (#8)
+ * Added a "Log only certain accounts" setting to Adium's "General" preferences. (#8, #14522)
* Added a "Log secure chats" setting to Adium's "General" preferences. (#94)
* Renamed "Save opened chats when quitting" setting to "Reopen chats from last time on startup" for clarity. (#14651)
@@ -87,14 +91,22 @@
* Mockie: new mention and focus indicators. (#14420)
* Fixed Renkoo to not scroll to bottom on new content regardless of scroll position. (#14331)
* Fixed Stockholm's breaking with RTL text. (#10403)
- * Fixed iChat emoticons in Snow Leopard on case-sensitive file systems. (#14936)
+ * Fixed message time popup intefering with copy and paste (#14361)
+ * Fixed iChat emoticons in Snow Leopard on case-sensitive file systems. (#14936)
+
+ Facebook
+ * Changed Adium's Facebook account option to connect via the official XMPP API.
+ *
ICQ
* Fixed ICQ disconnections going unnoticed. (#14229)
* Fixed hang caused by reading badly formatted transcripts from ICQ. (#14627)
IRC
- * Fixed crash caused by wrongly-encoded characters in IRC. (#13351)
+ * Fixed a crash related to Cyrillic nicknames in IRC. (#13351)
+
+ MSN
+ * Added a preference to enable/disable MSN Direct Connections. (#14602)
XMPP
* Double confirmation is now required to delete and unregister an XMPP account. (#14357)
@@ -106,12 +118,17 @@
* Fixed 1.4.1 regression of arrows not showing up in the Events tables of the Preference pane and the Get Info pane for active events. (#14629)
* Fixed a hang that occurred when required parts of loaded message styles were missing. (#7438)
* Fixed bookmark icons not updating when changing icon sets. (#13221)
+ * Fixed two memory leaks. (Adrian Godoroja) (#15047)
* Fixed "Remove Link" showing up twice in the input box's context menu on 10.6. (Shawn Khan) (#14454)
* Fixed 1.4 regression where selection of the active voice in the "Speak Event" and "Speak Text" contact alert actions failed. (#14574)
+ * Fixed positioning of selected icon in Recent Icons not being reapplied when icon is reselected. (Adrian Godoroja) (#9908)
Localisation
- * Updated the Localizable.strings files, adding missing translatable strings/nibs. (#14588)
+ * Updated the Localizable.strings files, adding missing translatable strings/nibs. (#14588, #14582)
+ * Updated and improved German localisation.
+ * Updated and improved Dutch localisation.
* Updated Swedish localisation. (#14993)
+ * Updated the British English localisation. (#15116)
* Fixed an issue in the Czech localisation. (#14586)
diff -r 61535d0ccea6 -r ee01675e683f Frameworks/AIUtilities Framework/Resources/en_GB.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/en_GB.lproj/Localizable.strings has changed
diff -r 61535d0ccea6 -r ee01675e683f Frameworks/AIUtilities Framework/Source/AISegmentedControl.m
--- a/Frameworks/AIUtilities Framework/Source/AISegmentedControl.m Fri Apr 01 02:48:31 2011 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AISegmentedControl.m Tue Apr 12 17:20:25 2011 -0400
@@ -34,18 +34,7 @@
- (void)showMenuForSegment:(NSInteger)segment
{
NSView *view = [self window].contentView;
- if ([NSApp isOnSnowLeopardOrBetter])
- [self.menu popUpMenuPositioningItem:nil atLocation:self.frame.origin inView:view];
- else{
- NSRect frame = self.frame;
- frame.origin.x += 10.0f;
- frame.origin.y -= 23.0f;
-
- NSPopUpButtonCell *popUpButtonCell = [[[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO] autorelease];
- [popUpButtonCell setMenu:self.menu];
- [popUpButtonCell selectItem:nil];
- [popUpButtonCell performClickWithFrame:frame inView:view];
- }
+ [self.menu popUpMenuPositioningItem:nil atLocation:self.frame.origin inView:view];
}
@end
diff -r 61535d0ccea6 -r ee01675e683f Frameworks/AIUtilities Framework/Source/AISharedWriterQueue.m
--- a/Frameworks/AIUtilities Framework/Source/AISharedWriterQueue.m Fri Apr 01 02:48:31 2011 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AISharedWriterQueue.m Tue Apr 12 17:20:25 2011 -0400
@@ -42,8 +42,7 @@
[newWriterQueue release];
[sharedWriterQueue setMaxConcurrentOperationCount:1];
- if ([NSApp isOnSnowLeopardOrBetter])
- [sharedWriterQueue performSelector:@selector(setName:) withObject:@"AISharedWriterQueue"];
+ [sharedWriterQueue setName:@"AISharedWriterQueue"];
}
return sharedWriterQueue;
diff -r 61535d0ccea6 -r ee01675e683f Frameworks/Adium Framework/Resources/en_GB.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/en_GB.lproj/EmoticonNames.strings has changed
diff -r 61535d0ccea6 -r ee01675e683f Frameworks/Adium Framework/Resources/en_GB.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/en_GB.lproj/Localizable.strings has changed
diff -r 61535d0ccea6 -r ee01675e683f Frameworks/Adium Framework/Source/AIMessageEntryTextView.m
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Fri Apr 01 02:48:31 2011 -0400
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Tue Apr 12 17:20:25 2011 -0400
@@ -137,7 +137,7 @@
historyArray = [[NSMutableArray alloc] initWithObjects:@"",nil];
pushArray = [[NSMutableArray alloc] init];
currentHistoryLocation = 0;
- [self setDrawsBackground:YES];
+ [self setDrawsBackground:NO];
_desiredSizeCached = NSMakeSize(0,0);
characterCounter = nil;
characterCounterPrefix = nil;
@@ -419,22 +419,20 @@
[self setContinuousSpellCheckingEnabled:[[prefDict objectForKey:KEY_SPELL_CHECKING] boolValue]];
}
- if ([NSApp isOnSnowLeopardOrBetter]) {
- if (!key || [key isEqualToString:KEY_SUBSTITUTION_DASH]) {
+ if (!key || [key isEqualToString:KEY_SUBSTITUTION_DASH]) {
[self setAutomaticDashSubstitutionEnabled:[[prefDict objectForKey:KEY_SUBSTITUTION_DASH] boolValue]];
- }
+ }
- if (!key || [key isEqualToString:KEY_SUBSTITUTION_DATA_DETECTORS]) {
+ if (!key || [key isEqualToString:KEY_SUBSTITUTION_DATA_DETECTORS]) {
[self setAutomaticDataDetectionEnabled:[[prefDict objectForKey:KEY_SUBSTITUTION_DATA_DETECTORS] boolValue]];
- }
+ }
- if (!key || [key isEqualToString:KEY_SUBSTITUTION_REPLACEMENT]) {
+ if (!key || [key isEqualToString:KEY_SUBSTITUTION_REPLACEMENT]) {
[self setAutomaticTextReplacementEnabled:[[prefDict objectForKey:KEY_SUBSTITUTION_REPLACEMENT] boolValue]];
- }
+ }
- if (!key || [key isEqualToString:KEY_SUBSTITUTION_SPELLING]) {
+ if (!key || [key isEqualToString:KEY_SUBSTITUTION_SPELLING]) {
[self setAutomaticSpellingCorrectionEnabled:[[prefDict objectForKey:KEY_SUBSTITUTION_SPELLING] boolValue]];
- }
}
if (!key || [key isEqualToString:KEY_SUBSTITUTION_COPY_PASTE]) {
diff -r 61535d0ccea6 -r ee01675e683f Other/Adium Spotlight Importer/GetMetadataForFile.m
--- a/Other/Adium Spotlight Importer/GetMetadataForFile.m Fri Apr 01 02:48:31 2011 -0400
+++ b/Other/Adium Spotlight Importer/GetMetadataForFile.m Tue Apr 12 17:20:25 2011 -0400
@@ -45,7 +45,7 @@
----------------------------------------------------------------------------- */
Boolean GetMetadataForXMLLog(NSMutableDictionary *attributes, NSString *pathToFile);
-NSString *GetTextContentForXMLLog(NSString *pathToFile);
+NSString *CopyTextContentForXMLLogData(NSData *logData);
Boolean GetMetadataForFile(void* thisInterface,
CFMutableDictionaryRef attributes,
@@ -73,6 +73,73 @@
return success;
}
+static CFStringRef ResolveUTI(CFStringRef contentTypeUTI, NSURL *urlToFile) {
+ //Deteremine the UTI type if we weren't passed one
+ CFStringRef pathExtension = (CFStringRef)[urlToFile pathExtension];
+ if (contentTypeUTI == NULL) {
+ if (CFStringCompare(pathExtension, CFSTR("chatLog"), (kCFCompareBackwards | kCFCompareCaseInsensitive)) == kCFCompareEqualTo) {
+ contentTypeUTI = CFSTR("com.adiumx.xmllog");
+ } else if (CFStringCompare(pathExtension, CFSTR("AdiumXMLLog"), (kCFCompareBackwards | kCFCompareCaseInsensitive)) == kCFCompareEqualTo) {
+ contentTypeUTI = CFSTR("com.adiumx.xmllog");
+ } else {
+ //Treat all other log extensions as HTML logs (plaintext will come out fine this way, too)
+ contentTypeUTI = CFSTR("com.adiumx.htmllog");
+ }
+ }
+ return contentTypeUTI;
+}
+
+NSData *CopyDataForURL(CFStringRef contentTypeUTI, NSURL *urlToFile) {
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ NSData *content;
+ contentTypeUTI = ResolveUTI(contentTypeUTI, urlToFile);
+
+ if (CFEqual(contentTypeUTI, CFSTR("com.adiumx.htmllog"))) {
+ content = [[NSData alloc] initWithContentsOfURL:urlToFile options:NSDataReadingUncached error:NULL];
+ } else if (CFEqual(contentTypeUTI, CFSTR("com.adiumx.xmllog"))) {
+ BOOL isDir;
+ NSString *path = [urlToFile path];
+ if ([[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDir]) {
+ if (isDir) {
+ /* If we have a chatLog bundle, we want to get the text content for the xml file inside */
+ urlToFile = [NSURL fileURLWithPath:[path stringByAppendingPathComponent:[[[path lastPathComponent] stringByDeletingPathExtension] stringByAppendingPathExtension:@"xml"]]];
+ }
+
+ content = [[NSData alloc] initWithContentsOfURL:urlToFile options:NSUncachedRead error:NULL];
+
+ } else {
+ content = nil;
+ }
+
+ } else {
+ content = nil;
+ NSLog(@"We were passed %@, of type %@, which is an unknown type", urlToFile, contentTypeUTI);
+ }
+
+ [pool release];
+
+ return content;
+}
+
+NSData *CopyDataForFile(CFStringRef contentTypeUTI, CFStringRef pathToFile) {
+ return CopyDataForURL(contentTypeUTI, [NSURL fileURLWithPath:(NSString *)pathToFile]);
+}
+
+CFStringRef CopyTextContentForFileData(CFStringRef contentTypeUTI, NSURL *urlToFile, NSData *fileData) {
+ if (!fileData) return NULL;
+
+ contentTypeUTI = ResolveUTI(contentTypeUTI, urlToFile);
+
+ NSString *result = nil;
+
+ if (CFEqual(contentTypeUTI,CFSTR("com.adiumx.htmllog"))) {
+ result = CopyTextContentForHTMLLogData(fileData);
+ } else if (CFEqual(contentTypeUTI, CFSTR("com.adiumx.xmllog"))) {
+ result = CopyTextContentForXMLLogData(fileData);
+ }
+ return (CFStringRef)result;
+}
+
/*!
* @brief Copy the text content for a file
*
@@ -86,46 +153,9 @@
CFStringRef CopyTextContentForFile(CFStringRef contentTypeUTI,
CFStringRef pathToFile)
{
- NSAutoreleasePool *pool;
- CFStringRef textContent;
- pool = [[NSAutoreleasePool alloc] init];
-
- //Deteremine the UTI type if we weren't passed one
- if (contentTypeUTI == NULL) {
- if (CFStringCompare((CFStringRef)[(NSString *)pathToFile pathExtension],
- CFSTR("chatLog"),
- (kCFCompareBackwards | kCFCompareCaseInsensitive)) == kCFCompareEqualTo) {
- contentTypeUTI = CFSTR("com.adiumx.xmllog");
- } else if (CFStringCompare((CFStringRef)[(NSString *)pathToFile pathExtension],
- CFSTR("AdiumXMLLog"),
- (kCFCompareBackwards | kCFCompareCaseInsensitive)) == kCFCompareEqualTo) {
- contentTypeUTI = CFSTR("com.adiumx.xmllog");
- } else {
- //Treat all other log extensions as HTML logs (plaintext will come out fine this way, too)
- contentTypeUTI = CFSTR("com.adiumx.htmllog");
- }
- }
-
- if (CFStringCompare(contentTypeUTI, CFSTR("com.adiumx.htmllog"), kCFCompareBackwards) == kCFCompareEqualTo) {
- textContent = (CFStringRef)GetTextContentForHTMLLog((NSString *)pathToFile);
- } else if (CFStringCompare(contentTypeUTI, (CFStringRef)@"com.adiumx.xmllog", kCFCompareBackwards) == kCFCompareEqualTo) {
- BOOL isDir;
- if ([[NSFileManager defaultManager] fileExistsAtPath:(NSString *)pathToFile isDirectory:&isDir]) {
- /* If we have a chatLog bundle, we want to get the text content for the xml file inside */
- if (isDir) pathToFile = (CFStringRef)[(NSString *)pathToFile stringByAppendingPathComponent:
- [[[(NSString *)pathToFile lastPathComponent] stringByDeletingPathExtension] stringByAppendingPathExtension:@"xml"]];
-
- textContent = (CFStringRef)GetTextContentForXMLLog((NSString *)pathToFile);
- } else {
- textContent = nil;
- }
-
- } else {
- textContent = nil;
- NSLog(@"We were passed %@, of type %@, which is an unknown type",pathToFile,contentTypeUTI);
- }
-
- if (textContent) CFRetain(textContent);
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ NSData *logData = CopyDataForFile(contentTypeUTI, pathToFile);
+ CFStringRef textContent = CopyTextContentForFileData(contentTypeUTI, [NSURL fileURLWithPath:(NSString *)pathToFile], logData);
[pool release];
return textContent;
@@ -275,23 +305,13 @@
return ret;
}
-NSString *GetTextContentForXMLLog(NSString *pathToFile)
-{
- NSError *err=nil;
- NSURL *furl = [NSURL fileURLWithPath:(NSString *)pathToFile];
- NSString *contentString = nil;
- NSXMLDocument *xmlDoc = nil;
- NSData *data = [NSData dataWithContentsOfURL:furl options:NSUncachedRead error:&err];
- if (data) {
- xmlDoc = [[NSXMLDocument alloc] initWithData:data options:NSXMLNodePreserveCDATA error:&err];
- }
-
- if (xmlDoc) {
- NSArray *contentArray = [xmlDoc nodesForXPath:@"//message//text()"
- error:&err];
+NSString *CopyTextContentForXMLLogData(NSData *data) {
+ NSString *contentString = nil;
+ NSXMLDocument *xmlDoc = [[NSXMLDocument alloc] initWithData:data options:NSXMLNodePreserveCDATA error:NULL];
+ if (xmlDoc) {
+ NSArray *contentArray = [xmlDoc nodesForXPath:@"//message//text()" error:NULL];
contentString = [contentArray componentsJoinedByString:@" "];
- [xmlDoc release];
- }
-
- return contentString;
+ [xmlDoc release];
+ }
+ return contentString;
}
diff -r 61535d0ccea6 -r ee01675e683f Other/Adium Spotlight Importer/GetMetadataForHTMLLog.h
--- a/Other/Adium Spotlight Importer/GetMetadataForHTMLLog.h Fri Apr 01 02:48:31 2011 -0400
+++ b/Other/Adium Spotlight Importer/GetMetadataForHTMLLog.h Tue Apr 12 17:20:25 2011 -0400
@@ -17,4 +17,4 @@
#import <Foundation/Foundation.h>
Boolean GetMetadataForHTMLLog(NSMutableDictionary *attributes, NSString *pathToFile);
-NSString *GetTextContentForHTMLLog(NSString *pathToFile);
+NSString *CopyTextContentForHTMLLogData(NSData *logData);
diff -r 61535d0ccea6 -r ee01675e683f Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m
--- a/Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m Fri Apr 01 02:48:31 2011 -0400
+++ b/Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m Tue Apr 12 17:20:25 2011 -0400
@@ -51,38 +51,20 @@
return date;
}
-NSString *GetTextContentForHTMLLog(NSString *pathToFile)
-{
- /* Perhaps we want to decode the HTML instead of stripping it so we can process
+NSString *CopyTextContentForHTMLLogData(NSData *logData) {
+ /* Perhaps we want to decode the HTML instead of stripping it so we can process
* the attributed contents to turn links into link (URL) for searching purposes...
*/
- NSString *textContent;
-
- NSMutableData *UTF8Data = nil;
- char *UTF8HTMLCString = nil;
-
- int fd = open([pathToFile fileSystemRepresentation], O_RDONLY);
- if (fd > -1) {
- struct stat sb;
- if (fstat(fd, &sb) == 0) {
- UTF8Data = [NSMutableData dataWithLength:(NSUInteger)(sb.st_size + 1ULL)];
- UTF8HTMLCString = [UTF8Data mutableBytes];
- if (UTF8HTMLCString != NULL)
- read(fd, UTF8HTMLCString, (size_t)sb.st_size);
- }
- close(fd);
- }
-
- if (UTF8HTMLCString) {
+ NSString *textContent = nil;
+ const char* UTF8HTMLCString = [logData bytes];
+ if (UTF8HTMLCString) {
//Strip the HTML markup
char *plainText = gaim_markup_strip_html(UTF8HTMLCString);
- textContent = [NSString stringWithUTF8String:plainText];
+ textContent = [[NSString alloc] initWithUTF8String:plainText];
free((void *)plainText);
- } else {
- textContent = nil;
}
-
- return textContent;
+
+ return textContent;
}
Boolean GetMetadataForHTMLLog(NSMutableDictionary *attributes, NSString *pathToFile)
@@ -122,11 +104,15 @@
forKey:(NSString *)kMDItemLastUsedDate];
}
- NSString *textContent;
- if ((textContent = GetTextContentForHTMLLog(pathToFile))) {
+ NSData *logData = [[NSData alloc] initWithContentsOfURL:[NSURL fileURLWithPath:pathToFile isDirectory:NO]
+ options:NSDataReadingUncached error:NULL];
+ NSString *textContent = nil;
+ if ((textContent = CopyTextContentForHTMLLogData(logData))) {
[attributes setObject:textContent
forKey:(NSString *)kMDItemTextContent];
}
+ [logData release];
+ [textContent release];
[attributes setObject:serviceClass
forKey:@"com_adiumX_service"];
diff -r 61535d0ccea6 -r ee01675e683f Plists/Info.plist
--- a/Plists/Info.plist Fri Apr 01 02:48:31 2011 -0400
+++ b/Plists/Info.plist Tue Apr 12 17:20:25 2011 -0400
@@ -474,11 +474,6 @@
<string>public.app-category.social-networking</string>
<key>LSMinimumSystemVersion</key>
<string>10.6.0</string>
- <key>LSMinimumSystemVersionByArchitecture</key>
- <dict>
- <key>x86_64</key>
- <string>10.6.0</string>
- </dict>
<key>LSRequiresNativeExecution</key>
<true/>
<key>NSAppleScriptEnabled</key>
diff -r 61535d0ccea6 -r ee01675e683f Plugins/Dual Window Interface/AIMessageViewController.h
--- a/Plugins/Dual Window Interface/AIMessageViewController.h Fri Apr 01 02:48:31 2011 -0400
+++ b/Plugins/Dual Window Interface/AIMessageViewController.h Tue Apr 12 17:20:25 2011 -0400
@@ -26,7 +26,6 @@
IBOutlet NSView *view_contents;
//Split views
- IBOutlet NSSplitView *splitView_textEntryHorizontal;
IBOutlet NSSplitView *splitView_verticalSplit;
//Message Display
diff -r 61535d0ccea6 -r ee01675e683f Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m Fri Apr 01 02:48:31 2011 -0400
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m Tue Apr 12 17:20:25 2011 -0400
@@ -146,6 +146,7 @@
//Configure our views
[self _configureMessageDisplay];
[self _configureTextEntryView];
+ [self _configureUserList];
//Draw background
[actionBarView setBackgroundColor:[NSColor colorWithCalibratedWhite:0.98f alpha:1.0f]];
@@ -739,10 +740,10 @@
if (userListOnRight) {
[view_userList removeFromSuperviewWithoutNeedingDisplay];
[splitView_verticalSplit addSubview:view_userList];
- userListFrame.origin.x = splitView_textEntryHorizontal.frame.size.width;
+ userListFrame.origin.x = view_messages.frame.size.width;
} else {
- [[splitView_textEntryHorizontal superview] removeFromSuperviewWithoutNeedingDisplay];
- [splitView_verticalSplit addSubview:[splitView_textEntryHorizontal superview]];
+ [view_messages removeFromSuperviewWithoutNeedingDisplay];
+ [splitView_verticalSplit addSubview:view_messages];
userListFrame.origin.x = 0.0f;
}
[view_userList setFrame:userListFrame];
@@ -891,10 +892,9 @@
*/
- (void)_updateTextEntryViewHeight
{
+#warning unused.
//Store the user's height so that autoresizing isn't messed up
CGFloat oldeHeight = entryMinHeight;
- [splitView_textEntryHorizontal setPosition:[self _textEntryViewProperHeightIgnoringUserMininum:NO]
- ofDividerAtIndex:0];
entryMinHeight = oldeHeight;
}
@@ -919,11 +919,11 @@
desiredHeight = ENTRY_TEXTVIEW_MIN_HEIGHT;
//Or above the allowed height
- if (desiredHeight >= (splitView_textEntryHorizontal.frame.size.height * MESSAGE_VIEW_MIN_HEIGHT_RATIO))
- return (splitView_textEntryHorizontal.frame.size.height * MESSAGE_VIEW_MIN_HEIGHT_RATIO);
+ if (desiredHeight >= (view_messages.frame.size.height * MESSAGE_VIEW_MIN_HEIGHT_RATIO))
+ return (view_messages.frame.size.height * MESSAGE_VIEW_MIN_HEIGHT_RATIO);
- CGFloat splitViewHeight = NSHeight(splitView_textEntryHorizontal.frame);
- CGFloat dividerThickness = [splitView_textEntryHorizontal dividerThickness];
+ CGFloat splitViewHeight = NSHeight(view_messages.frame);
+ CGFloat dividerThickness = [view_messages dividerThickness];
return splitViewHeight - desiredHeight - dividerThickness;
}
@@ -1128,8 +1128,6 @@
*/
- (void)_showUserListView
{
- //Configure the user list
- [self _configureUserList];
[self updateUserCount];
[view_userList setHidden:NO];
@@ -1156,7 +1154,7 @@
*/
- (void)_configureUserList
{
- if (!userListController) {
+ if (chat.isGroupChat) {
NSDictionary *themeDict = [NSDictionary dictionaryNamed:USERLIST_THEME forClass:[self class]];
NSDictionary *layoutDict = [NSDictionary dictionaryNamed:USERLIST_LAYOUT forClass:[self class]];
@@ -1282,10 +1280,11 @@
- (void)splitViewWillResizeSubviews:(NSNotification *)aNotification
{
if ([aNotification object] == splitView_verticalSplit) {
- if (NSWidth(view_userList.frame) > 0)
+ if (NSWidth(view_userList.frame) > 0) {
userListMinWidth = NSWidth(view_userList.frame);
- } else if ([aNotification object] == splitView_textEntryHorizontal) {
- entryMinHeight = NSHeight(textView_outgoing.frame);
+ [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(saveUserListMinimumSize) object:nil];
+ [self performSelector:@selector(saveUserListMinimumSize) withObject:nil afterDelay:0.5];
+ }
}
}
@@ -1297,7 +1296,7 @@
if ([splitView inLiveResize] || adium.interfaceController.activeChat != chat) {
if (splitView == splitView_verticalSplit) {
NSRect currentFrame = splitView.frame;
- NSRect msgFrame = [splitView_textEntryHorizontal superview].frame;
+ NSRect msgFrame = [view_messages superview].frame;
NSRect userFrame = view_userList.frame;
CGFloat dividerThickness = [splitView dividerThickness];
@@ -1318,21 +1317,7 @@
userFrame.origin.x = msgFrame.size.width + dividerThickness;
[view_userList setFrame:userFrame];
- [[splitView_textEntryHorizontal superview] setFrame:msgFrame];
- } else if (splitView == splitView_textEntryHorizontal) {
- NSRect currentFrame = splitView.frame;
- NSRect msgFrame = view_messages.frame;
- NSRect textFrame = [scrollView_textEntry superview].frame;
- CGFloat dividerThickness = [splitView dividerThickness];
-
- textFrame.size.width = currentFrame.size.width;
- msgFrame.size.width = currentFrame.size.width;
- msgFrame.size.height = currentFrame.size.height - textFrame.size.height - dividerThickness;
-
- textFrame.origin.y = msgFrame.size.height + dividerThickness;
-
- [view_messages setFrame:msgFrame];
- [[scrollView_textEntry superview] setFrame:textFrame];
+ [[view_messages superview] setFrame:msgFrame];
} else {
[splitView adjustSubviews];
}
@@ -1346,7 +1331,7 @@
*/
- (BOOL)splitView:(NSSplitView *)splitView canCollapseSubview:(NSView *)subview
{
- if (subview == view_messages || subview == [splitView_textEntryHorizontal superview])
+ if (subview == view_messages)
return NO;
else if (subview == [scrollView_textEntry superview])
return NO;
@@ -1369,10 +1354,7 @@
*/
- (CGFloat)splitView:(NSSplitView *)splitView constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)dividerIndex
{
- if (splitView == splitView_textEntryHorizontal) {
- //Min size of text entry view
- return [self _textEntryViewProperHeightIgnoringUserMininum:YES];
- } else if (splitView == splitView_verticalSplit) {
+ if (splitView == splitView_verticalSplit) {
//On the right: min size of user list
//On the left: max size of user list
if (chat.isGroupChat) {
@@ -1399,10 +1381,7 @@
*/
- (CGFloat)splitView:(NSSplitView *)splitView constrainMinCoordinate:(CGFloat)proposedMin ofSubviewAt:(NSInteger)dividerIndex
{
- if (splitView == splitView_textEntryHorizontal) {
- //Max size of text entry view
- return splitView_textEntryHorizontal.frame.size.height * MESSAGE_VIEW_MIN_HEIGHT_RATIO;
- } else if (splitView == splitView_verticalSplit) {
+ if (splitView == splitView_verticalSplit) {
//On the right: max size of user list
//On the left: min size of the user list
if (chat.isGroupChat) {
diff -r 61535d0ccea6 -r ee01675e683f Plugins/Dual Window Interface/MessageView.xib
--- a/Plugins/Dual Window Interface/MessageView.xib Fri Apr 01 02:48:31 2011 -0400
+++ b/Plugins/Dual Window Interface/MessageView.xib Tue Apr 12 17:20:25 2011 -0400
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">1070</int>
- <string key="IBDocument.SystemVersion">11A419</string>
- <string key="IBDocument.InterfaceBuilderVersion">1530</string>
- <string key="IBDocument.AppKitVersion">1115.2</string>
- <string key="IBDocument.HIToolboxVersion">549.00</string>
+ <int key="IBDocument.SystemTarget">1060</int>
+ <string key="IBDocument.SystemVersion">10J869</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1306</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">1530</string>
+ <string key="NS.object.0">1306</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -22,8 +22,8 @@
<string>NSOutlineView</string>
<string>NSCustomView</string>
<string>NSCustomObject</string>
+ <string>NSTableColumn</string>
<string>NSView</string>
- <string>NSTableColumn</string>
<string>NSTextField</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -53,21 +53,24 @@
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSBox" id="227740924">
+ <object class="NSBox" id="472278389">
<reference key="NSNextResponder" ref="498346344"/>
- <int key="NSvFlags">17</int>
+ <int key="NSvFlags">18</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSView" id="561091927">
- <reference key="NSNextResponder" ref="227740924"/>
+ <object class="NSView" id="465253647">
+ <reference key="NSNextResponder" ref="472278389"/>
<int key="NSvFlags">274</int>
- <string key="NSFrame">{{1, 1}, {0, 359}}</string>
- <reference key="NSSuperview" ref="227740924"/>
+ <string key="NSFrame">{{1, 1}, {479, 359}}</string>
+ <reference key="NSSuperview" ref="472278389"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="351509238"/>
</object>
</object>
- <string key="NSFrame">{{479, 0}, {1, 361}}</string>
+ <string key="NSFrameSize">{481, 361}</string>
<reference key="NSSuperview" ref="498346344"/>
- <reference key="NSNextKeyView" ref="561091927"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="465253647"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -92,7 +95,7 @@
<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
</object>
</object>
- <reference key="NSContentView" ref="561091927"/>
+ <reference key="NSContentView" ref="465253647"/>
<int key="NSBorderType">1</int>
<int key="NSBoxType">4</int>
<int key="NSTitlePosition">0</int>
@@ -101,43 +104,10 @@
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC42NjY2NjY2NjY3IDAuNjY2NjY2NjY2NyAwLjY2NjY2NjY2NjcAA</bytes>
</object>
- <reference key="NSFillColor2" ref="33147168"/>
- </object>
- <object class="NSBox" id="472278389">
- <reference key="NSNextResponder" ref="498346344"/>
- <int key="NSvFlags">16</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSView" id="465253647">
- <reference key="NSNextResponder" ref="472278389"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrame">{{1, 1}, {0, 359}}</string>
- <reference key="NSSuperview" ref="472278389"/>
- <reference key="NSNextKeyView" ref="351509238"/>
- </object>
+ <object class="NSColor" key="NSFillColor2">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAgMAA</bytes>
</object>
- <string key="NSFrameSize">{1, 361}</string>
- <reference key="NSSuperview" ref="498346344"/>
- <reference key="NSNextKeyView" ref="465253647"/>
- <string key="NSOffsets">{0, 0}</string>
- <object class="NSTextFieldCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Box</string>
- <reference key="NSSupport" ref="523686606"/>
- <reference key="NSBackgroundColor" ref="71900893"/>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
- </object>
- </object>
- <reference key="NSContentView" ref="465253647"/>
- <int key="NSBorderType">1</int>
- <int key="NSBoxType">4</int>
- <int key="NSTitlePosition">0</int>
- <bool key="NSTransparent">NO</bool>
- <reference key="NSBorderColor2" ref="33147168"/>
- <reference key="NSFillColor2" ref="33147168"/>
</object>
<object class="NSCustomView" id="687025598">
<reference key="NSNextResponder" ref="498346344"/>
@@ -152,13 +122,15 @@
<object class="NSView" id="739771638">
<reference key="NSNextResponder" ref="632298351"/>
<int key="NSvFlags">274</int>
- <string key="NSFrame">{{1, 1}, {479, 0}}</string>
+ <string key="NSFrame">{{1, 1}, {478, 0}}</string>
<reference key="NSSuperview" ref="632298351"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="472278389"/>
</object>
</object>
- <string key="NSFrameSize">{481, 1}</string>
+ <string key="NSFrameSize">{480, 1}</string>
<reference key="NSSuperview" ref="687025598"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="739771638"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -183,6 +155,7 @@
</object>
<string key="NSFrame">{{0, 300}, {481, 61}}</string>
<reference key="NSSuperview" ref="498346344"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="632298351"/>
<string key="NSClassName">AIAccountSelectionView</string>
</object>
@@ -193,172 +166,177 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomView" id="988585566">
<reference key="NSNextResponder" ref="351509238"/>
- <int key="NSvFlags">256</int>
+ <int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSSplitView" id="469967666">
+ <object class="NSScrollView" id="1006380680">
<reference key="NSNextResponder" ref="988585566"/>
- <int key="NSvFlags">286</int>
+ <int key="NSvFlags">290</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSCustomView" id="1034558317">
- <reference key="NSNextResponder" ref="469967666"/>
- <int key="NSvFlags">256</int>
+ <object class="NSClipView" id="382054263">
+ <reference key="NSNextResponder" ref="1006380680"/>
+ <int key="NSvFlags">2048</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSScrollView" id="60130733">
- <reference key="NSNextResponder" ref="1034558317"/>
- <int key="NSvFlags">310</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSClipView" id="916213062">
- <reference key="NSNextResponder" ref="60130733"/>
- <int key="NSvFlags">2304</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSView" id="819870531">
- <reference key="NSNextResponder" ref="916213062"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrameSize">{345, 254}</string>
- <reference key="NSSuperview" ref="916213062"/>
- <reference key="NSNextKeyView" ref="881321079"/>
- </object>
- </object>
- <string key="NSFrameSize">{345, 254}</string>
- <reference key="NSSuperview" ref="60130733"/>
- <reference key="NSNextKeyView" ref="819870531"/>
- <reference key="NSDocView" ref="819870531"/>
- <object class="NSColor" key="NSBGColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">windowFrameColor</string>
- <object class="NSColor" key="NSColor" id="78591470">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- </object>
- <int key="NScvFlags">2</int>
- </object>
- <object class="NSScroller" id="881321079">
- <reference key="NSNextResponder" ref="60130733"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-100, -100}, {15, 188}}</string>
- <reference key="NSSuperview" ref="60130733"/>
- <reference key="NSNextKeyView" ref="657097854"/>
- <reference key="NSTarget" ref="60130733"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSCurValue">1</double>
- <double key="NSPercent">0.96363627910614014</double>
- </object>
- <object class="NSScroller" id="657097854">
- <reference key="NSNextResponder" ref="60130733"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-100, -100}, {278, 15}}</string>
- <reference key="NSSuperview" ref="60130733"/>
- <reference key="NSNextKeyView" ref="916213062"/>
- <int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="60130733"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.50602412223815918</double>
- </object>
- </object>
- <string key="NSFrame">{{0, -1}, {345, 254}}</string>
- <reference key="NSSuperview" ref="1034558317"/>
- <reference key="NSNextKeyView" ref="916213062"/>
- <int key="NSsFlags">133120</int>
- <reference key="NSVScroller" ref="881321079"/>
- <reference key="NSHScroller" ref="657097854"/>
- <reference key="NSContentView" ref="916213062"/>
- </object>
- </object>
- <string key="NSFrameSize">{344, 253}</string>
- <reference key="NSSuperview" ref="469967666"/>
- <reference key="NSNextKeyView" ref="60130733"/>
- <string key="NSClassName">NSView</string>
- </object>
- <object class="NSCustomView" id="944644976">
- <reference key="NSNextResponder" ref="469967666"/>
- <int key="NSvFlags">268</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSScrollView" id="1006380680">
- <reference key="NSNextResponder" ref="944644976"/>
+ <object class="NSCustomView" id="662114219">
+ <reference key="NSNextResponder" ref="382054263"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSClipView" id="382054263">
- <reference key="NSNextResponder" ref="1006380680"/>
- <int key="NSvFlags">2048</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSCustomView" id="662114219">
- <reference key="NSNextResponder" ref="382054263"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrameSize">{344, 18}</string>
- <reference key="NSSuperview" ref="382054263"/>
- <reference key="NSNextKeyView" ref="949636887"/>
- <string key="NSClassName">AIMessageEntryTextView</string>
- <string key="NSExtension">NSTextView</string>
- </object>
- </object>
- <string key="NSFrame">{{1, 1}, {344, 37}}</string>
- <reference key="NSSuperview" ref="1006380680"/>
- <reference key="NSNextKeyView" ref="662114219"/>
- <reference key="NSDocView" ref="662114219"/>
- <reference key="NSBGColor" ref="33147168"/>
- <int key="NScvFlags">6</int>
- </object>
- <object class="NSScroller" id="949636887">
- <reference key="NSNextResponder" ref="1006380680"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-100, -100}, {15, 27}}</string>
- <reference key="NSSuperview" ref="1006380680"/>
- <reference key="NSNextKeyView" ref="559917187"/>
- <reference key="NSTarget" ref="1006380680"/>
- <string key="NSAction">_doScroller:</string>
- </object>
- <object class="NSScroller" id="559917187">
- <reference key="NSNextResponder" ref="1006380680"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-100, -100}, {343, 15}}</string>
- <reference key="NSSuperview" ref="1006380680"/>
- <reference key="NSNextKeyView" ref="382054263"/>
- <int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="1006380680"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.90740740740740744</double>
+ <object class="NSCustomView" id="1045927463">
+ <reference key="NSNextResponder" ref="662114219"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrameSize">{324, 18}</string>
+ <reference key="NSSuperview" ref="662114219"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="60271943"/>
+ <string key="NSClassName">AIMessageEntryTextView</string>
+ <string key="NSExtension">NSTextView</string>
</object>
</object>
- <string key="NSFrame">{{-1, -1}, {346, 39}}</string>
- <reference key="NSSuperview" ref="944644976"/>
- <reference key="NSNextKeyView" ref="382054263"/>
- <int key="NSsFlags">133650</int>
- <reference key="NSVScroller" ref="949636887"/>
- <reference key="NSHScroller" ref="559917187"/>
- <reference key="NSContentView" ref="382054263"/>
+ <string key="NSFrameSize">{324, 18}</string>
+ <reference key="NSSuperview" ref="382054263"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="949636887"/>
+ <string key="NSClassName">NSView</string>
+ <string key="NSExtension">NSTextView</string>
</object>
</object>
- <string key="NSFrame">{{0, 263}, {344, 37}}</string>
- <reference key="NSSuperview" ref="469967666"/>
- <reference key="NSNextKeyView" ref="1006380680"/>
- <string key="NSClassName">NSView</string>
+ <string key="NSFrameSize">{324, 20}</string>
+ <reference key="NSSuperview" ref="1006380680"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="662114219"/>
+ <reference key="NSDocView" ref="662114219"/>
+ <object class="NSColor" key="NSBGColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MSAxIDEAA</bytes>
+ </object>
+ <int key="NScvFlags">2</int>
+ </object>
+ <object class="NSScroller" id="949636887">
+ <reference key="NSNextResponder" ref="1006380680"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-100, -100}, {15, 27}}</string>
+ <reference key="NSSuperview" ref="1006380680"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="559917187"/>
+ <reference key="NSTarget" ref="1006380680"/>
+ <string key="NSAction">_doScroller:</string>
+ </object>
+ <object class="NSScroller" id="559917187">
+ <reference key="NSNextResponder" ref="1006380680"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-100, -100}, {343, 15}}</string>
+ <reference key="NSSuperview" ref="1006380680"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="382054263"/>
+ <int key="NSsFlags">1</int>
+ <reference key="NSTarget" ref="1006380680"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSPercent">0.90740740740740744</double>
+ </object>
+ </object>
+ <string key="NSFrame">{{10, 10}, {324, 20}}</string>
+ <reference key="NSSuperview" ref="988585566"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="382054263"/>
+ <int key="NSsFlags">528</int>
+ <reference key="NSVScroller" ref="949636887"/>
+ <reference key="NSHScroller" ref="559917187"/>
+ <reference key="NSContentView" ref="382054263"/>
+ </object>
+ <object class="NSCustomView" id="1034558317">
+ <reference key="NSNextResponder" ref="988585566"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSScrollView" id="60130733">
+ <reference key="NSNextResponder" ref="1034558317"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
More information about the commits
mailing list