Author: rmottola
Date: Sun Mar 22 19:06:17 2015
New Revision: 38420
URL: http://svn.gna.org/viewcvs/gnustep?rev=38420&view=rev
Log:
Move colorFromString from PCEditorFSCPrefs to PCPrefsController and make it
thus generally available
Modified:
apps/projectcenter/trunk/ChangeLog
apps/projectcenter/trunk/Headers/Protocols/Preferences.h
apps/projectcenter/trunk/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m
apps/projectcenter/trunk/PCPrefController.m
Modified: apps/projectcenter/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/projectcenter/trunk/ChangeLog?rev=38420&r1=38419&r2=38420&view=diff
==============================================================================
--- apps/projectcenter/trunk/ChangeLog (original)
+++ apps/projectcenter/trunk/ChangeLog Sun Mar 22 19:06:17 2015
@@ -1,3 +1,10 @@
+2015-03-22 Riccardo Mottola <[email protected]>
+
+ * 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 <[email protected]>
* Modules/Projects/Framework/PCFrameworkProject.m
Modified: apps/projectcenter/trunk/Headers/Protocols/Preferences.h
URL:
http://svn.gna.org/viewcvs/gnustep/apps/projectcenter/trunk/Headers/Protocols/Preferences.h?rev=38420&r1=38419&r2=38420&view=diff
==============================================================================
--- apps/projectcenter/trunk/Headers/Protocols/Preferences.h (original)
+++ apps/projectcenter/trunk/Headers/Protocols/Preferences.h Sun Mar 22
19:06:17 2015
@@ -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.
@@ -31,6 +32,8 @@
#define PCPreferencesDidChangeNotification
@"PCPreferencesDidChangeNotification"
@protocol PCPreferences <NSObject>
+
+- (NSColor *)colorFromString:(NSString *)colorString;
- (NSString *)stringForKey:(NSString *)key;
- (NSString *)stringForKey:(NSString *)key
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=38420&r1=38419&r2=38420&view=diff
==============================================================================
--- apps/projectcenter/trunk/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m
(original)
+++ apps/projectcenter/trunk/Modules/Preferences/EditorFSC/PCEditorFSCPrefs.m
Sun Mar 22 19:06:17 2015
@@ -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];
}
Modified: apps/projectcenter/trunk/PCPrefController.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/projectcenter/trunk/PCPrefController.m?rev=38420&r1=38419&r2=38420&view=diff
==============================================================================
--- apps/projectcenter/trunk/PCPrefController.m (original)
+++ apps/projectcenter/trunk/PCPrefController.m Sun Mar 22 19:06:17 2015
@@ -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.
@@ -28,6 +28,7 @@
#import <Protocols/Preferences.h>
@implementation PCPrefController
+
// ===========================================================================
// ==== Class methods
@@ -72,7 +73,40 @@
{
}
-// 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];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
