[Bibdesk-commit] SF.net SVN: bibdesk: [5795] trunk/bibdesk/BDSKZoomablePDFView.m

[<amaxwell@us...>]

Revision: 5795
Author:   amaxwell
Date:     2006-03-08 13:45:29 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5795&view=rev

Log Message:
-----------
Add context menu item for saving the PDF file from our PDFView subclass.

Modified Paths:
--------------
    trunk/bibdesk/BDSKZoomablePDFView.m
Modified: trunk/bibdesk/BDSKZoomablePDFView.m
===================================================================
--- trunk/bibdesk/BDSKZoomablePDFView.m	2006-03-08 19:40:46 UTC (rev 5794)
+++ trunk/bibdesk/BDSKZoomablePDFView.m	2006-03-08 21:45:29 UTC (rev 5795)
@@ -40,6 +40,7 @@
 #import <OmniAppKit/NSView-OAExtensions.h>
 #import <OmniBase/OBUtilities.h>
 #import "BDSKHeaderPopUpButton.h"
+#import <OmniFoundation/NSString-OFExtensions.h>
 
 @interface NSScrollView (BDSKZoomablePDFViewExtensions)
 @end
@@ -161,6 +162,26 @@
     [self updatePasteboardInfo];
 }
 
+- (void)saveDocumentSheetDidEnd:(NSSavePanel *)sheet returnCode:(int)returnCode  contextInfo:(void  *)contextInfo;
+{
+    NSError *error = nil;
+    if(returnCode == NSOKButton){
+        // -[PDFDocument writeToURL:] returns YES even if you don't have write permission, so we'll use NSData
+        NSData *data = [[self document] dataRepresentation];
+        
+        if([data writeToURL:[sheet URL] options:NSAtomicWrite error:&error] == NO){
+            [sheet orderOut:nil];
+            [self presentError:error];
+        }
+    }
+}
+    
+- (void)saveDocumentAs:(id)sender;
+{
+    NSString *name = [[[[self document] documentURL] path] lastPathComponent];
+    [[NSSavePanel savePanel] beginSheetForDirectory:nil file:(name ? name : NSLocalizedString(@"Untitled.pdf", @"")) modalForWindow:[self window] modalDelegate:self didEndSelector:@selector(saveDocumentSheetDidEnd:returnCode:contextInfo:) contextInfo:NULL];
+}
+
 - (NSMenu *)menuForEvent:(NSEvent *)theEvent;
 {
     NSMenu *menu = [super menuForEvent:theEvent];
@@ -172,6 +193,10 @@
     item = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Copy Text", @"") action:@selector(copyAsText:) keyEquivalent:@""];
     [menu addItem:item];
     [item release];
+    
+    item = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Save As", @""), [NSString horizontalEllipsisString]] action:@selector(saveDocumentAs:) keyEquivalent:@""];
+    [menu addItem:item];
+    [item release];
 
     return menu;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5794] trunk/bibdesk/BDSKFontManager.m

[<hofman@us...>]

Revision: 5794
Author:   hofman
Date:     2006-03-08 11:40:46 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5794&view=rev

Log Message:
-----------
Try the system conversion of preview fonts when we fail.

Modified Paths:
--------------
    trunk/bibdesk/BDSKFontManager.m
Modified: trunk/bibdesk/BDSKFontManager.m
===================================================================
--- trunk/bibdesk/BDSKFontManager.m	2006-03-08 17:55:42 UTC (rev 5793)
+++ trunk/bibdesk/BDSKFontManager.m	2006-03-08 19:40:46 UTC (rev 5794)
@@ -83,7 +83,10 @@
             if(!font){
                 font = [NSFont fontWithName:[tryFamily stringByAppendingString:@" Black Italic"] size:size];
                 if(!font){
-                    font = [NSFont boldSystemFontOfSize:size];
+                    font = [self convertFont:[NSFont fontWithName:tryFamily size:size] toHaveTrait:(NSBoldFontMask | NSItalicFontMask)];
+                    if(!font){
+                        font = [NSFont boldSystemFontOfSize:size];
+                    }
                 }
             }
         }
@@ -109,9 +112,12 @@
     
     NSFont *font = [NSFont fontWithName:[tryFamily stringByAppendingString:@" Bold"] size:size];
     if(!font){
-        [NSFont fontWithName:[tryFamily stringByAppendingString:@" Black"] size:size];
+        font = [NSFont fontWithName:[tryFamily stringByAppendingString:@" Black"] size:size];
         if(!font){
-            font = [NSFont boldSystemFontOfSize:size];
+            font = [self convertFont:[NSFont fontWithName:tryFamily size:size] toHaveTrait:NSBoldFontMask];
+            if(!font){
+                font = [NSFont boldSystemFontOfSize:size];
+            }
         }
     }
     return font;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5793] trunk/bibdesk/NSString_BDSKExtensions.m

[<hofman@us...>]

Revision: 5793
Author:   hofman
Date:     2006-03-08 09:55:42 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5793&view=rev

Log Message:
-----------
Fix typo in previous commit. 

Modified Paths:
--------------
    trunk/bibdesk/NSString_BDSKExtensions.m
Modified: trunk/bibdesk/NSString_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.m	2006-03-08 17:53:23 UTC (rev 5792)
+++ trunk/bibdesk/NSString_BDSKExtensions.m	2006-03-08 17:55:42 UTC (rev 5793)
@@ -426,21 +426,11 @@
 	return [self localizedCaseInsensitiveNumericCompare:other];
 }    
 
-- (NSComparisonResult)sortCompare:(NSString *)other{
-    BOOL otherIsEmpty = [NSString isEmptyString:other];
-	if ([self isEqualToString:@""]) {
-		return (otherIsEmpty)? NSOrderedSame : NSOrderedDescending;
-	} else if (otherIsEmpty) {
-		return NSOrderedAscending;
-	}
-	return [self localizedCaseInsensitiveNumericCompare:other];
-}    
-
 - (NSComparisonResult)triStateCompare:(NSString *)other{
     // we order increasingly as 0, -1, 1
     int myValue = [self triStateValue];
     int otherValue = [other triStateValue];
-    if myValue == otherValue
+    if (myValue == otherValue)
         return NSOrderedSame;
     else if (myValue == 0 || otherValue == 1)
         return NSOrderedAscending;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5792] trunk/bibdesk/NSString_BDSKExtensions.h

