aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPColorAdditions.m
diff options
context:
space:
mode:
Diffstat (limited to 'Source/SPColorAdditions.m')
-rw-r--r--Source/SPColorAdditions.m36
1 files changed, 21 insertions, 15 deletions
diff --git a/Source/SPColorAdditions.m b/Source/SPColorAdditions.m
index aee0458a..e3075c6e 100644
--- a/Source/SPColorAdditions.m
+++ b/Source/SPColorAdditions.m
@@ -4,21 +4,29 @@
// SPColorAdditions.m
// sequel-pro
//
-// Created by Hans-Jörg Bibiko on August 16, 2010
+// Created by Hans-Jörg Bibiko on August 16, 2010.
+// Copyright (c) 2010 Hans-Jörg Bibiko. All rights reserved.
//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
//
// More info at <http://code.google.com/p/sequel-pro/>
@@ -26,13 +34,12 @@
@implementation NSColor (SPColorAdditions)
-/*
+/**
* Convert self by using the NSCalibratedRGBColorSpace color space in a NSString
* #RRGGBBAA or if the alpha value is zero to #RRGGBB
*/
- (NSString *)rgbHexString
{
-
CGFloat red, green, blue, alpha;
NSString *redHexValue, *greenHexValue, *blueHexValue, *alphaHexValue;
NSColor *aColor = [self colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
@@ -48,7 +55,6 @@
}
return @"";
-
}
+ (NSColor *)colorWithRGBHexString:(NSString *)hexString