adium 4422:188f837e19eb: Fix, enable/disable some labels/control...
commits at adium.im
commits at adium.im
Wed Dec 21 23:53:13 UTC 2011
details: http://hg.adium.im/adium/rev/188f837e19eb
revision: 4422:188f837e19eb
branch: (none)
author: Adrian Godoroja <robotive at me.com>
date: Thu Dec 22 01:53:01 2011 +0200
Fix, enable/disable some labels/controls in Prefernces: General -> Messages & Advanced -> Address Book. Thanks to Paul Wilde's "sharp" eyes :)
Details:
General -> Messages: -> blank out "recent messages in new chats" and disable "Customize" button when "Log messages" is unticked.
Advanced -> Address Book -> blank out "Type text and drag name elements to create a custom name format." when "Import my contacts' names from the Address Book" is unticked.
diffs (664 lines):
diff -r c2bfe5f78867 -r 188f837e19eb AIBoolToControlTextColorTransformer.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AIBoolToControlTextColorTransformer.h Thu Dec 22 01:53:01 2011 +0200
@@ -0,0 +1,24 @@
+/*
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+
+/*!
+ * @class AIBoolToControlTextColorTransformer
+ * @brief NSValueTransformer which transforms BOOL to [NSColor controlTextColor] | [NSColor disabledControlTextColor]
+ */
+ at interface AIBoolToControlTextColorTransformer : NSValueTransformer
+
+ at end
diff -r c2bfe5f78867 -r 188f837e19eb AIBoolToControlTextColorTransformer.m
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AIBoolToControlTextColorTransformer.m Thu Dec 22 01:53:01 2011 +0200
@@ -0,0 +1,41 @@
+/*
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+
+#import "AIBoolToControlTextColorTransformer.h"
+
+ at implementation AIBoolToControlTextColorTransformer
+
++ (Class)transformedValueClass
+{
+ return [NSColor class];
+}
+
++ (BOOL)allowsReverseTransformation
+{
+ return NO;
+}
+
+- (id)transformedValue:(id)value
+{
+ if (value == nil || ![value respondsToSelector:@selector(boolValue)]) {
+ return nil;
+ }
+
+ return ([value boolValue]) ? [NSColor controlTextColor] : [NSColor disabledControlTextColor];
+}
+
+ at end
diff -r c2bfe5f78867 -r 188f837e19eb Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Tue Dec 20 23:06:42 2011 +0100
+++ b/Adium.xcodeproj/project.pbxproj Thu Dec 22 01:53:01 2011 +0200
@@ -1443,6 +1443,8 @@
9718DF46136A2C5200013760 /* AIImageCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9718DF44136A2C5200013760 /* AIImageCollectionView.m */; };
9722ABC813257D7F00CAB486 /* ContactListWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9722ABC713257D7F00CAB486 /* ContactListWindow.xib */; };
9760D24613E49A560031FA1A /* AboutDialog_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 9760D24513E49A560031FA1A /* AboutDialog_bg.png */; };
+ 9779184814A14E9F00FAAC33 /* AIBoolToControlTextColorTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9779184614A14E9F00FAAC33 /* AIBoolToControlTextColorTransformer.h */; };
+ 9779184914A14E9F00FAAC33 /* AIBoolToControlTextColorTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9779184714A14E9F00FAAC33 /* AIBoolToControlTextColorTransformer.m */; };
97AF5CDB13191DE200550C41 /* AIContactListUserPictureMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 97AF5CDA13191DE200550C41 /* AIContactListUserPictureMenuController.m */; };
97AF5CF413191E9A00550C41 /* ContactListChangeUserPictureMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 97AF5CF313191E9A00550C41 /* ContactListChangeUserPictureMenu.xib */; };
97E4B4FF13E7490000A8BA53 /* AboutDialog_transp_btm.png in Resources */ = {isa = PBXBuildFile; fileRef = 97E4B4FB13E7490000A8BA53 /* AboutDialog_transp_btm.png */; };
@@ -4605,6 +4607,8 @@
9718DF44136A2C5200013760 /* AIImageCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIImageCollectionView.m; path = "Frameworks/AIUtilities Framework/Source/AIImageCollectionView.m"; sourceTree = "<group>"; };
9722ABC713257D7F00CAB486 /* ContactListWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ContactListWindow.xib; path = Resources/ContactListWindow.xib; sourceTree = "<group>"; };
9760D24513E49A560031FA1A /* AboutDialog_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AboutDialog_bg.png; path = Resources/AboutDialog_bg.png; sourceTree = "<group>"; };
+ 9779184614A14E9F00FAAC33 /* AIBoolToControlTextColorTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIBoolToControlTextColorTransformer.h; sourceTree = "<group>"; };
+ 9779184714A14E9F00FAAC33 /* AIBoolToControlTextColorTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIBoolToControlTextColorTransformer.m; sourceTree = "<group>"; };
97AF5CD913191DE200550C41 /* AIContactListUserPictureMenuController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIContactListUserPictureMenuController.h; path = Source/AIContactListUserPictureMenuController.h; sourceTree = "<group>"; };
97AF5CDA13191DE200550C41 /* AIContactListUserPictureMenuController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIContactListUserPictureMenuController.m; path = Source/AIContactListUserPictureMenuController.m; sourceTree = "<group>"; };
97AF5CF313191E9A00550C41 /* ContactListChangeUserPictureMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ContactListChangeUserPictureMenu.xib; path = Resources/ContactListChangeUserPictureMenu.xib; sourceTree = "<group>"; };
@@ -5616,6 +5620,8 @@
3448055407AC5203006A7F7B /* Other */ = {
isa = PBXGroup;
children = (
+ 9779184614A14E9F00FAAC33 /* AIBoolToControlTextColorTransformer.h */,
+ 9779184714A14E9F00FAAC33 /* AIBoolToControlTextColorTransformer.m */,
347933F10C861017007ADCAA /* AIColorStringTransformer.h */,
347933F20C861017007ADCAA /* AIColorStringTransformer.m */,
340BA84409EC593A000EC441 /* AICorePluginLoader.h */,
@@ -9110,6 +9116,7 @@
112B47670F82E0FC00690E84 /* AIXtraInfo.h in Headers */,
34F17FCE0F8EAC34009C5A39 /* AIListOutlineView+Drawing.h in Headers */,
63B0EC9D0F8FBB660062476B /* AIProxyListObject.h in Headers */,
+ 9779184814A14E9F00FAAC33 /* AIBoolToControlTextColorTransformer.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -10579,6 +10586,7 @@
112B47680F82E0FC00690E84 /* AIXtraInfo.m in Sources */,
34F17FCF0F8EAC34009C5A39 /* AIListOutlineView+Drawing.m in Sources */,
63B0EC9C0F8FBB660062476B /* AIProxyListObject.m in Sources */,
+ 9779184914A14E9F00FAAC33 /* AIBoolToControlTextColorTransformer.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff -r c2bfe5f78867 -r 188f837e19eb Resources/en.lproj/GeneralPreferences.nib/designable.nib
--- a/Resources/en.lproj/GeneralPreferences.nib/designable.nib Tue Dec 20 23:06:42 2011 +0100
+++ b/Resources/en.lproj/GeneralPreferences.nib/designable.nib Thu Dec 22 01:53:01 2011 +0200
@@ -52,6 +52,8 @@
<int key="NSvFlags">258</int>
<string key="NSFrame">{{180, 40}, {223, 22}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="395798763"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSTextField" id="666833680">
@@ -59,6 +61,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 422}, {158, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="866289369"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="554074539">
<int key="NSCellFlags">67239424</int>
@@ -95,6 +99,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{178, 421}, {345, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="1028402368"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="64001217">
<int key="NSCellFlags">67239424</int>
@@ -118,6 +124,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 186}, {158, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="550877228"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="604695771">
<int key="NSCellFlags">67239424</int>
@@ -134,6 +142,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{177, 180}, {283, 26}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="509204869"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="346932475">
<int key="NSCellFlags">-2076049856</int>
@@ -187,6 +197,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 149}, {158, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="968411985"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="220626710">
<int key="NSCellFlags">67239424</int>
@@ -203,6 +215,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{178, 148}, {345, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="1022912864"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="96418576">
<int key="NSCellFlags">67239424</int>
@@ -224,6 +238,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 222}, {158, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="317131823"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1048718565">
<int key="NSCellFlags">67239424</int>
@@ -240,6 +256,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{177, 216}, {283, 26}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="685592821"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="239510870">
<int key="NSCellFlags">-2076049856</int>
@@ -288,6 +306,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 45}, {158, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="727659852"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="305595294">
<int key="NSCellFlags">67239424</int>
@@ -304,6 +324,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{177, 4}, {347, 28}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="169795752">
<int key="NSCellFlags">67239424</int>
@@ -325,6 +347,8 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{379, 337}, {108, 32}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="715645352"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="23840310">
<int key="NSCellFlags">67239424</int>
@@ -345,6 +369,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{195, 371}, {328, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="958453719"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="468254486">
<int key="NSCellFlags">67239424</int>
@@ -366,6 +392,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{195, 346}, {184, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="223591434"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="482404893">
<int key="NSCellFlags">67239424</int>
@@ -387,6 +415,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{195, 397}, {55, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="606751019"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="685173519">
<int key="NSCellFlags">67239424</int>
@@ -408,6 +438,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{178, 297}, {345, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="209177718"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="839881608">
<int key="NSCellFlags">67239424</int>
@@ -429,6 +461,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{195, 250}, {328, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="838555988"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="54678259">
<int key="NSCellFlags">67239424</int>
@@ -450,6 +484,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{315, 267}, {147, 26}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="765263822"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="156626493">
<int key="NSCellFlags">-2076049856</int>
@@ -533,6 +569,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{196, 274}, {117, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="9325956"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1046230780">
<int key="NSCellFlags">67239424</int>
@@ -549,6 +587,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 121}, {158, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="55874791"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="637601550">
<int key="NSCellFlags">67239424</int>
@@ -565,6 +605,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{178, 120}, {345, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="379579225"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="399560084">
<int key="NSCellFlags">67239424</int>
@@ -586,6 +628,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{195, 97}, {328, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="876436028"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="122113635">
<int key="NSCellFlags">67239424</int>
@@ -607,6 +651,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{195, 75}, {328, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="457706126"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="839973176">
<int key="NSCellFlags">67239424</int>
@@ -628,6 +674,8 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{254, 395}, {32, 22}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="149624680"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="623150519">
<int key="NSCellFlags">-1804468671</int>
@@ -658,6 +706,8 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{286, 392}, {19, 28}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="202374623"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="166405478">
<int key="NSCellFlags">917024</int>
@@ -675,6 +725,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{303, 398}, {221, 17}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="680415872"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="9023852">
<int key="NSCellFlags">67239424</int>
@@ -691,6 +743,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{178, 321}, {345, 18}}</string>
<reference key="NSSuperview" ref="974184333"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="147301537"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="538262951">
<int key="NSCellFlags">67239424</int>
@@ -710,6 +764,8 @@
</array>
<string key="NSFrameSize">{541, 459}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="666833680"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
@@ -1214,6 +1270,26 @@
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
+ <string key="label">textColor: adium.preferenceController.Logging.Enable Logging</string>
+ <reference key="source" ref="202374623"/>
+ <reference key="destination" ref="836442907"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="202374623"/>
+ <reference key="NSDestination" ref="836442907"/>
+ <string key="NSLabel">textColor: adium.preferenceController.Logging.Enable Logging</string>
+ <string key="NSBinding">textColor</string>
+ <string key="NSKeyPath">adium.preferenceController.Logging.Enable Logging</string>
+ <object class="NSDictionary" key="NSOptions">
+ <string key="NS.key.0">NSValueTransformerName</string>
+ <string key="NS.object.0">AIBoolToControlTextColorTransformer</string>
+ </object>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">407</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
<string key="label">value: adium.preferenceController.Interface.Save Containers On Quit</string>
<reference key="source" ref="223591434"/>
<reference key="destination" ref="836442907"/>
@@ -1241,7 +1317,7 @@
<string key="label">enabled: adium.preferenceController.Logging.LogCertainAccounts</string>
<reference key="source" ref="147301537"/>
<reference key="destination" ref="1027461115"/>
- <object class="NSNibBindingConnector" key="connector">
+ <object class="NSNibBindingConnector" key="connector" id="173882127">
<reference key="NSSource" ref="147301537"/>
<reference key="NSDestination" ref="1027461115"/>
<string key="NSLabel">enabled: adium.preferenceController.Logging.LogCertainAccounts</string>
@@ -1254,6 +1330,29 @@
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
+ <string key="label">enabled2: adium.preferenceController.Logging.Enable Logging</string>
+ <reference key="source" ref="147301537"/>
+ <reference key="destination" ref="836442907"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="147301537"/>
+ <reference key="NSDestination" ref="836442907"/>
+ <string key="NSLabel">enabled2: adium.preferenceController.Logging.Enable Logging</string>
+ <string key="NSBinding">enabled2</string>
+ <string key="NSKeyPath">adium.preferenceController.Logging.Enable Logging</string>
+ <dictionary key="NSOptions">
+ <integer value="-1" key="NSMultipleValuesPlaceholder"/>
+ <integer value="-1" key="NSNoSelectionPlaceholder"/>
+ <integer value="-1" key="NSNotApplicablePlaceholder"/>
+ <integer value="-1" key="NSNullPlaceholder"/>
+ </dictionary>
+ <reference key="NSPreviousConnector" ref="173882127"/>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">409</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
<string key="label">enabled: adium.preferenceController.Logging.Enable Logging</string>
<reference key="source" ref="958453719"/>
<reference key="destination" ref="836442907"/>
@@ -1907,9 +2006,207 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">404</int>
+ <int key="maxID">409</int>
</object>
- <object class="IBClassDescriber" key="IBDocument.Classes"/>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <array class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <object class="IBPartialClassDescription">
+ <string key="className">AILocalizationButton</string>
+ <string key="superclassName">NSButton</string>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="view_anchorToLeftSide">NSView</string>
+ <string key="view_anchorToRightSide">NSView</string>
+ <string key="window_anchorOnLeftSide">NSWindow</string>
+ <string key="window_anchorOnRightSide">NSWindow</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
+ <string key="name">view_anchorToLeftSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view_anchorToRightSide">
+ <string key="name">view_anchorToRightSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
+ <string key="name">window_anchorOnLeftSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
+ <string key="name">window_anchorOnRightSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AILocalizationButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AILocalizationTextField</string>
+ <string key="superclassName">NSTextField</string>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="view_anchorToLeftSide">NSView</string>
+ <string key="view_anchorToRightSide">NSView</string>
+ <string key="window_anchorOnLeftSide">NSWindow</string>
+ <string key="window_anchorOnRightSide">NSWindow</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
+ <string key="name">view_anchorToLeftSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view_anchorToRightSide">
+ <string key="name">view_anchorToRightSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
+ <string key="name">window_anchorOnLeftSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
+ <string key="name">window_anchorOnRightSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AILocalizationTextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIModularPane</string>
+ <string key="superclassName">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">changePreference:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">changePreference:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">changePreference:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">view</string>
+ <string key="NS.object.0">NSView</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">view</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">view</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIModularPane.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIPreferencePane</string>
+ <string key="superclassName">AIModularPane</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIPreferencePane.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">ESGeneralPreferences</string>
+ <string key="superclassName">AIPreferencePane</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">configureLogCertainAccounts:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">configureLogCertainAccounts:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">configureLogCertainAccounts:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="checkBox_arrangeByGroup">NSButton</string>
+ <string key="checkBox_messagesInTabs">NSButton</string>
+ <string key="checkBox_updatesAutomatic">NSButton</string>
+ <string key="checkBox_updatesIncludeBetas">NSButton</string>
+ <string key="checkBox_updatesProfileInfo">NSButton</string>
+ <string key="label_logging">NSTextField</string>
+ <string key="label_messagesSendOn">NSTextField</string>
+ <string key="label_messagesTabs">NSTextField</string>
+ <string key="label_shortcutRecorder">NSTextField</string>
+ <string key="label_switchTabsWith">NSTextField</string>
+ <string key="placeholder_shortcutRecorder">NSView</string>
+ <string key="popUp_sendKeys">NSPopUpButton</string>
+ <string key="popUp_tabKeys">NSPopUpButton</string>
+ <string key="popUp_tabPositionMenu">NSPopUpButton</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="checkBox_arrangeByGroup">
+ <string key="name">checkBox_arrangeByGroup</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_messagesInTabs">
+ <string key="name">checkBox_messagesInTabs</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_updatesAutomatic">
+ <string key="name">checkBox_updatesAutomatic</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_updatesIncludeBetas">
+ <string key="name">checkBox_updatesIncludeBetas</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_updatesProfileInfo">
+ <string key="name">checkBox_updatesProfileInfo</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_logging">
+ <string key="name">label_logging</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_messagesSendOn">
+ <string key="name">label_messagesSendOn</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_messagesTabs">
+ <string key="name">label_messagesTabs</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_shortcutRecorder">
+ <string key="name">label_shortcutRecorder</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_switchTabsWith">
+ <string key="name">label_switchTabsWith</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="placeholder_shortcutRecorder">
+ <string key="name">placeholder_shortcutRecorder</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="popUp_sendKeys">
+ <string key="name">popUp_sendKeys</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="popUp_tabKeys">
+ <string key="name">popUp_tabKeys</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="popUp_tabPositionMenu">
+ <string key="name">popUp_tabPositionMenu</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/ESGeneralPreferences.h</string>
+ </object>
+ </object>
+ </array>
+ </object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
diff -r c2bfe5f78867 -r 188f837e19eb Resources/en.lproj/GeneralPreferences.nib/keyedobjects.nib
Binary file Resources/en.lproj/GeneralPreferences.nib/keyedobjects.nib has changed
diff -r c2bfe5f78867 -r 188f837e19eb Source/ESAddressBookIntegrationAdvancedPreferences.m
--- a/Source/ESAddressBookIntegrationAdvancedPreferences.m Tue Dec 20 23:06:42 2011 +0100
+++ b/Source/ESAddressBookIntegrationAdvancedPreferences.m Thu Dec 22 01:53:01 2011 +0200
@@ -150,6 +150,8 @@
BOOL useImages = [[adium.preferenceController preferenceForKey:KEY_AB_USE_IMAGES
group:PREF_GROUP_ADDRESSBOOK] boolValue];
+ [label_instructions setTextColor:((enableImport) ? [NSColor controlTextColor] : [NSColor disabledControlTextColor])];
+
//Use Nick Name and the format menu are irrelevent if importing of names is not enabled
[checkBox_useFirstName setEnabled:enableImport];
[checkBox_useNickName setEnabled:enableImport];
More information about the commits
mailing list