adium 3571:bbddb444d1da: Make EMD more consistent and less confu...
commits at adium.im
commits at adium.im
Sat Nov 27 06:28:59 UTC 2010
details: http://hg.adium.im/adium/rev/bbddb444d1da
revision: 3571:bbddb444d1da
author: Frank Dowsett <wixardy at adium.im>
date: Sat Nov 27 01:19:13 2010 -0500
Make EMD more consistent and less confusing by not badging with Available when there is a status message or with Offline when an account is reconnecting fixes #8731 and #9932.
Subject: adium 3572:23b5e51284ae: Remove another unused nib.
details: http://hg.adium.im/adium/rev/23b5e51284ae
revision: 3572:23b5e51284ae
author: Frank Dowsett <wixardy at adium.im>
date: Sat Nov 27 01:19:19 2010 -0500
Remove another unused nib.
Subject: adium 3573:3058311a2c87: Bring some alignment enhancements to the info inspectors, work by Paul Wilde and Robby. Fixes #14441
details: http://hg.adium.im/adium/rev/3058311a2c87
revision: 3573:3058311a2c87
author: Frank Dowsett <wixardy at adium.im>
date: Sat Nov 27 01:19:25 2010 -0500
Bring some alignment enhancements to the info inspectors, work by Paul Wilde and Robby. Fixes #14441
diffs (truncated from 27364 to 1000 lines):
diff -r 06f000e3641b -r 3058311a2c87 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sat Nov 27 00:40:39 2010 +0100
+++ b/Adium.xcodeproj/project.pbxproj Sat Nov 27 01:19:25 2010 -0500
@@ -413,9 +413,6 @@
346BA3450774C2D200628F06 /* ESGlobalEventsPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 346BA3430774C2D200628F06 /* ESGlobalEventsPreferences.m */; };
346BA3640774C35500628F06 /* GlobalEventsPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 346BA3630774C35400628F06 /* GlobalEventsPreferences.nib */; };
346F5D3208A43E7B0055C610 /* CurrentTunes.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 346F5CB308A418FB0055C610 /* CurrentTunes.scpt */; };
- 3470BF600BC6F18500388232 /* AIMessageHistoryPreferencesWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3470BF5E0BC6F18500388232 /* AIMessageHistoryPreferencesWindowController.h */; };
- 3470BF610BC6F18500388232 /* AIMessageHistoryPreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3470BF5F0BC6F18500388232 /* AIMessageHistoryPreferencesWindowController.m */; };
- 3470BF700BC6F22200388232 /* MessageHistoryConfiguration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3470BF6F0BC6F22200388232 /* MessageHistoryConfiguration.nib */; };
347374BD0AA9206B00AD18E3 /* ShortcutRecorder.strings in Resources */ = {isa = PBXBuildFile; fileRef = 347374BB0AA9206B00AD18E3 /* ShortcutRecorder.strings */; };
3474E000082550FD00BF30F0 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 3474DFFF082550FD00BF30F0 /* Credits.rtf */; };
3474E0910825634300BF30F0 /* StatusPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3474E0900825634300BF30F0 /* StatusPreferences.nib */; };
@@ -2324,7 +2321,6 @@
341EC8BD0D3C2BA9007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = Resources/sl.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
341EC8BE0D3C2BA9007216A2 /* sl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sl; path = "Frameworks/Adium Framework/Resources/sl.lproj/Localizable.strings"; sourceTree = "<group>"; };
341EC8BF0D3C2BA9007216A2 /* sl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sl; path = Resources/sl.lproj/Localizable.strings; sourceTree = "<group>"; };
- 341EC8C00D3C2BA9007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = Resources/sl.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
341EC8C10D3C2BA9007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = Resources/sl.lproj/OTRPrefs.nib; sourceTree = "<group>"; };
341EC8C20D3C2BAA007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = Resources/sl.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
341EC8C30D3C2BAA007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = Resources/sl.lproj/PersonalPreferences.nib; sourceTree = "<group>"; };
@@ -2363,7 +2359,6 @@
34208D150D502D3F003138D1 /* fr_CA */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr_CA; path = "Plugins/Purple Service/fr_CA.lproj/Localizable.strings"; sourceTree = "<group>"; };
34208D160D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr_CA; path = "Frameworks/Adium Framework/Resources/fr_CA.lproj/Localizable.strings"; sourceTree = "<group>"; };
34208D180D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr_CA; path = Resources/fr_CA.lproj/Localizable.strings; sourceTree = "<group>"; };
- 34208D190D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr_CA; path = Resources/fr_CA.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
34208D1A0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr_CA; path = Resources/fr_CA.lproj/OTRPrefs.nib; sourceTree = "<group>"; };
34208D1B0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr_CA; path = Resources/fr_CA.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
34208D1C0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr_CA; path = Resources/fr_CA.lproj/PersonalPreferences.nib; sourceTree = "<group>"; };
@@ -2725,7 +2720,6 @@
345076AD0E106F5E00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_GB; path = Resources/en_GB.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
345076AF0E106F5E00BF0883 /* en_GB */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en_GB; path = "Plugins/Purple Service/en_GB.lproj/Localizable.strings"; sourceTree = "<group>"; };
345076B00E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en_GB; path = Resources/en_GB.lproj/Localizable.strings; sourceTree = "<group>"; };
- 345076B10E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_GB; path = Resources/en_GB.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
345076B20E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_GB; path = Resources/en_GB.lproj/OTRPrefs.nib; sourceTree = "<group>"; };
345076B30E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_GB; path = Resources/en_GB.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
345076B40E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_GB; path = Resources/en_GB.lproj/PersonalPreferences.nib; sourceTree = "<group>"; };
@@ -2763,7 +2757,6 @@
345076EC0E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_PT; path = Resources/pt_PT.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
345076ED0E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt_PT; path = "Plugins/Purple Service/pt_PT.lproj/Localizable.strings"; sourceTree = "<group>"; };
345076EE0E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt_PT; path = Resources/pt_PT.lproj/Localizable.strings; sourceTree = "<group>"; };
- 345076F00E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_PT; path = Resources/pt_PT.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
345076F10E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_PT; path = Resources/pt_PT.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
345076F20E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_PT; path = Resources/pt_PT.lproj/PersonalPreferences.nib; sourceTree = "<group>"; };
345076F30E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_PT; path = Resources/pt_PT.lproj/ProxyPasswordPrompt.nib; sourceTree = "<group>"; };
@@ -2960,25 +2953,6 @@
3461621206FB482C009181D8 /* ESChatUserListController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESChatUserListController.m; path = "Plugins/Dual Window Interface/ESChatUserListController.m"; sourceTree = "<group>"; };
3461621306FB482D009181D8 /* UserList Layout.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = "UserList Layout.plist"; path = "Plugins/Dual Window Interface/UserList Layout.plist"; sourceTree = "<group>"; };
346196F10D31607500763051 /* SRSnapback.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SRSnapback.png; path = Resources/SRSnapback.png; sourceTree = "<group>"; };
- 34619A860BC8BF2300DF383C /* ca */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ca; path = Resources/ca.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A870BC8BF2800DF383C /* cs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = cs; path = Resources/cs.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A880BC8BF2B00DF383C /* da */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = da; path = Resources/da.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A890BC8BF2D00DF383C /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = de; path = Resources/de.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A8A0BC8BF3000DF383C /* es */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = es; path = Resources/es.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A8B0BC8BF3400DF383C /* fi */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fi; path = Resources/fi.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A8C0BC8BF3700DF383C /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr; path = Resources/fr.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A8D0BC8BF3900DF383C /* is */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = is; path = Resources/is.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A8E0BC8BF3D00DF383C /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = it; path = Resources/it.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A8F0BC8BF4000DF383C /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ja; path = Resources/ja.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A900BC8BF4200DF383C /* nb */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = nb; path = Resources/nb.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A910BC8BF4500DF383C /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = nl; path = Resources/nl.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A920BC8BF4800DF383C /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pl; path = Resources/pl.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A930BC8BF4A00DF383C /* pt */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt; path = Resources/pt.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A940BC8BF4D00DF383C /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ru; path = Resources/ru.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A950BC8BF5100DF383C /* sv */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sv; path = Resources/sv.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A960BC8BF5400DF383C /* tr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = tr; path = Resources/tr.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A970BC8BF5600DF383C /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_CN; path = Resources/zh_CN.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
- 34619A980BC8BF5B00DF383C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_TW; path = Resources/zh_TW.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
34636E4C0BC9A90600AD57AD /* pt */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt; path = Resources/pt.lproj/PersonalPreferences.nib; sourceTree = "<group>"; };
346371050BCA0A5400AD57AD /* AIMessageTabSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMessageTabSplitView.h; path = Source/AIMessageTabSplitView.h; sourceTree = "<group>"; };
346371060BCA0A5400AD57AD /* AIMessageTabSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMessageTabSplitView.m; path = Source/AIMessageTabSplitView.m; sourceTree = "<group>"; };
@@ -3122,7 +3096,6 @@
346C9C120E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = "Frameworks/Adium Framework/Resources/hu.lproj/Localizable.strings"; sourceTree = "<group>"; };
346C9C130E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = Resources/hu.lproj/Localizable.strings; sourceTree = "<group>"; };
346C9C150E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = "Plugins/Purple Service/hu.lproj/Localizable.strings"; sourceTree = "<group>"; };
- 346C9C160E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = hu; path = Resources/hu.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
346C9C170E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = hu; path = Resources/hu.lproj/OTRPrefs.nib; sourceTree = "<group>"; };
346C9C180E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = hu; path = Resources/hu.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
346C9C190E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = hu; path = Resources/hu.lproj/PersonalPreferences.nib; sourceTree = "<group>"; };
@@ -3137,9 +3110,6 @@
346CFDC5087B7836009711C8 /* AdiumIdleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AdiumIdleManager.m; path = Source/AdiumIdleManager.m; sourceTree = "<group>"; };
346F5CB308A418FB0055C610 /* CurrentTunes.scpt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.scpt; name = CurrentTunes.scpt; path = Resources/CurrentTunes.scpt; sourceTree = "<group>"; };
347065E406015DC5004F0D20 /* WebKit Defaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; name = "WebKit Defaults.plist"; path = "Plugins/WebKit Message View/WebKit Defaults.plist"; sourceTree = "<group>"; };
- 3470BF5E0BC6F18500388232 /* AIMessageHistoryPreferencesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMessageHistoryPreferencesWindowController.h; path = Source/AIMessageHistoryPreferencesWindowController.h; sourceTree = "<group>"; };
- 3470BF5F0BC6F18500388232 /* AIMessageHistoryPreferencesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMessageHistoryPreferencesWindowController.m; path = Source/AIMessageHistoryPreferencesWindowController.m; sourceTree = "<group>"; };
- 3470BF660BC6F21200388232 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = Resources/en.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
347374BC0AA9206B00AD18E3 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
347374F00AA920F300AD18E3 /* ca */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ca; path = Resources/ca.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
347374F10AA920F700AD18E3 /* cs */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = cs; path = Resources/cs.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -3520,7 +3490,6 @@
34B1FCDC0F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = el_GR; path = Resources/el_GR.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
34B1FCDE0F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el_GR; path = "Plugins/Purple Service/el_GR.lproj/Localizable.strings"; sourceTree = "<group>"; };
34B1FCDF0F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el_GR; path = Resources/el_GR.lproj/Localizable.strings; sourceTree = "<group>"; };
- 34B1FCE00F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = el_GR; path = Resources/el_GR.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
34B1FCE10F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = el_GR; path = Resources/el_GR.lproj/OTRPrefs.nib; sourceTree = "<group>"; };
34B1FCE20F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = el_GR; path = Resources/el_GR.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
34B1FCE30F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = el_GR; path = Resources/el_GR.lproj/PersonalPreferences.nib; sourceTree = "<group>"; };
@@ -4271,7 +4240,6 @@
5A7642C311E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk_SK; path = Resources/sk_SK.lproj/Localizable.strings; sourceTree = "<group>"; };
5A7642C411E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk_SK; path = "Frameworks/Adium Framework/Resources/sk_SK.lproj/Localizable.strings"; sourceTree = "<group>"; };
5A7642C511E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk_SK; path = "Plugins/Purple Service/sk_SK.lproj/Localizable.strings"; sourceTree = "<group>"; };
- 5A7642C611E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sk_SK; path = Resources/sk_SK.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
5A7642C711E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sk_SK; path = Resources/sk_SK.lproj/OTRPrefs.nib; sourceTree = "<group>"; };
5A7642C811E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sk_SK; path = Resources/sk_SK.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
5A7642C911E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sk_SK; path = Resources/sk_SK.lproj/PersonalPreferences.nib; sourceTree = "<group>"; };
@@ -4318,7 +4286,6 @@
5A80CCA1121F5A7B00D0670A /* uk_UA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk_UA; path = "Frameworks/Adium Framework/Resources/uk_UA.lproj/Localizable.strings"; sourceTree = "<group>"; };
5A80CCA2121F5A7B00D0670A /* uk_UA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk_UA; path = "Plugins/Purple Service/uk_UA.lproj/Localizable.strings"; sourceTree = "<group>"; };
5A80CCA3121F5A7B00D0670A /* uk_UA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk_UA; path = uk_UA.lproj/Localizable.strings; sourceTree = "<group>"; };
- 5A80CCA4121F5A7B00D0670A /* uk_UA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk_UA; path = Resources/uk_UA.lproj/MessageHistoryConfiguration.nib; sourceTree = "<group>"; };
5A80CCA5121F5A7B00D0670A /* uk_UA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk_UA; path = Resources/uk_UA.lproj/OTRPrefs.nib; sourceTree = "<group>"; };
5A80CCA6121F5A7B00D0670A /* uk_UA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk_UA; path = Resources/uk_UA.lproj/PasswordPrompt.nib; sourceTree = "<group>"; };
5A80CCA7121F5A7B00D0670A /* uk_UA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk_UA; path = Resources/uk_UA.lproj/PersonalPreferences.nib; sourceTree = "<group>"; };
@@ -5967,16 +5934,6 @@
name = "WebKit Additions";
sourceTree = "<group>";
};
- 3470BF520BC6F13700388232 /* Message History */ = {
- isa = PBXGroup;
- children = (
- 3470BF6F0BC6F22200388232 /* MessageHistoryConfiguration.nib */,
- 3470BF5E0BC6F18500388232 /* AIMessageHistoryPreferencesWindowController.h */,
- 3470BF5F0BC6F18500388232 /* AIMessageHistoryPreferencesWindowController.m */,
- );
- name = "Message History";
- sourceTree = "<group>";
- };
3479A83B05DC9F2400998B3D /* Tooltips */ = {
isa = PBXGroup;
children = (
@@ -6421,7 +6378,6 @@
34C68B1C0778F9C200EB423C /* General Preferences */ = {
isa = PBXGroup;
children = (
- 3470BF520BC6F13700388232 /* Message History */,
83B920F809E70778008D8436 /* Hot Key */,
4B2E560406A33D85008866CF /* Chat Cycling */,
34C68B230778FA1300EB423C /* ESGeneralPreferencesPlugin.h */,
@@ -9346,7 +9302,6 @@
343700A70A9C1E170028604E /* AIAdvancedPreferencePane.h in Headers */,
3482E0F50AB5064E00471992 /* AIAdiumProtocol.h in Headers */,
34F312930ADC3FE800A4310E /* KNShelfSplitView.h in Headers */,
- 3470BF600BC6F18500388232 /* AIMessageHistoryPreferencesWindowController.h in Headers */,
11CA00100C35EC5100A6BB8D /* SS_PreferencePaneProtocol.h in Headers */,
11CA00110C35EC5200A6BB8D /* SS_PrefsController.h in Headers */,
34A88E190C7A26E1006EB7D4 /* AIPasswordPromptController.h in Headers */,
@@ -10056,7 +10011,6 @@
34F312BD0ADC43CA00A4310E /* xtras_duck.png in Resources */,
F551B1000B8F5130007D3A3C /* FireLogImporter.nib in Resources */,
117D6DC00BC5F0C40080D02B /* notify.png in Resources */,
- 3470BF700BC6F22200388232 /* MessageHistoryConfiguration.nib in Resources */,
344838690BC85EF70083723B /* AccountListPreferences.nib in Resources */,
344839380BC862780083723B /* pref-messages.png in Resources */,
34483A990BC869680083723B /* AdvancedPreferences.nib in Resources */,
@@ -10863,7 +10817,6 @@
34DC8B090A7EEEF7003E1636 /* JVFontPreviewField.m in Sources */,
343700A80A9C1E170028604E /* AIAdvancedPreferencePane.m in Sources */,
34F312F00ADC476300A4310E /* KNShelfSplitView.m in Sources */,
- 3470BF610BC6F18500388232 /* AIMessageHistoryPreferencesWindowController.m in Sources */,
11CA00120C35EC5200A6BB8D /* SS_PrefsController.m in Sources */,
34A88E180C7A26E0006EB7D4 /* AIPasswordPromptController.m in Sources */,
347933F40C861017007ADCAA /* AIColorStringTransformer.m in Sources */,
@@ -12238,41 +12191,6 @@
name = Statuses.strings;
sourceTree = "<group>";
};
- 3470BF6F0BC6F22200388232 /* MessageHistoryConfiguration.nib */ = {
- isa = PBXVariantGroup;
- children = (
- 3470BF660BC6F21200388232 /* en */,
- 34619A860BC8BF2300DF383C /* ca */,
- 34619A870BC8BF2800DF383C /* cs */,
- 34619A880BC8BF2B00DF383C /* da */,
- 34619A890BC8BF2D00DF383C /* de */,
- 34619A8A0BC8BF3000DF383C /* es */,
- 34619A8B0BC8BF3400DF383C /* fi */,
- 34619A8C0BC8BF3700DF383C /* fr */,
- 34619A8D0BC8BF3900DF383C /* is */,
- 34619A8E0BC8BF3D00DF383C /* it */,
- 34619A8F0BC8BF4000DF383C /* ja */,
- 34619A900BC8BF4200DF383C /* nb */,
- 34619A910BC8BF4500DF383C /* nl */,
- 34619A920BC8BF4800DF383C /* pl */,
- 34619A930BC8BF4A00DF383C /* pt */,
- 34619A940BC8BF4D00DF383C /* ru */,
- 34619A950BC8BF5100DF383C /* sv */,
- 34619A960BC8BF5400DF383C /* tr */,
- 34619A970BC8BF5600DF383C /* zh_CN */,
- 34619A980BC8BF5B00DF383C /* zh_TW */,
- 341EC8C00D3C2BA9007216A2 /* sl */,
- 34208D190D502D40003138D1 /* fr_CA */,
- 345076B10E106F5F00BF0883 /* en_GB */,
- 345076F00E106FD600BF0883 /* pt_PT */,
- 346C9C160E70E1F7002314EE /* hu */,
- 34B1FCE00F112BF600C7E952 /* el_GR */,
- 5A7642C611E044BA00E5E0AF /* sk_SK */,
- 5A80CCA4121F5A7B00D0670A /* uk_UA */,
- );
- name = MessageHistoryConfiguration.nib;
- sourceTree = "<group>";
- };
347374BB0AA9206B00AD18E3 /* ShortcutRecorder.strings */ = {
isa = PBXVariantGroup;
children = (
diff -r 06f000e3641b -r 3058311a2c87 Plugins/General Preferences/ESGeneralPreferences.h
--- a/Plugins/General Preferences/ESGeneralPreferences.h Sat Nov 27 00:40:39 2010 +0100
+++ b/Plugins/General Preferences/ESGeneralPreferences.h Sat Nov 27 01:19:25 2010 -0500
@@ -39,6 +39,4 @@
IBOutlet SRRecorderControl *shortcutRecorder;
}
-- (IBAction)configureMessageHistory:(id)sender;
-
@end
diff -r 06f000e3641b -r 3058311a2c87 Plugins/General Preferences/ESGeneralPreferences.m
--- a/Plugins/General Preferences/ESGeneralPreferences.m Sat Nov 27 00:40:39 2010 +0100
+++ b/Plugins/General Preferences/ESGeneralPreferences.m Sat Nov 27 01:19:25 2010 -0500
@@ -23,7 +23,6 @@
#import "SGHotKey.h"
#import "SRRecorderControl.h"
#import "SGHotKey.h"
-#import "AIMessageHistoryPreferencesWindowController.h"
#import "AIMessageWindowController.h"
#import <Adium/AIServiceIcons.h>
#import <Adium/AIStatusIcons.h>
@@ -310,10 +309,4 @@
group:@"Message Context Display"];
}
-#pragma mark Message history
-- (IBAction)configureMessageHistory:(id)sender
-{
- [AIMessageHistoryPreferencesWindowController configureMessageHistoryPreferencesOnWindow:[[self view] window]];
-}
-
@end
diff -r 06f000e3641b -r 3058311a2c87 Plugins/Status Menu Item/CBStatusMenuItemController.m
--- a/Plugins/Status Menu Item/CBStatusMenuItemController.m Sat Nov 27 00:40:39 2010 +0100
+++ b/Plugins/Status Menu Item/CBStatusMenuItemController.m Sat Nov 27 01:19:25 2010 -0500
@@ -246,7 +246,7 @@
if (!menuIconPath || !menuIconName) {
menuIconName = [adium.preferenceController defaultPreferenceForKey:KEY_MENU_BAR_ICONS
group:PREF_GROUP_APPEARANCE
- object:nil];
+ object:nil];
menuIconPath = [adium pathOfPackWithName:menuIconName
extension:EXTENSION_MENU_BAR_ICONS
resourceFolderName:RESOURCE_MENU_BAR_ICONS];
@@ -318,7 +318,6 @@
- (void)updateMenuIcons
{
NSImage *badge = nil;
- BOOL anyAccountHasStatusMessage;
NSString *imageName;
// If there's content, set our badge to the "content" icon.
@@ -355,15 +354,10 @@
break;
default:
- // Online badging order of presence: idle > reconnecting account > status message
-
// Assuming we're using an online image unless proven otherwise
imageName = IMAGE_TYPE_ONLINE;
// Check idle here, since it has less precedence than offline, invisible, or away.
- anyAccountHasStatusMessage = NO;
-
- // Check each account for IdleSince, a StatusState status message, or "Waiting to Reconnect"
for (AIAccount *account in adium.accountController.accounts) {
if (account.online && [account valueForProperty:@"idleSince"]) {
if (showBadge) {
@@ -375,25 +369,9 @@
imageName = IMAGE_TYPE_IDLE;
- // We don't need to check anymore; idle has high precedence than offline or available with a status message.
break;
- } else if (showBadge &&
- ([account valueForProperty:@"waitingToReconnect"] ||
- [account boolValueForProperty:@"isConnecting"])) {
- badge = [AIStatusIcons statusIconForStatusName:@"Offline"
- statusType:AIOfflineStatusType
- iconType:AIStatusIconList
- direction:AIIconNormal];
- } else if (account.online && [[account valueForProperty:@"accountStatus"] statusMessage]) {
- anyAccountHasStatusMessage = YES;
}
}
-
- // If we already haven't chosen a badge (for example, offline for a reconnecting account)
- // and we have a status message set on any online account, use an online badge
- if (showBadge && !badge && anyAccountHasStatusMessage) {
- badge = [adium.statusController.activeStatusState icon];
- }
break;
}
diff -r 06f000e3641b -r 3058311a2c87 Resources/AIAddressBookInspectorPane.nib/classes.nib
--- a/Resources/AIAddressBookInspectorPane.nib/classes.nib Sat Nov 27 00:40:39 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IBClasses</key>
- <array>
- <dict>
- <key>CLASS</key>
- <string>NSApplication</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSResponder</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSTextField</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSControl</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>RBSplitView</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>delegate</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>RBSplitSubview</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>cancelABPanel</key>
- <string>id</string>
- <key>cardSelected</key>
- <string>id</string>
- <key>runABPanel</key>
- <string>id</string>
- <key>setAlias</key>
- <string>id</string>
- <key>setNotes</key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>AIAddressBookInspectorPane</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>addressBookPanel</key>
- <string>NSPanel</string>
- <key>addressBookPicker</key>
- <string>ABPeoplePickerView</string>
- <key>aliasLabel</key>
- <string>NSTextField</string>
- <key>button_abPeoplePickerCancel</key>
- <string>NSButton</string>
- <key>button_abPeoplePickerOkay</key>
- <string>NSButton</string>
- <key>button_chooseCard</key>
- <string>NSButton</string>
- <key>contactAlias</key>
- <string>AIDelayedTextField</string>
- <key>contactNotes</key>
- <string>AIDelayedTextField</string>
- <key>inspectorContentView</key>
- <string>NSView</string>
- <key>label_abPeoplePickerChooseAnAddressCard</key>
- <string>NSTextField</string>
- <key>label_notes</key>
- <string>NSTextField</string>
- <key>notes</key>
- <string>AIDelayedTextField</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>AIObject</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>RBSplitSubview</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSView</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>adiumPrint</key>
- <string>id</string>
- <key>didAdjustSubviews</key>
- <string>RBSplitView</string>
- <key>prefsWindowWillClose</key>
- <string>SS_PrefsController</string>
- <key>toggleFindPanel</key>
- <string>id</string>
- <key>willAdjustSubviews</key>
- <string>RBSplitView</string>
- </dict>
- <key>CLASS</key>
- <string>NSObject</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>AILocalizationButton</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>view_anchorToLeftSide</key>
- <string>NSView</string>
- <key>view_anchorToRightSide</key>
- <string>NSView</string>
- <key>window_anchorOnLeftSide</key>
- <string>NSWindow</string>
- <key>window_anchorOnRightSide</key>
- <string>NSWindow</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSButton</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSWindow</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSResponder</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSButton</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSControl</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>AIObject</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>AIDelayedTextField</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSTextField</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>AILocalizationTextField</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>view_anchorToLeftSide</key>
- <string>NSView</string>
- <key>view_anchorToRightSide</key>
- <string>NSView</string>
- <key>window_anchorOnLeftSide</key>
- <string>NSWindow</string>
- <key>window_anchorOnRightSide</key>
- <string>NSWindow</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSTextField</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSButtonCell</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSActionCell</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>SS_PrefsController</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>delegate</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- </array>
- <key>IBVersion</key>
- <string>1</string>
-</dict>
-</plist>
diff -r 06f000e3641b -r 3058311a2c87 Resources/AIAddressBookInspectorPane.nib/designable.nib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/AIAddressBookInspectorPane.nib/designable.nib Sat Nov 27 01:19:25 2010 -0500
@@ -0,0 +1,1111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1050</int>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.AddressBook.ibplugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>868</string>
+ <string>804</string>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="200"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.AddressBook.ibplugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="294189975">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSCustomObject" id="352513495">
+ <string key="NSClassName">AIAddressBookInspectorPane</string>
+ </object>
+ <object class="NSCustomObject" id="1047251649">
+ <string key="NSClassName">FirstResponder</string>
+ </object>
+ <object class="NSCustomObject" id="304915370">
+ <string key="NSClassName">NSApplication</string>
+ </object>
+ <object class="NSCustomView" id="709718774">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSTextField" id="939932763">
+ <reference key="NSNextResponder" ref="709718774"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{12, 230}, {43, 14}}</string>
+ <reference key="NSSuperview" ref="709718774"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="111476667">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">272629760</int>
+ <string key="NSContents">Notes:</string>
+ <object class="NSFont" key="NSSupport" id="26">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">11</double>
+ <int key="NSfFlags">3100</int>
+ </object>
+ <reference key="NSControlView" ref="939932763"/>
+ <object class="NSColor" key="NSBackgroundColor" id="620004898">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlColor</string>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ </object>
+ </object>
+ <object class="NSColor" key="NSTextColor" id="502049214">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlTextColor</string>
+ <object class="NSColor" key="NSColor" id="312562365">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="NSButton" id="361439772">
+ <reference key="NSNextResponder" ref="709718774"/>
+ <int key="NSvFlags">293</int>
+ <string key="NSFrame">{{42, 9}, {215, 32}}</string>
+ <reference key="NSSuperview" ref="709718774"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="644818777">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Choose Address Book Card...</string>
+ <object class="NSFont" key="NSSupport" id="540804698">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">13</double>
+ <int key="NSfFlags">1044</int>
+ </object>
+ <reference key="NSControlView" ref="361439772"/>
+ <int key="NSButtonFlags">-2034876161</int>
+ <int key="NSButtonFlags2">129</int>
+ <reference key="NSAlternateImage" ref="540804698"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSTextField" id="59389793">
+ <reference key="NSNextResponder" ref="709718774"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrame">{{14, 51}, {273, 171}}</string>
+ <reference key="NSSuperview" ref="709718774"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="928257233">
+ <int key="NSCellFlags">-1805517311</int>
+ <int key="NSCellFlags2">4194304</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="59389793"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">textBackgroundColor</string>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ </object>
+ <object class="NSColor" key="NSTextColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">textColor</string>
+ <reference key="NSColor" ref="312562365"/>
+ </object>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{300, 258}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSMutableString" key="NSClassName">
+ <characters key="NS.bytes">NSView</characters>
+ </object>
+ <string key="NSExtension">NSResponder</string>
+ </object>
+ <object class="NSWindowTemplate" id="966346597">
+ <int key="NSWindowStyleMask">65</int>
+ <int key="NSWindowBacking">2</int>
+ <string key="NSWindowRect">{{196, 281}, {398, 229}}</string>
+ <int key="NSWTFlags">-469761024</int>
+ <string key="NSWindowTitle">Address Book Picker</string>
+ <string key="NSWindowClass">NSPanel</string>
+ <nil key="NSViewClass"/>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <object class="NSView" key="NSWindowView" id="250731527">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="ABPeoplePickerView" id="661086088">
+ <reference key="NSNextResponder" ref="250731527"/>
+ <int key="NSvFlags">264</int>
+ <string key="NSFrame">{{20, 60}, {358, 169}}</string>
+ <reference key="NSSuperview" ref="250731527"/>
+ <reference key="NSWindow"/>
+ <int key="ABPPFlags">0</int>
+ <nil key="ABPPAutosaveName"/>
+ <object class="NSMutableArray" key="ABPPColumns">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSTextField" id="104566503">
+ <reference key="NSNextResponder" ref="250731527"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{8, 198}, {208, 17}}</string>
+ <reference key="NSSuperview" ref="250731527"/>
+ <reference key="NSWindow"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="334147956">
+ <int key="NSCellFlags">67239488</int>
+ <int key="NSCellFlags2">272761856</int>
+ <string key="NSContents">Choose an Address Card:</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="104566503"/>
+ <reference key="NSBackgroundColor" ref="620004898"/>
+ <reference key="NSTextColor" ref="502049214"/>
+ </object>
+ </object>
+ <object class="NSButton" id="1048363145">
+ <reference key="NSNextResponder" ref="250731527"/>
+ <int key="NSvFlags">289</int>
+ <string key="NSFrame">{{263, 12}, {121, 32}}</string>
+ <reference key="NSSuperview" ref="250731527"/>
+ <reference key="NSWindow"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="588728948">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Choose Card</string>
+ <reference key="NSSupport" ref="540804698"/>
+ <reference key="NSControlView" ref="1048363145"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSButton" id="623458486">
+ <reference key="NSNextResponder" ref="250731527"/>
+ <int key="NSvFlags">289</int>
+ <string key="NSFrame">{{167, 12}, {96, 32}}</string>
+ <reference key="NSSuperview" ref="250731527"/>
+ <reference key="NSWindow"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="151920277">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Cancel</string>
+ <reference key="NSSupport" ref="540804698"/>
+ <reference key="NSControlView" ref="623458486"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{398, 229}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ </object>
+ <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">cardSelected:</string>
+ <reference key="source" ref="352513495"/>
+ <reference key="destination" ref="1048363145"/>
+ </object>
+ <int key="connectionID">40</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">cancelABPanel:</string>
+ <reference key="source" ref="352513495"/>
+ <reference key="destination" ref="623458486"/>
+ </object>
+ <int key="connectionID">41</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">inspectorContentView</string>
+ <reference key="source" ref="352513495"/>
+ <reference key="destination" ref="709718774"/>
+ </object>
+ <int key="connectionID">65</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">notes</string>
+ <reference key="source" ref="352513495"/>
+ <reference key="destination" ref="59389793"/>
+ </object>
+ <int key="connectionID">134</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">contactNotes</string>
+ <reference key="source" ref="352513495"/>
+ <reference key="destination" ref="59389793"/>
+ </object>
+ <int key="connectionID">158</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">setNotes:</string>
+ <reference key="source" ref="352513495"/>
+ <reference key="destination" ref="59389793"/>
+ </object>
+ <int key="connectionID">170</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">addressBookPanel</string>
+ <reference key="source" ref="352513495"/>
+ <reference key="destination" ref="966346597"/>
+ </object>
+ <int key="connectionID">181</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="966346597"/>
+ <reference key="destination" ref="352513495"/>
+ </object>
+ <int key="connectionID">182</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">addressBookPicker</string>
+ <reference key="source" ref="352513495"/>
+ <reference key="destination" ref="661086088"/>
+ </object>
+ <int key="connectionID">194</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">label_notes</string>
+ <reference key="source" ref="352513495"/>
+ <reference key="destination" ref="939932763"/>
+ </object>
+ <int key="connectionID">206</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">button_chooseCard</string>
+ <reference key="source" ref="352513495"/>
+ <reference key="destination" ref="361439772"/>
+ </object>
+ <int key="connectionID">207</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">runABPanel:</string>
+ <reference key="source" ref="352513495"/>
+ <reference key="destination" ref="361439772"/>
+ </object>
+ <int key="connectionID">208</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">label_abPeoplePickerChooseAnAddressCard</string>
+ <reference key="source" ref="352513495"/>
+ <reference key="destination" ref="104566503"/>
+ </object>
+ <int key="connectionID">209</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">button_abPeoplePickerOkay</string>
+ <reference key="source" ref="352513495"/>
+ <reference key="destination" ref="1048363145"/>
+ </object>
+ <int key="connectionID">210</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">button_abPeoplePickerCancel</string>
+ <reference key="source" ref="352513495"/>
+ <reference key="destination" ref="623458486"/>
+ </object>
+ <int key="connectionID">211</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">view_anchorToRightSide</string>
+ <reference key="source" ref="623458486"/>
+ <reference key="destination" ref="1048363145"/>
+ </object>
+ <int key="connectionID">212</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">view_anchorToLeftSide</string>
+ <reference key="source" ref="1048363145"/>
+ <reference key="destination" ref="623458486"/>
+ </object>
+ <int key="connectionID">213</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <object class="NSArray" key="object" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <reference key="children" ref="294189975"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="352513495"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="1047251649"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">First Responder</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-3</int>
+ <reference key="object" ref="304915370"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">Application</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">2</int>
+ <reference key="object" ref="709718774"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="59389793"/>
+ <reference ref="939932763"/>
+ <reference ref="361439772"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">Address Book View</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">5</int>
+ <reference key="object" ref="939932763"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="111476667"/>
+ </object>
+ <reference key="parent" ref="709718774"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">198</int>
+ <reference key="object" ref="111476667"/>
+ <reference key="parent" ref="939932763"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8</int>
+ <reference key="object" ref="361439772"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="644818777"/>
+ </object>
+ <reference key="parent" ref="709718774"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">199</int>
+ <reference key="object" ref="644818777"/>
+ <reference key="parent" ref="361439772"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">106</int>
+ <reference key="object" ref="59389793"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="928257233"/>
+ </object>
+ <reference key="parent" ref="709718774"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">200</int>
+ <reference key="object" ref="928257233"/>
+ <reference key="parent" ref="59389793"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">15</int>
+ <reference key="object" ref="966346597"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="250731527"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">Panel (Address Book Picker)</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">16</int>
+ <reference key="object" ref="250731527"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="661086088"/>
+ <reference ref="104566503"/>
+ <reference ref="1048363145"/>
+ <reference ref="623458486"/>
+ </object>
+ <reference key="parent" ref="966346597"/>
+ </object>
More information about the commits
mailing list