[<hofman@us...>]

Revision: 5792
Author:   hofman
Date:     2006-03-08 09:53:23 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5792&view=rev

Log Message:
-----------
Fix typo in last commit. 

Modified Paths:
--------------
    trunk/bibdesk/NSString_BDSKExtensions.h
Modified: trunk/bibdesk/NSString_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.h	2006-03-08 17:52:20 UTC (rev 5791)
+++ trunk/bibdesk/NSString_BDSKExtensions.h	2006-03-08 17:53:23 UTC (rev 5792)
@@ -271,7 +271,7 @@
     @param      other (description)
     @result     (description)
 */
-- (NSComparisonResult)triStateCompare:(NSString *)other{
+- (NSComparisonResult)triStateCompare:(NSString *)other;
 
 #pragma mark -
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5791] trunk/bibdesk

[<hofman@us...>]

Revision: 5791
Author:   hofman
Date:     2006-03-08 09:52:20 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5791&view=rev

Log Message:
-----------
Fix bug # 1445731. 
Add a custom comparison for triState string values, ordering as 0, -1, 1. 
Use this for sorting boolean and triState fields. 
Also return genericValueOfField for undefined keys, as they process nil values correctly. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument.m
    trunk/bibdesk/BibItem.m
    trunk/bibdesk/NSString_BDSKExtensions.h
    trunk/bibdesk/NSString_BDSKExtensions.m
Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m	2006-03-08 17:01:03 UTC (rev 5790)
+++ trunk/bibdesk/BibDocument.m	2006-03-08 17:52:20 UTC (rev 5791)
@@ -2177,9 +2177,12 @@
         sortDescriptor = [[BDSKTableSortDescriptor alloc] initWithKey:@"stringCache.Booktitle" ascending:ascend selector:@selector(localizedCompare:)];
         
     }else if([[[OFPreferenceWrapper sharedPreferenceWrapper] stringArrayForKey:BDSKBooleanFieldsKey] containsObject:tcID] ||
-             [[[OFPreferenceWrapper sharedPreferenceWrapper] stringArrayForKey:BDSKTriStateFieldsKey] containsObject:tcID] || 
-             [[[OFPreferenceWrapper sharedPreferenceWrapper] stringArrayForKey:BDSKRatingFieldsKey] containsObject:tcID]){
+             [[[OFPreferenceWrapper sharedPreferenceWrapper] stringArrayForKey:BDSKTriStateFieldsKey] containsObject:tcID]){
         
+        sortDescriptor = [[NSSortDescriptor alloc] initWithKey:tcID ascending:ascend selector:@selector(triStateCompare:)];
+        
+    }else if([[[OFPreferenceWrapper sharedPreferenceWrapper] stringArrayForKey:BDSKRatingFieldsKey] containsObject:tcID]){
+        
         // Use NSSortDescriptor instead of the BDSKTableSortDescriptor, so 0 values are handled correctly; if we ever store these as NSNumbers, the selector must be changed to compare:.
         sortDescriptor = [[NSSortDescriptor alloc] initWithKey:tcID ascending:ascend selector:@selector(numericCompare:)];
         

Modified: trunk/bibdesk/BibItem.m
===================================================================
--- trunk/bibdesk/BibItem.m	2006-03-08 17:01:03 UTC (rev 5790)
+++ trunk/bibdesk/BibItem.m	2006-03-08 17:52:20 UTC (rev 5791)
@@ -1011,7 +1011,7 @@
 }
 
 - (id)valueForUndefinedKey:(NSString *)key{
-    return [self valueOfField:key];
+    return [self valueOfGenericField:key];
 }
 
 - (NSString *)valueOfField: (NSString *)key{

Modified: trunk/bibdesk/NSString_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.h	2006-03-08 17:01:03 UTC (rev 5790)
+++ trunk/bibdesk/NSString_BDSKExtensions.h	2006-03-08 17:52:20 UTC (rev 5791)
@@ -265,15 +265,13 @@
 - (NSComparisonResult)sortCompare:(NSString *)other;
 
 /*!
-    @method     containsString:options:range:
-    @abstract   Determine whether a string contains searchString in aRange using mask as search options.
+    @method     triStateCompare:
+    @abstract   For sorting triState string values
     @discussion (comprehensive description)
-    @param      searchString (description)
-    @param      mask (description)
-    @param      aRange (description)
+    @param      other (description)
     @result     (description)
 */
-- (BOOL)containsString:(NSString *)searchString options:(unsigned int)mask range:(NSRange)aRange;
+- (NSComparisonResult)triStateCompare:(NSString *)other{
 
 #pragma mark -
 
@@ -296,6 +294,17 @@
 - (NSArray *)componentsSeparatedByCharactersInSet:(NSCharacterSet *)charSet trimWhitespace:(BOOL)trim;
 
 /*!
+    @method     containsString:options:range:
+    @abstract   Determine whether a string contains searchString in aRange using mask as search options.
+    @discussion (comprehensive description)
+    @param      searchString (description)
+    @param      mask (description)
+    @param      aRange (description)
+    @result     (description)
+*/
+- (BOOL)containsString:(NSString *)searchString options:(unsigned int)mask range:(NSRange)aRange;
+
+/*!
 @method     containsWord:
 @abstract   Determine whether a string contains the argument aWord; if it contains aWord as a substring, it then tests to see if it is bounded by null, punctuation, or whitespace.
 @discussion (comprehensive description)

Modified: trunk/bibdesk/NSString_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.m	2006-03-08 17:01:03 UTC (rev 5790)
+++ trunk/bibdesk/NSString_BDSKExtensions.m	2006-03-08 17:52:20 UTC (rev 5791)
@@ -49,6 +49,7 @@
 static AGRegex *orRegex = nil;
 static NSString *yesString = nil;
 static NSString *noString = nil;
+static NSString *mixedString = nil;
 
 @implementation NSString (BDSKExtensions)
 
@@ -63,6 +64,8 @@
     
     yesString = [NSLocalizedString(@"Yes", @"Yes") copy];
     noString = [NSLocalizedString(@"No", @"No") copy];
+    mixedString = [NSLocalizedString(@"-", @"indeterminate or mixed value indicator") copy];
+    
 }
 
 + (NSString *)hexStringForCharacter:(unichar)ch{
@@ -105,10 +108,6 @@
 }
 
 + (NSString *)stringWithTriStateValue:(NSCellStateValue)triStateValue {
-    static NSString *mixedString = nil;
-    if(mixedString == nil)
-		mixedString = NSLocalizedString(@"-", @"indeterminate or mixed value indicator");
-    
     switch (triStateValue) {
         case NSOffState:
             return noString;
@@ -427,10 +426,28 @@
 	return [self localizedCaseInsensitiveNumericCompare:other];
 }    
 
-- (BOOL)containsString:(NSString *)searchString options:(unsigned int)mask range:(NSRange)aRange{
-    return !searchString || [searchString length] == 0 || [self rangeOfString:searchString options:mask range:aRange].length > 0;
-}
+- (NSComparisonResult)sortCompare:(NSString *)other{
+    BOOL otherIsEmpty = [NSString isEmptyString:other];
+	if ([self isEqualToString:@""]) {
+		return (otherIsEmpty)? NSOrderedSame : NSOrderedDescending;
+	} else if (otherIsEmpty) {
+		return NSOrderedAscending;
+	}
+	return [self localizedCaseInsensitiveNumericCompare:other];
+}    
 
+- (NSComparisonResult)triStateCompare:(NSString *)other{
+    // we order increasingly as 0, -1, 1
+    int myValue = [self triStateValue];
+    int otherValue = [other triStateValue];
+    if myValue == otherValue
+        return NSOrderedSame;
+    else if (myValue == 0 || otherValue == 1)
+        return NSOrderedAscending;
+    else 
+        return NSOrderedDescending;
+}    
+
 #pragma mark -
 
 - (BOOL)booleanValue{
@@ -448,6 +465,10 @@
     return [(id)BDStringCreateComponentsSeparatedByCharacterSetTrimWhitespace(CFAllocatorGetDefault(), (CFStringRef)self, (CFCharacterSetRef)charSet, trim) autorelease];
 }
 
+- (BOOL)containsString:(NSString *)searchString options:(unsigned int)mask range:(NSRange)aRange{
+    return !searchString || [searchString length] == 0 || [self rangeOfString:searchString options:mask range:aRange].length > 0;
+}
+
 - (BOOL)containsWord:(NSString *)aWord{
     
     NSRange subRange = [self rangeOfString:aWord];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5790] trunk/bibdesk

[<hofman@us...>]

Revision: 5790
Author:   hofman
Date:     2006-03-08 09:01:03 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5790&view=rev

Log Message:
-----------
check modifier flags for typeAhead.

Modified Paths:
--------------
    trunk/bibdesk/BDSKDragTableView.m
    trunk/bibdesk/BDSKGroupTableView.h
    trunk/bibdesk/BDSKGroupTableView.m
    trunk/bibdesk/BDSKTextImportController.m
    trunk/bibdesk/MacroWindowController.m
Modified: trunk/bibdesk/BDSKDragTableView.m
===================================================================
--- trunk/bibdesk/BDSKDragTableView.m	2006-03-08 15:46:04 UTC (rev 5789)
+++ trunk/bibdesk/BDSKDragTableView.m	2006-03-08 17:01:03 UTC (rev 5790)
@@ -53,6 +53,7 @@
 - (void)keyDown:(NSEvent *)event{
     unichar c = [[event characters] characterAtIndex:0];
     NSCharacterSet *alnum = [NSCharacterSet alphanumericCharacterSet];
+    unsigned int flags = ([event modifierFlags] & 0xffff0000U);
     if (c == 0x0020){ // spacebar to page down in the lower pane of the BibDocument splitview, shift-space to page up
         if([event modifierFlags] & NSShiftKeyMask)
             [[self delegate] pageUpInPreview:nil];
@@ -83,7 +84,7 @@
         [self selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:([event modifierFlags] | NSShiftKeyMask)];
         [self scrollRowToVisible:row];
     // pass it on the typeahead selector
-    }else if ([alnum characterIsMember:c]) {
+    }else if ([alnum characterIsMember:c] && flags == 0) {
         [typeAheadHelper substringProcessKeyDownCharacter:c];
     }else{
         [super keyDown:event];

Modified: trunk/bibdesk/BDSKGroupTableView.h
===================================================================
--- trunk/bibdesk/BDSKGroupTableView.h	2006-03-08 15:46:04 UTC (rev 5789)
+++ trunk/bibdesk/BDSKGroupTableView.h	2006-03-08 17:01:03 UTC (rev 5790)
@@ -39,6 +39,7 @@
 #import <Cocoa/Cocoa.h>
 #import <OmniAppKit/OAGradientTableView.h>
 #import <OmniAppKit/OATypeAheadSelectionHelper.h>
+#import "OATypeAheadSelectionHelper_Extensions.h"
 
 @class BDSKGroupTableView;
 

Modified: trunk/bibdesk/BDSKGroupTableView.m
===================================================================
--- trunk/bibdesk/BDSKGroupTableView.m	2006-03-08 15:46:04 UTC (rev 5789)
+++ trunk/bibdesk/BDSKGroupTableView.m	2006-03-08 17:01:03 UTC (rev 5790)
@@ -92,6 +92,7 @@
 - (void)keyDown:(NSEvent *)theEvent
 {
     unichar c = [[theEvent characters] characterAtIndex:0];
+    unsigned int modifierFlags = ([theEvent modifierFlags] & 0xffff0000U);
 	// modified from NSTableView-OAExtensions.h which uses a shared typeahead helper instance (which we can't access to force it to recache)
 	if (![[NSUserDefaults standardUserDefaults] boolForKey:@"DisableTypeAheadSelection"]) {
 
@@ -99,9 +100,9 @@
         if([[typeAheadHelper valueForKey:@"typeAheadSearchCache"] count] == 0)
             [typeAheadHelper rebuildTypeAheadSearchCache];
 
-		if (([[NSCharacterSet alphanumericCharacterSet] characterIsMember:c] || ([typeAheadHelper isProcessing] && ![[NSCharacterSet controlCharacterSet] characterIsMember:c]))) {
+		if (([[NSCharacterSet alphanumericCharacterSet] characterIsMember:c] || ([typeAheadHelper isProcessing] && ![[NSCharacterSet controlCharacterSet] characterIsMember:c])) && modifierFlags == 0) {
 			 
-			[typeAheadHelper processKeyDownCharacter:c];
+			[typeAheadHelper substringProcessKeyDownCharacter:c];
 			return;
 		}
 	}

Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m	2006-03-08 15:46:04 UTC (rev 5789)
+++ trunk/bibdesk/BDSKTextImportController.m	2006-03-08 17:01:03 UTC (rev 5790)
@@ -1458,23 +1458,31 @@
 }
 
 - (void)keyDown:(NSEvent *)event{
-    unichar c = [[event characters] characterAtIndex:0];
-    NSCharacterSet *alnum = [NSCharacterSet alphanumericCharacterSet];
+    NSString *chars = [event charactersIgnoringModifiers];
+    unichar c = ([chars length]) ? [chars characterAtIndex:0] : 0;
+    unsigned int flags = ([event modifierFlags] & 0xffff0000U);
     
+    static NSCharacterSet *fieldNameCharSet = nil;
+    if (fieldNameCharSet == nil) 
+        fieldNameCharSet = [[[[BibTypeManager sharedManager] strictInvalidCharactersForField:BDSKCiteKeyString inFileType:BDSKBibtexString] invertedSet] copy];
+    
     if ([[self dataSource] isInTemporaryTypeAheadMode]) {
-        if (c == NSTabCharacter || c == 0x001b) {
+        if (flags != 0) {
+            NSBeep();
+            return;
+        } else if (c == NSTabCharacter || c == 0x001b) {
             [[self dataSource] endTemporaryTypeAheadModeAndSet:NO];
             return;
         } else if (c == NSCarriageReturnCharacter || c == NSEnterCharacter || c == NSNewlineCharacter) {
             [[self dataSource] endTemporaryTypeAheadModeAndSet:YES];
             return;
-        } else if ([alnum characterIsMember:c] == NO && c != NSDownArrowFunctionKey && c != NSUpArrowFunctionKey) {
+        } else if ([fieldNameCharSet characterIsMember:c] == NO && c != NSDownArrowFunctionKey && c != NSUpArrowFunctionKey) {
             NSBeep();
             return;
         }
     }
     
-    if ([alnum characterIsMember:c]) {
+    if ([fieldNameCharSet characterIsMember:c] && flags == 0) {
         [typeAheadHelper prefixProcessKeyDownCharacter:c];
     }else{
         [super keyDown:event];

Modified: trunk/bibdesk/MacroWindowController.m
===================================================================
--- trunk/bibdesk/MacroWindowController.m	2006-03-08 15:46:04 UTC (rev 5789)
+++ trunk/bibdesk/MacroWindowController.m	2006-03-08 17:01:03 UTC (rev 5790)
@@ -451,6 +451,7 @@
 - (void)keyDown:(NSEvent *)event{
     unichar c = [[event characters] characterAtIndex:0];
     NSCharacterSet *alnum = [NSCharacterSet alphanumericCharacterSet];
+    unsigned int flags = ([event modifierFlags] & 0xffff0000U);
     if (c == NSDeleteCharacter ||
         c == NSBackspaceCharacter) {
         [[self delegate] removeSelectedMacros:nil];
@@ -459,7 +460,7 @@
              c == NSCarriageReturnCharacter){
                 if([self numberOfSelectedRows] == 1)
                     [self editColumn:0 row:[self selectedRow] withEvent:nil select:YES];
-    }else if ([alnum characterIsMember:c]) {
+    }else if ([alnum characterIsMember:c] && flags == 0) {
         [typeAheadHelper substringProcessKeyDownCharacter:c];
     }else{
         [super keyDown:event];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5789] trunk/bibdesk

[<hofman@us...>]

Revision: 5789
Author:   hofman
Date:     2006-03-08 07:46:04 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5789&view=rev

Log Message:
-----------
Use new name for typeahead method, with required behavior for the context. 

Modified Paths:
--------------
    trunk/bibdesk/BDSKDragTableView.m
    trunk/bibdesk/BDSKTextImportController.m
    trunk/bibdesk/MacroWindowController.m
    trunk/bibdesk/NSString_BDSKExtensions.h
    trunk/bibdesk/NSString_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKDragTableView.m
===================================================================
--- trunk/bibdesk/BDSKDragTableView.m	2006-03-08 15:45:09 UTC (rev 5788)
+++ trunk/bibdesk/BDSKDragTableView.m	2006-03-08 15:46:04 UTC (rev 5789)
@@ -84,7 +84,7 @@
         [self scrollRowToVisible:row];
     // pass it on the typeahead selector
     }else if ([alnum characterIsMember:c]) {
-        [typeAheadHelper newProcessKeyDownCharacter:c];
+        [typeAheadHelper substringProcessKeyDownCharacter:c];
     }else{
         [super keyDown:event];
     }

Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m	2006-03-08 15:45:09 UTC (rev 5788)
+++ trunk/bibdesk/BDSKTextImportController.m	2006-03-08 15:46:04 UTC (rev 5789)
@@ -1475,7 +1475,7 @@
     }
     
     if ([alnum characterIsMember:c]) {
-        [typeAheadHelper newProcessKeyDownCharacter:c];
+        [typeAheadHelper prefixProcessKeyDownCharacter:c];
     }else{
         [super keyDown:event];
     }

Modified: trunk/bibdesk/MacroWindowController.m
===================================================================
--- trunk/bibdesk/MacroWindowController.m	2006-03-08 15:45:09 UTC (rev 5788)
+++ trunk/bibdesk/MacroWindowController.m	2006-03-08 15:46:04 UTC (rev 5789)
@@ -460,7 +460,7 @@
                 if([self numberOfSelectedRows] == 1)
                     [self editColumn:0 row:[self selectedRow] withEvent:nil select:YES];
     }else if ([alnum characterIsMember:c]) {
-        [typeAheadHelper newProcessKeyDownCharacter:c];
+        [typeAheadHelper substringProcessKeyDownCharacter:c];
     }else{
         [super keyDown:event];
     }

Modified: trunk/bibdesk/NSString_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.h	2006-03-08 15:45:09 UTC (rev 5788)
+++ trunk/bibdesk/NSString_BDSKExtensions.h	2006-03-08 15:46:04 UTC (rev 5789)
@@ -263,7 +263,18 @@
     @result     (description)
 */
 - (NSComparisonResult)sortCompare:(NSString *)other;
-    
+
+/*!
+    @method     containsString:options:range:
+    @abstract   Determine whether a string contains searchString in aRange using mask as search options.
+    @discussion (comprehensive description)
+    @param      searchString (description)
+    @param      mask (description)
+    @param      aRange (description)
+    @result     (description)
+*/
+- (BOOL)containsString:(NSString *)searchString options:(unsigned int)mask range:(NSRange)aRange;
+
 #pragma mark -
 
 /*!

Modified: trunk/bibdesk/NSString_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.m	2006-03-08 15:45:09 UTC (rev 5788)
+++ trunk/bibdesk/NSString_BDSKExtensions.m	2006-03-08 15:46:04 UTC (rev 5789)
@@ -427,6 +427,10 @@
 	return [self localizedCaseInsensitiveNumericCompare:other];
 }    
 
+- (BOOL)containsString:(NSString *)searchString options:(unsigned int)mask range:(NSRange)aRange{
+    return !searchString || [searchString length] == 0 || [self rangeOfString:searchString options:mask range:aRange].length > 0;
+}
+
 #pragma mark -
 
 - (BOOL)booleanValue{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5788] trunk/bibdesk

[<hofman@us...>]

Revision: 5788
Author:   hofman
Date:     2006-03-08 07:45:09 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5788&view=rev

Log Message:
-----------
Make 2 methods, to match either for a substring or a prefix. Move matching method to private interface. 

Modified Paths:
--------------
    trunk/bibdesk/OATypeAheadSelectionHelper_Extensions.h
    trunk/bibdesk/OATypeAheadSelectionHelper_Extensions.m
Modified: trunk/bibdesk/OATypeAheadSelectionHelper_Extensions.h
===================================================================
--- trunk/bibdesk/OATypeAheadSelectionHelper_Extensions.h	2006-03-08 13:45:35 UTC (rev 5787)
+++ trunk/bibdesk/OATypeAheadSelectionHelper_Extensions.h	2006-03-08 15:45:09 UTC (rev 5788)
@@ -42,6 +42,7 @@
 
 @interface OATypeAheadSelectionHelper (BDSKExtensions)
 
-- (void)newProcessKeyDownCharacter:(unichar)character;
-- (int)_indexOfItemWithSubstring:(NSString *)substring afterIndex:(int)selectedIndex;
+- (void)prefixProcessKeyDownCharacter:(unichar)character;
+- (void)substringProcessKeyDownCharacter:(unichar)character;
+- (void)processKeyDownCharacter:(unichar)character matchPrefix:(BOOL)matchPrefix;
 @end

Modified: trunk/bibdesk/OATypeAheadSelectionHelper_Extensions.m
===================================================================
--- trunk/bibdesk/OATypeAheadSelectionHelper_Extensions.m	2006-03-08 13:45:35 UTC (rev 5787)
+++ trunk/bibdesk/OATypeAheadSelectionHelper_Extensions.m	2006-03-08 15:45:09 UTC (rev 5788)
@@ -41,11 +41,13 @@
 @interface OATypeAheadSelectionHelper (BDSKPrivate)
 - (void)_replacementDealloc;
 - (void)_replacementTypeAheadSearchTimeout;
+- (int)_indexOfItemWithSubstring:(NSString *)substring afterIndex:(unsigned int)selectedIndex;
 @end
 
 @interface OATypeAheadSelectionHelper (OmniPrivate)
 // this is in Omni's implementation
 - (void)_typeAheadSearchTimeout;
+- (int)_indexOfItemWithPrefix:(NSString *)prefix afterIndex:(unsigned int)selectedIndex;
 @end
 
 // Use to implement a display like OmniWeb's when you start typing a link title; we should probably just use our own subclass here
@@ -76,16 +78,68 @@
     originalTypeAheadSearchTimeoutIMP(self, _cmd);
 }
 
+- (int)_indexOfItemWithSubstring:(NSString *)substring afterIndex:(unsigned int)selectedIndex
+{
+    unsigned int labelIndex, foundIndex, labelCount;
+    unsigned int substringLength;
+    BOOL looped;
+
+    if (typeAheadSearchCache == nil)
+        [self rebuildTypeAheadSearchCache];
+
+    substringLength = [substring length];
+    labelCount = [typeAheadSearchCache count];
+    if (labelCount == 0)
+        return NSNotFound;
+    if (selectedIndex == NSNotFound)
+        selectedIndex = labelCount - 1;
+
+    labelIndex = selectedIndex + 1;
+    if (labelIndex == labelCount)
+        labelIndex = 0;
+    looped = NO;
+    while (!looped) {
+        NSString *label;
+        unsigned int labelLength;
+
+        foundIndex = labelIndex++;
+        if (labelIndex == labelCount)
+            labelIndex = 0;
+        if (labelIndex == selectedIndex + 1 || (labelIndex == 0 && selectedIndex == labelCount - 1))
+            looped = YES;
+        label = [typeAheadSearchCache objectAtIndex:foundIndex];
+        labelLength = [label length];
+        if (labelLength < substringLength)
+            continue;
+        if ([label rangeOfString:substring options:NSCaseInsensitiveSearch].location != NSNotFound)
+            return foundIndex;
+    }
+
+    return NSNotFound;
+}
+
 @end
 
 @implementation OATypeAheadSelectionHelper (BDSKExtensions)
 
-- (void)newProcessKeyDownCharacter:(unichar)character;
+- (void)prefixProcessKeyDownCharacter:(unichar)character;
 {
+    [self processKeyDownCharacter:character matchPrefix:YES];
+}
+
+- (void)substringProcessKeyDownCharacter:(unichar)character;
+{
+    [self processKeyDownCharacter:character matchPrefix:NO];
+}
+
+- (void)processKeyDownCharacter:(unichar)character matchPrefix:(BOOL)matchPrefix;
+{
     OFScheduler *scheduler;
     NSString *selectedItem;
     int selectedIndex, foundIndex;
     unsigned int searchStringLength;
+    unsigned int selectedItemLength;
+    NSRange range;
 
     OBPRECONDITION(_dataSource != nil);
 
@@ -111,59 +165,24 @@
     selectedItem = [_dataSource currentlySelectedItem];
 
     searchStringLength = [typeAheadSearchString length];
+    selectedItemLength = [selectedItem length];
     
-    // The Omni implementation of this looks for a prefix; we're searching for a substring
-    if (searchStringLength > 1 && [selectedItem length] >= searchStringLength && [selectedItem containsString:typeAheadSearchString options:NSCaseInsensitiveSearch])
+    // The Omni implementation of this looks for a prefix; we might be searching for a substring
+    range = NSMakeRange(0, matchPrefix ? searchStringLength : selectedItemLength);
+    if (searchStringLength > 1 && selectedItemLength >= searchStringLength && [selectedItem containsString:typeAheadSearchString options:NSCaseInsensitiveSearch range:range])
         return; // Avoid flashing a selection all over the place while you're still typing the thing you have selected
 
     if (flags.cycleResults && selectedItem)
         selectedIndex = [typeAheadSearchCache indexOfObject:selectedItem];
     else
         selectedIndex = NSNotFound;
-    foundIndex = [self _indexOfItemWithSubstring:typeAheadSearchString afterIndex:selectedIndex];
+    if (matchPrefix)
+        foundIndex = [self _indexOfItemWithPrefix:typeAheadSearchString afterIndex:selectedIndex];
+    else
+        foundIndex = [self _indexOfItemWithSubstring:typeAheadSearchString afterIndex:selectedIndex];
 
     if (foundIndex != NSNotFound)
         [_dataSource typeAheadSelectItemAtIndex:foundIndex];
 }
 
-- (int)_indexOfItemWithSubstring:(NSString *)substring afterIndex:(int)selectedIndex
-{
-    unsigned int labelIndex, foundIndex, labelCount;
-    unsigned int substringLength;
-    BOOL looped;
-
-    if (typeAheadSearchCache == nil)
-        [self rebuildTypeAheadSearchCache];
-
-    substringLength = [substring length];
-    labelCount = [typeAheadSearchCache count];
-    if (labelCount == 0)
-        return NSNotFound;
-    if (selectedIndex == NSNotFound)
-        selectedIndex = labelCount - 1;
-
-    labelIndex = selectedIndex + 1;
-    if (labelIndex == labelCount)
-        labelIndex = 0;
-    looped = NO;
-    while (!looped) {
-        NSString *label;
-        unsigned int labelLength;
-
-        foundIndex = labelIndex++;
-        if (labelIndex == labelCount)
-            labelIndex = 0;
-        if (labelIndex == selectedIndex + 1 || (labelIndex == 0 && selectedIndex == labelCount - 1))
-            looped = YES;
-        label = [typeAheadSearchCache objectAtIndex:foundIndex];
-        labelLength = [label length];
-        if (labelLength < substringLength)
-            continue;
-        if ([label rangeOfString:substring options:NSCaseInsensitiveSearch].location != NSNotFound)
-            return foundIndex;
-    }
-
-    return NSNotFound;
-}
-
 @end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5787] trunk/bibdesk

[<hofman@us...>]

Revision: 5787
Author:   hofman
Date:     2006-03-08 05:45:35 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5787&view=rev

Log Message:
-----------
Use bibtypemanager to identify person fields in more cases. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument+Menus.m
    trunk/bibdesk/BibDocument_Groups.m
    trunk/bibdesk/BibPersonController.m
Modified: trunk/bibdesk/BibDocument+Menus.m
===================================================================
--- trunk/bibdesk/BibDocument+Menus.m	2006-03-08 12:32:35 UTC (rev 5786)
+++ trunk/bibdesk/BibDocument+Menus.m	2006-03-08 13:45:35 UTC (rev 5787)
@@ -620,7 +620,7 @@
 	int row = [groupTableView selectedRow];
 	if ([groupTableView numberOfSelectedRows] == 1 && row > 0) {
 		// single smart group selection
-		if (row <= [smartGroups count] || [currentGroupField isEqualToString:BDSKAuthorString] || [currentGroupField isEqualToString:BDSKEditorString])
+		if (row <= [smartGroups count] || [[[BibTypeManager sharedManager] personFieldsSet] containsObject:currentGroupField])
 			return YES;
 		else
 			return NO;

Modified: trunk/bibdesk/BibDocument_Groups.m
===================================================================
--- trunk/bibdesk/BibDocument_Groups.m	2006-03-08 12:32:35 UTC (rev 5786)
+++ trunk/bibdesk/BibDocument_Groups.m	2006-03-08 13:45:35 UTC (rev 5787)
@@ -654,7 +654,7 @@
 		   didEndSelector:NULL
 			  contextInfo:nil];
 		[filterController release];
-	} else if ([currentGroupField isEqualToString:BDSKAuthorString] || [currentGroupField isEqualToString:BDSKEditorString]) {
+	} else if ([[[BibTypeManager sharedManager] personFieldsSet] containsObject:currentGroupField]) {
 		BibAuthor *person = (BibAuthor *)[group name];
 		OBASSERT(person != nil && [person isKindOfClass:[BibAuthor class]]);
 		BibPersonController *pc = [person personController];

Modified: trunk/bibdesk/BibPersonController.m
===================================================================
--- trunk/bibdesk/BibPersonController.m	2006-03-08 12:32:35 UTC (rev 5786)
+++ trunk/bibdesk/BibPersonController.m	2006-03-08 13:45:35 UTC (rev 5787)
@@ -37,6 +37,7 @@
  */
 
 #import "BibPersonController.h"
+#import "BibTypeManager.h"
 #import "BibDocument.h"
 #import "BibAuthor.h"
 #import "BibItem.h"
@@ -201,7 +202,7 @@
     BibItem *pub = nil;
     
     // @@ maybe handle this in the type manager?
-    NSArray *fieldNames = [NSArray arrayWithObjects:BDSKAuthorString, BDSKEditorString, nil];
+    NSArray *fieldNames = [[[BibTypeManager sharedManager] personFieldsSet] allObjects];
     NSArray *peopleFromString;
     CFIndex numberOfFields = [fieldNames count];
     NSString *fieldName;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5786] trunk/bibdesk/English.lproj/BibDocument.nib

[<hofman@us...>]

Revision: 5786
Author:   hofman
Date:     2006-03-08 04:32:35 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5786&view=rev

Log Message:
-----------
Remove all tablecolumns from the main table. We create them dynamically, while loading the nib can sometimes call columnwidth resizing notifications, which mess up the widths in the prefs. 

Modified Paths:
--------------
    trunk/bibdesk/English.lproj/BibDocument.nib/info.nib
    trunk/bibdesk/English.lproj/BibDocument.nib/keyedobjects.nib
    trunk/bibdesk/English.lproj/BibDocument.nib/objects.nib
Modified: trunk/bibdesk/English.lproj/BibDocument.nib/info.nib
===================================================================
--- trunk/bibdesk/English.lproj/BibDocument.nib/info.nib	2006-03-08 12:00:33 UTC (rev 5785)
+++ trunk/bibdesk/English.lproj/BibDocument.nib/info.nib	2006-03-08 12:32:35 UTC (rev 5786)
@@ -34,18 +34,18 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>777</integer>
-		<integer>641</integer>
+		<integer>277</integer>
+		<integer>5</integer>
+		<integer>702</integer>
+		<integer>661</integer>
+		<integer>324</integer>
+		<integer>819</integer>
 		<integer>626</integer>
 		<integer>433</integer>
 		<integer>786</integer>
-		<integer>5</integer>
+		<integer>777</integer>
 		<integer>303</integer>
-		<integer>819</integer>
-		<integer>702</integer>
-		<integer>324</integer>
-		<integer>277</integer>
-		<integer>661</integer>
+		<integer>641</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8H14</string>

Modified: trunk/bibdesk/English.lproj/BibDocument.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: trunk/bibdesk/English.lproj/BibDocument.nib/objects.nib
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5785] trunk/bibdesk/BDSKTextImportController.m

