diff --git a/ChangeLog b/ChangeLog index d1a370b..b08cc48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-03-22 Riccardo Mottola + + * Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m + Convert CMYK to RGB before serializing. + 2015-03-22 Riccardo Mottola * Modules/Editors/ProjectCenter/PCEditor.m diff --git a/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m b/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m index 4094447..6ac7c8f 100644 --- a/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m +++ b/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m @@ -243,7 +243,6 @@ - (void)setEditorColor:(id)sender { NSColor *color; - NSColor *currentColor; NSString *colorString; NSString *key; NSString *colorSpaceName; @@ -252,50 +251,38 @@ { NSLog(@"foregroundColorWell"); color = [foregroundColorWell color]; - currentColor = currentForegroundColor; key = EditorForegroundColor; } else if (sender == backgroundColorWell) { NSLog(@"backgroundColorWell"); color = [backgroundColorWell color]; - currentColor = currentBackgroundColor; key = EditorBackgroundColor; } else // selectionColorWell { NSLog(@"selectionColorWell"); color = [selectionColorWell color]; - currentColor = currentSelectionColor; key = EditorSelectionColor; } colorSpaceName = [color colorSpaceName]; - NSLog(@"Color's colorspace name: '%@'", colorSpaceName); - if ([colorSpaceName isEqualToString:@"NSCalibratedRGBColorSpace"]) - { -/* [sender setColor:currentColor]; - NSRunAlertPanel(@"Set Color", - @"Please, use RGB color.\n" - @"Color in color well left unchanged", - @"Close", nil, nil);*/ - colorString = [NSString stringWithFormat:@"RGB %0.1f %0.1f %0.1f", - [color redComponent], - [color greenComponent], - [color blueComponent]]; - } - else if ([colorSpaceName isEqualToString:@"NSCalibratedWhiteColorSpace"]) + + if ([colorSpaceName isEqualToString:@"NSCalibratedWhiteColorSpace"]) { colorString = [NSString stringWithFormat:@"White %0.1f", [color whiteComponent]]; } else { - return; + if (![colorSpaceName isEqualToString:NSCalibratedRGBColorSpace]) + color = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; + colorString = [NSString stringWithFormat:@"RGB %0.1f %0.1f %0.1f", + [color redComponent], + [color greenComponent], + [color blueComponent]]; } - currentColor = color; - NSLog(@"Selected color: '%@'", colorString); [prefs setString:colorString forKey:key notify:YES];