Revision: 24032
http://sourceforge.net/p/bibdesk/svn/24032
Author: hofman
Date: 2019-07-15 21:21:16 +0000 (Mon, 15 Jul 2019)
Log Message:
-----------
rename property to allow declaring a property
Modified Paths:
--------------
trunk/bibdesk/BDSKTemplateDocument.m
trunk/bibdesk/BDSKTypeTemplate.h
trunk/bibdesk/BDSKTypeTemplate.m
trunk/bibdesk/English.lproj/TemplateDocument.xib
trunk/bibdesk/French.lproj/TemplateDocument.xib
trunk/bibdesk/German.lproj/TemplateDocument.xib
Modified: trunk/bibdesk/BDSKTemplateDocument.m
===================================================================
--- trunk/bibdesk/BDSKTemplateDocument.m 2019-07-15 21:06:06 UTC (rev
24031)
+++ trunk/bibdesk/BDSKTemplateDocument.m 2019-07-15 21:21:16 UTC (rev
24032)
@@ -174,7 +174,7 @@
defaultTypeIndex = [typeTemplates count];
[self addTypeTemplateForType:type];
}
- [[typeTemplates objectAtIndex:defaultTypeIndex] setDefault:YES];
+ [[typeTemplates objectAtIndex:defaultTypeIndex]
setDefaultTemplate:YES];
NSMutableArray *tmpFonts = [NSMutableArray array];
NSMutableArray *fontNames = [[[[NSFontManager sharedFontManager]
availableFontFamilies] mutableCopy] autorelease];
@@ -560,9 +560,9 @@
- (void)setDefaultTypeIndex:(NSUInteger)newDefaultTypeIndex {
if (defaultTypeIndex != newDefaultTypeIndex) {
[[[self undoManager] prepareWithInvocationTarget:self]
setDefaultTypeIndex:defaultTypeIndex];
- [[typeTemplates objectAtIndex:defaultTypeIndex] setDefault:NO];
+ [[typeTemplates objectAtIndex:defaultTypeIndex] setDefaultTemplate:NO];
defaultTypeIndex = newDefaultTypeIndex;
- [[typeTemplates objectAtIndex:defaultTypeIndex] setDefault:YES];
+ [[typeTemplates objectAtIndex:defaultTypeIndex]
setDefaultTemplate:YES];
[self updateStrings];
}
}
Modified: trunk/bibdesk/BDSKTypeTemplate.h
===================================================================
--- trunk/bibdesk/BDSKTypeTemplate.h 2019-07-15 21:06:06 UTC (rev 24031)
+++ trunk/bibdesk/BDSKTypeTemplate.h 2019-07-15 21:21:16 UTC (rev 24032)
@@ -43,7 +43,7 @@
@interface BDSKTypeTemplate : NSObject {
NSString *pubType;
BOOL included;
- BOOL isDefault;
+ BOOL defaultTemplate;
NSArray *requiredTokens;
NSArray *optionalTokens;
NSArray *itemTemplate;
@@ -54,10 +54,8 @@
@property (nonatomic, retain) NSString *pubType;
@property (nonatomic, getter=isIncluded) BOOL included;
+@property (nonatomic, getter=isDefaultTemplate) BOOL defaultTemplate;
-- (BOOL)isDefault;
-- (void)setDefault:(BOOL)newDefault;
-
@property (nonatomic, readonly) NSColor *textColor;
@property (nonatomic, readonly) NSArray *requiredTokens;
Modified: trunk/bibdesk/BDSKTypeTemplate.m
===================================================================
--- trunk/bibdesk/BDSKTypeTemplate.m 2019-07-15 21:06:06 UTC (rev 24031)
+++ trunk/bibdesk/BDSKTypeTemplate.m 2019-07-15 21:21:16 UTC (rev 24032)
@@ -45,7 +45,7 @@
@implementation BDSKTypeTemplate
-@synthesize pubType, included, requiredTokens, optionalTokens, itemTemplate;
+@synthesize pubType, included, defaultTemplate, requiredTokens,
optionalTokens, itemTemplate;
@dynamic textColor, string;
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
@@ -76,18 +76,10 @@
#pragma mark Accessors
-- (BOOL)isDefault {
- return isDefault;
-}
-
-- (void)setDefault:(BOOL)newDefault {
- isDefault = newDefault;
-}
-
- (NSColor *)textColor {
NSColor *color = [NSColor controlTextColor];
if ([[self itemTemplate] count] == 0) {
- if ([self isIncluded] || [self isDefault])
+ if ([self isIncluded] || [self isDefaultTemplate])
color = [NSColor redColor];
else
color = [NSColor disabledControlTextColor];
Modified: trunk/bibdesk/English.lproj/TemplateDocument.xib
===================================================================
--- trunk/bibdesk/English.lproj/TemplateDocument.xib 2019-07-15 21:06:06 UTC
(rev 24031)
+++ trunk/bibdesk/English.lproj/TemplateDocument.xib 2019-07-15 21:21:16 UTC
(rev 24032)
@@ -454,7 +454,7 @@
</textFieldCell>
<tableColumnResizingMask
key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<connections>
- <binding
destination="700" name="fontBold" keyPath="arrangedObjects.default" id="1600"/>
+ <binding
destination="700" name="fontBold" keyPath="arrangedObjects.defaultTemplate"
id="1600"/>
<binding
destination="700" name="value" keyPath="arrangedObjects.pubType" id="1684">
<dictionary
key="options">
<integer
key="NSAllowsEditingMultipleValuesSelection" value="0"/>
@@ -1010,7 +1010,7 @@
<string>optionalTokens</string>
<string>@distinctUnionOfArrays.requiredTokens</string>
<string>@unionOfArrays.requiredTokens</string>
- <string>default</string>
+ <string>defaultTemplate</string>
<string>textColor</string>
<string>templateOptions.dateFormat.displayName</string>
<string>fonts</string>
@@ -1118,7 +1118,7 @@
<string>bold</string>
<string>italic</string>
<string>defaultTypeIndex</string>
- <string>default</string>
+ <string>defaultTemplate</string>
<string>specialTokens</string>
<string>templateOptions.appending</string>
<string>templateOptions.appending.key</string>
Modified: trunk/bibdesk/French.lproj/TemplateDocument.xib
===================================================================
--- trunk/bibdesk/French.lproj/TemplateDocument.xib 2019-07-15 21:06:06 UTC
(rev 24031)
+++ trunk/bibdesk/French.lproj/TemplateDocument.xib 2019-07-15 21:21:16 UTC
(rev 24032)
@@ -455,7 +455,7 @@
</textFieldCell>
<tableColumnResizingMask
key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<connections>
- <binding
destination="700" name="fontBold" keyPath="arrangedObjects.default" id="1600"/>
+ <binding
destination="700" name="fontBold" keyPath="arrangedObjects.defaultTemplate"
id="1600"/>
<binding
destination="700" name="value" keyPath="arrangedObjects.pubType" id="1684">
<dictionary
key="options">
<integer
key="NSAllowsEditingMultipleValuesSelection" value="0"/>
@@ -1012,7 +1012,7 @@
<string>optionalTokens</string>
<string>@distinctUnionOfArrays.requiredTokens</string>
<string>@unionOfArrays.requiredTokens</string>
- <string>default</string>
+ <string>defaultTemplate</string>
<string>textColor</string>
<string>templateOptions.dateFormat.displayName</string>
<string>fonts</string>
@@ -1120,7 +1120,7 @@
<string>bold</string>
<string>italic</string>
<string>defaultTypeIndex</string>
- <string>default</string>
+ <string>defaultTemplate</string>
<string>specialTokens</string>
<string>templateOptions.appending</string>
<string>templateOptions.appending.key</string>
Modified: trunk/bibdesk/German.lproj/TemplateDocument.xib
===================================================================
--- trunk/bibdesk/German.lproj/TemplateDocument.xib 2019-07-15 21:06:06 UTC
(rev 24031)
+++ trunk/bibdesk/German.lproj/TemplateDocument.xib 2019-07-15 21:21:16 UTC
(rev 24032)
@@ -455,7 +455,7 @@
</textFieldCell>
<tableColumnResizingMask
key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<connections>
- <binding
destination="700" name="fontBold" keyPath="arrangedObjects.default" id="1600"/>
+ <binding
destination="700" name="fontBold" keyPath="arrangedObjects.defaultTemplate"
id="1600"/>
<binding
destination="700" name="value" keyPath="arrangedObjects.pubType" id="1684">
<dictionary
key="options">
<integer
key="NSAllowsEditingMultipleValuesSelection" value="0"/>
@@ -1012,7 +1012,7 @@
<string>optionalTokens</string>
<string>@distinctUnionOfArrays.requiredTokens</string>
<string>@unionOfArrays.requiredTokens</string>
- <string>default</string>
+ <string>defaultTemplate</string>
<string>textColor</string>
<string>templateOptions.dateFormat.displayName</string>
<string>fonts</string>
@@ -1120,7 +1120,7 @@
<string>bold</string>
<string>italic</string>
<string>defaultTypeIndex</string>
- <string>default</string>
+ <string>defaultTemplate</string>
<string>specialTokens</string>
<string>templateOptions.appending</string>
<string>templateOptions.appending.key</string>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
