gnustep/apps-projectcenter
0
0
Fork 0
mirror of https://github.com/gnustep/apps-projectcenter.git synced 2025-03-18 08:33:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move colorFromString from PCEditorFSCPrefs to PCPrefsController and make it thus generally available

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@38420 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Riccardo Mottola 2015-03-22 18:06:17 +00:00
parent e60d0be099
commit e287500b99
4 changed files with 50 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2015-03-22 Riccardo Mottola <rm@gnu.org>
* Headers/Protocols/Preferences.h
* Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m
* PCPrefController.m
Move colorFromString from PCEditorFSCPrefs to PCPrefsController and make it thus generally available.
2015-03-12 Riccardo Mottola <rm@gnu.org>
* Modules/Projects/Framework/PCFrameworkProject.m

5
Headers/Protocols/Preferences.h
View file

@ -1,9 +1,10 @@
/*
GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
Copyright (C) 2005 Free Software Foundation
Copyright (C) 2005-2015 Free Software Foundation
Authors: Serg Stoyan
Riccardo Mottola
This file is part of GNUstep.
@ -32,6 +33,8 @@
@protocol PCPreferences <NSObject>
- (NSColor *)colorFromString:(NSString *)colorString;
- (NSString *)stringForKey:(NSString *)key;
- (NSString *)stringForKey:(NSString *)key
defaultValue:(NSString *)defaultValue;

31
Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m
View file

@ -147,32 +147,7 @@
}
}
- (NSColor *)colorFromString:(NSString *)colorString
{
NSArray *colorComponents;
NSString *colorSpaceName;
NSColor *color;
colorComponents = [colorString componentsSeparatedByString:@" "];
colorSpaceName = [colorComponents objectAtIndex:0];
if ([colorSpaceName isEqualToString:@"White"]) // Treat as WhiteColorSpace
{
color = [NSColor
colorWithCalibratedWhite:[[colorComponents objectAtIndex:1] floatValue]
alpha:1.0];
}
else // Treat as RGBColorSpace
{
color = [NSColor
colorWithCalibratedRed:[[colorComponents objectAtIndex:1] floatValue]
green:[[colorComponents objectAtIndex:2] floatValue]
blue:[[colorComponents objectAtIndex:3] floatValue]
alpha:1.0];
}
return color;
}
// ----------------------------------------------------------------------------
// --- Protocol
@ -213,15 +188,15 @@
// Colors
val = [prefs stringForKey:EditorForegroundColor defaultValue:@"White 0.0"];
currentForegroundColor = [self colorFromString:val];
currentForegroundColor = [prefs colorFromString:val];
[foregroundColorWell setColor:currentForegroundColor];
val = [prefs stringForKey:EditorBackgroundColor defaultValue:@"White 1.0"];
currentBackgroundColor = [self colorFromString:val];
currentBackgroundColor = [prefs colorFromString:val];
[backgroundColorWell setColor:currentBackgroundColor];
val = [prefs stringForKey:EditorSelectionColor defaultValue:@"White 0.66"];
currentSelectionColor = [self colorFromString:val];
currentSelectionColor = [prefs colorFromString:val];
[selectionColorWell setColor:currentSelectionColor];
}

38
PCPrefController.m
View file

@ -1,7 +1,7 @@
/*
GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
Copyright (C) 2001-2008 Free Software Foundation
Copyright (C) 2001-2015 Free Software Foundation
This file is part of GNUstep.
@ -29,6 +29,7 @@
@implementation PCPrefController
// ===========================================================================
// ==== Class methods
// ===========================================================================
@ -72,7 +73,40 @@ static PCPrefController *_prefCtrllr = nil;
{
}
// Accessory
// ----------------------------------------------------------------------------
// --- color utility method
// ----------------------------------------------------------------------------
- (NSColor *)colorFromString:(NSString *)colorString
{
NSArray *colorComponents;
NSString *colorSpaceName;
NSColor *color;
colorComponents = [colorString componentsSeparatedByString:@" "];
colorSpaceName = [colorComponents objectAtIndex:0];
if ([colorSpaceName isEqualToString:@"White"]) // Treat as WhiteColorSpace
{
color = [NSColor
colorWithCalibratedWhite:[[colorComponents objectAtIndex:1] floatValue]
alpha:1.0];
}
else // Treat as RGBColorSpace
{
color = [NSColor
colorWithCalibratedRed:[[colorComponents objectAtIndex:1] floatValue]
green:[[colorComponents objectAtIndex:2] floatValue]
blue:[[colorComponents objectAtIndex:3] floatValue]
alpha:1.0];
}
return color;
}
// ----------------------------------------------------------------------------
// --- Accessors
// ----------------------------------------------------------------------------
- (NSString *)stringForKey:(NSString *)key
{
return [self stringForKey:key defaultValue:nil];