Revision: 13861
http://sourceforge.net/p/skim-app/code/13861
Author: hofman
Date: 2023-12-09 15:37:45 +0000 (Sat, 09 Dec 2023)
Log Message:
-----------
declare properties in categories
Modified Paths:
--------------
trunk/NSArray_SKExtensions.h
trunk/NSAttributedString_SKExtensions.h
trunk/NSBezierPath_SKExtensions.h
trunk/NSBitmapImageRep_SKExtensions.h
trunk/NSColor_SKExtensions.h
trunk/NSColor_SKExtensions.m
trunk/NSData_SKExtensions.h
trunk/NSData_SKExtensions.m
trunk/NSDocument_SKExtensions.h
trunk/NSEvent_SKExtensions.h
trunk/NSFileManager_SKExtensions.h
trunk/NSFont_SKExtensions.h
trunk/NSImage_SKExtensions.h
trunk/NSMenu_SKExtensions.h
trunk/NSNumber_SKExtensions.h
trunk/NSParagraphStyle_SKExtensions.h
trunk/NSPasteboard_SKExtensions.h
trunk/NSScreen_SKExtensions.h
trunk/NSScriptCommand_SKExtensions.h
trunk/NSScroller_SKExtensions.h
trunk/NSSegmentedControl_SKExtensions.h
trunk/NSString_SKExtensions.h
trunk/NSURL_SKExtensions.h
trunk/NSValue_SKExtensions.h
trunk/NSView_SKExtensions.h
trunk/NSWindowController_SKExtensions.h
trunk/PDFAnnotationCircle_SKExtensions.h
trunk/PDFAnnotationFreeText_SKExtensions.h
trunk/PDFAnnotationLine_SKExtensions.h
trunk/PDFAnnotationMarkup_SKExtensions.h
trunk/PDFAnnotationSquare_SKExtensions.h
trunk/PDFAnnotationText_SKExtensions.h
trunk/PDFAnnotation_SKExtensions.h
trunk/PDFDocument_SKExtensions.h
trunk/PDFOutline_SKExtensions.h
trunk/PDFPage_SKExtensions.h
trunk/PDFSelection_SKExtensions.h
trunk/PDFView_SKExtensions.h
trunk/SKNPDFAnnotationNote_SKExtensions.h
Modified: trunk/NSArray_SKExtensions.h
===================================================================
--- trunk/NSArray_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSArray_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -41,15 +41,15 @@
@interface NSArray (SKExtensions)
-- (NSArray *)arraySortedByPageIndex;
-- (NSArray *)arraySortedByBounds;
-- (NSArray *)arraySortedByPageIndexAndBounds;
-- (NSArray *)arraySortedByType;
-- (NSArray *)arraySortedByContents;
-- (NSArray *)arraySortedByTypeAndContents;
-- (NSArray *)arraySortedByTypeAndPageIndex;
-- (NSArray *)arraySortedByColor;
-- (NSArray *)arraySortedByColorAndPageIndex;
-- (NSArray *)arraySortedByModificationDate;
+@property (nonatomic, readonly) NSArray *arraySortedByPageIndex;
+@property (nonatomic, readonly) NSArray *arraySortedByBounds;
+@property (nonatomic, readonly) NSArray *arraySortedByPageIndexAndBounds;
+@property (nonatomic, readonly) NSArray *arraySortedByType;
+@property (nonatomic, readonly) NSArray *arraySortedByContents;
+@property (nonatomic, readonly) NSArray *arraySortedByTypeAndContents;
+@property (nonatomic, readonly) NSArray *arraySortedByTypeAndPageIndex;
+@property (nonatomic, readonly) NSArray *arraySortedByColor;
+@property (nonatomic, readonly) NSArray *arraySortedByColorAndPageIndex;
+@property (nonatomic, readonly) NSArray *arraySortedByModificationDate;
@end
Modified: trunk/NSAttributedString_SKExtensions.h
===================================================================
--- trunk/NSAttributedString_SKExtensions.h 2023-12-08 23:57:39 UTC (rev
13860)
+++ trunk/NSAttributedString_SKExtensions.h 2023-12-09 15:37:45 UTC (rev
13861)
@@ -41,20 +41,20 @@
@interface NSAttributedString (SKExtensions)
-- (NSAttributedString *)attributedStringByAddingTextColorAttribute;
-- (NSAttributedString *)attributedStringByRemovingTextColorAttribute;
-- (NSAttributedString *)attributedStringByAddingControlTextColorAttribute;
+@property (nonatomic, readonly) NSAttributedString
*attributedStringByAddingTextColorAttribute;
+@property (nonatomic, readonly) NSAttributedString
*attributedStringByRemovingTextColorAttribute;
+@property (nonatomic, readonly) NSAttributedString
*attributedStringByAddingControlTextColorAttribute;
-- (NSAttributedString *)accessibilityAttributedString;
+@property (nonatomic, readonly) NSAttributedString
*accessibilityAttributedString;
-- (NSString *)xmlString;
-- (NSData *)RTFRepresentation;
+@property (nonatomic, readonly) NSString *xmlString;
+@property (nonatomic, readonly) NSData *RTFRepresentation;
-- (NSString *)scriptingName;
-- (NSTextStorage *)scriptingRichText;
+@property (nonatomic, readonly) NSString *scriptingName;
+@property (nonatomic, readonly) NSTextStorage *scriptingRichText;
-- (NSScriptObjectSpecifier *)objectSpecifier;
-- (NSScriptObjectSpecifier *)richTextSpecifier;
+@property (nonatomic, readonly) NSScriptObjectSpecifier *objectSpecifier;
+@property (nonatomic, readonly) NSScriptObjectSpecifier *richTextSpecifier;
@end
@@ -70,7 +70,6 @@
@interface NSTextStorage (SKExtensions)
-- (id)scriptingRTF;
-- (void)setScriptingRTF:(id)data;
+@property (nonatomic, copy) id scriptingRTF;
@end
Modified: trunk/NSBezierPath_SKExtensions.h
===================================================================
--- trunk/NSBezierPath_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSBezierPath_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -40,14 +40,13 @@
@interface NSBezierPath (SKExtensions)
-- (NSArray *)dashPattern;
-- (void)setDashPattern:(NSArray *)newPattern;
+@property (nonatomic, copy) NSArray *dashPattern;
-- (NSRect)nonEmptyBounds;
+@property (nonatomic, readonly) NSRect nonEmptyBounds;
- (NSPoint)associatedPointForElementAtIndex:(NSUInteger)anIndex;
-- (CGPathRef)CGPath;
+@property (nonatomic, readonly) CGPathRef CGPath;
- (void)halfEllipseFromPoint:(NSPoint)halfwayPoint toPoint:(NSPoint)endPoint;
Modified: trunk/NSBitmapImageRep_SKExtensions.h
===================================================================
--- trunk/NSBitmapImageRep_SKExtensions.h 2023-12-08 23:57:39 UTC (rev
13860)
+++ trunk/NSBitmapImageRep_SKExtensions.h 2023-12-09 15:37:45 UTC (rev
13861)
@@ -40,7 +40,7 @@
@interface NSBitmapImageRep (SKExtensions)
-- (NSRect)foregroundRect;
+@property (nonatomic, readonly) NSRect foregroundRect;
- (void)clear;
Modified: trunk/NSColor_SKExtensions.h
===================================================================
--- trunk/NSColor_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSColor_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -79,21 +79,21 @@
+ (NSColor *)selectionHighlightColor:(BOOL)active;
+ (NSColor *)selectionHighlightInteriorColor:(BOOL)active;
-+ (NSArray *)favoriteColors;
+@property (class, nonatomic, readonly) NSArray *favoriteColors;
- (NSComparisonResult)colorCompare:(NSColor *)aColor;
-- (CGFloat)luminance;
+@property (nonatomic, readonly) CGFloat luminance;
- (void)drawSwatchInRoundedRect:(NSRect)rect;
-- (NSColor *)opaqueColor;
+@property (nonatomic, readonly) NSColor *opaqueColor;
-+ (id)scriptingRgbaColorWithDescriptor:(NSAppleEventDescriptor *)descriptor;
-- (id)scriptingRgbaColorDescriptor;
++ (instancetype)scriptingRgbaColorWithDescriptor:(NSAppleEventDescriptor
*)descriptor;
+@property (nonatomic, readonly) NSAppleEventDescriptor
*scriptingRgbaColorDescriptor;
-- (NSString *)accessibilityValue;
+@property (nonatomic, readonly) NSString *accessibilityValue;
-- (NSString *)hexString;
+@property (nonatomic, readonly) NSString *hexString;
@end
Modified: trunk/NSColor_SKExtensions.m
===================================================================
--- trunk/NSColor_SKExtensions.m 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSColor_SKExtensions.m 2023-12-09 15:37:45 UTC (rev 13861)
@@ -177,7 +177,7 @@
#pragma mark Scripting
-+ (id)scriptingRgbaColorWithDescriptor:(NSAppleEventDescriptor *)descriptor {
++ (instancetype)scriptingRgbaColorWithDescriptor:(NSAppleEventDescriptor
*)descriptor {
if ([descriptor descriptorType] == typeAEList) {
CGFloat red = 0.0, green = 0.0, blue = 0.0, alpha = 0.0;
if ([descriptor numberOfItems] > 0)
@@ -251,7 +251,7 @@
}
}
-- (id)scriptingRgbaColorDescriptor;
+- (NSAppleEventDescriptor *)scriptingRgbaColorDescriptor;
{
if ([self isEqual:[NSColor underPageBackgroundColor]])
return [NSAppleEventDescriptor
descriptorWithEnumCode:SKScriptingColorUnderPageBackground];
Modified: trunk/NSData_SKExtensions.h
===================================================================
--- trunk/NSData_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSData_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -53,23 +53,23 @@
@interface NSData (SKExtensions)
-- (NSString *)md5String;
-- (NSString *)xmlString;
+@property (nonatomic, readonly) NSString *md5String;
+@property (nonatomic, readonly) NSString *xmlString;
- (instancetype)initWithHexString:(NSString *)hexString;
-- (NSString *)hexString;
+@property (nonatomic, readonly) NSString *hexString;
+ (NSData *)dataWithPointAsQDPoint:(NSPoint)point;
+ (NSData *)dataWithRectAsQDRect:(NSRect)rect;
-- (NSPoint)pointValueAsQDPoint;
-- (NSRect)rectValueAsQDRect;
+@property (nonatomic, readonly) NSPoint pointValueAsQDPoint;
+@property (nonatomic, readonly) NSRect rectValueAsQDRect;
-+ (id)scriptingPdfWithDescriptor:(NSAppleEventDescriptor *)descriptor;
-- (id)scriptingPdfDescriptor;
-+ (id)scriptingTiffPictureWithDescriptor:(NSAppleEventDescriptor *)descriptor;
-- (id)scriptingTiffPictureDescriptor;
-+ (id)scriptingRtfWithDescriptor:(NSAppleEventDescriptor *)descriptor;
-- (id)scriptingRtfDescriptor;
++ (instancetype)scriptingPdfWithDescriptor:(NSAppleEventDescriptor
*)descriptor;
+@property (nonatomic, readonly) NSAppleEventDescriptor *scriptingPdfDescriptor;
++ (instancetype)scriptingTiffPictureWithDescriptor:(NSAppleEventDescriptor
*)descriptor;
+@property (nonatomic, readonly) NSAppleEventDescriptor
*scriptingTiffPictureDescriptor;
++ (instancetype)scriptingRtfWithDescriptor:(NSAppleEventDescriptor
*)descriptor;
+@property (nonatomic, readonly) NSAppleEventDescriptor *scriptingRtfDescriptor;
@end
Modified: trunk/NSData_SKExtensions.m
===================================================================
--- trunk/NSData_SKExtensions.m 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSData_SKExtensions.m 2023-12-09 15:37:45 UTC (rev 13861)
@@ -203,27 +203,27 @@
return rect;
}
-+ (id)scriptingPdfWithDescriptor:(NSAppleEventDescriptor *)descriptor {
++ (instancetype)scriptingPdfWithDescriptor:(NSAppleEventDescriptor
*)descriptor {
return [descriptor data];
}
-- (id)scriptingPdfDescriptor {
+- (NSAppleEventDescriptor *)scriptingPdfDescriptor {
return [NSAppleEventDescriptor descriptorWithDescriptorType:'PDF '
data:self];
}
-+ (id)scriptingTiffPictureWithDescriptor:(NSAppleEventDescriptor *)descriptor {
++ (instancetype)scriptingTiffPictureWithDescriptor:(NSAppleEventDescriptor
*)descriptor {
return [descriptor data];
}
-- (id)scriptingTiffPictureDescriptor {
+- (NSAppleEventDescriptor *)scriptingTiffPictureDescriptor {
return [NSAppleEventDescriptor descriptorWithDescriptorType:'TIFF'
data:self];
}
-+ (id)scriptingRtfWithDescriptor:(NSAppleEventDescriptor *)descriptor {
++ (instancetype)scriptingRtfWithDescriptor:(NSAppleEventDescriptor
*)descriptor {
return [descriptor data];
}
-- (id)scriptingRtfDescriptor {
+- (NSAppleEventDescriptor *)scriptingRtfDescriptor {
return [NSAppleEventDescriptor descriptorWithDescriptorType:'RTF '
data:self];
}
Modified: trunk/NSDocument_SKExtensions.h
===================================================================
--- trunk/NSDocument_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSDocument_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -51,13 +51,13 @@
+ (BOOL)isPDFDocument;
-- (SKInteractionMode)systemInteractionMode;
+@property (nonatomic, readonly) SKInteractionMode systemInteractionMode;
-- (NSWindow *)mainWindow;
+@property (nonatomic, readonly) NSWindow *mainWindow;
- (IBAction)copyURL:(id)sender;
-- (NSMenu *)notesMenu;
+@property (nonatomic, readonly) NSMenu *notesMenu;
#pragma mark Document Setup
@@ -64,12 +64,12 @@
- (void)saveRecentDocumentInfo;
- (void)applySetup:(NSDictionary *)setup;
- (void)applyOptions:(NSDictionary *)options;
-- (NSDictionary *)currentDocumentSetup;
+@property (nonatomic, readonly) NSDictionary *currentDocumentSetup;
#pragma mark PDF Document
-- (PDFDocument *)pdfDocument;
-- (PDFDocument *)placeholderPdfDocument;
+@property (nonatomic, readonly) PDFDocument *pdfDocument;
+@property (nonatomic, readonly) PDFDocument *placeholderPdfDocument;
#pragma mark Bookmark Actions
@@ -80,18 +80,18 @@
- (BOOL)hasNotes;
-- (NSArray *)notes;
+@property (nonatomic, readonly) NSArray *notes;
-- (NSArray *)SkimNoteProperties;
+@property (nonatomic, readonly) NSArray *SkimNoteProperties;
-- (NSData *)notesData;
+@property (nonatomic, readonly) NSData *notesData;
- (NSString *)notesStringForTemplateType:(NSString *)typeName;
- (NSData *)notesDataForTemplateType:(NSString *)typeName;
- (NSFileWrapper *)notesFileWrapperForTemplateType:(NSString *)typeName;
-- (NSString *)notesString;
-- (NSData *)notesRTFData;
+@property (nonatomic, readonly) NSString *notesString;
+@property (nonatomic, readonly) NSData *notesRTFData;
- (NSData *)notesFDFDataForFile:(NSString *)filename fileIDStrings:(NSArray
*)fileIDStrings;
@@ -109,25 +109,23 @@
- (NSUInteger)countOfOutlines;
- (PDFOutline *)objectInOutlinesAtIndex:(NSUInteger)idx;
-- (PDFPage *)currentPage;
-- (void)setCurrentPage:(PDFPage *)page;
-- (NSData *)currentQDPoint;
-- (PDFAnnotation *)activeNote;
-- (NSTextStorage *)richText;
-- (id)selectionSpecifier;
-- (NSData *)selectionQDRect;
-- (id)selectionPage;
-- (NSArray *)noteSelection;
-- (void)setNoteSelection:(NSArray *)newNoteSelection;
-- (NSDictionary *)pdfViewSettings;
-- (NSDictionary *)documentAttributes;
-- (BOOL)isPDFDocument;
-- (NSInteger)toolMode;
-- (NSInteger)scriptingInteractionMode;
-- (NSDocument *)presentationNotesDocument;
-- (NSInteger)presentationNotesOffset;
-- (id)readingBar;
-- (BOOL)hasReadingBar;
+@property (nonatomic, retain) PDFPage *currentPage;
+@property (nonatomic, readonly) NSData *currentQDPoint;
+@property (nonatomic, readonly) PDFAnnotation *activeNote;
+@property (nonatomic, readonly) NSTextStorage *richText;
+@property (nonatomic, readonly) id selectionSpecifier;
+@property (nonatomic, readonly) NSData *selectionQDRect;
+@property (nonatomic, readonly) id selectionPage;
+@property (nonatomic, retain) NSArray *noteSelection;
+@property (nonatomic, readonly) NSDictionary *pdfViewSettings;
+@property (nonatomic, readonly) NSDictionary *documentAttributes;
+@property (nonatomic, readonly) BOOL isPDFDocument;
+@property (nonatomic, readonly) NSInteger toolMode;
+@property (nonatomic, readonly) NSInteger scriptingInteractionMode;
+@property (nonatomic, readonly) NSDocument *presentationNotesDocument;
+@property (nonatomic, readonly) NSInteger presentationNotesOffset;
+@property (nonatomic, readonly) id readingBar;
+@property (nonatomic, readonly) BOOL hasReadingBar;
- (void)handleRevertScriptCommand:(NSScriptCommand *)command;
- (void)handleGoToScriptCommand:(NSScriptCommand *)command;
Modified: trunk/NSEvent_SKExtensions.h
===================================================================
--- trunk/NSEvent_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSEvent_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -45,16 +45,15 @@
@interface NSEvent (SKExtensions)
-+ (NSUInteger)standardModifierFlags;
-- (NSUInteger)deviceIndependentModifierFlags;
-- (NSUInteger)standardModifierFlags;
+@property (class, nonatomic, readonly) NSUInteger standardModifierFlags;
+@property (nonatomic, readonly) NSUInteger deviceIndependentModifierFlags;
+@property (nonatomic, readonly) NSUInteger standardModifierFlags;
-+ (NSPointingDeviceType)currentPointingDeviceType;
-+
(void)setCurrentPointingDeviceType:(NSPointingDeviceType)newCurrentPointingDeviceType;
+@property (class, nonatomic) NSPointingDeviceType currentPointingDeviceType;
-- (unichar)firstCharacter;
+@property (nonatomic, readonly) unichar firstCharacter;
- (NSPoint)locationInView:(NSView *)view;
-- (NSPoint)locationOnScreen;
+@property (nonatomic, readonly) NSPoint locationOnScreen;
@end
Modified: trunk/NSFileManager_SKExtensions.h
===================================================================
--- trunk/NSFileManager_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSFileManager_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -41,8 +41,8 @@
@interface NSFileManager (SKExtensions)
-- (NSArray *)applicationSupportDirectoryURLs;
+@property (nonatomic, readonly) NSArray *applicationSupportDirectoryURLs;
-- (NSURL *)uniqueChewableItemsDirectoryURL;
+@property (nonatomic, readonly) NSURL *uniqueChewableItemsDirectoryURL;
@end
Modified: trunk/NSFont_SKExtensions.h
===================================================================
--- trunk/NSFont_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSFont_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -40,5 +40,5 @@
@interface NSFont (SKExtensions)
-- (CGFloat)defaultViewLineHeight;
+@property (nonatomic, readonly) CGFloat defaultViewLineHeight;
@end
Modified: trunk/NSImage_SKExtensions.h
===================================================================
--- trunk/NSImage_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSImage_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -218,7 +218,7 @@
+ (NSImage *)maskImageWithSize:(NSSize)size cornerRadius:(CGFloat)radius;
-+ (NSImage *)markImage;
+@property (class, nonatomic, readonly) NSImage *markImage;
+ (void)makeImages;
Modified: trunk/NSMenu_SKExtensions.h
===================================================================
--- trunk/NSMenu_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSMenu_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -41,7 +41,7 @@
@interface NSMenu (SKExtensions)
-+ (NSMenu *)menu;
+@property (class, nonatomic, readonly) NSMenu *menu;
- (NSMenuItem *)insertItemWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget atIndex:(NSInteger)anIndex;
- (NSMenuItem *)addItemWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget;
Modified: trunk/NSNumber_SKExtensions.h
===================================================================
--- trunk/NSNumber_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSNumber_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -41,11 +41,11 @@
@interface NSNumber (SKExtensions)
-- (NSNumber *)numberByAddingOne;
-- (NSNumber *)numberBySubstractingOne;
+@property (nonatomic, readonly) NSNumber *numberByAddingOne;
+@property (nonatomic, readonly) NSNumber *numberBySubstractingOne;
-- (NSString *)romanNumeralValue;
-- (NSString *)alphaCounterValue;
-- (NSString *)greekCounterValue;
+@property (nonatomic, readonly) NSString *romanNumeralValue;
+@property (nonatomic, readonly) NSString *alphaCounterValue;
+@property (nonatomic, readonly) NSString *greekCounterValue;
@end
Modified: trunk/NSParagraphStyle_SKExtensions.h
===================================================================
--- trunk/NSParagraphStyle_SKExtensions.h 2023-12-08 23:57:39 UTC (rev
13860)
+++ trunk/NSParagraphStyle_SKExtensions.h 2023-12-09 15:37:45 UTC (rev
13861)
@@ -40,6 +40,6 @@
@interface NSParagraphStyle (SKExtensions)
-+ (NSParagraphStyle *)defaultClippingParagraphStyle;
-+ (NSParagraphStyle *)defaultTruncatingTailParagraphStyle;
+@property (class, nonatomic, readonly) NSParagraphStyle
*defaultClippingParagraphStyle;
+@property (class, nonatomic, readonly) NSParagraphStyle
*defaultTruncatingTailParagraphStyle;
@end
Modified: trunk/NSPasteboard_SKExtensions.h
===================================================================
--- trunk/NSPasteboard_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSPasteboard_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -41,7 +41,7 @@
@interface NSPasteboard (SKExtensions)
-- (NSURL *)pasteLocationURL;
+@property (nonatomic, readonly) NSURL *pasteLocationURL;
- (BOOL)writeURLs:(NSArray *)URLs names:(NSArray *)names;
Modified: trunk/NSScreen_SKExtensions.h
===================================================================
--- trunk/NSScreen_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSScreen_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -45,8 +45,8 @@
+ (BOOL)screenForWindowHasMenuBar:(NSWindow *)window;
-+ (NSScreen *)primaryScreen;
+@property (class, nonatomic, readonly) NSScreen *primaryScreen;
-- (NSScreen *)primaryScreen;
+@property (nonatomic, readonly) NSScreen *primaryScreen;
@end
Modified: trunk/NSScriptCommand_SKExtensions.h
===================================================================
--- trunk/NSScriptCommand_SKExtensions.h 2023-12-08 23:57:39 UTC (rev
13860)
+++ trunk/NSScriptCommand_SKExtensions.h 2023-12-09 15:37:45 UTC (rev
13861)
@@ -41,8 +41,8 @@
@interface NSScriptCommand (SKExtensions)
-- (NSScriptObjectSpecifier *)subjectSpecifier;
-- (id)evaluatedSubjects;
+@property (nonatomic, readonly) NSScriptObjectSpecifier *subjectSpecifier;
+@property (nonatomic, readonly) id evaluatedSubjects;
@end
Modified: trunk/NSScroller_SKExtensions.h
===================================================================
--- trunk/NSScroller_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSScroller_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -39,5 +39,5 @@
#import <Cocoa/Cocoa.h>
@interface NSScroller (SKExtensions)
-+ (CGFloat)effectiveScrollerWidth;
+@property (class, nonatomic, readonly) CGFloat effectiveScrollerWidth;
@end
Modified: trunk/NSSegmentedControl_SKExtensions.h
===================================================================
--- trunk/NSSegmentedControl_SKExtensions.h 2023-12-08 23:57:39 UTC (rev
13860)
+++ trunk/NSSegmentedControl_SKExtensions.h 2023-12-09 15:37:45 UTC (rev
13861)
@@ -41,7 +41,7 @@
@interface NSSegmentedControl (SKExtensions)
-- (NSInteger)selectedTag;
+@property (nonatomic, readonly) NSInteger selectedTag;
- (void)setEnabledForAllSegments:(BOOL)enabled;
- (void)setHelp:(NSString *)toolTip forSegment:(NSInteger)segment;
Modified: trunk/NSString_SKExtensions.h
===================================================================
--- trunk/NSString_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSString_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -43,18 +43,18 @@
- (NSComparisonResult)noteTypeCompare:(id)other;
-- (NSString
*)stringByCollapsingWhitespaceAndNewlinesAndRemovingSurroundingWhitespaceAndNewlines;
-- (NSString *)stringByRemovingAliens;
+@property (nonatomic, readonly) NSString
*stringByCollapsingWhitespaceAndNewlinesAndRemovingSurroundingWhitespaceAndNewlines;
+@property (nonatomic, readonly) NSString *stringByRemovingAliens;
-- (NSString *)stringByAppendingEllipsis;
+@property (nonatomic, readonly) NSString *stringByAppendingEllipsis;
- (NSString *)stringByAppendingEmDashAndString:(NSString *)aString;
- (NSString *)stringByAppendingDashAndString:(NSString *)aString;
- (NSString *)stringByBackslashEscapingCharactersFromSet:(NSCharacterSet
*)charSet;
-- (NSString *)stringByEscapingShellChars;
-- (NSString *)stringByEscapingDoubleQuotes;
-- (NSString *)stringByEscapingParenthesis;
+@property (nonatomic, readonly) NSString *stringByEscapingShellChars;
+@property (nonatomic, readonly) NSString *stringByEscapingDoubleQuotes;
+@property (nonatomic, readonly) NSString *stringByEscapingParenthesis;
- (NSComparisonResult)localizedCaseInsensitiveNumericCompare:(NSString *)aStr;
@@ -62,38 +62,38 @@
- (NSString *)lossyStringUsingEncoding:(NSStringEncoding)encoding;
-- (NSString *)typeName;
+@property (nonatomic, readonly) NSString *typeName;
-- (NSString *)rectString;
-- (NSString *)pointString;
-- (NSString *)originString;
-- (NSString *)sizeString;
-- (NSString *)midPointString;
-- (CGFloat)rectX;
-- (CGFloat)rectY;
-- (CGFloat)rectWidth;
-- (CGFloat)rectHeight;
-- (CGFloat)pointX;
-- (CGFloat)pointY;
+@property (nonatomic, readonly) NSString *rectString;
+@property (nonatomic, readonly) NSString *pointString;
+@property (nonatomic, readonly) NSString *originString;
+@property (nonatomic, readonly) NSString *sizeString;
+@property (nonatomic, readonly) NSString *midPointString;
+@property (nonatomic, readonly) CGFloat rectX;
+@property (nonatomic, readonly) CGFloat rectY;
+@property (nonatomic, readonly) CGFloat rectWidth;
+@property (nonatomic, readonly) CGFloat rectHeight;
+@property (nonatomic, readonly) CGFloat pointX;
+@property (nonatomic, readonly) CGFloat pointY;
-- (NSString *)stringBySurroundingWithSpacesIfNotEmpty;
-- (NSString *)stringByAppendingSpaceIfNotEmpty;
-- (NSString *)stringByAppendingDoubleSpaceIfNotEmpty;
-- (NSString *)stringByPrependingSpaceIfNotEmpty;
-- (NSString *)stringByAppendingCommaIfNotEmpty;
-- (NSString *)stringByAppendingFullStopIfNotEmpty;
-- (NSString *)stringByAppendingCommaAndSpaceIfNotEmpty;
-- (NSString *)stringByAppendingFullStopAndSpaceIfNotEmpty;
-- (NSString *)stringByPrependingCommaAndSpaceIfNotEmpty;
-- (NSString *)stringByPrependingFullStopAndSpaceIfNotEmpty;
-- (NSString *)parenthesizedStringIfNotEmpty;
+@property (nonatomic, readonly) NSString
*stringBySurroundingWithSpacesIfNotEmpty;
+@property (nonatomic, readonly) NSString *stringByAppendingSpaceIfNotEmpty;
+@property (nonatomic, readonly) NSString
*stringByAppendingDoubleSpaceIfNotEmpty;
+@property (nonatomic, readonly) NSString *stringByPrependingSpaceIfNotEmpty;
+@property (nonatomic, readonly) NSString *stringByAppendingCommaIfNotEmpty;
+@property (nonatomic, readonly) NSString *stringByAppendingFullStopIfNotEmpty;
+@property (nonatomic, readonly) NSString
*stringByAppendingCommaAndSpaceIfNotEmpty;
+@property (nonatomic, readonly) NSString
*stringByAppendingFullStopAndSpaceIfNotEmpty;
+@property (nonatomic, readonly) NSString
*stringByPrependingCommaAndSpaceIfNotEmpty;
+@property (nonatomic, readonly) NSString
*stringByPrependingFullStopAndSpaceIfNotEmpty;
+@property (nonatomic, readonly) NSString *parenthesizedStringIfNotEmpty;
-- (NSURL *)url;
-- (NSAttributedString *)icon;
-- (NSAttributedString *)smallIcon;
+@property (nonatomic, readonly) NSURL *url;
+@property (nonatomic, readonly) NSAttributedString *icon;
+@property (nonatomic, readonly) NSAttributedString *smallIcon;
-- (NSAttributedString *)typeIcon;
+@property (nonatomic, readonly) NSAttributedString *typeIcon;
-- (NSString *)xmlString;
+@property (nonatomic, readonly) NSString *xmlString;
@end
Modified: trunk/NSURL_SKExtensions.h
===================================================================
--- trunk/NSURL_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSURL_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -49,20 +49,20 @@
- (NSURL *)URLReplacingPathExtension:(NSString *)ext;
- (NSString *)lastPathComponentReplacingPathExtension:(NSString *)ext;
-- (NSURL *)uniqueFileURL;
+@property (nonatomic, readonly) NSURL *uniqueFileURL;
-- (BOOL)isTrashedFileURL;
+@property (nonatomic, readonly, getter=isTrashedFileURL) BOOL trashedFileURL;
-- (BOOL)isSkimURL;
-- (BOOL)isSkimFileURL;
-- (BOOL)isSkimBookmarkURL;
-- (NSURL *)skimFileURL;
+@property (nonatomic, readonly) BOOL isSkimURL;
+@property (nonatomic, readonly) BOOL isSkimFileURL;
+@property (nonatomic, readonly) BOOL isSkimBookmarkURL;
+@property (nonatomic, readonly) NSURL *skimFileURL;
-- (NSAttributedString *)icon;
-- (NSAttributedString *)smallIcon;
-- (NSAttributedString *)linkedIcon;
-- (NSAttributedString *)linkedSmallIcon;
-- (NSAttributedString *)linkedText;
-- (NSAttributedString *)linkedFileName;
+@property (nonatomic, readonly) NSAttributedString *icon;
+@property (nonatomic, readonly) NSAttributedString *smallIcon;
+@property (nonatomic, readonly) NSAttributedString *linkedIcon;
+@property (nonatomic, readonly) NSAttributedString *linkedSmallIcon;
+@property (nonatomic, readonly) NSAttributedString *linkedText;
+@property (nonatomic, readonly) NSAttributedString *linkedFileName;
@end
Modified: trunk/NSValue_SKExtensions.h
===================================================================
--- trunk/NSValue_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSValue_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -41,16 +41,16 @@
@interface NSValue (SKExtensions)
-- (NSString *)rectString;
-- (NSString *)pointString;
-- (NSString *)originString;
-- (NSString *)sizeString;
-- (NSString *)midPointString;
-- (CGFloat)rectX;
-- (CGFloat)rectY;
-- (CGFloat)rectWidth;
-- (CGFloat)rectHeight;
-- (CGFloat)pointX;
-- (CGFloat)pointY;
+@property (nonatomic, readonly) NSString *rectString;
+@property (nonatomic, readonly) NSString *pointString;
+@property (nonatomic, readonly) NSString *originString;
+@property (nonatomic, readonly) NSString *sizeString;
+@property (nonatomic, readonly) NSString *midPointString;
+@property (nonatomic, readonly) CGFloat rectX;
+@property (nonatomic, readonly) CGFloat rectY;
+@property (nonatomic, readonly) CGFloat rectWidth;
+@property (nonatomic, readonly) CGFloat rectHeight;
+@property (nonatomic, readonly) CGFloat pointX;
+@property (nonatomic, readonly) CGFloat pointY;
@end
Modified: trunk/NSView_SKExtensions.h
===================================================================
--- trunk/NSView_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/NSView_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -47,7 +47,7 @@
- (void)deactivateWellSubcontrols;
- (void)deactivateColorWellSubcontrols;
-- (SKFontWell *)activeFontWell;
+@property (nonatomic, readonly) SKFontWell *activeFontWell;
- (NSRect)convertRectToScreen:(NSRect)rect;
- (NSRect)convertRectFromScreen:(NSRect)rect;
Modified: trunk/NSWindowController_SKExtensions.h
===================================================================
--- trunk/NSWindowController_SKExtensions.h 2023-12-08 23:57:39 UTC (rev
13860)
+++ trunk/NSWindowController_SKExtensions.h 2023-12-09 15:37:45 UTC (rev
13861)
@@ -43,7 +43,7 @@
- (void)setWindowFrameAutosaveNameOrCascade:(NSString *)name;
-- (BOOL)isNoteWindowController;
+@property (nonatomic, readonly, getter=isNoteWindowController) BOOL
noteWindowController;
- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void
(^)(NSInteger result))handler;
Modified: trunk/PDFAnnotationCircle_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationCircle_SKExtensions.h 2023-12-08 23:57:39 UTC (rev
13860)
+++ trunk/PDFAnnotationCircle_SKExtensions.h 2023-12-09 15:37:45 UTC (rev
13861)
@@ -41,5 +41,5 @@
@interface PDFAnnotationCircle (SKExtensions)
-- (void)setScriptingInteriorColor:(NSColor *)newColor;
+@property (nonatomic, copy) NSColor *scriptingInteriorColor;
@end
Modified: trunk/PDFAnnotationFreeText_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationFreeText_SKExtensions.h 2023-12-08 23:57:39 UTC (rev
13860)
+++ trunk/PDFAnnotationFreeText_SKExtensions.h 2023-12-09 15:37:45 UTC (rev
13861)
@@ -46,9 +46,9 @@
@interface PDFAnnotationFreeText (SKExtensions)
-- (void)setFontName:(NSString *)fontName;
-- (void)setFontSize:(CGFloat)pointSize;
-- (void)setScriptingFontColor:(NSColor *)newScriptingFontColor;
-- (void)setScriptingAlignment:(NSInteger)alignment;
+@property (nonatomic, copy) NSFont *fontName;
+@property (nonatomic) CGFloat fontSize;
+@property (nonatomic, copy) NSColor *scriptingFontColor;
+@property (nonatomic) NSInteger scriptingAlignment;
@end
Modified: trunk/PDFAnnotationLine_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationLine_SKExtensions.h 2023-12-08 23:57:39 UTC (rev
13860)
+++ trunk/PDFAnnotationLine_SKExtensions.h 2023-12-09 15:37:45 UTC (rev
13861)
@@ -50,10 +50,10 @@
@interface PDFAnnotationLine (SKExtensions)
-- (void)setStartPointAsQDPoint:(NSData *)inQDPointAsData;
-- (void)setEndPointAsQDPoint:(NSData *)inQDPointAsData;
-- (void)setScriptingStartLineStyle:(PDFLineStyle)style;
-- (void)setScriptingEndLineStyle:(PDFLineStyle)style;
-- (void)setScriptingInteriorColor:(NSColor *)newColor;
+@property (nonatomic, copy) NSData *startPointAsQDPoint;
+@property (nonatomic, copy) NSData *endPointAsQDPoint;
+@property (nonatomic) PDFLineStyle scriptingStartLineStyle;
+@property (nonatomic) PDFLineStyle scriptingEndLineStyle;
+@property (nonatomic, copy) NSColor *scriptingInteriorColor;
@end
Modified: trunk/PDFAnnotationMarkup_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationMarkup_SKExtensions.h 2023-12-08 23:57:39 UTC (rev
13860)
+++ trunk/PDFAnnotationMarkup_SKExtensions.h 2023-12-09 15:37:45 UTC (rev
13861)
@@ -47,6 +47,6 @@
- (instancetype)initSkimNoteWithSelection:(PDFSelection *)selection
forPage:(PDFPage *)page forType:(NSString *)type;
-- (PDFSelection *)selection;
+@property (nonatomic, readonly) PDFSelection *selection;
@end
Modified: trunk/PDFAnnotationSquare_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationSquare_SKExtensions.h 2023-12-08 23:57:39 UTC (rev
13860)
+++ trunk/PDFAnnotationSquare_SKExtensions.h 2023-12-09 15:37:45 UTC (rev
13861)
@@ -41,5 +41,5 @@
@interface PDFAnnotationSquare (SKExtensions)
-- (void)setScriptingInteriorColor:(NSColor *)newColor;
+@property (nonatomic, copy) NSColor *scriptingInteriorColor;
@end
Modified: trunk/PDFAnnotationText_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationText_SKExtensions.h 2023-12-08 23:57:39 UTC (rev
13860)
+++ trunk/PDFAnnotationText_SKExtensions.h 2023-12-09 15:37:45 UTC (rev
13861)
@@ -44,5 +44,5 @@
@interface PDFAnnotationText (SKExtensions)
-- (void)setScriptingIconType:(PDFTextAnnotationIconType)iconType;
+@property (nonatomic) PDFTextAnnotationIconType scriptingIconType;
@end
Modified: trunk/PDFAnnotation_SKExtensions.h
===================================================================
--- trunk/PDFAnnotation_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/PDFAnnotation_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -68,43 +68,36 @@
+ (NSDictionary *)textToNoteSkimNoteProperties:(NSDictionary *)properties;
-- (NSString *)fdfString;
+@property (nonatomic, readonly) NSString *fdfString;
-- (NSUInteger)pageIndex;
+@property (nonatomic, readonly) NSUInteger pageIndex;
-- (PDFBorderStyle)borderStyle;
-- (void)setBorderStyle:(PDFBorderStyle)style;
-- (CGFloat)lineWidth;
-- (void)setLineWidth:(CGFloat)width;
-- (NSArray *)dashPattern;
-- (void)setDashPattern:(NSArray *)pattern;
+@property (nonatomic) PDFBorderStyle borderStyle;
+@property (nonatomic) CGFloat lineWidth;
+@property (nonatomic, copy) NSArray *dashPattern;
-- (NSPoint)observedStartPoint;
-- (void)setObservedStartPoint:(NSPoint)point;
-- (NSPoint)observedEndPoint;
-- (void)setObservedEndPoint:(NSPoint)point;
+@property (nonatomic) NSPoint observedStartPoint;
+@property (nonatomic) NSPoint observedEndPoint;
-- (CGFloat)pathInset;
+@property (nonatomic, readonly) CGFloat pathInset;
-- (NSArray *)bezierPaths;
-- (void)setBezierPaths:(NSArray *)newPaths;
+@property (nonatomic, copy) NSArray *bezierPaths;
-- (NSArray *)pagePaths;
+@property (nonatomic, readonly) NSArray *pagePaths;
-- (NSImage *)image;
-- (NSAttributedString *)text;
+@property (nonatomic, readonly) NSImage *image;
+@property (nonatomic, readonly) NSAttributedString *text;
-- (BOOL)hasNoteText;
-- (SKNoteText *)noteText;
+@property (nonatomic, readonly) BOOL hasNoteText;
+@property (nonatomic, readonly) SKNoteText *noteText;
-- (PDFSelection *)selection;
+@property (nonatomic, readonly) PDFSelection *selection;
-- (id)objectValue;
-- (void)setObjectValue:(id)newObjectValue;
+@property (nonatomic, retain) id objectValue;
-- (SKNPDFWidgetType)widgetType;
+@property (nonatomic, readonly) SKNPDFWidgetType widgetType;
-- (NSString *)textString;
+@property (nonatomic, readonly) NSString *textString;
- (BOOL)isMarkup;
- (BOOL)isNote;
@@ -123,10 +116,10 @@
- (BOOL)hitTest:(NSPoint)point;
-- (CGFloat)boundsOrder;
+@property (nonatomic, readonly) CGFloat boundsOrder;
- (NSRect)displayRectForBounds:(NSRect)bounds lineWidth:(CGFloat)lineWidth;
-- (NSRect)displayRect;
+@property (nonatomic, readonly) NSRect displayRect;
- (SKRectEdges)resizeHandleForPoint:(NSPoint)point
scaleFactor:(CGFloat)scaleFactor;
@@ -136,40 +129,35 @@
- (void)autoUpdateString;
-- (NSString *)uniqueID;
+@property (nonatomic, readonly) NSString *uniqueID;
- (void)setColor:(NSColor *)color alternate:(BOOL)alternate
updateDefaults:(BOOL)update;
-- (NSURL *)skimURL;
+@property (nonatomic, readonly) NSURL *skimURL;
-- (NSSet *)keysForValuesToObserveForUndo;
+@property (nonatomic, readonly) NSSet *keysForValuesToObserveForUndo;
-+ (NSSet *)customScriptingKeys;
-- (NSScriptObjectSpecifier *)objectSpecifier;
-- (NSColor *)scriptingColor;
-- (void)setScriptingColor:(NSColor *)newColor;
-- (PDFPage *)scriptingPage;
-- (NSDate *)scriptingModificationDate;
-- (void)setScriptingModificationDate:(NSDate *)date;
-- (NSString *)scriptingUserName;
-- (void)setScriptingUserName:(NSString *)name;
-- (PDFTextAnnotationIconType)scriptingIconType;
-- (id)textContents;
-- (void)setTextContents:(id)text;
-- (id)richText;
-- (void)setBoundsAsQDRect:(NSData *)inQDBoundsAsData;
-- (NSData *)boundsAsQDRect;
-- (NSInteger)scriptingAlignment;
-- (NSString *)fontName;
-- (CGFloat)fontSize;
-- (NSColor *)scriptingFontColor;
-- (NSColor *)scriptingInteriorColor;
-- (NSData *)startPointAsQDPoint;
-- (NSData *)endPointAsQDPoint;
-- (PDFLineStyle)scriptingStartLineStyle;
-- (PDFLineStyle)scriptingEndLineStyle;
-- (id)selectionSpecifier;
-- (NSArray *)scriptingPointLists;
+@property (class, nonatomic, readonly) NSSet *customScriptingKeys;
+@property (nonatomic, readonly) NSScriptObjectSpecifier *objectSpecifier;
+@property (nonatomic, copy) NSColor *scriptingColor;
+@property (nonatomic, readonly) PDFPage *scriptingPage;
+@property (nonatomic, copy) NSDate *scriptingModificationDate;
+@property (nonatomic, copy) NSString *scriptingUserName;
+@property (nonatomic, readonly) PDFTextAnnotationIconType scriptingIconType;
+@property (nonatomic, copy) id textContents;
+@property (nonatomic, readonly) id richText;
+@property (nonatomic, copy) NSData *boundsAsQDRect;
+@property (nonatomic, readonly) NSInteger scriptingAlignment;
+@property (nonatomic, readonly) NSString *fontName;
+@property (nonatomic, readonly) CGFloat fontSize;
+@property (nonatomic, readonly) NSColor *scriptingFontColor;
+@property (nonatomic, readonly) NSColor *scriptingInteriorColor;
+@property (nonatomic, readonly) NSData *startPointAsQDPoint;
+@property (nonatomic, readonly) NSData *endPointAsQDPoint;
+@property (nonatomic, readonly) PDFLineStyle scriptingStartLineStyle;
+@property (nonatomic, readonly) PDFLineStyle scriptingEndLineStyle;
+@property (nonatomic, readonly) id selectionSpecifier;
+@property (nonatomic, readonly) NSArray *scriptingPointLists;
- (void)handleEditScriptCommand:(NSScriptCommand *)command;
@@ -176,6 +164,6 @@
@end
@interface PDFAnnotation (SKDefaultExtensions)
-- (NSColor *)interiorColor;
-- (NSString *)fieldName;
+@property (nonatomic, readonly) NSColor *interiorColor;
+@property (nonatomic, readonly) NSString *fieldName;
@end
Modified: trunk/PDFDocument_SKExtensions.h
===================================================================
--- trunk/PDFDocument_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/PDFDocument_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -55,15 +55,14 @@
} SKLanguageDirectionAngles;
@interface PDFDocument (SKExtensions) <NSFastEnumeration>
-- (NSArray *)pageLabels;
-- (NSArray *)fileIDStrings;
-- (NSDictionary *)initialSettings;
-- (SKLanguageDirectionAngles)languageDirectionAngles;
-- (BOOL)allowsNotes;
-- (BOOL)realAllowsCommenting;
-- (NSDocument *)containingDocument;
-- (NSArray *)detectedWidgets;
-- (void)setContainingDocument:(NSDocument *)document;
+@property (nonatomic, readonly) NSArray *pageLabels;
+@property (nonatomic, readonly) NSArray *fileIDStrings;
+@property (nonatomic, readonly) NSDictionary *initialSettings;
+@property (nonatomic, readonly) SKLanguageDirectionAngles
languageDirectionAngles;
+@property (nonatomic, readonly) BOOL allowsNotes;
+@property (nonatomic, readonly) BOOL realAllowsCommenting;
+@property (nonatomic, readonly) NSArray *detectedWidgets;
+@property (nonatomic, weak) NSDocument *containingDocument;
- (void)addAnnotation:(PDFAnnotation *)annotation toPage:(PDFPage *)page;
- (void)removeAnnotation:(PDFAnnotation *)annotation;
- (void)moveAnnotation:(PDFAnnotation *)annotation toPage:(PDFPage *)page;
Modified: trunk/PDFOutline_SKExtensions.h
===================================================================
--- trunk/PDFOutline_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/PDFOutline_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -42,23 +42,22 @@
@interface PDFOutline (SKExtensions)
-- (PDFPage *)page;
-- (NSString *)pageLabel;
+@property (nonatomic, readonly) PDFPage *page;
+@property (nonatomic, readonly) NSString *pageLabel;
-- (NSString *)cleanedLabel;
+@property (nonatomic, readonly) NSString *cleanedLabel;
-- (NSInteger)deepestLevel;
+@property (nonatomic, readonly) NSInteger deepestLevel;
- (void)pageLabelDidUpdate;
-- (NSScriptObjectSpecifier *)objectSpecifier;
-- (PDFOutline *)scriptingParent;
-- (NSArray *)entireContents;
+@property (nonatomic, readonly) NSScriptObjectSpecifier *objectSpecifier;
+@property (nonatomic, readonly) PDFOutline *scriptingParent;
+@property (nonatomic, readonly) NSArray *entireContents;
- (NSUInteger)countOfOutlines;
- (PDFOutline *)objectInOutlinesAtIndex:(NSUInteger)idx;
-- (NSString *)scriptingURL;
-- (NSURL *)scriptingFile;
-- (BOOL)isExpanded;
-- (void)setExpanded:(BOOL)flag;
+@property (nonatomic, readonly) NSString *scriptingURL;
+@property (nonatomic, readonly) NSURL *scriptingFile;
+@property (nonatomic, getter=isExpanded) BOOL expanded;
@end
Modified: trunk/PDFPage_SKExtensions.h
===================================================================
--- trunk/PDFPage_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/PDFPage_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -52,12 +52,11 @@
@interface PDFPage (SKExtensions) <NSFilePromiseProviderDelegate>
-+ (BOOL)usesSequentialPageNumbering;
-+ (void)setUsesSequentialPageNumbering:(BOOL)flag;
+@property (class, nonatomic) BOOL usesSequentialPageNumbering;
-- (NSRect)foregroundRect;
-- (NSRect)autoCropBox;
-- (NSRect)boundingBox;
+@property (nonatomic, readonly) NSRect foregroundRect;
+@property (nonatomic, readonly) NSRect autoCropBox;
+@property (nonatomic, readonly) NSRect boundingBox;
- (NSImage *)thumbnailWithSize:(CGFloat)size forBox:(PDFDisplayBox)box;
- (NSImage *)thumbnailWithSize:(CGFloat)size forBox:(PDFDisplayBox)box
readingBar:(SKReadingBar *)readingBar;
@@ -64,12 +63,12 @@
- (NSImage *)thumbnailWithSize:(CGFloat)size forBox:(PDFDisplayBox)box
shadowBlurRadius:(CGFloat)shadowBlurRadius highlights:(NSArray *)highlights;
- (NSAttributedString *)thumbnailAttachmentWithSize:(CGFloat)size;
-- (NSAttributedString *)thumbnailAttachment;
-- (NSAttributedString *)thumbnail512Attachment;
-- (NSAttributedString *)thumbnail256Attachment;
-- (NSAttributedString *)thumbnail128Attachment;
-- (NSAttributedString *)thumbnail64Attachment;
-- (NSAttributedString *)thumbnail32Attachment;
+@property (nonatomic, readonly) NSAttributedString *thumbnailAttachment;
+@property (nonatomic, readonly) NSAttributedString *thumbnail512Attachment;
+@property (nonatomic, readonly) NSAttributedString *thumbnail256Attachment;
+@property (nonatomic, readonly) NSAttributedString *thumbnail128Attachment;
+@property (nonatomic, readonly) NSAttributedString *thumbnail64Attachment;
+@property (nonatomic, readonly) NSAttributedString *thumbnail32Attachment;
- (NSData *)PDFDataForRect:(NSRect)rect;
- (NSData *)TIFFDataForRect:(NSRect)rect;
@@ -77,40 +76,37 @@
- (id<NSPasteboardWriting>)filePromiseForPageIndexes:(NSIndexSet *)pageIndexes;
- (void)writeToClipboardForPageIndexes:(NSIndexSet *)pageIndexes;
-- (NSURL *)skimURL;
+@property (nonatomic, readonly) NSURL *skimURL;
-- (NSPointerArray *)lineRects;
+@property (nonatomic, readonly) NSPointerArray *lineRects;
- (NSInteger)indexOfLineRectAtPoint:(NSPoint)point lower:(BOOL)lower;
-- (NSUInteger)pageIndex;
-- (NSString *)sequentialLabel;
-- (NSString *)displayLabel;
+@property (nonatomic, readonly) NSUInteger pageIndex;
+@property (nonatomic, readonly) NSString *sequentialLabel;
+@property (nonatomic, readonly) NSString *displayLabel;
-- (NSInteger)intrinsicRotation;
-- (NSInteger)characterDirectionAngle;
-- (NSInteger)lineDirectionAngle;
+@property (nonatomic, readonly) NSInteger intrinsicRotation;
+@property (nonatomic, readonly) NSInteger characterDirectionAngle;
+@property (nonatomic, readonly) NSInteger lineDirectionAngle;
-- (BOOL)isEditable;
+@property (nonatomic, readonly, getter=isEditable) BOOL editable;
- (NSAffineTransform *)affineTransformForBox:(PDFDisplayBox)box;
- (CGFloat)sortOrderForBounds:(NSRect)bounds;
-- (NSScriptObjectSpecifier *)objectSpecifier;
-- (NSDocument *)containingDocument;
-- (NSUInteger)index;
-- (NSInteger)rotationAngle;
-- (void)setRotationAngle:(NSInteger)angle;
-- (NSData *)boundsAsQDRect;
-- (void)setBoundsAsQDRect:(NSData *)inQDBoundsAsData;
-- (NSData *)mediaBoundsAsQDRect;
-- (void)setMediaBoundsAsQDRect:(NSData *)inQDBoundsAsData;
-- (NSData *)contentBoundsAsQDRect;
-- (NSArray *)lineBoundsAsQDRects;
+@property (nonatomic, readonly) NSScriptObjectSpecifier *objectSpecifier;
+@property (nonatomic, readonly) NSDocument *containingDocument;
+@property (nonatomic, readonly) NSUInteger index;
+@property (nonatomic) NSInteger rotationAngle;
+@property (nonatomic, copy) NSData *boundsAsQDRect;
+@property (nonatomic, copy) NSData *mediaBoundsAsQDRect;
+@property (nonatomic, readonly) NSData *contentBoundsAsQDRect;
+@property (nonatomic, readonly) NSArray *lineBoundsAsQDRects;
- (NSUInteger)countOfLines;
- (SKLine *)objectInLinesAtIndex:(NSUInteger)anIndex;
-- (NSTextStorage *)richText;
-- (NSArray *)notes;
+@property (nonatomic, readonly) NSTextStorage *richText;
+@property (nonatomic, readonly) NSArray *notes;
- (id)valueInNotesWithUniqueID:(NSString *)aUniqueID;
- (void)insertObject:(id)newNote inNotesAtIndex:(NSUInteger)index;
- (void)removeObjectFromNotesAtIndex:(NSUInteger)index;
Modified: trunk/PDFSelection_SKExtensions.h
===================================================================
--- trunk/PDFSelection_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/PDFSelection_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -45,15 +45,15 @@
+ (PDFSelection *)selectionByAddingSelections:(NSArray *)selections;
// the search table columns bind to these methods for display
-- (NSString *)cleanedString;
-- (NSAttributedString *)contextString;
+@property (nonatomic, readonly) NSString *cleanedString;
+@property (nonatomic, readonly) NSAttributedString *contextString;
-- (PDFDestination *)destination;
+@property (nonatomic, readonly) PDFDestination *destination;
- (NSUInteger)safeIndexOfFirstCharacterOnPage:(PDFPage *)page;
- (NSUInteger)safeIndexOfLastCharacterOnPage:(PDFPage *)page;
-- (PDFPage *)safeFirstPage;
-- (PDFPage *)safeLastPage;
+@property (nonatomic, readonly) PDFPage *safeFirstPage;
+@property (nonatomic, readonly) PDFPage *safeLastPage;
- (BOOL)hasCharacters;
@@ -61,6 +61,6 @@
+ (instancetype)selectionWithSpecifier:(id)specifier;
+ (instancetype)selectionWithSpecifier:(id)specifier onPage:(PDFPage *)aPage;
-- (id)objectSpecifiers;
+@property (nonatomic, readonly) id objectSpecifiers;
@end
Modified: trunk/PDFView_SKExtensions.h
===================================================================
--- trunk/PDFView_SKExtensions.h 2023-12-08 23:57:39 UTC (rev 13860)
+++ trunk/PDFView_SKExtensions.h 2023-12-09 15:37:45 UTC (rev 13861)
@@ -69,8 +69,8 @@
- (NSRect)layoutBoundsForPage:(PDFPage *)page;
-+ (NSColor *)defaultBackgroundColor;
-+ (NSColor *)defaultFullScreenBackgroundColor;
+@property (class, nonatomic, readonly) NSColor *defaultBackgroundColor;
+@property (class, nonatomic, readonly) NSColor
*defaultFullScreenBackgroundColor;
@end
Modified: trunk/SKNPDFAnnotationNote_SKExtensions.h
===================================================================
--- trunk/SKNPDFAnnotationNote_SKExtensions.h 2023-12-08 23:57:39 UTC (rev
13860)
+++ trunk/SKNPDFAnnotationNote_SKExtensions.h 2023-12-09 15:37:45 UTC (rev
13861)
@@ -43,15 +43,6 @@
extern NSString *SKPDFAnnotationRichTextKey;
-
-@interface PDFAnnotationText (SKLeopardDeprecated)
-// these are deprecated on 10.5, but we don't want to use the popup for 10.4
compatibility; we check for existence before using this anyway
-- (BOOL)windowIsOpen;
-- (void)setWindowIsOpen:(BOOL)isOpen;
-@end
-
-#pragma mark -
-
@interface SKNPDFAnnotationNote (SKExtensions)
-- (void)setRichText:(id)newText;
+@property (nonatomic, readonly) id richText;
@end
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
