Revision: 13866
http://sourceforge.net/p/skim-app/code/13866
Author: hofman
Date: 2023-12-09 17:20:20 +0000 (Sat, 09 Dec 2023)
Log Message:
-----------
standard property names for is... boolean properrties
Modified Paths:
--------------
trunk/NSDocument_SKExtensions.h
trunk/NSURL_SKExtensions.h
trunk/NSURL_SKExtensions.m
trunk/SKAlias.h
trunk/SKAlias.m
trunk/SKApplicationController.m
trunk/SKDocumentController.m
trunk/SKMainWindowController_UI.m
Modified: trunk/NSDocument_SKExtensions.h
===================================================================
--- trunk/NSDocument_SKExtensions.h 2023-12-09 16:53:42 UTC (rev 13865)
+++ trunk/NSDocument_SKExtensions.h 2023-12-09 17:20:20 UTC (rev 13866)
@@ -119,7 +119,7 @@
@property (nonatomic, strong) NSArray *noteSelection;
@property (nonatomic, readonly) NSDictionary *pdfViewSettings;
@property (nonatomic, readonly) NSDictionary *documentAttributes;
-@property (nonatomic, readonly) BOOL isPDFDocument;
+@property (nonatomic, readonly, getter=isPDFDocument) BOOL PDFDocument;
@property (nonatomic, readonly) NSInteger toolMode;
@property (nonatomic, readonly) NSInteger scriptingInteractionMode;
@property (nonatomic, readonly) NSDocument *presentationNotesDocument;
Modified: trunk/NSURL_SKExtensions.h
===================================================================
--- trunk/NSURL_SKExtensions.h 2023-12-09 16:53:42 UTC (rev 13865)
+++ trunk/NSURL_SKExtensions.h 2023-12-09 17:20:20 UTC (rev 13866)
@@ -53,10 +53,10 @@
@property (nonatomic, readonly, getter=isTrashedFileURL) BOOL trashedFileURL;
-@property (nonatomic, readonly) BOOL isSkimURL;
-@property (nonatomic, readonly) BOOL isSkimFileURL;
-@property (nonatomic, readonly) BOOL isSkimBookmarkURL;
-@property (nonatomic, readonly) NSURL *skimFileURL;
+@property (nonatomic, readonly, getter=isSkimURL) BOOL skimURL;
+@property (nonatomic, readonly, getter=isSkimFileURL) BOOL skimFileURL;
+@property (nonatomic, readonly, getter=isSkimBookmarkURL) BOOL skimBookmarkURL;
+@property (nonatomic, readonly) NSURL *associatedFileURL;
@property (nonatomic, readonly) NSAttributedString *icon;
@property (nonatomic, readonly) NSAttributedString *smallIcon;
Modified: trunk/NSURL_SKExtensions.m
===================================================================
--- trunk/NSURL_SKExtensions.m 2023-12-09 16:53:42 UTC (rev 13865)
+++ trunk/NSURL_SKExtensions.m 2023-12-09 17:20:20 UTC (rev 13866)
@@ -159,7 +159,7 @@
return host == nil || [host caseInsensitiveCompare:@"bookmarks"] !=
NSOrderedSame;
}
-- (NSURL *)skimFileURL {
+- (NSURL *)associatedFileURL {
if ([self isFileURL])
return self;
if ([self isSkimFileURL] == NO)
Modified: trunk/SKAlias.h
===================================================================
--- trunk/SKAlias.h 2023-12-09 16:53:42 UTC (rev 13865)
+++ trunk/SKAlias.h 2023-12-09 17:20:20 UTC (rev 13866)
@@ -45,7 +45,7 @@
}
@property (nonatomic, readonly) NSData *data;
-@property (nonatomic, readonly) BOOL isBookmark;
+@property (nonatomic, readonly, getter=isBookmark) BOOL bookmark;
@property (nonatomic, readonly) NSURL *fileURL;
@property (nonatomic, readonly) NSURL *fileURLNoUI;
Modified: trunk/SKAlias.m
===================================================================
--- trunk/SKAlias.m 2023-12-09 16:53:42 UTC (rev 13865)
+++ trunk/SKAlias.m 2023-12-09 17:20:20 UTC (rev 13866)
@@ -41,7 +41,7 @@
@implementation SKAlias
-@dynamic data, isBookmark, fileURL, fileURLNoUI;
+@dynamic data, bookmark, fileURL, fileURLNoUI;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2023-12-09 16:53:42 UTC (rev 13865)
+++ trunk/SKApplicationController.m 2023-12-09 17:20:20 UTC (rev 13866)
@@ -451,7 +451,7 @@
}];
}
} else {
- [[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfURL:[theURL skimFileURL] display:YES
completionHandler:^(NSDocument *document, BOOL documentWasAlreadyOpen, NSError
*error) {
+ [[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfURL:[theURL associatedFileURL] display:YES
completionHandler:^(NSDocument *document, BOOL documentWasAlreadyOpen, NSError
*error) {
if (document == nil && errorReporting && error && [error
isUserCancelledError] == NO)
[NSApp presentError:error];
}];
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2023-12-09 16:53:42 UTC (rev 13865)
+++ trunk/SKDocumentController.m 2023-12-09 17:20:20 UTC (rev 13866)
@@ -294,7 +294,7 @@
NSURL *theURL = [theURLs count] > 0 ? [theURLs objectAtIndex:0] : nil;
if ([theURL isSkimFileURL])
- theURL = [theURL skimFileURL];
+ theURL = [theURL associatedFileURL];
if ([theURL isSkimBookmarkURL]) {
SKBookmark *bookmark = showNotes ? nil : [[SKBookmarkController
sharedBookmarkController] bookmarkForURL:theURL];
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2023-12-09 16:53:42 UTC (rev 13865)
+++ trunk/SKMainWindowController_UI.m 2023-12-09 17:20:20 UTC (rev 13866)
@@ -1439,7 +1439,7 @@
[self presentError:error];
}];
} else if ([url isSkimFileURL]) {
- [sdc openDocumentWithContentsOfURL:[url skimFileURL] display:YES
completionHandler:^(NSDocument *document, BOOL documentWasAlreadyOpen, NSError
*error){
+ [sdc openDocumentWithContentsOfURL:[url associatedFileURL] display:YES
completionHandler:^(NSDocument *document, BOOL documentWasAlreadyOpen, NSError
*error){
if (document == nil && error && [error isUserCancelledError] == NO)
[self presentError:error];
}];
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
