adium 4562:b538b6f2f1e0: Buildbot doesn't like having ivars in a...
commits at adium.im
commits at adium.im
Wed Jan 25 06:55:34 UTC 2012
details: http://hg.adium.im/adium/rev/b538b6f2f1e0
revision: 4562:b538b6f2f1e0
branch: PreferencesRedux
author: Frank Dowsett <wixardy at adium.im>
date: Wed Jan 25 01:43:17 2012 -0500
Buildbot doesn't like having ivars in a class extension.
Subject: adium 4563:f5dca08fb214: merge from default
details: http://hg.adium.im/adium/rev/f5dca08fb214
revision: 4563:f5dca08fb214
branch: PreferencesRedux
author: Frank Dowsett <wixardy at adium.im>
date: Wed Jan 25 01:53:51 2012 -0500
merge from default
diffs (truncated from 73335 to 1000 lines):
diff -r 75819036d065 -r f5dca08fb214 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sun Jan 22 17:06:11 2012 -0500
+++ b/Adium.xcodeproj/project.pbxproj Wed Jan 25 01:53:51 2012 -0500
@@ -4526,6 +4526,9 @@
D10A3A2A122C61EF003B5A7E /* source-destination.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "source-destination.png"; path = "Resources/source-destination.png"; sourceTree = "<group>"; };
D182F1B411DFF23700E33AE2 /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = sk_SK.lproj/InfoPlist.strings; sourceTree = "<group>"; };
D182F1B611DFF23700E33AE2 /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = sk_SK.lproj/schema.strings; sourceTree = "<group>"; };
+ D1B9BFFE14C3ADAE00D03244 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/ESPurpleZephyrAccountView.nib"; sourceTree = "<group>"; };
+ D1B9C00814C3ADF600D03244 /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = "Plugins/Purple Service/sl.lproj/Localizable.strings"; sourceTree = "<group>"; };
+ D1B9C01C14C3AEC300D03244 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/WebKit Message View/sl.lproj/WebKitPreferencesView.nib"; sourceTree = "<group>"; };
D1C1FA2514995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_AU; path = Resources/en_AU.lproj/AccountProxy.nib; sourceTree = "<group>"; };
D1C1FA2614995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_AU; path = Resources/en_AU.lproj/AIAdvancedInspectorPane.nib; sourceTree = "<group>"; };
D1C1FA2714995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_AU; path = "Plugins/Purple Service/en_AU.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
@@ -4591,6 +4594,20 @@
D1C1FA7014995E84008C94EB /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_TW; path = "Plugins/Purple Service/zh_TW.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
D1C1FA7114995E88008C94EB /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sk_SK; path = "Plugins/Purple Service/sk_SK.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
D1C1FA7214995E8E008C94EB /* uk_UA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk_UA; path = "Plugins/Purple Service/uk_UA.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
+ D1F92AE214C3A6F6009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/DCPurpleJabberJoinChatView.nib"; sourceTree = "<group>"; };
+ D1F92AE414C3A70E009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/ESPurpleJabberAccountView.nib"; sourceTree = "<group>"; };
+ D1F92AEE14C3A72C009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/ESPurpleAIMAccountView.nib"; sourceTree = "<group>"; };
+ D1F92AF014C3A735009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/DCPurpleOscarJoinChatView.nib"; sourceTree = "<group>"; };
+ D1F92AF314C3A748009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/ESPurpleICQAccountView.nib"; sourceTree = "<group>"; };
+ D1F92AFD14C3A786009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/DCPurpleYahooJoinChatView.nib"; sourceTree = "<group>"; };
+ D1F92B0714C3A79A009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/DCPurpleZephyrJoinChatView.nib"; sourceTree = "<group>"; };
+ D1F92B1114C3A7B4009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/ESPurpleGaduGaduAccountView.nib"; sourceTree = "<group>"; };
+ D1F92B1814C3A7C6009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/ESPurpleMSNAccountView.nib"; sourceTree = "<group>"; };
+ D1F92B1D14C3A7E6009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/ESPurpleNovellAccountView.nib"; sourceTree = "<group>"; };
+ D1F92B2514C3A7F6009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/ESPurpleYahooAccountView.nib"; sourceTree = "<group>"; };
+ D1F92B2814C3A80B009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/ESPurpleSimpleAccountView.nib"; sourceTree = "<group>"; };
+ D1F92B2B14C3A819009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/DCPurpleMeanwhileJoinChatView.nib"; sourceTree = "<group>"; };
+ D1F92B2D14C3A820009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/sl.lproj/ESPurpleMeanwhileAccountView.nib"; sourceTree = "<group>"; };
D3DA2E3E052E65DE00A8010B /* LNAboutBoxController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = LNAboutBoxController.m; path = Source/LNAboutBoxController.m; sourceTree = "<group>"; };
D3DA2E40052E65E400A8010B /* LNAboutBoxController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = LNAboutBoxController.h; path = Source/LNAboutBoxController.h; sourceTree = "<group>"; };
DA9CF854080F9784000C5249 /* AIPathUtilities.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIPathUtilities.h; path = "Frameworks/Adium Framework/Source/AIPathUtilities.h"; sourceTree = "<group>"; };
@@ -10916,6 +10933,7 @@
5A7642C511E044BA00E5E0AF /* sk_SK */,
5A80CCA2121F5A7B00D0670A /* uk_UA */,
D1C1FA4314995D98008C94EB /* en_AU */,
+ D1B9C00814C3ADF600D03244 /* sl */,
);
name = Localizable.strings;
sourceTree = "<group>";
@@ -11059,6 +11077,7 @@
5A7642BB11E044BA00E5E0AF /* sk_SK */,
5A80CC98121F5A7B00D0670A /* uk_UA */,
D1C1FA3B14995D98008C94EB /* en_AU */,
+ D1F92B1D14C3A7E6009D7B34 /* sl */,
);
name = ESPurpleNovellAccountView.nib;
sourceTree = "<group>";
@@ -11094,6 +11113,7 @@
5A7642B611E044B900E5E0AF /* sk_SK */,
5A80CC93121F5A7A00D0670A /* uk_UA */,
D1C1FA3614995D98008C94EB /* en_AU */,
+ D1F92B1114C3A7B4009D7B34 /* sl */,
);
name = ESPurpleGaduGaduAccountView.nib;
sourceTree = "<group>";
@@ -11129,6 +11149,7 @@
5A7642BA11E044BA00E5E0AF /* sk_SK */,
5A80CC97121F5A7B00D0670A /* uk_UA */,
D1C1FA3A14995D98008C94EB /* en_AU */,
+ D1F92B1814C3A7C6009D7B34 /* sl */,
);
name = ESPurpleMSNAccountView.nib;
sourceTree = "<group>";
@@ -11164,6 +11185,7 @@
5A7642B011E044B900E5E0AF /* sk_SK */,
5A80CC8C121F5A7A00D0670A /* uk_UA */,
D1C1FA2F14995D98008C94EB /* en_AU */,
+ D1F92B0714C3A79A009D7B34 /* sl */,
);
name = DCPurpleZephyrJoinChatView.nib;
sourceTree = "<group>";
@@ -11199,6 +11221,7 @@
5A7642AE11E044B900E5E0AF /* sk_SK */,
5A80CC8A121F5A7A00D0670A /* uk_UA */,
D1C1FA2D14995D98008C94EB /* en_AU */,
+ D1F92AF014C3A735009D7B34 /* sl */,
);
name = DCPurpleOscarJoinChatView.nib;
sourceTree = "<group>";
@@ -11234,6 +11257,7 @@
5A7642AF11E044B900E5E0AF /* sk_SK */,
5A80CC8B121F5A7A00D0670A /* uk_UA */,
D1C1FA2E14995D98008C94EB /* en_AU */,
+ D1F92AFD14C3A786009D7B34 /* sl */,
);
name = DCPurpleYahooJoinChatView.nib;
sourceTree = "<group>";
@@ -11269,6 +11293,7 @@
5A7642BE11E044BA00E5E0AF /* sk_SK */,
5A80CC9B121F5A7B00D0670A /* uk_UA */,
D1C1FA3E14995D98008C94EB /* en_AU */,
+ D1B9BFFE14C3ADAE00D03244 /* sl */,
);
name = ESPurpleZephyrAccountView.nib;
sourceTree = "<group>";
@@ -11304,6 +11329,7 @@
5A7642AD11E044B900E5E0AF /* sk_SK */,
5A80CC89121F5A7A00D0670A /* uk_UA */,
D1C1FA2C14995D98008C94EB /* en_AU */,
+ D1F92B2B14C3A819009D7B34 /* sl */,
);
name = DCPurpleMeanwhileJoinChatView.nib;
sourceTree = "<group>";
@@ -11374,6 +11400,7 @@
5A7642AC11E044B900E5E0AF /* sk_SK */,
5A80CC88121F5A7A00D0670A /* uk_UA */,
D1C1FA2B14995D98008C94EB /* en_AU */,
+ D1F92AE214C3A6F6009D7B34 /* sl */,
);
name = DCPurpleJabberJoinChatView.nib;
sourceTree = "<group>";
@@ -11409,6 +11436,7 @@
5A7642B711E044B900E5E0AF /* sk_SK */,
5A80CC94121F5A7A00D0670A /* uk_UA */,
D1C1FA3714995D98008C94EB /* en_AU */,
+ D1F92AF314C3A748009D7B34 /* sl */,
);
name = ESPurpleICQAccountView.nib;
sourceTree = "<group>";
@@ -11444,6 +11472,7 @@
5A7642B511E044B900E5E0AF /* sk_SK */,
5A80CC92121F5A7A00D0670A /* uk_UA */,
D1C1FA3514995D98008C94EB /* en_AU */,
+ D1F92AEE14C3A72C009D7B34 /* sl */,
);
name = ESPurpleAIMAccountView.nib;
sourceTree = "<group>";
@@ -11479,6 +11508,7 @@
5A7642B911E044B900E5E0AF /* sk_SK */,
5A80CC96121F5A7B00D0670A /* uk_UA */,
D1C1FA3914995D98008C94EB /* en_AU */,
+ D1F92B2D14C3A820009D7B34 /* sl */,
);
name = ESPurpleMeanwhileAccountView.nib;
sourceTree = "<group>";
@@ -11514,6 +11544,7 @@
5A7642BD11E044BA00E5E0AF /* sk_SK */,
5A80CC9A121F5A7B00D0670A /* uk_UA */,
D1C1FA3D14995D98008C94EB /* en_AU */,
+ D1F92B2514C3A7F6009D7B34 /* sl */,
);
name = ESPurpleYahooAccountView.nib;
sourceTree = "<group>";
@@ -11549,6 +11580,7 @@
5A7642B811E044B900E5E0AF /* sk_SK */,
5A80CC95121F5A7B00D0670A /* uk_UA */,
D1C1FA3814995D98008C94EB /* en_AU */,
+ D1F92AE414C3A70E009D7B34 /* sl */,
);
name = ESPurpleJabberAccountView.nib;
sourceTree = "<group>";
@@ -11656,6 +11688,7 @@
5A7642BC11E044BA00E5E0AF /* sk_SK */,
5A80CC99121F5A7B00D0670A /* uk_UA */,
D1C1FA3C14995D98008C94EB /* en_AU */,
+ D1F92B2814C3A80B009D7B34 /* sl */,
);
name = ESPurpleSimpleAccountView.nib;
sourceTree = "<group>";
@@ -11763,6 +11796,7 @@
5A7642D011E044BA00E5E0AF /* sk_SK */,
5A80CCAE121F5A7B00D0670A /* uk_UA */,
D1C1FA4F14995D98008C94EB /* en_AU */,
+ D1B9C01C14C3AEC300D03244 /* sl */,
);
name = WebKitPreferencesView.nib;
sourceTree = "<group>";
diff -r 75819036d065 -r f5dca08fb214 ChangeLogs/Changes Between Betas.txt
--- a/ChangeLogs/Changes Between Betas.txt Sun Jan 22 17:06:11 2012 -0500
+++ b/ChangeLogs/Changes Between Betas.txt Wed Jan 25 01:53:51 2012 -0500
@@ -1,5 +1,34 @@
Adium 1.5xx
- * Updated Italian localisation. (#15758)
+ * Fixed hang which could occur when receiving a message and opening the Transcript Viewer at the same time.
+ * Fixed localisation of a couple of emoticons.
+ * Renamed "Current Track" status to "iTunes Status" (known as "iTunes" prior to 1.5).
+ * Updated localisations: German (#15586, #15733), Greek, Swedish (#15786).
+ * Fixed initializers and did minor clean-up in: AISplitView, AIListOutlineView, AIAccountPlusFieldPromptController,
+ DCJoinChatWindowController, CSNewContactAlertWindowController, SHLinkEditorWindowController, AIListLayoutWindowController,
+ AIListThemeWindowController, AITextColorPreviewView, ErrorMessageWindowController, AWEzvContactManagerRendezvous, AIContactListImagePicker.
+ * Fixed a leak when resizing animated Gif files.
+
+Adium 1.5rc1
+ Localisation
+ * Updated localisations: Catalan (#15770), Chinese (Traditional), Italian (#15758), Portuguese (Portugal) (#15721), Slovenian (#15772).
+ * Fixed typos/misspellings in Russian localization. (#15769, #15571)
+
+ Transcript Viewer
+ * Fixed ghosting artifacts when scrolling transcript contents (while searching).
+ * Fixed a potential crash when the log index failed to initialize while trying to delete a log.
+ * Fixed a hang caused by two threads opening the same index simultaneously.
+
+ General
+ * Added Aqualicious Graphite, a new contact list theme to match Mac OS X's Graphite style.
+ * Added the generic menu items to the group chat cog button for XMPP groupchats.
+ * Fixed "Show Toolbar" showing as disabled and untranslated. (#15759)
+ * Fixed ghosting artifacts in the "Get Info" window's "Events" tab. (#12237)
+ * Fixed enable/disable "View Chat Transcripts" menu item, in group chats (user list) context menu.
+ * Chats can no longer refuse to quit when they're still processing content.
+ * Fixed AdiumAppleScriptRunner to enable building on Lion.
+ * Switched some adiumx.com links to adium.im.
+ * Fixed a bunch of non-integer view size values.
+
Adium 1.5b9
General
diff -r 75819036d065 -r f5dca08fb214 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Sun Jan 22 17:06:11 2012 -0500
+++ b/ChangeLogs/Changes.txt Wed Jan 25 01:53:51 2012 -0500
@@ -39,7 +39,7 @@
Encryption
* Made it easier to delete a fingerprint. (Aleksei Gorny) (#1654)
* The "Generate" button is now labelled "Regenerate" when a fingerprint already exists. (Tyler Funnell) (#1128)
- * Disable Encryption -> Initiate Encrypted OTR Chat, menu item, if encrypted chat is disabled from settings. (Tyler Funnell) (#7389)
+ * Disable Encryption -> Initiate Encrypted OTR Chat menu item if encrypted chat is disabled from settings. (Tyler Funnell) (#7389)
Events and Notifications
* Added the ability to add timestamps to Growl notifications. (Stuart Connolly) (#9920)
@@ -51,6 +51,7 @@
Get Info window
* Various visual refinements. (Paul Wilde) (#14441)
* Removed the service icon from the top of the "Get Info" window's first pane (and from the contact list tooltip). (#14654)
+ * Fixed ghosting artifacts in Events tab (#12237).
Group Chats
* Added support for purple images (custom emoticons etc.). (Peter Fung) (#15183)
@@ -76,6 +77,7 @@
* Made emoticons between packs more consistent. (#11450)
* Fixed the ":^)" emoticon being mistakenly interpreted the same as ":-\". (#13924)
* Disabled elastic scroll of the text input, in Lion.
+ * Added the generic menu items to the group chat cog button for XMPP groupchats.
Status
* Added ability to change which track information the "iTunes" status displays. (#6373)
@@ -117,8 +119,8 @@
* The contact window's toolbar items now have appropriate labels. (#13010)
Miscellaneous
- * New Adiumy menu bar icon set (by Igor Kryzhanovskyi).
* New "About Adium" dialog. (Thanks to Mike Houben & Paul Wilde for graphics)
+ * Aqualicious Graphite, new contact list theme to match OS X Graphite style.
* Updated Growl.framework to 1.3.1.
* The Downloads stack in the Dock will now bounce when Adium finishes receiving a file.
* Quarantine received files after downloading, so the Finder will show a warning before opening received applications (similar to Safari).
@@ -129,12 +131,14 @@
* Added a menu item to view release notes in the help menu. (#8569)
* Fixed some issues with AppleScript. (Peter Schmitt) (#15234)
* Converted most AppleScripts from .scpt to .applescript files. (dak180) (#13940)
+ * Fixed AdiumAppleScriptRunner to enable building on Lion.
* Miscellaneous improvements to Copyright.txt file.
* Rewrote the libpurple eventloop to use libdispatch. (#13932)
* Debug logging: All GLib's errors and messages, and all exceptions are now logged to the Debug Window.
Localisation
- * Updated translations: Catalan (#14898), Czech (#15677), Danish (#15703), Dutch (#15697), Australian English (#15700), French (#15734), German (#15586, 15648), Italien (#15758), Portuguese (Portugal) (#15721), Swedish (#15726).
+ * Updated translations: Catalan (#15770), Chinese (Traditional), Czech (#15677), Danish (#15703), Dutch (#15697), Australian English (#15700), French (#15734), German (#15586, #15648, #15733), Greek, Italian (#15758), Portuguese (Portugal) (#15721), Slovenian (#15772), Swedish (#15726).
+ * Fixed localisation of a couple of emoticons.
Version 1.4.4 (12/5/2011)
diff -r 75819036d065 -r f5dca08fb214 Frameworks/AIUtilities Framework/Resources/sl.lproj/Localizable.strings
Binary file Frameworks/AIUtilities Framework/Resources/sl.lproj/Localizable.strings has changed
diff -r 75819036d065 -r f5dca08fb214 Frameworks/AIUtilities Framework/Source/AIFloater.h
--- a/Frameworks/AIUtilities Framework/Source/AIFloater.h Sun Jan 22 17:06:11 2012 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIFloater.h Wed Jan 25 01:53:51 2012 -0500
@@ -20,7 +20,8 @@
* @class AIFloater
* @brief A programtically movable, fadable <tt>NSImage</tt> display class
*
- * <tt>AIFloater</tt> allows for the display of an <tt>NSImage</tt>, including an animating one, anywhere on the screen. The image can be easily moved programatically and will fade into and out of view as requested.
+ * <tt>AIFloater</tt> allows for the display of an <tt>NSImage</tt>, including an animating one, anywhere on the screen.
+ * The image can be easily moved programatically and will fade into and out of view as requested.
*/
@interface AIFloater : NSObject {
NSImageView *staticView;
@@ -35,7 +36,7 @@
*
* It will handle releasing itself when closed; it need not be retained by the caller.
*/
-+ (id)floaterWithImage:(NSImage *)inImage styleMask:(unsigned int)styleMask;
++ (id)newFloaterWithImage:(NSImage *)inImage styleMask:(unsigned int)styleMask;
/*!
* Position the float at a specified point
diff -r 75819036d065 -r f5dca08fb214 Frameworks/AIUtilities Framework/Source/AIFloater.m
--- a/Frameworks/AIUtilities Framework/Source/AIFloater.m Sun Jan 22 17:06:11 2012 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIFloater.m Wed Jan 25 01:53:51 2012 -0500
@@ -25,14 +25,16 @@
#define WINDOW_FADE_SNAP 0.05f // How close to min/max we must get before fade is finished
@interface AIFloater ()
+
- (id)initWithImage:(NSImage *)inImage styleMask:(unsigned int)styleMask;
-- (void)_setWindowOpacity:(CGFloat)opacity;
+- (void)AI_setWindowOpacity:(CGFloat)opacity;
+
@end
@implementation AIFloater
// Because the floater can control its own display, it retains itself and releases when it closes.
-+ (id)floaterWithImage:(NSImage *)inImage styleMask:(unsigned int)styleMask
++ (id)newFloaterWithImage:(NSImage *)inImage styleMask:(unsigned int)styleMask
{
return [[self alloc] initWithImage:inImage styleMask:styleMask];
}
@@ -58,7 +60,7 @@
[panel setHasShadow:YES];
[panel setOpaque:NO];
[panel setBackgroundColor:[NSColor clearColor]];
- [self _setWindowOpacity:WINDOW_FADE_MIN];
+ [self AI_setWindowOpacity:WINDOW_FADE_MIN];
// Setup the static view
staticView = [[NSImageView alloc] initWithFrame:frame];
@@ -106,7 +108,7 @@
- (void)setMaxOpacity:(CGFloat)inMaxOpacity
{
maxOpacity = inMaxOpacity;
- if (windowIsVisible) [self _setWindowOpacity:maxOpacity];
+ if (windowIsVisible) [self AI_setWindowOpacity:maxOpacity];
}
#pragma mark Window Visibility
@@ -134,12 +136,12 @@
[fadeAnimation startAnimation];
}
} else {
- [self _setWindowOpacity:(windowIsVisible ? maxOpacity : WINDOW_FADE_MIN)];
+ [self AI_setWindowOpacity:(windowIsVisible ? maxOpacity : WINDOW_FADE_MIN)];
}
}
}
-- (void)_setWindowOpacity:(CGFloat)opacity
+- (void)AI_setWindowOpacity:(CGFloat)opacity
{
[panel setAlphaValue:opacity];
}
diff -r 75819036d065 -r f5dca08fb214 Frameworks/AIUtilities Framework/Source/AIImageButton.m
--- a/Frameworks/AIUtilities Framework/Source/AIImageButton.m Sun Jan 22 17:06:11 2012 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIImageButton.m Wed Jan 25 01:53:51 2012 -0500
@@ -114,7 +114,7 @@
point.x = maxXOrigin;
}
- imageFloater = [[AIFloater floaterWithImage:bigImage styleMask:NSBorderlessWindowMask] retain];
+ imageFloater = [[AIFloater newFloaterWithImage:bigImage styleMask:NSBorderlessWindowMask] retain];
[imageFloater setMaxOpacity:1.0f];
[imageFloater moveFloaterToPoint:point];
[imageFloater setVisible:YES animate:NO];
diff -r 75819036d065 -r f5dca08fb214 Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m Sun Jan 22 17:06:11 2012 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m Wed Jan 25 01:53:51 2012 -0500
@@ -273,6 +273,9 @@
// Write GIF Extension Blocks
[self writeGIFExtensionBlocksInData:GIFRepresentationData forRepresenation:(NSBitmapImageRep *)bestRep];
+ // Release before you re-allocate.
+ [newImage release];
+
newImage = [[NSImage alloc] initWithData:GIFRepresentationData];
} else {
[scaledImage lockFocus];
diff -r 75819036d065 -r f5dca08fb214 Frameworks/AIUtilities Framework/Source/AIOSCompatibility.h
--- a/Frameworks/AIUtilities Framework/Source/AIOSCompatibility.h Sun Jan 22 17:06:11 2012 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIOSCompatibility.h Wed Jan 25 01:53:51 2012 -0500
@@ -36,4 +36,4 @@
#endif //MAC_OS_X_VERSION_10_7
-#endif
\ No newline at end of file
+#endif
diff -r 75819036d065 -r f5dca08fb214 Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.m
--- a/Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.m Sun Jan 22 17:06:11 2012 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.m Wed Jan 25 01:53:51 2012 -0500
@@ -40,10 +40,6 @@
- (void)contentViewBoundsDidChange;
@end
- at interface NSWindow (SpacesDeterminationHackery)
-- (BOOL)isOnCurrentWorkspace;
- at end
-
@implementation AISmoothTooltipTracker
+ (AISmoothTooltipTracker *)smoothTooltipTrackerForView:(NSView *)inView withDelegate:(id <AISmoothTooltipTrackerDelegate>)inDelegate
@@ -291,7 +287,7 @@
if ([theWindow isVisible] &&
NSPointInRect([theWindow convertScreenToBase:mouseLocation],[[theWindow contentView] convertRect:[view frame] fromView:[view superview]]) &&
- [theWindow isOnCurrentWorkspace]) {
+ [theWindow isOnActiveSpace]) {
//tooltipCount is used for delaying the appearence of tooltips. We reset it to 0 when the mouse moves. When
//the mouse is left still tooltipCount will eventually grow greater than TOOL_TIP_DELAY, and we will begin
//displaying the tooltips
@@ -324,52 +320,3 @@
}
@end
-
- at implementation NSWindow (SpacesDeterminationHackery)
-
-// Internal CoreGraphics typedefs
-typedef int CGSConnection;
-typedef int CGSWindow;
-
-/* Retrieve the workspace number associated with the workspace currently
- * being shown.
- *
- * cid -- Current connection.
- * workspace -- Pointer to int value to be set to workspace number.
- */
-extern OSStatus CGSGetWorkspace(const CGSConnection cid, int *workspace);
-
-/* Retrieve workspace number associated with the workspace a particular window
- * resides on.
- *
- * cid -- Current connection.
- * wid -- Window number of window to examine.
- * workspace -- Pointer to int value to be set to workspace number.
- */
-extern OSStatus CGSGetWindowWorkspace(const CGSConnection cid, const CGSWindow wid, int *workspace);
-
-/* Get the default connection for the current process. */
-extern CGSConnection _CGSDefaultConnection(void);
-
-- (BOOL)isOnCurrentWorkspace
-{
- if ([self respondsToSelector:@selector(isOnActiveSpace)])
- return [self isOnActiveSpace];
-
- OSStatus err;
- int currentWorkspace, windowWorkspace;
-
- err = CGSGetWorkspace(_CGSDefaultConnection(), ¤tWorkspace);
- if (err == kCGErrorSuccess) {
- CGSGetWindowWorkspace(_CGSDefaultConnection(), (int)[self windowNumber], &windowWorkspace);
- if (err == kCGErrorSuccess) {
- //If windowWorkspace is 0, the window is showing on every workspace, so it definitely is on the current one.
- return ((currentWorkspace == windowWorkspace) || (windowWorkspace == 0));
- }
- }
-
- //Default to assuming that we're on the current workspace
- return YES;
-}
-
- at end
diff -r 75819036d065 -r f5dca08fb214 Frameworks/AIUtilities Framework/Source/AISplitView.h
--- a/Frameworks/AIUtilities Framework/Source/AISplitView.h Sun Jan 22 17:06:11 2012 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AISplitView.h Wed Jan 25 01:53:51 2012 -0500
@@ -19,8 +19,8 @@
* @class AISplitView
* @brief <tt>NSSplitView</tt> subclass with additional customization
*
- * This subclass of NSSplitView allows the user to adjust the thickness of the divider and disable drawing of the
- * divider 'dot' graphic.
+ * This subclass of NSSplitView allows the user to adjust the thickness of the divider
+ * and disable drawing of the divider 'dot' graphic.
*/
@interface AISplitView : NSSplitView {
CGFloat dividerThickness;
@@ -29,18 +29,15 @@
/*!
* @brief Set the thickness of the split divider
- *
- * Set the thickness of the split divider
- * @param inThickness Desired divider thickness
*/
-- (void)setDividerThickness:(CGFloat)inThickness;
+ at property (nonatomic, readwrite, assign) CGFloat dividerThickness;
/*!
* @brief Toggle drawing of the divider graphics
*
* Toggle display of the divider graphics (The 'dot' in the center of the divider)
- * @param inDraw NO to disable drawing of the dot, YES to enable it
+ * Set to NO to disable drawing of the dot, YES to enable it
*/
-- (void)setDrawsDivider:(BOOL)inDraw;
+ at property (nonatomic, readwrite, assign) BOOL drawDivider;
@end
diff -r 75819036d065 -r f5dca08fb214 Frameworks/AIUtilities Framework/Source/AISplitView.m
--- a/Frameworks/AIUtilities Framework/Source/AISplitView.m Sun Jan 22 17:06:11 2012 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AISplitView.m Wed Jan 25 01:53:51 2012 -0500
@@ -14,20 +14,25 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#import "AISplitView.h"
@interface AISplitView ()
-- (void)_initSplitView;
+
+- (void)AI_initSplitView;
+
@end
@implementation AISplitView
-//Init
+ at synthesize dividerThickness, drawDivider;
+
+// Init
- (id)initWithCoder:(NSCoder *)aDecoder
{
- if (([super initWithCoder:aDecoder])) {
- [self _initSplitView];
+ if ((self = [super initWithCoder:aDecoder])) {
+ [self AI_initSplitView];
}
return self;
}
@@ -35,31 +40,22 @@
- (id)initWithFrame:(NSRect)frameRect
{
if ((self = [super initWithFrame:frameRect])) {
- [self _initSplitView];
+ [self AI_initSplitView];
}
return self;
}
-- (void)_initSplitView
+- (void)AI_initSplitView
{
dividerThickness = [super dividerThickness];
drawDivider = YES;
}
-//Divider thickness
-- (void)setDividerThickness:(CGFloat)inThickness{
- dividerThickness = inThickness;
-}
-- (CGFloat)dividerThickness{
- return dividerThickness;
-}
+#pragma mark - Drawing
-//Divider drawing
-- (void)setDrawsDivider:(BOOL)inDraw{
- drawDivider = inDraw;
-}
-- (void)drawDividerInRect:(NSRect)aRect{
- if (drawDivider) {
+- (void)drawDividerInRect:(NSRect)aRect
+{
+ if ([self drawDivider]) {
[super drawDividerInRect:aRect];
}
}
diff -r 75819036d065 -r f5dca08fb214 Frameworks/Adium Framework/Resources/ca.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/ca.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 75819036d065 -r f5dca08fb214 Frameworks/Adium Framework/Resources/ca.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/ca.lproj/EmoticonNames.strings has changed
diff -r 75819036d065 -r f5dca08fb214 Frameworks/Adium Framework/Resources/ca.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/ca.lproj/Localizable.strings has changed
diff -r 75819036d065 -r f5dca08fb214 Frameworks/Adium Framework/Resources/cs.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/cs.lproj/EmoticonNames.strings has changed
diff -r 75819036d065 -r f5dca08fb214 Frameworks/Adium Framework/Resources/da.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/da.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 75819036d065 -r f5dca08fb214 Frameworks/Adium Framework/Resources/da.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/da.lproj/EmoticonNames.strings has changed
diff -r 75819036d065 -r f5dca08fb214 Frameworks/Adium Framework/Resources/de.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/de.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 75819036d065 -r f5dca08fb214 Frameworks/Adium Framework/Resources/de.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/de.lproj/Localizable.strings has changed
diff -r 75819036d065 -r f5dca08fb214 Frameworks/Adium Framework/Resources/el_GR.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/el_GR.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 75819036d065 -r f5dca08fb214 Frameworks/Adium Framework/Resources/el_GR.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/el_GR.lproj/Localizable.strings has changed
diff -r 75819036d065 -r f5dca08fb214 Frameworks/Adium Framework/Resources/en.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/en.lproj/EmoticonNames.strings has changed
diff -r 75819036d065 -r f5dca08fb214 Frameworks/Adium Framework/Resources/en_AU.lproj/EmoticonNames.strings
--- a/Frameworks/Adium Framework/Resources/en_AU.lproj/EmoticonNames.strings Sun Jan 22 17:06:11 2012 -0500
+++ b/Frameworks/Adium Framework/Resources/en_AU.lproj/EmoticonNames.strings Wed Jan 25 01:53:51 2012 -0500
@@ -5,7 +5,7 @@
"Angry" = "Angry";
/* Emoticon name */
-"Baring Teeth" = "Baring Teeth";
+"Baring teeth" = "Baring teeth";
/* Emoticon name */
"Blush" = "Blush";
@@ -26,7 +26,7 @@
"Disappointed" = "Disappointed";
/* Emoticon name */
-"Don't Tell Anyone" = "Don't Tell Anyone";
+"Don't tell anyone" = "Don't tell anyone";
/* Emoticon name */
"Embarrassed" = "Embarrassed";
@@ -56,13 +56,13 @@
"Heart" = "Heart";
/* Emoticon name */
-"I Don't Know" = "I Don't Know";
+"I don't know" = "I don't know";
/* Emoticon name */
"Kiss" = "Kiss";
/* Emoticon name */
-"Lips Are Sealed" = "Lips Are Sealed";
+"Lips are sealed" = "Lips are sealed";
/* Emoticon name */
"Money-mouth" = "Money-mouth";
@@ -71,7 +71,7 @@
"Nerd" = "Nerd";
/* Emoticon name */
-"Open Mouthed" = "Open Mouthed";
+"Open mouthed" = "Open mouthed";
/* Emoticon name */
"Party" = "Party";
@@ -107,7 +107,7 @@
"Thinking" = "Thinking";
/* Emoticon name */
-"Tongue Out" = "Tongue Out";
+"Tongue out" = "Tongue out";
/* Emoticon name */
"Undecided" = "Undecided";
diff -r 75819036d065 -r f5dca08fb214 Frameworks/Adium Framework/Resources/en_GB.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/en_GB.lproj/EmoticonNames.strings has changed
diff -r 75819036d065 -r f5dca08fb214 Frameworks/Adium Framework/Resources/es.lproj/EditStateSheet.nib/designable.nib
--- a/Frameworks/Adium Framework/Resources/es.lproj/EditStateSheet.nib/designable.nib Sun Jan 22 17:06:11 2012 -0500
+++ b/Frameworks/Adium Framework/Resources/es.lproj/EditStateSheet.nib/designable.nib Wed Jan 25 01:53:51 2012 -0500
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">11A511</string>
- <string key="IBDocument.InterfaceBuilderVersion">1617</string>
- <string key="IBDocument.AppKitVersion">1138</string>
- <string key="IBDocument.HIToolboxVersion">566.00</string>
+ <string key="IBDocument.SystemVersion">10K549</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1938</string>
+ <string key="IBDocument.AppKitVersion">1038.36</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">1617</string>
+ <string key="NS.object.0">1938</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSTextField</string>
@@ -32,7 +32,10 @@
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</array>
- <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
+ </object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="983003822">
<object class="NSCustomObject" id="126005853">
<string key="NSClassName">AIEditStateWindowController</string>
@@ -53,7 +56,6 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{422, 496}</string>
<string key="NSWindowContentMinSize">{403, 477}</string>
<object class="NSView" key="NSWindowView" id="509876344">
@@ -66,6 +68,7 @@
<string key="NSFrame">{{324, 12}, {84, 32}}</string>
<reference key="NSSuperview" ref="509876344"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="727255828">
<int key="NSCellFlags">67239424</int>
@@ -96,6 +99,7 @@
<string key="NSFrame">{{229, 12}, {95, 32}}</string>
<reference key="NSSuperview" ref="509876344"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="686597933"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="732367146">
<int key="NSCellFlags">67239424</int>
@@ -118,6 +122,7 @@
<string key="NSFrame">{{13, 116}, {368, 18}}</string>
<reference key="NSSuperview" ref="509876344"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="763791491"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="215150478">
<int key="NSCellFlags">67239424</int>
@@ -146,6 +151,7 @@
<string key="NSFrame">{{12, 258}, {130, 18}}</string>
<reference key="NSSuperview" ref="509876344"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="873668146"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="950289041">
<int key="NSCellFlags">67239424</int>
@@ -169,6 +175,7 @@
<string key="NSFrame">{{35, 238}, {316, 18}}</string>
<reference key="NSSuperview" ref="509876344"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="459354381"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1020350936">
<int key="NSCellFlags">67239424</int>
@@ -219,6 +226,7 @@
<string key="NSFrameSize">{363, 14}</string>
<reference key="NSSuperview" ref="891957801"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="1015368611"/>
<object class="NSTextContainer" key="NSTextContainer" id="1027022442">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -278,11 +286,9 @@
<integer value="1" key="NSUnderline"/>
</dictionary>
<nil key="NSDefaultParagraphStyle"/>
- <nil key="NSTextFinder"/>
- <int key="NSPreferredTextFinderStyle">1</int>
</object>
<int key="NSTVFlags">6</int>
- <string key="NSMaxSize">{690, 10000000}</string>
+ <string key="NSMaxSize">{690, 1e+07}</string>
<string key="NSMinize">{344, 0}</string>
<nil key="NSDelegate"/>
</object>
@@ -325,6 +331,7 @@
<string key="NSFrame">{{-30, 1}, {15, 91}}</string>
<reference key="NSSuperview" ref="459354381"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="891957801"/>
<reference key="NSTarget" ref="459354381"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
@@ -335,6 +342,7 @@
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="459354381"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="809775435"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="459354381"/>
<string key="NSAction">_doScroller:</string>
@@ -345,8 +353,8 @@
<string key="NSFrame">{{37, 139}, {365, 93}}</string>
<reference key="NSSuperview" ref="509876344"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="891957801"/>
- <int key="NSsFlags">133650</int>
+ <reference key="NSNextKeyView" ref="534678362"/>
+ <int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="809775435"/>
<reference key="NSHScroller" ref="534678362"/>
<reference key="NSContentView" ref="891957801"/>
@@ -362,9 +370,10 @@
<object class="NSStepper" id="825201197">
<reference key="NSNextResponder" ref="80424508"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{129, -3}, {19, 28}}</string>
+ <string key="NSFrame">{{114, -3}, {19, 28}}</string>
<reference key="NSSuperview" ref="80424508"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="519940975"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="1022260684">
<int key="NSCellFlags">68025888</int>
@@ -385,9 +394,10 @@
<object class="NSTextField" id="1069301758">
<reference key="NSNextResponder" ref="80424508"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{105, 0}, {25, 22}}</string>
+ <string key="NSFrame">{{90, 0}, {25, 22}}</string>
<reference key="NSSuperview" ref="80424508"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="825201197"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="108012993">
<int key="NSCellFlags">-1804468671</int>
@@ -413,9 +423,10 @@
<object class="NSTextField" id="519940975">
<reference key="NSNextResponder" ref="80424508"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{150, 3}, {116, 17}}</string>
+ <string key="NSFrame">{{135, 3}, {116, 17}}</string>
<reference key="NSSuperview" ref="80424508"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="225696218"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="556586308">
<int key="NSCellFlags">67239424</int>
@@ -443,6 +454,7 @@
<string key="NSFrame">{{24, -3}, {19, 28}}</string>
<reference key="NSSuperview" ref="80424508"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="30081493"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="845689701">
<int key="NSCellFlags">68025888</int>
@@ -461,6 +473,7 @@
<string key="NSFrame">{{45, 3}, {42, 17}}</string>
<reference key="NSSuperview" ref="80424508"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="1069301758"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="710160508">
<int key="NSCellFlags">67239424</int>
@@ -478,6 +491,7 @@
<string key="NSFrameSize">{25, 22}</string>
<reference key="NSSuperview" ref="80424508"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="437797315"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="347985311">
<int key="NSCellFlags">-1804468671</int>
@@ -494,11 +508,13 @@
<string key="NSFrameSize">{330, 22}</string>
<reference key="NSSuperview" ref="763791491"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="330136588"/>
</object>
</array>
<string key="NSFrame">{{37, 87}, {330, 22}}</string>
<reference key="NSSuperview" ref="509876344"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="80424508"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -558,6 +574,7 @@
<string key="NSFrameSize">{356, 14}</string>
<reference key="NSSuperview" ref="220857931"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="762602674"/>
<object class="NSTextContainer" key="NSTextContainer" id="856998969">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -592,11 +609,9 @@
<integer value="1" key="NSUnderline"/>
</dictionary>
<nil key="NSDefaultParagraphStyle"/>
- <nil key="NSTextFinder"/>
- <int key="NSPreferredTextFinderStyle">1</int>
</object>
<int key="NSTVFlags">6</int>
- <string key="NSMaxSize">{712, 10000000}</string>
+ <string key="NSMaxSize">{712, 1e+07}</string>
<string key="NSMinize">{355, 0}</string>
<nil key="NSDelegate"/>
</object>
@@ -616,6 +631,7 @@
<string key="NSFrame">{{-30, 1}, {15, 91}}</string>
<reference key="NSSuperview" ref="310284586"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="220857931"/>
<reference key="NSTarget" ref="310284586"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
@@ -626,6 +642,7 @@
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="310284586"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="5112318"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="310284586"/>
<string key="NSAction">_doScroller:</string>
@@ -636,8 +653,8 @@
<string key="NSFrame">{{17, 4}, {358, 93}}</string>
<reference key="NSSuperview" ref="229597639"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="220857931"/>
- <int key="NSsFlags">133650</int>
+ <reference key="NSNextKeyView" ref="528747730"/>
+ <int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="5112318"/>
<reference key="NSHScroller" ref="528747730"/>
<reference key="NSContentView" ref="220857931"/>
@@ -648,6 +665,7 @@
<string key="NSFrame">{{3, 105}, {126, 17}}</string>
<reference key="NSSuperview" ref="229597639"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="310284586"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="711168837">
<int key="NSCellFlags">67239424</int>
@@ -663,11 +681,13 @@
<string key="NSFrameSize">{391, 119}</string>
<reference key="NSSuperview" ref="840011933"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="611038104"/>
</object>
</array>
<string key="NSFrame">{{11, 284}, {391, 119}}</string>
<reference key="NSSuperview" ref="509876344"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="229597639"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -692,6 +712,7 @@
<string key="NSFrame">{{14, 443}, {371, 5}}</string>
<reference key="NSSuperview" ref="509876344"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="897172840"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -715,6 +736,7 @@
<string key="NSFrame">{{13, 19}, {216, 18}}</string>
<reference key="NSSuperview" ref="509876344"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="454589821"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="491604206">
<int key="NSCellFlags">67239424</int>
@@ -746,6 +768,7 @@
<string key="NSFrame">{{47, 3}, {324, 22}}</string>
<reference key="NSSuperview" ref="71972643"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="212821259"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="269895215">
<int key="NSCellFlags">-1804468671</int>
@@ -764,6 +787,7 @@
<string key="NSFrame">{{-3, 6}, {45, 17}}</string>
<reference key="NSSuperview" ref="71972643"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="606590580"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="577178631">
<int key="NSCellFlags">67239424</int>
@@ -779,11 +803,13 @@
<string key="NSFrameSize">{387, 30}</string>
<reference key="NSSuperview" ref="264779342"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="345202850"/>
</object>
</array>
<string key="NSFrame">{{15, 455}, {387, 30}}</string>
<reference key="NSSuperview" ref="509876344"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="71972643"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -816,6 +842,7 @@
<string key="NSFrame">{{49, 0}, {325, 26}}</string>
<reference key="NSSuperview" ref="602148515"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="840011933"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="633478529">
<int key="NSCellFlags">-2076049856</int>
@@ -892,6 +919,7 @@
<string key="NSFrame">{{-3, -11}, {50, 34}}</string>
<reference key="NSSuperview" ref="602148515"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="865140827"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="701667450">
<int key="NSCellFlags">67239424</int>
@@ -907,11 +935,13 @@
<string key="NSFrameSize">{387, 27}</string>
<reference key="NSSuperview" ref="897172840"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="124491817"/>
</object>
</array>
<string key="NSFrame">{{15, 408}, {387, 27}}</string>
<reference key="NSSuperview" ref="509876344"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="602148515"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -936,6 +966,7 @@
<string key="NSFrame">{{13, 61}, {129, 18}}</string>
<reference key="NSSuperview" ref="509876344"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="113233166"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="575166235">
<int key="NSCellFlags">67239424</int>
@@ -959,6 +990,7 @@
<string key="NSFrame">{{13, 40}, {118, 18}}</string>
<reference key="NSSuperview" ref="509876344"/>
More information about the commits
mailing list