diff --git a/SubEthaEdit-Mac/Source/AdvancedPreferences.m b/SubEthaEdit-Mac/Source/AdvancedPreferences.m index 5aebcd1ab..b7c5598e9 100644 --- a/SubEthaEdit-Mac/Source/AdvancedPreferences.m +++ b/SubEthaEdit-Mac/Source/AdvancedPreferences.m @@ -36,8 +36,8 @@ - (NSString *)mainNibName { - (void)mainViewDidLoad { NSUserDefaults *defaults=[NSUserDefaults standardUserDefaults]; BOOL disableState=([defaults objectForKey:@"AppleScreenAdvanceSizeThreshold"] && [[defaults objectForKey:@"AppleScreenAdvanceSizeThreshold"] floatValue]<=1.); - [self.O_disableScreenFontsButton setState:disableState?NSOnState:NSOffState]; - [self.O_synthesiseFontsButton setState:[defaults boolForKey:SynthesiseFontsPreferenceKey]?NSOnState:NSOffState]; + [self.O_disableScreenFontsButton setState:disableState?NSControlStateValueOn:NSControlStateValueOff]; + [self.O_synthesiseFontsButton setState:[defaults boolForKey:SynthesiseFontsPreferenceKey]?NSControlStateValueOn:NSControlStateValueOff]; NSString *absolutePath = [[AppController sharedInstance].URLOfInstallCommand path]; [self.commandLineInstallTextField setStringValue:[@"sudo " stringByAppendingString:[absolutePath stringByReplacingOccurrencesOfString:@" " withString:@"\\ "]]]; @@ -59,7 +59,7 @@ - (IBAction)revealInstallCommandInFinder:(id)sender { #pragma mark - - (IBAction)changeDisableScreenFonts:(id)aSender { - if ([aSender state]==NSOnState) { + if ([aSender state]==NSControlStateValueOn) { [[NSUserDefaults standardUserDefaults] setFloat:1. forKey:@"AppleScreenAdvanceSizeThreshold"]; } else { [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"AppleScreenAdvanceSizeThreshold"]; @@ -67,7 +67,7 @@ - (IBAction)changeDisableScreenFonts:(id)aSender { } - (IBAction)changeSynthesiseFonts:(id)aSender { - [[NSUserDefaults standardUserDefaults] setBool:[aSender state]==NSOnState forKey:SynthesiseFontsPreferenceKey]; + [[NSUserDefaults standardUserDefaults] setBool:[aSender state]==NSControlStateValueOn forKey:SynthesiseFontsPreferenceKey]; // trigger update [[[SEEDocumentController sharedInstance] documents] makeObjectsPerformSelector:@selector(applyStylePreferences)]; } diff --git a/SubEthaEdit-Mac/Source/AppController.m b/SubEthaEdit-Mac/Source/AppController.m index cc6dc723a..d20cac0d2 100644 --- a/SubEthaEdit-Mac/Source/AppController.m +++ b/SubEthaEdit-Mac/Source/AppController.m @@ -704,7 +704,7 @@ - (void)addDocumentNewSubmenuEntriesToMenu:(NSMenu *)aMenu { } item.keyEquivalent = @""; if (isSelectedModeItem) { - item.state = NSOnState; + item.state = NSControlStateValueOn; } item; })]; @@ -715,7 +715,7 @@ - (void)addDocumentNewSubmenuEntriesToMenu:(NSMenu *)aMenu { [alternateItem setKeyEquivalentModifierMask:NSEventModifierFlagOption]; [alternateItem setTitle:[NSString stringWithFormat:NSLocalizedString(!inTabs?@"MODE_IN_NEW_TAB_CONTEXT_MENU_TEXT":@"MODE_IN_NEW_WINDOW_CONTEXT_MENU_TEXT",@""),[normalItem title]]]; if (isSelectedModeItem) { - alternateItem.state = NSOnState; + alternateItem.state = NSControlStateValueOn; } [aMenu addItem:alternateItem]; diff --git a/SubEthaEdit-Mac/Source/Debug/DebugPreferences.m b/SubEthaEdit-Mac/Source/Debug/DebugPreferences.m index 0afe079dd..2327fbdfa 100644 --- a/SubEthaEdit-Mac/Source/Debug/DebugPreferences.m +++ b/SubEthaEdit-Mac/Source/Debug/DebugPreferences.m @@ -75,9 +75,9 @@ - (void)mainViewDidLoad { // Initialize user interface elements to reflect current preference settings NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; BOOL enableDebugMenu = [defaults boolForKey:@"EnableDebugMenu"]; - [toggleDebugMenuCheckBox setState:(enableDebugMenu ? NSOnState : NSOffState)]; + [toggleDebugMenuCheckBox setState:(enableDebugMenu ? NSControlStateValueOn : NSControlStateValueOff)]; BOOL enableBEEPLogging = [defaults boolForKey:@"EnableBEEPLogging"]; - [toggleBEEPLoggingCheckBox setState:(enableBEEPLogging ? NSOnState : NSOffState)]; + [toggleBEEPLoggingCheckBox setState:(enableBEEPLogging ? NSControlStateValueOn : NSControlStateValueOff)]; [[DebugController sharedInstance] enableDebugMenu:enableDebugMenu]; } @@ -89,10 +89,10 @@ - (void)didUnselect { - (IBAction)toggleDebugMenu:(id)sender { int state = [sender state]; - if (state == NSOnState) { + if (state == NSControlStateValueOn) { [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"EnableDebugMenu"]; [[DebugController sharedInstance] enableDebugMenu:YES]; - } else if (state == NSOffState) { + } else if (state == NSControlStateValueOff) { [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"EnableDebugMenu"]; [[DebugController sharedInstance] enableDebugMenu:NO]; } @@ -100,9 +100,9 @@ - (IBAction)toggleDebugMenu:(id)sender { - (IBAction)toggleBEEPLogging:(id)sender { int state = [sender state]; - if (state == NSOnState) { + if (state == NSControlStateValueOn) { [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"EnableBEEPLogging"]; - } else if (state == NSOffState) { + } else if (state == NSControlStateValueOff) { [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"EnableBEEPLogging"]; } } diff --git a/SubEthaEdit-Mac/Source/DocumentMode.m b/SubEthaEdit-Mac/Source/DocumentMode.m index 1d184f2aa..5be99c847 100644 --- a/SubEthaEdit-Mac/Source/DocumentMode.m +++ b/SubEthaEdit-Mac/Source/DocumentMode.m @@ -341,7 +341,7 @@ - (instancetype)initWithBundle:(NSBundle *)aBundle { [_defaults setObject:@NO forKey:DocumentModeUTF8BOMPreferenceKey]; // ignore deprecated color settings, but still set them for backwards compatability - NSValueTransformer *transformer=[NSValueTransformer valueTransformerForName:NSUnarchiveFromDataTransformerName]; + NSValueTransformer *transformer=[NSValueTransformer valueTransformerForName:NSSecureUnarchiveFromDataTransformerName]; [_defaults setObject:[transformer reverseTransformedValue:[NSColor blackColor]] forKey:DocumentModeForegroundColorPreferenceKey]; [_defaults setObject:[transformer reverseTransformedValue:[NSColor whiteColor]] forKey:DocumentModeBackgroundColorPreferenceKey]; [[EncodingManager sharedInstance] registerEncoding:NoStringEncoding]; @@ -568,13 +568,13 @@ - (SyntaxStyle *)defaultSyntaxStyle { SEEStyleSheet *styleSheet = [self styleSheetForLanguageContext:nil]; NSColor *highlightColor = styleSheet?[[styleSheet styleAttributesForScope:@"meta.highlight.currentline"] objectForKey:@"color"]:[NSColor yellowColor]; - [_defaults setObject:[[NSValueTransformer valueTransformerForName:NSUnarchiveFromDataTransformerName] reverseTransformedValue:highlightColor] forKey:DocumentModeCurrentLineHighlightColorPreferenceKey]; + [_defaults setObject:[[NSValueTransformer valueTransformerForName:NSSecureUnarchiveFromDataTransformerName] reverseTransformedValue:highlightColor] forKey:DocumentModeCurrentLineHighlightColorPreferenceKey]; if (![_defaults objectForKey:DocumentModeBackgroundColorIsDarkPreferenceKey]) { [_defaults setObject:@NO forKey:DocumentModeBackgroundColorIsDarkPreferenceKey]; if ([self isBaseMode] && [_defaults objectForKey:DocumentModeBackgroundColorPreferenceKey]) { // take old background and foreground color settings - NSValueTransformer *transformer=[NSValueTransformer valueTransformerForName:NSUnarchiveFromDataTransformerName]; + NSValueTransformer *transformer=[NSValueTransformer valueTransformerForName:NSSecureUnarchiveFromDataTransformerName]; NSColor *color=nil; color=[transformer transformedValue:[_defaults objectForKey:DocumentModeBackgroundColorPreferenceKey]]; diff --git a/SubEthaEdit-Mac/Source/EditPreferences.m b/SubEthaEdit-Mac/Source/EditPreferences.m index d780ac53b..0eca49c3f 100644 --- a/SubEthaEdit-Mac/Source/EditPreferences.m +++ b/SubEthaEdit-Mac/Source/EditPreferences.m @@ -44,9 +44,9 @@ - (void)documentModeListChanged:(NSNotification *)aNotification { - (IBAction)validateDefaultsState:(id)aSender { DocumentMode *baseMode=[[DocumentModeManager sharedInstance] baseMode]; DocumentMode *selectedMode=[O_modeController content]; - [O_viewController setContent:([O_viewDefaultButton state]==NSOnState)?baseMode:selectedMode]; - [O_editController setContent:([O_editDefaultButton state]==NSOnState)?baseMode:selectedMode]; - [O_fileController setContent:([O_fileDefaultButton state]==NSOnState)?baseMode:selectedMode]; + [O_viewController setContent:([O_viewDefaultButton state]==NSControlStateValueOn)?baseMode:selectedMode]; + [O_editController setContent:([O_editDefaultButton state]==NSControlStateValueOn)?baseMode:selectedMode]; + [O_fileController setContent:([O_fileDefaultButton state]==NSControlStateValueOn)?baseMode:selectedMode]; } - (IBAction)changeMode:(id)aSender { diff --git a/SubEthaEdit-Mac/Source/EncodingManager.m b/SubEthaEdit-Mac/Source/EncodingManager.m index 96106ef65..dec77da11 100644 --- a/SubEthaEdit-Mac/Source/EncodingManager.m +++ b/SubEthaEdit-Mac/Source/EncodingManager.m @@ -344,7 +344,7 @@ - (void)noteEncodingListChange:(BOOL)writeDefault updateList:(BOOL)updateList po int cnt, numEncodings = [self.encodingMatrix numberOfRows]; for (cnt = 0; cnt < numEncodings; cnt++) { NSCell *cell = [self.encodingMatrix cellAtRow:cnt column:0]; - [cell setState:[encodings containsObject:[NSNumber numberWithUnsignedInt:[cell tag]]] ? NSOnState : NSOffState]; + [cell setState:[encodings containsObject:[NSNumber numberWithUnsignedInt:[cell tag]]] ? NSControlStateValueOn : NSControlStateValueOff]; if ([registeredEncodings containsObject:[NSNumber numberWithUnsignedInt:[cell tag]]] || [cell tag] == NSUTF8StringEncoding || [cell tag] == NSUnicodeStringEncoding) { [cell setEnabled:NO]; @@ -377,7 +377,7 @@ - (IBAction)encodingListChanged:(id)sender { for (cnt = 0; cnt < numRows; cnt++) { NSCell *cell = [self.encodingMatrix cellAtRow:cnt column:0]; - if (((NSUInteger)[cell tag] != NoStringEncoding) && ([cell state] == NSOnState)) [encs addObject:[NSNumber numberWithUnsignedInt:[cell tag]]]; + if (((NSUInteger)[cell tag] != NoStringEncoding) && ([cell state] == NSControlStateValueOn)) [encs addObject:[NSNumber numberWithUnsignedInt:[cell tag]]]; } encodings = encs; diff --git a/SubEthaEdit-Mac/Source/FindAllTableView.m b/SubEthaEdit-Mac/Source/FindAllTableView.m index b78e2d4e7..1ff83972d 100644 --- a/SubEthaEdit-Mac/Source/FindAllTableView.m +++ b/SubEthaEdit-Mac/Source/FindAllTableView.m @@ -28,10 +28,10 @@ - (void)copy:(id)sender { } } - [pb declareTypes: [NSArray arrayWithObject:NSStringPboardType] + [pb declareTypes: [NSArray arrayWithObject:NSPasteboardTypeString] owner:nil]; - [pb setString:string forType: NSStringPboardType]; + [pb setString:string forType:NSPasteboardTypeString]; } - (void)paste:(id)sender { diff --git a/SubEthaEdit-Mac/Source/FindReplaceController.m b/SubEthaEdit-Mac/Source/FindReplaceController.m index 25449a097..558091f61 100644 --- a/SubEthaEdit-Mac/Source/FindReplaceController.m +++ b/SubEthaEdit-Mac/Source/FindReplaceController.m @@ -426,8 +426,8 @@ - (void)applicationWillResign:(NSNotification *)notification { - (NSString *)pasteboardFindString { NSString *result = nil; NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:NSPasteboardNameFind]; - if ([[pasteboard types] containsObject:NSStringPboardType]) { - result = [pasteboard stringForType:NSStringPboardType]; + if ([[pasteboard types] containsObject:NSPasteboardTypeString]) { + result = [pasteboard stringForType:NSPasteboardTypeString]; } return result; } @@ -444,8 +444,8 @@ - (void)saveFindStringToPasteboard { NSString *pasteboardFindString = [self pasteboardFindString]; if (currentFindString && ![currentFindString isEqualToString:pasteboardFindString]) { NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:NSPasteboardNameFind]; - [pasteboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil]; - [pasteboard setString:currentFindString forType:NSStringPboardType]; + [pasteboard declareTypes:[NSArray arrayWithObject:NSPasteboardTypeString] owner:nil]; + [pasteboard setString:currentFindString forType:NSPasteboardTypeString]; } } diff --git a/SubEthaEdit-Mac/Source/GeneralPreferences.m b/SubEthaEdit-Mac/Source/GeneralPreferences.m index 834198e72..be32733cb 100644 --- a/SubEthaEdit-Mac/Source/GeneralPreferences.m +++ b/SubEthaEdit-Mac/Source/GeneralPreferences.m @@ -56,7 +56,7 @@ - (IBAction)toggleLocalHighlightDefault:(id)aSender { if ([aSender isKindOfClass:[NSButton class]]) { NSButton *button = (NSButton *)aSender; - isEnabled = (button.state == NSOnState); + isEnabled = (button.state == NSControlStateValueOn); } else { isEnabled = ![defaults boolForKey:HighlightChangesAlonePreferenceKey]; } @@ -125,9 +125,9 @@ - (void)setLocalChangesHighlightButtonStateFromDefaults { - (void)setLocalChangesHighlightButtonState:(BOOL)isEnabled { if (isEnabled) { - [self.O_highlightLocalChangesButton setState:NSOnState]; + [self.O_highlightLocalChangesButton setState:NSControlStateValueOn]; } else { - [self.O_highlightLocalChangesButton setState:NSOffState]; + [self.O_highlightLocalChangesButton setState:NSControlStateValueOff]; } } diff --git a/SubEthaEdit-Mac/Source/HueToColorValueTransformer.m b/SubEthaEdit-Mac/Source/HueToColorValueTransformer.m index 50c472ded..833a94316 100644 --- a/SubEthaEdit-Mac/Source/HueToColorValueTransformer.m +++ b/SubEthaEdit-Mac/Source/HueToColorValueTransformer.m @@ -30,7 +30,7 @@ - (id)transformedValue:(id)aValue { - (id)reverseTransformedValue:(id)value { if (![value isKindOfClass:[NSColor class]]) return nil; - NSColor *color = [(NSColor *)value colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; + NSColor *color = [(NSColor *)value colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; CGFloat hue = 0.0; [color getHue:&hue saturation:NULL brightness:NULL alpha:NULL]; diff --git a/SubEthaEdit-Mac/Source/NSColorTCMAdditions.m b/SubEthaEdit-Mac/Source/NSColorTCMAdditions.m index 258883264..25797e820 100644 --- a/SubEthaEdit-Mac/Source/NSColorTCMAdditions.m +++ b/SubEthaEdit-Mac/Source/NSColorTCMAdditions.m @@ -54,7 +54,7 @@ + (NSColor *)colorForHTMLString:(NSString *) htmlString } - (NSString *)shortHTMLString { - NSColor *color=[self colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; + NSColor *color=[self colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; NSString *result=[NSString stringWithFormat:@"#%01x%01x%01x", (int)([color redComponent]*15.+.5), (int)([color greenComponent]*15.+.5), @@ -63,7 +63,7 @@ - (NSString *)shortHTMLString { } - (NSString *)HTMLString { - NSColor *color=[self colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; + NSColor *color=[self colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; NSString *result=[NSString stringWithFormat:@"#%02x%02x%02x", (int)([color redComponent]*255.+.5), (int)([color greenComponent]*255.+.5), @@ -72,19 +72,19 @@ - (NSString *)HTMLString { } - (BOOL)isDark { - float brightness=[[self colorUsingColorSpaceName:NSCalibratedRGBColorSpace] brightnessComponent]; + float brightness=[[self colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]] brightnessComponent]; return (brightness<.5); } - (NSColor *)brightnessInvertedColor { CGFloat alpha = self.alphaComponent; - NSColor *color=[self colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; + NSColor *color=[self colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; NSColor *invertedColor=[NSColor colorWithCalibratedRed:1.0-[color redComponent] green:1.0-[color greenComponent] blue:1.0-[color blueComponent] alpha:1.0]; return [NSColor colorWithCalibratedHue:[color hueComponent] saturation:[invertedColor saturationComponent] brightness:[invertedColor brightnessComponent] alpha:alpha]; } - (NSColor *)brightnessInvertedSelectionColor { - NSColor *color=[self colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; + NSColor *color=[self colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; NSColor *invertedColor=[NSColor colorWithCalibratedRed:1.0-[color redComponent] green:1.0-[color greenComponent] blue:1.0-[color blueComponent] alpha:1.0]; return [NSColor colorWithCalibratedHue:[color hueComponent] saturation:[invertedColor saturationComponent] brightness:MAX([invertedColor brightnessComponent],0.6) alpha:1.0]; } diff --git a/SubEthaEdit-Mac/Source/NSImageTCMAdditions.m b/SubEthaEdit-Mac/Source/NSImageTCMAdditions.m index fe97a0ff7..f12fbbfd1 100644 --- a/SubEthaEdit-Mac/Source/NSImageTCMAdditions.m +++ b/SubEthaEdit-Mac/Source/NSImageTCMAdditions.m @@ -112,7 +112,7 @@ + (NSImage *)highResolutionImageWithSize:(NSSize)inSize usingDrawingBlock:(void hasAlpha:YES isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace - bitmapFormat:NSAlphaFirstBitmapFormat + bitmapFormat:NSBitmapFormatAlphaFirst bytesPerRow:0 bitsPerPixel:0]; @@ -136,7 +136,7 @@ + (NSImage *)highResolutionImageWithSize:(NSSize)inSize usingDrawingBlock:(void hasAlpha:YES isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace - bitmapFormat:NSAlphaFirstBitmapFormat + bitmapFormat:NSBitmapFormatAlphaFirst bytesPerRow:0 bitsPerPixel:0]; @@ -210,7 +210,7 @@ + (NSImage *)pdfBasedImageNamed:(NSString *)aName { [[NSColor clearColor] set]; NSRectFill(dstRect); - CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort]; + CGContextRef context = [[NSGraphicsContext currentContext] CGContext]; CGSize layerScale = CGSizeMake(CGBitmapContextGetWidth(context) / fullRect.size.width, CGBitmapContextGetHeight(context) / fullRect.size.height); @@ -396,7 +396,7 @@ - (NSImage *)dimmedImage { NSBezierPath *roundedRectanglePath = [NSBezierPath bezierPathWithRoundedRect:NSInsetRect(roundRect, strokeWidth/2.0, strokeWidth/2.0) xRadius:strokeWidth * 1.5 yRadius:strokeWidth * 1.5]; // getting a good dark background for this hue - CGFloat hue = [[aColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace] hueComponent]; + CGFloat hue = [[aColor colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]] hueComponent]; [[NSColor colorWithHue:hue saturation:1.0 brightness:0.25 alpha:1.0] set]; [roundedRectanglePath fill]; @@ -410,7 +410,7 @@ - (NSImage *)dimmedImage { [aColor set]; [roundedRectanglePath stroke]; } - CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort]; + CGContextRef context = [[NSGraphicsContext currentContext] CGContext]; [[NSColor whiteColor] setFill]; CGContextSetLineCap(context, kCGLineCapRound); diff --git a/SubEthaEdit-Mac/Source/NSMenuTCMAdditions.m b/SubEthaEdit-Mac/Source/NSMenuTCMAdditions.m index 7e91c578d..a93bceb27 100644 --- a/SubEthaEdit-Mac/Source/NSMenuTCMAdditions.m +++ b/SubEthaEdit-Mac/Source/NSMenuTCMAdditions.m @@ -30,11 +30,11 @@ - (void)setMark:(BOOL)aMark { if (image) { [self setMixedStateImage:image]; - [self setState:NSMixedState]; + [self setState:NSControlStateValueMixed]; } } else { [self setMixedStateImage:[NSImage imageNamed:NSImageNameMenuMixedStateTemplate]]; - [self setState:NSOffState]; + [self setState:NSControlStateValueOff]; } } diff --git a/SubEthaEdit-Mac/Source/PlainTextDocument.m b/SubEthaEdit-Mac/Source/PlainTextDocument.m index 215f5b2f3..0a61107eb 100644 --- a/SubEthaEdit-Mac/Source/PlainTextDocument.m +++ b/SubEthaEdit-Mac/Source/PlainTextDocument.m @@ -1136,7 +1136,7 @@ - (IBAction)toggleIsAnnounced:(id)aSender { // Toggle back the state of the button if it was a button if ([aSender isKindOfClass:[NSButton class]]) { - [aSender setState:[aSender state] == NSOnState ? NSOffState : NSOnState]; + [aSender setState:[aSender state] == NSControlStateValueOn ? NSControlStateValueOff : NSControlStateValueOn]; } } @@ -3737,7 +3737,7 @@ - (BOOL)writeToURL:(NSURL *)absoluteURL ofType:(NSString *)inType forSaveOperati if (success) success = [fm createDirectoryAtPath:quicklookPath withIntermediateDirectories:YES attributes:nil error:nil]; if (success) { NSURL *thumbnailURL = [NSURL fileURLWithPath:[quicklookPath stringByAppendingPathComponent:@"Thumbnail.jpg"]]; - NSData *jpegData = [[self thumbnailBitmapRepresentation] representationUsingType:NSJPEGFileType properties:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithFloat:0.90],NSImageCompressionFactor,nil]]; + NSData *jpegData = [[self thumbnailBitmapRepresentation] representationUsingType:NSBitmapImageFileTypeJPEG properties:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithFloat:0.90],NSImageCompressionFactor,nil]]; success = [jpegData writeToURL:thumbnailURL options:0 error:outError]; if (success && [[NSUserDefaults standardUserDefaults] boolForKey:@"SaveSeeTextPreview"]) { NSView *printView = [self printableView]; @@ -4022,13 +4022,13 @@ - (BOOL)hasMarkedTexts { - (BOOL)validateMenuItem:(NSMenuItem *)anItem { SEL selector=[anItem action]; if (selector==@selector(toggleSyntaxHighlighting:)) { - [anItem setState:(I_flags.highlightSyntax?NSOnState:NSOffState)]; + [anItem setState:(I_flags.highlightSyntax?NSControlStateValueOn:NSControlStateValueOff)]; return ![self isProxyDocument]; } else if (selector == @selector(chooseLineEndings:)) { if ([self lineEnding] == [anItem tag]) { - [anItem setState:NSOnState]; + [anItem setState:NSControlStateValueOn]; } else { - [anItem setState:NSOffState]; + [anItem setState:NSControlStateValueOff]; } } else if (selector == @selector(convertLineEndings:)) { NSStringEncoding encoding=[self fileEncoding]; @@ -4039,9 +4039,9 @@ - (BOOL)validateMenuItem:(NSMenuItem *)anItem { encoding==NSNonLossyASCIIStringEncoding)); } else if (selector == @selector(selectEncoding:)) { if ([self fileEncoding] == (NSUInteger)[anItem tag]) { - [anItem setState:NSOnState]; + [anItem setState:NSControlStateValueOn]; } else { - [anItem setState:NSOffState]; + [anItem setState:NSControlStateValueOff]; } TCMMMSession *session=[self session]; return (![self isProxyDocument] && [session isServer] && [session participantCount]<=1); @@ -4049,26 +4049,26 @@ - (BOOL)validateMenuItem:(NSMenuItem *)anItem { DocumentModeManager *modeManager=[DocumentModeManager sharedInstance]; NSString *identifier=[modeManager documentModeIdentifierForTag:[anItem tag]]; if (identifier && [[[self documentMode] documentModeIdentifier] isEqualToString:identifier]) { - [anItem setState:NSOnState]; + [anItem setState:NSControlStateValueOn]; } else { - [anItem setState:NSOffState]; + [anItem setState:NSControlStateValueOff]; } return ![self isProxyDocument]; } else if (selector == @selector(toggleUsesTabs:)) { - [anItem setState:(I_flags.usesTabs?NSOnState:NSOffState)]; + [anItem setState:(I_flags.usesTabs?NSControlStateValueOn:NSControlStateValueOff)]; return ![self isProxyDocument]; } else if (selector == @selector(selectWrapMode:)) { - [anItem setState:(I_flags.wrapMode==[anItem tag]?NSOnState:NSOffState)]; + [anItem setState:(I_flags.wrapMode==[anItem tag]?NSControlStateValueOn:NSControlStateValueOff)]; return ![self isProxyDocument]; } else if (selector == @selector(toggleIndentNewLines:)) { - [anItem setState:(I_flags.indentNewLines?NSOnState:NSOffState)]; + [anItem setState:(I_flags.indentNewLines?NSControlStateValueOn:NSControlStateValueOff)]; return ![self isProxyDocument]; } else if (selector == @selector(changeTabWidth:)) { - [anItem setState:(I_tabWidth==[[anItem title]intValue]?NSOnState:NSOffState)]; + [anItem setState:(I_tabWidth==[[anItem title]intValue]?NSControlStateValueOn:NSControlStateValueOff)]; return ![self isProxyDocument]; } else if (selector == @selector(changePendingUsersAccess:)) { TCMMMSession *session=[self session]; - [anItem setState:([anItem tag]==[session accessState])?NSOnState:NSOffState]; + [anItem setState:([anItem tag]==[session accessState])?NSControlStateValueOn:NSControlStateValueOff]; return [session isServer]; } else if (selector == @selector(toggleIsAnnounced:)) { [anItem setTitle:[self isAnnounced]? @@ -4463,7 +4463,7 @@ - (void)setDocumentBackgroundColor:(NSColor *)aColor { /*"This method returns the blockeditTextAttributes that the textview uses. If you make background colors customizeable you want to change these too"*/ - (NSDictionary *)blockeditAttributes { if (!I_blockeditAttributes) { - float backgroundBrightness=[[[self documentBackgroundColor] colorUsingColorSpaceName:NSCalibratedRGBColorSpace] brightnessComponent]; + float backgroundBrightness=[[[self documentBackgroundColor] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]] brightnessComponent]; ; if (backgroundBrightness>.5) backgroundBrightness-=.1; else backgroundBrightness+=.1; @@ -5824,17 +5824,10 @@ - (NSArray *)sharingServicePicker:(NSSharingServicePicker *)sharingServicePicker hasPublicURL = YES; } - if (! hasPublicURL) { // if we don't have a public URL remove also email and messages + if (!hasPublicURL) { // if we don't have a public URL remove also email and messages [sharingServices removeObject:[NSSharingService sharingServiceNamed:NSSharingServiceNameComposeEmail]]; [sharingServices removeObject:[NSSharingService sharingServiceNamed:NSSharingServiceNameComposeMessage]]; } - - // remove social media entries, because they need persistant URLS and change the see:// scheme. - [sharingServices removeObject:[NSSharingService sharingServiceNamed:NSSharingServiceNamePostOnFacebook]]; - [sharingServices removeObject:[NSSharingService sharingServiceNamed:NSSharingServiceNamePostOnTwitter]]; - [sharingServices removeObject:[NSSharingService sharingServiceNamed:NSSharingServiceNamePostOnSinaWeibo]]; - [sharingServices removeObject:[NSSharingService sharingServiceNamed:NSSharingServiceNamePostOnTencentWeibo]]; - [sharingServices removeObject:[NSSharingService sharingServiceNamed:NSSharingServiceNamePostOnLinkedIn]]; // remove add to iphoto as it adds itself if the list is empty [sharingServices removeObject:[NSSharingService sharingServiceNamed:NSSharingServiceNameAddToIPhoto]]; @@ -6590,8 +6583,8 @@ - (NSBitmapImageRep *)thumbnailBitmapRepresentation { [textView cacheDisplayInRect:[textView frame] toBitmapImageRep:rep]; NSPasteboard *pb=[NSPasteboard generalPasteboard]; - [pb declareTypes:[NSArray arrayWithObject:NSTIFFPboardType] owner:self]; - [pb setData:[rep TIFFRepresentation] forType:NSTIFFPboardType]; + [pb declareTypes:[NSArray arrayWithObject:NSPasteboardTypeTIFF] owner:self]; + [pb setData:[rep TIFFRepresentation] forType:NSPasteboardTypeTIFF]; return rep; } @@ -7208,8 +7201,8 @@ - (void)createThumbnail:(id)aSender { NSBitmapImageRep *rep = [myTextView bitmapImageRepForCachingDisplayInRect:rectToCache]; [myTextView cacheDisplayInRect:[myTextView frame] toBitmapImageRep:rep]; NSPasteboard *pb=[NSPasteboard generalPasteboard]; - [pb declareTypes:[NSArray arrayWithObject:NSTIFFPboardType] owner:self]; - [pb setData:[rep TIFFRepresentation] forType:NSTIFFPboardType]; + [pb declareTypes:[NSArray arrayWithObject:NSPasteboardTypeTIFF] owner:self]; + [pb setData:[rep TIFFRepresentation] forType:NSPasteboardTypeTIFF]; [myTextView setDrawsBackground:YES]; } diff --git a/SubEthaEdit-Mac/Source/PlainTextEditor.m b/SubEthaEdit-Mac/Source/PlainTextEditor.m index 0ba0a1c44..a1f10f5cd 100644 --- a/SubEthaEdit-Mac/Source/PlainTextEditor.m +++ b/SubEthaEdit-Mac/Source/PlainTextEditor.m @@ -1345,20 +1345,20 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem SEL selector = [menuItem action]; if (selector == @selector(toggleWrap:)) { - [menuItem setState:[O_scrollView hasHorizontalScroller] ? NSOffState:NSOnState]; + [menuItem setState:[O_scrollView hasHorizontalScroller] ? NSControlStateValueOff:NSControlStateValueOn]; return YES; } else if (selector == @selector(toggleTopStatusBar:)) { - [menuItem setState:[self showsTopStatusBar] ? NSOnState:NSOffState]; + [menuItem setState:[self showsTopStatusBar] ? NSControlStateValueOn:NSControlStateValueOff]; return YES; } else if (selector == @selector(toggleShowsChangeMarks:)) { BOOL showsChangeMarks = [self showsChangeMarks]; - [menuItem setState:showsChangeMarks ? NSOnState:NSOffState]; + [menuItem setState:showsChangeMarks ? NSControlStateValueOn:NSControlStateValueOff]; return YES; } else if (selector == @selector(toggleShowInvisibles:)) { - [menuItem setState:[self showsInvisibleCharacters] ? NSOnState:NSOffState]; + [menuItem setState:[self showsInvisibleCharacters] ? NSControlStateValueOn:NSControlStateValueOff]; return YES; } else if (selector == @selector(toggleShowInconsistentIndentation:)) { - [menuItem setState:[self showsInconsistentIndentation] ? NSOnState:NSOffState]; + [menuItem setState:[self showsInconsistentIndentation] ? NSControlStateValueOn:NSControlStateValueOff]; return YES; } else if (selector == @selector(blockeditSelection:) || selector == @selector(endBlockedit:)) { FoldableTextStorage *textStorage = (FoldableTextStorage *)[I_textView textStorage]; @@ -1381,7 +1381,7 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem return [I_textView selectedRange].length > 0; } else if (selector == @selector(changePendingUsersAccessAndAnnounce:)) { TCMMMSession *session=self.document.session; - [menuItem setState:([menuItem tag]==[session accessState])?NSOnState:NSOffState]; + [menuItem setState:([menuItem tag]==[session accessState])?NSControlStateValueOn:NSControlStateValueOff]; return [session isServer]; } return YES; @@ -1469,8 +1469,8 @@ - (IBAction)copyAsXHTML:(id)aSender { [result appendString:content]; [result appendFormat:@"", topLevelTag]; - [[NSPasteboard generalPasteboard] declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil]; - [[NSPasteboard generalPasteboard] setString:result forType:NSStringPboardType]; + [[NSPasteboard generalPasteboard] declareTypes:[NSArray arrayWithObject:NSPasteboardTypeString] owner:nil]; + [[NSPasteboard generalPasteboard] setString:result forType:NSPasteboardTypeString]; } else { NSBeep(); } @@ -1527,8 +1527,8 @@ - (IBAction)copyAsXHTML:(id)aSender { // [pool release]; // } while (index"]; -// [[NSPasteboard generalPasteboard] declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil]; -// [[NSPasteboard generalPasteboard] setString:result forType:NSStringPboardType]; +// [[NSPasteboard generalPasteboard] declareTypes:[NSArray arrayWithObject:NSPasteboardTypeString] owner:nil]; +// [[NSPasteboard generalPasteboard] setString:result forType:NSPasteboardTypeString]; // [result release]; // } else { // NSBeep(); @@ -2228,7 +2228,7 @@ - (void)textView:(NSTextView *)view doubleClickedOnCell:(id )cell atIndex:(NSUInteger)charIndex { if ([[cell attachment] isKindOfClass:[FoldedTextAttachment class]]) { - return @[NSStringPboardType]; + return @[NSPasteboardTypeString]; } else { return @[]; } diff --git a/SubEthaEdit-Mac/Source/PlainTextWindow.m b/SubEthaEdit-Mac/Source/PlainTextWindow.m index 5c5cadaf6..5d756b9f1 100644 --- a/SubEthaEdit-Mac/Source/PlainTextWindow.m +++ b/SubEthaEdit-Mac/Source/PlainTextWindow.m @@ -113,7 +113,7 @@ - (IBAction)toggleTabBar:(id)sender { - (BOOL)validateMenuItem:(NSMenuItem *)menuItem { if (menuItem.action == @selector(toggleTabBar:)) { BOOL alwaysShowTabBar = SEEDocumentController.shouldAlwaysShowTabBar; - [menuItem setState:alwaysShowTabBar ? NSOnState : NSOffState]; + [menuItem setState:alwaysShowTabBar ? NSControlStateValueOn : NSControlStateValueOff]; return YES; } return [super validateMenuItem:menuItem]; diff --git a/SubEthaEdit-Mac/Source/PlainTextWindowController.m b/SubEthaEdit-Mac/Source/PlainTextWindowController.m index fcd60edbd..f8ff42d44 100644 --- a/SubEthaEdit-Mac/Source/PlainTextWindowController.m +++ b/SubEthaEdit-Mac/Source/PlainTextWindowController.m @@ -248,20 +248,20 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem { selector == @selector(toggleShowInconsistentIndentation:)){ return [self.activePlainTextEditor validateMenuItem:menuItem]; } else if (selector ==@selector(toggleWebPreview:)) { - [menuItem setState:self.SEE_tabContext.hasWebPreviewSplit ? NSOnState : NSOffState]; + [menuItem setState:self.SEE_tabContext.hasWebPreviewSplit ? NSControlStateValueOn : NSControlStateValueOff]; return YES; } else if (selector == @selector(toggleParticipantsOverlay:)) { [menuItem setState: [self.plainTextEditors.lastObject hasBottomOverlayView] ? - NSOnState : - NSOffState]; + NSControlStateValueOn : + NSControlStateValueOff]; return YES; } else if (selector == @selector(toggleBottomStatusBar:)) { PlainTextWindowControllerTabContext *tabContext = self.SEE_tabContext; - [menuItem setState:[[tabContext.plainTextEditors lastObject] showsBottomStatusBar]?NSOnState:NSOffState]; + [menuItem setState:[[tabContext.plainTextEditors lastObject] showsBottomStatusBar]?NSControlStateValueOn:NSControlStateValueOff]; return YES; } else if (selector == @selector(toggleLineNumbers:)) { - [menuItem setState:[self showsGutter]?NSOnState:NSOffState]; + [menuItem setState:[self showsGutter]?NSControlStateValueOn:NSControlStateValueOff]; return YES; } else if (selector == @selector(copyDocumentURL:)) { return [self.plainTextDocument isAnnounced]; @@ -276,7 +276,7 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem { return !isReceivingContent; } else if (selector == @selector(changePendingUsersAccess:)) { TCMMMSession *session=[self.plainTextDocument session]; - [menuItem setState:([menuItem tag]==[session accessState])?NSOnState:NSOffState]; + [menuItem setState:([menuItem tag]==[session accessState])?NSControlStateValueOn:NSControlStateValueOff]; return [session isServer]; } else if (selector == @selector(readWriteButtonAction:) || selector == @selector(followUser:) || @@ -369,13 +369,13 @@ - (IBAction)copyDocumentURL:(id)aSender { NSURL *documentURL = [[self document] documentURL]; NSPasteboard *pboard = [NSPasteboard generalPasteboard]; - NSArray *pbTypes = [NSArray arrayWithObjects:NSStringPboardType, NSURLPboardType, @"CorePasteboardFlavorType 0x75726C20", @"CorePasteboardFlavorType 0x75726C6E", nil]; + NSArray *pbTypes = [NSArray arrayWithObjects:NSPasteboardTypeString, NSPasteboardTypeURL, @"CorePasteboardFlavorType 0x75726C20", @"CorePasteboardFlavorType 0x75726C6E", nil]; [pboard declareTypes:pbTypes owner:self]; const char *dataUTF8 = [[documentURL absoluteString] UTF8String]; [pboard setData:[NSData dataWithBytes:dataUTF8 length:strlen(dataUTF8)] forType:@"CorePasteboardFlavorType 0x75726C20"]; dataUTF8 = [[[self document] displayName] UTF8String]; [pboard setData:[NSData dataWithBytes:dataUTF8 length:strlen(dataUTF8)] forType:@"CorePasteboardFlavorType 0x75726C6E"]; - [pboard setString:[documentURL absoluteString] forType:NSStringPboardType]; + [pboard setString:[documentURL absoluteString] forType:NSPasteboardTypeString]; [documentURL writeToPasteboard:pboard]; } diff --git a/SubEthaEdit-Mac/Source/PopUpButton.m b/SubEthaEdit-Mac/Source/PopUpButton.m index 8628c11b9..0b3cb4249 100644 --- a/SubEthaEdit-Mac/Source/PopUpButton.m +++ b/SubEthaEdit-Mac/Source/PopUpButton.m @@ -70,7 +70,7 @@ - (void)drawRect:(NSRect)aRect { NSLog(@"%s - Unknown line drawing option: %u", __FUNCTION__, self.lineDrawingEdge); } - CGContextRef ctx = [[NSGraphicsContext currentContext] graphicsPort]; + CGContextRef ctx = [[NSGraphicsContext currentContext] CGContext]; CGContextSetFillColorWithColor(ctx, [[NSColor secondaryLabelColor] CGColor]); CGContextBeginPath(ctx); NSRect triangleRect; diff --git a/SubEthaEdit-Mac/Source/SEECollaborationPreferenceModule.m b/SubEthaEdit-Mac/Source/SEECollaborationPreferenceModule.m index be3a4dc3e..f7255ea6e 100644 --- a/SubEthaEdit-Mac/Source/SEECollaborationPreferenceModule.m +++ b/SubEthaEdit-Mac/Source/SEECollaborationPreferenceModule.m @@ -61,7 +61,7 @@ - (void)mainViewDidLoad { [self.O_nameTextField setStringValue:[me name]]; [self.O_emailTextField setStringValue:[[me properties] objectForKey:@"Email"]]; - [self.O_automaticallyMapPortButton setState:[defaults boolForKey:ShouldAutomaticallyMapPort]?NSOnState:NSOffState]; + [self.O_automaticallyMapPortButton setState:[defaults boolForKey:ShouldAutomaticallyMapPort]?NSControlStateValueOn:NSControlStateValueOff]; [self updateLocalPort]; @@ -74,8 +74,8 @@ - (void)mainViewDidLoad { [self portMapperDidFinishWork:nil]; } - [self.O_enableCollaborationButton setState:[TCMMMBEEPSessionManager sharedInstance].isNetworkingDisabled ? NSOffState : NSOnState]; - [self.O_invisibleOnNetworkButton setState:[[TCMMMPresenceManager sharedInstance] isVisible] ? NSOffState : NSOnState]; + [self.O_enableCollaborationButton setState:[TCMMMBEEPSessionManager sharedInstance].isNetworkingDisabled ? NSControlStateValueOff : NSControlStateValueOn]; + [self.O_invisibleOnNetworkButton setState:[[TCMMMPresenceManager sharedInstance] isVisible] ? NSControlStateValueOff : NSControlStateValueOn]; SEEUserColorsPreviewView *preview = self.O_userColorsPreview; NSUserDefaultsController *defaultsController = [NSUserDefaultsController sharedUserDefaultsController]; @@ -281,19 +281,19 @@ - (IBAction)postGeneralViewPreferencesDidChangeNotificiation:(id)aSender { #pragma mark - IBActions - Port Mapping - (IBAction)changeAutomaticallyMapPorts:(id)aSender { - BOOL shouldStart = ([self.O_automaticallyMapPortButton state]==NSOnState); + BOOL shouldStart = ([self.O_automaticallyMapPortButton state]==NSControlStateValueOn); [[NSUserDefaults standardUserDefaults] setBool:shouldStart forKey:ShouldAutomaticallyMapPort]; [[TCMMMBEEPSessionManager sharedInstance] validatePortMapping]; } - (IBAction)changeDisableNetworking:(id)aSender { - BOOL collaborationEnabled = [self.O_enableCollaborationButton state] != NSOnState ? YES : NO; - [TCMMMBEEPSessionManager sharedInstance].networkingDisabled = collaborationEnabled; + BOOL collaborationDisabled = [self.O_enableCollaborationButton state] == NSControlStateValueOff; + [TCMMMBEEPSessionManager sharedInstance].networkingDisabled = collaborationDisabled; [self updateLocalPort]; } - (IBAction)changeVisiblityOnNetwork:(id)aSender { - [[TCMMMPresenceManager sharedInstance] setVisible:[self.O_invisibleOnNetworkButton state] == NSOffState ? YES : NO]; + [[TCMMMPresenceManager sharedInstance] setVisible:[self.O_invisibleOnNetworkButton state] == NSControlStateValueOff ? YES : NO]; } #pragma mark - Localization diff --git a/SubEthaEdit-Mac/Source/SEEFindAndReplaceContext.m b/SubEthaEdit-Mac/Source/SEEFindAndReplaceContext.m index 2bea696e2..4564c100e 100644 --- a/SubEthaEdit-Mac/Source/SEEFindAndReplaceContext.m +++ b/SubEthaEdit-Mac/Source/SEEFindAndReplaceContext.m @@ -79,8 +79,8 @@ - (void)signalErrorWithDescription:(NSString *)aDescription { - (NSString *)pasteboardFindString { NSString *result = nil; NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:NSPasteboardNameFind]; - if ([[pasteboard types] containsObject:NSStringPboardType]) { - result = [pasteboard stringForType:NSStringPboardType]; + if ([[pasteboard types] containsObject:NSPasteboardTypeString]) { + result = [pasteboard stringForType:NSPasteboardTypeString]; } return result; } @@ -90,8 +90,8 @@ - (void)saveFindStringToFindPasteboard { NSString *pasteboardFindString = [self pasteboardFindString]; if (currentFindString && ![currentFindString isEqualToString:pasteboardFindString]) { NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:NSPasteboardNameFind]; - [pasteboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil]; - [pasteboard setString:currentFindString forType:NSStringPboardType]; + [pasteboard declareTypes:[NSArray arrayWithObject:NSPasteboardTypeString] owner:nil]; + [pasteboard setString:currentFindString forType:NSPasteboardTypeString]; } } diff --git a/SubEthaEdit-Mac/Source/SEEFindAndReplaceViewController.m b/SubEthaEdit-Mac/Source/SEEFindAndReplaceViewController.m index cbfe089f4..475abe448 100644 --- a/SubEthaEdit-Mac/Source/SEEFindAndReplaceViewController.m +++ b/SubEthaEdit-Mac/Source/SEEFindAndReplaceViewController.m @@ -314,23 +314,23 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem { } } else if (menuItem.action == @selector(switchRegexSyntaxDialect:)) { BOOL isOn = ([[self.findAndReplaceStateObjectController valueForKeyPath:kOptionKeyPathRegexDialect] integerValue] == menuItem.tag); - [menuItem setState:isOn ? NSOnState : NSOffState]; + [menuItem setState:isOn ? NSControlStateValueOn : NSControlStateValueOff]; } else if (menuItem.action == @selector(toggleRegexOption:)) { NSInteger tag = [menuItem tag]; NSString *keyPath = [self keyPathForRegexOption:tag]; NSNumber *currentValue = [self.findAndReplaceStateObjectController valueForKeyPath:keyPath]; - [menuItem setState:currentValue.boolValue ? NSOnState : NSOffState]; + [menuItem setState:currentValue.boolValue ? NSControlStateValueOn : NSControlStateValueOff]; return validationResultForRegexOptions; } else { switch (menuItem.tag) { case kOptionMenuIgnoreCaseTag: - [menuItem setState:[[self.findAndReplaceStateObjectController valueForKeyPath:kOptionKeyPathCaseSensitive] boolValue] ? NSOffState : NSOnState]; + [menuItem setState:[[self.findAndReplaceStateObjectController valueForKeyPath:kOptionKeyPathCaseSensitive] boolValue] ? NSControlStateValueOff : NSControlStateValueOn]; break; case kOptionMenuWrapAroundTag: - [menuItem setState:[[self.findAndReplaceStateObjectController valueForKeyPath:kOptionKeyPathWrapsAround] boolValue] ? NSOnState : NSOffState]; + [menuItem setState:[[self.findAndReplaceStateObjectController valueForKeyPath:kOptionKeyPathWrapsAround] boolValue] ? NSControlStateValueOn : NSControlStateValueOff]; break; case kOptionMenuUseRegularExpressionsTag: - [menuItem setState:useRegex ? NSOnState : NSOffState]; + [menuItem setState:useRegex ? NSControlStateValueOn : NSControlStateValueOff]; break; case kOptionMenuSelectedLanguageDialectTag: @@ -349,11 +349,11 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem { } case kOptionMenuEscapeCharacterSlashTag: - [menuItem setState:[[self.findAndReplaceStateObjectController valueForKeyPath:kOptionKeyPathRegexEscapeCharacter] isEqualToString:OgreBackslashCharacter] ? NSOnState : NSOffState]; + [menuItem setState:[[self.findAndReplaceStateObjectController valueForKeyPath:kOptionKeyPathRegexEscapeCharacter] isEqualToString:OgreBackslashCharacter] ? NSControlStateValueOn : NSControlStateValueOff]; return validationResultForRegexOptions; case kOptionMenuEscapeCharacterYenTag: - [menuItem setState:[[self.findAndReplaceStateObjectController valueForKeyPath:kOptionKeyPathRegexEscapeCharacter] isEqualToString:OgreGUIYenCharacter] ? NSOnState : NSOffState]; + [menuItem setState:[[self.findAndReplaceStateObjectController valueForKeyPath:kOptionKeyPathRegexEscapeCharacter] isEqualToString:OgreGUIYenCharacter] ? NSControlStateValueOn : NSControlStateValueOff]; return validationResultForRegexOptions; default: diff --git a/SubEthaEdit-Mac/Source/SEEOpenPanelAccessoryViewController.m b/SubEthaEdit-Mac/Source/SEEOpenPanelAccessoryViewController.m index b12fab02e..688e988ce 100644 --- a/SubEthaEdit-Mac/Source/SEEOpenPanelAccessoryViewController.m +++ b/SubEthaEdit-Mac/Source/SEEOpenPanelAccessoryViewController.m @@ -29,11 +29,11 @@ - (instancetype)initWithOpenPanel:(NSOpenPanel *)openPanel { BOOL goesIntoBundles = [[NSUserDefaults standardUserDefaults] boolForKey:@"GoIntoBundlesPrefKey"]; [openPanel setTreatsFilePackagesAsDirectories:goesIntoBundles]; [openPanel setCanChooseDirectories:YES]; - [self.goIntoBundlesCheckboxOutlet setState:goesIntoBundles ? NSOnState : NSOffState]; + [self.goIntoBundlesCheckboxOutlet setState:goesIntoBundles ? NSControlStateValueOn : NSControlStateValueOff]; BOOL showsHiddenFiles = [[NSUserDefaults standardUserDefaults] boolForKey:@"ShowsHiddenFiles"]; [openPanel setShowsHiddenFiles:showsHiddenFiles]; - [self.showHiddenFilesCheckboxOutlet setState:showsHiddenFiles ? NSOnState : NSOffState]; + [self.showHiddenFilesCheckboxOutlet setState:showsHiddenFiles ? NSControlStateValueOn : NSControlStateValueOff]; [openPanel TCM_setAssociatedValue:self forKey:@"OpenPanelAccessoryViewController"]; self.openPanel = openPanel; @@ -42,13 +42,13 @@ - (instancetype)initWithOpenPanel:(NSOpenPanel *)openPanel { } - (IBAction)goIntoBundles:(id)sender { - BOOL flag = ([(NSButton*)sender state] == NSOffState) ? NO : YES; + BOOL flag = ([(NSButton*)sender state] == NSControlStateValueOff) ? NO : YES; [self.openPanel setTreatsFilePackagesAsDirectories:flag]; [[NSUserDefaults standardUserDefaults] setBool:flag forKey:@"GoIntoBundlesPrefKey"]; } - (IBAction)showHiddenFiles:(id)sender { - BOOL flag = ([(NSButton*)sender state] == NSOffState) ? NO : YES; + BOOL flag = ([(NSButton*)sender state] == NSControlStateValueOff) ? NO : YES; [self.openPanel setShowsHiddenFiles:flag]; [[NSUserDefaults standardUserDefaults] setBool:flag forKey:@"ShowsHiddenFiles"]; } diff --git a/SubEthaEdit-Mac/Source/SEEStyleSheetEditorWindowController.m b/SubEthaEdit-Mac/Source/SEEStyleSheetEditorWindowController.m index 1c178c0d9..7e7df5c9f 100644 --- a/SubEthaEdit-Mac/Source/SEEStyleSheetEditorWindowController.m +++ b/SubEthaEdit-Mac/Source/SEEStyleSheetEditorWindowController.m @@ -155,11 +155,11 @@ - (IBAction)validateDefaultsState:(id)aSender { // BOOL useDefault=[[[O_modePopUpButton selectedMode] defaultForKey:DocumentModeUseDefaultStylePreferenceKey] boolValue]; // DocumentMode *baseMode=[[DocumentModeManager sharedInstance] baseMode]; // DocumentMode *selectedMode=[O_modePopUpButton selectedMode]; -// [O_fontController setContent:([O_fontDefaultButton state]==NSOnState)?baseMode:selectedMode]; +// [O_fontController setContent:([O_fontDefaultButton state]==NSControlStateValueOn)?baseMode:selectedMode]; // [O_styleController setContent:useDefault?baseMode:selectedMode]; // [O_defaultStyleButton setHidden:[[I_currentSyntaxStyle documentMode] isBaseMode]]; // if (O_defaultStyleButton !=aSender) { -// [O_defaultStyleButton setState:useDefault?NSOnState:NSOffState]; +// [O_defaultStyleButton setState:useDefault?NSControlStateValueOn:NSControlStateValueOff]; // } // // [O_stylesTableView setDisableFirstRow:useDefault]; @@ -210,11 +210,11 @@ - (void)updateInspector { NSButton *inheritButton = [triple objectAtIndex:1]; NSButton *actualButton = [triple objectAtIndex:2]; BOOL inherit = [directStyleAttributes objectForKey:key] == 0; - [inheritButton setState:inherit ? NSOnState : NSOffState]; + [inheritButton setState:inherit ? NSControlStateValueOn : NSControlStateValueOff]; NSString *value = [computedStyleAttributes objectForKey:key]; BOOL isSet = value && ![value isEqualToString:SEEStyleSheetValueNone] && ![value isEqualToString:SEEStyleSheetValueNormal]; // NSLog(@"%s %@ -> %d",__FUNCTION__, value, isSet); - [actualButton setState:isSet ? NSOnState : NSOffState]; + [actualButton setState:isSet ? NSControlStateValueOn : NSControlStateValueOff]; [actualButton setEnabled:!inherit]; } @@ -226,7 +226,7 @@ - (void)updateInspector { NSButton *inheritButton = [triple objectAtIndex:1]; NSColorWell *well = [triple objectAtIndex:2]; BOOL inherit = [directStyleAttributes objectForKey:key] == 0; - [inheritButton setState:inherit ? NSOnState : NSOffState]; + [inheritButton setState:inherit ? NSControlStateValueOn : NSControlStateValueOff]; NSColor *value = [computedStyleAttributes objectForKey:key]; [well setColor:value]; [well setEnabled:!inherit]; @@ -266,9 +266,9 @@ - (IBAction)takeInheritanceState:(id)aSender { NSString *key = [triple objectAtIndex:0]; NSButton *inheritButton = [triple objectAtIndex:1]; // NSButton *actualButton = [triple objectAtIndex:2]; - if ([directStyleAttributes objectForKey:key] && inheritButton.state == NSOnState) { + if ([directStyleAttributes objectForKey:key] && inheritButton.state == NSControlStateValueOn) { [directStyleAttributes removeObjectForKey:key]; - } else if (![directStyleAttributes objectForKey:key] && inheritButton.state == NSOffState) { + } else if (![directStyleAttributes objectForKey:key] && inheritButton.state == NSControlStateValueOff) { id value = [computedStyleAttributes objectForKey:key]; if (value) { [directStyleAttributes setObject:value forKey:key]; @@ -346,7 +346,7 @@ - (void)changeTraitByButton:(NSButton *)aButton key:(NSString *)aKey yesValue:(i if (selectedRow != -1) { NSString *scopeString = [[self scopesArray] objectAtIndex:selectedRow]; NSMutableDictionary *directStyleAttributes = [[self.currentStyleSheet styleAttributesForExactScope:scopeString] mutableCopy]; - [directStyleAttributes setObject:[aButton state] == NSOnState ? aYesValue : aNoValue forKey:aKey]; + [directStyleAttributes setObject:[aButton state] == NSControlStateValueOn ? aYesValue : aNoValue forKey:aKey]; NSLog(@"%s %@",__FUNCTION__, directStyleAttributes); [self.currentStyleSheet setStyleAttributes:directStyleAttributes forScope:scopeString]; [self updateForChangedStyles]; @@ -476,12 +476,12 @@ - (IBAction)revealStyleSheetInFinder:(id)aSender { // //- (IBAction)changeFontTraitItalic:(id)aSender { // [aSender setAllowsMixedState:NO]; -// [self setTrait:NSItalicFontMask ofSelectedStylesTo:[aSender state]==NSOnState]; +// [self setTrait:NSItalicFontMask ofSelectedStylesTo:[aSender state]==NSControlStateValueOn]; //} // //- (IBAction)changeFontTraitBold:(id)aSender { // [aSender setAllowsMixedState:NO]; -// [self setTrait:NSBoldFontMask ofSelectedStylesTo:[aSender state]==NSOnState]; +// [self setTrait:NSBoldFontMask ofSelectedStylesTo:[aSender state]==NSControlStateValueOn]; //} // //- (IBAction)import:(id)aSender { @@ -721,7 +721,7 @@ - (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(NSInteger)inde #pragma mark TableView DataSource - (NSArray *)scopesArray { - return (self.O_showOnlyMatchingScopesButton.state == NSOnState) ? self.currentStyleSheet.allScopesWithExamples : self.currentStyleSheet.allScopes; + return (self.O_showOnlyMatchingScopesButton.state == NSControlStateValueOn) ? self.currentStyleSheet.allScopesWithExamples : self.currentStyleSheet.allScopes; } - (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView { diff --git a/SubEthaEdit-Mac/Source/SEETextView.m b/SubEthaEdit-Mac/Source/SEETextView.m index c61c0422c..85fe27748 100644 --- a/SubEthaEdit-Mac/Source/SEETextView.m +++ b/SubEthaEdit-Mac/Source/SEETextView.m @@ -777,7 +777,7 @@ - (IBAction)copy:(id)aSender { NSPasteboard *pasteboard = [NSPasteboard generalPasteboard]; BOOL isRichText = [self isRichText]; - [pasteboard declareTypes:(isRichText ? [NSArray arrayWithObjects:NSRTFDPboardType,NSRTFPboardType,nil] : [NSArray arrayWithObjects:NSStringPboardType,nil]) owner:nil]; + [pasteboard declareTypes:(isRichText ? @[NSPasteboardTypeRTFD,NSPasteboardTypeRTF] : @[NSPasteboardTypeString]) owner:nil]; if (isRichText) { id textStorage = [self textStorage]; @@ -793,23 +793,23 @@ - (IBAction)copy:(id)aSender { NSAttributedString *foldingIconString = [NSAttributedString attributedStringWithAttachment:foldingIconAttachment]; NSAttributedString *foldingIconReplacementString = [[NSAttributedString alloc] initWithURL:[[NSBundle mainBundle] URLForResource:@"FoldingBubbleText" withExtension:@"rtf"] options:@{} documentAttributes:nil error:NULL]; [mutableString replaceAttachmentsWithAttributedString:foldingIconString]; - [pasteboard setData:[mutableString RTFDFromRange:[mutableString TCM_fullLengthRange] documentAttributes:@{}] forType:NSRTFDPboardType]; + [pasteboard setData:[mutableString RTFDFromRange:[mutableString TCM_fullLengthRange] documentAttributes:@{}] forType:NSPasteboardTypeRTFD]; [mutableString replaceAttachmentsWithAttributedString:foldingIconReplacementString]; - [pasteboard setData:[mutableString RTFFromRange:[mutableString TCM_fullLengthRange] documentAttributes:@{}] forType:NSRTFPboardType]; + [pasteboard setData:[mutableString RTFFromRange:[mutableString TCM_fullLengthRange] documentAttributes:@{}] forType:NSPasteboardTypeRTF]; } else { - [self writeSelectionToPasteboard:pasteboard type:NSStringPboardType]; + [self writeSelectionToPasteboard:pasteboard type:NSPasteboardTypeString]; } } - (NSArray *)writablePasteboardTypes { - NSArray *result = [NSArray arrayWithObject:NSStringPboardType]; + NSArray *result = [NSArray arrayWithObject:NSPasteboardTypeString]; return result; } - (BOOL)writeSelectionToPasteboard:(NSPasteboard *)pasteboard type:(NSString *)type { - if ([type isEqualToString:NSStringPboardType]) { + if ([type isEqualToString:NSPasteboardTypeString]) { NSRange selectedRange = [self selectedRange]; - if (selectedRange.length == 0) return NO; + if (selectedRange.length == 0) { return NO; } id textStorage = [self textStorage]; if ([textStorage respondsToSelector:@selector(fullRangeForFoldedRange:)]) { @@ -817,7 +817,7 @@ - (BOOL)writeSelectionToPasteboard:(NSPasteboard *)pasteboard type:(NSString *)t textStorage = [textStorage fullTextStorage]; } - [pasteboard setString:[[textStorage string] substringWithRange:selectedRange] forType:NSStringPboardType]; + [pasteboard setString:[[textStorage string] substringWithRange:selectedRange] forType:NSPasteboardTypeString]; return YES; } return NO; diff --git a/SubEthaEdit-Mac/Source/StylePreferences.m b/SubEthaEdit-Mac/Source/StylePreferences.m index 645df95bc..a7a733618 100644 --- a/SubEthaEdit-Mac/Source/StylePreferences.m +++ b/SubEthaEdit-Mac/Source/StylePreferences.m @@ -70,31 +70,31 @@ - (void)didUnselect { #pragma mark - IBActions - (IBAction)validateDefaultsState:(id)aSender { - [self.O_styleSheetDefaultRadioButton setState:NSOffState]; - [self.O_styleSheetCustomRadioButton setState:NSOffState]; - [self.O_styleSheetCustomForLanguageContextsRadioButton setState:NSOffState]; + [self.O_styleSheetDefaultRadioButton setState:NSControlStateValueOff]; + [self.O_styleSheetCustomRadioButton setState:NSControlStateValueOff]; + [self.O_styleSheetCustomForLanguageContextsRadioButton setState:NSControlStateValueOff]; DocumentMode *currentMode = [self.O_modeController content]; if ([[[currentMode defaults] objectForKey:DocumentModeUseDefaultStyleSheetPreferenceKey] boolValue]) { - [self.O_styleSheetDefaultRadioButton setState:NSOnState]; + [self.O_styleSheetDefaultRadioButton setState:NSControlStateValueOn]; } else { SEEStyleSheetSettings *styleSheetSettings = [currentMode styleSheetSettings]; if (styleSheetSettings.usesMultipleStyleSheets) { - [self.O_styleSheetCustomForLanguageContextsRadioButton setState:NSOnState]; + [self.O_styleSheetCustomForLanguageContextsRadioButton setState:NSControlStateValueOn]; } else { - [self.O_styleSheetCustomRadioButton setState:NSOnState]; + [self.O_styleSheetCustomRadioButton setState:NSControlStateValueOn]; } } DocumentMode *baseMode = [[DocumentModeManager sharedInstance] baseMode]; DocumentMode *selectedMode = [self.O_modePopUpButton selectedMode]; - [self.O_fontController setContent:([self.O_fontDefaultButton state]==NSOnState)?baseMode:selectedMode]; + [self.O_fontController setContent:([self.O_fontDefaultButton state]==NSControlStateValueOn)?baseMode:selectedMode]; [self takeFontFromMode:selectedMode]; [self highlightSyntax]; } - (IBAction)changeDefaultState:(id)aSender { - BOOL useDefault = ([aSender state]==NSOnState); + BOOL useDefault = ([aSender state]==NSControlStateValueOn); [[[self.O_modePopUpButton selectedMode] defaults] setObject:[NSNumber numberWithBool:useDefault] forKey:DocumentModeUseDefaultStylePreferenceKey]; [self validateDefaultsState:aSender]; } @@ -175,7 +175,7 @@ - (IBAction)changeFontViaPanel:(id)sender { } - (IBAction)useSystemMonospacedFont:(id)sender { - if ([self.O_fontDefaultButton state] != NSOnState) { + if ([self.O_fontDefaultButton state] != NSControlStateValueOn) { DocumentMode *mode = [self.O_modePopUpButton selectedMode]; NSFont *font = mode.plainFontBase; CGFloat size = font.pointSize; @@ -280,7 +280,7 @@ - (void)selectMode:(DocumentMode *)aDocumentMode { - (void)changeFont:(id)fontManager { // NSLog(@"%s",__FUNCTION__); - if ([self.O_fontDefaultButton state] != NSOnState) { + if ([self.O_fontDefaultButton state] != NSControlStateValueOn) { NSFont *newFont = [fontManager convertFont:[self.O_modePopUpButton selectedMode].plainFontBase]; NSMutableDictionary *dict=[NSMutableDictionary dictionary]; diff --git a/SubEthaEdit-Mac/Source/TCMMMUserSEEAdditions.m b/SubEthaEdit-Mac/Source/TCMMMUserSEEAdditions.m index 8d6d5a5a7..48b5a09ed 100644 --- a/SubEthaEdit-Mac/Source/TCMMMUserSEEAdditions.m +++ b/SubEthaEdit-Mac/Source/TCMMMUserSEEAdditions.m @@ -168,21 +168,21 @@ - (NSImage *)defaultImage { #pragma mark - Helper + (NSData *)imagePNGDataFromImage:(NSImage *)aImage { - NSData *data = nil; - if (aImage) { - data = [aImage TIFFRepresentation]; - data = [[NSBitmapImageRep imageRepWithData:data] representationUsingType:NSPNGFileType properties:@{}]; - } - return data; + NSData *data = nil; + if (aImage) { + data = [aImage TIFFRepresentation]; + data = [[NSBitmapImageRep imageRepWithData:data] representationUsingType:NSBitmapImageFileTypePNG properties:@{}]; + } + return data; } + (NSData *)imageJPEGDataFromImage:(NSImage *)aImage { - NSData *data = nil; - if (aImage) { - data = [aImage TIFFRepresentation]; - data = [[NSBitmapImageRep imageRepWithData:data] representationUsingType:NSJPEGFileType properties:@{NSImageCompressionFactor : @0.80}]; - } - return data; + NSData *data = nil; + if (aImage) { + data = [aImage TIFFRepresentation]; + data = [[NSBitmapImageRep imageRepWithData:data] representationUsingType:NSBitmapImageFileTypeJPEG properties:@{NSImageCompressionFactor : @0.80}]; + } + return data; } diff --git a/SubEthaEdit-Mac/SubEthaEdit.xcodeproj/project.pbxproj b/SubEthaEdit-Mac/SubEthaEdit.xcodeproj/project.pbxproj index f0004d5ff..824671fe4 100644 --- a/SubEthaEdit-Mac/SubEthaEdit.xcodeproj/project.pbxproj +++ b/SubEthaEdit-Mac/SubEthaEdit.xcodeproj/project.pbxproj @@ -2974,60 +2974,18 @@ 5EC6382E0ABEB71200D3295B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/SubEthaEdit.app/Contents/MacOS/SubEthaEdit"; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; INFOPLIST_FILE = "Unit Tests-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - OTHER_LDFLAGS = ( - "-framework", - Cocoa, - ); - PRODUCT_BUNDLE_IDENTIFIER = "de.codingmonkeys.SubEthaEdit${TCM_APP_STYLE}.UnitTests"; + PRODUCT_BUNDLE_IDENTIFIER = "${SEE_APP_IDENTIFIER_BASE}.Mac${TCM_APP_STYLE}${TCM_APP_IDENTIFER_SUFFIX}.UnitTests"; PRODUCT_NAME = "Unit Tests"; - TEST_HOST = "$(BUNDLE_LOADER)"; - ZERO_LINK = NO; }; name = Debug; }; 5EC6382F0ABEB71200D3295B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/SubEthaEdit.app/Contents/MacOS/SubEthaEdit"; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; INFOPLIST_FILE = "Unit Tests-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - OTHER_LDFLAGS = ( - "-framework", - Cocoa, - ); - PRODUCT_BUNDLE_IDENTIFIER = "de.codingmonkeys.SubEthaEdit${TCM_APP_STYLE}.UnitTests"; + PRODUCT_BUNDLE_IDENTIFIER = "${SEE_APP_IDENTIFIER_BASE}.Mac${TCM_APP_STYLE}${TCM_APP_IDENTIFER_SUFFIX}.UnitTests"; PRODUCT_NAME = "Unit Tests"; - TEST_HOST = "$(BUNDLE_LOADER)"; - ZERO_LINK = NO; }; name = Release; }; @@ -3148,6 +3106,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; ONLY_ACTIVE_ARCH = YES; }; name = Debug; @@ -3183,6 +3142,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; OTHER_CFLAGS = ( "-DTCM_NO_DEBUG", "-DNS_BLOCK_ASSERTIONS",