[<hofman@us...>]

Revision: 5785
Author:   hofman
Date:     2006-03-08 04:00:33 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5785&view=rev

Log Message:
-----------
Set typeAheadSelector dataSource to nil in dealloc to fix bug reported on users list. 

Modified Paths:
--------------
    trunk/bibdesk/BDSKTextImportController.m
Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m	2006-03-08 10:50:34 UTC (rev 5784)
+++ trunk/bibdesk/BDSKTextImportController.m	2006-03-08 12:00:33 UTC (rev 5785)
@@ -1442,7 +1442,7 @@
                 index += 10;
             if (flags & NSShiftKeyMask)
                 index += 20;
-            if ([[self dataSource] addCurrentSelectionToFieldAtIndex:index]) {
+            if ([[self dataSource] addCurrentSelectionToFieldAtIndex:index] == NO) {
                 NSBeep();
                 return NO;
             } else return YES;
@@ -1488,11 +1488,12 @@
 
 - (void)awakeFromNib{
     typeAheadHelper = [[OATypeAheadSelectionHelper alloc] init];
-    [typeAheadHelper setDataSource:[self delegate]];
+    [typeAheadHelper setDataSource:[self dataSource]];
     [typeAheadHelper setCyclesSimilarResults:YES];
 }
 
 - (void)dealloc{
+    [typeAheadHelper setDataSource:nil];
     [typeAheadHelper release];
     [super dealloc];
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5784] trunk/bibdesk/English.lproj/BibDesk Help/bibdesk.texi

[<hofman@us...>]

Revision: 5784
Author:   hofman
Date:     2006-03-08 02:50:34 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5784&view=rev

Log Message:
-----------
Describe temporary typeahead mode for text import. 

Modified Paths:
--------------
    trunk/bibdesk/English.lproj/BibDesk Help/bibdesk.texi
Modified: trunk/bibdesk/English.lproj/BibDesk Help/bibdesk.texi
===================================================================
--- trunk/bibdesk/English.lproj/BibDesk Help/bibdesk.texi	2006-03-08 10:31:37 UTC (rev 5783)
+++ trunk/bibdesk/English.lproj/BibDesk Help/bibdesk.texi	2006-03-08 10:50:34 UTC (rev 5784)
@@ -815,7 +815,7 @@
 @image{gfx/textImport}
 
 If you have a source of references that isn't in a structured form,
-you can use the @menutitle{Add New Publications from Pasteboard} menu item in the
+you can use the @menutitle{Add New Publications from Clipboard} menu item in the
 @menutitle{Publication} menu (or the key shortcut @optcmd{L}) to open a
 sheet that lets you add references by selecting text and assigning
 that text to fields in a new reference. You can also choose the 
@@ -858,14 +858,18 @@
 double-clicking on the rightmost column of the table.
 
 @kindex Cmd-0 - Cmd-9
+@kindex Cmd-=
 
-You can make adding data faster by just double-clicking the name of
+You can make adding data faster by double-clicking the name of
 the field you want the selected text to fill and it will be added for
-you. You can also use the key shortcuts @cmd{0} through @cmd{9} to
-copy the selected text over to the corresponding field.
+you. You can also use the key shortcuts @cmd{&#0048} through @cmd{9} or 
+@optcmd{&#0048} through @optcmd{9} to copy the selected text over to the 
+corresponding field. Alternatively, you can type @cmd{=} to temporarily 
+move to the table to select a field to fill. After that, start typing 
+the field name or use the arrow keys to find the field and hit the 
+Enter key to fill it and return to what you were doing. Use the 
+Tab or Escape key to just go back without filling the field. 
 
-@... note: Double-clicking to transfer the data does not work for the webpage view yet.
-
 @c --------------------------------------------------------------------------------------
 
 @node Editing References


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5783] trunk/bibdesk/BDSKTextImportController.m

[<hofman@us...>]

Revision: 5783
Author:   hofman
Date:     2006-03-08 02:31:37 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5783&view=rev

Log Message:
-----------
Only use Cmd-= shortcut for temporary typeahead mode. 

Modified Paths:
--------------
    trunk/bibdesk/BDSKTextImportController.m
Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m	2006-03-08 09:56:57 UTC (rev 5782)
+++ trunk/bibdesk/BDSKTextImportController.m	2006-03-08 10:31:37 UTC (rev 5783)
@@ -1447,7 +1447,7 @@
                 return NO;
             } else return YES;
         
-        } else if ([[self dataSource] isInTemporaryTypeAheadMode] == NO && (c == '=' || c == '+')) {
+        } else if ([[self dataSource] isInTemporaryTypeAheadMode] == NO && c == '=') {
         
             [[self dataSource] startTemporaryTypeAheadMode];
             return YES;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5782] trunk/bibdesk/BibDocument+Menus.m

