adium-1.4 3518:67194db10c73: Update to current default on facebo...
commits at adium.im
commits at adium.im
Fri Jun 24 18:14:33 UTC 2011
details: http://hg.adium.im/adium-1.4/rev/67194db10c73
revision: 3518:67194db10c73
branch: facebook-xmpp
author: Evan Schoenberg
date: Fri Jun 24 13:14:02 2011 -0500
Update to current default on facebook-xmpp
diffs (truncated from 368976 to 1000 lines):
diff -r 2eed27cd9ddf -r 67194db10c73 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sun Mar 20 20:39:20 2011 -0700
+++ b/Adium.xcodeproj/project.pbxproj Fri Jun 24 13:14:02 2011 -0500
@@ -12885,6 +12885,7 @@
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
);
+ GCC_PREPROCESSOR_DEFINITIONS = RELEASE_BUILD;
};
name = Release;
};
@@ -12896,6 +12897,10 @@
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
);
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ RELEASE_BUILD,
+ DEBUG_BUILD,
+ );
};
name = "Release-Debug";
};
diff -r 2eed27cd9ddf -r 67194db10c73 AdiumHelp/AdiumHelp.helpindex
Binary file AdiumHelp/AdiumHelp.helpindex has changed
diff -r 2eed27cd9ddf -r 67194db10c73 AdiumHelp/pgs/AdvancedFeatures-FileTransfer.html
--- a/AdiumHelp/pgs/AdvancedFeatures-FileTransfer.html Sun Mar 20 20:39:20 2011 -0700
+++ b/AdiumHelp/pgs/AdvancedFeatures-FileTransfer.html Fri Jun 24 13:14:02 2011 -0500
@@ -28,7 +28,7 @@
<li>AIM (hard limit of 4 GB)</li>
<li>ICQ (hard limit of 4 GB)</li>
<li>IRC</li>
- <li>MSN (send through server only)</li>
+ <li>MSN</li>
<li>SILC (not yet in Adium)</li>
<li>Yahoo when not using an HTTP proxy (is relayed via a file transfer server).</li>
<li>XMPP (Jabber) when neither side is behind a NAT device.</li>
diff -r 2eed27cd9ddf -r 67194db10c73 AdiumHelp/pgs/ContactList-CombiningContacts.html
--- a/AdiumHelp/pgs/ContactList-CombiningContacts.html Sun Mar 20 20:39:20 2011 -0700
+++ b/AdiumHelp/pgs/ContactList-CombiningContacts.html Fri Jun 24 13:14:02 2011 -0500
@@ -59,7 +59,7 @@
<li>Select the combined contact in your <strong>Contact List</strong>.</li>
<li>Choose <strong>Get Info</strong> from the <strong>Contact</strong> menu.</li>
<li>Select the desired contact from the expanded meta-contact in the contact list.</li>
- <li>Drag the contact outside of the meta and into another group.</li>
+ <li>Drag the contact outside of the meta and into another group. (Again, if you have a "borderless" contact list, you'll need to hold down <strong>Command (⌘)</strong> in order to initiate the drag.)</li>
</ol>
<ul>
<li><i><strong>Note:</strong></i> If a single Apple Address Book card has the contacts listed together, this process will only remain in effect until Adium is restarted. This occurs because Adium automatically creates combined contacts based on this Address Book information.</li>
diff -r 2eed27cd9ddf -r 67194db10c73 AdiumHelp/pgs/Messaging-Focus.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/Messaging-Focus.html Fri Jun 24 13:14:02 2011 -0500
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta name="keywords" content="focus, unread, new, message" />
+<meta name="description" content="Focus" />
+<title>Focus</title>
+<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />
+</head>
+<body>
+<div id="banner"> <a name="messageview" id="messageview"></a>
+ <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+ <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+ <div id="pagetitle">
+ <h1>Focus</h1>
+ </div>
+ <p>Adium provides indication when a new message has been received in a <a href="Messaging-GroupChat.html">group chat</a> after your tab/window lost focus. Primarily it does so by displaying a red line in the scrollbar (not customizable) but Adium also provides a way for message styles to apply custom styling to messages that were received while focus was lost.</p>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Scrollbar indicators</h3>
+ </div>
+ <div class="taskboxtext">
+ <ul>
+ <li>When the window or tab loses focus, a red line is added.</li>
+ <li>You can access the "Jump to Previous Mark", "Jump to Next Mark" and "Jump to Focus Mark" by right-clicking the scroll bar, or from the Display menu.</li>
+ </ul>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>In-chat indicators</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>Adium allows message styles to provide their own, in-chat indicators for focus. Whether or not a message style provides it's own in-chat indication of messages received while focus is lost is up to the message style author.</p>
+ <p>There are two varieties of indications available in message styles: indicating the first message received while focus was lost, or indicating each message received while focus was lost. Or both. The message styles bundled with 1.4 (or newer) work like this:</p>
+ <ul>
+ <li>First: Smooth Operator.</li>
+ <li>Each: Gone Dark, minimal_mod, Mockie, Stockholm, yMous</li>
+ <li>Combined: Renkoo</li>
+ </ul>
+ <p>Each message style bundled with 1.4 (or newer) provides a different, style-integrated focus indicator.</p>
+ <ul>
+ <li>Gone Dark uses a background "screen" behind each message received while focus was lost.</li>
+ <li>minimal_mod uses faint grey vertical stripes (extensions of the per-message separators) behind each message received while focus was lost.</li>
+ <li>Mockie uses grey "â—¦" in the margin (may be left or right) next to each message received while focus was lost.</li>
+ <li>Renkoo uses "+" after the timestamp for each message that arrived while focus was lost a colored background and also uses a "+" with a colored background (matches variant color) after the timestamp for the first message received while focus was lost.</li>
+ <li>Smooth Operator uses a down arrow in the margin to the right of the first message received while focus was lost (matches text color).</li>
+ <li>Stockholm uses a colored capsule at the right edge of each message received while focus was lost.</li>
+ <li>yMous uses a vertical line at the left edge of the chat window for each message received while focus was lost.</li>
+ </ul>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Potential for confusion</h3>
+ </div>
+ <div class="taskboxtext">
+ <ul>
+ <li>Focus indication (both scrollbar and in-chat) is not removed until the chat window loses focus, and there is no explicit indication for "focus regained".</li>
+ <li>Using styles that provides only an in-chat indicator for the first message received while focus was lost, the presence of a firstFocus indicator does not mean that every following message was received while focus was lost.</li>
+ </ul>
+ </div>
+ </div>
+</div>
+</body>
+</html>
diff -r 2eed27cd9ddf -r 67194db10c73 AdiumHelp/pgs/Messaging-GroupChat.html
--- a/AdiumHelp/pgs/Messaging-GroupChat.html Sun Mar 20 20:39:20 2011 -0700
+++ b/AdiumHelp/pgs/Messaging-GroupChat.html Fri Jun 24 13:14:02 2011 -0500
@@ -119,13 +119,19 @@
<h3>Mentions</h3>
</div>
<div class="taskboxtext">
- <p>Mentions are indicated by lines on the scroll bar.</p>
- <ul>
- <li>When your name (or what you decide to highlight*) is mentioned in a chat, a grey line is added.</li>
- <li>When the window or tab loses focus, a red line is added and you can "Jump to Focus Mark" to easily go to it.</li>
- <li>You can access the "Jump to Previous Mark", "Jump to Next Mark" and "Jump to Focus Mark" by right-clicking the scroll bar, or from the new Display menu.</li>
- </ul>
- <p>*Mentions can specified in Preferences → Advanced → Mention.</p>
+ <p>Adium provides indication of when your user name (and some other text you possibly specified - see below) has been mentioned in a <a href="Messaging-GroupChat.html">group chat</a>. Primarily it does so by displaying a grey line in the scrollbar (not customizable) but Adium also provides a way for message styles to apply custom styling to messages that contain a mention.</p>
+ <p>Mentions can be specified in Preferences → Advanced → Mention.</p>
+ <p>All message styles bundled with 1.4 (or newer) provide a different, style-integrated indication for mentions that indicate the specific message that contains a message.</p>
+ <p>See the dedicated article on <a href="Messaging-Mentions.html">Mentions</a> for details.</p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Focus</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>Adium provides indication when a new message has been received in a <a href="Messaging-GroupChat.html">group chat</a> after your tab/window lost focus. Primarily it does so by displaying a red line in the scrollbar (not customizable) but Adium also provides a way for message styles to apply custom styling to messages that were received while focus was lost.</p>
+ <p>See the dedicated article on <a href="Messaging-Focus.html">Focus</a> for details.</p>
</div>
</div>
<div class="taskboxline">
diff -r 2eed27cd9ddf -r 67194db10c73 AdiumHelp/pgs/Messaging-Mentions.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/Messaging-Mentions.html Fri Jun 24 13:14:02 2011 -0500
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta name="keywords" content="mention, highlight, notification" />
+<meta name="description" content="Mentions" />
+<title>Mentions</title>
+<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />
+</head>
+<body>
+<div id="banner"> <a name="messageview" id="messageview"></a>
+ <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+ <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+ <div id="pagetitle">
+ <h1>Mentions</h1>
+ </div>
+ <p>Adium provides indication of when your user name (and some other text you possibly specified - see below) has been mentioned in a <a href="Messaging-GroupChat.html">group chat</a>. Primarily it does so by displaying a grey line in the scrollbar (not customizable) but Adium also provides a way for message styles to apply custom styling to messages that contain a mention.</p>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Specifying mentions</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>Mentions can be specified in Preferences → Advanced → Mention. By default, Adium highlights messages that include your username but you can add other notification strings to be highlighted.</p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Scrollbar indicators</h3>
+ </div>
+ <div class="taskboxtext">
+ <ul>
+ <li>When your user name (or what you decide to highlight) is mentioned in a chat, a dark grey horizontal line is added.</li>
+ <li>You can access the "Jump to Previous Mark" or "Jump to Next Mark" from the Display menu or by right-clicking the scroll bar.</li>
+ </ul>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Mention count</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>Mentions are also indicated by the color of the tab's unread mention count changing to red.</p>
+ <ul>
+ <li>Mention count preferences can be changed in Preferences → Advanced → Message Alerts.</li>
+ </ul>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>In-chat indicators</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>Adium allows message styles to provide their own, in-chat indicators for mention. All message styles bundled with 1.4 (or newer) provide a different, style-integrated indication for mentions that indicate the specific message that contains a message.</p>
+ <ul>
+ <li>Gone Dark uses a colored background (matches variant color).</li>
+ <li>minimal_mod uses a dark block at the left edge (matches header color).</li>
+ <li>Mockie uses a "•" in the margin (may be left or right) (matches variant color).</li>
+ <li>Renkoo uses a colored background (matches variant color).</li>
+ <li>Smooth Operator uses a star in the right margin (matches text color).</li>
+ <li>Stockholm uses a mention icon to the left of the relevant message (mention icon will replace a buddy icon if the user has chosen to display buddy icons) (matches variant color).</li>
+ <li>yMous uses a colored block at the right edge of the relevant message (between the message and the timestamp if the timestamp is visible) (matches variant color).</li>
+ </ul>
+ </div>
+ </div>
+</div>
+</body>
+</html>
diff -r 2eed27cd9ddf -r 67194db10c73 AdiumHelp/pgs/Messaging-MessageView.html
--- a/AdiumHelp/pgs/Messaging-MessageView.html Sun Mar 20 20:39:20 2011 -0700
+++ b/AdiumHelp/pgs/Messaging-MessageView.html Fri Jun 24 13:14:02 2011 -0500
@@ -33,8 +33,8 @@
<p>.AdiumMessageStyle Xtras provide alternate message styles for Adium. By default, Adium contains seven message styles that can be configured from Adium's Messages preferences pane:</p>
<ul>
<li>GoneDark</li>
+ <li>minimal_mod</li>
<li>Mockie</li>
- <li>minimal_mod</li>
<li>Renkoo</li>
<li>Smooth Operator</li>
<li>Stockholm</li>
diff -r 2eed27cd9ddf -r 67194db10c73 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Sun Mar 20 20:39:20 2011 -0700
+++ b/ChangeLogs/Changes.txt Fri Jun 24 13:14:02 2011 -0500
@@ -1,12 +1,18 @@
 Adium Version History
-----------------------
-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)
+Version 1.4.2 (06/13/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)
+ * 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)
+ * 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)
+ Contact List
+ * Fixed tooltips not being updated when scrollwheeling through the contact list. (#3480)
+ * Improved readability of tooltips by making their contents opaque and only the background transparent. (#15050)
+
Logging
* 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)
@@ -14,23 +20,34 @@
Message View
* Only display focus indication for group chats. (#14420)
+ * Enable %service% keyword in header.
* Fixed issue where sections of conversations loaded from message history are repeated. (#13362)
- * 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 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.
- *
+ * minimal_mod
+ * Disabled consecutivization of actions to prevent overlapping icons. Fixed erroneous application of a grey dotted top border to a consecutive, unfocused action that follows a non-action. Fixed text wrap alignment issues on actions.
+ * Mockie
+ * New mention and focus indicators, and improved scaling at large font sizes. (#14420)
+ * Renkoo
+ * No longer scrolls to bottom on new content regardless of scroll position. (#14331)
+ * Smooth Operator
+ * Compact: Mentions in actions are no longer italicized. Sendercolor Adiumy is not displayed in IRC too. Fixed progressively increasing saturation of the sendercolor Adiumy on each consecutive message.
+ * Classic: Fixed slight misalignment between sender and message. Lightened the on-click shadow. The per-message marks in the classic variant now grow to the left rather than to the right where it can overlap message text.
+ * Dark: New variant!
+ * all variants: Improved the performance of all-by-sender-on-click javascript. Shifted the built-in buddy icons down a few pixels so they look more centered. Switched to more compact focus indication icons.
+ * Stockholm
+ * Reverted to pre-1.4 layout for per-message timestamps (#14361). Per-message timestamps now display on the left when the message text is RTL (#10403).
+ * yMous
+ * Removed the per-message triangle, slimmed the area between the sender and message, and fixed more elements to scale with font-size. Improved the performance of all-by-sender-on-click javascript.
ICQ
* Fixed ICQ disconnections going unnoticed. (#14229)
* Fixed hang caused by reading badly formatted transcripts from ICQ. (#14627)
+ * Switch to clientLogin authentication for ICQ and AIM, allowing SSL to be used if possible again. Change the options for encryption to "Require"/"Opportunistic"/"Disabled." (#15000)
+ * Use the clientLogin key of the official ICQ Mac client instead of the AIM key we had which got banned. (#15244)
IRC
- * Fixed a crash related to Cyrillic nicknames in IRC. (#13351)
+ * Fixed a crash related to invalid UTF8 in nicknames on IRC. (#13351)
+ * Fixed a crash that occurred when opening irc://-links to new servers on ports other than 6667. (#15093)
MSN
* Added a preference to enable/disable MSN Direct Connections. (#14602)
@@ -49,12 +66,11 @@
* 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)
+ * Fixed an issue with adding URLs via copy/paste resulting in an invalid link. (#15229)
Localisation
* 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 and improved localisations: British English (#15116), Catalan (#15231), Danish (#15160), Dutch (#15202), Finnish (#15211), French (#15198), German (#15204), Italian (#15224), Polish (#15230), Portuguese (Portugal) (#15223), Russian (#15246), Swedish (#15217).
* Fixed an issue in the Czech localisation. (#14586)
diff -r 2eed27cd9ddf -r 67194db10c73 Copyright.txt
--- a/Copyright.txt Sun Mar 20 20:39:20 2011 -0700
+++ b/Copyright.txt Fri Jun 24 13:14:02 2011 -0500
@@ -1,5 +1,5 @@
Adium
-Copyright (C) 2001-2010 by the following:
+Copyright (C) 2001-2011 by the following:
Thijs Alkemade
Adam Atlas
@@ -17,7 +17,7 @@
Ariel Chinn
David Clark
Felipe Contreras
-Jacobo Tarrag—n Cros
+Jacobo Tarragón Cros
Brian Dickman
Michael Dippery
Frank Dowsett
diff -r 2eed27cd9ddf -r 67194db10c73 Frameworks/AIUtilities Framework/Resources/ca.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/ca.lproj/Localizable.strings has changed
diff -r 2eed27cd9ddf -r 67194db10c73 Frameworks/AIUtilities Framework/Resources/en_GB.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/en_GB.lproj/Localizable.strings has changed
diff -r 2eed27cd9ddf -r 67194db10c73 Frameworks/AIUtilities Framework/Resources/fi.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/fi.lproj/Localizable.strings has changed
diff -r 2eed27cd9ddf -r 67194db10c73 Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.h
--- a/Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.h Sun Mar 20 20:39:20 2011 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.h Fri Jun 24 13:14:02 2011 -0500
@@ -51,6 +51,8 @@
NSPoint tooltipLocation; //Last tooltip location we told our delegate about
NSTrackingRectTag tooltipTrackingTag; //Tag for our tracking rect
int tooltipCount; //Used to determine how long before a tooltip appears
+
+ BOOL mouseIsScrolling;
}
/*!
diff -r 2eed27cd9ddf -r 67194db10c73 Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.m
--- a/Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.m Sun Mar 20 20:39:20 2011 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.m Fri Jun 24 13:14:02 2011 -0500
@@ -26,6 +26,8 @@
- (void)_startTrackingMouse;
- (void)_stopTrackingMouse;
- (void)_hideTooltip;
+
+- (void)contentViewBoundsDidChange;
@end
@interface NSWindow (SpacesDeterminationHackery)
@@ -46,6 +48,7 @@
delegate = inDelegate;
tooltipTrackingTag = -1;
tooltipLocation = NSZeroPoint;
+ mouseIsScrolling = NO;
//Reset cursor tracking when the view's frame changes
[[NSNotificationCenter defaultCenter] addObserver:self
@@ -56,6 +59,14 @@
selector:@selector(resetCursorTracking)
name:AIWindowToolbarDidToggleVisibility
object:[view window]];
+
+ // Track contentView bounds changes (useful to detect scrolling)
+ if ([view isKindOfClass:[NSScrollView class]]) {
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(contentViewBoundsDidChange)
+ name:NSViewBoundsDidChangeNotification
+ object:[(NSScrollView *)view contentView]];
+ }
[self installCursorRect];
}
@@ -200,6 +211,12 @@
[self _stopTrackingMouse];
}
+// Handle scrolling
+- (void)contentViewBoundsDidChange
+{
+ mouseIsScrolling = YES;
+}
+
//Start tracking mouse movement
- (void)_startTrackingMouse
{
@@ -269,9 +286,12 @@
//the mouse is left still tooltipCount will eventually grow greater than TOOL_TIP_DELAY, and we will begin
//displaying the tooltips
if (tooltipCount > TOOL_TIP_DELAY) {
- if (!NSEqualPoints(tooltipLocation, mouseLocation)) {
+ if (!NSEqualPoints(tooltipLocation, mouseLocation) || mouseIsScrolling) {
[delegate showTooltipAtPoint:mouseLocation];
tooltipLocation = mouseLocation;
+
+ // Reset scrolling info
+ mouseIsScrolling = NO;
}
} else {
diff -r 2eed27cd9ddf -r 67194db10c73 Frameworks/AIUtilities Framework/Source/AITooltipUtilities.m
--- a/Frameworks/AIUtilities Framework/Source/AITooltipUtilities.m Sun Mar 20 20:39:20 2011 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AITooltipUtilities.m Fri Jun 24 13:14:02 2011 -0500
@@ -20,7 +20,7 @@
#define TOOLTIP_TITLE_BODY_MARGIN 10.0
#define MAX_IMAGE_DIMENSION 96.0
-#define TOOLTIP_OPACITY 0.9
+#define TOOLTIP_OPACITY 1.0
#define TOOLTIP_FADEOUT_INTERVAL 0.025
#define TOOLTIP_FADOUT_STEP 0.1
@@ -193,7 +193,8 @@
defer:NO];
[tooltipWindow setHidesOnDeactivate:NO];
[tooltipWindow setIgnoresMouseEvents:YES];
- [tooltipWindow setBackgroundColor:[NSColor whiteColor]];
+ [tooltipWindow setOpaque:NO];
+ [tooltipWindow setBackgroundColor:[[NSColor controlBackgroundColor] colorWithAlphaComponent:0.97f]];
[tooltipWindow setAlphaValue:TOOLTIP_OPACITY];
[tooltipWindow setHasShadow:YES];
diff -r 2eed27cd9ddf -r 67194db10c73 Frameworks/Adium Framework/Resources/ca.lproj/EditStateSheet.nib/designable.nib
--- a/Frameworks/Adium Framework/Resources/ca.lproj/EditStateSheet.nib/designable.nib Sun Mar 20 20:39:20 2011 -0700
+++ b/Frameworks/Adium Framework/Resources/ca.lproj/EditStateSheet.nib/designable.nib Fri Jun 24 13:14:02 2011 -0500
@@ -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">1060</int>
- <string key="IBDocument.SystemVersion">10F569</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
+ <int key="IBDocument.SystemTarget">1050</int>
+ <string key="IBDocument.SystemVersion">10J869</string>
+ <string key="IBDocument.InterfaceBuilderVersion">788</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">804</string>
+ <string key="NS.object.0">788</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -21,18 +21,18 @@
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="498645305">
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="983003822">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSCustomObject" id="962199563">
+ <object class="NSCustomObject" id="126005853">
<string key="NSClassName">AIEditStateWindowController</string>
</object>
- <object class="NSCustomObject" id="705234837">
+ <object class="NSCustomObject" id="675423129">
<string key="NSClassName">FirstResponder</string>
</object>
- <object class="NSCustomObject" id="307660712">
+ <object class="NSCustomObject" id="122537041">
<string key="NSClassName">NSApplication</string>
</object>
- <object class="NSWindowTemplate" id="953304848">
+ <object class="NSWindowTemplate" id="423516752">
<int key="NSWindowStyleMask">3</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{447, 335}, {403, 521}}</string>
@@ -44,30 +44,30 @@
</object>
<string key="NSWindowContentMaxSize">{403, 527}</string>
<string key="NSWindowContentMinSize">{403, 477}</string>
- <object class="NSView" key="NSWindowView" id="894530293">
+ <object class="NSView" key="NSWindowView" id="509876344">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSButton" id="141367826">
- <reference key="NSNextResponder" ref="894530293"/>
+ <object class="NSButton" id="686597933">
+ <reference key="NSNextResponder" ref="509876344"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{305, 12}, {84, 32}}</string>
- <reference key="NSSuperview" ref="894530293"/>
+ <reference key="NSSuperview" ref="509876344"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="1022310621">
+ <object class="NSButtonCell" key="NSCell" id="727255828">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">D'acord</string>
- <object class="NSFont" key="NSSupport" id="68384524">
+ <object class="NSFont" key="NSSupport" id="321541240">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
- <reference key="NSControlView" ref="141367826"/>
+ <reference key="NSControlView" ref="686597933"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">268435457</int>
- <object class="NSFont" key="NSAlternateImage" id="671722301">
+ <object class="NSFont" key="NSAlternateImage" id="627402330">
<string key="NSName">Helvetica</string>
<double key="NSSize">13</double>
<int key="NSfFlags">16</int>
@@ -78,46 +78,46 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSButton" id="364951779">
- <reference key="NSNextResponder" ref="894530293"/>
+ <object class="NSButton" id="454589821">
+ <reference key="NSNextResponder" ref="509876344"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{221, 12}, {84, 32}}</string>
- <reference key="NSSuperview" ref="894530293"/>
+ <reference key="NSSuperview" ref="509876344"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="779775694">
+ <object class="NSButtonCell" key="NSCell" id="732367146">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Cancel·la</string>
- <reference key="NSSupport" ref="68384524"/>
- <reference key="NSControlView" ref="364951779"/>
+ <reference key="NSSupport" ref="321541240"/>
+ <reference key="NSControlView" ref="454589821"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="671722301"/>
+ <reference key="NSAlternateImage" ref="627402330"/>
<string key="NSAlternateContents"/>
<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSButton" id="18509426">
- <reference key="NSNextResponder" ref="894530293"/>
+ <object class="NSButton" id="1015368611">
+ <reference key="NSNextResponder" ref="509876344"/>
<int key="NSvFlags">264</int>
<string key="NSFrame">{{12, 140}, {372, 18}}</string>
- <reference key="NSSuperview" ref="894530293"/>
+ <reference key="NSSuperview" ref="509876344"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="64783783">
+ <object class="NSButtonCell" key="NSCell" id="215150478">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Apareix com a inactiu immediatament</string>
- <reference key="NSSupport" ref="68384524"/>
- <reference key="NSControlView" ref="18509426"/>
+ <string key="NSContents">Mostra'm inactiu immediatament</string>
+ <reference key="NSSupport" ref="321541240"/>
+ <reference key="NSControlView" ref="1015368611"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <object class="NSCustomResource" key="NSNormalImage" id="1023732300">
+ <object class="NSCustomResource" key="NSNormalImage" id="970152037">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSSwitch</string>
</object>
- <object class="NSButtonImageSource" key="NSAlternateImage" id="29693735">
+ <object class="NSButtonImageSource" key="NSAlternateImage" id="522635332">
<string key="NSImageName">NSSwitch</string>
</object>
<string key="NSAlternateContents"/>
@@ -126,60 +126,62 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSButton" id="538346770">
- <reference key="NSNextResponder" ref="894530293"/>
+ <object class="NSButton" id="762602674">
+ <reference key="NSNextResponder" ref="509876344"/>
<int key="NSvFlags">264</int>
<string key="NSFrame">{{12, 283}, {373, 18}}</string>
- <reference key="NSSuperview" ref="894530293"/>
+ <reference key="NSSuperview" ref="509876344"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="919723132">
+ <object class="NSButtonCell" key="NSCell" id="950289041">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Resposta automà tica</string>
- <reference key="NSSupport" ref="68384524"/>
- <reference key="NSControlView" ref="538346770"/>
+ <reference key="NSSupport" ref="321541240"/>
+ <reference key="NSControlView" ref="762602674"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSAlternateImage" ref="29693735"/>
+ <reference key="NSNormalImage" ref="970152037"/>
+ <reference key="NSAlternateImage" ref="522635332"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSButton" id="565148792">
- <reference key="NSNextResponder" ref="894530293"/>
+ <object class="NSButton" id="873668146">
+ <reference key="NSNextResponder" ref="509876344"/>
<int key="NSvFlags">264</int>
<string key="NSFrame">{{35, 263}, {350, 18}}</string>
- <reference key="NSSuperview" ref="894530293"/>
+ <reference key="NSSuperview" ref="509876344"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="99524311">
+ <object class="NSButtonCell" key="NSCell" id="1020350936">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Amb un missatge personalitzat:</string>
- <reference key="NSSupport" ref="68384524"/>
- <reference key="NSControlView" ref="565148792"/>
+ <reference key="NSSupport" ref="321541240"/>
+ <reference key="NSControlView" ref="873668146"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSAlternateImage" ref="29693735"/>
+ <reference key="NSNormalImage" ref="970152037"/>
+ <reference key="NSAlternateImage" ref="522635332"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSScrollView" id="842663423">
- <reference key="NSNextResponder" ref="894530293"/>
+ <object class="NSScrollView" id="459354381">
+ <reference key="NSNextResponder" ref="509876344"/>
<int key="NSvFlags">266</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSClipView" id="478340462">
- <reference key="NSNextResponder" ref="842663423"/>
+ <object class="NSClipView" id="891957801">
+ <reference key="NSNextResponder" ref="459354381"/>
<int key="NSvFlags">2304</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSTextView" id="371269161">
- <reference key="NSNextResponder" ref="478340462"/>
+ <object class="NSTextView" id="159678567">
+ <reference key="NSNextResponder" ref="891957801"/>
<int key="NSvFlags">2322</int>
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -205,8 +207,8 @@
</object>
</object>
<string key="NSFrameSize">{344, 14}</string>
- <reference key="NSSuperview" ref="478340462"/>
- <object class="NSTextContainer" key="NSTextContainer" id="514131114">
+ <reference key="NSSuperview" ref="891957801"/>
+ <object class="NSTextContainer" key="NSTextContainer" id="1027022442">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
<object class="NSMutableString" key="NSString">
@@ -216,12 +218,12 @@
</object>
<object class="NSMutableArray" key="NSTextContainers">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="514131114"/>
+ <reference ref="1027022442"/>
</object>
<int key="NSLMFlags">6</int>
<nil key="NSDelegate"/>
</object>
- <reference key="NSTextView" ref="371269161"/>
+ <reference key="NSTextView" ref="159678567"/>
<double key="NSWidth">344</double>
<int key="NSTCFlags">1</int>
</object>
@@ -229,7 +231,7 @@
<int key="NSFlags">28647</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
- <object class="NSColor" key="NSBackgroundColor" id="702594311">
+ <object class="NSColor" key="NSBackgroundColor" id="911429596">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
@@ -242,27 +244,27 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSColor" id="1015121942">
+ <object class="NSColor" id="983459605">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">selectedTextBackgroundColor</string>
- <object class="NSColor" key="NSColor" id="768261220">
+ <object class="NSColor" key="NSColor" id="42051119">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
- <object class="NSColor" id="639882300">
+ <object class="NSColor" id="305890478">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">selectedTextColor</string>
- <object class="NSColor" key="NSColor" id="765986467">
+ <object class="NSColor" key="NSColor" id="486934647">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
</object>
</object>
</object>
- <reference key="NSInsertionColor" ref="765986467"/>
+ <reference key="NSInsertionColor" ref="486934647"/>
<object class="NSDictionary" key="NSLinkAttributes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@@ -273,11 +275,11 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSColor" id="317078781">
+ <object class="NSColor" id="51833698">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MCAwIDEAA</bytes>
</object>
- <object class="NSCursor" id="784041542">
+ <object class="NSCursor" id="369070163">
<string key="NSHotSpot">{8, -8}</string>
<int key="NSCursorType">13</int>
</object>
@@ -293,70 +295,70 @@
</object>
</object>
<string key="NSFrame">{{1, 1}, {344, 91}}</string>
- <reference key="NSSuperview" ref="842663423"/>
- <reference key="NSNextKeyView" ref="371269161"/>
- <reference key="NSDocView" ref="371269161"/>
- <reference key="NSBGColor" ref="702594311"/>
- <object class="NSCursor" key="NSCursor" id="44478940">
+ <reference key="NSSuperview" ref="459354381"/>
+ <reference key="NSNextKeyView" ref="159678567"/>
+ <reference key="NSDocView" ref="159678567"/>
+ <reference key="NSBGColor" ref="911429596"/>
+ <object class="NSCursor" key="NSCursor" id="124104457">
<string key="NSHotSpot">{4, -5}</string>
<int key="NSCursorType">1</int>
</object>
<int key="NScvFlags">4</int>
</object>
- <object class="NSScroller" id="496139760">
- <reference key="NSNextResponder" ref="842663423"/>
+ <object class="NSScroller" id="809775435">
+ <reference key="NSNextResponder" ref="459354381"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-30, 1}, {15, 91}}</string>
- <reference key="NSSuperview" ref="842663423"/>
- <reference key="NSTarget" ref="842663423"/>
+ <reference key="NSSuperview" ref="459354381"/>
+ <reference key="NSTarget" ref="459354381"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
</object>
- <object class="NSScroller" id="322688699">
- <reference key="NSNextResponder" ref="842663423"/>
+ <object class="NSScroller" id="534678362">
+ <reference key="NSNextResponder" ref="459354381"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
- <reference key="NSSuperview" ref="842663423"/>
+ <reference key="NSSuperview" ref="459354381"/>
<int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="842663423"/>
+ <reference key="NSTarget" ref="459354381"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
<double key="NSPercent">0.94565218687057495</double>
</object>
</object>
<string key="NSFrame">{{37, 164}, {346, 93}}</string>
- <reference key="NSSuperview" ref="894530293"/>
- <reference key="NSNextKeyView" ref="478340462"/>
+ <reference key="NSSuperview" ref="509876344"/>
+ <reference key="NSNextKeyView" ref="891957801"/>
<int key="NSsFlags">530</int>
- <reference key="NSVScroller" ref="496139760"/>
- <reference key="NSHScroller" ref="322688699"/>
- <reference key="NSContentView" ref="478340462"/>
+ <reference key="NSVScroller" ref="809775435"/>
+ <reference key="NSHScroller" ref="534678362"/>
+ <reference key="NSContentView" ref="891957801"/>
</object>
- <object class="NSBox" id="772737076">
- <reference key="NSNextResponder" ref="894530293"/>
+ <object class="NSBox" id="763791491">
+ <reference key="NSNextResponder" ref="509876344"/>
<int key="NSvFlags">264</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSView" id="579971952">
- <reference key="NSNextResponder" ref="772737076"/>
+ <object class="NSView" id="80424508">
+ <reference key="NSNextResponder" ref="763791491"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSStepper" id="916664508">
- <reference key="NSNextResponder" ref="579971952"/>
+ <object class="NSStepper" id="825201197">
+ <reference key="NSNextResponder" ref="80424508"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{129, -3}, {19, 28}}</string>
- <reference key="NSSuperview" ref="579971952"/>
+ <reference key="NSSuperview" ref="80424508"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSStepperCell" key="NSCell" id="979131415">
+ <object class="NSStepperCell" key="NSCell" id="1022260684">
<int key="NSCellFlags">68025888</int>
<int key="NSCellFlags2">0</int>
- <object class="NSFont" key="NSSupport" id="683872977">
+ <object class="NSFont" key="NSSupport" id="31331014">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">12</double>
<int key="NSfFlags">16</int>
</object>
- <reference key="NSControlView" ref="916664508"/>
+ <reference key="NSControlView" ref="825201197"/>
<double key="NSValue">10</double>
<double key="NSMaxValue">59</double>
<double key="NSIncrement">1</double>
@@ -364,156 +366,156 @@
<bool key="NSAutorepeat">YES</bool>
</object>
</object>
- <object class="NSTextField" id="618810304">
- <reference key="NSNextResponder" ref="579971952"/>
+ <object class="NSTextField" id="1069301758">
+ <reference key="NSNextResponder" ref="80424508"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{105, 0}, {25, 22}}</string>
- <reference key="NSSuperview" ref="579971952"/>
+ <reference key="NSSuperview" ref="80424508"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="325142892">
+ <object class="NSTextFieldCell" key="NSCell" id="108012993">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags2">4195328</int>
<string key="NSContents">10</string>
- <reference key="NSSupport" ref="68384524"/>
- <reference key="NSControlView" ref="618810304"/>
+ <reference key="NSSupport" ref="321541240"/>
+ <reference key="NSControlView" ref="1069301758"/>
<bool key="NSDrawsBackground">YES</bool>
- <object class="NSColor" key="NSBackgroundColor" id="870844260">
+ <object class="NSColor" key="NSBackgroundColor" id="616743529">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textBackgroundColor</string>
- <reference key="NSColor" ref="702594311"/>
+ <reference key="NSColor" ref="911429596"/>
</object>
- <object class="NSColor" key="NSTextColor" id="738781861">
+ <object class="NSColor" key="NSTextColor" id="1062485171">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textColor</string>
- <reference key="NSColor" ref="765986467"/>
+ <reference key="NSColor" ref="486934647"/>
</object>
</object>
</object>
- <object class="NSTextField" id="966382804">
- <reference key="NSNextResponder" ref="579971952"/>
+ <object class="NSTextField" id="519940975">
+ <reference key="NSNextResponder" ref="80424508"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{150, 3}, {94, 17}}</string>
- <reference key="NSSuperview" ref="579971952"/>
+ <reference key="NSSuperview" ref="80424508"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="761159723">
+ <object class="NSTextFieldCell" key="NSCell" id="556586308">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">TWludXRzCg</string>
- <reference key="NSSupport" ref="68384524"/>
- <reference key="NSControlView" ref="966382804"/>
- <object class="NSColor" key="NSBackgroundColor" id="838641767">
+ <reference key="NSSupport" ref="321541240"/>
+ <reference key="NSControlView" ref="519940975"/>
+ <object class="NSColor" key="NSBackgroundColor" id="793674802">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
- <reference key="NSColor" ref="768261220"/>
+ <reference key="NSColor" ref="42051119"/>
</object>
- <object class="NSColor" key="NSTextColor" id="362848878">
+ <object class="NSColor" key="NSTextColor" id="969039322">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
- <reference key="NSColor" ref="765986467"/>
+ <reference key="NSColor" ref="486934647"/>
</object>
</object>
</object>
- <object class="NSStepper" id="141684792">
- <reference key="NSNextResponder" ref="579971952"/>
+ <object class="NSStepper" id="437797315">
+ <reference key="NSNextResponder" ref="80424508"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{24, -3}, {19, 28}}</string>
- <reference key="NSSuperview" ref="579971952"/>
+ <reference key="NSSuperview" ref="80424508"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSStepperCell" key="NSCell" id="881460383">
+ <object class="NSStepperCell" key="NSCell" id="845689701">
<int key="NSCellFlags">68025888</int>
<int key="NSCellFlags2">0</int>
- <reference key="NSSupport" ref="683872977"/>
- <reference key="NSControlView" ref="141684792"/>
+ <reference key="NSSupport" ref="31331014"/>
+ <reference key="NSControlView" ref="437797315"/>
<double key="NSMaxValue">59</double>
<double key="NSIncrement">1</double>
<bool key="NSValueWraps">YES</bool>
<bool key="NSAutorepeat">YES</bool>
</object>
</object>
- <object class="NSTextField" id="963543560">
- <reference key="NSNextResponder" ref="579971952"/>
+ <object class="NSTextField" id="30081493">
+ <reference key="NSNextResponder" ref="80424508"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{45, 3}, {42, 17}}</string>
- <reference key="NSSuperview" ref="579971952"/>
+ <reference key="NSSuperview" ref="80424508"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="29263009">
+ <object class="NSTextFieldCell" key="NSCell" id="710160508">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string key="NSContents">Hores</string>
- <reference key="NSSupport" ref="68384524"/>
- <reference key="NSControlView" ref="963543560"/>
- <reference key="NSBackgroundColor" ref="838641767"/>
- <reference key="NSTextColor" ref="362848878"/>
+ <reference key="NSSupport" ref="321541240"/>
+ <reference key="NSControlView" ref="30081493"/>
+ <reference key="NSBackgroundColor" ref="793674802"/>
+ <reference key="NSTextColor" ref="969039322"/>
</object>
</object>
- <object class="NSTextField" id="291038923">
- <reference key="NSNextResponder" ref="579971952"/>
+ <object class="NSTextField" id="330136588">
+ <reference key="NSNextResponder" ref="80424508"/>
<int key="NSvFlags">268</int>
<string key="NSFrameSize">{25, 22}</string>
- <reference key="NSSuperview" ref="579971952"/>
+ <reference key="NSSuperview" ref="80424508"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="737731474">
+ <object class="NSTextFieldCell" key="NSCell" id="347985311">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags2">4195328</int>
<string key="NSContents">0</string>
- <reference key="NSSupport" ref="68384524"/>
- <reference key="NSControlView" ref="291038923"/>
+ <reference key="NSSupport" ref="321541240"/>
More information about the commits
mailing list