adium 5447:cc3ec21fa74f: Adds sender name colouring support to t...
commits at adium.im
commits at adium.im
Fri Apr 26 01:09:44 UTC 2013
details: http://hg.adium.im/adium/rev/cc3ec21fa74f
revision: 5447:cc3ec21fa74f
branch: adium-1.6
author: Ariel "yelly" Chinn <arielchinn at gmail.com>
date: Fri Aug 26 14:58:56 2011 +0300
Adds sender name colouring support to the log viewer with a toggle that defaults to off. Needs a new icon for the toolbar for this feature, there's a warning in the place where it should go. Fixes #12352
r=wix
Subject: adium 5448:92e6c1d9864c: Updated Sparkle to 0ed83cf9f2eeb425d4fdd141c01a29d843970c20. Fixes #16034
details: http://hg.adium.im/adium/rev/92e6c1d9864c
revision: 5448:92e6c1d9864c
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Thu Apr 25 21:07:47 2013 -0400
Updated Sparkle to 0ed83cf9f2eeb425d4fdd141c01a29d843970c20. Fixes #16034
diffs (662 lines):
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/AIUtilities Framework/Source/AIColorAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIColorAdditions.m Thu Apr 25 19:34:03 2013 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIColorAdditions.m Thu Apr 25 21:07:47 2013 -0400
@@ -170,6 +170,7 @@
[NSColor colorWithHTMLString:@"#00f"], @"blue",
[NSColor colorWithHTMLString:@"#008080"], @"teal",
[NSColor colorWithHTMLString:@"#0ff"], @"aqua",
+ [NSColor colorWithHTMLString:@"#4b0082"], @"indigo",
nil];
NSArray *paths = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:defaultRGBTxtLocation1 error:NULL];
for (NSString *middlePath in paths) {
@@ -534,7 +535,9 @@
NSDictionary *colorValues = [self colorNamesDictionary];
colorValue = [colorValues objectForKey:str];
if (!colorValue) colorValue = [colorValues objectForKey:[str lowercaseString]];
- if (!colorValue) {
+ if (colorValue) {
+ return colorValue;
+ } else {
#if COLOR_DEBUG
NSLog(@"+[NSColor(AIColorAdditions) colorWithHTMLString:] called with unrecognised color name (str is %@); returning %@", str, defaultColor);
#endif
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h
--- a/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h Thu Apr 25 19:34:03 2013 -0400
+++ b/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h Thu Apr 25 21:07:47 2013 -0400
@@ -20,6 +20,7 @@
NSString *DSASignature;
NSString *minimumSystemVersion;
+ NSString *maximumSystemVersion;
NSURL *fileURL;
NSString *versionString;
@@ -45,6 +46,7 @@
- (NSURL *)fileURL;
- (NSString *)DSASignature;
- (NSString *)minimumSystemVersion;
+- (NSString *)maximumSystemVersion;
- (NSDictionary *)deltaUpdates;
- (BOOL)isDeltaUpdate;
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h
--- a/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h Thu Apr 25 19:34:03 2013 -0400
+++ b/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h Thu Apr 25 21:07:47 2013 -0400
@@ -27,12 +27,12 @@
+ (SUUpdater *)sharedUpdater;
+ (SUUpdater *)updaterForBundle:(NSBundle *)bundle;
-- initForBundle:(NSBundle *)bundle;
+- (id)initForBundle:(NSBundle *)bundle;
- (NSBundle *)hostBundle;
- (void)setDelegate:(id)delegate;
-- delegate;
+- (id)delegate;
- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyChecks;
- (BOOL)automaticallyChecksForUpdates;
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist
--- a/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist Thu Apr 25 19:34:03 2013 -0400
+++ b/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist Thu Apr 25 21:07:47 2013 -0400
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
- <string>11C74</string>
+ <string>12D78</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
@@ -21,20 +21,20 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>290f64f</string>
+ <string>0ed83cf</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
- <string>4D199</string>
+ <string>4H1003</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
- <string>10K549</string>
+ <string>11E52</string>
<key>DTSDKName</key>
- <string>macosx10.6</string>
+ <string>macosx10.7</string>
<key>DTXcode</key>
- <string>0420</string>
+ <string>0462</string>
<key>DTXcodeBuild</key>
- <string>4D199</string>
+ <string>4H1003</string>
</dict>
</plist>
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/License.txt
--- a/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt Thu Apr 25 19:34:03 2013 -0400
+++ b/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt Thu Apr 25 21:07:47 2013 -0400
@@ -10,121 +10,6 @@
EXTERNAL LICENSES
=================
-This project uses software developed by the OpenSSL Project for use in the OpenSSL
-Toolkit (http://www.openssl.org). This toolkit is licensed as follows:
-/* ====================================================================
-* Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modiÞcation, are permitted provided that the following conditions
-* are met:
-*
-* 1. Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in
-* the documentation and/or other materials provided with the
-* distribution.
-*
-* 3. All advertising materials mentioning features or use of this
-* software must display the following acknowledgment:
-* ÒThis product includes software developed by the OpenSSL Project
-* for use in the OpenSSL Toolkit. (http://www.openssl.org/)Ó
-*
-* 4. The names ÒOpenSSL ToolkitÓ and ÒOpenSSL ProjectÓ must not be used to
-* endorse or promote products derived from this software without
-* prior written permission. For written permission, please contact
-* openssl-core at openssl.org.
-*
-* 5. Products derived from this software may not be called ÒOpenSSLÓ
-* nor may ÒOpenSSLÓ appear in their names without prior written
-* permission of the OpenSSL Project.
-*
-* 6. Redistributions of any form whatsoever must retain the following
-
-* acknowledgment:
-* ÒThis product includes software developed by the OpenSSL Project
-* for use in the OpenSSL Toolkit (http://www.openssl.org/)Ó
-*
-* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS ISÕÕ AND ANY
-* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
-* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-* OF THE POSSIBILITY OF SUCH DAMAGE.
-* ====================================================================
-*
-* This product includes cryptographic software written by Eric Young
-* (eay at cryptsoft.com). This product includes software written by Tim
-* Hudson (tjh at cryptsoft.com).
-*
-*/
-
-Original SSLeay License
-/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
-* All rights reserved.
-*
-* This package is an SSL implementation written
-* by Eric Young (eay at cryptsoft.com).
-* The implementation was written so as to conform with Netscapes SSL.
-*
-* This library is free for commercial and non-commercial use as long as
-* the following conditions are aheared to. The following conditions
-* apply to all code found in this distribution, be it the RC4, RSA,
-* lhash, DES, etc., code; not just the SSL code. The SSL documentation
-* included with this distribution is covered by the same copyright terms
-* except that the holder is Tim Hudson (tjh at cryptsoft.com).
-*
-* Copyright remains Eric YoungÕs, and as such any Copyright notices in
-* the code are not to be removed.
-* If this package is used in a product, Eric Young should be given attribution
-* as the author of the parts of the library used.
-* This can be in the form of a textual message at program startup or
-* in documentation (online or textual) provided with the package.
-*
-* Redistribution and use in source and binary forms, with or without
-* modiÞcation, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the copyright
-* notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* 3. All advertising materials mentioning features or use of this software
-* must display the following acknowledgement:
-* ÒThis product includes cryptographic software written by
-* Eric Young (eay at cryptsoft.com)Ó
-* The word ÔcryptographicÕ can be left out if the rouines from the library
-* being used are not cryptographic related :-).
-* 4. If you include any Windows speciÞc code (or a derivative thereof) from
-* the apps directory (application code) you must include an acknowledgement:
-* ÒThis product includes software written by Tim Hudson (tjh at cryptsoft.com)Ó
-*
-* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS ISÕÕ AND
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-* SUCH DAMAGE.
-*
-* The licence and distribution terms for any publically available version or
-* derivative of this code cannot be changed. i.e. this code cannot simply be
-* copied and put under another distribution licence
-* [including the GNU Public Licence.]
-*/
-
License for bspatch.c and bsdiff.c, from bsdiff 4.3 (<http://www.daemonology.net/bsdiff/>:
/*-
* Copyright 2003-2005 Colin Percival
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUPasswordPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUPasswordPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUPasswordPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUPasswordPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Info.plist
--- a/Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Info.plist Thu Apr 25 19:34:03 2013 -0400
+++ b/Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Info.plist Thu Apr 25 21:07:47 2013 -0400
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
- <string>11C74</string>
+ <string>12D78</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
@@ -25,17 +25,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
- <string>4D199</string>
+ <string>4H1003</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
- <string>10K549</string>
+ <string>11E52</string>
<key>DTSDKName</key>
- <string>macosx10.6</string>
+ <string>macosx10.7</string>
<key>DTXcode</key>
- <string>0420</string>
+ <string>0462</string>
<key>DTXcodeBuild</key>
- <string>4D199</string>
+ <string>4H1003</string>
<key>LSBackgroundOnly</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/MacOS/finish_installation
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/MacOS/finish_installation has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/SUStatus.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/SUStatus.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/ar.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/ar.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/da.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/da.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/is.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/is.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/ja.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/ja.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/pt_BR.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/pt_BR.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/ro.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/ro.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/ru.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/ru.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/sl.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/sl.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/th.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/th.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/tr.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/tr.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/uk.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/finish_installation.app/Contents/Resources/uk.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUPasswordPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUPasswordPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUPasswordPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUPasswordPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib
Binary file Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Frameworks/Sparkle.framework/Versions/A/Sparkle
Binary file Frameworks/Sparkle.framework/Versions/A/Sparkle has changed
diff -r 7658a4afc14d -r 92e6c1d9864c Resources/LoggingDefaults.plist
--- a/Resources/LoggingDefaults.plist Thu Apr 25 19:34:03 2013 -0400
+++ b/Resources/LoggingDefaults.plist Thu Apr 25 21:07:47 2013 -0400
@@ -10,5 +10,7 @@
<true/>
<key>Log Viewer Emoticons</key>
<true/>
+ <key>Log Viewer Sender Colors</key>
+ <false/>
</dict>
</plist>
diff -r 7658a4afc14d -r 92e6c1d9864c Source/AILogViewerWindowController.h
--- a/Source/AILogViewerWindowController.h Thu Apr 25 19:34:03 2013 -0400
+++ b/Source/AILogViewerWindowController.h Thu Apr 25 21:07:47 2013 -0400
@@ -119,6 +119,7 @@
//Old
BOOL showEmoticons;
BOOL showTimestamps;
+ BOOL showSenderColors;
SKSearchRef currentSearch;
NSLock *currentSearchLock;
diff -r 7658a4afc14d -r 92e6c1d9864c Source/AILogViewerWindowController.m
--- a/Source/AILogViewerWindowController.m Thu Apr 25 19:34:03 2013 -0400
+++ b/Source/AILogViewerWindowController.m Thu Apr 25 21:07:47 2013 -0400
@@ -77,14 +77,20 @@
#define SHOW_EMOTICONS AILocalizedString(@"Show Emoticons",nil)
#define HIDE_TIMESTAMPS AILocalizedString(@"Hide Timestamps",nil)
#define SHOW_TIMESTAMPS AILocalizedString(@"Show Timestamps",nil)
+#define HIDE_SENDERCOLORS AILocalizedString(@"Disable Sender Colors",nil)
+#define SHOW_SENDERCOLORS AILocalizedString(@"Enable Sender Colors",nil)
#define IMAGE_EMOTICONS_OFF @"emoticon"
#define IMAGE_EMOTICONS_ON @"emoticon-sleep"
#define IMAGE_TIMESTAMPS_OFF @"transcripts-timestamp-out"
#define IMAGE_TIMESTAMPS_ON @"transcripts-timestamp-in"
+#warning needs new icons
+#define IMAGE_SENDERCOLORS_OFF @"transcripts-timestamp-out"
+#define IMAGE_SENDERCOLORS_ON @"transcripts-timestamp-in"
#define KEY_LOG_VIEWER_EMOTICONS @"Log Viewer Emoticons"
#define KEY_LOG_VIEWER_TIMESTAMPS @"Log Viewer Timestamps"
+#define KEY_LOG_VIEWER_SENDERCOLORS @"Log Viewer Sender Colors"
#define KEY_LOG_VIEWER_SELECTED_COLUMN @"Log Viewer Selected Column Identifier"
@interface AILogViewerWindowController ()
@@ -233,6 +239,7 @@
automaticSearch = YES;
showEmoticons = NO;
showTimestamps = YES;
+ showSenderColors = NO;
activeSearchString = nil;
displayedLogArray = nil;
windowIsClosing = NO;
@@ -419,6 +426,12 @@
group:PREF_GROUP_LOGGING] boolValue];
[[toolbarItems objectForKey:@"toggletimestamps"] setLabel:(showTimestamps ? HIDE_TIMESTAMPS : SHOW_TIMESTAMPS)];
[[toolbarItems objectForKey:@"toggletimestamps"] setImage:[NSImage imageNamed:(showTimestamps ? IMAGE_TIMESTAMPS_ON : IMAGE_TIMESTAMPS_OFF) forClass:[self class]]];
+
+ // Set sender colour filtering
+ showSenderColors = [[adium.preferenceController preferenceForKey:KEY_LOG_VIEWER_SENDERCOLORS
+ group:PREF_GROUP_LOGGING] boolValue];
+ [[toolbarItems objectForKey:@"togglesendercolors"] setLabel:(showSenderColors ? HIDE_SENDERCOLORS : SHOW_SENDERCOLORS)];
+ [[toolbarItems objectForKey:@"togglesendercolors"] setImage:[NSImage imageNamed:(showSenderColors ? IMAGE_SENDERCOLORS_ON : IMAGE_SENDERCOLORS_OFF) forClass:[self class]]];
//Toolbar
[self installToolbar];
@@ -518,6 +531,11 @@
forKey:KEY_LOG_VIEWER_TIMESTAMPS
group:PREF_GROUP_LOGGING];
+ // Set preference for sender colours filtering
+ [adium.preferenceController setPreference:[NSNumber numberWithBool:showSenderColors]
+ forKey:KEY_LOG_VIEWER_SENDERCOLORS
+ group:PREF_GROUP_LOGGING];
+
//Set preference for selected column
[adium.preferenceController setPreference:[selectedColumn identifier]
forKey:KEY_LOG_VIEWER_SELECTED_COLUMN
@@ -799,7 +817,8 @@
NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithBool:showTimestamps], @"showTimestamps",
- [NSNumber numberWithBool:showEmoticons], @"showEmoticons",
+ [NSNumber numberWithBool:showEmoticons], @"showEmoticons",
+ [NSNumber numberWithBool:showSenderColors], @"showSenderColors",
nil];
NSAttributedString *attributedLogFileText = [AIXMLChatlogConverter readFile:logFullPath withOptions:options];
if (attributedLogFileText) {
@@ -2024,6 +2043,15 @@
[self displayLogs:displayedLogArray];
}
+- (IBAction)toggleSendercolorFiltering:(id)sender
+{
+ showSenderColors = !showSenderColors;
+ [sender setLabel:(showSenderColors ? HIDE_SENDERCOLORS : SHOW_SENDERCOLORS)];
+ [sender setImage:[NSImage imageNamed:(showSenderColors ? IMAGE_SENDERCOLORS_ON : IMAGE_SENDERCOLORS_OFF) forClass:[self class]]];
+
+ [self displayLogs:displayedLogArray];
+}
+
#pragma mark Outline View Data source
- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)idx ofItem:(id)item
{
@@ -2351,15 +2379,27 @@
menu:nil];
// Toggle Timestamps
[AIToolbarUtilities addToolbarItemToDictionary:toolbarItems
- withIdentifier:@"toggletimestamps"
- label:(showTimestamps ? HIDE_TIMESTAMPS : SHOW_TIMESTAMPS)
- paletteLabel:AILocalizedString(@"Show/Hide Timestamps", nil)
- toolTip:AILocalizedString(@"Show or hide timestamps in logs", nil)
- target:self
- settingSelector:@selector(setImage:)
- itemContent:[NSImage imageNamed:(showTimestamps ? IMAGE_TIMESTAMPS_ON : IMAGE_TIMESTAMPS_OFF) forClass:[self class]]
- action:@selector(toggleTimestampFiltering:)
- menu:nil];
+ withIdentifier:@"toggletimestamps"
+ label:(showTimestamps ? HIDE_TIMESTAMPS : SHOW_TIMESTAMPS)
+ paletteLabel:AILocalizedString(@"Show/Hide Timestamps", nil)
+ toolTip:AILocalizedString(@"Show or hide timestamps in logs", nil)
+ target:self
+ settingSelector:@selector(setImage:)
+ itemContent:[NSImage imageNamed:(showTimestamps ? IMAGE_TIMESTAMPS_ON : IMAGE_TIMESTAMPS_OFF) forClass:[self class]]
+ action:@selector(toggleTimestampFiltering:)
+ menu:nil];
+
+ // Toggle Sender Colours
+ [AIToolbarUtilities addToolbarItemToDictionary:toolbarItems
+ withIdentifier:@"togglesendercolors"
+ label:(showSenderColors ? HIDE_SENDERCOLORS : SHOW_SENDERCOLORS)
+ paletteLabel:AILocalizedString(@"Enable/Disable Sender Colors", nil)
+ toolTip:AILocalizedString(@"Enable or disable multiple sender name colors in logs", nil)
+ target:self
+ settingSelector:@selector(setImage:)
+ itemContent:[NSImage imageNamed:(showSenderColors ? IMAGE_SENDERCOLORS_ON : IMAGE_SENDERCOLORS_OFF) forClass:[self class]]
+ action:@selector(toggleSendercolorFiltering:)
+ menu:nil];
[[self window] setToolbar:toolbar];
@@ -2374,7 +2414,7 @@
- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar
{
return [NSArray arrayWithObjects:DATE_ITEM_IDENTIFIER, NSToolbarFlexibleSpaceItemIdentifier,
- @"delete", @"toggleemoticons", @"toggletimestamps", NSToolbarPrintItemIdentifier, NSToolbarFlexibleSpaceItemIdentifier,
+ @"delete", @"toggleemoticons", @"toggletimestamps", @"togglesendercolors", NSToolbarPrintItemIdentifier, NSToolbarFlexibleSpaceItemIdentifier,
@"search", nil];
}
diff -r 7658a4afc14d -r 92e6c1d9864c Source/AIXMLChatlogConverter.m
--- a/Source/AIXMLChatlogConverter.m Thu Apr 25 19:34:03 2013 -0400
+++ b/Source/AIXMLChatlogConverter.m Thu Apr 25 21:07:47 2013 -0400
@@ -26,6 +26,7 @@
#import <AIUtilities/NSCalendarDate+ISO8601Parsing.h>
#import <AIUtilities/AIDateFormatterAdditions.h>
#import <AIUtilities/AIStringAdditions.h>
+#import <AIUtilities/AIColorAdditions.h>
#define PREF_GROUP_WEBKIT_MESSAGE_DISPLAY @"WebKit Message Display"
#define KEY_WEBKIT_USE_NAME_FORMAT @"Use Custom Name Format"
@@ -180,13 +181,14 @@
BOOL showTimestamps = [[options objectForKey:@"showTimestamps"] boolValue];
BOOL showEmoticons = [[options objectForKey:@"showEmoticons"] boolValue];
+ BOOL showSendercolors = [[options objectForKey:@"showSenderColors"] boolValue];
NSXMLElement *chatElement = [[xmlDoc nodesForXPath:@"//chat" error:&err] lastObject];
NSDictionary *chatAttributes = [chatElement AIAttributesAsDictionary];
NSString *mySN = [[chatAttributes objectForKey:@"account"] stringValue];
NSString *service = [[chatAttributes objectForKey:@"service"] stringValue];
-
+
NSString *myDisplayName = nil;
for (AIAccount *account in adium.accountController.accounts) {
@@ -269,11 +271,13 @@
timestampStr = [[dateFormatter stringFromDate:date] retain];
}];
-
+ NSString *senderColor = (!sentMessage ? [NSColor representedColorForObject:sender withValidColors:nil] : @"#007F00");
+
[output appendAttributedString:[htmlDecoder decodeHTML:[NSString stringWithFormat:
- @"<div class=\"%@\">%@<span class=\"sender\">%@%@:</span></div> ",
+ @"<div class=\"%@\">%@<span class=\"sender\"%@>%@%@:</span></div> ",
(sentMessage ? @"send" : @"receive"),
(showTimestamps ? [NSString stringWithFormat:@"<span class=\"timestamp\">%@</span> ", timestampStr] : @""),
+ (showSendercolors ? [NSString stringWithFormat:@" style=\"color: %@\"", senderColor] : @""),
shownSender, (autoResponse ? AILocalizedString(@" (Autoreply)", nil) : @"")]]];
[timestampStr release];
More information about the commits
mailing list