[<hofman@us...>]

Revision: 5782
Author:   hofman
Date:     2006-03-08 01:56:57 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5782&view=rev

Log Message:
-----------
Add counter to Copy As BibTeX menu item for multiple selection. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument+Menus.m
Modified: trunk/bibdesk/BibDocument+Menus.m
===================================================================
--- trunk/bibdesk/BibDocument+Menus.m	2006-03-08 09:38:51 UTC (rev 5781)
+++ trunk/bibdesk/BibDocument+Menus.m	2006-03-08 09:56:57 UTC (rev 5782)
@@ -94,7 +94,7 @@
 			if (n <= 1)
 				s = NSLocalizedString(@"BibTeX Record", @"BibTeX Record");
 			else
-				s = NSLocalizedString(@"BibTeX Records", @"BibTeX Records");
+				s = [NSString stringWithFormat:NSLocalizedString(@"%i BibTeX Records", @"%i BibTeX Records"), n];
 			break;
 		case BDSKCiteDragCopyType:
 			do {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5781] trunk/bibdesk/English.lproj/MainMenu.nib

[<hofman@us...>]

Revision: 5781
Author:   hofman
Date:     2006-03-08 01:38:51 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5781&view=rev

Log Message:
-----------
Remove some unimportant items from the Font menu.

