[Adium-commits] adium 2008:07f303adc40d: This isn't quite as pretty, but it matc...
adium-commits at adiumx.com
adium-commits at adiumx.com
Tue Apr 28 06:53:08 UTC 2009
details: http://hg.adiumx.com/adium/rev/07f303adc40d
revision: 2008:07f303adc40d
author: David Smith <catfish.man at gmail.com>
date: Mon Apr 27 23:36:54 2009 -0700
This isn't quite as pretty, but it matches Mail.app better
Subject: adium 2009:89ea4430edf9: Remove the acceptsFirstMouse property from AIAlternatingRowTableView, since the one use of it was (imo) not a good one. Also convert that use over to an NSTableView
details: http://hg.adiumx.com/adium/rev/89ea4430edf9
revision: 2009:89ea4430edf9
author: David Smith <catfish.man at gmail.com>
date: Mon Apr 27 23:50:36 2009 -0700
Remove the acceptsFirstMouse property from AIAlternatingRowTableView, since the one use of it was (imo) not a good one. Also convert that use over to an NSTableView
Subject: adium 2010:d30703953cf5: Actually move this to NSTableView
details: http://hg.adiumx.com/adium/rev/d30703953cf5
revision: 2010:d30703953cf5
author: David Smith <catfish.man at gmail.com>
date: Mon Apr 27 23:52:39 2009 -0700
Actually move this to NSTableView
diffstat:
Frameworks/AIUtilities Framework/Source/AIAlternatingRowTableView.h | 3 -
Frameworks/AIUtilities Framework/Source/AIAlternatingRowTableView.m | 9 -
Plugins/Emoticons/AIEmoticonPackPreviewTableView.h | 4 +-
Plugins/Emoticons/AIEmoticonPreferences.m | 1 -
Plugins/Emoticons/EmoticonPrefs.nib/classes.nib | 300 +++++++--
Plugins/Emoticons/EmoticonPrefs.nib/info.nib | 18 +-
Plugins/Emoticons/EmoticonPrefs.nib/keyedobjects.nib |
Resources/en.lproj/AIAdvancedInspectorPane.nib/classes.nib | 54 +-
Resources/en.lproj/AIAdvancedInspectorPane.nib/keyedobjects.nib |
Source/AIAdvancedInspectorPane.h | 2 +-
Source/AIAdvancedInspectorPane.m | 1 -
11 files changed, 290 insertions(+), 102 deletions(-)
diffs (533 lines):
diff -r 2c261bad5dd4 -r d30703953cf5 Frameworks/AIUtilities Framework/Source/AIAlternatingRowTableView.h
--- a/Frameworks/AIUtilities Framework/Source/AIAlternatingRowTableView.h Mon Apr 27 23:21:18 2009 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AIAlternatingRowTableView.h Mon Apr 27 23:52:39 2009 -0700
@@ -21,12 +21,9 @@
*
*/
@interface AIAlternatingRowTableView : NSTableView {
- BOOL acceptsFirstMouse;
BOOL drawsGradientSelection;
}
- at property (readwrite, nonatomic) BOOL acceptsFirstMouse;
-
@property (readwrite, nonatomic) BOOL drawsGradientSelection;
@end
diff -r 2c261bad5dd4 -r d30703953cf5 Frameworks/AIUtilities Framework/Source/AIAlternatingRowTableView.m
--- a/Frameworks/AIUtilities Framework/Source/AIAlternatingRowTableView.m Mon Apr 27 23:21:18 2009 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AIAlternatingRowTableView.m Mon Apr 27 23:52:39 2009 -0700
@@ -53,7 +53,6 @@
- (void)_initAlternatingRowTableView
{
- self.acceptsFirstMouse = NO;
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(alternatingRowTableViewSelectionDidChange:)
name:NSTableViewSelectionDidChangeNotification
@@ -99,14 +98,6 @@
return drawsGradientSelection;
}
-// First mouse ----------------------------------------------------------------------
- at synthesize acceptsFirstMouse;
-
-- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent
-{
- return self.acceptsFirstMouse;
-}
-
//Allow our delegate to specify context menus
- (NSMenu *)menuForEvent:(NSEvent *)theEvent
{
diff -r 2c261bad5dd4 -r d30703953cf5 Plugins/Emoticons/AIEmoticonPackPreviewTableView.h
--- a/Plugins/Emoticons/AIEmoticonPackPreviewTableView.h Mon Apr 27 23:21:18 2009 -0700
+++ b/Plugins/Emoticons/AIEmoticonPackPreviewTableView.h Mon Apr 27 23:52:39 2009 -0700
@@ -14,9 +14,7 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <AIUtilities/AIAlternatingRowTableView.h>
-
- at interface AIEmoticonPackPreviewTableView : AIAlternatingRowTableView {
+ at interface AIEmoticonPackPreviewTableView : NSTableView {
}
diff -r 2c261bad5dd4 -r d30703953cf5 Plugins/Emoticons/AIEmoticonPreferences.m
--- a/Plugins/Emoticons/AIEmoticonPreferences.m Mon Apr 27 23:21:18 2009 -0700
+++ b/Plugins/Emoticons/AIEmoticonPreferences.m Mon Apr 27 23:52:39 2009 -0700
@@ -76,7 +76,6 @@
[table_emoticonPacks registerForDraggedTypes:[NSArray arrayWithObject:EMOTICON_PACK_DRAG_TYPE]];
//Configure the outline view
- [table_emoticonPacks setDrawsGradientSelection:YES];
[[table_emoticonPacks tableColumnWithIdentifier:@"Emoticons"] setDataCell:[[[AIGenericViewCell alloc] init] autorelease]];
[table_emoticonPacks selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO];
[table_emoticonPacks setToolTip:EMOTICON_PACKS_TOOLTIP];
diff -r 2c261bad5dd4 -r d30703953cf5 Plugins/Emoticons/EmoticonPrefs.nib/classes.nib
--- a/Plugins/Emoticons/EmoticonPrefs.nib/classes.nib Mon Apr 27 23:21:18 2009 -0700
+++ b/Plugins/Emoticons/EmoticonPrefs.nib/classes.nib Mon Apr 27 23:52:39 2009 -0700
@@ -1,73 +1,227 @@
-{
- IBClasses = (
- {
- CLASS = AIAlternatingRowOutlineView;
- LANGUAGE = ObjC;
- SUPERCLASS = NSOutlineView;
- },
- {
- CLASS = AIAlternatingRowTableView;
- LANGUAGE = ObjC;
- SUPERCLASS = NSTableView;
- },
- {CLASS = AIAutoScrollView; LANGUAGE = ObjC; SUPERCLASS = NSScrollView; },
- {CLASS = AICheckboxList; LANGUAGE = ObjC; SUPERCLASS = NSScrollView; },
- {
- CLASS = AIEmoticonPackPreviewTableView;
- LANGUAGE = ObjC;
- SUPERCLASS = AIAlternatingRowTableView;
- },
- {
- CLASS = AIEmoticonPreferences;
- LANGUAGE = ObjC;
- OUTLETS = {
- "button_OK" = NSButton;
- "table_emoticonPacks" = AIAlternatingRowTableView;
- "table_emoticons" = AIAlternatingRowTableView;
- "textField_packTitle" = NSTextField;
- };
- SUPERCLASS = AIWindowController;
- },
- {
- CLASS = AILocalizationButton;
- LANGUAGE = ObjC;
- OUTLETS = {
- "view_anchorToLeftSide" = NSView;
- "view_anchorToRightSide" = NSView;
- "window_anchorOnLeftSide" = NSWindow;
- "window_anchorOnRightSide" = NSWindow;
- };
- SUPERCLASS = NSButton;
- },
- {CLASS = AIPlasticButton; LANGUAGE = ObjC; SUPERCLASS = NSButton; },
- {
- ACTIONS = {changePreference = id; };
- CLASS = AIPreferencePane;
- LANGUAGE = ObjC;
- OUTLETS = {
- delegate = id;
- plugin = id;
- "textField_title" = NSTextField;
- view = NSView;
- "view_containerSubView" = NSView;
- "view_containerView" = NSView;
- };
- SUPERCLASS = NSObject;
- },
- {
- CLASS = AIVariableRowHeightOutlineView;
- LANGUAGE = ObjC;
- SUPERCLASS = AIAlternatingRowOutlineView;
- },
- {
- ACTIONS = {closeWindow = id; };
- CLASS = AIWindowController;
- LANGUAGE = ObjC;
- SUPERCLASS = NSWindowController;
- },
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {CLASS = NSButton; LANGUAGE = ObjC; SUPERCLASS = NSControl; },
- {CLASS = NSObject; LANGUAGE = ObjC; }
- );
- IBVersion = 1;
-}
\ No newline at end of file
+<?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>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>CLASS</key>
+ <string>NSTextField</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSControl</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>RBSplitSubview</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSMenu</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</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>NSScrollView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>AIEmoticonPreferences</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>button_OK</key>
+ <string>NSButton</string>
+ <key>table_emoticonPacks</key>
+ <string>AIAlternatingRowTableView</string>
+ <key>table_emoticons</key>
+ <string>AIAlternatingRowTableView</string>
+ <key>textField_packTitle</key>
+ <string>NSTextField</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>AIWindowController</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>FirstResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSCell</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</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>AIEmoticonPackPreviewTableView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSTableView</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>closeWindow</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>AIWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSWindowController</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>AIAlternatingRowTableView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSTableView</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>
+ <dict>
+ <key>CLASS</key>
+ <string>NSTableView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSControl</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
diff -r 2c261bad5dd4 -r d30703953cf5 Plugins/Emoticons/EmoticonPrefs.nib/info.nib
--- a/Plugins/Emoticons/EmoticonPrefs.nib/info.nib Mon Apr 27 23:21:18 2009 -0700
+++ b/Plugins/Emoticons/EmoticonPrefs.nib/info.nib Mon Apr 27 23:52:39 2009 -0700
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>IBDocumentLocation</key>
- <string>69 57 356 240 0 0 1280 832 </string>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>677</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../../Adium.xcodeproj</string>
+ <key>IBOldestOS</key>
+ <integer>5</integer>
<key>IBOpenObjects</key>
<array>
- <integer>160</integer>
+ <integer>161</integer>
</array>
<key>IBSystem Version</key>
- <string>8L127</string>
- <key>IBUsesTextArchiving</key>
- <true/>
+ <string>9G55</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
</dict>
</plist>
diff -r 2c261bad5dd4 -r d30703953cf5 Plugins/Emoticons/EmoticonPrefs.nib/keyedobjects.nib
Binary file Plugins/Emoticons/EmoticonPrefs.nib/keyedobjects.nib has changed
diff -r 2c261bad5dd4 -r d30703953cf5 Resources/en.lproj/AIAdvancedInspectorPane.nib/classes.nib
--- a/Resources/en.lproj/AIAdvancedInspectorPane.nib/classes.nib Mon Apr 27 23:21:18 2009 -0700
+++ b/Resources/en.lproj/AIAdvancedInspectorPane.nib/classes.nib Mon Apr 27 23:52:39 2009 -0700
@@ -42,6 +42,14 @@
<string>NSView</string>
</dict>
<dict>
+ <key>CLASS</key>
+ <string>NSMenu</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
<key>ACTIONS</key>
<dict>
<key>adiumPrint</key>
@@ -97,6 +105,22 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSMenuItem</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>FirstResponder</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -122,7 +146,7 @@
<key>OUTLETS</key>
<dict>
<key>accountsTableView</key>
- <string>AIAlternatingRowTableView</string>
+ <string>NSTableView</string>
<key>checkBox_alwaysShow</key>
<string>NSButton</string>
<key>checkBox_autoJoin</key>
@@ -145,6 +169,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSCell</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSButton</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -153,11 +185,19 @@
</dict>
<dict>
<key>CLASS</key>
- <string>AIAlternatingRowTableView</string>
+ <string>NSPopUpButton</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
- <string>NSTableView</string>
+ <string>NSButton</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSPopUpButtonCell</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSMenuItemCell</string>
</dict>
<dict>
<key>CLASS</key>
@@ -199,6 +239,14 @@
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSTableView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSControl</string>
+ </dict>
</array>
<key>IBVersion</key>
<string>1</string>
diff -r 2c261bad5dd4 -r d30703953cf5 Resources/en.lproj/AIAdvancedInspectorPane.nib/keyedobjects.nib
Binary file Resources/en.lproj/AIAdvancedInspectorPane.nib/keyedobjects.nib has changed
diff -r 2c261bad5dd4 -r d30703953cf5 Source/AIAdvancedInspectorPane.h
--- a/Source/AIAdvancedInspectorPane.h Mon Apr 27 23:21:18 2009 -0700
+++ b/Source/AIAdvancedInspectorPane.h Mon Apr 27 23:52:39 2009 -0700
@@ -14,7 +14,7 @@
@interface AIAdvancedInspectorPane : NSObject <AIContentInspectorPane, AIAccountMenuDelegate> {
IBOutlet NSView *inspectorContentView;
- IBOutlet AIAlternatingRowTableView *accountsTableView;
+ IBOutlet NSTableView *accountsTableView;
IBOutlet NSTableColumn *contactsColumn;
IBOutlet NSTextField *label_account;
diff -r 2c261bad5dd4 -r d30703953cf5 Source/AIAdvancedInspectorPane.m
--- a/Source/AIAdvancedInspectorPane.m Mon Apr 27 23:21:18 2009 -0700
+++ b/Source/AIAdvancedInspectorPane.m Mon Apr 27 23:52:39 2009 -0700
@@ -51,7 +51,6 @@
//Configure Table view
[accountsTableView setUsesAlternatingRowBackgroundColors:YES];
- [accountsTableView setAcceptsFirstMouse:YES];
//[[[accountsTableView tableColumnWithIdentifier:@"account"] headerCell] setTitle:AILocalizedString(@"Account",nil)];
[[[accountsTableView tableColumnWithIdentifier:@"contact"] headerCell] setTitle:AILocalizedString(@"Contact","This header for the table in the Accounts tab of the Get Info window indicates the name of the contact within a metacontact")];
More information about the commits
mailing list