Revision: 24096
http://sourceforge.net/p/bibdesk/svn/24096
Author: hofman
Date: 2019-07-31 23:07:07 +0000 (Wed, 31 Jul 2019)
Log Message:
-----------
properties for view classes
Modified Paths:
--------------
trunk/bibdesk/BDSKAddressTextField.h
trunk/bibdesk/BDSKAddressTextField.m
trunk/bibdesk/BDSKBackgroundView.h
trunk/bibdesk/BDSKBackgroundView.m
trunk/bibdesk/BDSKButtonBar.h
trunk/bibdesk/BDSKButtonBar.m
trunk/bibdesk/BDSKCollapsibleView.h
trunk/bibdesk/BDSKCollapsibleView.m
trunk/bibdesk/BDSKColoredView.h
trunk/bibdesk/BDSKColoredView.m
trunk/bibdesk/BDSKContainerView.h
trunk/bibdesk/BDSKContainerView.m
trunk/bibdesk/BDSKDragImageView.h
trunk/bibdesk/BDSKDragImageView.m
trunk/bibdesk/BDSKEdgeView.h
trunk/bibdesk/BDSKEdgeView.m
trunk/bibdesk/BDSKEditorTextFieldCell.h
trunk/bibdesk/BDSKEditorTextFieldCell.m
trunk/bibdesk/BDSKEditorTextView.h
trunk/bibdesk/BDSKEditorTextView.m
trunk/bibdesk/BDSKFontWell.h
trunk/bibdesk/BDSKFontWell.m
trunk/bibdesk/BDSKGradientView.h
trunk/bibdesk/BDSKGradientView.m
trunk/bibdesk/BDSKGroupCell.h
trunk/bibdesk/BDSKGroupCell.m
trunk/bibdesk/BDSKGroupOutlineView.h
trunk/bibdesk/BDSKGroupOutlineView.m
trunk/bibdesk/BDSKLevelIndicatorCell.h
trunk/bibdesk/BDSKLevelIndicatorCell.m
trunk/bibdesk/BDSKLineNumberView.h
trunk/bibdesk/BDSKLineNumberView.m
trunk/bibdesk/BDSKMainTableView.h
trunk/bibdesk/BDSKMainTableView.m
trunk/bibdesk/BDSKOutlineView.h
trunk/bibdesk/BDSKOutlineView.m
trunk/bibdesk/BDSKPreferenceIconView.h
trunk/bibdesk/BDSKPreferenceIconView.m
trunk/bibdesk/BDSKRatingButton.h
trunk/bibdesk/BDSKRatingButton.m
trunk/bibdesk/BDSKRatingButtonCell.h
trunk/bibdesk/BDSKRatingButtonCell.m
trunk/bibdesk/BDSKScriptMenu.h
trunk/bibdesk/BDSKScrollableTextField.h
trunk/bibdesk/BDSKScrollableTextField.m
trunk/bibdesk/BDSKScrollableTextFieldCell.h
trunk/bibdesk/BDSKScrollableTextFieldCell.m
trunk/bibdesk/BDSKSplitView.h
trunk/bibdesk/BDSKSplitView.m
trunk/bibdesk/BDSKStatusBar.h
trunk/bibdesk/BDSKStatusBar.m
trunk/bibdesk/BDSKTableView.h
trunk/bibdesk/BDSKTableView.m
trunk/bibdesk/BDSKTextImportItemTableView.h
trunk/bibdesk/BDSKTextImportItemTableView.m
trunk/bibdesk/BDSKTextWithIconCell.h
trunk/bibdesk/BDSKTextWithIconCell.m
trunk/bibdesk/BDSKWebView.h
trunk/bibdesk/BDSKWebView.m
trunk/bibdesk/BDSKZoomablePDFView.h
trunk/bibdesk/BDSKZoomablePDFView.m
trunk/bibdesk/BDSKZoomableTextView.h
trunk/bibdesk/BDSKZoomableTextView.m
Modified: trunk/bibdesk/BDSKAddressTextField.h
===================================================================
--- trunk/bibdesk/BDSKAddressTextField.h 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKAddressTextField.h 2019-07-31 23:07:07 UTC (rev
24096)
@@ -45,7 +45,7 @@
NSButton *button;
}
-- (NSButton *)button;
+@property (nonatomic, readonly) NSButton *button;
- (id <BDSKAddressTextFieldDelegate>)delegate;
- (void)setDelegate:(id <BDSKAddressTextFieldDelegate>)newDelegate;
Modified: trunk/bibdesk/BDSKAddressTextField.m
===================================================================
--- trunk/bibdesk/BDSKAddressTextField.m 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKAddressTextField.m 2019-07-31 23:07:07 UTC (rev
24096)
@@ -48,6 +48,8 @@
@implementation BDSKAddressTextField
+@synthesize button;
+
+ (Class)cellClass {
return [BDSKAddressTextFieldCell class];
}
@@ -119,10 +121,6 @@
[super dealloc];
}
-- (NSButton *)button {
- return button;
-}
-
- (void)handleKeyOrMainStateChangedNotification:(NSNotification *)note {
[self setNeedsDisplay:YES];
}
Modified: trunk/bibdesk/BDSKBackgroundView.h
===================================================================
--- trunk/bibdesk/BDSKBackgroundView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKBackgroundView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -42,7 +42,7 @@
@interface BDSKBackgroundView : NSView {
BOOL showFocusRing;
}
-- (BOOL)showFocusRing;
-- (void)setShowFocusRing:(BOOL)flag;
+@property (nonatomic) BOOL showFocusRing;
+
@end
Modified: trunk/bibdesk/BDSKBackgroundView.m
===================================================================
--- trunk/bibdesk/BDSKBackgroundView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKBackgroundView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -40,6 +40,8 @@
@implementation BDSKBackgroundView
+@synthesize showFocusRing;
+
- (id)initWithFrame:(NSRect)frameRect{
if(self = [super initWithFrame:frameRect]){
showFocusRing = NO;
@@ -52,10 +54,6 @@
return [super awakeAfterUsingCoder:aDecoder];
}
-- (BOOL)showFocusRing{
- return showFocusRing;
-}
-
- (void)setShowFocusRing:(BOOL)flag{
showFocusRing = flag;
[self setNeedsDisplay:YES];
Modified: trunk/bibdesk/BDSKButtonBar.h
===================================================================
--- trunk/bibdesk/BDSKButtonBar.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKButtonBar.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -49,15 +49,12 @@
SEL action;
}
-- (id)target;
-- (void)setTarget:(id)newTarget;
+@property (nonatomic, assign) id target;
+@property (nonatomic) SEL action;
-- (SEL)action;
-- (void)setAction:(SEL)newAction;
-
- (void)clickButton:(NSButton *)button;
-- (NSArray *)buttons;
+@property (nonatomic, readonly) NSArray *buttons;
- (void)addButton:(NSButton *)button;
- (void)removeButton:(NSButton *)button;
@@ -65,8 +62,9 @@
- (NSButton *)newButtonWithTitle:(NSString *)title representedObject:(NSString
*)object;
- (NSButton *)addButtonWithTitle:(NSString *)title representedObject:(NSString
*)object;
-- (NSButton *)selectedButton;
-- (id)representedObjectOfSelectedButton;
+@property (nonatomic, readonly) NSButton *selectedButton;
+@property (nonatomic, readonly) id representedObjectOfSelectedButton;
+
- (void)selectButton:(NSButton *)button;
- (void)selectButtonWithRepresentedObject:(id)representedObject;
Modified: trunk/bibdesk/BDSKButtonBar.m
===================================================================
--- trunk/bibdesk/BDSKButtonBar.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKButtonBar.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -46,6 +46,9 @@
@implementation BDSKButtonBar
+@synthesize target, action, buttons;
+@dynamic selectedButton, representedObjectOfSelectedButton;
+
// @@ Dark mode
- (id)initWithFrame:(NSRect)frame {
@@ -70,26 +73,6 @@
[self tile];
}
-- (id)target {
- return target;
-}
-
-- (void)setTarget:(id)newTarget {
- target = newTarget;
-}
-
-- (SEL)action {
- return action;
-}
-
-- (void)setAction:(SEL)newAction {
- action = newAction;
-}
-
-- (NSArray *)buttons {
- return buttons;
-}
-
- (void)addButton:(NSButton *)button {
[button setTarget:self];
[button setAction:@selector(clickButton:)];
Modified: trunk/bibdesk/BDSKCollapsibleView.h
===================================================================
--- trunk/bibdesk/BDSKCollapsibleView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKCollapsibleView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -46,9 +46,7 @@
BDSKRectEdgeMask collapseEdges;
}
-- (NSSize)minSize;
-- (void)setMinSize:(NSSize)size;
-- (BDSKRectEdgeMask)collapseEdges;
-- (void)setCollapseEdges:(BDSKRectEdgeMask)mask;
+@property (nonatomic) NSSize minSize;
+@property (nonatomic) BDSKRectEdgeMask collapseEdges;
@end
Modified: trunk/bibdesk/BDSKCollapsibleView.m
===================================================================
--- trunk/bibdesk/BDSKCollapsibleView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKCollapsibleView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -41,6 +41,8 @@
@implementation BDSKCollapsibleView
+@synthesize minSize, collapseEdges;
+
- (id)initWithFrame:(NSRect)frame {
self = [super initWithFrame:frame];
if (self) {
@@ -68,18 +70,6 @@
// NSView should handle encoding of contentView as it is a subview
}
-- (NSSize)minSize {
- return minSize;
-}
-
-- (void)setMinSize:(NSSize)size {
- minSize = size;
-}
-
-- (BDSKRectEdgeMask)collapseEdges {
- return collapseEdges;
-}
-
- (void)setCollapseEdges:(BDSKRectEdgeMask)mask {
if (mask != collapseEdges) {
collapseEdges = mask;
Modified: trunk/bibdesk/BDSKColoredView.h
===================================================================
--- trunk/bibdesk/BDSKColoredView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKColoredView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -43,7 +43,6 @@
NSColor *backgroundColor;
}
-- (NSColor *)backgroundColor;
-- (void)setBackgroundColor:(NSColor *)newColor;
+@property (nonatomic, retain) NSColor *backgroundColor;
@end
Modified: trunk/bibdesk/BDSKColoredView.m
===================================================================
--- trunk/bibdesk/BDSKColoredView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKColoredView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -41,6 +41,8 @@
@implementation BDSKColoredView
+@synthesize backgroundColor;
+
- (id)initWithFrame:(NSRect)frame {
self = [super initWithFrame:frame];
if (self) {
@@ -54,21 +56,10 @@
[super dealloc];
}
-- (NSColor *)backgroundColor {
- return [[backgroundColor retain] autorelease];
-}
-
-- (void)setBackgroundColor:(NSColor *)newColor {
- if (backgroundColor != newColor) {
- [backgroundColor release];
- backgroundColor = [newColor retain];
- }
-}
-
- (void)drawRect:(NSRect)rect {
- if (backgroundColor) {
+ if ([self backgroundColor]) {
[NSGraphicsContext saveGraphicsState];
- [backgroundColor setFill];
+ [[self backgroundColor] setFill];
[NSBezierPath fillRect:rect];
[NSGraphicsContext restoreGraphicsState];
}
Modified: trunk/bibdesk/BDSKContainerView.h
===================================================================
--- trunk/bibdesk/BDSKContainerView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKContainerView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -43,26 +43,8 @@
id contentView;
}
-/*!
- @method contentView
- @abstract Returns the contentView of the containerView.
- @discussion (discussion)
-*/
-- (id)contentView;
+@property (nonatomic, assign) id contentView;
-/*!
- @method setContentView
- @abstract Sets the contentView to aView, resizing it if necessary.
- @discussion (discussion)
- @param aView The view to set as contentView.
-*/
-- (void)setContentView:(NSView *)aView;
+@property (nonatomic, readonly) NSRect contentRect;
-/*!
- @method contentRect
- @abstract Returns the rect for the content.
- @discussion (discussion)
-*/
-- (NSRect)contentRect;
-
@end
Modified: trunk/bibdesk/BDSKContainerView.m
===================================================================
--- trunk/bibdesk/BDSKContainerView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKContainerView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -41,6 +41,9 @@
@implementation BDSKContainerView
+@synthesize contentView;
+@dynamic contentRect;
+
- (id)initWithFrame:(NSRect)frame {
self = [super initWithFrame:frame];
if (self) {
@@ -66,10 +69,6 @@
[coder encodeConditionalObject:contentView forKey:@"contentView"];
}
-- (id)contentView {
- return contentView;
-}
-
- (void)setContentView:(NSView *)aView {
if (aView != contentView) {
[contentView removeFromSuperview];
Modified: trunk/bibdesk/BDSKDragImageView.h
===================================================================
--- trunk/bibdesk/BDSKDragImageView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKDragImageView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -54,7 +54,6 @@
BOOL highlighted;
}
-- (id<BDSKDragImageViewDelegate>)delegate;
-- (void)setDelegate:(id<BDSKDragImageViewDelegate>)newDelegate;
+@property (nonatomic, assign) id<BDSKDragImageViewDelegate> delegate;
@end
Modified: trunk/bibdesk/BDSKDragImageView.m
===================================================================
--- trunk/bibdesk/BDSKDragImageView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKDragImageView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -44,14 +44,8 @@
@implementation BDSKDragImageView
-- (id<BDSKDragImageViewDelegate>)delegate {
- return delegate;
-}
+@synthesize delegate;
-- (void)setDelegate:(id<BDSKDragImageViewDelegate>)newDelegate {
- delegate = newDelegate;
-}
-
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender{
NSDragOperation dragOp = NSDragOperationNone;
if ([delegate
respondsToSelector:@selector(dragImageView:validateDrop:)])
Modified: trunk/bibdesk/BDSKEdgeView.h
===================================================================
--- trunk/bibdesk/BDSKEdgeView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKEdgeView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -54,60 +54,12 @@
NSMutableArray *edgeColors;
}
-/*!
- @method edges
- @abstract Returns the mask for the edges that the view should draw
- @discussion (discussion)
-*/
-- (BDSKRectEdgeMask)edges;
+@property (nonatomic) BDSKRectEdgeMask edges;
-/*!
- @method setEdges:
- @abstract Sets the mask for the edges to draw. Valid values are given
in the enum in the header.
- You can combine edges using the bitwise | operator.
- @discussion (discussion)
- @param mask The mask to set
-*/
-- (void)setEdges:(BDSKRectEdgeMask)mask;
-
-/*!
- @method setEdgeColor
- @abstract Sets the color of all the edges to aColor.
- @discussion (discussion)
- @param aColor The color to set.
-*/
+@property (nonatomic, copy) NSArray *edgeColors;
- (void)setEdgeColor:(NSColor *)aColor;
-/*!
- @method edgeColors
- @abstract Returns the array of colors to use for the edges.
- @discussion (discussion)
-*/
-- (NSArray *)edgeColors;
-
-/*!
- @method setEdgeColors:
- @abstract Sets the array of colors to use for the edges. This should be
an array of length 4, indexed by the NSRectEdge enum.
- @discussion (discussion)
- @param colors The array of colors to set.
-*/
-- (void)setEdgeColors:(NSArray *)colors;
-
-/*!
- @method colorForEdge:
- @abstract Returns the color used for the edge.
- @discussion (discussion)
- @param edge The edge for which you want the color.
-*/
- (NSColor *)colorForEdge:(NSRectEdge)edge;
-
-/*!
- @method setColor:forEdge:
- @abstract Sets the color used for the edge.
- @discussion (discussion)
- @param aColor The color to set.
- @param edge The edge for which you want set the color.
-*/
- (void)setColor:(NSColor *)aColor forEdge:(NSRectEdge)edge;
@end
Modified: trunk/bibdesk/BDSKEdgeView.m
===================================================================
--- trunk/bibdesk/BDSKEdgeView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKEdgeView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -43,6 +43,8 @@
@implementation BDSKEdgeView
+@synthesize edges, edgeColors;
+
// @@ Dark mode
- (id)initWithFrame:(NSRect)frame {
@@ -90,11 +92,6 @@
NSRectFill(edgeRect);
}
}
-
-- (BDSKRectEdgeMask)edges {
- return edges;
-}
-
- (void)setEdges:(BDSKRectEdgeMask)mask {
if (mask != edges) {
edges = mask;
@@ -103,10 +100,6 @@
}
}
-- (NSArray *)edgeColors {
- return edgeColors;
-}
-
- (void)setEdgeColors:(NSArray *)colors {
if (colors != edgeColors) {
[edgeColors release];
Modified: trunk/bibdesk/BDSKEditorTextFieldCell.h
===================================================================
--- trunk/bibdesk/BDSKEditorTextFieldCell.h 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKEditorTextFieldCell.h 2019-07-31 23:07:07 UTC (rev
24096)
@@ -45,18 +45,13 @@
NSURL *url;
}
-- (NSURL *)URL;
-- (void)setURL:(NSURL *)newURL;
+@property (nonatomic, retain) NSURL *URL;
-- (BOOL)hasButton;
-- (void)setHasButton:(BOOL)flag;
+@property (nonatomic) BOOL hasButton;
-- (id)buttonTarget;
-- (void)setButtonTarget:(id)target;
+@property (nonatomic, assign) id buttonTarget;
+@property (nonatomic) SEL buttonAction;
-- (SEL)buttonAction;
-- (void)setButtonAction:(SEL)selector;
-
- (NSRect)buttonRectForBounds:(NSRect)theRect;
@end
Modified: trunk/bibdesk/BDSKEditorTextFieldCell.m
===================================================================
--- trunk/bibdesk/BDSKEditorTextFieldCell.m 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKEditorTextFieldCell.m 2019-07-31 23:07:07 UTC (rev
24096)
@@ -48,6 +48,9 @@
@implementation BDSKEditorTextFieldCell
+@synthesize URL, hasButton;
+@dynamic buttonAction, buttonTarget;
+
+ (BOOL)prefersTrackingUntilMouseUp { return YES; }
- (void)commonInit {
@@ -151,27 +154,6 @@
return [super trackMouse:theEvent inRect:cellFrame ofView:controlView
untilMouseUp:untilMouseUp];
}
-- (NSURL *)URL {
- return url;
-}
-
-- (void)setURL:(NSURL *)newURL {
- if (url != newURL) {
- [url release];
- url = [newURL retain];
- }
-}
-
-- (BOOL)hasButton {
- return hasButton;
-}
-
-- (void)setHasButton:(BOOL)flag {
- if (hasButton != flag) {
- hasButton = flag;
- }
-}
-
- (id)buttonTarget {
return [buttonCell target];
}
Modified: trunk/bibdesk/BDSKEditorTextView.h
===================================================================
--- trunk/bibdesk/BDSKEditorTextView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKEditorTextView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -42,6 +42,5 @@
@interface BDSKEditorTextView : NSTextView {
BOOL usesDefaultFont;
}
-- (BOOL)usesDefaultFont;
-- (void)setUsesDefaultFont:(BOOL)flag;
+@property (nonatomic) BOOL usesDefaultFont;
@end
Modified: trunk/bibdesk/BDSKEditorTextView.m
===================================================================
--- trunk/bibdesk/BDSKEditorTextView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKEditorTextView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -52,6 +52,8 @@
@implementation BDSKEditorTextView
+@synthesize usesDefaultFont;
+
- (id)initWithCoder:(NSCoder *)coder
{
self = [super initWithCoder:coder];
@@ -89,10 +91,6 @@
[super dealloc];
}
-- (BOOL)usesDefaultFont {
- return usesDefaultFont;
-}
-
- (void)setUsesDefaultFont:(BOOL)flag {
if (usesDefaultFont != flag) {
usesDefaultFont = flag;
Modified: trunk/bibdesk/BDSKFontWell.h
===================================================================
--- trunk/bibdesk/BDSKFontWell.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKFontWell.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -47,14 +47,11 @@
- (void)activate;
- (void)deactivate;
-- (BOOL)isActive;
+@property (nonatomic, readonly, getter=isActive) BOOL active;
-- (NSString *)fontName;
-- (void)setFontName:(NSString *)fontName;
+@property (nonatomic, retain) NSString *fontName;
+@property (nonatomic) CGFloat fontSize;
-- (CGFloat)fontSize;
-- (void)setFontSize:(CGFloat)pointSize;
-
- (void)changeFontFromFontManager:(id)sender;
@end
Modified: trunk/bibdesk/BDSKFontWell.m
===================================================================
--- trunk/bibdesk/BDSKFontWell.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKFontWell.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -63,6 +63,8 @@
@implementation BDSKFontWell
+@dynamic active, fontName, fontSize;
+
+ (Class)cellClass {
return [BDSKFontWellCell class];
}
Modified: trunk/bibdesk/BDSKGradientView.h
===================================================================
--- trunk/bibdesk/BDSKGradientView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKGradientView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -45,7 +45,6 @@
NSArray *backgroundColors;
}
-- (NSArray *)backgroundColors;
-- (void)setBackgroundColors:(NSArray *)colors;
+@property (nonatomic, copy) NSArray *backgroundColors;
@end
Modified: trunk/bibdesk/BDSKGradientView.m
===================================================================
--- trunk/bibdesk/BDSKGradientView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKGradientView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -42,6 +42,8 @@
@implementation BDSKGradientView
+@synthesize backgroundColors;
+
// @@ Dark mode
- (id)initWithFrame:(NSRect)frame {
@@ -65,17 +67,6 @@
[gradient release];
}
-- (NSArray *)backgroundColors {
- return backgroundColors;
-}
-
-- (void)setBackgroundColors:(NSArray *)colors {
- if (backgroundColors != colors) {
- [backgroundColors release];
- backgroundColors = [colors copy];
- }
-}
-
// required in order for redisplay to work properly with the controls
- (BOOL)isOpaque{ return YES; }
Modified: trunk/bibdesk/BDSKGroupCell.h
===================================================================
--- trunk/bibdesk/BDSKGroupCell.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKGroupCell.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -56,6 +56,7 @@
- (NSRect)textRectForBounds:(NSRect)theRect;
- (NSRect)iconRectForBounds:(NSRect)theRect;
-- (CGFloat)labelHeight;
+@property (nonatomic, readonly) CGFloat labelHeight;
+
@end
Modified: trunk/bibdesk/BDSKGroupCell.m
===================================================================
--- trunk/bibdesk/BDSKGroupCell.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKGroupCell.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -63,6 +63,8 @@
@implementation BDSKGroupCell
+@dynamic labelHeight;
+
static NSMutableDictionary *numberStringDictionary = nil;
static BDSKGroupCellFormatter *groupCellFormatter = nil;
Modified: trunk/bibdesk/BDSKGroupOutlineView.h
===================================================================
--- trunk/bibdesk/BDSKGroupOutlineView.h 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKGroupOutlineView.h 2019-07-31 23:07:07 UTC (rev
24096)
@@ -53,7 +53,7 @@
NSTextFieldCell *parentCell;
}
-- (NSTextFieldCell *)parentCell;
+@property (nonatomic, readonly) NSTextFieldCell *parentCell;
- (id <BDSKGroupOutlineViewDelegate>)delegate;
- (void)setDelegate:(id <BDSKGroupOutlineViewDelegate>)newDelegate;
Modified: trunk/bibdesk/BDSKGroupOutlineView.m
===================================================================
--- trunk/bibdesk/BDSKGroupOutlineView.m 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKGroupOutlineView.m 2019-07-31 23:07:07 UTC (rev
24096)
@@ -52,6 +52,8 @@
@implementation BDSKGroupOutlineView
+@dynamic parentCell;
+
- (id)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
Modified: trunk/bibdesk/BDSKLevelIndicatorCell.h
===================================================================
--- trunk/bibdesk/BDSKLevelIndicatorCell.h 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKLevelIndicatorCell.h 2019-07-31 23:07:07 UTC (rev
24096)
@@ -43,5 +43,5 @@
{
CGFloat maxHeight;
}
-- (void)setMaxHeight:(CGFloat)h;
+@property (nonatomic) CGFloat maxHeight;
@end
Modified: trunk/bibdesk/BDSKLevelIndicatorCell.m
===================================================================
--- trunk/bibdesk/BDSKLevelIndicatorCell.m 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKLevelIndicatorCell.m 2019-07-31 23:07:07 UTC (rev
24096)
@@ -44,6 +44,8 @@
@implementation BDSKLevelIndicatorCell
+@synthesize maxHeight;
+
- (id)initWithLevelIndicatorStyle:(NSLevelIndicatorStyle)levelIndicatorStyle;
{
self = [super initWithLevelIndicatorStyle:levelIndicatorStyle];
@@ -65,11 +67,6 @@
return cellSize;
}
-- (void)setMaxHeight:(CGFloat)h;
-{
- maxHeight = h;
-}
-
- (CGFloat)indicatorHeight { return maxHeight; }
// DigitalColor Meter indicates 0.7 and 0.5 are the approximate values for a
deselected level indicator cell (relevancy mode). This looks really bad when
selected in a gradient tableview, though, particularly when the table doesn't
have focus.
Modified: trunk/bibdesk/BDSKLineNumberView.h
===================================================================
--- trunk/bibdesk/BDSKLineNumberView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKLineNumberView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -43,5 +43,5 @@
NSPointerArray *lineCharacterIndexes;
NSMapTable *errorMarkers;
}
-- (CGFloat)requiredRuleThickness;
+@property (nonatomic, readonly) CGFloat requiredRuleThickness;
@end
Modified: trunk/bibdesk/BDSKLineNumberView.m
===================================================================
--- trunk/bibdesk/BDSKLineNumberView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKLineNumberView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -54,6 +54,8 @@
@implementation BDSKLineNumberView
+@dynamic requiredRuleThickness;
+
static NSDictionary *lineNumberAttributes = nil;
// @@ Dark mode
Modified: trunk/bibdesk/BDSKMainTableView.h
===================================================================
--- trunk/bibdesk/BDSKMainTableView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKMainTableView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -66,26 +66,25 @@
BOOL ignoreMovedColumn;
}
-- (NSInteger)lastMouseDownRow;
-- (NSInteger)lastMouseDownColumn;
+@property (nonatomic, readonly) NSInteger lastMouseDownRow;
+@property (nonatomic, readonly) NSInteger lastMouseDownColumn;
-- (void)setAlternatingRowBackgroundColors:(NSArray *)colorArray;
-- (NSArray *)alternatingRowBackgroundColors;
+@property (nonatomic, retain) NSArray *alternatingRowBackgroundColors;
- (void)setupTableColumnsWithIdentifiers:(NSArray *)identifiers;
-- (NSMenu *)columnsMenu;
+@property (nonatomic, readonly) NSMenu *columnsMenu;
- (void)addTableColumnWithIdentifier:(NSString *)identifier;
- (void)removeTableColumnWithIdentifier:(NSString *)identifier;
- (void)updateTableColumnTypes;
-- (NSArray *)tableColumnIdentifiers;
+@property (nonatomic, readonly) NSArray *tableColumnIdentifiers;
- (void)scrollRowToCenter:(NSUInteger)row;
- (void)alternateDelete:(id)sender;
- (void)alternateCut:(id)sender;
-- (BOOL)canAlternateDelete;
-- (BOOL)canAlternateCut;
+@property (nonatomic, readonly) BOOL canAlternateDelete;
+@property (nonatomic, readonly) BOOL canAlternateCut;
- (id <BDSKMainTableViewDelegate>)delegate;
- (void)setDelegate:(id <BDSKMainTableViewDelegate>)newDelegate;
Modified: trunk/bibdesk/BDSKMainTableView.m
===================================================================
--- trunk/bibdesk/BDSKMainTableView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKMainTableView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -94,6 +94,9 @@
@implementation BDSKMainTableView
+@synthesize lastMouseDownRow, lastMouseDownColumn;
+@dynamic alternatingRowBackgroundColors, columnsMenu, tableColumnIdentifiers,
canAlternateDelete, canAlternateCut;
+
+ (BOOL)shouldQueueTypeSelectHelper { return YES; }
- (void)commonInit{
@@ -134,14 +137,6 @@
[super mouseDown:theEvent];
}
-- (NSInteger)lastMouseDownRow {
- return lastMouseDownRow;
-}
-
-- (NSInteger)lastMouseDownColumn {
- return lastMouseDownColumn;
-}
-
- (BOOL)canAlternateDelete {
if ([self numberOfClickedOrSelectedRows] == 0 || [[self dataSource]
respondsToSelector:@selector(tableView:alternateDeleteRowsWithIndexes:)] == NO)
return NO;
Modified: trunk/bibdesk/BDSKOutlineView.h
===================================================================
--- trunk/bibdesk/BDSKOutlineView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKOutlineView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -78,23 +78,21 @@
}
- (NSArray *)itemsAtRowIndexes:(NSIndexSet *)indexes;
-- (NSArray *)selectedItems;
-- (NSArray *)clickedOrSelectedItems;
+@property (nonatomic, readonly) NSArray *selectedItems;
+@property (nonatomic, readonly) NSArray *clickedOrSelectedItems;
-- (BDSKTypeSelectHelper *)typeSelectHelper;
-- (void)setTypeSelectHelper:(BDSKTypeSelectHelper *)newTypeSelectHelper;
+@property (nonatomic, retain) BDSKTypeSelectHelper *typeSelectHelper;
- (void)changeFont:(id)sender;
- (void)outlineViewFontChanged;
- (CGFloat)rowHeightForFont:(NSFont *)font;
- (void)updateFontPanel:(NSNotification *)notification;
-- (NSString *)fontNamePreferenceKey;
-- (void)setFontNamePreferenceKey:(NSString *)newFontNamePreferenceKey;
-- (NSString *)fontSizePreferenceKey;
-- (void)setFontSizePreferenceKey:(NSString *)newFontSizePreferenceKey;
-- (NSControlSize)cellControlSize;
+@property (nonatomic, retain) NSString *fontNamePreferenceKey;
+@property (nonatomic, retain) NSString *fontSizePreferenceKey;
+@property (nonatomic, readonly) NSControlSize cellControlSize;
+
- (void)moveUp:(id)sender;
- (void)moveDown:(id)sender;
- (void)scrollToBeginningOfDocument:(id)sender;
@@ -109,14 +107,9 @@
- (void)paste:(id)sender;
- (void)duplicate:(id)sender;
-- (BOOL)canDelete;
-- (BOOL)canCopy;
-- (BOOL)canCut;
-- (BOOL)canPaste;
-- (BOOL)canDuplicate;
+@property (nonatomic, readonly) BOOL canDelete, canCopy, canCut, canPaste,
canDuplicate;
-- (NSFont *)font;
-- (void)setFont:(NSFont *)font;
+@property (nonatomic, retain) NSFont *font;
- (id <BDSKOutlineViewDelegate>)delegate;
- (void)setDelegate:(id <BDSKOutlineViewDelegate>)newDelegate;
Modified: trunk/bibdesk/BDSKOutlineView.m
===================================================================
--- trunk/bibdesk/BDSKOutlineView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKOutlineView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -47,6 +47,9 @@
@implementation BDSKOutlineView
+@synthesize typeSelectHelper, fontNamePreferenceKey, fontSizePreferenceKey;
+@dynamic selectedItems, clickedOrSelectedItems, cellControlSize, canDelete,
canCopy, canCut, canPaste, canDuplicate, font;
+
- (void)dealloc {
if (fontNamePreferenceKey || fontSizePreferenceKey || typeSelectHelper)
BDSKENSURE_MAIN_THREAD(
@@ -76,10 +79,6 @@
#pragma mark TypeSelectHelper methods
-- (BDSKTypeSelectHelper *)typeSelectHelper {
- return typeSelectHelper;
-}
-
- (void)setTypeSelectHelper:(BDSKTypeSelectHelper *)newTypeSelectHelper {
if (typeSelectHelper != newTypeSelectHelper) {
if ([typeSelectHelper delegate] == self)
@@ -133,10 +132,6 @@
}
}
-- (NSString *)fontNamePreferenceKey{
- return fontNamePreferenceKey;
-}
-
- (void)setFontNamePreferenceKey:(NSString *)newFontNamePreferenceKey{
if (fontNamePreferenceKey != newFontNamePreferenceKey) {
[self removeObserverForFontPreferences];
@@ -147,10 +142,6 @@
}
}
-- (NSString *)fontSizePreferenceKey{
- return fontSizePreferenceKey;
-}
-
- (void)setFontSizePreferenceKey:(NSString *)newFontSizePreferenceKey{
if (fontSizePreferenceKey != newFontSizePreferenceKey) {
[self removeObserverForFontPreferences];
Modified: trunk/bibdesk/BDSKPreferenceIconView.h
===================================================================
--- trunk/bibdesk/BDSKPreferenceIconView.h 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKPreferenceIconView.h 2019-07-31 23:07:07 UTC (rev
24096)
@@ -53,14 +53,8 @@
- (id)initWithPreferenceController:(BDSKPreferenceController *)aController;
-- (NSString *)clickedIdentifier;
+@property (nonatomic, readonly) NSString *clickedIdentifier;
-- (id)target;
-- (void)setTarget:(id)newTarget;
-
-- (SEL)action;
-- (void)setAction:(SEL)newAction;
-
- (void)showSpotlightsForIdentifiers:(NSArray *)identifiers;
@end
Modified: trunk/bibdesk/BDSKPreferenceIconView.m
===================================================================
--- trunk/bibdesk/BDSKPreferenceIconView.m 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKPreferenceIconView.m 2019-07-31 23:07:07 UTC (rev
24096)
@@ -65,6 +65,8 @@
@implementation BDSKPreferenceIconView
+@dynamic clickedIdentifier;
+
- (id)initWithPreferenceController:(BDSKPreferenceController *)aController {
self = [super initWithFrame:NSZeroRect];
if (self) {
Modified: trunk/bibdesk/BDSKRatingButton.h
===================================================================
--- trunk/bibdesk/BDSKRatingButton.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKRatingButton.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -43,10 +43,7 @@
@interface BDSKRatingButton : NSButton {
}
-- (NSUInteger)rating;
-- (void)setRating:(NSUInteger)newRating;
+@property (nonatomic) NSUInteger rating;
+@property (nonatomic) NSUInteger maxRating;
-- (NSUInteger)maxRating;
-- (void)setMaxRating:(NSUInteger)newRating;
-
@end
Modified: trunk/bibdesk/BDSKRatingButton.m
===================================================================
--- trunk/bibdesk/BDSKRatingButton.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKRatingButton.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -41,6 +41,8 @@
@implementation BDSKRatingButton
+@dynamic rating, maxRating;
+
+ (Class)cellClass {
return [BDSKRatingButtonCell class];
}
Modified: trunk/bibdesk/BDSKRatingButtonCell.h
===================================================================
--- trunk/bibdesk/BDSKRatingButtonCell.h 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKRatingButtonCell.h 2019-07-31 23:07:07 UTC (rev
24096)
@@ -46,10 +46,7 @@
- (id)initWithMaxRating:(NSUInteger)aRating;
-- (NSUInteger)rating;
-- (void)setRating:(NSUInteger)newRating;
+@property (nonatomic) NSUInteger rating;
+@property (nonatomic) NSUInteger maxRating;
-- (NSUInteger)maxRating;
-- (void)setMaxRating:(NSUInteger)newRating;
-
@end
Modified: trunk/bibdesk/BDSKRatingButtonCell.m
===================================================================
--- trunk/bibdesk/BDSKRatingButtonCell.m 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKRatingButtonCell.m 2019-07-31 23:07:07 UTC (rev
24096)
@@ -51,6 +51,8 @@
@implementation BDSKRatingButtonCell
+@synthesize rating, maxRating;
+
// designated initializer
- (id)initWithMaxRating:(NSUInteger)aRating {
self = [super initTextCell:@""];
@@ -86,10 +88,6 @@
return cellCopy;
}
-- (NSUInteger)rating {
- return rating;
-}
-
- (void)setRating:(NSUInteger)newRating {
if (newRating > maxRating)
newRating = maxRating;
@@ -99,10 +97,6 @@
}
}
-- (NSUInteger)maxRating {
- return maxRating;
-}
-
- (void)setMaxRating:(NSUInteger)newRating {
if (maxRating != newRating) {
maxRating = newRating;
Modified: trunk/bibdesk/BDSKScriptMenu.h
===================================================================
--- trunk/bibdesk/BDSKScriptMenu.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKScriptMenu.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -39,5 +39,5 @@
#import <Cocoa/Cocoa.h>
@interface NSApplication (BDSKScriptMenu)
-- (NSMenu *)scriptMenu;
+@property (nonatomic, readonly) NSMenu *scriptMenu;
@end
Modified: trunk/bibdesk/BDSKScrollableTextField.h
===================================================================
--- trunk/bibdesk/BDSKScrollableTextField.h 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKScrollableTextField.h 2019-07-31 23:07:07 UTC (rev
24096)
@@ -47,6 +47,5 @@
@interface BDSKScrollableTextField : NSTextField {
}
-- (CGFloat)scrollAmount;
-- (void)setScrollAmount:(CGFloat)amount;
+@property (nonatomic) CGFloat scrollAmount;
@end
Modified: trunk/bibdesk/BDSKScrollableTextField.m
===================================================================
--- trunk/bibdesk/BDSKScrollableTextField.m 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKScrollableTextField.m 2019-07-31 23:07:07 UTC (rev
24096)
@@ -43,6 +43,8 @@
@implementation BDSKScrollableTextField
+@dynamic scrollAmount;
+
+ (id)defaultAnimationForKey:(NSString *)key {
if ([key isEqualToString:@"scrollAmount"])
return [CABasicAnimation animation];
Modified: trunk/bibdesk/BDSKScrollableTextFieldCell.h
===================================================================
--- trunk/bibdesk/BDSKScrollableTextFieldCell.h 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKScrollableTextFieldCell.h 2019-07-31 23:07:07 UTC (rev
24096)
@@ -56,7 +56,6 @@
- (NSRect)buttonRect:(BDSKScrollButton)button forBounds:(NSRect)theRect;
-- (CGFloat)scrollAmount;
-- (void)setScrollAmount:(CGFloat)amount;
+@property (nonatomic) CGFloat scrollAmount;
@end
Modified: trunk/bibdesk/BDSKScrollableTextFieldCell.m
===================================================================
--- trunk/bibdesk/BDSKScrollableTextFieldCell.m 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKScrollableTextFieldCell.m 2019-07-31 23:07:07 UTC (rev
24096)
@@ -54,6 +54,8 @@
@implementation BDSKScrollableTextFieldCell
+@synthesize scrollAmount;
+
#pragma mark Init and dealloc
- (id)initTextCell:(NSString *)aString
@@ -113,14 +115,6 @@
}
}
-- (CGFloat)scrollAmount {
- return scrollAmount;
-}
-
-- (void)setScrollAmount:(CGFloat)amount {
- scrollAmount = amount;
-}
-
- (BOOL)isButtonEnabled:(BDSKScrollButton)button {
if (button == BDSKScrollLeftButton)
return scrollStep > 0;
Modified: trunk/bibdesk/BDSKSplitView.h
===================================================================
--- trunk/bibdesk/BDSKSplitView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKSplitView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -42,6 +42,6 @@
@interface BDSKSplitView : NSSplitView {
BOOL animating;
}
-- (BOOL)isAnimating;
+@property (nonatomic, readonly, getter=isAnimating) BOOL animating;
- (void)setPosition:(CGFloat)position ofDividerAtIndex:(NSInteger)dividerIndex
animate:(BOOL)animate;
@end
Modified: trunk/bibdesk/BDSKSplitView.m
===================================================================
--- trunk/bibdesk/BDSKSplitView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKSplitView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -43,6 +43,8 @@
@implementation BDSKSplitView
+@synthesize animating;
+
+ (id)defaultAnimationForKey:(NSString *)key {
if ([key isEqualToString:@"firstSplitPosition"] || [key
isEqualToString:@"secondSplitPosition"])
return [CABasicAnimation animation];
@@ -78,10 +80,6 @@
[self setPosition:position ofDividerAtIndex:1];
}
-- (BOOL)isAnimating {
- return animating;
-}
-
- (void)setPosition:(CGFloat)position ofDividerAtIndex:(NSInteger)dividerIndex
animate:(BOOL)animate {
NSTimeInterval duration = [NSAnimationContext
defaultAnimationTimeInterval];
Modified: trunk/bibdesk/BDSKStatusBar.h
===================================================================
--- trunk/bibdesk/BDSKStatusBar.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKStatusBar.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -66,43 +66,23 @@
- (void)toggleBelowView:(NSView *)view animate:(BOOL)animate;
-- (BOOL)isVisible;
+@property (nonatomic, readonly, getter=isVisible) BOOL visible;
-- (NSString *)stringValue;
-- (void)setStringValue:(NSString *)aString;
+@property (nonatomic, retain) NSString *stringValue;
-- (NSFont *)font;
-- (void)setFont:(NSFont *)fontObject;
+@property (nonatomic, retain) NSFont *font;
-- (NSTextAlignment)alignment;
-- (void)setAlignment:(NSTextAlignment)newAlignment;
+@property (nonatomic) NSTextAlignment alignment;
-- (CGFloat)leftMargin;
-- (void)setLeftMargin:(CGFloat)margin;
+@property (nonatomic) CGFloat leftMargin;
+@property (nonatomic) CGFloat rightMargin;
-- (CGFloat)rightMargin;
-- (void)setRightMargin:(CGFloat)margin;
+@property (nonatomic, readonly) NSProgressIndicator *progressIndicator;
-- (NSProgressIndicator *)progressIndicator;
+@property (nonatomic) BDSKProgressIndicatorStyle progressIndicatorStyle;
+@property (nonatomic) double progressIndicatorValue;
-/*!
- @method progressIndicatorStyle
- @abstract Returns whether the receiver is present and if it is, whether
it is indeterminate.
- @discussion -
-*/
-- (BDSKProgressIndicatorStyle)progressIndicatorStyle;
-
-/*!
- @method setProgressIndicatorStyle
- @abstract Sets whetherthe receiver has an indicator, and if so whether
to be indeterminate.
- @discussion Use this rather than setStyle on the progressIndicator
directly. Authomatically starts and stops the animation.
-*/
-- (void)setProgressIndicatorStyle:(BDSKProgressIndicatorStyle)style;
-
-- (double)progressIndicatorValue;
-- (void)setProgressIndicatorValue:(double)value;
-
-- (NSArray *)iconIdentifiers;
+@property (nonatomic, readonly) NSArray *iconIdentifiers;
- (void)addIcon:(NSImage *)icon withIdentifier:(NSString *)identifier;
- (void)addIcon:(NSImage *)icon withIdentifier:(NSString *)identifier
toolTip:(NSString *)toolTip;
- (void)removeIconWithIdentifier:(NSString *)identifier;
@@ -110,7 +90,6 @@
- (NSString *)view:(NSView *)view stringForToolTip:(NSToolTipTag)tag
point:(NSPoint)point userData:(void *)userData;
- (void)rebuildToolTips;
-- (id<BDSKStatusBarDelegate>)delegate;
-- (void)setDelegate:(id<BDSKStatusBarDelegate>)newDelegate;
+@property (nonatomic, assign) id<BDSKStatusBarDelegate> delegate;
@end
Modified: trunk/bibdesk/BDSKStatusBar.m
===================================================================
--- trunk/bibdesk/BDSKStatusBar.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKStatusBar.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -49,6 +49,9 @@
@implementation BDSKStatusBar
+@synthesize leftMargin, rightMargin, progressIndicator, delegate;
+@dynamic visible, stringValue, font, progressIndicatorStyle,
progressIndicatorValue, iconIdentifiers;
+
- (id)initWithFrame:(NSRect)frame {
self = [super initWithFrame:frame];
if (self) {
@@ -212,19 +215,11 @@
[textCell setAlignment:newAlignment];
}
-- (CGFloat)leftMargin {
- return leftMargin;
-}
-
- (void)setLeftMargin:(CGFloat)margin {
leftMargin = margin;
[self setNeedsDisplay:YES];
}
-- (CGFloat)rightMargin {
- return rightMargin;
-}
-
- (void)setRightMargin:(CGFloat)margin {
rightMargin = margin;
[self setNeedsDisplay:YES];
@@ -312,20 +307,8 @@
[self rebuildToolTips];
}
-- (id<BDSKStatusBarDelegate>)delegate {
- return delegate;
-}
-
-- (void)setDelegate:(id<BDSKStatusBarDelegate>)newDelegate {
- delegate = newDelegate;
-}
-
#pragma mark Progress indicator
-- (NSProgressIndicator *)progressIndicator {
- return progressIndicator;
-}
-
- (BDSKProgressIndicatorStyle)progressIndicatorStyle {
if (progressIndicator == nil)
return BDSKProgressIndicatorStyleNone;
Modified: trunk/bibdesk/BDSKTableView.h
===================================================================
--- trunk/bibdesk/BDSKTableView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKTableView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -80,20 +80,18 @@
+ (BOOL)shouldQueueTypeSelectHelper;
-- (BDSKTypeSelectHelper *)typeSelectHelper;
-- (void)setTypeSelectHelper:(BDSKTypeSelectHelper *)newTypeSelectHelper;
+@property (nonatomic, retain) BDSKTypeSelectHelper *typeSelectHelper;
- (void)changeFont:(id)sender;
- (void)tableViewFontChanged;
- (CGFloat)rowHeightForFont:(NSFont *)font;
- (void)updateFontPanel:(NSNotification *)notification;
-- (NSString *)fontNamePreferenceKey;
-- (void)setFontNamePreferenceKey:(NSString *)newFontNamePreferenceKey;
-- (NSString *)fontSizePreferenceKey;
-- (void)setFontSizePreferenceKey:(NSString *)newFontSizePreferenceKey;
-- (NSControlSize)cellControlSize;
+@property (nonatomic, retain) NSString *fontNamePreferenceKey;
+@property (nonatomic, retain) NSString *fontSizePreferenceKey;
+@property (nonatomic, readonly) NSControlSize cellControlSize;
+
- (void)invertSelection:(id)sender;
- (void)moveUp:(id)sender;
- (void)moveDown:(id)sender;
@@ -109,14 +107,9 @@
- (void)paste:(id)sender;
- (void)duplicate:(id)sender;
-- (BOOL)canDelete;
-- (BOOL)canCopy;
-- (BOOL)canCut;
-- (BOOL)canPaste;
-- (BOOL)canDuplicate;
+@property (nonatomic, readonly) BOOL canDelete, canCopy, canCut, canPaste,
canDuplicate;
-- (NSFont *)font;
-- (void)setFont:(NSFont *)font;
+@property (nonatomic, retain) NSFont *font;
- (id <BDSKTableViewDelegate>)delegate;
- (void)setDelegate:(id <BDSKTableViewDelegate>)newDelegate;
Modified: trunk/bibdesk/BDSKTableView.m
===================================================================
--- trunk/bibdesk/BDSKTableView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKTableView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -47,6 +47,9 @@
@implementation BDSKTableView
+@synthesize typeSelectHelper, fontNamePreferenceKey, fontSizePreferenceKey;
+@dynamic cellControlSize, canDelete, canCopy, canCut, canPaste, canDuplicate,
font;
+
+ (BOOL)shouldQueueTypeSelectHelper { return NO; }
- (void)dealloc {
@@ -62,10 +65,6 @@
#pragma mark TypeSelectHelper methods
-- (BDSKTypeSelectHelper *)typeSelectHelper {
- return typeSelectHelper;
-}
-
- (void)setTypeSelectHelper:(BDSKTypeSelectHelper *)newTypeSelectHelper {
if (typeSelectHelper != newTypeSelectHelper) {
if ([typeSelectHelper delegate] == self) {
@@ -108,10 +107,6 @@
}
}
-- (NSString *)fontNamePreferenceKey{
- return fontNamePreferenceKey;
-}
-
- (void)setFontNamePreferenceKey:(NSString *)newFontNamePreferenceKey{
if (fontNamePreferenceKey != newFontNamePreferenceKey) {
[self removeObserverForFontPreferences];
@@ -122,10 +117,6 @@
}
}
-- (NSString *)fontSizePreferenceKey{
- return fontSizePreferenceKey;
-}
-
- (void)setFontSizePreferenceKey:(NSString *)newFontSizePreferenceKey{
if (fontSizePreferenceKey != newFontSizePreferenceKey) {
[self removeObserverForFontPreferences];
Modified: trunk/bibdesk/BDSKTextImportItemTableView.h
===================================================================
--- trunk/bibdesk/BDSKTextImportItemTableView.h 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKTextImportItemTableView.h 2019-07-31 23:07:07 UTC (rev
24096)
@@ -52,7 +52,7 @@
BOOL didSetValue;
}
-- (BOOL)isInTemporaryTypeSelectMode;
+@property (nonatomic, readonly, getter=isInTemporaryTypeSelectMode) BOOL
inTemporaryTypeSelectMode;
- (id <BDSKTextImportItemTableViewDelegate>)delegate;
- (void)setDelegate:(id <BDSKTextImportItemTableViewDelegate>)newDelegate;
Modified: trunk/bibdesk/BDSKTextImportItemTableView.m
===================================================================
--- trunk/bibdesk/BDSKTextImportItemTableView.m 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKTextImportItemTableView.m 2019-07-31 23:07:07 UTC (rev
24096)
@@ -49,9 +49,7 @@
@implementation BDSKTextImportItemTableView
-- (BOOL)isInTemporaryTypeSelectMode {
- return temporaryTypeSelectMode;
-}
+@synthesize inTemporaryTypeSelectMode=temporaryTypeSelectMode;
- (void)startTemporaryTypeSelectMode {
if (temporaryTypeSelectMode)
Modified: trunk/bibdesk/BDSKTextWithIconCell.h
===================================================================
--- trunk/bibdesk/BDSKTextWithIconCell.h 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKTextWithIconCell.h 2019-07-31 23:07:07 UTC (rev
24096)
@@ -48,8 +48,7 @@
+ (Class)formatterClass;
-- (NSImage *)icon;
-- (void)setIcon:(NSImage *)newIcon;
+@property (nonatomic, retain) NSImage *icon;
- (NSRect)textRectForBounds:(NSRect)aRect;
- (NSRect)iconRectForBounds:(NSRect)aRect;
Modified: trunk/bibdesk/BDSKTextWithIconCell.m
===================================================================
--- trunk/bibdesk/BDSKTextWithIconCell.m 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKTextWithIconCell.m 2019-07-31 23:07:07 UTC (rev
24096)
@@ -52,6 +52,8 @@
@implementation BDSKTextWithIconCell
+@dynamic icon;
+
#define BORDER_BETWEEN_EDGE_AND_IMAGE_BORDERLESS (1.0)
#define BORDER_BETWEEN_IMAGE_AND_TEXT_BORDERLESS (0.0)
#define BORDER_BETWEEN_EDGE_AND_IMAGE_BORDERED (2.0)
Modified: trunk/bibdesk/BDSKWebView.h
===================================================================
--- trunk/bibdesk/BDSKWebView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKWebView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -55,15 +55,11 @@
BDSKWebDelegate *webDelegate;
}
-- (id<BDSKWebViewDelegate>)delegate;
-- (void)setDelegate:(id<BDSKWebViewDelegate>)newDelegate;
+@property (nonatomic, assign) id<BDSKWebViewDelegate> delegate;
+@property (nonatomic, assign) id<BDSKWebViewNavigationDelegate>
navigationDelegate;
-- (id<BDSKWebViewNavigationDelegate>)navigationDelegate;
-- (void)setNavigationDelegate:(id<BDSKWebViewNavigationDelegate>)newDelegate;
+@property (nonatomic, retain) NSURL *URL;
-- (NSURL *)URL;
-- (void)setURL:(NSURL *)newURL;
-
- (IBAction)addBookmark:(id)sender;
@end
Modified: trunk/bibdesk/BDSKWebView.m
===================================================================
--- trunk/bibdesk/BDSKWebView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKWebView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -55,12 +55,9 @@
NSUndoManager *undoManager;
}
-- (id<BDSKWebViewDelegate>)delegate;
-- (void)setDelegate:(id<BDSKWebViewDelegate>)newDelegate;
+@property (nonatomic, assign) id<BDSKWebViewDelegate> delegate;
+@property (nonatomic, assign) id<BDSKWebViewNavigationDelegate>
navigationDelegate;
-- (id<BDSKWebViewNavigationDelegate>)navigationDelegate;
-- (void)setNavigationDelegate:(id<BDSKWebViewNavigationDelegate>)newDelegate;
-
@end
#pragma mark -
@@ -70,7 +67,7 @@
WebView *webView;
}
+ (id)sharedHandler;
-- (WebView *)webView;
+@property (nonatomic, readonly) WebView *webView;
@end
#pragma mark -
@@ -77,6 +74,8 @@
@implementation BDSKWebView
+@dynamic delegate, navigationDelegate, URL;
+
- (id)initWithFrame:(NSRect)frameRect frameName:(NSString *)frameName
groupName:(NSString *)groupName {
self = [super initWithFrame:frameRect frameName:frameName
groupName:@"BibDeskWebGroup"];
if (self) {
@@ -169,6 +168,8 @@
@implementation BDSKWebDelegate
+@synthesize delegate, navigationDelegate;
+
- (void)dealloc {
delegate = nil;
navigationDelegate = nil;
@@ -201,16 +202,6 @@
return [super respondsToSelector:aSelector];
}
-#pragma mark Accessors
-
-- (id<BDSKWebViewDelegate>)delegate { return delegate; }
-
-- (void)setDelegate:(id<BDSKWebViewDelegate>)newDelegate { delegate =
newDelegate; }
-
-- (id<BDSKWebViewNavigationDelegate>)navigationDelegate { return
navigationDelegate; }
-
-- (void)setNavigationDelegate:(id<BDSKWebViewNavigationDelegate>)newDelegate {
navigationDelegate = newDelegate; }
-
#pragma mark Delegate forward
- (void)webView:(WebView *)sender setURL:(NSURL *)aURL {
@@ -515,6 +506,8 @@
@implementation BDSKNewWebWindowHandler
+@synthesize webView;
+
static id sharedHandler = nil;
+ (id)sharedHandler {
@@ -537,10 +530,6 @@
[[NSWorkspace sharedWorkspace] openURL:[request URL]];
}
-- (WebView *)webView {
- return webView;
-}
-
- (void)dealloc {
BDSKDESTROY(webView);
[super dealloc];
Modified: trunk/bibdesk/BDSKZoomablePDFView.h
===================================================================
--- trunk/bibdesk/BDSKZoomablePDFView.h 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKZoomablePDFView.h 2019-07-31 23:07:07 UTC (rev 24096)
@@ -45,7 +45,7 @@
CGFloat startScale;
}
-- (NSScrollView *)scrollView;
+@property (nonatomic, readonly) NSScrollView *scrollView;
- (IBAction)printSelection:(id)sender;
Modified: trunk/bibdesk/BDSKZoomablePDFView.m
===================================================================
--- trunk/bibdesk/BDSKZoomablePDFView.m 2019-07-31 21:59:55 UTC (rev 24095)
+++ trunk/bibdesk/BDSKZoomablePDFView.m 2019-07-31 23:07:07 UTC (rev 24096)
@@ -57,6 +57,8 @@
@implementation BDSKZoomablePDFView
+@dynamic scrollView;
+
static NSString *BDSKDefaultScaleMenuLabels[] = {@"Auto", @"10%", @"20%",
@"25%", @"35%", @"50%", @"60%", @"71%", @"85%", @"100%", @"120%", @"141%",
@"170%", @"200%", @"300%", @"400%", @"600%", @"800%"};
static CGFloat BDSKDefaultScaleMenuFactors[] = {0.0, 0.1, 0.2, 0.25, 0.35,
0.5, 0.6, 0.71, 0.85, 1.0, 1.2, 1.41, 1.7, 2.0, 3.0, 4.0, 6.0, 8.0};
Modified: trunk/bibdesk/BDSKZoomableTextView.h
===================================================================
--- trunk/bibdesk/BDSKZoomableTextView.h 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKZoomableTextView.h 2019-07-31 23:07:07 UTC (rev
24096)
@@ -46,8 +46,7 @@
CGFloat pinchZoomFactor;
}
-- (CGFloat)scaleFactor;
-- (void)setScaleFactor:(CGFloat)factor;
+@property (nonatomic) CGFloat scaleFactor;
- (IBAction)zoomToActualSize:(id)sender;
- (IBAction)zoomIn:(id)sender;
Modified: trunk/bibdesk/BDSKZoomableTextView.m
===================================================================
--- trunk/bibdesk/BDSKZoomableTextView.m 2019-07-31 21:59:55 UTC (rev
24095)
+++ trunk/bibdesk/BDSKZoomableTextView.m 2019-07-31 23:07:07 UTC (rev
24096)
@@ -61,6 +61,8 @@
@implementation BDSKZoomableTextView
+@synthesize scaleFactor;
+
static NSString *BDSKDefaultScaleMenuLabels[] = {@"10%", @"20%", @"25%",
@"35%", @"50%", @"60%", @"71%", @"85%", @"100%", @"120%", @"141%", @"170%",
@"200%", @"300%", @"400%", @"600%", @"800%"};
static CGFloat BDSKDefaultScaleMenuFactors[] = {0.1, 0.2, 0.25, 0.35, 0.5,
0.6, 0.71, 0.85, 1.0, 1.2, 1.41, 1.7, 2.0, 3.0, 4.0, 6.0, 8.0};
@@ -237,10 +239,6 @@
return upper;
}
-- (CGFloat)scaleFactor {
- return scaleFactor;
-}
-
- (void)setScaleFactor:(CGFloat)newScaleFactor {
[self setScaleFactor:newScaleFactor adjustPopup:YES];
}
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
