Revision: 22427
http://sourceforge.net/p/bibdesk/svn/22427
Author: hofman
Date: 2018-07-17 18:07:36 +0000 (Tue, 17 Jul 2018)
Log Message:
-----------
Handle format string recoloring of edited string from controller. Only validate
the format once at each edit from formatter, and get the result from the
formatter for further handling. Use custom text field to notify when selecting
the text field.
Modified Paths:
--------------
trunk/bibdesk/BDSKFormatStringFormatter.h
trunk/bibdesk/BDSKFormatStringFormatter.m
trunk/bibdesk/BibPref_AutoFile.h
trunk/bibdesk/BibPref_AutoFile.m
trunk/bibdesk/BibPref_CiteKey.h
trunk/bibdesk/BibPref_CiteKey.m
trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
trunk/bibdesk/English.lproj/BibPref_AutoFile.xib
trunk/bibdesk/English.lproj/BibPref_CiteKey.xib
trunk/bibdesk/French.lproj/BibPref_AutoFile.xib
trunk/bibdesk/French.lproj/BibPref_CiteKey.xib
trunk/bibdesk/German.lproj/BibPref_AutoFile.xib
trunk/bibdesk/German.lproj/BibPref_CiteKey.xib
Added Paths:
-----------
trunk/bibdesk/BDSKTextField.h
trunk/bibdesk/BDSKTextField.m
Modified: trunk/bibdesk/BDSKFormatStringFormatter.h
===================================================================
--- trunk/bibdesk/BDSKFormatStringFormatter.h 2018-07-17 06:30:30 UTC (rev
22426)
+++ trunk/bibdesk/BDSKFormatStringFormatter.h 2018-07-17 18:07:36 UTC (rev
22427)
@@ -41,6 +41,10 @@
@interface BDSKFormatStringFormatter : NSFormatter {
NSString *parseField;
+ NSAttributedString *attributedString;
+ NSString *formatError;
}
- (id)initWithField:(NSString *)field;
+- (NSAttributedString *)attributedString;
+- (NSString *)formatError;
@end
Modified: trunk/bibdesk/BDSKFormatStringFormatter.m
===================================================================
--- trunk/bibdesk/BDSKFormatStringFormatter.m 2018-07-17 06:30:30 UTC (rev
22426)
+++ trunk/bibdesk/BDSKFormatStringFormatter.m 2018-07-17 18:07:36 UTC (rev
22427)
@@ -54,19 +54,37 @@
- (void)dealloc
{
BDSKDESTROY(parseField);
+ BDSKDESTROY(attributedString);
+ BDSKDESTROY(formatError);
[super dealloc];
}
+- (NSAttributedString *)attributedString { return attributedString; }
+
+- (NSString *)formatError { return formatError; }
+
- (NSString *)stringForObjectValue:(id)obj{
return obj;
}
+- (NSString *)editingStringForObjectValue:(id)obj {
+ // make sure the ivars are up-to-date
+ [self attributedStringForObjectValue:obj withDefaultAttributes:nil];
+ return obj;
+}
+
- (NSAttributedString *)attributedStringForObjectValue:(id)obj
withDefaultAttributes:(NSDictionary *)attrs{
NSAttributedString *attrString = nil;
NSString *format = [[obj copy] autorelease];
+ NSString *errorString = nil;
- [BDSKFormatParser validateFormat:&format attributedFormat:&attrString
forField:parseField error:NULL];
+ [BDSKFormatParser validateFormat:&format attributedFormat:&attrString
forField:parseField error:&errorString];
+ [attributedString release];
+ attributedString = [attrString retain];
+ [formatError release];
+ formatError = [errorString retain];
+
return attrString;
}
@@ -78,10 +96,8 @@
- (BOOL)isPartialStringValid:(NSString **)partialStringPtr
proposedSelectedRange:(NSRangePointer)proposedSelRangePtr
originalString:(NSString *)origString
originalSelectedRange:(NSRange)origSelRange errorDescription:(NSString **)error{
NSAttributedString *attrString = nil;
NSString *format = [[*partialStringPtr copy] autorelease];
- NSString *errorString = nil;
- [BDSKFormatParser validateFormat:&format attributedFormat:&attrString
forField:parseField error:&errorString];
- format = [attrString string];
+ format = [[self attributedStringForObjectValue:format
withDefaultAttributes:nil] string];
if (NO == [format isEqualToString:*partialStringPtr]) {
NSUInteger length = [format length];
@@ -94,10 +110,9 @@
else
*proposedSelRangePtr = NSMakeRange(length, 0);
}
- if (error) *error = errorString;
+ if (error) *error = formatError;
return NO;
} else return YES;
}
-
@end
Added: trunk/bibdesk/BDSKTextField.h
===================================================================
--- trunk/bibdesk/BDSKTextField.h (rev 0)
+++ trunk/bibdesk/BDSKTextField.h 2018-07-17 18:07:36 UTC (rev 22427)
@@ -0,0 +1,49 @@
+//
+// BDSKTextField.h
+// BibDesk
+//
+// Created by Christiaan on 17/07/2018.
+/*
+ This software is Copyright (c) 2018
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+
+@protocol BDSKTextFieldDelegate <NSTextFieldDelegate>
+@optional
+- (void)textFieldDidBecomeFirstResponder:(NSTextField *)textField;
+@end
+
+@interface BDSKTextField : NSTextField
+- (id <BDSKTextFieldDelegate>)delegate;
+- (void)setDelegate:(id <BDSKTextFieldDelegate>)newDelegate;
+@end
Added: trunk/bibdesk/BDSKTextField.m
===================================================================
--- trunk/bibdesk/BDSKTextField.m (rev 0)
+++ trunk/bibdesk/BDSKTextField.m 2018-07-17 18:07:36 UTC (rev 22427)
@@ -0,0 +1,55 @@
+//
+// BDSKTextField.m
+// BibDesk
+//
+// Created by Christiaan on 17/07/2018.
+/*
+ This software is Copyright (c) 2018
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "BDSKTextField.h"
+
+@implementation BDSKTextField
+
+- (BOOL)becomeFirstResponder {
+ if ([super becomeFirstResponder]) {
+ if ([[self delegate]
respondsToSelector:@selector(textFieldDidBecomeFirstResponder:)])
+ [[self delegate] textFieldDidBecomeFirstResponder:self];
+ return YES;
+ }
+ return NO;
+}
+
+- (id <BDSKTextFieldDelegate>)delegate { return (id
<BDSKTextFieldDelegate>)[super delegate]; }
+- (void)setDelegate:(id <BDSKTextFieldDelegate>)newDelegate { [super
setDelegate:newDelegate]; }
+
+@end
Modified: trunk/bibdesk/BibPref_AutoFile.h
===================================================================
--- trunk/bibdesk/BibPref_AutoFile.h 2018-07-17 06:30:30 UTC (rev 22426)
+++ trunk/bibdesk/BibPref_AutoFile.h 2018-07-17 18:07:36 UTC (rev 22427)
@@ -40,7 +40,6 @@
#import <Cocoa/Cocoa.h>
#import "BDSKPreferencePane.h"
-@class BDSKFormatStringFieldEditor;
@interface BibPref_AutoFile : BDSKPreferencePane
<NSControlTextEditingDelegate> {
IBOutlet NSPanel *formatSheet;
@@ -61,7 +60,6 @@
IBOutlet NSTextField *previewDisplay;
NSString *lastPapersFolderPath;
- BDSKFormatStringFieldEditor *coloringEditor;
}
- (IBAction)showFormatSheet:(id)sender;
Modified: trunk/bibdesk/BibPref_AutoFile.m
===================================================================
--- trunk/bibdesk/BibPref_AutoFile.m 2018-07-17 06:30:30 UTC (rev 22426)
+++ trunk/bibdesk/BibPref_AutoFile.m 2018-07-17 18:07:36 UTC (rev 22427)
@@ -40,7 +40,6 @@
#import "NSImage_BDSKExtensions.h"
#import "BDSKFormatParser.h"
#import "BDSKFormatStringFormatter.h"
-#import "BDSKFormatStringFieldEditor.h"
#import "BDSKAppController.h"
#import "BDSKPreviewItem.h"
#import "BDSKStringConstants.h"
@@ -70,7 +69,6 @@
- (void)dealloc{
BDSKDESTROY(lastPapersFolderPath);
- BDSKDESTROY(coloringEditor);
[super dealloc];
}
@@ -92,8 +90,6 @@
[formatSheetField setFormatter:formatter];
[formatter release];
- coloringEditor = [[BDSKFormatStringFieldEditor alloc]
initWithFrame:[formatSheetField frame] parseField:BDSKLocalFileString];
-
[papersFolderLocationTextField setFormatter:[[[BDSKFolderPathFormatter
alloc] init] autorelease]];
[previewDisplay setStringValue:[[BDSKPreviewItem sharedItem] displayText]];
@@ -112,11 +108,6 @@
}
}
-// sheet's delegate must be connected to file's owner in IB
-- (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)anObject{
- return (anObject == formatSheetField ? coloringEditor : nil);
-}
-
- (void)updatePapersFolderUI{
NSString *papersFolder = [[sud stringForKey:BDSKPapersFolderPathKey]
stringByAbbreviatingWithTildeInPath];
@@ -231,7 +222,7 @@
// presently just used to display the warning if the path for autofile was
invalid
- (BOOL)control:(NSControl *)control didFailToFormatString:(NSString *)string
errorDescription:(NSString *)error{
- if(error != nil) {
+ if(error != nil && control == papersFolderLocationTextField) {
NSAlert *alert = [[[NSAlert alloc] init] autorelease];
[alert setMessageText:NSLocalizedString(@"Invalid Entry", @"Message in
alert dialog when entering invalid entry")];
[alert setInformativeText:error];
@@ -270,18 +261,15 @@
if ([NSString isEmptyString:newSpecifier])
return;
- if (fieldEditor) {
- selRange = NSMakeRange([fieldEditor selectedRange].location +
2, [newSpecifier length] - 2);
- [fieldEditor insertText:newSpecifier];
- } else {
- NSString *formatString = [formatSheetField stringValue];
- selRange = NSMakeRange([formatString length] + 2, [newSpecifier
length] - 2);
- [formatSheetField setStringValue:[formatString
stringByAppendingString:newSpecifier]];
- }
-
- // this handles the new sud and the UI update
- [self localUrlFormatChanged:sender];
-
+ if (fieldEditor == nil) {
+ [formatSheet makeFirstResponder:formatSheetField];
+ [[formatSheetField currentEditor]
setSelectedRange:NSMakeRange([[formatSheetField stringValue] length], 0)];
+ fieldEditor = [formatSheetField currentEditor];
+ }
+
+ selRange = NSMakeRange([fieldEditor selectedRange].location + 2,
[newSpecifier length] - 2);
+ [fieldEditor insertText:newSpecifier];
+
// select the 'arbitrary' numbers
if ([newSpecifier isEqualToString:@"%0"] || [newSpecifier
isEqualToString:@"%%"]) {
selRange.location -= 1;
@@ -299,7 +287,6 @@
selRange.location += 13;
selRange.length = 0;
}
- [formatSheetField selectText:self];
[[formatSheetField currentEditor] setSelectedRange:selRange];
}
@@ -325,23 +312,46 @@
[sud setObject:formatString forKey:BDSKLocalFileFormatKey];
}
else { //changed the text field or added from the repository
- NSString *error = nil;
- NSAttributedString *attrFormat = nil;
- formatString = [formatSheetField stringValue];
- //if ([formatString isEqualToString:[sud
stringForKey:BDSKLocalFileFormatKey]]) return; // nothing changed
- if ([BDSKFormatParser validateFormat:&formatString
attributedFormat:&attrFormat forField:BDSKLocalFileString error:&error]) {
- [sud setObject:formatString
forKey:BDSKLocalFileFormatKey];
- }
- else {
- [self setLocalUrlFormatInvalidWarning:YES
message:error];
- [formatSheetField setAttributedStringValue:attrFormat];
- return;
- }
+ if (nil != [(BDSKFormatStringFormatter *)[formatSheetField formatter]
formatError])
+ return;
+ formatString = [formatSheetField stringValue];
+ [sud setObject:formatString forKey:BDSKLocalFileFormatKey];
}
[[BDSKTypeManager sharedManager] setRequiredFieldsForLocalFile:
[BDSKFormatParser requiredFieldsForFormat:formatString]];
[self updateFormatPresetUI];
}
+#pragma mark Format field text changes
+
+- (void)textFieldDidBecomeFirstResponder:(NSTextField *)textField {
+ NSTextView *fieldEditor = (NSTextView *)[textField currentEditor];
+ // get the attributed string from the format parser
+ NSAttributedString *attrString = [(BDSKFormatStringFormatter *)[textField
formatter] attributedString];
+
+ // get the attributes of the parsed string and apply them to our
NSTextStorage; it may not be safe to set it directly at this point
+ if ([[fieldEditor string] isEqualToString:[attrString string]]) {
+ NSTextStorage *textStorage = [fieldEditor textStorage];
+ [attrString enumerateAttributesInRange:NSMakeRange(0, [attrString
length]) options:0 usingBlock:^(NSDictionary *attrs, NSRange range, BOOL *stop){
+ [textStorage setAttributes:attrs range:range];
+ }];
+ }
+}
+
+- (void)controlTextDidChange:(NSNotification *)notification {
+ if ([notification object] == formatSheetField) {
+ [self textFieldDidBecomeFirstResponder:formatSheetField];
+
+ NSString *formatError = [(BDSKFormatStringFormatter
*)[formatSheetField formatter] formatError];
+ [self setLocalUrlFormatInvalidWarning:formatError != nil
message:formatError];
+ }
+}
+
+- (BOOL)control:(NSControl *)control textShouldEndEditing:(NSText
*)fieldEditor {
+ if (control == formatSheetField)
+ return [(BDSKFormatStringFormatter *)[formatSheetField formatter]
formatError] == nil;
+ return YES;
+}
+
#pragma mark Format sheet stuff
- (IBAction)showFormatSheet:(id)sender{
@@ -370,10 +380,11 @@
NSString *error = nil;
NSString *otherButton = nil;
- if ([formatSheet makeFirstResponder:nil])
+ if ([formatSheet makeFirstResponder:nil] == NO)
[formatSheet endEditingFor:nil];
- if ([BDSKFormatParser validateFormat:&formatString
forField:BDSKLocalFileString error:&error])
+ error = [(BDSKFormatStringFormatter *)[formatSheetField formatter]
formatError];
+ if (error == nil)
return YES;
formatString = [sud stringForKey:BDSKLocalFileFormatKey];
@@ -392,7 +403,7 @@
NSInteger rv = [alert runModal];
if (rv == NSAlertFirstButtonReturn){
- [formatSheetField selectText:self];
+ [formatSheet makeFirstResponder:formatSheetField];
return NO;
} else if (rv == NSAlertThirdButtonReturn){
formatString = [[sudc initialValues]
objectForKey:BDSKLocalFileFormatKey];
@@ -399,6 +410,7 @@
[sud setObject:formatString forKey:BDSKLocalFileFormatKey];
[[BDSKTypeManager sharedManager] setRequiredFieldsForLocalFile:
[BDSKFormatParser requiredFieldsForFormat:formatString]];
}
+ // this will reset the formatSheetField string to the chosen default
[self updateFormatPreviewUI];
return YES;
}
Modified: trunk/bibdesk/BibPref_CiteKey.h
===================================================================
--- trunk/bibdesk/BibPref_CiteKey.h 2018-07-17 06:30:30 UTC (rev 22426)
+++ trunk/bibdesk/BibPref_CiteKey.h 2018-07-17 18:07:36 UTC (rev 22427)
@@ -39,7 +39,6 @@
#import <Cocoa/Cocoa.h>
#import "BDSKPreferencePane.h"
-@class BDSKFormatStringFieldEditor;
@interface BibPref_CiteKey : BDSKPreferencePane
{
@@ -55,8 +54,6 @@
IBOutlet NSButton* citeKeyLowercaseCheckButton;
IBOutlet NSMatrix *formatCleanRadio;
IBOutlet NSTextField *previewDisplay;
-
- BDSKFormatStringFieldEditor *coloringEditor;
}
- (IBAction)showFormatSheet:(id)sender;
Modified: trunk/bibdesk/BibPref_CiteKey.m
===================================================================
--- trunk/bibdesk/BibPref_CiteKey.m 2018-07-17 06:30:30 UTC (rev 22426)
+++ trunk/bibdesk/BibPref_CiteKey.m 2018-07-17 18:07:36 UTC (rev 22427)
@@ -42,10 +42,10 @@
#import "NSImage_BDSKExtensions.h"
#import "BDSKFormatParser.h"
#import "BDSKFormatStringFormatter.h"
-#import "BDSKFormatStringFieldEditor.h"
#import "BDSKAppController.h"
#import "BDSKPreviewItem.h"
#import "BDSKTypeManager.h"
+#import "BDSKTextField.h"
#define MAX_PREVIEW_WIDTH 481
#define MAX_FORMAT_WIDTH 266
@@ -64,11 +64,6 @@
static NSString *presetFormatStrings[] = {@"%a1:%Y%u2", @"%a1:%Y%u0",
@"%a33%y%m", @"%a1%Y%t15"};
static NSString *repositorySpecifierStrings[] = {@"", @"%a00", @"%A0",
@"%p00", @"%P0", @"%t0", @"%T0", @"%Y", @"%y", @"%m", @"%k0", @"%f{}0", @"%w{}[
]0", @"%s{}[][][]0", @"%c{}", @"%f{BibTeX Type}", @"%i{}0", @"%u0", @"%U0",
@"%n0", @"%0", @"%%"};
-- (void)dealloc{
- BDSKDESTROY(coloringEditor);
- [super dealloc];
-}
-
- (void)updateUI {
[citeKeyAutogenerateCheckButton setState:[sud
boolForKey:BDSKCiteKeyAutogenerateKey] ? NSOnState : NSOffState];
@@ -85,8 +80,6 @@
[formatSheetField setFormatter:formatter];
[formatter release];
- coloringEditor = [[BDSKFormatStringFieldEditor alloc]
initWithFrame:[formatSheetField frame] parseField:BDSKCiteKeyString];
-
[previewDisplay setStringValue:[[BDSKPreviewItem sharedItem] displayText]];
[previewDisplay sizeToFit];
@@ -103,11 +96,6 @@
}
}
-// sheet's delegate must be connected to file's owner in IB
-- (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)anObject{
- return (anObject == formatSheetField ? coloringEditor : nil);
-}
-
- (void)updateFormatPresetUI{
NSInteger citeKeyPresetChoice = [sud
integerForKey:BDSKCiteKeyFormatPresetKey];
BOOL custom = (citeKeyPresetChoice == 0);
@@ -188,19 +176,16 @@
if ([NSString isEmptyString:newSpecifier])
return;
+
+ if (fieldEditor == nil) {
+ [formatSheet makeFirstResponder:formatSheetField];
+ [[formatSheetField currentEditor]
setSelectedRange:NSMakeRange([[formatSheetField stringValue] length], 0)];
+ fieldEditor = [formatSheetField currentEditor];
+ }
+
+ selRange = NSMakeRange([fieldEditor selectedRange].location + 2,
[newSpecifier length] - 2);
+ [fieldEditor insertText:newSpecifier];
- if (fieldEditor) {
- selRange = NSMakeRange([fieldEditor selectedRange].location +
2, [newSpecifier length] - 2);
- [fieldEditor insertText:newSpecifier];
- } else {
- NSString *formatString = [formatSheetField stringValue];
- selRange = NSMakeRange([formatString length] + 2, [newSpecifier
length] - 2);
- [formatSheetField setStringValue:[formatString
stringByAppendingString:newSpecifier]];
- }
-
- // this handles the new sud and the UI update
- [self citeKeyFormatChanged:sender];
-
// select the 'arbitrary' numbers
if ([newSpecifier isEqualToString:@"%0"] || [newSpecifier
isEqualToString:@"%%"]) {
selRange.location -= 1;
@@ -214,8 +199,7 @@
selRange.location += 13;
selRange.length = 0;
}
- [formatSheetField selectText:self];
- [[formatSheetField currentEditor] setSelectedRange:selRange];
+ [fieldEditor setSelectedRange:selRange];
}
- (IBAction)citeKeyFormatChanged:(id)sender{
@@ -240,23 +224,42 @@
[sud setObject:formatString forKey:BDSKCiteKeyFormatKey];
}
else { //changed the text field or added from the repository
- NSString *error = nil;
- NSAttributedString *attrFormat = nil;
- formatString = [formatSheetField stringValue];
- //if ([formatString isEqualToString:[sud
stringForKey:BDSKCiteKeyFormatKey]]) return; // nothing changed
- if ([BDSKFormatParser validateFormat:&formatString
attributedFormat:&attrFormat forField:BDSKCiteKeyString error:&error]) {
- [sud setObject:formatString
forKey:BDSKCiteKeyFormatKey];
- }
- else {
- [self setCiteKeyFormatInvalidWarning:YES message:error];
- [formatSheetField setAttributedStringValue:attrFormat];
- return;
- }
- }
- [[BDSKTypeManager sharedManager] setRequiredFieldsForCiteKey:
[BDSKFormatParser requiredFieldsForFormat:formatString]];
+ if (nil != [(BDSKFormatStringFormatter *)[formatSheetField formatter]
formatError])
+ return;
+ formatString = [formatSheetField stringValue];
+ [sud setObject:formatString forKey:BDSKCiteKeyFormatKey];
+ }
+ [[BDSKTypeManager sharedManager] setRequiredFieldsForCiteKey:
[BDSKFormatParser requiredFieldsForFormat:formatString]];
[self updateFormatPresetUI];
}
+#pragma mark Format field text changes
+
+- (void)textFieldDidBecomeFirstResponder:(NSTextField *)textField {
+ NSTextView *fieldEditor = (NSTextView *)[textField currentEditor];
+ // get the attributed string from the format parser
+ NSAttributedString *attrString = [(BDSKFormatStringFormatter *)[textField
formatter] attributedString];
+
+ // get the attributes of the parsed string and apply them to our
NSTextStorage; it may not be safe to set it directly at this point
+ if ([[fieldEditor string] isEqualToString:[attrString string]]) {
+ NSTextStorage *textStorage = [fieldEditor textStorage];
+ [attrString enumerateAttributesInRange:NSMakeRange(0, [attrString
length]) options:0 usingBlock:^(NSDictionary *attrs, NSRange range, BOOL *stop){
+ [textStorage setAttributes:attrs range:range];
+ }];
+ }
+}
+
+- (void)controlTextDidChange:(NSNotification *)notification {
+ [self textFieldDidBecomeFirstResponder:formatSheetField];
+
+ NSString *formatError = [(BDSKFormatStringFormatter *)[formatSheetField
formatter] formatError];
+ [self setCiteKeyFormatInvalidWarning:formatError != nil
message:formatError];
+}
+
+- (BOOL)control:(NSControl *)control textShouldEndEditing:(NSText
*)fieldEditor {
+ return [(BDSKFormatStringFormatter *)[formatSheetField formatter]
formatError] == nil;
+}
+
#pragma mark Format sheet stuff
- (IBAction)showFormatSheet:(id)sender{
@@ -285,10 +288,11 @@
NSString *error = nil;
NSString *otherButton = nil;
- if ([formatSheet makeFirstResponder:nil])
+ if ([formatSheet makeFirstResponder:nil] == NO)
[formatSheet endEditingFor:nil];
- if ([BDSKFormatParser validateFormat:&formatString
forField:BDSKCiteKeyString error:&error])
+ error = [(BDSKFormatStringFormatter *)[formatSheetField formatter]
formatError];
+ if (error == nil)
return YES;
formatString = [sud stringForKey:BDSKCiteKeyFormatKey];
@@ -307,7 +311,7 @@
NSInteger rv = [alert runModal];
if (rv == NSAlertFirstButtonReturn){
- [formatSheetField selectText:self];
+ [formatSheet makeFirstResponder:formatSheetField];
return NO;
} else if (rv == NSAlertThirdButtonReturn){
formatString = [[sudc initialValues]
objectForKey:BDSKCiteKeyFormatKey];
@@ -314,6 +318,7 @@
[sud setObject:formatString forKey:BDSKCiteKeyFormatKey];
[[BDSKTypeManager sharedManager] setRequiredFieldsForCiteKey:
[BDSKFormatParser requiredFieldsForFormat:formatString]];
}
+ // this will reset the formatSheetField string to the chosen default
[self updateFormatPresetUI];
return YES;
}
@@ -346,7 +351,7 @@
- (void)setCiteKeyFormatInvalidWarning:(BOOL)set message:(NSString *)message{
[formatWarningButton setToolTip:set ? message : nil];
[formatWarningButton setHidden:set == NO];
- [formatSheetField setTextColor:(set ? [NSColor redColor] : [NSColor
blackColor])]; // overdone?
+ //[formatSheetField setTextColor:(set ? [NSColor redColor] : [NSColor
blackColor])]; // overdone?
}
@end
Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
===================================================================
--- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2018-07-17 06:30:30 UTC
(rev 22426)
+++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2018-07-17 18:07:36 UTC
(rev 22427)
@@ -101,6 +101,7 @@
CE15E6230FCC28B1009FCBF1 /* BibDocument_UI.m in Sources */ =
{isa = PBXBuildFile; fileRef = CE15E6210FCC28B1009FCBF1 /* BibDocument_UI.m */;
};
CE1782FC1158EFCB00B2EBDF /* BookmarkSheet.xib in Resources */ =
{isa = PBXBuildFile; fileRef = CE1782FB1158EFCB00B2EBDF /* BookmarkSheet.xib
*/; };
CE17832E1158F0A000B2EBDF /* BDSKBookmarkSheetController.m in
Sources */ = {isa = PBXBuildFile; fileRef = CE17832C1158F0A000B2EBDF /*
BDSKBookmarkSheetController.m */; };
+ CE1E082120FE48E90003FD0D /* BDSKTextField.m in Sources */ =
{isa = PBXBuildFile; fileRef = CE1E081F20FE48E90003FD0D /* BDSKTextField.m */;
};
CE1EF2940F8E0D54004E7AE8 /* BDSKParentGroup.m in Sources */ =
{isa = PBXBuildFile; fileRef = CE1EF2920F8E0D54004E7AE8 /* BDSKParentGroup.m
*/; };
CE2153D416B169A4004EB59A /* BDSKAlias.m in Sources */ = {isa =
PBXBuildFile; fileRef = CE2153D216B169A4004EB59A /* BDSKAlias.m */; };
CE21D10B09208B9D0075E607 /* BDSKGroup.m in Sources */ = {isa =
PBXBuildFile; fileRef = CE21D10909208B9D0075E607 /* BDSKGroup.m */; };
@@ -874,6 +875,8 @@
CE17832C1158F0A000B2EBDF /* BDSKBookmarkSheetController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = BDSKBookmarkSheetController.m; sourceTree =
"<group>"; };
CE1783631158F57600B2EBDF /* French */ = {isa =
PBXFileReference; lastKnownFileType = file.xib; name = French; path =
French.lproj/BookmarkSheet.xib; sourceTree = "<group>"; };
CE17EE7E0E24F27400DE06EA /* BibDesk-App.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path =
"BibDesk-App.xcconfig"; sourceTree = "<group>"; };
+ CE1E081E20FE48E90003FD0D /* BDSKTextField.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BDSKTextField.h;
sourceTree = "<group>"; };
+ CE1E081F20FE48E90003FD0D /* BDSKTextField.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
BDSKTextField.m; sourceTree = "<group>"; };
CE1EF2910F8E0D54004E7AE8 /* BDSKParentGroup.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BDSKParentGroup.h; sourceTree = "<group>"; };
CE1EF2920F8E0D54004E7AE8 /* BDSKParentGroup.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BDSKParentGroup.m; sourceTree = "<group>"; };
CE2153D116B169A4004EB59A /* BDSKAlias.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BDSKAlias.h; sourceTree = "<group>"; };
@@ -2097,6 +2100,7 @@
CE62E0920F4C46D600BDF01E /* BDSKSplitView.m */,
CE30FAD60919713100CB1A19 /* BDSKStatusBar.m */,
CE62E0B80F4C4A2100BDF01E /* BDSKTableView.m */,
+ CE1E081F20FE48E90003FD0D /* BDSKTextField.m */,
CE33D605136AB73600ACE924 /*
BDSKTextImportItemTableView.m */,
F9DCEA4E094B7D1100AEE662 /*
BDSKTextWithIconCell.m */,
CE6DACC30A503ECF00123185 /* BDSKToolbarItem.m
*/,
@@ -2710,6 +2714,7 @@
CE95AF150ADBE7C000CB20E7 /*
BDSKTemplateObjectProxy.h */,
CE325FCB0A1A74E9002D6E4C /*
BDSKTemplateParser.h */,
F9DB895A08A54BBA00CB3D53 /* BDSKTeXTask.h */,
+ CE1E081E20FE48E90003FD0D /* BDSKTextField.h */,
27AFAF9A080D1E1B0096F5D2 /*
BDSKTextImportController.h */,
CE33D604136AB73600ACE924 /*
BDSKTextImportItemTableView.h */,
F98AA67F0971E3F400184BD8 /*
BDSKTextViewCompletionController.h */,
@@ -3467,6 +3472,7 @@
CE38FB89091D946A00BCB69D /*
BDSKConditionController.m in Sources */,
CE38FB8F091D94A100BCB69D /* BDSKFilter.m in
Sources */,
CE38FB91091D94A100BCB69D /*
BDSKFilterController.m in Sources */,
+ CE1E082120FE48E90003FD0D /* BDSKTextField.m in
Sources */,
F9E07C8509202309007BCDD4 /*
BibDocument_Groups.m in Sources */,
F9E07C9009202345007BCDD4 /*
BibDocument_Search.m in Sources */,
CE522F761D5CA7FE00348D7D /* BDSKDOIParser.m in
Sources */,
Modified: trunk/bibdesk/English.lproj/BibPref_AutoFile.xib
===================================================================
--- trunk/bibdesk/English.lproj/BibPref_AutoFile.xib 2018-07-17 06:30:30 UTC
(rev 22426)
+++ trunk/bibdesk/English.lproj/BibPref_AutoFile.xib 2018-07-17 18:07:36 UTC
(rev 22427)
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">17D47</string>
+ <string key="IBDocument.SystemVersion">17G65</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
- <string key="IBDocument.AppKitVersion">1561.20.106</string>
- <string key="IBDocument.HIToolboxVersion">910.40</string>
+ <string key="IBDocument.AppKitVersion">1561.60.100</string>
+ <string key="IBDocument.HIToolboxVersion">911.10</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">851</string>
@@ -29,7 +29,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="379568108">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<nil key="NSNibTouchBar"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
@@ -39,7 +39,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{30,
312}, {208, 18}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="443269905">
<int
key="NSCellFlags">67108864</int>
@@ -73,7 +72,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{447,
349}, {100, 32}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="118899412">
<int
key="NSCellFlags">67108864</int>
@@ -99,7 +97,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{520,
308}, {21, 24}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="131228171">
<int
key="NSCellFlags">67108864</int>
@@ -125,7 +122,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
137}, {56, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="777663268">
<int
key="NSCellFlags">67108864</int>
@@ -171,7 +167,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{10, 13}, {454, 39}}</string>
<reference key="NSSuperview" ref="766259252"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="888696891">
<int key="NSCellFlags">67108864</int>
@@ -194,12 +189,10 @@
</array>
<string
key="NSFrame">{{1, 1}, {474, 65}}</string>
<reference
key="NSSuperview" ref="439657964"/>
- <reference
key="NSWindow"/>
</object>
</array>
<string key="NSFrame">{{42,
20}, {476, 67}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<string key="NSOffsets">{0,
0}</string>
<object class="NSTextFieldCell"
key="NSTitleCell">
<int
key="NSCellFlags">67108864</int>
@@ -238,7 +231,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{127,
210}, {417, 26}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object
class="NSPopUpButtonCell" key="NSCell" id="557791840">
<int
key="NSCellFlags">-2076180416</int>
@@ -342,7 +334,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{29,
216}, {96, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="59179889">
<int
key="NSCellFlags">67108864</int>
@@ -362,7 +353,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{237,
357}, {208, 22}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="904869679">
<int
key="NSCellFlags">-1804599231</int>
@@ -388,7 +378,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{29,
107}, {501, 22}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="876270127">
<int
key="NSCellFlags">-2073034687</int>
@@ -409,7 +398,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
242}, {118, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="557249209">
<int
key="NSCellFlags">67108864</int>
@@ -433,7 +421,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
387}, {121, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="937480139">
<int
key="NSCellFlags">67108864</int>
@@ -453,7 +440,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{432,
164}, {115, 32}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="304318043">
<int
key="NSCellFlags">67108864</int>
@@ -479,7 +465,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{130,
172}, {288, 22}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="648759712">
<int
key="NSCellFlags">-1536163775</int>
@@ -500,7 +485,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{29,
174}, {94, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="868974587">
<int
key="NSCellFlags">67108864</int>
@@ -520,7 +504,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{30,
265}, {203, 18}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="263253738">
<int
key="NSCellFlags">67108864</int>
@@ -545,7 +528,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
289}, {67, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="699911002">
<int
key="NSCellFlags">67108864</int>
@@ -565,7 +547,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{30,
338}, {263, 38}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool
key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSNumRows">2</int>
@@ -740,8 +721,6 @@
</object>
</array>
<string key="NSFrameSize">{561, 424}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
@@ -3063,6 +3042,7 @@
<string
key="148.IBEditorWindowLastContentRect">{{116, 162}, {435, 563}}</string>
<string
key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string
key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string
key="150.CustomClassName">BDSKTextField</string>
<object class="NSMutableDictionary"
key="150.IBAttributePlaceholdersKey">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute"
key="NS.object.0">
@@ -3544,6 +3524,16 @@
</object>
</object>
</array>
+ <array class="NSMutableArray"
key="referencedPartialClassDescriptionsV3.1+">
+ <object class="IBPartialClassDescription">
+ <string
key="className">BDSKTextField</string>
+ <string
key="superclassName">NSTextField</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBDocumentRelativeSource</string>
+ <string
key="minorKey">../BDSKTextField.h</string>
+ </object>
+ </object>
+ </array>
<array class="NSMutableArray"
key="referencedPartialClassDescriptionsV3.2+">
<object class="IBPartialClassDescription">
<string
key="className">NSActionCell</string>
Modified: trunk/bibdesk/English.lproj/BibPref_CiteKey.xib
===================================================================
--- trunk/bibdesk/English.lproj/BibPref_CiteKey.xib 2018-07-17 06:30:30 UTC
(rev 22426)
+++ trunk/bibdesk/English.lproj/BibPref_CiteKey.xib 2018-07-17 18:07:36 UTC
(rev 22427)
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">17D47</string>
+ <string key="IBDocument.SystemVersion">17G65</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
- <string key="IBDocument.AppKitVersion">1561.20.106</string>
- <string key="IBDocument.HIToolboxVersion">910.40</string>
+ <string key="IBDocument.AppKitVersion">1561.60.100</string>
+ <string key="IBDocument.HIToolboxVersion">911.10</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">851</string>
@@ -29,7 +29,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="321430047">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<nil key="NSNibTouchBar"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
@@ -39,7 +39,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
245}, {111, 17}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="222412844">
<int
key="NSCellFlags">67108864</int>
@@ -79,7 +78,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{29,
137}, {56, 17}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="98792986">
<int
key="NSCellFlags">67108864</int>
@@ -103,7 +101,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{498,
276}, {21, 24}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="449785958">
<int
key="NSCellFlags">67108864</int>
@@ -129,7 +126,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{127,
213}, {395, 26}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object
class="NSPopUpButtonCell" key="NSCell" id="817141962">
<int
key="NSCellFlags">-2076180416</int>
@@ -255,7 +251,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{10, 13}, {454, 39}}</string>
<reference key="NSSuperview" ref="181747349"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="928619137">
<int key="NSCellFlags">67108864</int>
@@ -278,12 +273,10 @@
</array>
<string
key="NSFrame">{{1, 1}, {474, 65}}</string>
<reference
key="NSSuperview" ref="215889833"/>
- <reference
key="NSWindow"/>
</object>
</array>
<string key="NSFrame">{{31,
20}, {476, 67}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<string key="NSOffsets">{0,
0}</string>
<object class="NSTextFieldCell"
key="NSTitleCell">
<int
key="NSCellFlags">67108864</int>
@@ -322,7 +315,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{29,
219}, {96, 17}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="578207608">
<int
key="NSCellFlags">67108864</int>
@@ -342,7 +334,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{30,
280}, {394, 18}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="228884809">
<int
key="NSCellFlags">67108864</int>
@@ -372,7 +363,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
304}, {168, 17}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="98507934">
<int
key="NSCellFlags">67108864</int>
@@ -392,7 +382,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{41,
107}, {481, 22}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="301756987">
<int
key="NSCellFlags">-2073034687</int>
@@ -418,7 +407,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{410,
167}, {115, 32}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="492553237">
<int
key="NSCellFlags">67108864</int>
@@ -444,7 +432,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{130,
175}, {266, 22}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="679091113">
<int
key="NSCellFlags">-1536163775</int>
@@ -465,7 +452,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{29,
177}, {94, 17}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="558038706">
<int
key="NSCellFlags">67108864</int>
@@ -481,8 +467,6 @@
</object>
</array>
<string key="NSFrameSize">{539, 341}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
@@ -1712,6 +1696,14 @@
</object>
<int key="connectionID">376</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection"
key="connection">
+ <string
key="label">delegate</string>
+ <reference key="source"
ref="355797761"/>
+ <reference key="destination"
ref="107350581"/>
+ </object>
+ <int key="connectionID">429</int>
+ </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -2413,9 +2405,9 @@
</object>
</object>
<string
key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string
key="240.IBEditorWindowLastContentRect">{{272, 153}, {539, 260}}</string>
+ <string
key="240.IBEditorWindowLastContentRect">{{155, 153}, {539, 260}}</string>
<string
key="240.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string
key="240.IBWindowTemplateEditedContentRect">{{272, 153}, {539, 260}}</string>
+ <string
key="240.IBWindowTemplateEditedContentRect">{{155, 153}, {539, 260}}</string>
<boolean value="YES"
key="240.windowTemplate.hasMinSize"/>
<string key="240.windowTemplate.minSize">{213,
107}</string>
<string
key="241.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2436,6 +2428,7 @@
<string
key="248.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string
key="249.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string
key="250.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string
key="251.CustomClassName">BDSKTextField</string>
<object class="NSMutableDictionary"
key="251.IBAttributePlaceholdersKey">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute"
key="NS.object.0">
@@ -2547,7 +2540,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary"
key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">428</int>
+ <int key="maxID">429</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray"
key="referencedPartialClassDescriptions">
@@ -2686,6 +2679,16 @@
</object>
</object>
</array>
+ <array class="NSMutableArray"
key="referencedPartialClassDescriptionsV3.1+">
+ <object class="IBPartialClassDescription">
+ <string
key="className">BDSKTextField</string>
+ <string
key="superclassName">NSTextField</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBDocumentRelativeSource</string>
+ <string
key="minorKey">../BDSKTextField.h</string>
+ </object>
+ </object>
+ </array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string
key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
Modified: trunk/bibdesk/French.lproj/BibPref_AutoFile.xib
===================================================================
--- trunk/bibdesk/French.lproj/BibPref_AutoFile.xib 2018-07-17 06:30:30 UTC
(rev 22426)
+++ trunk/bibdesk/French.lproj/BibPref_AutoFile.xib 2018-07-17 18:07:36 UTC
(rev 22427)
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">17D47</string>
+ <string key="IBDocument.SystemVersion">17G65</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
- <string key="IBDocument.AppKitVersion">1561.20.106</string>
- <string key="IBDocument.HIToolboxVersion">910.40</string>
+ <string key="IBDocument.AppKitVersion">1561.60.100</string>
+ <string key="IBDocument.HIToolboxVersion">911.10</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">851</string>
@@ -29,7 +29,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="379568108">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<nil key="NSNibTouchBar"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
@@ -39,7 +39,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{30,
316}, {232, 18}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="443269905">
<int
key="NSCellFlags">67108864</int>
@@ -73,7 +72,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{570,
353}, {100, 32}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="118899412">
<int
key="NSCellFlags">67108864</int>
@@ -99,7 +97,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{643,
312}, {21, 24}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="131228171">
<int
key="NSCellFlags">67108864</int>
@@ -125,7 +122,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
141}, {57, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="777663268">
<int
key="NSCellFlags">67108864</int>
@@ -171,7 +167,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{10, 13}, {454, 39}}</string>
<reference key="NSSuperview" ref="766259252"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="888696891">
<int key="NSCellFlags">67108864</int>
@@ -195,12 +190,10 @@
</array>
<string
key="NSFrame">{{1, 1}, {598, 65}}</string>
<reference
key="NSSuperview" ref="439657964"/>
- <reference
key="NSWindow"/>
</object>
</array>
<string key="NSFrame">{{42,
24}, {600, 67}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<string key="NSOffsets">{0,
0}</string>
<object class="NSTextFieldCell"
key="NSTitleCell">
<int
key="NSCellFlags">67108864</int>
@@ -239,7 +232,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{153,
214}, {514, 26}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object
class="NSPopUpButtonCell" key="NSCell" id="557791840">
<int
key="NSCellFlags">-2076180416</int>
@@ -281,10 +273,7 @@
<reference ref="332710777"/>
<object
class="NSMenuItem" id="55650444">
<reference key="NSMenu" ref="837957319"/>
-
<object class="NSMutableString" key="NSTitle">
-
<bytes
key="NS.bytes">UHJlbWllcnMgYXV0ZXVycyArIMKrIC8gwrsgKyBhbm7DqWUgKyBsZXR0cmVzIHVuaXF1ZXMgKyBleHRl
-bnNpb24</bytes>
-
</object>
+
<string key="NSTitle">Premiers auteurs + « / » + année + lettres uniques +
extension</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
@@ -296,10 +285,7 @@
</object>
<object
class="NSMenuItem" id="905840223">
<reference key="NSMenu" ref="837957319"/>
-
<object class="NSMutableString" key="NSTitle">
-
<bytes
key="NS.bytes">UHJlbWllciBhdXRldXIgKyDCqyAvIMK7ICsgMTUgbW90cyBkdSB0aXRyZSArIGxldHRyZXMgdW5pcXVl
-cyArIGV4dGVuc2lvbg</bytes>
-
</object>
+
<string key="NSTitle">Premier auteur + « / » + 15 mots du titre + lettres
uniques + extension</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
@@ -349,7 +335,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{35,
220}, {116, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="59179889">
<int
key="NSCellFlags">67108864</int>
@@ -369,7 +354,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{329,
361}, {239, 22}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="904869679">
<int
key="NSCellFlags">-1804599231</int>
@@ -395,7 +379,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{29,
111}, {635, 22}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="876270127">
<int
key="NSCellFlags">-2073034687</int>
@@ -416,7 +399,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
246}, {154, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="557249209">
<int
key="NSCellFlags">67108864</int>
@@ -440,7 +422,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
391}, {246, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="937480139">
<int
key="NSCellFlags">67108864</int>
@@ -460,7 +441,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{555,
168}, {115, 32}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="304318043">
<int
key="NSCellFlags">67108864</int>
@@ -486,7 +466,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{156,
176}, {262, 22}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="648759712">
<int
key="NSCellFlags">-1536163775</int>
@@ -507,7 +486,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{29,
178}, {122, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="868974587">
<int
key="NSCellFlags">67108864</int>
@@ -527,7 +505,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{30,
269}, {250, 18}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="263253738">
<int
key="NSCellFlags">67108864</int>
@@ -552,7 +529,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
293}, {109, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="699911002">
<int
key="NSCellFlags">67108864</int>
@@ -572,7 +548,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{30,
342}, {329, 38}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool
key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSNumRows">2</int>
@@ -639,8 +614,6 @@
</object>
</array>
<string key="NSFrameSize">{684, 428}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
@@ -921,10 +894,7 @@
<reference ref="1032679518"/>
<object class="NSMenuItem" id="384011134">
<reference key="NSMenu" ref="91513501"/>
-
<object class="NSMutableString" key="NSTitle">
-
<bytes
key="NS.bytes">UHJlbWllciBhdXRldXIgKyDCqyAvIMK7ICsgYW5uw6llICsgbGV0dHJlcyB1bmlxdWVzICsgZXh0ZW5z
-aW9uA</bytes>
-
</object>
+
<string key="NSTitle">Premier auteur + « / » + année + lettres uniques
+ extension</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
@@ -936,10 +906,7 @@
</object>
<object class="NSMenuItem" id="15840913">
<reference key="NSMenu" ref="91513501"/>
-
<object class="NSMutableString" key="NSTitle">
-
<bytes
key="NS.bytes">UHJlbWllciBhdXRldXIgKyDCqyAvIMK7ICsgMTUgbW90cyBkdSB0aXRyZSArIG5vbWJyZSB1bmlxdWUg
-KyBleHRlbnNpb24</bytes>
-
</object>
+
<string key="NSTitle">Premier auteur + « / » + 15 mots du titre +
nombre unique + extension</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
@@ -2766,9 +2733,9 @@
<string
key="104.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string
key="106.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string
key="107.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string
key="137.IBEditorWindowLastContentRect">{{126, 414}, {686, 282}}</string>
+ <string
key="137.IBEditorWindowLastContentRect">{{8, 414}, {686, 282}}</string>
<string
key="137.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string
key="137.IBWindowTemplateEditedContentRect">{{126, 414}, {686, 282}}</string>
+ <string
key="137.IBWindowTemplateEditedContentRect">{{8, 414}, {686, 282}}</string>
<boolean value="YES"
key="137.windowTemplate.hasMinSize"/>
<string key="137.windowTemplate.minSize">{213,
107}</string>
<string
key="138.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2780,6 +2747,7 @@
<string
key="146.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string
key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string
key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string
key="150.CustomClassName">BDSKTextField</string>
<object class="NSMutableDictionary"
key="150.IBAttributePlaceholdersKey">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute"
key="NS.object.0">
@@ -2983,7 +2951,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary"
key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">390</int>
+ <int key="maxID">391</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray"
key="referencedPartialClassDescriptions">
@@ -3181,6 +3149,16 @@
</object>
</object>
</array>
+ <array class="NSMutableArray"
key="referencedPartialClassDescriptionsV3.1+">
+ <object class="IBPartialClassDescription">
+ <string
key="className">BDSKTextField</string>
+ <string
key="superclassName">NSTextField</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBDocumentRelativeSource</string>
+ <string
key="minorKey">../BDSKTextField.h</string>
+ </object>
+ </object>
+ </array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string
key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
Modified: trunk/bibdesk/French.lproj/BibPref_CiteKey.xib
===================================================================
--- trunk/bibdesk/French.lproj/BibPref_CiteKey.xib 2018-07-17 06:30:30 UTC
(rev 22426)
+++ trunk/bibdesk/French.lproj/BibPref_CiteKey.xib 2018-07-17 18:07:36 UTC
(rev 22427)
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">17D47</string>
+ <string key="IBDocument.SystemVersion">17G65</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
- <string key="IBDocument.AppKitVersion">1561.20.106</string>
- <string key="IBDocument.HIToolboxVersion">910.40</string>
+ <string key="IBDocument.AppKitVersion">1561.60.100</string>
+ <string key="IBDocument.HIToolboxVersion">911.10</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">851</string>
@@ -1620,6 +1620,14 @@
</object>
<int key="connectionID">376</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection"
key="connection">
+ <string
key="label">delegate</string>
+ <reference key="source"
ref="355797761"/>
+ <reference key="destination"
ref="107350581"/>
+ </object>
+ <int key="connectionID">429</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -2376,6 +2384,7 @@
<string>249.ImportedFromIB2</string>
<string>250.IBPluginDependency</string>
<string>250.ImportedFromIB2</string>
+ <string>251.CustomClassName</string>
<string>251.IBAttributePlaceholdersKey</string>
<string>251.IBPluginDependency</string>
<string>251.ImportedFromIB2</string>
@@ -2593,6 +2602,7 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
+ <string>BDSKTextField</string>
<object class="NSMutableDictionary">
<string
key="NS.key.0">ToolTip</string>
<object
class="IBToolTipAttribute" key="NS.object.0">
@@ -2759,7 +2769,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">428</int>
+ <int key="maxID">429</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray"
key="referencedPartialClassDescriptions">
@@ -3125,6 +3135,17 @@
</object>
</object>
</object>
+ <object class="NSMutableArray"
key="referencedPartialClassDescriptionsV3.1+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string
key="className">BDSKTextField</string>
+ <string
key="superclassName">NSTextField</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBDocumentRelativeSource</string>
+ <string
key="minorKey">../BDSKTextField.h</string>
+ </object>
+ </object>
+ </object>
<object class="NSMutableArray"
key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
Modified: trunk/bibdesk/German.lproj/BibPref_AutoFile.xib
===================================================================
--- trunk/bibdesk/German.lproj/BibPref_AutoFile.xib 2018-07-17 06:30:30 UTC
(rev 22426)
+++ trunk/bibdesk/German.lproj/BibPref_AutoFile.xib 2018-07-17 18:07:36 UTC
(rev 22427)
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">17D47</string>
+ <string key="IBDocument.SystemVersion">17G65</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
- <string key="IBDocument.AppKitVersion">1561.20.106</string>
- <string key="IBDocument.HIToolboxVersion">910.40</string>
+ <string key="IBDocument.AppKitVersion">1561.60.100</string>
+ <string key="IBDocument.HIToolboxVersion">911.10</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">851</string>
@@ -29,7 +29,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="379568108">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<nil key="NSNibTouchBar"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
@@ -39,7 +39,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{30,
312}, {250, 18}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="443269905">
<int
key="NSCellFlags">67108864</int>
@@ -73,7 +72,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{584,
349}, {109, 32}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="118899412">
<int
key="NSCellFlags">67108864</int>
@@ -99,7 +97,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{666,
308}, {21, 24}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="131228171">
<int
key="NSCellFlags">67108864</int>
@@ -125,7 +122,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{26,
137}, {67, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="777663268">
<int
key="NSCellFlags">67108864</int>
@@ -171,7 +167,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{10, 13}, {454, 39}}</string>
<reference key="NSSuperview" ref="766259252"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="888696891">
<int key="NSCellFlags">67108864</int>
@@ -194,12 +189,10 @@
</array>
<string
key="NSFrame">{{1, 1}, {559, 65}}</string>
<reference
key="NSSuperview" ref="439657964"/>
- <reference
key="NSWindow"/>
</object>
</array>
<string key="NSFrame">{{73,
20}, {561, 67}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<string key="NSOffsets">{0,
0}</string>
<object class="NSTextFieldCell"
key="NSTitleCell">
<int
key="NSCellFlags">67108864</int>
@@ -238,7 +231,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{125,
210}, {565, 26}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object
class="NSPopUpButtonCell" key="NSCell" id="557791840">
<int
key="NSCellFlags">-2080374720</int>
@@ -342,7 +334,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{66,
216}, {57, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="59179889">
<int
key="NSCellFlags">67108864</int>
@@ -362,7 +353,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{299,
357}, {283, 22}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="904869679">
<int
key="NSCellFlags">-1804599231</int>
@@ -388,7 +378,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{29,
107}, {658, 22}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="876270127">
<int
key="NSCellFlags">-2073034687</int>
@@ -409,7 +398,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
242}, {130, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="557249209">
<int
key="NSCellFlags">67108864</int>
@@ -433,7 +421,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
387}, {202, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="937480139">
<int
key="NSCellFlags">67108864</int>
@@ -453,7 +440,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{584,
164}, {109, 32}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="304318043">
<int
key="NSCellFlags">67108864</int>
@@ -479,7 +465,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{128,
172}, {454, 22}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="648759712">
<int
key="NSCellFlags">-1536163775</int>
@@ -500,7 +485,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{29,
174}, {94, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="868974587">
<int
key="NSCellFlags">67108864</int>
@@ -520,7 +504,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{30,
265}, {262, 18}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="263253738">
<int
key="NSCellFlags">67108864</int>
@@ -545,7 +528,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
289}, {80, 17}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="699911002">
<int
key="NSCellFlags">67108864</int>
@@ -565,7 +547,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{30,
338}, {317, 38}}</string>
<reference key="NSSuperview"
ref="379568108"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool
key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSNumRows">2</int>
@@ -632,8 +613,6 @@
</object>
</array>
<string key="NSFrameSize">{707, 424}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
@@ -2768,6 +2747,7 @@
<string
key="148.IBEditorWindowLastContentRect">{{116, 161}, {565, 563}}</string>
<string
key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string
key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string
key="150.CustomClassName">BDSKTextField</string>
<object class="NSMutableDictionary"
key="150.IBAttributePlaceholdersKey">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute"
key="NS.object.0">
@@ -3255,6 +3235,16 @@
</object>
</object>
</array>
+ <array class="NSMutableArray"
key="referencedPartialClassDescriptionsV3.1+">
+ <object class="IBPartialClassDescription">
+ <string
key="className">BDSKTextField</string>
+ <string
key="superclassName">NSTextField</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBDocumentRelativeSource</string>
+ <string
key="minorKey">../BDSKTextField.h</string>
+ </object>
+ </object>
+ </array>
<array class="NSMutableArray"
key="referencedPartialClassDescriptionsV3.2+">
<object class="IBPartialClassDescription">
<string
key="className">NSActionCell</string>
Modified: trunk/bibdesk/German.lproj/BibPref_CiteKey.xib
===================================================================
--- trunk/bibdesk/German.lproj/BibPref_CiteKey.xib 2018-07-17 06:30:30 UTC
(rev 22426)
+++ trunk/bibdesk/German.lproj/BibPref_CiteKey.xib 2018-07-17 18:07:36 UTC
(rev 22427)
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">17D47</string>
+ <string key="IBDocument.SystemVersion">17G65</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
- <string key="IBDocument.AppKitVersion">1561.20.106</string>
- <string key="IBDocument.HIToolboxVersion">910.40</string>
+ <string key="IBDocument.AppKitVersion">1561.60.100</string>
+ <string key="IBDocument.HIToolboxVersion">911.10</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">851</string>
@@ -29,7 +29,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="321430047">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<nil key="NSNibTouchBar"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
@@ -39,7 +39,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
245}, {111, 17}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="222412844">
<int
key="NSCellFlags">67108864</int>
@@ -79,7 +78,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{29,
137}, {67, 17}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="98792986">
<int
key="NSCellFlags">67108864</int>
@@ -103,7 +101,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{533,
276}, {21, 24}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="449785958">
<int
key="NSCellFlags">67108864</int>
@@ -129,7 +126,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{127,
213}, {430, 26}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object
class="NSPopUpButtonCell" key="NSCell" id="817141962">
<int
key="NSCellFlags">-2080374720</int>
@@ -255,7 +251,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{10, 13}, {454, 39}}</string>
<reference key="NSSuperview" ref="181747349"/>
-
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="928619137">
<int key="NSCellFlags">67108864</int>
@@ -278,12 +273,10 @@
</array>
<string
key="NSFrame">{{1, 1}, {474, 65}}</string>
<reference
key="NSSuperview" ref="215889833"/>
- <reference
key="NSWindow"/>
</object>
</array>
<string key="NSFrame">{{49,
20}, {476, 67}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<string key="NSOffsets">{0,
0}</string>
<object class="NSTextFieldCell"
key="NSTitleCell">
<int
key="NSCellFlags">67108864</int>
@@ -322,7 +315,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{66,
219}, {57, 17}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="578207608">
<int
key="NSCellFlags">67108864</int>
@@ -342,7 +334,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{30,
280}, {463, 18}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="228884809">
<int
key="NSCellFlags">67108864</int>
@@ -372,7 +363,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17,
304}, {262, 17}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="98507934">
<int
key="NSCellFlags">67108864</int>
@@ -392,7 +382,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{41,
107}, {481, 22}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="301756987">
<int
key="NSCellFlags">-2073034687</int>
@@ -418,7 +407,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{445,
167}, {115, 32}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="492553237">
<int
key="NSCellFlags">67108864</int>
@@ -444,7 +432,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{130,
175}, {313, 22}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="679091113">
<int
key="NSCellFlags">-1536163775</int>
@@ -465,7 +452,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{29,
177}, {94, 17}}</string>
<reference key="NSSuperview"
ref="321430047"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell"
key="NSCell" id="558038706">
<int
key="NSCellFlags">67108864</int>
@@ -481,8 +467,6 @@
</object>
</array>
<string key="NSFrameSize">{574, 341}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
@@ -1621,6 +1605,14 @@
</object>
<int key="connectionID">376</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection"
key="connection">
+ <string
key="label">delegate</string>
+ <reference key="source"
ref="355797761"/>
+ <reference key="destination"
ref="107350581"/>
+ </object>
+ <int key="connectionID">429</int>
+ </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -2322,9 +2314,9 @@
</object>
</object>
<string
key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string
key="240.IBEditorWindowLastContentRect">{{181, 160}, {574, 289}}</string>
+ <string
key="240.IBEditorWindowLastContentRect">{{120, 160}, {574, 289}}</string>
<string
key="240.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string
key="240.IBWindowTemplateEditedContentRect">{{181, 160}, {574, 289}}</string>
+ <string
key="240.IBWindowTemplateEditedContentRect">{{120, 160}, {574, 289}}</string>
<boolean value="YES"
key="240.windowTemplate.hasMinSize"/>
<string key="240.windowTemplate.minSize">{213,
107}</string>
<string
key="241.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2345,6 +2337,7 @@
<string
key="248.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string
key="249.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string
key="250.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string
key="251.CustomClassName">BDSKTextField</string>
<object class="NSMutableDictionary"
key="251.IBAttributePlaceholdersKey">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute"
key="NS.object.0">
@@ -2456,7 +2449,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary"
key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">428</int>
+ <int key="maxID">429</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray"
key="referencedPartialClassDescriptions">
@@ -2595,6 +2588,16 @@
</object>
</object>
</array>
+ <array class="NSMutableArray"
key="referencedPartialClassDescriptionsV3.1+">
+ <object class="IBPartialClassDescription">
+ <string
key="className">BDSKTextField</string>
+ <string
key="superclassName">NSTextField</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBDocumentRelativeSource</string>
+ <string
key="minorKey">../BDSKTextField.h</string>
+ </object>
+ </object>
+ </array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string
key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
