From: <ho...@us...> - 2009-12-07 12:01:38
|
Revision: 16280 http://bibdesk.svn.sourceforge.net/bibdesk/?rev=16280&view=rev Author: hofman Date: 2009-12-07 12:01:29 +0000 (Mon, 07 Dec 2009) Log Message: ----------- Simplify image popup button. Use image and its size from the first menu item, as NSPopUpButton does. Just draw the button cell with the image and draw the arrow separately if needed. Modified Paths: -------------- trunk/bibdesk/BDSKButtonBar.m trunk/bibdesk/BDSKImagePopUpButton.h trunk/bibdesk/BDSKImagePopUpButton.m trunk/bibdesk/BDSKImagePopUpButtonCell.h trunk/bibdesk/BDSKImagePopUpButtonCell.m trunk/bibdesk/BDSKMainTableView.m trunk/bibdesk/BibDocument.m trunk/bibdesk/English.lproj/BibDocument.xib Modified: trunk/bibdesk/BDSKButtonBar.m =================================================================== --- trunk/bibdesk/BDSKButtonBar.m 2009-12-07 07:34:53 UTC (rev 16279) +++ trunk/bibdesk/BDSKButtonBar.m 2009-12-07 12:01:29 UTC (rev 16280) @@ -182,12 +182,10 @@ if (overflowButton == nil) { overflowButton = [[BDSKImagePopUpButton alloc] initWithFrame:NSZeroRect pullsDown:YES]; [[overflowButton cell] setArrowPosition:NSPopUpNoArrow]; - [[overflowButton cell] setUsesItemFromMenu:NO]; [[overflowButton cell] setAltersStateOfSelectedItem:NO]; [[overflowButton cell] setBackgroundStyle:NSBackgroundStyleRaised]; [overflowButton addItemWithTitle:@""]; - [overflowButton setIcon:[NSImage imageNamed:@"Overflow"]]; - [overflowButton setIconSize:[[overflowButton icon] size]]; + [[overflowButton itemAtIndex:0] setImage:[NSImage imageNamed:@"Overflow"]]; [overflowButton sizeToFit]; } else { while ([overflowButton numberOfItems] > 1) Modified: trunk/bibdesk/BDSKImagePopUpButton.h =================================================================== --- trunk/bibdesk/BDSKImagePopUpButton.h 2009-12-07 07:34:53 UTC (rev 16279) +++ trunk/bibdesk/BDSKImagePopUpButton.h 2009-12-07 12:01:29 UTC (rev 16280) @@ -41,11 +41,4 @@ @interface BDSKImagePopUpButton : NSPopUpButton - -- (NSImage *)icon; -- (void)setIcon:(NSImage *)anImage; - -- (NSSize)iconSize; -- (void)setIconSize:(NSSize)newIconSize; - @end Modified: trunk/bibdesk/BDSKImagePopUpButton.m =================================================================== --- trunk/bibdesk/BDSKImagePopUpButton.m 2009-12-07 07:34:53 UTC (rev 16279) +++ trunk/bibdesk/BDSKImagePopUpButton.m 2009-12-07 12:01:29 UTC (rev 16280) @@ -52,11 +52,10 @@ if (self = [super initWithCoder:coder]) { if ([[self cell] isKindOfClass:[[self class] cellClass]] == NO) { id oldCell = [self cell]; - id cell = [[[[[self class] cellClass] alloc] initImageCell:[oldCell image]] autorelease]; + id cell = [[[[[self class] cellClass] alloc] initTextCell:@"" pullsDown:NO] autorelease]; [cell setEnabled:[oldCell isEnabled]]; [cell setShowsFirstResponder:[oldCell showsFirstResponder]]; - [cell setUsesItemFromMenu:[oldCell usesItemFromMenu]]; [cell setArrowPosition:[oldCell arrowPosition]]; [cell setMenu:[oldCell menu]]; @@ -66,20 +65,4 @@ return self; } -- (NSImage *)icon { - return [[self cell] icon]; -} - -- (void)setIcon:(NSImage *)anImage { - [[self cell] setIcon:anImage]; -} - -- (NSSize)iconSize { - return [[self cell] iconSize]; -} - -- (void)setIconSize:(NSSize)newIconSize { - [[self cell] setIconSize:newIconSize]; -} - @end Modified: trunk/bibdesk/BDSKImagePopUpButtonCell.h =================================================================== --- trunk/bibdesk/BDSKImagePopUpButtonCell.h 2009-12-07 07:34:53 UTC (rev 16279) +++ trunk/bibdesk/BDSKImagePopUpButtonCell.h 2009-12-07 12:01:29 UTC (rev 16280) @@ -39,19 +39,7 @@ #import <Cocoa/Cocoa.h> -@interface BDSKImagePopUpButtonCell : NSPopUpButtonCell -{ +@interface BDSKImagePopUpButtonCell : NSPopUpButtonCell { NSButtonCell *buttonCell; - NSImage *icon; - NSSize iconSize; } - -+ (NSImage *)arrowImage; - -- (NSImage *)icon; -- (void)setIcon:(NSImage *)anImage; - -- (NSSize)iconSize; -- (void)setIconSize:(NSSize)newIconSize; - @end Modified: trunk/bibdesk/BDSKImagePopUpButtonCell.m =================================================================== --- trunk/bibdesk/BDSKImagePopUpButtonCell.m 2009-12-07 07:34:53 UTC (rev 16279) +++ trunk/bibdesk/BDSKImagePopUpButtonCell.m 2009-12-07 12:01:29 UTC (rev 16280) @@ -43,43 +43,21 @@ @implementation BDSKImagePopUpButtonCell -+ (NSImage *)arrowImage { - static NSImage *arrowImage = nil; - if (arrowImage == nil) { - arrowImage = [[NSImage alloc] initWithSize:NSMakeSize(7.0, 5.0)]; - [arrowImage lockFocus]; - NSBezierPath *path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(0.5, 5.0)]; - [path lineToPoint:NSMakePoint(6.5, 5.0)]; - [path lineToPoint:NSMakePoint(3.5, 0.0)]; - [path closePath]; - [[NSColor colorWithCalibratedWhite:0.0 alpha:0.75] setFill]; - [path fill]; - [arrowImage unlockFocus]; - } - return arrowImage; -} - - (void)makeButtonCell { buttonCell = [[NSButtonCell allocWithZone:[self zone]] initTextCell: @""]; [buttonCell setBordered: NO]; [buttonCell setHighlightsBy: NSContentsCellMask]; [buttonCell setImagePosition: NSImageLeft]; + [buttonCell setImageScaling:NSImageScaleProportionallyDown]; [buttonCell setEnabled:[self isEnabled]]; [buttonCell setShowsFirstResponder:[self showsFirstResponder]]; } -// this used to be the designated intializer +// we should always be unbordered and pulldown - (id)initTextCell:(NSString *)stringValue pullsDown:(BOOL)pullsDown{ - return [self initImageCell:nil]; -} - -// this is now the designated intializer -- (id)initImageCell:(NSImage *)anImage{ - if (self = [super initTextCell:@"" pullsDown:YES]) { + if (self = [super initTextCell:stringValue pullsDown:YES]) { [self makeButtonCell]; - icon = [anImage retain]; - iconSize = icon ? [icon size] : NSMakeSize(32.0, 32.0); + [self setBordered:NO]; } return self; @@ -88,64 +66,26 @@ - (id)initWithCoder:(NSCoder *)coder{ if (self = [super initWithCoder:coder]) { [self makeButtonCell]; - icon = [[coder decodeObjectForKey:@"icon"] retain]; - iconSize = [coder decodeSizeForKey:@"iconSize"]; + [self setBordered:NO]; // hack to always get regular controls in a toolbar customization palette, there should be a better way [self setControlSize:NSRegularControlSize]; } return self; } -- (void)encodeWithCoder:(NSCoder *)encoder{ - [super encodeWithCoder:encoder]; - [encoder encodeObject:icon forKey:@"icon"]; - [encoder encodeSize:iconSize forKey:@"iconSize"]; -} - - (id)copyWithZone:(NSZone *)aZone { BDSKImagePopUpButtonCell *copy = [super copyWithZone:aZone]; [copy makeButtonCell]; - copy->icon = [icon copyWithZone:aZone]; - copy->iconSize = iconSize; return copy; } - (void)dealloc{ BDSKDESTROY(buttonCell); - BDSKDESTROY(icon); [super dealloc]; } #pragma mark Accessors -- (NSSize)iconSize { - return iconSize; -} - -- (void)setIconSize:(NSSize)newIconSize { - if (NSEqualSizes(iconSize, newIconSize) == NO) { - iconSize = newIconSize; - [buttonCell setImage:nil]; - } -} - -- (NSImage *)icon { - return icon; -} - -- (void)setIcon:(NSImage *)anImage{ - if (icon != anImage) { - [icon release]; - icon = [anImage retain]; - [buttonCell setImage:nil]; // invalidate the image - } -} - -- (void)setArrowPosition:(NSPopUpArrowPosition)position { - [super setArrowPosition:position]; - [buttonCell setImage:nil]; // invalidate the image -} - - (void)setEnabled:(BOOL)flag { [super setEnabled:flag]; [buttonCell setEnabled:flag]; @@ -156,80 +96,67 @@ [buttonCell setShowsFirstResponder:flag]; } -- (void)setUsesItemFromMenu:(BOOL)flag{ - [super setUsesItemFromMenu:flag]; - [buttonCell setImage:nil]; // invalidate the image -} - -- (void)setControlSize:(NSControlSize)size { - [super setControlSize:size]; - [buttonCell setImage:nil]; // invalidate the image -} - - (void)setBackgroundStyle:(NSBackgroundStyle)style { [super setBackgroundStyle:style]; [buttonCell setBackgroundStyle:style]; - [buttonCell setImage:nil]; // invalidate the image } #pragma mark Drawing and highlighting -- (NSSize)iconDrawSize { - NSSize size = iconSize; +- (NSSize)cellSize { + [buttonCell setImage:[self numberOfItems] ? [[self itemAtIndex:0] image] : nil]; + NSSize size = [buttonCell cellSize]; if ([self controlSize] != NSRegularControlSize) { - // for small and mini controls we just scale the icon by 75% - size = NSMakeSize(size.width * 0.75, size.height * 0.75); - } - return size; + size = NSMakeSize(round(0.75 * size.width), round(0.75 * size.height)); + if ([self arrowPosition] != NSPopUpNoArrow) + size.width += 5.0; + } else if ([self arrowPosition] != NSPopUpNoArrow) { + size.width += 7.0; + } + return size; } -- (NSSize)cellSize { - NSSize size = [self iconDrawSize]; - if ([self arrowPosition] != NSPopUpNoArrow) { - size.width += [[[self class] arrowImage] size].width; - } - return size; -} - -- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView{ - if ([buttonCell image] == nil || [self usesItemFromMenu]) { - // we need to redraw the image - - NSImage *img = [self usesItemFromMenu] ? [[self selectedItem] image] : [self icon]; - NSImage *popUpImage = nil; - NSSize drawSize = [self iconDrawSize]; - - if ([self arrowPosition] == NSPopUpNoArrow && NSEqualSizes([img size], drawSize)) { - popUpImage = [img retain]; +- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView{ + NSRect arrowRect = NSZeroRect, rect = cellFrame; + CGFloat arrowWidth = [self controlSize] == NSRegularControlSize ? 7.0 : 5.0; + + if ([self arrowPosition] != NSPopUpNoArrow) + NSDivideRect(rect, &arrowRect, &rect, arrowWidth, NSMaxXEdge); + + [buttonCell setImage:[self numberOfItems] ? [[self itemAtIndex:0] image] : nil]; + [buttonCell drawWithFrame:rect inView:controlView]; + + if (NSIsEmptyRect(arrowRect) == NO) { + NSBezierPath *path = [NSBezierPath bezierPath]; + if ([self controlSize] == NSRegularControlSize) { + if ([controlView isFlipped]) { + [path moveToPoint:NSMakePoint(NSMinX(arrowRect) + 0.5, NSMaxY(arrowRect) - 6.0)]; + [path relativeLineToPoint:NSMakePoint(6.0, 0.0)]; + [path relativeLineToPoint:NSMakePoint(-3.0, 5.0)]; + } else { + [path moveToPoint:NSMakePoint(NSMinX(arrowRect) + 0.5, NSMinY(arrowRect) + 6.0)]; + [path relativeLineToPoint:NSMakePoint(6.0, 0.0)]; + [path relativeLineToPoint:NSMakePoint(-3.0, -5.0)]; + } } else { - NSRect iconRect = NSZeroRect; - NSRect iconDrawRect = NSZeroRect; - NSRect arrowRect = NSZeroRect; - NSRect arrowDrawRect = NSZeroRect; - - iconRect.size = [img size]; - iconDrawRect.size = drawSize; - if ([self arrowPosition] != NSPopUpNoArrow) { - arrowRect.size = arrowDrawRect.size = [[[self class] arrowImage] size]; - arrowDrawRect.origin = NSMakePoint(NSWidth(iconDrawRect), 1.0); - drawSize.width += NSWidth(arrowRect); + if ([controlView isFlipped]) { + [path moveToPoint:NSMakePoint(NSMinX(arrowRect) + 0.5, NSMaxY(arrowRect) - 4.0)]; + [path relativeLineToPoint:NSMakePoint(4.0, 0.0)]; + [path relativeLineToPoint:NSMakePoint(-2.0, 3.0)]; + } else { + [path moveToPoint:NSMakePoint(NSMinX(arrowRect) + 0.5, NSMinY(arrowRect) + 4.0)]; + [path relativeLineToPoint:NSMakePoint(4.0, 0.0)]; + [path relativeLineToPoint:NSMakePoint(-2.0, -3.0)]; } - - popUpImage = [[NSImage alloc] initWithSize: drawSize]; - [popUpImage lockFocus]; - if (img) - [img drawInRect: iconDrawRect fromRect: iconRect operation: NSCompositeSourceOver fraction: 1.0]; - if ([self arrowPosition] != NSPopUpNoArrow) - [[[self class] arrowImage] drawInRect: arrowDrawRect fromRect: arrowRect operation: NSCompositeSourceOver fraction: 1.0]; - [popUpImage unlockFocus]; } - - [buttonCell setImage: popUpImage]; - [popUpImage release]; + [path closePath]; + [[NSColor colorWithCalibratedWhite:0.0 alpha:0.75] setFill]; + [NSGraphicsContext saveGraphicsState]; + if ([self showsFirstResponder]) + NSSetFocusRingStyle(NSFocusRingBelow); + [path fill]; + [NSGraphicsContext restoreGraphicsState]; } - // NSLog(@"cellFrame: %@ selectedItem: %@", NSStringFromRect(cellFrame), [[self selectedItem] title]); - - [buttonCell drawWithFrame: cellFrame inView: controlView]; } - (void)highlight:(BOOL)flag withFrame:(NSRect)cellFrame inView:(NSView *)controlView{ Modified: trunk/bibdesk/BDSKMainTableView.m =================================================================== --- trunk/bibdesk/BDSKMainTableView.m 2009-12-07 07:34:53 UTC (rev 16279) +++ trunk/bibdesk/BDSKMainTableView.m 2009-12-07 12:01:29 UTC (rev 16280) @@ -135,11 +135,8 @@ NSRect cornerViewFrame = [[self cornerView] frame]; BDSKImagePopUpButton *cornerViewButton = [[BDSKImagePopUpButton alloc] initWithFrame:cornerViewFrame]; [cornerViewButton setPullsDown:YES]; - [cornerViewButton setIconSize:cornerViewFrame.size]; - [cornerViewButton setIcon:[[self class] cornerColumnsImage]]; [[cornerViewButton cell] setArrowPosition:NSPopUpNoArrow]; [[cornerViewButton cell] setAltersStateOfSelectedItem:NO]; - [[cornerViewButton cell] setUsesItemFromMenu:NO]; [self setCornerView:cornerViewButton]; [cornerViewButton release]; @@ -676,10 +673,11 @@ [item setState:NSOnState]; } - if ([[self cornerView] isKindOfClass:[BDSKImagePopUpButton class]] && menu != nil) { + if ([[self cornerView] isKindOfClass:[NSPopUpButton class]] && menu != nil) { menu = [self columnsMenu]; // this is already a copy - [menu insertItemWithTitle:@"" action:NULL keyEquivalent:@"" atIndex:0]; - [(BDSKImagePopUpButton *)[self cornerView] setMenu:menu]; + item = [menu insertItemWithTitle:@"" action:NULL keyEquivalent:@"" atIndex:0]; + [item setImage:[[self class] cornerColumnsImage]]; + [(NSPopUpButton *)[self cornerView] setMenu:menu]; } } Modified: trunk/bibdesk/BibDocument.m =================================================================== --- trunk/bibdesk/BibDocument.m 2009-12-07 07:34:53 UTC (rev 16279) +++ trunk/bibdesk/BibDocument.m 2009-12-07 12:01:29 UTC (rev 16280) @@ -523,11 +523,9 @@ // ImagePopUpButtons setup [[actionMenuButton cell] setAltersStateOfSelectedItem:NO]; - [[actionMenuButton cell] setUsesItemFromMenu:NO]; [actionMenuButton setMenu:actionMenu]; [[groupActionMenuButton cell] setAltersStateOfSelectedItem:NO]; - [[groupActionMenuButton cell] setUsesItemFromMenu:NO]; [groupActionMenuButton setMenu:groupMenu]; // array of BDSKSharedGroup objects and zeroconf support, doesn't do anything when already enabled Modified: trunk/bibdesk/English.lproj/BibDocument.xib =================================================================== --- trunk/bibdesk/English.lproj/BibDocument.xib 2009-12-07 07:34:53 UTC (rev 16279) +++ trunk/bibdesk/English.lproj/BibDocument.xib 2009-12-07 12:01:29 UTC (rev 16280) @@ -1286,7 +1286,7 @@ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> </object> <object class="NSCustomView" id="612415563"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1295,6 +1295,7 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{106, 20}, {190, 22}}</string> <reference key="NSSuperview" ref="612415563"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSSearchFieldCell" key="NSCell" id="303864505"> <int key="NSCellFlags">343014976</int> @@ -1361,13 +1362,14 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 16}, {39, 32}}</string> <reference key="NSSuperview" ref="612415563"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="328378999"> <int key="NSCellFlags">-2076049920</int> <int key="NSCellFlags2">0</int> <reference key="NSSupport" ref="546091473"/> <reference key="NSControlView" ref="783583270"/> - <int key="NSButtonFlags">100679935</int> + <int key="NSButtonFlags">104874239</int> <int key="NSButtonFlags2">2</int> <string key="NSAlternateContents"/> <object class="NSMutableString" key="NSKeyEquivalent"> @@ -1382,7 +1384,7 @@ <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> - <object class="NSCustomResource" key="NSImage"> + <object class="NSCustomResource" key="NSImage" id="967259013"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">gear</string> </object> @@ -1411,6 +1413,7 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{61, 16}, {39, 32}}</string> <reference key="NSSuperview" ref="612415563"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="797536204"> <int key="NSCellFlags">-2076049920</int> @@ -1432,7 +1435,7 @@ <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> - <object class="NSCustomResource" key="NSImage"> + <object class="NSCustomResource" key="NSImage" id="234053746"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">gear2</string> </object> @@ -1458,6 +1461,8 @@ </object> </object> <string key="NSFrameSize">{316, 66}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> <string key="NSExtension">NSResponder</string> </object> @@ -1470,6 +1475,7 @@ <string key="NSTitle"/> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSImage" ref="967259013"/> <reference key="NSOnImage" ref="530244347"/> <reference key="NSMixedImage" ref="555694585"/> </object> @@ -1704,6 +1710,7 @@ <string key="NSTitle"/> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSImage" ref="234053746"/> <reference key="NSOnImage" ref="530244347"/> <reference key="NSMixedImage" ref="555694585"/> </object> @@ -4650,6 +4657,7 @@ <string>1117.ImportedFromIB2</string> <string>432.IBPluginDependency</string> <string>432.ImportedFromIB2</string> + <string>433.IBEditorWindowLastContentRect</string> <string>433.IBPluginDependency</string> <string>433.ImportedFromIB2</string> <string>434.IBPluginDependency</string> @@ -5026,6 +5034,7 @@ <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> + <string>{{0, 387}, {272, 447}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5076,7 +5085,7 @@ <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> - <string>{{84, 367}, {311, 353}}</string> + <string>{{84, 353}, {311, 367}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5231,7 +5240,7 @@ <object class="IBPartialClassDescription"> <string key="className">BDSKGroupOutlineView</string> <string key="superclassName">BDSKOutlineView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="634159805"> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">BDSKGroupOutlineView.h</string> </object> @@ -5288,7 +5297,7 @@ <string>id</string> </object> </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1048304600"> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">BDSKMainTableView.h</string> </object> @@ -5335,7 +5344,7 @@ <string>id</string> </object> </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="390963115"> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">BDSKOutlineView.h</string> </object> @@ -5385,7 +5394,7 @@ <string>id</string> </object> </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="10101253"> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">BDSKStatusBar.h</string> </object> @@ -5438,7 +5447,7 @@ <string>id</string> </object> </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="792832204"> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">BDSKTableView.h</string> </object> @@ -5569,7 +5578,6 @@ <string>revealLinkedFile:</string> <string>revealLocalURL:</string> <string>search:</string> - <string>searchByContent:</string> <string>selectAllPublications:</string> <string>selectCrossrefParentAction:</string> <string>selectDuplicates:</string> @@ -5673,7 +5681,6 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -5975,14 +5982,12 @@ <string>changeSearchType:</string> <string>makeSearchFieldKey:</string> <string>search:</string> - <string>searchByContent:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -6113,13 +6118,6 @@ </object> <object class="IBPartialClassDescription"> <string key="className">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="573718155"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKFieldEditor.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSControl</string> <string key="superclassName">NSView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBUserSource</string> @@ -6157,20 +6155,6 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKCitationFormatter.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKComplexStringFormatter.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> <string key="minorKey">BDSKDocumentSearch.h</string> </object> </object> @@ -6178,121 +6162,6 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKDragImageView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKDragTextField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKDragWindow.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKEditorTableView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="573718155"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKFieldNameFormatter.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKFileContentSearchController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="634159805"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKItemPasteboardHelper.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKLinkedFile.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="1048304600"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKNotesWindowController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKOrphanedFileServer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="390963115"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKSpotlightView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="10101253"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="792832204"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKTeXTask.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKTemplateDocument.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> <string key="minorKey">BDSKTemplateParser.h</string> </object> </object> @@ -6300,34 +6169,6 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKTextImportController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKTypeSelectHelper.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKUndoManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BibPref_Export.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> <string key="minorKey">NSObject_BDSKExtensions.h</string> </object> </object> @@ -6335,13 +6176,6 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">vendorsrc/harmless/AMButtonBar.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> <string key="minorKey">vendorsrc/kenferry/KFASHandlerAdditions-TypeTranslation.h</string> </object> </object> @@ -6399,6 +6233,13 @@ </object> <object class="IBPartialClassDescription"> <string key="className">NSTableView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="573718155"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">BDSKFieldEditor.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSTableView</string> <object class="NSMutableDictionary" key="actions"> <string key="NS.key.0">invertSelection:</string> <string key="NS.object.0">id</string> @@ -6421,6 +6262,10 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">NSTextField</string> + <reference key="sourceIdentifier" ref="573718155"/> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSTextView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> @@ -6492,7 +6337,7 @@ <string>id</string> </object> </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="697496129"> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> <string key="minorKey">FileView.framework/Headers/FVFileView.h</string> </object> @@ -6775,10 +6620,6 @@ </object> <object class="IBPartialClassDescription"> <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="697496129"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |