From 877d120e3d900fbcd88d7eb38854844dfd5add8e Mon Sep 17 00:00:00 2001 From: Jinyu Meng Date: Tue, 10 Nov 2020 21:26:49 +0900 Subject: [PATCH] Fix file drag and drop. --- DUWindow.m | 15 +++++++-------- DictUnifier.xcodeproj/project.pbxproj | 6 ++++-- Info.plist | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/DUWindow.m b/DUWindow.m index 31897ef..81b7ef7 100644 --- a/DUWindow.m +++ b/DUWindow.m @@ -27,16 +27,15 @@ - (NSDragOperation) draggingEntered: (id < NSDraggingInfo >) sender - (BOOL) performDragOperation: (id < NSDraggingInfo >) sender { - NSPasteboard *pboard = [sender draggingPasteboard]; BOOL successful = NO; - - if ([[pboard types] containsObject: NSPasteboardTypeFileURL]) - { - NSArray *files = [pboard propertyListForType: NSPasteboardTypeFileURL]; - [controller startConversion: [files objectAtIndex: 0]]; - successful = NO; + NSPasteboard *pboard = [sender draggingPasteboard]; + if ([[pboard types] containsObject:NSURLPboardType]) { + NSArray *urls = [pboard readObjectsForClasses:@[[NSURL class]] options:nil]; + NSURL *firstURL = [urls firstObject]; + NSString *pathString = [firstURL path]; + [controller startConversion: pathString]; + successful = YES; } - return successful; } diff --git a/DictUnifier.xcodeproj/project.pbxproj b/DictUnifier.xcodeproj/project.pbxproj index b2b9ce2..79fae26 100644 --- a/DictUnifier.xcodeproj/project.pbxproj +++ b/DictUnifier.xcodeproj/project.pbxproj @@ -719,7 +719,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 7; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; @@ -732,6 +732,7 @@ "$(inherited)", "\"$(SRCROOT)\"", ); + MARKETING_VERSION = 2.2; PRODUCT_BUNDLE_IDENTIFIER = "org.jjgod.${PRODUCT_NAME:identifier}"; PRODUCT_NAME = DictUnifier; SDKROOT = ""; @@ -746,7 +747,7 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 7; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -758,6 +759,7 @@ "$(inherited)", "\"$(SRCROOT)\"", ); + MARKETING_VERSION = 2.2; PRODUCT_BUNDLE_IDENTIFIER = "org.jjgod.${PRODUCT_NAME:identifier}"; PRODUCT_NAME = DictUnifier; SDKROOT = ""; diff --git a/Info.plist b/Info.plist index 463ae8c..42f12ad 100644 --- a/Info.plist +++ b/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.1 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion - 5 + $(CURRENT_PROJECT_VERSION) NSMainNibFile MainMenu NSPrincipalClass