adium 2444:8c9a502c1cec: Separate out some regular vs. group cha...
commits at adium.im
commits at adium.im
Tue Jun 2 17:27:49 UTC 2009
details: http://hg.adium.im/adium/rev/8c9a502c1cec
revision: 2444:8c9a502c1cec
author: Zachary West <zacw at adium.im>
date: Tue Jun 02 13:27:18 2009 -0400
Separate out some regular vs. group chat advanced Message preferences.
Adds a "…only count number of unread mentions" for tabs in the group chat prefs. Fixes #12033.
This forces a nib update.
diffs (truncated from 1658 to 1000 lines):
diff -r 35f6b312d24c -r 8c9a502c1cec Plugins/Dual Window Interface/AIDualWindowInterfacePlugin.h
--- a/Plugins/Dual Window Interface/AIDualWindowInterfacePlugin.h Mon Jun 01 22:46:44 2009 -0700
+++ b/Plugins/Dual Window Interface/AIDualWindowInterfacePlugin.h Tue Jun 02 13:27:18 2009 -0400
@@ -33,6 +33,8 @@
#define KEY_ARRANGE_TABS_BY_GROUP @"Arrange Tabs By Group"
#define KEY_TABBAR_POSITION @"Tab Bar Position"
#define KEY_TABBAR_SHOW_UNREAD_COUNT @"Show Unread Message Count in Tabs"
+#define KEY_TABBAR_SHOW_UNREAD_COUNT_GROUP @"Show Unread Message Count in Group Chat Tabs"
+#define KEY_TABBAR_SHOW_UNREAD_MENTION_ONLYGROUP @"Show Unread Mention Count Only in Group Chat Tabs"
#define KEY_ALWAYS_CREATE_NEW_WINDOWS @"Always Create New Windows"
#define KEY_USE_LAST_WINDOW @"Use Last Window"
diff -r 35f6b312d24c -r 8c9a502c1cec Plugins/Dual Window Interface/AIMessageTabViewItem.m
--- a/Plugins/Dual Window Interface/AIMessageTabViewItem.m Mon Jun 01 22:46:44 2009 -0700
+++ b/Plugins/Dual Window Interface/AIMessageTabViewItem.m Tue Jun 02 13:27:18 2009 -0400
@@ -342,9 +342,25 @@
- (NSInteger)objectCount
{
- //return 0 to disable the badge
- return ([[adium.preferenceController preferenceForKey:KEY_TABBAR_SHOW_UNREAD_COUNT group:PREF_GROUP_DUAL_WINDOW_INTERFACE] boolValue] ?
- self.chat.unviewedContentCount : 0);
+ if (self.chat.isGroupChat) {
+ if ([[adium.preferenceController preferenceForKey:KEY_TABBAR_SHOW_UNREAD_COUNT_GROUP
+ group:PREF_GROUP_DUAL_WINDOW_INTERFACE] boolValue]) {
+ if ([[adium.preferenceController preferenceForKey:KEY_TABBAR_SHOW_UNREAD_MENTION_ONLYGROUP
+ group:PREF_GROUP_DUAL_WINDOW_INTERFACE] boolValue]) {
+ return self.chat.unviewedMentionCount;
+ } else {
+ return self.chat.unviewedContentCount;
+ }
+ }
+ } else {
+ if ([[adium.preferenceController preferenceForKey:KEY_TABBAR_SHOW_UNREAD_COUNT
+ group:PREF_GROUP_DUAL_WINDOW_INTERFACE] boolValue]) {
+ return self.chat.unviewedContentCount;
+ }
+ }
+
+ // Returning 0 disables it.
+ return 0;
}
- (void)setCountColor:(NSColor *)color
diff -r 35f6b312d24c -r 8c9a502c1cec Plugins/Dual Window Interface/DualWindowDefaults.plist
--- a/Plugins/Dual Window Interface/DualWindowDefaults.plist Mon Jun 01 22:46:44 2009 -0700
+++ b/Plugins/Dual Window Interface/DualWindowDefaults.plist Tue Jun 02 13:27:18 2009 -0400
@@ -4,6 +4,8 @@
<dict>
<key>Show Unread Message Count in Tabs</key>
<true/>
+ <key>Show Unread Message Count in Group Chat Tabs</key>
+ <true/>
<key>Autohide Tab Bar</key>
<false/>
<key>Enable Inactive Tab Close</key>
diff -r 35f6b312d24c -r 8c9a502c1cec Plugins/Dual Window Interface/ESDualWindowMessageAdvancedPreferences.h
--- a/Plugins/Dual Window Interface/ESDualWindowMessageAdvancedPreferences.h Mon Jun 01 22:46:44 2009 -0700
+++ b/Plugins/Dual Window Interface/ESDualWindowMessageAdvancedPreferences.h Tue Jun 02 13:27:18 2009 -0400
@@ -15,20 +15,34 @@
*/
#import <Adium/AIAdvancedPreferencePane.h>
+#import "AIWebKitMessageViewPlugin.h"
@interface ESDualWindowMessageAdvancedPreferences : AIAdvancedPreferencePane {
- IBOutlet NSButton *autohide_tabBar;
- IBOutlet NSButton *checkBox_allowInactiveClosing;
+ IBOutlet NSTabView *tabView_messageType;
+ IBOutlet NSTabViewItem *tabViewItem_regular;
+ IBOutlet NSTabViewItem *tabViewItem_group;
+ // Regular/Group Chat false tabs
IBOutlet NSButton *checkBox_customNameFormatting;
IBOutlet NSPopUpButton *popUp_nameFormat;
- IBOutlet NSPopUpButton *popUp_minimumFontSize;
IBOutlet NSPopUpButton *popUp_timeStampFormat;
+ IBOutlet NSPopUpButton *popUp_minimumFontSize;
+
+ IBOutlet NSButton *checkBox_showTabCount;
+ IBOutlet NSButton *checkBox_unreadMentionCount;
+
+ // Tabs
+ IBOutlet NSButton *autohide_tabBar;
+
+ // Window Handling
IBOutlet NSButton *checkBox_hide;
IBOutlet NSButton *checkBox_psychicOpen;
IBOutlet NSPopUpButton *popUp_windowPosition;
}
+ at property (readonly, nonatomic) NSString *preferenceGroupForCurrentTab;
+ at property (readonly, nonatomic) AIWebkitStyleType currentTab;
+
@end
diff -r 35f6b312d24c -r 8c9a502c1cec Plugins/Dual Window Interface/ESDualWindowMessageAdvancedPreferences.m
--- a/Plugins/Dual Window Interface/ESDualWindowMessageAdvancedPreferences.m Mon Jun 01 22:46:44 2009 -0700
+++ b/Plugins/Dual Window Interface/ESDualWindowMessageAdvancedPreferences.m Tue Jun 02 13:27:18 2009 -0400
@@ -26,12 +26,11 @@
#import <Adium/AIInterfaceControllerProtocol.h>
#import "AIPreferenceWindowController.h"
-#import "AIWebKitMessageViewPlugin.h"
-
@interface ESDualWindowMessageAdvancedPreferences ()
- (NSMenu *)_fontSizeMenu;
- (NSMenu *)_timeStampMenu;
- (void)_addTimeStampChoice:(NSDateFormatter *)formatter toMenu:(NSMenu *)menu;
+- (void)configurePreferencesForTab;
@end
@implementation ESDualWindowMessageAdvancedPreferences
@@ -46,6 +45,60 @@
return [NSImage imageNamed:@"pref-messages" forClass:[AIPreferenceWindowController class]];
}
+- (AIWebkitStyleType)currentTab
+{
+ if (tabView_messageType.selectedTabViewItem == tabViewItem_regular) {
+ return AIWebkitRegularChat;
+ } else {
+ return AIWebkitGroupChat;
+ }
+}
+
+- (NSString *)preferenceGroupForCurrentTab
+{
+ NSString *prefGroup = nil;
+
+ switch(self.currentTab) {
+ case AIWebkitRegularChat:
+ prefGroup = PREF_GROUP_WEBKIT_REGULAR_MESSAGE_DISPLAY;
+ break;
+
+ case AIWebkitGroupChat:
+ prefGroup = PREF_GROUP_WEBKIT_GROUP_MESSAGE_DISPLAY;
+ break;
+ }
+
+ return prefGroup;
+}
+
+- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem
+{
+ [self configurePreferencesForTab];
+}
+
+- (void)configurePreferencesForTab
+{
+ NSDictionary *prefDict = [adium.preferenceController preferencesForGroup:self.preferenceGroupForCurrentTab];
+
+ [checkBox_customNameFormatting setState:[[prefDict objectForKey:KEY_WEBKIT_USE_NAME_FORMAT] boolValue]];
+ [popUp_nameFormat selectItemWithTag:[[prefDict objectForKey:KEY_WEBKIT_NAME_FORMAT] integerValue]];
+
+ [popUp_minimumFontSize setMenu:[self _fontSizeMenu]];
+ [popUp_minimumFontSize selectItemWithTag:[[prefDict objectForKey:KEY_WEBKIT_MIN_FONT_SIZE] integerValue]];
+
+ [popUp_timeStampFormat setMenu:[self _timeStampMenu]];
+ [popUp_timeStampFormat selectItemWithRepresentedObject:[prefDict objectForKey:KEY_WEBKIT_TIME_STAMP_FORMAT]];
+
+ BOOL showTabCount = [[adium.preferenceController preferenceForKey:(self.currentTab == AIWebkitGroupChat ? KEY_TABBAR_SHOW_UNREAD_COUNT_GROUP : KEY_TABBAR_SHOW_UNREAD_COUNT)
+ group:PREF_GROUP_DUAL_WINDOW_INTERFACE] boolValue];
+ [checkBox_showTabCount setState:showTabCount];
+
+ [checkBox_unreadMentionCount setState:[[adium.preferenceController preferenceForKey:KEY_TABBAR_SHOW_UNREAD_MENTION_ONLYGROUP
+ group:PREF_GROUP_DUAL_WINDOW_INTERFACE] boolValue]];
+
+ [self configureControlDimming];
+}
+
//Called in response to all preference controls, applies new settings
- (IBAction)changePreference:(id)sender
{
@@ -53,12 +106,7 @@
[adium.preferenceController setPreference:[NSNumber numberWithBool:![sender state]]
forKey:KEY_AUTOHIDE_TABBAR
group:PREF_GROUP_DUAL_WINDOW_INTERFACE];
-
- } else if (sender == checkBox_allowInactiveClosing) {
- [adium.preferenceController setPreference:[NSNumber numberWithBool:[sender state]]
- forKey:KEY_ENABLE_INACTIVE_TAB_CLOSE
- group:PREF_GROUP_DUAL_WINDOW_INTERFACE];
-
+
} else if (sender == checkBox_hide) {
[adium.preferenceController setPreference:[NSNumber numberWithBool:([sender state]==NSOnState)]
forKey:KEY_WINDOW_HIDE
@@ -72,37 +120,32 @@
} else if (sender == checkBox_customNameFormatting) {
[adium.preferenceController setPreference:[NSNumber numberWithBool:[sender state]]
forKey:KEY_WEBKIT_USE_NAME_FORMAT
- group:PREF_GROUP_WEBKIT_REGULAR_MESSAGE_DISPLAY];
- [adium.preferenceController setPreference:[NSNumber numberWithBool:[sender state]]
- forKey:KEY_WEBKIT_USE_NAME_FORMAT
- group:PREF_GROUP_WEBKIT_GROUP_MESSAGE_DISPLAY];
+ group:self.preferenceGroupForCurrentTab];
} else if (sender == popUp_nameFormat) {
[adium.preferenceController setPreference:[NSNumber numberWithInteger:[[sender selectedItem] tag]]
forKey:KEY_WEBKIT_NAME_FORMAT
- group:PREF_GROUP_WEBKIT_REGULAR_MESSAGE_DISPLAY];
-
- [adium.preferenceController setPreference:[NSNumber numberWithInteger:[[sender selectedItem] tag]]
- forKey:KEY_WEBKIT_NAME_FORMAT
- group:PREF_GROUP_WEBKIT_GROUP_MESSAGE_DISPLAY];
+ group:self.preferenceGroupForCurrentTab];
+
} else if (sender == popUp_minimumFontSize) {
[adium.preferenceController setPreference:[NSNumber numberWithInteger:[[sender selectedItem] tag]]
forKey:KEY_WEBKIT_MIN_FONT_SIZE
- group:PREF_GROUP_WEBKIT_REGULAR_MESSAGE_DISPLAY];
-
- [adium.preferenceController setPreference:[NSNumber numberWithInteger:[[sender selectedItem] tag]]
- forKey:KEY_WEBKIT_MIN_FONT_SIZE
- group:PREF_GROUP_WEBKIT_GROUP_MESSAGE_DISPLAY];
+ group:self.preferenceGroupForCurrentTab];
} else if (sender == popUp_timeStampFormat) {
[adium.preferenceController setPreference:[[sender selectedItem] representedObject]
forKey:KEY_WEBKIT_TIME_STAMP_FORMAT
- group:PREF_GROUP_WEBKIT_REGULAR_MESSAGE_DISPLAY];
+ group:self.preferenceGroupForCurrentTab];
+
+ } else if (sender == checkBox_showTabCount) {
+ [adium.preferenceController setPreference:[NSNumber numberWithBool:[sender state]]
+ forKey:(self.currentTab == AIWebkitGroupChat ? KEY_TABBAR_SHOW_UNREAD_COUNT_GROUP : KEY_TABBAR_SHOW_UNREAD_COUNT)
+ group:PREF_GROUP_DUAL_WINDOW_INTERFACE];
- [adium.preferenceController setPreference:[[sender selectedItem] representedObject]
- forKey:KEY_WEBKIT_TIME_STAMP_FORMAT
- group:PREF_GROUP_WEBKIT_GROUP_MESSAGE_DISPLAY];
-
+ } else if (sender == checkBox_unreadMentionCount) {
+ [adium.preferenceController setPreference:[NSNumber numberWithBool:([sender state] == NSOnState)]
+ forKey:KEY_TABBAR_SHOW_UNREAD_MENTION_ONLYGROUP
+ group:PREF_GROUP_DUAL_WINDOW_INTERFACE];
}
[self configureControlDimming];
@@ -126,7 +169,6 @@
prefDict = [adium.preferenceController preferencesForGroup:PREF_GROUP_DUAL_WINDOW_INTERFACE];
[autohide_tabBar setState:![[prefDict objectForKey:KEY_AUTOHIDE_TABBAR] boolValue]];
- [checkBox_allowInactiveClosing setState:[[prefDict objectForKey:KEY_ENABLE_INACTIVE_TAB_CLOSE] boolValue]];
//Window position
[popUp_windowPosition setMenu:[adium.interfaceController menuForWindowLevelsNotifyingTarget:self]];
@@ -137,27 +179,18 @@
[checkBox_hide setState:[[prefDict objectForKey:KEY_WINDOW_HIDE] boolValue]];
[checkBox_psychicOpen setState:[[prefDict objectForKey:KEY_PSYCHIC] boolValue]];
-
- // We load the regular preferences, since both group and regular are copies of each other for these.
- prefDict = [adium.preferenceController preferencesForGroup:PREF_GROUP_WEBKIT_REGULAR_MESSAGE_DISPLAY];
- [popUp_nameFormat selectItemWithTag:[[prefDict objectForKey:KEY_WEBKIT_NAME_FORMAT] integerValue]];
- [checkBox_customNameFormatting setState:[[prefDict objectForKey:KEY_WEBKIT_USE_NAME_FORMAT] boolValue]];
-
- [popUp_minimumFontSize setMenu:[self _fontSizeMenu]];
- [popUp_minimumFontSize selectItemWithTag:[[prefDict objectForKey:KEY_WEBKIT_MIN_FONT_SIZE] integerValue]];
- [popUp_timeStampFormat setMenu:[self _timeStampMenu]];
- [popUp_timeStampFormat selectItemWithRepresentedObject:[prefDict objectForKey:KEY_WEBKIT_TIME_STAMP_FORMAT]];
-
+ [self configurePreferencesForTab];
[self configureControlDimming];
}
- (void)configureControlDimming
{
// We load the regular preferences, since both group and regular are copies of each other for these.
- NSDictionary *prefDict = [adium.preferenceController preferencesForGroup:PREF_GROUP_WEBKIT_REGULAR_MESSAGE_DISPLAY];
+ NSDictionary *prefDict = [adium.preferenceController preferencesForGroup:self.preferenceGroupForCurrentTab];
[popUp_nameFormat setEnabled:[[prefDict objectForKey:KEY_WEBKIT_USE_NAME_FORMAT] boolValue]];
+ [checkBox_unreadMentionCount setEnabled:checkBox_showTabCount.state];
}
/*!
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/ca.lproj/DualWindowMessageAdvanced.nib/classes.nib
--- a/Resources/ca.lproj/DualWindowMessageAdvanced.nib/classes.nib Mon Jun 01 22:46:44 2009 -0700
+++ b/Resources/ca.lproj/DualWindowMessageAdvanced.nib/classes.nib Tue Jun 02 13:27:18 2009 -0400
@@ -173,6 +173,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSTabView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSPopUpButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -215,8 +223,6 @@
<dict>
<key>autohide_tabBar</key>
<string>NSButton</string>
- <key>checkBox_allowInactiveClosing</key>
- <string>NSButton</string>
<key>checkBox_animateDockIcon</key>
<string>NSButton</string>
<key>checkBox_badgeDockIcon</key>
@@ -227,6 +233,10 @@
<string>NSButton</string>
<key>checkBox_psychicOpen</key>
<string>NSButton</string>
+ <key>checkBox_showTabCount</key>
+ <string>NSButton</string>
+ <key>checkBox_unreadMentionCount</key>
+ <string>NSButton</string>
<key>popUp_minimumFontSize</key>
<string>NSPopUpButton</string>
<key>popUp_nameFormat</key>
@@ -235,6 +245,12 @@
<string>NSPopUpButton</string>
<key>popUp_windowPosition</key>
<string>NSPopUpButton</string>
+ <key>tabViewItem_group</key>
+ <string>NSTabViewItem</string>
+ <key>tabViewItem_regular</key>
+ <string>NSTabViewItem</string>
+ <key>tabView_messageType</key>
+ <string>NSTabView</string>
</dict>
<key>SUPERCLASS</key>
<string>AIAdvancedPreferencePane</string>
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/ca.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib
Binary file Resources/ca.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib has changed
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/cs.lproj/DualWindowMessageAdvanced.nib/classes.nib
--- a/Resources/cs.lproj/DualWindowMessageAdvanced.nib/classes.nib Mon Jun 01 22:46:44 2009 -0700
+++ b/Resources/cs.lproj/DualWindowMessageAdvanced.nib/classes.nib Tue Jun 02 13:27:18 2009 -0400
@@ -173,6 +173,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSTabView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSPopUpButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -215,8 +223,6 @@
<dict>
<key>autohide_tabBar</key>
<string>NSButton</string>
- <key>checkBox_allowInactiveClosing</key>
- <string>NSButton</string>
<key>checkBox_animateDockIcon</key>
<string>NSButton</string>
<key>checkBox_badgeDockIcon</key>
@@ -227,6 +233,10 @@
<string>NSButton</string>
<key>checkBox_psychicOpen</key>
<string>NSButton</string>
+ <key>checkBox_showTabCount</key>
+ <string>NSButton</string>
+ <key>checkBox_unreadMentionCount</key>
+ <string>NSButton</string>
<key>popUp_minimumFontSize</key>
<string>NSPopUpButton</string>
<key>popUp_nameFormat</key>
@@ -235,6 +245,12 @@
<string>NSPopUpButton</string>
<key>popUp_windowPosition</key>
<string>NSPopUpButton</string>
+ <key>tabViewItem_group</key>
+ <string>NSTabViewItem</string>
+ <key>tabViewItem_regular</key>
+ <string>NSTabViewItem</string>
+ <key>tabView_messageType</key>
+ <string>NSTabView</string>
</dict>
<key>SUPERCLASS</key>
<string>AIAdvancedPreferencePane</string>
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/cs.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib
Binary file Resources/cs.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib has changed
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/da.lproj/DualWindowMessageAdvanced.nib/classes.nib
--- a/Resources/da.lproj/DualWindowMessageAdvanced.nib/classes.nib Mon Jun 01 22:46:44 2009 -0700
+++ b/Resources/da.lproj/DualWindowMessageAdvanced.nib/classes.nib Tue Jun 02 13:27:18 2009 -0400
@@ -173,6 +173,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSTabView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSPopUpButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -215,8 +223,6 @@
<dict>
<key>autohide_tabBar</key>
<string>NSButton</string>
- <key>checkBox_allowInactiveClosing</key>
- <string>NSButton</string>
<key>checkBox_animateDockIcon</key>
<string>NSButton</string>
<key>checkBox_badgeDockIcon</key>
@@ -227,6 +233,10 @@
<string>NSButton</string>
<key>checkBox_psychicOpen</key>
<string>NSButton</string>
+ <key>checkBox_showTabCount</key>
+ <string>NSButton</string>
+ <key>checkBox_unreadMentionCount</key>
+ <string>NSButton</string>
<key>popUp_minimumFontSize</key>
<string>NSPopUpButton</string>
<key>popUp_nameFormat</key>
@@ -235,6 +245,12 @@
<string>NSPopUpButton</string>
<key>popUp_windowPosition</key>
<string>NSPopUpButton</string>
+ <key>tabViewItem_group</key>
+ <string>NSTabViewItem</string>
+ <key>tabViewItem_regular</key>
+ <string>NSTabViewItem</string>
+ <key>tabView_messageType</key>
+ <string>NSTabView</string>
</dict>
<key>SUPERCLASS</key>
<string>AIAdvancedPreferencePane</string>
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/da.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib
Binary file Resources/da.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib has changed
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/de.lproj/DualWindowMessageAdvanced.nib/classes.nib
--- a/Resources/de.lproj/DualWindowMessageAdvanced.nib/classes.nib Mon Jun 01 22:46:44 2009 -0700
+++ b/Resources/de.lproj/DualWindowMessageAdvanced.nib/classes.nib Tue Jun 02 13:27:18 2009 -0400
@@ -173,6 +173,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSTabView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSPopUpButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -215,8 +223,6 @@
<dict>
<key>autohide_tabBar</key>
<string>NSButton</string>
- <key>checkBox_allowInactiveClosing</key>
- <string>NSButton</string>
<key>checkBox_animateDockIcon</key>
<string>NSButton</string>
<key>checkBox_badgeDockIcon</key>
@@ -227,6 +233,10 @@
<string>NSButton</string>
<key>checkBox_psychicOpen</key>
<string>NSButton</string>
+ <key>checkBox_showTabCount</key>
+ <string>NSButton</string>
+ <key>checkBox_unreadMentionCount</key>
+ <string>NSButton</string>
<key>popUp_minimumFontSize</key>
<string>NSPopUpButton</string>
<key>popUp_nameFormat</key>
@@ -235,6 +245,12 @@
<string>NSPopUpButton</string>
<key>popUp_windowPosition</key>
<string>NSPopUpButton</string>
+ <key>tabViewItem_group</key>
+ <string>NSTabViewItem</string>
+ <key>tabViewItem_regular</key>
+ <string>NSTabViewItem</string>
+ <key>tabView_messageType</key>
+ <string>NSTabView</string>
</dict>
<key>SUPERCLASS</key>
<string>AIAdvancedPreferencePane</string>
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/de.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib
Binary file Resources/de.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib has changed
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/el_GR.lproj/DualWindowMessageAdvanced.nib/classes.nib
--- a/Resources/el_GR.lproj/DualWindowMessageAdvanced.nib/classes.nib Mon Jun 01 22:46:44 2009 -0700
+++ b/Resources/el_GR.lproj/DualWindowMessageAdvanced.nib/classes.nib Tue Jun 02 13:27:18 2009 -0400
@@ -173,6 +173,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSTabView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSPopUpButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -215,8 +223,6 @@
<dict>
<key>autohide_tabBar</key>
<string>NSButton</string>
- <key>checkBox_allowInactiveClosing</key>
- <string>NSButton</string>
<key>checkBox_animateDockIcon</key>
<string>NSButton</string>
<key>checkBox_badgeDockIcon</key>
@@ -227,6 +233,10 @@
<string>NSButton</string>
<key>checkBox_psychicOpen</key>
<string>NSButton</string>
+ <key>checkBox_showTabCount</key>
+ <string>NSButton</string>
+ <key>checkBox_unreadMentionCount</key>
+ <string>NSButton</string>
<key>popUp_minimumFontSize</key>
<string>NSPopUpButton</string>
<key>popUp_nameFormat</key>
@@ -235,6 +245,12 @@
<string>NSPopUpButton</string>
<key>popUp_windowPosition</key>
<string>NSPopUpButton</string>
+ <key>tabViewItem_group</key>
+ <string>NSTabViewItem</string>
+ <key>tabViewItem_regular</key>
+ <string>NSTabViewItem</string>
+ <key>tabView_messageType</key>
+ <string>NSTabView</string>
</dict>
<key>SUPERCLASS</key>
<string>AIAdvancedPreferencePane</string>
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/el_GR.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib
Binary file Resources/el_GR.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib has changed
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/en.lproj/DualWindowMessageAdvanced.nib/classes.nib
--- a/Resources/en.lproj/DualWindowMessageAdvanced.nib/classes.nib Mon Jun 01 22:46:44 2009 -0700
+++ b/Resources/en.lproj/DualWindowMessageAdvanced.nib/classes.nib Tue Jun 02 13:27:18 2009 -0400
@@ -173,6 +173,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSTabView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSPopUpButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -215,8 +223,6 @@
<dict>
<key>autohide_tabBar</key>
<string>NSButton</string>
- <key>checkBox_allowInactiveClosing</key>
- <string>NSButton</string>
<key>checkBox_animateDockIcon</key>
<string>NSButton</string>
<key>checkBox_badgeDockIcon</key>
@@ -227,6 +233,10 @@
<string>NSButton</string>
<key>checkBox_psychicOpen</key>
<string>NSButton</string>
+ <key>checkBox_showTabCount</key>
+ <string>NSButton</string>
+ <key>checkBox_unreadMentionCount</key>
+ <string>NSButton</string>
<key>popUp_minimumFontSize</key>
<string>NSPopUpButton</string>
<key>popUp_nameFormat</key>
@@ -235,6 +245,12 @@
<string>NSPopUpButton</string>
<key>popUp_windowPosition</key>
<string>NSPopUpButton</string>
+ <key>tabViewItem_group</key>
+ <string>NSTabViewItem</string>
+ <key>tabViewItem_regular</key>
+ <string>NSTabViewItem</string>
+ <key>tabView_messageType</key>
+ <string>NSTabView</string>
</dict>
<key>SUPERCLASS</key>
<string>AIAdvancedPreferencePane</string>
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/en.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib
Binary file Resources/en.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib has changed
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/en_GB.lproj/DualWindowMessageAdvanced.nib/classes.nib
--- a/Resources/en_GB.lproj/DualWindowMessageAdvanced.nib/classes.nib Mon Jun 01 22:46:44 2009 -0700
+++ b/Resources/en_GB.lproj/DualWindowMessageAdvanced.nib/classes.nib Tue Jun 02 13:27:18 2009 -0400
@@ -173,6 +173,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSTabView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSPopUpButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -215,8 +223,6 @@
<dict>
<key>autohide_tabBar</key>
<string>NSButton</string>
- <key>checkBox_allowInactiveClosing</key>
- <string>NSButton</string>
<key>checkBox_animateDockIcon</key>
<string>NSButton</string>
<key>checkBox_badgeDockIcon</key>
@@ -227,6 +233,10 @@
<string>NSButton</string>
<key>checkBox_psychicOpen</key>
<string>NSButton</string>
+ <key>checkBox_showTabCount</key>
+ <string>NSButton</string>
+ <key>checkBox_unreadMentionCount</key>
+ <string>NSButton</string>
<key>popUp_minimumFontSize</key>
<string>NSPopUpButton</string>
<key>popUp_nameFormat</key>
@@ -235,6 +245,12 @@
<string>NSPopUpButton</string>
<key>popUp_windowPosition</key>
<string>NSPopUpButton</string>
+ <key>tabViewItem_group</key>
+ <string>NSTabViewItem</string>
+ <key>tabViewItem_regular</key>
+ <string>NSTabViewItem</string>
+ <key>tabView_messageType</key>
+ <string>NSTabView</string>
</dict>
<key>SUPERCLASS</key>
<string>AIAdvancedPreferencePane</string>
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/en_GB.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib
Binary file Resources/en_GB.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib has changed
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/es.lproj/DualWindowMessageAdvanced.nib/classes.nib
--- a/Resources/es.lproj/DualWindowMessageAdvanced.nib/classes.nib Mon Jun 01 22:46:44 2009 -0700
+++ b/Resources/es.lproj/DualWindowMessageAdvanced.nib/classes.nib Tue Jun 02 13:27:18 2009 -0400
@@ -173,6 +173,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSTabView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSPopUpButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -215,8 +223,6 @@
<dict>
<key>autohide_tabBar</key>
<string>NSButton</string>
- <key>checkBox_allowInactiveClosing</key>
- <string>NSButton</string>
<key>checkBox_animateDockIcon</key>
<string>NSButton</string>
<key>checkBox_badgeDockIcon</key>
@@ -227,6 +233,10 @@
<string>NSButton</string>
<key>checkBox_psychicOpen</key>
<string>NSButton</string>
+ <key>checkBox_showTabCount</key>
+ <string>NSButton</string>
+ <key>checkBox_unreadMentionCount</key>
+ <string>NSButton</string>
<key>popUp_minimumFontSize</key>
<string>NSPopUpButton</string>
<key>popUp_nameFormat</key>
@@ -235,6 +245,12 @@
<string>NSPopUpButton</string>
<key>popUp_windowPosition</key>
<string>NSPopUpButton</string>
+ <key>tabViewItem_group</key>
+ <string>NSTabViewItem</string>
+ <key>tabViewItem_regular</key>
+ <string>NSTabViewItem</string>
+ <key>tabView_messageType</key>
+ <string>NSTabView</string>
</dict>
<key>SUPERCLASS</key>
<string>AIAdvancedPreferencePane</string>
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/es.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib
Binary file Resources/es.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib has changed
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/fi.lproj/DualWindowMessageAdvanced.nib/classes.nib
--- a/Resources/fi.lproj/DualWindowMessageAdvanced.nib/classes.nib Mon Jun 01 22:46:44 2009 -0700
+++ b/Resources/fi.lproj/DualWindowMessageAdvanced.nib/classes.nib Tue Jun 02 13:27:18 2009 -0400
@@ -173,6 +173,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSTabView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSPopUpButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -215,8 +223,6 @@
<dict>
<key>autohide_tabBar</key>
<string>NSButton</string>
- <key>checkBox_allowInactiveClosing</key>
- <string>NSButton</string>
<key>checkBox_animateDockIcon</key>
<string>NSButton</string>
<key>checkBox_badgeDockIcon</key>
@@ -227,6 +233,10 @@
<string>NSButton</string>
<key>checkBox_psychicOpen</key>
<string>NSButton</string>
+ <key>checkBox_showTabCount</key>
+ <string>NSButton</string>
+ <key>checkBox_unreadMentionCount</key>
+ <string>NSButton</string>
<key>popUp_minimumFontSize</key>
<string>NSPopUpButton</string>
<key>popUp_nameFormat</key>
@@ -235,6 +245,12 @@
<string>NSPopUpButton</string>
<key>popUp_windowPosition</key>
<string>NSPopUpButton</string>
+ <key>tabViewItem_group</key>
+ <string>NSTabViewItem</string>
+ <key>tabViewItem_regular</key>
+ <string>NSTabViewItem</string>
+ <key>tabView_messageType</key>
+ <string>NSTabView</string>
</dict>
<key>SUPERCLASS</key>
<string>AIAdvancedPreferencePane</string>
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/fi.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib
Binary file Resources/fi.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib has changed
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/fr.lproj/DualWindowMessageAdvanced.nib/classes.nib
--- a/Resources/fr.lproj/DualWindowMessageAdvanced.nib/classes.nib Mon Jun 01 22:46:44 2009 -0700
+++ b/Resources/fr.lproj/DualWindowMessageAdvanced.nib/classes.nib Tue Jun 02 13:27:18 2009 -0400
@@ -173,6 +173,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSTabView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSPopUpButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -215,8 +223,6 @@
<dict>
<key>autohide_tabBar</key>
<string>NSButton</string>
- <key>checkBox_allowInactiveClosing</key>
- <string>NSButton</string>
<key>checkBox_animateDockIcon</key>
<string>NSButton</string>
<key>checkBox_badgeDockIcon</key>
@@ -227,6 +233,10 @@
<string>NSButton</string>
<key>checkBox_psychicOpen</key>
<string>NSButton</string>
+ <key>checkBox_showTabCount</key>
+ <string>NSButton</string>
+ <key>checkBox_unreadMentionCount</key>
+ <string>NSButton</string>
<key>popUp_minimumFontSize</key>
<string>NSPopUpButton</string>
<key>popUp_nameFormat</key>
@@ -235,6 +245,12 @@
<string>NSPopUpButton</string>
<key>popUp_windowPosition</key>
<string>NSPopUpButton</string>
+ <key>tabViewItem_group</key>
+ <string>NSTabViewItem</string>
+ <key>tabViewItem_regular</key>
+ <string>NSTabViewItem</string>
+ <key>tabView_messageType</key>
+ <string>NSTabView</string>
</dict>
<key>SUPERCLASS</key>
<string>AIAdvancedPreferencePane</string>
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/fr.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib
Binary file Resources/fr.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib has changed
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/fr_CA.lproj/DualWindowMessageAdvanced.nib/classes.nib
--- a/Resources/fr_CA.lproj/DualWindowMessageAdvanced.nib/classes.nib Mon Jun 01 22:46:44 2009 -0700
+++ b/Resources/fr_CA.lproj/DualWindowMessageAdvanced.nib/classes.nib Tue Jun 02 13:27:18 2009 -0400
@@ -173,6 +173,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSTabView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSPopUpButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -215,8 +223,6 @@
<dict>
<key>autohide_tabBar</key>
<string>NSButton</string>
- <key>checkBox_allowInactiveClosing</key>
- <string>NSButton</string>
<key>checkBox_animateDockIcon</key>
<string>NSButton</string>
<key>checkBox_badgeDockIcon</key>
@@ -227,6 +233,10 @@
<string>NSButton</string>
<key>checkBox_psychicOpen</key>
<string>NSButton</string>
+ <key>checkBox_showTabCount</key>
+ <string>NSButton</string>
+ <key>checkBox_unreadMentionCount</key>
+ <string>NSButton</string>
<key>popUp_minimumFontSize</key>
<string>NSPopUpButton</string>
<key>popUp_nameFormat</key>
@@ -235,6 +245,12 @@
<string>NSPopUpButton</string>
<key>popUp_windowPosition</key>
<string>NSPopUpButton</string>
+ <key>tabViewItem_group</key>
+ <string>NSTabViewItem</string>
+ <key>tabViewItem_regular</key>
+ <string>NSTabViewItem</string>
+ <key>tabView_messageType</key>
+ <string>NSTabView</string>
</dict>
<key>SUPERCLASS</key>
<string>AIAdvancedPreferencePane</string>
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/fr_CA.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib
Binary file Resources/fr_CA.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib has changed
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/hu.lproj/DualWindowMessageAdvanced.nib/classes.nib
--- a/Resources/hu.lproj/DualWindowMessageAdvanced.nib/classes.nib Mon Jun 01 22:46:44 2009 -0700
+++ b/Resources/hu.lproj/DualWindowMessageAdvanced.nib/classes.nib Tue Jun 02 13:27:18 2009 -0400
@@ -173,6 +173,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSTabView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSPopUpButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -215,8 +223,6 @@
<dict>
<key>autohide_tabBar</key>
<string>NSButton</string>
- <key>checkBox_allowInactiveClosing</key>
- <string>NSButton</string>
<key>checkBox_animateDockIcon</key>
<string>NSButton</string>
<key>checkBox_badgeDockIcon</key>
@@ -227,6 +233,10 @@
<string>NSButton</string>
<key>checkBox_psychicOpen</key>
<string>NSButton</string>
+ <key>checkBox_showTabCount</key>
+ <string>NSButton</string>
+ <key>checkBox_unreadMentionCount</key>
+ <string>NSButton</string>
<key>popUp_minimumFontSize</key>
<string>NSPopUpButton</string>
<key>popUp_nameFormat</key>
@@ -235,6 +245,12 @@
<string>NSPopUpButton</string>
<key>popUp_windowPosition</key>
<string>NSPopUpButton</string>
+ <key>tabViewItem_group</key>
+ <string>NSTabViewItem</string>
+ <key>tabViewItem_regular</key>
+ <string>NSTabViewItem</string>
+ <key>tabView_messageType</key>
+ <string>NSTabView</string>
</dict>
<key>SUPERCLASS</key>
<string>AIAdvancedPreferencePane</string>
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/hu.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib
Binary file Resources/hu.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib has changed
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/is.lproj/DualWindowMessageAdvanced.nib/classes.nib
--- a/Resources/is.lproj/DualWindowMessageAdvanced.nib/classes.nib Mon Jun 01 22:46:44 2009 -0700
+++ b/Resources/is.lproj/DualWindowMessageAdvanced.nib/classes.nib Tue Jun 02 13:27:18 2009 -0400
@@ -173,6 +173,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSTabView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSPopUpButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -215,8 +223,6 @@
<dict>
<key>autohide_tabBar</key>
<string>NSButton</string>
- <key>checkBox_allowInactiveClosing</key>
- <string>NSButton</string>
<key>checkBox_animateDockIcon</key>
<string>NSButton</string>
<key>checkBox_badgeDockIcon</key>
@@ -227,6 +233,10 @@
<string>NSButton</string>
<key>checkBox_psychicOpen</key>
<string>NSButton</string>
+ <key>checkBox_showTabCount</key>
+ <string>NSButton</string>
+ <key>checkBox_unreadMentionCount</key>
+ <string>NSButton</string>
<key>popUp_minimumFontSize</key>
<string>NSPopUpButton</string>
<key>popUp_nameFormat</key>
@@ -235,6 +245,12 @@
<string>NSPopUpButton</string>
<key>popUp_windowPosition</key>
<string>NSPopUpButton</string>
+ <key>tabViewItem_group</key>
+ <string>NSTabViewItem</string>
+ <key>tabViewItem_regular</key>
+ <string>NSTabViewItem</string>
+ <key>tabView_messageType</key>
+ <string>NSTabView</string>
</dict>
<key>SUPERCLASS</key>
<string>AIAdvancedPreferencePane</string>
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/is.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib
Binary file Resources/is.lproj/DualWindowMessageAdvanced.nib/keyedobjects.nib has changed
diff -r 35f6b312d24c -r 8c9a502c1cec Resources/it.lproj/DualWindowMessageAdvanced.nib/classes.nib
--- a/Resources/it.lproj/DualWindowMessageAdvanced.nib/classes.nib Mon Jun 01 22:46:44 2009 -0700
+++ b/Resources/it.lproj/DualWindowMessageAdvanced.nib/classes.nib Tue Jun 02 13:27:18 2009 -0400
@@ -173,6 +173,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSTabView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSPopUpButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -215,8 +223,6 @@
<dict>
<key>autohide_tabBar</key>
<string>NSButton</string>
- <key>checkBox_allowInactiveClosing</key>
- <string>NSButton</string>
<key>checkBox_animateDockIcon</key>
<string>NSButton</string>
<key>checkBox_badgeDockIcon</key>
@@ -227,6 +233,10 @@
<string>NSButton</string>
<key>checkBox_psychicOpen</key>
<string>NSButton</string>
More information about the commits
mailing list