diff --git a/mac/ColorClock/ColorClock.xcodeproj/project.pbxproj b/mac/ColorClock/ColorClock.xcodeproj/project.pbxproj
index 30445cd..6f0f3f9 100644
--- a/mac/ColorClock/ColorClock.xcodeproj/project.pbxproj
+++ b/mac/ColorClock/ColorClock.xcodeproj/project.pbxproj
@@ -148,7 +148,7 @@
9B25EAD8154B78EA00157002 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0450;
+ LastUpgradeCheck = 0610;
ORGANIZATIONNAME = "Blue Worm Labs, LLC";
};
buildConfigurationList = 9B25EADB154B78EA00157002 /* Build configuration list for PBXProject "ColorClock" */;
@@ -216,7 +216,6 @@
9B25EAF9154B78EB00157002 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_GC = required;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -229,14 +228,13 @@
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx;
};
name = Debug;
};
9B25EAFA154B78EB00157002 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_GC = required;
GCC_VERSION = "";
@@ -245,7 +243,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx;
};
name = Release;
};
@@ -253,11 +251,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
- GCC_ENABLE_OBJC_GC = supported;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "ColorClock/ColorClock-Prefix.pch";
INFOPLIST_FILE = "ColorClock/ColorClock-Info.plist";
@@ -272,11 +271,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
- GCC_ENABLE_OBJC_GC = supported;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "ColorClock/ColorClock-Prefix.pch";
INFOPLIST_FILE = "ColorClock/ColorClock-Info.plist";
diff --git a/mac/ColorClock/ColorClock.xcodeproj/project.xcworkspace/xcshareddata/ColorClock.xccheckout b/mac/ColorClock/ColorClock.xcodeproj/project.xcworkspace/xcshareddata/ColorClock.xccheckout
new file mode 100644
index 0000000..704573e
--- /dev/null
+++ b/mac/ColorClock/ColorClock.xcodeproj/project.xcworkspace/xcshareddata/ColorClock.xccheckout
@@ -0,0 +1,41 @@
+
+
+
+
+ IDESourceControlProjectFavoriteDictionaryKey
+
+ IDESourceControlProjectIdentifier
+ 00676455-FFAD-422A-8C63-16CC7D70CA4A
+ IDESourceControlProjectName
+ ColorClock
+ IDESourceControlProjectOriginsDictionary
+
+ 4314B9B1200358061486206A4F6B6F07A1CAABFA
+ github.com:bluewormlabs/colorclock.git
+
+ IDESourceControlProjectPath
+ mac/ColorClock/ColorClock.xcodeproj
+ IDESourceControlProjectRelativeInstallPathDictionary
+
+ 4314B9B1200358061486206A4F6B6F07A1CAABFA
+ ../../../..
+
+ IDESourceControlProjectURL
+ github.com:bluewormlabs/colorclock.git
+ IDESourceControlProjectVersion
+ 111
+ IDESourceControlProjectWCCIdentifier
+ 4314B9B1200358061486206A4F6B6F07A1CAABFA
+ IDESourceControlProjectWCConfigurations
+
+
+ IDESourceControlRepositoryExtensionIdentifierKey
+ public.vcs.git
+ IDESourceControlWCCIdentifierKey
+ 4314B9B1200358061486206A4F6B6F07A1CAABFA
+ IDESourceControlWCCName
+ colorclock
+
+
+
+
diff --git a/mac/ColorClock/ColorClock/ColorClockView.h b/mac/ColorClock/ColorClock/ColorClockView.h
index a2cad33..3347995 100644
--- a/mac/ColorClock/ColorClock/ColorClockView.h
+++ b/mac/ColorClock/ColorClock/ColorClockView.h
@@ -14,7 +14,6 @@
IBOutlet id timeFormat24;
IBOutlet id timeFormat12;
IBOutlet id showHexValue;
- IBOutlet id fontName;
@private
}
diff --git a/mac/ColorClock/ColorClock/ColorClockView.m b/mac/ColorClock/ColorClock/ColorClockView.m
index 6930af7..c548e05 100644
--- a/mac/ColorClock/ColorClock/ColorClockView.m
+++ b/mac/ColorClock/ColorClock/ColorClockView.m
@@ -52,9 +52,6 @@ - (void)drawRect:(NSRect)rect {
NSFont *font;
NSFont *hexFont;
NSColor *fontColor = [NSColor colorWithCalibratedWhite:1 alpha:0.6];
- NSColor *gradientStartColor = [NSColor colorWithCalibratedRed:0 green:0 blue:0 alpha:0.05];
- NSColor *gradientEndColor = [NSColor colorWithCalibratedRed:0 green:0 blue:0 alpha:0.5];
- NSGradient *gradient = [[NSGradient alloc] initWithStartingColor:gradientStartColor endingColor:gradientEndColor];
ScreenSaverDefaults * defaults;
defaults = [ScreenSaverDefaults defaultsForModuleWithName:ColorClock];
hex = [self getHexColorForTime:date];
@@ -91,7 +88,6 @@ - (void)drawRect:(NSRect)rect {
CGFloat y = ((screenSize.height / 2) - (stringSize.height / 3));
CGFloat x = ((screenSize.width / 2) - (stringSize.width / 2));
- [gradient drawInRect:rect relativeCenterPosition:NSZeroPoint];
[time drawAtPoint:NSMakePoint(x, y) withAttributes:attr];
//make the hex font size smaller
@@ -103,9 +99,6 @@ - (void)drawRect:(NSRect)rect {
CGFloat hexX = ((screenSize.width / 2) - (hexStringSize.width / 2));
[hex drawAtPoint:NSMakePoint(hexX, y) withAttributes:hexAttr];
- [gradient release];
- [dateFormatter release];
- [style release];
}
- (void)animateOneFrame {
@@ -151,7 +144,6 @@ -(NSString*) getHexColorForTime:(NSDate*)date {
//get our color
NSString *hex = [NSString stringWithFormat:@"%X%X%X%X%X%X", (int)firstDigit, (int)secondDigit, (int)thirdDigit, (int)fourthDigit, (int)fifthDigit, (int)sixthDigit];
- [formatter release];
return hex;
}
@@ -210,8 +202,6 @@ - (IBAction) okClick: (id)sender
forKey:@"timeFormat12"];
[defaults setBool:[timeFormat24 state]
forKey:@"timeFormat24"];
- [defaults setValue:[fontName state]
- forKey:@"fontName"];
[defaults setBool:[showHexValue state]
forKey:@"showHexValue"];
diff --git a/mac/ColorClock/ConfigurationPanel.xib b/mac/ColorClock/ConfigurationPanel.xib
index ab9abb0..5206183 100644
--- a/mac/ColorClock/ConfigurationPanel.xib
+++ b/mac/ColorClock/ConfigurationPanel.xib
@@ -1,8 +1,8 @@
-
+
-
-
+
+
@@ -14,37 +14,34 @@
-
-
+
+
-
+
-
-
+
-
-
-
+
@@ -65,7 +62,6 @@
-
@@ -74,7 +70,6 @@
-
\ No newline at end of file
+