adium 3824:72d6f1400384: Merged with default
commits at adium.im
commits at adium.im
Fri Apr 1 15:45:17 UTC 2011
details: http://hg.adium.im/adium/rev/72d6f1400384
revision: 3824:72d6f1400384
branch: FloatingMessageWindowTextField
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Fri Apr 01 17:38:23 2011 +0200
Merged with default
diffs (267 lines):
diff -r 9ad82fb7564c -r 72d6f1400384 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Fri Apr 01 15:03:55 2011 +0200
+++ b/ChangeLogs/Changes.txt Fri Apr 01 17:38:23 2011 +0200
@@ -44,7 +44,7 @@
* 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).
diff -r 9ad82fb7564c -r 72d6f1400384 Plugins/WebKit Message View/AIWebKitMessageViewController.h
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.h Fri Apr 01 15:03:55 2011 +0200
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.h Fri Apr 01 17:38:23 2011 +0200
@@ -50,6 +50,7 @@
//Focus tracking
BOOL nextMessageFocus;
+ BOOL nextMessageRegainedFocus;
}
/*!
diff -r 9ad82fb7564c -r 72d6f1400384 Plugins/WebKit Message View/AIWebKitMessageViewController.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.m Fri Apr 01 15:03:55 2011 +0200
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.m Fri Apr 01 17:38:23 2011 +0200
@@ -132,6 +132,7 @@
* classed as such.
*/
nextMessageFocus = YES;
+ nextMessageRegainedFocus = YES;
//Observe preference changes.
[adium.preferenceController registerPreferenceObserver:self forGroup:PREF_GROUP_WEBKIT_REGULAR_MESSAGE_DISPLAY];
@@ -487,6 +488,7 @@
[previousContent release];
previousContent = nil;
nextMessageFocus = NO;
+ nextMessageRegainedFocus = NO;
[chat clearUnviewedContentCount];
}
@@ -708,6 +710,7 @@
[content addDisplayClass:@"firstFocus"];
nextMessageFocus = NO;
+ nextMessageRegainedFocus = YES;
}
// Add a class for "this content received while out of focus"
@@ -731,6 +734,11 @@
}
}
+ if (content.postProcessContent && adium.interfaceController.activeChat == content.chat && !nextMessageFocus && nextMessageRegainedFocus) {
+ nextMessageRegainedFocus = NO;
+ [content addDisplayClass:@"regainedFocus"];
+ }
+
//Add the content object
[self _appendContent:content
similar:similar
@@ -1514,6 +1522,7 @@
// The next message being inserted needs to add a mark.
nextMessageFocus = YES;
+ nextMessageRegainedFocus = NO;
DOMNodeList *nodeList = [webView.mainFrameDocument querySelectorAll:@".focus"];
DOMHTMLElement *node = nil; NSMutableArray *classes = nil;
@@ -1530,6 +1539,21 @@
[classes release];
}
+ // Also remove .regainedFocus. By definition this should _not_ have class .focus too, so make a new list
+ DOMNodeList *nodeListRegained = [webView.mainFrameDocument querySelectorAll:@".regainedFocus"];
+
+ for (unsigned i = 0; i < nodeListRegained.length; i++)
+ {
+ node = (DOMHTMLElement *)[nodeListRegained item:i];
+ classes = [[node.className componentsSeparatedByString:@" "] mutableCopy];
+
+ [classes removeObject:@"regainedFocus"];
+
+ node.className = [classes componentsJoinedByString:@" "];
+
+ [classes release];
+ }
+
}
- (void)addMark
diff -r 9ad82fb7564c -r 72d6f1400384 Resources/ContactListWindow.xib
--- a/Resources/ContactListWindow.xib Fri Apr 01 15:03:55 2011 +0200
+++ b/Resources/ContactListWindow.xib Fri Apr 01 17:38:23 2011 +0200
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">1305</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
+ <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>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">1305</string>
+ <string key="NS.object.0">1530</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -46,13 +46,14 @@
<object class="NSWindowTemplate" id="43046457">
<int key="NSWindowStyleMask">4111</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{30, 654}, {213, 410}}</string>
+ <string key="NSWindowRect">{{122, 488}, {213, 410}}</string>
<int key="NSWTFlags">1881669632</int>
<string key="NSWindowTitle"/>
<string key="NSWindowClass">AIDockingWindow</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
+ <nil key="NSUserInterfaceItemIdentifier"/>
<object class="NSView" key="NSWindowView" id="263109925">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -74,7 +75,7 @@
<string key="NSFrameSize">{213, 410}</string>
<reference key="NSSuperview" ref="58758836"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
+ <reference key="NSNextKeyView" ref="374111282"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
@@ -156,6 +157,7 @@
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">YES</bool>
<int key="NSTableViewDraggingDestinationStyle">0</int>
+ <int key="NSTableViewGroupRowStyle">1</int>
</object>
</object>
<string key="NSFrameSize">{213, 410}</string>
@@ -202,8 +204,8 @@
<string key="NSFrameSize">{213, 410}</string>
<reference key="NSSuperview" ref="263109925"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="374111282"/>
- <int key="NSsFlags">560</int>
+ <reference key="NSNextKeyView" ref="58758836"/>
+ <int key="NSsFlags">133680</int>
<reference key="NSVScroller" ref="593971232"/>
<reference key="NSHScroller" ref="374111282"/>
<reference key="NSContentView" ref="58758836"/>
@@ -216,10 +218,10 @@
<reference key="NSNextKeyView" ref="166732467"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
- <string key="NSMaxSize">{1e+13, 1e+13}</string>
+ <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
</object>
<object class="NSCustomView" id="951015401">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">258</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -240,7 +242,6 @@
</object>
<string key="NSFrameSize">{36, 36}</string>
<reference key="NSSuperview" ref="951015401"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="673854253">
<int key="NSCellFlags">270663168</int>
@@ -262,7 +263,6 @@
<int key="NSvFlags">290</int>
<string key="NSFrame">{{17, 0}, {113, 18}}</string>
<reference key="NSSuperview" ref="128062098"/>
- <reference key="NSWindow"/>
<string key="NSClassName">AIHoveringPopUpButton</string>
<string key="NSExtension">NSButton</string>
</object>
@@ -271,7 +271,6 @@
<int key="NSvFlags">266</int>
<string key="NSFrame">{{17, 17}, {113, 18}}</string>
<reference key="NSSuperview" ref="128062098"/>
- <reference key="NSWindow"/>
<string key="NSClassName">AIContactListNameButton</string>
<string key="NSExtension">NSButton</string>
</object>
@@ -292,7 +291,6 @@
</object>
<string key="NSFrame">{{3, 11}, {16, 16}}</string>
<reference key="NSSuperview" ref="128062098"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="93881662">
<int key="NSCellFlags">130560</int>
@@ -307,14 +305,11 @@
</object>
<string key="NSFrame">{{36, 1}, {134, 35}}</string>
<reference key="NSSuperview" ref="951015401"/>
- <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
</object>
<string key="NSFrameSize">{170, 36}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<string key="NSClassName">AIWindowDraggingView</string>
<string key="NSExtension">NSView</string>
</object>
diff -r 9ad82fb7564c -r 72d6f1400384 test.txt
--- a/test.txt Fri Apr 01 15:03:55 2011 +0200
+++ b/test.txt Fri Apr 01 17:38:23 2011 +0200
@@ -63,3 +63,4 @@
Test
Test
Test
+There Is No Test. Only Zuul!
diff -r 9ad82fb7564c -r 72d6f1400384 xcconfigs/Adium.xcconfig
--- a/xcconfigs/Adium.xcconfig Fri Apr 01 15:03:55 2011 +0200
+++ b/xcconfigs/Adium.xcconfig Fri Apr 01 17:38:23 2011 +0200
@@ -9,6 +9,5 @@
INFOPLIST_PREFIX_HEADER = $(TARGET_BUILD_DIR)/include/PlistMacros.h
LD_RUNPATH_SEARCH_PATHS = @executable_path/../Frameworks
HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_2) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_3) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_4)
-OTHER_CFLAGS = $(CFLAGS) -fno-builtin-strndup
OTHER_LDFLAGS[arch=i386] = -framework QuickTime
OTHER_LDFLAGS[arch=x86_64] = -framework QTKit
diff -r 9ad82fb7564c -r 72d6f1400384 xcconfigs/AdiumLibpurple.xcconfig
--- a/xcconfigs/AdiumLibpurple.xcconfig Fri Apr 01 15:03:55 2011 +0200
+++ b/xcconfigs/AdiumLibpurple.xcconfig Fri Apr 01 17:38:23 2011 +0200
@@ -8,7 +8,7 @@
PRODUCT_NAME = AdiumLibpurple
SKIP_INSTALL = YES
DYLIB_CURRENT_VERSION = 1
-OTHER_LDFLAGS = -header-pad_max_install_names -lsasl2
+OTHER_LDFLAGS = -lsasl2
INFOPLIST_FILE = Plists/AdiumLibpurple.plist
DYLIB_COMPATIBILITY_VERSION = 1
LD_RUNPATH_SEARCH_PATHS = @executable_path/../Frameworks
diff -r 9ad82fb7564c -r 72d6f1400384 xcconfigs/Base.xcconfig
--- a/xcconfigs/Base.xcconfig Fri Apr 01 15:03:55 2011 +0200
+++ b/xcconfigs/Base.xcconfig Fri Apr 01 17:38:23 2011 +0200
@@ -25,7 +25,6 @@
VALID_ARCHS = i386 x86_64
DEBUG_INFORMATION_FORMAT = dwarf
WARNING_CFLAGS = -Wall
-OTHER_LDFLAGS = -Wl -pie
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "$(BUILT_PRODUCTS_DIR)"
GCC_WARN_64_TO_32_BIT_CONVERSION = YES
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES
diff -r 9ad82fb7564c -r 72d6f1400384 xcconfigs/Spotlight Importer.xcconfig
--- a/xcconfigs/Spotlight Importer.xcconfig Fri Apr 01 15:03:55 2011 +0200
+++ b/xcconfigs/Spotlight Importer.xcconfig Fri Apr 01 17:38:23 2011 +0200
@@ -6,4 +6,3 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = NO
INSTALL_PATH = /Library/Spotlight
LIBRARY_STYLE = bundle
-OTHER_CFLAGS = ${OTHER_CFLAGS} -fno-builtin-strndup
More information about the commits
mailing list