Modified Paths:
--------------
    trunk/bibdesk/English.lproj/MainMenu.nib/info.nib
    trunk/bibdesk/English.lproj/MainMenu.nib/keyedobjects.nib
    trunk/bibdesk/English.lproj/MainMenu.nib/objects.nib
Modified: trunk/bibdesk/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/bibdesk/English.lproj/MainMenu.nib/info.nib	2006-03-08 06:44:33 UTC (rev 5780)
+++ trunk/bibdesk/English.lproj/MainMenu.nib/info.nib	2006-03-08 09:38:51 UTC (rev 5781)
@@ -23,10 +23,10 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
+		<integer>202</integer>
 		<integer>493</integer>
+		<integer>424</integer>
 		<integer>29</integer>
-		<integer>424</integer>
-		<integer>202</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8H14</string>

Modified: trunk/bibdesk/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: trunk/bibdesk/English.lproj/MainMenu.nib/objects.nib
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bibdesk-commit] SF.net SVN: bibdesk: [5780] trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj

[<amaxwell@us...>]

Revision: 5780
Author:   amaxwell
Date:     2006-03-07 22:44:33 -0800 (Tue, 07 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5780&view=rev

Log Message:
-----------
Change version to 255

Modified Paths:
--------------
    trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
===================================================================
--- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj	2006-03-07 22:39:47 UTC (rev 5779)
+++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj	2006-03-08 06:44:33 UTC (rev 5780)
@@ -1045,7 +1045,7 @@
 		3DFF35600816B55B0052F37C /* forward_small.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = forward_small.tiff; path = Images/forward_small.tiff; sourceTree = "<group>"; };
 		3DFF35620816B5780052F37C /* reload_small.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = reload_small.tiff; path = Images/reload_small.tiff; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
-		8D1107320486CEB800E47090 /* BibDesk.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BibDesk.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		8D1107320486CEB800E47090 /* BibDesk.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = BibDesk.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		CE1A7ED4090BDEB600ACC864 /* BDSKHeaderPopUpButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKHeaderPopUpButtonCell.h; sourceTree = "<group>"; };
 		CE1A7ED5090BDEB600ACC864 /* BDSKHeaderPopUpButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKHeaderPopUpButtonCell.m; sourceTree = "<group>"; };
 		CE1A7EDD090BDF1C00ACC864 /* BDSKHeaderPopUpButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKHeaderPopUpButton.h; sourceTree = "<group>"; };
@@ -3855,7 +3855,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 255;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -3898,7 +3898,7 @@
 					i386,
 				);
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 255;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_AUTO_VECTORIZATION = NO;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -3945,7 +3945,7 @@
 		F993F1BF08553A61007A7657 /* Test */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 255;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
 				GCC_ENABLE_CPP_RTTI = NO;
@@ -3976,7 +3976,7 @@
 		F993F1C008553A61007A7657 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 255;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
 				GCC_ENABLE_CPP_RTTI = NO;
@@ -4746,7 +4746,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = ppc;
-				CURRENT_PROJECT_VERSION = 254;
+				CURRENT_PROJECT_VERSION = 255;
 				GCC_AUTO_VECTORIZATION = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.3;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.