Getting things in order for the bigger stuff...

diff --git a/ITKit.xcode/project.pbxproj b/ITKit.xcode/project.pbxproj
index 3513343..5dfb7f4 100755 (executable)
--- a/ITKit.xcode/project.pbxproj
+++ b/ITKit.xcode/project.pbxproj
@@ -177,7 +177,6 @@
                                7C992DF2054F5179000B93EA,
                                7C992DF3054F5179000B93EA,
                                7C992DF4054F5179000B93EA,
-                               7C992F9E054F54C1000B93EA,
                        );
                        isa = PBXGroup;
                        name = Classes;
@@ -261,6 +260,12 @@
 //7C2
 //7C3
 //7C4
+               7C5B7C93054F6EC9008379B6 = {
+                       fileRef = 8DC2EF5B0486A6940098B216;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
                7C992DC9054F5179000B93EA = {
                        expectedFileType = sourcecode.c.h;
                        fileEncoding = 4;
@@ -485,22 +490,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
-               7C992DE5054F5179000B93EA = {
-                       expectedFileType = sourcecode.c.h;
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       path = ITLED.h;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               7C992DE6054F5179000B93EA = {
-                       expectedFileType = sourcecode.c.objc;
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       path = ITLED.m;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                7C992DE7054F5179000B93EA = {
                        expectedFileType = sourcecode.c.h;
                        fileEncoding = 4;
@@ -1066,9 +1055,6 @@
                7C992E39054F522D000B93EA = {
                        children = (
                                7C992E3A054F522D000B93EA,
-                               7C992E3C054F5237000B93EA,
-                               7C992E3D054F523F000B93EA,
-                               7C992E49054F525E000B93EA,
                        );
                        isa = PBXVariantGroup;
                        name = ITKeyCodes.plist;
@@ -1080,8 +1066,8 @@
                        expectedFileType = text.plist;
                        fileEncoding = 4;
                        isa = PBXFileReference;
-                       name = English;
-                       path = English.lproj/ITKeyCodes.plist;
+                       name = Global;
+                       path = ITKeyCodes.plist;
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -1091,22 +1077,6 @@
                        settings = {
                        };
                };
-               7C992E3C054F5237000B93EA = {
-                       expectedFileType = text.plist;
-                       isa = PBXFileReference;
-                       name = French;
-                       path = French.lproj/ITKeyCodes.plist;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               7C992E3D054F523F000B93EA = {
-                       expectedFileType = text.plist;
-                       isa = PBXFileReference;
-                       name = German;
-                       path = German.lproj/ITKeyCodes.plist;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                7C992E3E054F5246000B93EA = {
                        children = (
                                7C992E3F054F5246000B93EA,
@@ -1185,14 +1155,6 @@
                        settings = {
                        };
                };
-               7C992E49054F525E000B93EA = {
-                       expectedFileType = text.plist;
-                       isa = PBXFileReference;
-                       name = Japanese;
-                       path = Japanese.lproj/ITKeyCodes.plist;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                7C992E78054F5285000B93EA = {
                        expectedFileType = text;
                        fileEncoding = 4;
@@ -1204,9 +1166,6 @@
                7C992E9B054F52B0000B93EA = {
                        children = (
                                7C992E9C054F52B0000B93EA,
-                               7C992EBC054F52B7000B93EA,
-                               7C992ED7054F52BC000B93EA,
-                               7C992EFA054F52C4000B93EA,
                        );
                        isa = PBXVariantGroup;
                        name = ITKeyComboPanel.nib;
@@ -1217,8 +1176,8 @@
                7C992E9C054F52B0000B93EA = {
                        expectedFileType = wrapper.nib;
                        isa = PBXFileReference;
-                       name = English;
-                       path = English.lproj/ITKeyComboPanel.nib;
+                       name = Global;
+                       path = ITKeyComboPanel.nib;
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -1228,36 +1187,9 @@
                        settings = {
                        };
                };
-               7C992EBC054F52B7000B93EA = {
-                       expectedFileType = wrapper.nib;
-                       isa = PBXFileReference;
-                       name = French;
-                       path = French.lproj/ITKeyComboPanel.nib;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               7C992ED7054F52BC000B93EA = {
-                       expectedFileType = wrapper.nib;
-                       isa = PBXFileReference;
-                       name = German;
-                       path = German.lproj/ITKeyComboPanel.nib;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               7C992EFA054F52C4000B93EA = {
-                       expectedFileType = wrapper.nib;
-                       isa = PBXFileReference;
-                       name = Japanese;
-                       path = Japanese.lproj/ITKeyComboPanel.nib;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                7C992F18054F52CF000B93EA = {
                        children = (
                                7C992F19054F52CF000B93EA,
-                               7C992F3C054F52D6000B93EA,
-                               7C992F5D054F52DC000B93EA,
-                               7C992F7E054F52E4000B93EA,
                        );
                        isa = PBXVariantGroup;
                        name = Localizable.strings;
@@ -1269,8 +1201,8 @@
                        expectedFileType = text.plist.strings;
                        fileEncoding = 4;
                        isa = PBXFileReference;
-                       name = English;
-                       path = English.lproj/Localizable.strings;
+                       name = Global;
+                       path = Localizable.strings;
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -1280,34 +1212,9 @@
                        settings = {
                        };
                };
-               7C992F3C054F52D6000B93EA = {
-                       expectedFileType = text.plist.strings;
-                       isa = PBXFileReference;
-                       name = French;
-                       path = French.lproj/Localizable.strings;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               7C992F5D054F52DC000B93EA = {
-                       expectedFileType = text.plist.strings;
-                       isa = PBXFileReference;
-                       name = German;
-                       path = German.lproj/Localizable.strings;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               7C992F7E054F52E4000B93EA = {
-                       expectedFileType = text.plist.strings;
-                       isa = PBXFileReference;
-                       name = Japanese;
-                       path = Japanese.lproj/Localizable.strings;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                7C992F82054F5389000B93EA = {
                        buildActionMask = 2147483647;
                        files = (
-                               7CAFE6C9056321E7004CBAFE,
                                7C993130054F6A03000B93EA,
                        );
                        isa = PBXHeadersBuildPhase;
@@ -1341,7 +1248,7 @@
                7C992F85054F5389000B93EA = {
                        buildActionMask = 2147483647;
                        files = (
-                               7CAFE6CC05632206004CBAFE,
+                               7C5B7C93054F6EC9008379B6,
                        );
                        isa = PBXFrameworksBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
@@ -1357,7 +1264,7 @@
                        );
                        buildSettings = {
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = ITKit_Prefix.pch;
+                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                GCC_WARN_UNKNOWN_PRAGMAS = NO;
                                INFOPLIST_FILE = "ITKitShowcase-Info.plist";
@@ -1371,7 +1278,6 @@
                                WARNING_CFLAGS = "-Wmost";
                        };
                        dependencies = (
-                               7CAFE6D00563220F004CBAFE,
                        );
                        isa = PBXNativeTarget;
                        name = ITKitShowcase;
@@ -1482,17 +1388,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
-               7C992F9E054F54C1000B93EA = {
-                       children = (
-                               7C992DE5054F5179000B93EA,
-                               7C992DE6054F5179000B93EA,
-                       );
-                       isa = PBXGroup;
-                       name = Incomplete;
-                       path = "";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                7C992FA1054F54C3000B93EA = {
                        children = (
                                7C993015054F54F0000B93EA,
@@ -1884,30 +1779,6 @@
                        settings = {
                        };
                };
-               7CAFE6C9056321E7004CBAFE = {
-                       fileRef = 32DBCF5E0370ADEE00C91783;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
-               7CAFE6CC05632206004CBAFE = {
-                       fileRef = 8DC2EF5B0486A6940098B216;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
-               7CAFE6CF0563220F004CBAFE = {
-                       containerPortal = 0867D690FE84028FC02AAC07;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
-                       remoteInfo = ITKit;
-               };
-               7CAFE6D00563220F004CBAFE = {
-                       isa = PBXTargetDependency;
-                       target = 8DC2EF4F0486A6940098B216;
-                       targetProxy = 7CAFE6CF0563220F004CBAFE;
-               };
                7CC84BE0054F6CA2001DC704 = {
                        expectedFileType = wrapper.framework;
                        isa = PBXFileReference;

diff --git a/ITLED.h b/ITLED.h
deleted file mode 100755 (executable)
index 5b3bcf2..0000000
--- a/ITLED.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *     ITKit
- *  ITLED
- *    NSButton subclass which resembles an LED, suitable for use
- *    in applications which utilize the Metal or Pro look.
- *
- *  Original Author : Matt Judy <mjudy@ithinksw.com>
- *   Responsibility : Matt Judy <mjudy@ithinksw.com>
- *
- *  Copyright (c) 2002 - 2003 iThink Software.
- *  All Rights Reserved
- *
- */
-
-
-#import <Cocoa/Cocoa.h>
-
-
-@interface ITLEDCell : NSActionCell {
-
-    NSColor *_ledColor;
-    BOOL     _state;
-
-}
-
-- (NSColor *)ledColor;
-- (void)setLEDColor:(NSColor *)newColor;
-
-@end
-
-
-@interface ITLED : NSControl {
-
-}
-
-- (NSColor *)ledColor;
-- (void)setLEDColor;
-
-@end

diff --git a/ITLED.m b/ITLED.m
deleted file mode 100755 (executable)
index 3ceb5ac..0000000
--- a/ITLED.m
+++ /dev/null
@@ -1,101 +0,0 @@
-#import "ITLED.h"
-
-
-/*************************************************************************/
-#pragma mark -
-#pragma mark CELL IMPLEMENTATION
-/*************************************************************************/
-
-@implementation ITLEDCell
-
-
-/*************************************************************************/
-#pragma mark -
-#pragma mark CELL INITIALIZATION METHODS
-/*************************************************************************/
-
-- (id)init {
-    if ( (self = [super init]) ) {
-        _ledColor = [[NSColor greenColor] retain];
-    }
-    return self;
-}
-
-
-/*************************************************************************/
-#pragma mark -
-#pragma mark CELL INSTANCE METHODS
-/*************************************************************************/
-
-- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
-{
-    [[NSColor greenColor] set];
-    NSRectFill(cellFrame);
-}
-
-
-/*************************************************************************/
-#pragma mark -
-#pragma mark CELL DEALLOCATION METHODS
-/*************************************************************************/
-
-- (void)dealloc {
-    [super dealloc];
-    [_ledColor release];
-}
-
-
-@end
-
-
-/*************************************************************************/
-#pragma mark -
-#pragma mark CONTROL IMPLEMENTATION
-/*************************************************************************/
-
-@implementation ITLED
-
-
-/*************************************************************************/
-#pragma mark -
-#pragma mark CONTROL INITIALIZATION METHODS
-/*************************************************************************/
-
-+ (void)initialize {
-    if (self == [ITLED class]) {
-        [self setCellClass: [ITLEDCell class]];
-    }
-}
-
-+ (Class)cellClass {
-    return [ITLEDCell class];
-}
-
-
-/*************************************************************************/
-#pragma mark -
-#pragma mark CONTROL INSTANCE METHODS
-/*************************************************************************/
-
-- (NSColor *)ledColor
-{
-    return [[self cell] ledColor];
-}
-
-- (void)setLEDColor:(NSColor *)newColor
-{
-    [[self cell] setLEDColor:newColor];
-}
-
-
-/*************************************************************************/
-#pragma mark -
-#pragma mark CONTROL DEALLOCATION METHODS
-/*************************************************************************/
-
-- (void)dealloc {
-    [super dealloc];
-}
-
-
-@end

diff --git a/ITTSWBackgroundView.m b/ITTSWBackgroundView.m
index 94731aa..f7343ed 100755 (executable)
--- a/ITTSWBackgroundView.m
+++ b/ITTSWBackgroundView.m
@@ -16,27 +16,55 @@
 {
     float vh = NSHeight(theRect);
     float vw = NSWidth(theRect);
+    
+    NSPoint pointA = NSMakePoint( 24.0        , 0.0         );
+//  NSPoint pointB = NSMakePoint( 0.0         , 24.0        );  reference
+    NSPoint pointC = NSMakePoint( 0.0         , (vh - 24.0) );
+//  NSPoint pointD = NSMakePoint( 24.0        , vh          );  reference
+    NSPoint pointE = NSMakePoint( (vw - 24.0) , vh          );
+//  NSPoint pointF = NSMakePoint( vw          , (vh - 24.0) );  reference
+    NSPoint pointG = NSMakePoint( vw          , 24.0        );
+//  NSPoint pointH = NSMakePoint( (vw - 24.0) , 0.0         );  reference
 
+    NSPoint ctrAB  = NSMakePoint( 24.0        , 24.0        );
+    NSPoint ctrCD  = NSMakePoint( 24.0        , (vh - 24.0) );
+    NSPoint ctrEF  = NSMakePoint( (vw - 24.0) , (vh - 24.0) );
+    NSPoint ctrGH  = NSMakePoint( (vw - 24.0) , 24.0        );
+    
+    /*
+     *        D                    E
+     *      +------------------------+
+     *    C | * ctrCD        ctrEF * | F
+     *      |                        |
+     *    B | * ctrAB        ctrGH * | G
+     *      +------------------------+
+     *        A                    H
+     */
+    
     [_path autorelease];
     _path = [[NSBezierPath bezierPath] retain];
 
-    [_path moveToPoint:NSMakePoint( 0.0, (vh - 24.0) )];         //  first point
-    [_path curveToPoint:NSMakePoint( 24.0, vh )
-         controlPoint1:NSMakePoint( 0.0, (vh - 11.0) )
-         controlPoint2:NSMakePoint( 11.0, vh )];                 //  top-left curve
-    [_path lineToPoint:NSMakePoint( (vw - 24.0), vh )];    //  top line
-    [_path curveToPoint:NSMakePoint( vw, (vh - 24.0) )
-         controlPoint1:NSMakePoint( (vw - 11.0), vh )
-         controlPoint2:NSMakePoint( vw, (vh - 11.0) )];   //  top-right curve
-    [_path lineToPoint:NSMakePoint( vw, 24.0 )];           //  right line
-    [_path curveToPoint:NSMakePoint( (vw - 24.0), 0.0 )
-         controlPoint1:NSMakePoint( vw, 11.0 )
-         controlPoint2:NSMakePoint( (vw - 11.0), 0.0 )];  //  bottom-right curve
-    [_path lineToPoint:NSMakePoint( 24.0, 0.0 )];          //  bottom line
-    [_path curveToPoint:NSMakePoint( 0.0, 24.0 )
-         controlPoint1:NSMakePoint( 11.0, 0.0 )
-         controlPoint2:NSMakePoint( 0.0, 11.0 )];         //  bottom-left curve
-    [_path closePath];                                                                   //  left line
+    [path moveToPoint:pointA];                         //  first point
+    [path appendBezierPathWithArcWithCenter:ctrAB      //  bottom-left curve
+                                     radius:24.0
+                                 startAngle:90.0
+                                   endAngle:180.0];
+    [path lineToPoint:pointC];                         //  left line
+    [path appendBezierPathWithArcWithCenter:ctrCD      //  top-left curve
+                                     radius:24.0
+                                 startAngle:180.0
+                                   endAngle:270.0];
+    [path lineToPoint:pointE];                         //  top line
+    [path appendBezierPathWithArcWithCenter:ctrEF      //  top-right curve
+                                     radius:24.0
+                                 startAngle:270.0
+                                   endAngle:0.0];
+    [path lineToPoint:pointG];                         //  right line
+    [path appendBezierPathWithArcWithCenter:ctrGH      //  bottom-right curve
+                                     radius:24.0
+                                 startAngle:0.0
+                                   endAngle:90.0];
+    [path lineToPoint:pointA];                         //  right line
 
     [[NSColor colorWithCalibratedWhite:0.0 alpha:0.15] set];
     [_path fill];

diff --git a/Showcase/Controller.m b/Showcase/Controller.m
index 5b655a6..df393b0 100755 (executable)
--- a/Showcase/Controller.m
+++ b/Showcase/Controller.m
@@ -192,7 +192,7 @@
     // Setup the Window, and remove all its contentview's subviews.
     windowWidth  = ( SW_PAD + imageWidth + SW_SPACE + textWidth + SW_PAD );
     windowHeight = ( SW_PAD + contentHeight + SW_PAD );
-    [statusWindow setFrame:NSMakeRect(SW_BORDER, SW_BORDER, windowWidth, windowHeight) display:YES];
+    [statusWindow setFrame:NSMakeRect(SW_BORDER, SW_BORDER, windowWidth, windowHeight) display:YES animate:YES];
     [[[statusWindow contentView] subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)];
     
     // Setup, position, fill, and add the image view to the content view.