diff --git a/Application/ArgsController.m b/Application/ArgsController.m index ae8a36f1..5cb60747 100644 --- a/Application/ArgsController.m +++ b/Application/ArgsController.m @@ -128,6 +128,16 @@ - (void)constructCommandString { // Interpreter NSDictionary *defaultAttrs = @{ NSForegroundColorAttributeName: [NSColor blackColor], NSBackgroundColorAttributeName: [NSColor whiteColor] }; + BOOL darkMode = NO; + if (@available(macOS 10.14, *)) { + darkMode = ([[[NSAppearance currentAppearance] name] isEqualToString:NSAppearanceNameDarkAqua]); + } + if (darkMode) { + defaultAttrs = @{ NSForegroundColorAttributeName: [NSColor whiteColor], + NSBackgroundColorAttributeName: [NSColor blackColor] }; + [commandTextField setBackgroundColor:[NSColor blackColor]]; + } + NSMutableAttributedString *cmdString = [[NSMutableAttributedString alloc] initWithString:[interpreterTextField stringValue] attributes:defaultAttrs]; // Interpreter args diff --git a/Application/Resources/Platypus-Info.plist b/Application/Resources/Platypus-Info.plist index 6e90133d..56148831 100644 --- a/Application/Resources/Platypus-Info.plist +++ b/Application/Resources/Platypus-Info.plist @@ -411,7 +411,7 @@ CFBundleSignature ???? CFBundleVersion - 1250 + 1251 LSApplicationCategoryType public.app-category.developer-tools LSMinimumSystemVersion diff --git a/ScriptExec/SEController.m b/ScriptExec/SEController.m index 29480667..9b61827a 100644 --- a/ScriptExec/SEController.m +++ b/ScriptExec/SEController.m @@ -1517,7 +1517,7 @@ - (BOOL)isAcceptableFileType:(NSString *)file { NSError *outErr = nil; NSString *fileType = [WORKSPACE typeOfFile:file error:&outErr]; if (fileType == nil) { - NSLog(@"Unable to determine file type for %@: %@", file, [outErr localizedDescription]); + DLog(@"Unable to determine file type for %@: %@", file, [outErr localizedDescription]); } else if ([WORKSPACE type:fileType conformsToType:uti]) { return YES; } diff --git a/Shared/PlatypusAppSpec.m b/Shared/PlatypusAppSpec.m index e6b891ff..42343a56 100644 --- a/Shared/PlatypusAppSpec.m +++ b/Shared/PlatypusAppSpec.m @@ -411,7 +411,7 @@ - (BOOL)create { if (path) { [data writeToFile:path atomically:NO]; } else { - NSLog(@"Warning: Could not create tmp file named '%@'", name); + DLog(@"Warning: Could not create tmp file named '%@'", name); } } else if ([bundledFile isKindOfClass:[NSString class]]) { bundledFilePath = (NSString *)bundledFile; @@ -954,7 +954,7 @@ + (NSString *)bundleIdentifierForAppName:(NSString *)name authorName:(NSString * // This makes the file uneditable in Interface Builder. + (void)optimizeNibFile:(NSString *)nibPath { if ([FILEMGR fileExistsAtPath:IBTOOL_PATH] == NO) { - NSLog(@"Unable to strip nib file, ibtool not found at path %@", IBTOOL_PATH); + DLog(@"Unable to strip nib file, ibtool not found at path %@", IBTOOL_PATH); return; } NSTask *ibToolTask = [[NSTask alloc] init]; diff --git a/Shared/PlatypusScriptUtils.m b/Shared/PlatypusScriptUtils.m index 638333cf..7f3940c8 100644 --- a/Shared/PlatypusScriptUtils.m +++ b/Shared/PlatypusScriptUtils.m @@ -265,7 +265,7 @@ + (BOOL)isPotentiallyScriptAtPath:(NSString *)path { + (BOOL)hasShebangLineAtPath:(NSString *)path { if (![FILEMGR isReadableFileAtPath:path]) { - NSLog(@"Unable to read file %@", path); + DLog(@"Unable to read file %@", path); return NO; }