Revision: 24109
http://sourceforge.net/p/bibdesk/svn/24109
Author: hofman
Date: 2019-08-02 09:39:27 +0000 (Fri, 02 Aug 2019)
Log Message:
-----------
provide default implementation of some system colors when not available
Modified Paths:
--------------
trunk/bibdesk/BDSKCitationFormatter.m
trunk/bibdesk/BDSKComplexStringEditor.m
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BDSKErrorEditor.m
trunk/bibdesk/BDSKFormatParser.m
trunk/bibdesk/BDSKPathColorTransformer.m
trunk/bibdesk/BDSKTextImportController.m
trunk/bibdesk/BDSKTypeTemplate.m
trunk/bibdesk/BibDocument_DataSource.m
trunk/bibdesk/BibPref_Export.m
trunk/bibdesk/BibPref_TeX.m
trunk/bibdesk/NSColor_BDSKExtensions.h
trunk/bibdesk/NSColor_BDSKExtensions.m
trunk/bibdesk/NSImage_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKCitationFormatter.m
===================================================================
--- trunk/bibdesk/BDSKCitationFormatter.m 2019-08-02 08:36:20 UTC (rev
24108)
+++ trunk/bibdesk/BDSKCitationFormatter.m 2019-08-02 09:39:27 UTC (rev
24109)
@@ -38,14 +38,9 @@
#import "BDSKCitationFormatter.h"
#import "BDSKTypeManager.h"
+#import "NSColor_BDSKExtensions.h"
-#if SDK_BEFORE(10_14)
-@interface NSColor (BDSKYosemiteDeclarations)
-+ (NSColor *)linkColor;
-@end
-#endif
-
@implementation BDSKCitationFormatter
@synthesize delegate;
@@ -95,7 +90,7 @@
NSUInteger start, length = [string length];
NSRange range = NSMakeRange(0, 0);
NSString *keyString;
- NSColor *color = [NSColor respondsToSelector:@selector(linkColor)] ?
[NSColor linkColor] : [NSColor blueColor];
+ NSColor *color = [NSColor linkColor];
[attrString removeAttribute:NSLinkAttributeName range:NSMakeRange(0,
length)];
Modified: trunk/bibdesk/BDSKComplexStringEditor.m
===================================================================
--- trunk/bibdesk/BDSKComplexStringEditor.m 2019-08-02 08:36:20 UTC (rev
24108)
+++ trunk/bibdesk/BDSKComplexStringEditor.m 2019-08-02 09:39:27 UTC (rev
24109)
@@ -200,7 +200,7 @@
- (void)setError:(NSError *)error {
NSString *reason = [error localizedDescription];
NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Invalid
BibTeX string: %@. This change will not be recorded.", @"Tool tip message"),
reason];
- [expandedValueTextField setTextColor:[NSColor redColor]];
+ [expandedValueTextField setTextColor:[NSColor systemRedColor]];
[expandedValueTextField setStringValue:reason];
[expandedValueTextField setToolTip:message];
}
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2019-08-02 08:36:20 UTC (rev 24108)
+++ trunk/bibdesk/BDSKEditor.m 2019-08-02 09:39:27 UTC (rev 24109)
@@ -3752,7 +3752,7 @@
message = NSLocalizedString(@"This cite-key is a duplicate", @"Tool
tip message");
[citeKeyWarningButton setHidden:message == nil];
[citeKeyWarningButton setToolTip:message];
- [citeKeyField setTextColor:(message ? [NSColor redColor] : [NSColor
controlTextColor])];
+ [citeKeyField setTextColor:(message ? [NSColor systemRedColor] :
[NSColor controlTextColor])];
}
@end
Modified: trunk/bibdesk/BDSKErrorEditor.m
===================================================================
--- trunk/bibdesk/BDSKErrorEditor.m 2019-08-02 08:36:20 UTC (rev 24108)
+++ trunk/bibdesk/BDSKErrorEditor.m 2019-08-02 09:39:27 UTC (rev 24109)
@@ -49,22 +49,12 @@
#import "BDSKErrorObject.h"
#import "BDSKDocumentController.h"
#import "BDSKTouchBarButtonGroup.h"
+#import "NSColor_BDSKExtensions.h"
#define BDSKTouchBarItemIdentifierButtons
@"edu.ucsd.mmccrack.bibdesk.touchbar-item.buttons"
static char BDSKErrorEditorObservationContext;
-#if SDK_BEFORE(10_10)
-@interface NSColor (BDSKYosemiteDeclarations)
-- (NSColor *)systemBlueColor;
-- (NSColor *)systemRedColor;
-- (NSColor *)systemPurpleColor;
-- (NSColor *)systemBrownColor;
-- (NSColor *)systemGrayColor;
-- (NSColor *)systemOrangeColor;
-@end
-#endif
-
@implementation BDSKErrorEditor
@synthesize textView, syntaxHighlightCheckbox, reopenButton, reloadButton,
lineNumberField, manager, errors, fileURL, displayName, pasteDragData,
pasteDrag;
@@ -81,21 +71,12 @@
+ (void)initialize {
BDSKINITIALIZE;
- if (RUNNING_BEFORE(10_10)) {
- quoteColor = [[NSColor blueColor] retain];
- delimColor = [[NSColor redColor] retain];
- typeColor = [[NSColor purpleColor] retain];
- quotedColor = [[NSColor brownColor] retain];
- commentColor = [[NSColor grayColor] retain];
- hashColor = [[NSColor magentaColor] retain];
- } else {
- quoteColor = [[NSColor systemBlueColor] retain];
- delimColor = [[NSColor systemRedColor] retain];
- typeColor = [[NSColor systemPurpleColor] retain];
- quotedColor = [[NSColor systemBrownColor] retain];
- commentColor = [[NSColor systemGrayColor] retain];
- hashColor = [[NSColor systemOrangeColor] retain];
- }
+ quoteColor = [[NSColor systemBlueColor] retain];
+ delimColor = [[NSColor systemRedColor] retain];
+ typeColor = [[NSColor systemPurpleColor] retain];
+ quotedColor = [[NSColor systemBrownColor] retain];
+ commentColor = [[NSColor systemGrayColor] retain];
+ hashColor = [[NSColor systemOrangeColor] retain];
}
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
Modified: trunk/bibdesk/BDSKFormatParser.m
===================================================================
--- trunk/bibdesk/BDSKFormatParser.m 2019-08-02 08:36:20 UTC (rev 24108)
+++ trunk/bibdesk/BDSKFormatParser.m 2019-08-02 09:39:27 UTC (rev 24109)
@@ -102,7 +102,7 @@
paramTextAttr = [[NSDictionary alloc] initWithObjectsAndKeys:boldFont,
NSFontAttributeName, [NSColor colorWithCalibratedRed:0.0 green:0.7 blue:0.0
alpha:1.0], NSForegroundColorAttributeName, nil];
argAttr = [[NSDictionary alloc] initWithObjectsAndKeys:font,
NSFontAttributeName, [NSColor controlTextColor],
NSForegroundColorAttributeName, nil];
textAttr = [[NSDictionary alloc] initWithObjectsAndKeys:boldFont,
NSFontAttributeName, [NSColor controlTextColor],
NSForegroundColorAttributeName, nil];
- errorAttr = [[NSDictionary alloc] initWithObjectsAndKeys:font,
NSFontAttributeName, [NSColor redColor], NSForegroundColorAttributeName, nil];
+ errorAttr = [[NSDictionary alloc] initWithObjectsAndKeys:font,
NSFontAttributeName, [NSColor systemRedColor], NSForegroundColorAttributeName,
nil];
}
+ (NSString *)parseFormat:(NSString *)format forField:(NSString *)fieldName
ofItem:(id <BDSKParseableItem>)pub suggestion:(NSString *)suggestion
Modified: trunk/bibdesk/BDSKPathColorTransformer.m
===================================================================
--- trunk/bibdesk/BDSKPathColorTransformer.m 2019-08-02 08:36:20 UTC (rev
24108)
+++ trunk/bibdesk/BDSKPathColorTransformer.m 2019-08-02 09:39:27 UTC (rev
24109)
@@ -38,6 +38,7 @@
#import "BDSKPathColorTransformer.h"
#import "BDSKFiler.h"
+#import "NSColor_BDSKExtensions.h"
@implementation BDSKOldPathColorTransformer
@@ -79,7 +80,7 @@
if (statusFlag & BDSKTargetFileExistsErrorMask) {
return [NSColor controlTextColor];
} else if (statusFlag & BDSKIncompleteFieldsErrorMask) {
- return [NSColor redColor];
+ return [NSColor systemRedColor];
} else {
return [NSColor controlTextColor];
}
Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m 2019-08-02 08:36:20 UTC (rev
24108)
+++ trunk/bibdesk/BDSKTextImportController.m 2019-08-02 09:39:27 UTC (rev
24109)
@@ -67,6 +67,7 @@
#import "NSError_BDSKExtensions.h"
#import "NSAttributedString_BDSKExtensions.h"
#import "NSAlert_BDSKExtensions.h"
+#import "NSColor_BDSKExtensions.h"
#define BDSKTextImportControllerFrameAutosaveName @"BDSKTextImportController
Frame Autosave Name"
@@ -1150,7 +1151,7 @@
- (void)setCiteKeyDuplicateWarning:(BOOL)set{
[citeKeyWarningButton setToolTip:set ? NSLocalizedString(@"This cite-key
is a duplicate", @"Tool tip message") : nil];
[citeKeyWarningButton setHidden:set == NO];
- [citeKeyField setTextColor:(set ? [NSColor redColor] : [NSColor
controlTextColor])];
+ [citeKeyField setTextColor:(set ? [NSColor systemRedColor] : [NSColor
controlTextColor])];
}
#pragma mark TableView Data source
Modified: trunk/bibdesk/BDSKTypeTemplate.m
===================================================================
--- trunk/bibdesk/BDSKTypeTemplate.m 2019-08-02 08:36:20 UTC (rev 24108)
+++ trunk/bibdesk/BDSKTypeTemplate.m 2019-08-02 09:39:27 UTC (rev 24109)
@@ -40,6 +40,7 @@
#import "BDSKToken.h"
#import "BDSKTypeManager.h"
#import "BDSKStringConstants.h"
+#import "NSColor_BDSKExtensions.h"
NSString *BDSKTemplateDidChangeNotification =
@"BDSKTemplateDidChangeNotification";
@@ -80,7 +81,7 @@
NSColor *color = [NSColor controlTextColor];
if ([[self itemTemplate] count] == 0) {
if ([self isIncluded] || [self isDefaultTemplate])
- color = [NSColor redColor];
+ color = [NSColor systemRedColor];
else
color = [NSColor disabledControlTextColor];
}
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m 2019-08-02 08:36:20 UTC (rev
24108)
+++ trunk/bibdesk/BibDocument_DataSource.m 2019-08-02 09:39:27 UTC (rev
24109)
@@ -162,7 +162,7 @@
}
} else if ([tcID isEqualToString:BDSKCiteKeyString]) {
BibItem *pub = [[self shownPublications] objectAtIndex:row];
- [aCell setTextColor:[pub isValidCiteKey:[pub citeKey]] ? [NSColor
controlTextColor] : [NSColor redColor]];
+ [aCell setTextColor:[pub isValidCiteKey:[pub citeKey]] ? [NSColor
controlTextColor] : [NSColor systemRedColor]];
} else if ([tcID isBooleanField] || [tcID isTriStateField]) {
[aCell setEnabled:[self
hasGroupTypeSelected:BDSKExternalGroupType] == NO];
}
Modified: trunk/bibdesk/BibPref_Export.m
===================================================================
--- trunk/bibdesk/BibPref_Export.m 2019-08-02 08:36:20 UTC (rev 24108)
+++ trunk/bibdesk/BibPref_Export.m 2019-08-02 09:39:27 UTC (rev 24109)
@@ -45,6 +45,7 @@
#import "NSMenu_BDSKExtensions.h"
#import "BDSKPreferenceRecord.h"
#import "NSPasteboard_BDSKExtensions.h"
+#import "NSColor_BDSKExtensions.h"
#define BDSKPasteboardTypeTemplateRows
@"edu.ucsd.mmccrack.bibdesk.pasteboard.template-rows"
@@ -306,7 +307,7 @@
- (void)outlineView:(NSOutlineView *)ov willDisplayCell:(id)cell
forTableColumn:(NSTableColumn *)tableColumn item:(id)item{
NSString *columnID = [tableColumn identifier];
if ([cell respondsToSelector:@selector(setTextColor:)])
- [cell setTextColor:([item valueForKey:columnID] ? [NSColor
controlTextColor] : [NSColor redColor])];
+ [cell setTextColor:([item valueForKey:columnID] ? [NSColor
controlTextColor] : [NSColor systemRedColor])];
if([columnID isEqualToString:BDSKTemplateRoleString]) {
[cell removeAllItems];
[cell addItemsWithObjectValues:([item isLeaf]) ? roles : fileTypes];
Modified: trunk/bibdesk/BibPref_TeX.m
===================================================================
--- trunk/bibdesk/BibPref_TeX.m 2019-08-02 08:36:20 UTC (rev 24108)
+++ trunk/bibdesk/BibPref_TeX.m 2019-08-02 09:39:27 UTC (rev 24109)
@@ -45,6 +45,7 @@
#import "BDSKStringConstants.h"
#import "BDSKPreferenceController.h"
#import "NSAlert_BDSKExtensions.h"
+#import "NSColor_BDSKExtensions.h"
#define BDSK_TEX_DOWNLOAD_URL @"https://tug.org/mactex/";
@@ -120,7 +121,7 @@
if ([BDSKShellCommandFormatter isValidExecutableCommand:teXPath])
[texBinaryPathField setTextColor:[NSColor controlTextColor]];
else
- [texBinaryPathField setTextColor:[NSColor redColor]];
+ [texBinaryPathField setTextColor:[NSColor systemRedColor]];
}
- (void)updateBibTeXPathUI{
@@ -129,7 +130,7 @@
if ([BDSKShellCommandFormatter isValidExecutableCommand:bibTeXPath])
[bibtexBinaryPathField setTextColor:[NSColor controlTextColor]];
else
- [bibtexBinaryPathField setTextColor:[NSColor redColor]];
+ [bibtexBinaryPathField setTextColor:[NSColor systemRedColor]];
}
-(IBAction)changeTexBinPath:(id)sender{
Modified: trunk/bibdesk/NSColor_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSColor_BDSKExtensions.h 2019-08-02 08:36:20 UTC (rev
24108)
+++ trunk/bibdesk/NSColor_BDSKExtensions.h 2019-08-02 09:39:27 UTC (rev
24109)
@@ -70,3 +70,15 @@
- (id)scriptingRgbaColorDescriptor;
@end
+
+#if SDK_BEFORE(10_10)
+@interface NSColor (BDSKYosemiteDeclarations)
+- (NSColor *)systemBlueColor;
+- (NSColor *)systemRedColor;
+- (NSColor *)systemPurpleColor;
+- (NSColor *)systemBrownColor;
+- (NSColor *)systemGrayColor;
+- (NSColor *)systemOrangeColor;
+- (NSColor *)linkColor;
+@end
+#endif
Modified: trunk/bibdesk/NSColor_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSColor_BDSKExtensions.m 2019-08-02 08:36:20 UTC (rev
24108)
+++ trunk/bibdesk/NSColor_BDSKExtensions.m 2019-08-02 09:39:27 UTC (rev
24109)
@@ -37,6 +37,7 @@
*/
#import "NSColor_BDSKExtensions.h"
+#import "BDSKRuntime.h"
#if SDK_BEFORE(10_10)
@interface NSColor (BDSKYosemiteDeclarations)
@@ -124,6 +125,16 @@
@implementation NSColor (BDSKExtensions)
++ (void)load {
+ BDSKAddClassMethodImplementationFromSelector(self,
@selector(systemBlueColor), @selector(blueColor));
+ BDSKAddClassMethodImplementationFromSelector(self,
@selector(systemBrownColor), @selector(brownColor));
+ BDSKAddClassMethodImplementationFromSelector(self,
@selector(systemGrayColor), @selector(grayColor));
+ BDSKAddClassMethodImplementationFromSelector(self,
@selector(systemOrangeColor), @selector(magentaColor));
+ BDSKAddClassMethodImplementationFromSelector(self,
@selector(systemPurpleColor), @selector(purpleColor));
+ BDSKAddClassMethodImplementationFromSelector(self,
@selector(systemRedColor), @selector(redColor));
+ BDSKAddClassMethodImplementationFromSelector(self, @selector(linkColor),
@selector(blueColor));
+}
+
+ (NSColor *)colorWithAquaColor:(NSColor *)aAquaColor darkAquaColor:(NSColor
*)aDarkAquaColor {
if (RUNNING_AFTER(10_13))
return [[[BDSKDynamicColor alloc] initWithAquaColor:aAquaColor
darkAquaColor:aDarkAquaColor] autorelease];
@@ -196,7 +207,7 @@
+ (NSColor *)complexStringColor {
static NSColor *color = nil;
if (color == nil)
- color = [[NSColor respondsToSelector:@selector(systemBlueColor)] ?
[NSColor systemBlueColor] : [NSColor blueColor] retain];
+ color = [[NSColor systemBlueColor] retain];
return color;
}
Modified: trunk/bibdesk/NSImage_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSImage_BDSKExtensions.m 2019-08-02 08:36:20 UTC (rev
24108)
+++ trunk/bibdesk/NSImage_BDSKExtensions.m 2019-08-02 09:39:27 UTC (rev
24109)
@@ -40,6 +40,7 @@
#import "NSBezierPath_BDSKExtensions.h"
#import "NSAttributedString_BDSKExtensions.h"
#import "NSString_BDSKExtensions.h"
+#import "NSColor_BDSKExtensions.h"
#define BDSKImageNamePreviewDisplayTextTemplate @"BDSKPreviewDisplayText"
#define BDSKImageNamePreviewDisplayFilesTemplate @"BDSKPreviewDisplayFiles"
@@ -548,7 +549,7 @@
[self drawInRect:targetRect fromRect:NSZeroRect
operation:NSCompositeCopy fraction:1.0];
// draw a count of the rows being dragged, similar to Mail.app
- [[NSColor redColor] setFill];
+ [[NSColor systemRedColor] setFill];
[NSBezierPath fillHorizontalOvalInRect:NSInsetRect(countRect,
-countOffset, 0.0)];
[countString drawInRect:countRect];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
