Author: rmottola
Date: Sun Mar 22 22:41:56 2015
New Revision: 38423
URL: http://svn.gna.org/viewcvs/gnustep?rev=38423&view=rev
Log:
Convert CMYK to RGB before serializing
Modified:
apps/projectcenter/trunk/ChangeLog
apps/projectcenter/trunk/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m
Modified: apps/projectcenter/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/projectcenter/trunk/ChangeLog?rev=38423&r1=38422&r2=38423&view=diff
==============================================================================
--- apps/projectcenter/trunk/ChangeLog (original)
+++ apps/projectcenter/trunk/ChangeLog Sun Mar 22 22:41:56 2015
@@ -1,3 +1,8 @@
+2015-03-22 Riccardo Mottola <r...@gnu.org>
+
+ * Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m
+ Convert CMYK to RGB before serializing.
+
2015-03-22 Riccardo Mottola <r...@gnu.org>
* Modules/Editors/ProjectCenter/PCEditor.m
Modified:
apps/projectcenter/trunk/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/projectcenter/trunk/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m?rev=38423&r1=38422&r2=38423&view=diff
==============================================================================
--- apps/projectcenter/trunk/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m
(original)
+++ apps/projectcenter/trunk/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m
Sun Mar 22 22:41:56 2015
@@ -243,7 +243,6 @@
- (void)setEditorColor:(id)sender
{
NSColor *color;
- NSColor *currentColor;
NSString *colorString;
NSString *key;
NSString *colorSpaceName;
@@ -252,49 +251,37 @@
{
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;
- }
-
- currentColor = color;
+ if (![colorSpaceName isEqualToString:NSCalibratedRGBColorSpace])
+ color = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+ colorString = [NSString stringWithFormat:@"RGB %0.1f %0.1f %0.1f",
+ [color redComponent],
+ [color greenComponent],
+ [color blueComponent]];
+ }
NSLog(@"Selected color: '%@'", colorString);
_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs
