Revision: 15753
http://sourceforge.net/p/skim-app/code/15753
Author: hofman
Date: 2025-11-03 16:59:58 +0000 (Mon, 03 Nov 2025)
Log Message:
-----------
use NSPasteboardType for URL and fileURL
Modified Paths:
--------------
trunk/NSPasteboard_SKExtensions.m
trunk/NSURL_SKExtensions.m
trunk/SKBookmarkController.m
trunk/SKDownloadController.m
Modified: trunk/NSPasteboard_SKExtensions.m
===================================================================
--- trunk/NSPasteboard_SKExtensions.m 2025-11-03 15:54:41 UTC (rev 15752)
+++ trunk/NSPasteboard_SKExtensions.m 2025-11-03 16:59:58 UTC (rev 15753)
@@ -51,7 +51,7 @@
NSURL *theURL = [URLs objectAtIndex:i];
NSPasteboardItem *item = [[NSPasteboardItem alloc] init];
- [item setString:[theURL absoluteString] forType:(NSString *)([theURL
isFileURL] ? kUTTypeFileURL : kUTTypeURL)];
+ [item setString:[theURL absoluteString] forType:[theURL isFileURL] ?
NSPasteboardTypeFileURL : NSPasteboardTypeURL];
[item setString:[theURL absoluteString]
forType:NSPasteboardTypeString];
if (i < namesCount)
[item setString:[names objectAtIndex:i]
forType:SKPasteboardTypeURLName];
Modified: trunk/NSURL_SKExtensions.m
===================================================================
--- trunk/NSURL_SKExtensions.m 2025-11-03 15:54:41 UTC (rev 15752)
+++ trunk/NSURL_SKExtensions.m 2025-11-03 16:59:58 UTC (rev 15753)
@@ -286,11 +286,11 @@
@implementation SKURL
+ (NSArray *)readableTypesForPasteboard:(NSPasteboard *)pasteboard {
- return @[(__bridge NSString *)kUTTypeURL, (__bridge NSString
*)kUTTypeFileURL, NSPasteboardTypeString];
+ return @[NSPasteboardTypeURL, NSPasteboardTypeFileURL,
NSPasteboardTypeString];
}
+ (NSPasteboardReadingOptions)readingOptionsForType:(NSString *)type
pasteboard:(NSPasteboard *)pasteboard {
- if ([type isEqualToString:(__bridge NSString *)kUTTypeURL] || [type
isEqualToString:(__bridge NSString *)kUTTypeFileURL] || [type
isEqualToString:NSPasteboardTypeString])
+ if ([type isEqualToString:NSPasteboardTypeURL] || [type
isEqualToString:NSPasteboardTypeFileURL] || [type
isEqualToString:NSPasteboardTypeString])
return NSPasteboardReadingAsString;
return NSPasteboardReadingAsData;
}
@@ -299,7 +299,7 @@
self = nil;
if ([propertyList isKindOfClass:[NSString class]]) {
NSString *string = propertyList;
- if ([type isEqualToString:(__bridge NSString *)kUTTypeURL] || [type
isEqualToString:(__bridge NSString *)kUTTypeFileURL]) {
+ if ([type isEqualToString:NSPasteboardTypeURL] || [type
isEqualToString:NSPasteboardTypeFileURL]) {
self = (id)[[NSURL alloc] initWithString:string];
} else if ([type isEqualToString:NSPasteboardTypeString]) {
if ([string rangeOfString:@"://"].length) {
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2025-11-03 15:54:41 UTC (rev 15752)
+++ trunk/SKBookmarkController.m 2025-11-03 16:59:58 UTC (rev 15753)
@@ -210,7 +210,7 @@
[outlineView setTypeSelectHelper:[SKTypeSelectHelper typeSelectHelper]];
- [outlineView registerForDraggedTypes:@[SKPasteboardTypeBookmarkRow,
(__bridge NSString *)kUTTypeFileURL, NSFilenamesPboardType]];
+ [outlineView registerForDraggedTypes:@[SKPasteboardTypeBookmarkRow,
NSPasteboardTypeFileURL, NSFilenamesPboardType]];
[outlineView setDraggingSourceOperationMask:NSDragOperationMove
forLocal:YES];
[outlineView setDraggingSourceOperationMask:NSDragOperationDelete
forLocal:NO];
@@ -221,7 +221,7 @@
[outlineView sizeToFit];
- NSArray *sendTypes = @[(__bridge NSString *)kUTTypeFileURL];
+ NSArray *sendTypes = @[NSPasteboardTypeFileURL];
[NSApp registerServicesMenuSendTypes:sendTypes returnTypes:@[]];
}
@@ -1381,7 +1381,7 @@
#pragma mark Services
- (BOOL)writeSelectionToPasteboard:(NSPasteboard *)pboard types:(NSArray
*)types {
- if ([types containsObject:(__bridge NSString *)kUTTypeFileURL] &&
([outlineView selectedRow] != -1 || [outlineView clickedRow] != -1)) {
+ if ([types containsObject:NSPasteboardTypeFileURL] && ([outlineView
selectedRow] != -1 || [outlineView clickedRow] != -1)) {
NSInteger rowIndex = [outlineView clickedRow];
NSIndexSet *indexes = [outlineView selectedRowIndexes];
if (rowIndex != -1 && [indexes containsIndex:rowIndex] == NO)
@@ -1403,7 +1403,7 @@
}
- (id)validRequestorForSendType:(NSString *)sendType returnType:(NSString
*)returnType {
- if ([sendType isEqualToString:(__bridge NSString *)kUTTypeFileURL] &&
returnType == nil)
+ if ([sendType isEqualToString:NSPasteboardTypeFileURL] && returnType ==
nil)
return [outlineView selectedRow] != -1 || [outlineView clickedRow] !=
-1 ? self : nil;
return [super validRequestorForSendType:sendType returnType:returnType];
}
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2025-11-03 15:54:41 UTC (rev 15752)
+++ trunk/SKDownloadController.m 2025-11-03 16:59:58 UTC (rev 15753)
@@ -147,7 +147,7 @@
[tableView setTypeSelectHelper:[SKTypeSelectHelper typeSelectHelper]];
- [tableView registerForDraggedTypes:@[(__bridge NSString *)kUTTypeURL,
(__bridge NSString *)kUTTypeFileURL, NSURLPboardType, NSFilenamesPboardType,
NSPasteboardTypeString]];
+ [tableView registerForDraggedTypes:@[NSPasteboardTypeURL,
NSPasteboardTypeFileURL, NSURLPboardType, NSFilenamesPboardType,
NSPasteboardTypeString]];
[tableView setSupportsQuickLook:YES];
}
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
