From 10df31cbf977e73e47326f2388eab2f80d86ed95 Mon Sep 17 00:00:00 2001
From: Klaas Pieter Annema <klaaspieter@annema.me>
Date: Tue, 22 Jun 2010 07:47:30 +0200
Subject: [PATCH 01/41] made isEqual: work on CPIndexSet and updated unit tests

---
 Foundation/CPIndexSet.j           | 11 +++++++++++
 Tests/Foundation/CPIndexSetTest.j | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/Foundation/CPIndexSet.j b/Foundation/CPIndexSet.j
index 266c7273e..9975c0e11 100644
--- a/Foundation/CPIndexSet.j
+++ b/Foundation/CPIndexSet.j
@@ -130,6 +130,17 @@
     return self;
 }
 
+- (BOOL)isEqual:(id)anObject
+{
+    if (self === anObject)
+        return YES;
+
+    if (![anObject isKindOfClass:[CPIndexSet class]])
+        return NO;
+
+    return [self isEqualToIndexSet:anObject];
+}
+
 // Querying an Index Set
 /*!
     Compares the receiver with the provided index set.
diff --git a/Tests/Foundation/CPIndexSetTest.j b/Tests/Foundation/CPIndexSetTest.j
index c38778903..b63ff8cf9 100644
--- a/Tests/Foundation/CPIndexSetTest.j
+++ b/Tests/Foundation/CPIndexSetTest.j
@@ -368,6 +368,26 @@ function descriptionWithoutEntity(aString)
     [self assertTrue:[_set containsIndexes:[CPIndexSet indexSetWithIndexesInRange:startRange]]];
 }
 
+- (void)testIsEqual
+{
+    var differentSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(10, 11)],
+        equalSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(10, 10)];
+
+    [self assertFalse:[_set isEqual:differentSet]];
+    [self assertTrue:[_set isEqual:equalSet]];
+    [self assertTrue:[_set isEqual:_set]];
+}
+
+- (void)testIsEqualToIndexSet
+{
+    var differentSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(10, 11)],
+        equalSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(10, 10)];
+
+    [self assertFalse:[_set isEqualToIndexSet:differentSet]];
+    [self assertTrue:[_set isEqualToIndexSet:equalSet]];
+    [self assertTrue:[_set isEqualToIndexSet:_set]];
+}
+
 - (void)tearDown
 {
     _set = nil;

From 6b132c4d3b7eb44daae513001abf27a09fc7fc61 Mon Sep 17 00:00:00 2001
From: Klaas Pieter Annema <klaaspieter@annema.me>
Date: Wed, 30 Jun 2010 11:15:38 +0200
Subject: [PATCH 02/41] added check for nil in CPIndexSet isEqual

---
 Foundation/CPIndexSet.j           | 2 +-
 Tests/Foundation/CPIndexSetTest.j | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Foundation/CPIndexSet.j b/Foundation/CPIndexSet.j
index 9975c0e11..af528b169 100644
--- a/Foundation/CPIndexSet.j
+++ b/Foundation/CPIndexSet.j
@@ -135,7 +135,7 @@
     if (self === anObject)
         return YES;
 
-    if (![anObject isKindOfClass:[CPIndexSet class]])
+    if (!anObject || ![anObject isKindOfClass:[CPIndexSet class]])
         return NO;
 
     return [self isEqualToIndexSet:anObject];
diff --git a/Tests/Foundation/CPIndexSetTest.j b/Tests/Foundation/CPIndexSetTest.j
index b63ff8cf9..49e3194df 100644
--- a/Tests/Foundation/CPIndexSetTest.j
+++ b/Tests/Foundation/CPIndexSetTest.j
@@ -373,6 +373,7 @@ function descriptionWithoutEntity(aString)
     var differentSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(10, 11)],
         equalSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(10, 10)];
 
+    [self assertFalse:[_set isEqual:nil]];
     [self assertFalse:[_set isEqual:differentSet]];
     [self assertTrue:[_set isEqual:equalSet]];
     [self assertTrue:[_set isEqual:_set]];

From 914175de70921f31a4b092a950522fa27c27ed40 Mon Sep 17 00:00:00 2001
From: Klaas Pieter Annema <klaaspieter@annema.me>
Date: Mon, 12 Jul 2010 15:41:00 +0200
Subject: [PATCH 03/41] If CPValueTransformerNameBindingOption contains an
 existing class, allocate and use it in CPKeyValueBinding

---
 AppKit/CPKeyValueBinding.j | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/AppKit/CPKeyValueBinding.j b/AppKit/CPKeyValueBinding.j
index a926cdd2b..89fd10c13 100644
--- a/AppKit/CPKeyValueBinding.j
+++ b/AppKit/CPKeyValueBinding.j
@@ -181,7 +181,22 @@ var CPBindingOperationAnd = 0,
         valueTransformer;
 
     if (valueTransformerName)
+    {
+        if (valueTransformerName === @"ESIsEmptyIndexSetValueTransformer")
+            debugger;
+
         valueTransformer = [CPValueTransformer valueTransformerForName:valueTransformerName];
+
+        if (!valueTransformer)
+        {
+            var valueTransformerClass = CPClassFromString(valueTransformerName);
+            if (valueTransformerClass)
+            {
+                valueTransformer = [[valueTransformerClass alloc] init];
+                [valueTransformerClass setValueTransformer:valueTransformer forName:valueTransformerName];
+            }
+        }
+    }
     else
         valueTransformer = [options objectForKey:CPValueTransformerBindingOption];
 

From c17a3533ecae63d479b285b23ac3a490ebe8bd3c Mon Sep 17 00:00:00 2001
From: Klaas Pieter Annema <klaaspieter@annema.me>
Date: Tue, 20 Jul 2010 14:59:18 +0200
Subject: [PATCH 04/41] fix #764

Array controller inserts object in wrong arranged object position if there are no sort descriptors defined
---
 AppKit/CPArrayController.j | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/AppKit/CPArrayController.j b/AppKit/CPArrayController.j
index c11206f79..72aab18f4 100644
--- a/AppKit/CPArrayController.j
+++ b/AppKit/CPArrayController.j
@@ -400,16 +400,23 @@
 
     if (_filterPredicate === nil || [_filterPredicate evaluateWithObject:object])
     {
-        var pos = [_arrangedObjects insertObject:object inArraySortedByDescriptors:_sortDescriptors];
+        var position;
+        if ([_sortDescriptors count] > 0)
+             position = [_arrangedObjects insertObject:object inArraySortedByDescriptors:_sortDescriptors];
+        else
+        {
+            [_arrangedObjects addObject:object];
+            position = [_arrangedObjects count] - 1;
+        }
 
         if (_selectsInsertedObjects)
         {
-            [self setSelectionIndex:pos];
+            [self setSelectionIndex:position];
         }
         else
         {
             [self willChangeValueForKey:@"selectionIndexes"];
-            [_selectionIndexes shiftIndexesStartingAtIndex:pos by:1];
+            [_selectionIndexes shiftIndexesStartingAtIndex:position by:1];
             [self didChangeValueForKey:@"selectionIndexes"];
         }
     }

From 138888e6201d4efee04e55b159dac6122c341895 Mon Sep 17 00:00:00 2001
From: Klaas Pieter Annema <klaaspieter@annema.me>
Date: Mon, 26 Jul 2010 14:04:05 +0200
Subject: [PATCH 05/41] implement CPArrayController
 insertObject:atArrangedObjectIndex:

---
 AppKit/CPArrayController.j | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/AppKit/CPArrayController.j b/AppKit/CPArrayController.j
index c11206f79..fed04b4b1 100644
--- a/AppKit/CPArrayController.j
+++ b/AppKit/CPArrayController.j
@@ -417,6 +417,33 @@
         [self rearrangeObjects];
 }
 
+- (void)insertObject:(id)anObject atArrangedObjectIndex:(int)anIndex
+{
+    if (![self canAdd])
+        return;
+
+    [self willChangeValueForKey:@"content"];
+    [_contentObject insertObject:anObject atIndex:anIndex];
+    [self didChangeValueForKey:@"content"];
+
+    if (_clearsFilterPredicateOnInsertion)
+        [self setFilterPredicate:nil];
+
+    [[self arrangedObjects] insertObject:anObject atIndex:anIndex];
+
+    if ([self selectsInsertedObjects])
+        [self setSelectionIndex:anIndex];
+    else
+    {
+        [self willChangeValueForKey:@"selectionIndexes"]
+        [[self selectionIndexes] shiftIndexesStartingAtIndex:anIndex by:1];
+        [self didChangeValueForKey:@"selectionIndexes"];
+    }
+
+    if ([self avoidsEmptySelection] && [[self selectionIndexes] count] <= 0 && [_contentObject count] > 0)
+        [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:0]];
+}
+
 - (void)removeObject:(id)object
 {
     if (![self canRemove])

From bb3c08ce0ba6b6a52164c131b6d22b02e39f74e1 Mon Sep 17 00:00:00 2001
From: Klaas Pieter Annema <klaaspieter@annema.me>
Date: Mon, 26 Jul 2010 14:04:26 +0200
Subject: [PATCH 06/41] add CPArrayController test

---
 Tests/AppKit/CPArrayControllerTest.j | 86 ++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 Tests/AppKit/CPArrayControllerTest.j

diff --git a/Tests/AppKit/CPArrayControllerTest.j b/Tests/AppKit/CPArrayControllerTest.j
new file mode 100644
index 000000000..4ea774920
--- /dev/null
+++ b/Tests/AppKit/CPArrayControllerTest.j
@@ -0,0 +1,86 @@
+@implementation CPArrayControllerTest : OJTestCase
+{
+    CPArrayController                           _arrayController @accessors(property=arrayController);
+    CPArray                                     _contentArray @accessors(property=contentArray);
+}
+
+- (void)setUp
+{
+    _contentArray = [];
+
+    [_contentArray addObject:[Person personWithName:@"Francisco" age:21]];
+    [_contentArray addObject:[Person personWithName:@"Ross" age:30]];
+    [_contentArray addObject:[Person personWithName:@"Tom" age:15]];
+
+    _arrayController = [[CPArrayController alloc] initWithContent:[self contentArray]];
+}
+
+- (void)testInitWithContent
+{
+    [self assert:[self contentArray] equals:[[self arrayController] contentArray]];
+    [self assert:[_CPObservableArray class] equals:[[[self arrayController] arrangedObjects] class]];
+}
+
+- (void)testSetContent
+{
+    otherContent = [@"5", @"6"];
+    [[self arrayController] setContent:otherContent];
+
+    [self assert:otherContent equals:[[self arrayController] contentArray]];
+    [self assert:[_CPObservableArray class] equals:[[[self arrayController] arrangedObjects] class]];
+}
+
+- (void)testInsertObjectAtArrangedObjectIndex
+{
+    var object = [Person personWithName:@"Klaas Pieter" age:24],
+        arrayController = [self arrayController];
+
+    [arrayController setSortDescriptors:[[CPSortDescriptor sortDescriptorWithKey:@"age" ascending:YES]]];
+    [arrayController insertObject:object atArrangedObjectIndex:1];
+
+    [self assert:object equals:[[arrayController arrangedObjects] objectAtIndex:1]];
+}
+
+- (void)testContentBinding
+{
+    [[self arrayController] bind:@"contentArray" toObject:self withKeyPath:@"contentArray" options:0];
+
+    [self assert:[[self arrayController] contentArray] equals:[self contentArray]];
+    
+    [[self mutableArrayValueForKey:@"contentArray"] addObject:@"4"];
+    [self assert:[self contentArray] equals:[[self arrayController] contentArray]];
+
+    [[self arrayController] insertObject:@"2" atArrangedObjectIndex:1];
+    [self assert:[[self arrayController] contentArray] equals:[self contentArray]];
+}
+
+@end
+
+@implementation Person : CPObject
+{
+    CPString                    _name @accessors(property=name);
+    int                         _age @accessors(property=age);
+}
+
++ (id)personWithName:(CPString)aName age:(int)anAge
+{
+    return [[self alloc] initWithName:aName age:anAge];
+}
+
+- (id)initWithName:(CPString)aName age:(int)anAge
+{
+    if (self = [super init])
+    {
+        _name = aName;
+        _age = anAge;
+    }
+
+    return self;
+}
+
+- (CPString)description
+{
+    return [CPString stringWithFormat:@"%@ : %@", [self name], [self age]];
+}
+
+@end
\ No newline at end of file

From 4f946f267ef7a4c94a05dd88acdc41a8ade2ba19 Mon Sep 17 00:00:00 2001
From: Klaas Pieter Annema <klaaspieter@annema.me>
Date: Mon, 26 Jul 2010 18:34:13 +0200
Subject: [PATCH 07/41] fix CPArrayController removeObject:

removeObject: only shifted the selection, it never actually removes the object
---
 AppKit/CPArrayController.j | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/AppKit/CPArrayController.j b/AppKit/CPArrayController.j
index c11206f79..ad40efcd2 100644
--- a/AppKit/CPArrayController.j
+++ b/AppKit/CPArrayController.j
@@ -426,12 +426,14 @@
    [_contentObject removeObject:object];
    [self didChangeValueForKey:@"content"];
 
-   if ([_filterPredicate evaluateWithObject:object])
+   if (_filterPredicate === nil || [_filterPredicate evaluateWithObject:object])
    {
         [self willChangeValueForKey:@"selectionIndexes"];
         var pos = [_arrangedObjects indexOfObject:object];
 
+        [_arrangedObjects removeObjectAtIndex:pos];
         [_selectionIndexes shiftIndexesStartingAtIndex:pos by:-1];
+
         [self didChangeValueForKey:@"selectionIndexes"];
    }
 }

From b9c2becd3e6e9eb1ed82e37d440fc6a528e19af0 Mon Sep 17 00:00:00 2001
From: Klaas Pieter Annema <klaaspieter@annema.me>
Date: Tue, 27 Jul 2010 09:09:59 +0200
Subject: [PATCH 08/41] implement CPIndexSet isEqual:

---
 Foundation/CPIndexSet.j | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Foundation/CPIndexSet.j b/Foundation/CPIndexSet.j
index 266c7273e..af528b169 100644
--- a/Foundation/CPIndexSet.j
+++ b/Foundation/CPIndexSet.j
@@ -130,6 +130,17 @@
     return self;
 }
 
+- (BOOL)isEqual:(id)anObject
+{
+    if (self === anObject)
+        return YES;
+
+    if (!anObject || ![anObject isKindOfClass:[CPIndexSet class]])
+        return NO;
+
+    return [self isEqualToIndexSet:anObject];
+}
+
 // Querying an Index Set
 /*!
     Compares the receiver with the provided index set.

From 48a5d55af714a89f88269a4ced9828c1e03fcd4f Mon Sep 17 00:00:00 2001
From: Klaas Pieter Annema <klaaspieter@annema.me>
Date: Tue, 27 Jul 2010 09:10:41 +0200
Subject: [PATCH 09/41] fix CPArrayController selectPrevious: and selectNext:

Also added unit-tests for canSelectPrevious, canSelectNext, selectPrevious: and selectNext:
---
 AppKit/CPArrayController.j           | 24 +++++------
 Tests/AppKit/CPArrayControllerTest.j | 59 ++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/AppKit/CPArrayController.j b/AppKit/CPArrayController.j
index a799b296d..189485a8c 100644
--- a/AppKit/CPArrayController.j
+++ b/AppKit/CPArrayController.j
@@ -358,29 +358,29 @@
 
 //Moving selection
 
--(BOOL)canSelectPrevious
+- (BOOL)canSelectPrevious
 {
     return [[self selectionIndexes] firstIndex] > 0
 }
 
--(BOOL)canSelectNext
+-(void)selectPrevious:(id)sender
 {
-    return [[self selectionIndexes] firstIndex] < [[self arrangedObjects] count] -1;
-}
+    var index = [[self selectionIndexes] firstIndex] - 1;
 
--(void)selectNext:(id)sender
-{
-    var index = [[self selectionIndexes] firstIndex] + 1 || 0;
-
-    if (index < [[self arrangedObjects] count])
+    if (index >= 0)
         [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:index]];
 }
 
--(void)selectPrevious:(id)sender
+- (BOOL)canSelectNext
 {
-    var index = [[self selectionIndexes] firstIndex] - 1 || [[self arrangedObjects] count] - 1;
+    return [[self selectionIndexes] firstIndex] < [[self arrangedObjects] count] - 1;
+}
 
-    if (index >= 0)
+- (void)selectNext:(id)sender
+{
+    var index = [[self selectionIndexes] firstIndex] + 1;
+
+    if (index < [[self arrangedObjects] count])
         [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:index]];
 }
 
diff --git a/Tests/AppKit/CPArrayControllerTest.j b/Tests/AppKit/CPArrayControllerTest.j
index 4ea774920..532771848 100644
--- a/Tests/AppKit/CPArrayControllerTest.j
+++ b/Tests/AppKit/CPArrayControllerTest.j
@@ -41,6 +41,65 @@
     [self assert:object equals:[[arrayController arrangedObjects] objectAtIndex:1]];
 }
 
+- (void)testSelectPrevious
+{
+    var arrayController = [self arrayController];
+
+    // Selection index: 1
+    [arrayController setSelectionIndexes:[CPIndexSet indexSetWithIndex:1]];
+    [self assertTrue:[arrayController canSelectPrevious] message:@"index > 0; canSelectPrevious should return YES"]
+
+    [arrayController selectPrevious:self];
+    [self assert:[CPIndexSet indexSetWithIndex:0] equals:[arrayController selectionIndexes]];
+
+    // Selection index: 0
+    [self assertFalse:[arrayController canSelectPrevious] message:@"index <= 0; canSelectPrevious should return NO"];
+
+    [arrayController selectPrevious:self];
+    [self assert:[CPIndexSet indexSetWithIndex:0] equals:[arrayController selectionIndexes]];
+}
+
+- (void)testSelectNext
+{
+    var arrayController = [self arrayController],
+        count = [[arrayController arrangedObjects] count];
+
+    // Selection index: count - 2
+    [arrayController setSelectionIndexes:[CPIndexSet indexSetWithIndex:count - 2]];
+    [self assertTrue:[arrayController canSelectNext] message:@"index < (count - 1); canSelectNext should return YES"];
+
+    [arrayController selectNext:self];
+    [self assert:[CPIndexSet indexSetWithIndex:count - 1] equals:[arrayController selectionIndexes]];
+
+    // Selection index: count - 1
+    [self assertFalse:[arrayController canSelectNext] message:@"index >= (count - 1) canSelectNext should return NO"];
+
+    [arrayController selectNext:self];
+    [self assert:[CPIndexSet indexSetWithIndex:count - 1] equals:[arrayController selectionIndexes]];
+}
+// - (void)testSelectNext
+// {
+//     var arrayController = [self arrayController],
+//         arrangedObjects = [arrayController arrangedObjects],
+//         startIndex = 0,
+//         selectionIndexes = [CPIndexSet indexSetWithIndex:startIndex];
+// 
+//     [arrayController setSelectionIndexes:selectionIndexes];
+//     [arrayController selectNext:self];
+// 
+//     [selectionIndexes shiftIndexesStartingAtIndex:startIndex by:1]
+//     [self assert:selectionIndexes equals:[arrayController selectionIndexes]];
+// 
+//     // Test that the selection wraps around
+//     startIndex = [arrangedObjects count] - 1;
+//     selectionIndexes = [CPIndexSet indexSetWithIndex:startIndex];
+// 
+//     [arrayController setSelectionIndexes:selectionIndexes];
+//     [arrayController selectNext:self];
+// 
+//     [self assert:[CPIndexSet indexSetWithIndex:0] equals:[arrayController selectionIndexes]];
+// }
+
 - (void)testContentBinding
 {
     [[self arrayController] bind:@"contentArray" toObject:self withKeyPath:@"contentArray" options:0];

From 75ceeffab8068b4d136a6af8ccc575bb24a8abd5 Mon Sep 17 00:00:00 2001
From: Klaas Pieter Annema <klaaspieter@annema.me>
Date: Wed, 28 Jul 2010 13:28:53 +0200
Subject: [PATCH 10/41] remove commented code from CPArrayControllerTest

---
 Tests/AppKit/CPArrayControllerTest.j | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/Tests/AppKit/CPArrayControllerTest.j b/Tests/AppKit/CPArrayControllerTest.j
index 532771848..c7bf08a96 100644
--- a/Tests/AppKit/CPArrayControllerTest.j
+++ b/Tests/AppKit/CPArrayControllerTest.j
@@ -77,28 +77,6 @@
     [arrayController selectNext:self];
     [self assert:[CPIndexSet indexSetWithIndex:count - 1] equals:[arrayController selectionIndexes]];
 }
-// - (void)testSelectNext
-// {
-//     var arrayController = [self arrayController],
-//         arrangedObjects = [arrayController arrangedObjects],
-//         startIndex = 0,
-//         selectionIndexes = [CPIndexSet indexSetWithIndex:startIndex];
-// 
-//     [arrayController setSelectionIndexes:selectionIndexes];
-//     [arrayController selectNext:self];
-// 
-//     [selectionIndexes shiftIndexesStartingAtIndex:startIndex by:1]
-//     [self assert:selectionIndexes equals:[arrayController selectionIndexes]];
-// 
-//     // Test that the selection wraps around
-//     startIndex = [arrangedObjects count] - 1;
-//     selectionIndexes = [CPIndexSet indexSetWithIndex:startIndex];
-// 
-//     [arrayController setSelectionIndexes:selectionIndexes];
-//     [arrayController selectNext:self];
-// 
-//     [self assert:[CPIndexSet indexSetWithIndex:0] equals:[arrayController selectionIndexes]];
-// }
 
 - (void)testContentBinding
 {

From ff98a9be5a011a8c754455c383e0503dd6b869d4 Mon Sep 17 00:00:00 2001
From: Klaas Pieter Annema <klaaspieter@annema.me>
Date: Wed, 28 Jul 2010 15:02:48 +0200
Subject: [PATCH 11/41] fix preserve selection in removeObjects and added unit
 test

---
 AppKit/CPArrayController.j           |  31 +++++-
 Tests/AppKit/CPArrayControllerTest.j | 153 +++++++++++++++++++++++++++
 2 files changed, 179 insertions(+), 5 deletions(-)
 create mode 100644 Tests/AppKit/CPArrayControllerTest.j

diff --git a/AppKit/CPArrayController.j b/AppKit/CPArrayController.j
index 4953c3016..3830758db 100644
--- a/AppKit/CPArrayController.j
+++ b/AppKit/CPArrayController.j
@@ -489,13 +489,34 @@
 
 - (void)_removeObjects:(CPArray)objects
 {
-    var contentArray = [self contentArray],
-        count = [objects count];
+    [self willChangeValueForKey:@"content"];
+    [_contentObject removeObjectsInArray:objects];
+    [self didChangeValueForKey:@"content"];
 
-    for (var i=0; i<count; i++)
-        [contentArray removeObject:[objects objectAtIndex:i]];
+    var arrangedObjects = [self arrangedObjects],
+        position = [arrangedObjects indexOfObject:[objects objectAtIndex:0]];
 
-    [self setContent:contentArray];
+    [arrangedObjects removeObjectsInArray:objects];
+
+    var objectsCount = [arrangedObjects count],
+        selectionIndexes = [CPIndexSet indexSet];
+
+    if ([self preservesSelection] || [self avoidsEmptySelection])
+    {
+        selectionIndexes = [CPIndexSet indexSetWithIndex:position];
+
+        // Remove the selection if there are no objects
+        if (objectsCount <= 0)
+            selectionIndexes = [CPIndexSet indexSet];
+
+        // Shift selection to last object if position is out of bounds
+        else if (position >= objectsCount)
+            selectionIndexes = [CPIndexSet indexSetWithIndex:objectsCount - 1];
+     }
+
+     [self willChangeValueForKey:@"selectionIndexes"];
+     _selectionIndexes = selectionIndexes;
+     [self didChangeValueForKey:@"selectionIndexes"];
 }
 
 - (BOOL)canInsert
diff --git a/Tests/AppKit/CPArrayControllerTest.j b/Tests/AppKit/CPArrayControllerTest.j
new file mode 100644
index 000000000..dd2415e56
--- /dev/null
+++ b/Tests/AppKit/CPArrayControllerTest.j
@@ -0,0 +1,153 @@
+@implementation CPArrayControllerTest : OJTestCase
+{
+    CPArrayController                           _arrayController @accessors(property=arrayController);
+    CPArray                                     _contentArray @accessors(property=contentArray);
+}
+
+- (void)setUp
+{
+    _contentArray = [];
+
+    [_contentArray addObject:[Person personWithName:@"Francisco" age:21]];
+    [_contentArray addObject:[Person personWithName:@"Ross" age:30]];
+    [_contentArray addObject:[Person personWithName:@"Tom" age:15]];
+
+    _arrayController = [[CPArrayController alloc] initWithContent:[self contentArray]];
+}
+
+- (void)testInitWithContent
+{
+    [self assert:[self contentArray] equals:[[self arrayController] contentArray]];
+    [self assert:[_CPObservableArray class] equals:[[[self arrayController] arrangedObjects] class]];
+}
+
+- (void)testSetContent
+{
+    otherContent = [@"5", @"6"];
+    [[self arrayController] setContent:otherContent];
+
+    [self assertFalse:otherContent === [[self arrayController] contentArray] message:@"array controller should copy it's content"];
+    [self assert:otherContent equals:[[self arrayController] contentArray]];
+    [self assert:[_CPObservableArray class] equals:[[[self arrayController] arrangedObjects] class]];
+}
+
+- (void)testInsertObjectAtArrangedObjectIndex
+{
+    var object = [Person personWithName:@"Klaas Pieter" age:24],
+        arrayController = [self arrayController];
+
+    [arrayController setSortDescriptors:[[CPSortDescriptor sortDescriptorWithKey:@"age" ascending:YES]]];
+    [arrayController insertObject:object atArrangedObjectIndex:1];
+
+    [self assert:object equals:[[arrayController arrangedObjects] objectAtIndex:1]];
+}
+
+- (void)testSelectPrevious
+{
+    var arrayController = [self arrayController];
+
+    // Selection index: 1
+    [arrayController setSelectionIndexes:[CPIndexSet indexSetWithIndex:1]];
+    [self assertTrue:[arrayController canSelectPrevious] message:@"index > 0; canSelectPrevious should return YES"]
+
+    [arrayController selectPrevious:self];
+    [self assert:[CPIndexSet indexSetWithIndex:0] equals:[arrayController selectionIndexes]];
+
+    // Selection index: 0
+    [self assertFalse:[arrayController canSelectPrevious] message:@"index <= 0; canSelectPrevious should return NO"];
+
+    [arrayController selectPrevious:self];
+    [self assert:[CPIndexSet indexSetWithIndex:0] equals:[arrayController selectionIndexes]];
+}
+
+- (void)testSelectNext
+{
+    var arrayController = [self arrayController],
+        count = [[arrayController arrangedObjects] count];
+
+    // Selection index: count - 2
+    [arrayController setSelectionIndexes:[CPIndexSet indexSetWithIndex:count - 2]];
+    [self assertTrue:[arrayController canSelectNext] message:@"index < (count - 1); canSelectNext should return YES"];
+
+    [arrayController selectNext:self];
+    [self assert:[CPIndexSet indexSetWithIndex:count - 1] equals:[arrayController selectionIndexes]];
+
+    // Selection index: count - 1
+    [self assertFalse:[arrayController canSelectNext] message:@"index >= (count - 1) canSelectNext should return NO"];
+
+    [arrayController selectNext:self];
+    [self assert:[CPIndexSet indexSetWithIndex:count - 1] equals:[arrayController selectionIndexes]];
+}
+
+- (void)testRemoveObjects
+{
+    var arrayController = [self arrayController];
+    [arrayController setPreservesSelection:NO];
+
+    [arrayController setSelectionIndexes:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(1, 2)]];
+    [arrayController removeObjects:[arrayController selectedObjects]]
+
+    [self assert:[CPIndexSet indexSet] equals:[arrayController selectionIndexes]
+         message:@"selection should be empty if arraycontroller doesn't preserve selection"];
+
+    arrayController = [[CPArrayController alloc] initWithContent:[self contentArray]];
+    [arrayController setPreservesSelection:YES];
+    print([self contentArray]);
+
+    // Remove from middle
+    var selectionIndexes = [CPIndexSet indexSetWithIndex:1];
+    [arrayController setSelectionIndexes:selectionIndexes];
+    [arrayController removeObjects:[arrayController selectedObjects]];
+    [self assert:selectionIndexes equals:[arrayController selectionIndexes] message:@"selection should stay the same"];
+
+    // Remove from end
+    [arrayController removeObjects:[[[arrayController content] objectAtIndex:1]]];
+    [self assert:[CPIndexSet indexSetWithIndex:0] equals:[arrayController selectionIndexes] 
+         message:@"last object removed; selection should shift to first available index"];
+    
+    // Remove from all
+    [arrayController removeObjects:[[[arrayController content] objectAtIndex:0]]];
+    [self assert:[CPIndexSet indexSet] equals:[arrayController selectionIndexes] message:@"no objects left, selection should disappear"];
+}
+
+- (void)testContentBinding
+{
+    [[self arrayController] bind:@"contentArray" toObject:self withKeyPath:@"contentArray" options:0];
+
+    [self assert:[[self arrayController] contentArray] equals:[self contentArray]];
+    
+    [[self mutableArrayValueForKey:@"contentArray"] addObject:@"4"];
+    [self assert:[self contentArray] equals:[[self arrayController] contentArray] 
+         message:@"object 4 was added; contentArray should reflect this"];
+}
+
+@end
+
+@implementation Person : CPObject
+{
+    CPString                    _name @accessors(property=name);
+    int                         _age @accessors(property=age);
+}
+
++ (id)personWithName:(CPString)aName age:(int)anAge
+{
+    return [[self alloc] initWithName:aName age:anAge];
+}
+
+- (id)initWithName:(CPString)aName age:(int)anAge
+{
+    if (self = [super init])
+    {
+        _name = aName;
+        _age = anAge;
+    }
+
+    return self;
+}
+
+- (CPString)description
+{
+    return [CPString stringWithFormat:@"%@ : %@", [self name], [self age]];
+}
+
+@end
\ No newline at end of file

From 1a9670ae9cf755b8e2cb6a6950dfd8c5e197d413 Mon Sep 17 00:00:00 2001
From: Klaas Pieter Annema <klaaspieter@annema.me>
Date: Mon, 17 May 2010 12:32:56 +0200
Subject: [PATCH 12/41] made sure CPViewController calls viewDidLoad if it's
 view property is set directly

---
 AppKit/CPViewController.j | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/AppKit/CPViewController.j b/AppKit/CPViewController.j
index 3fffe261d..ab8c3a22e 100644
--- a/AppKit/CPViewController.j
+++ b/AppKit/CPViewController.j
@@ -162,8 +162,6 @@ var CPViewControllerCachedCibs;
 
         if ([cibOwner respondsToSelector:@selector(viewControllerDidLoadCib:)])
             [cibOwner viewControllerDidLoadCib:self];
-
-        [self viewDidLoad];
     }
 
     return _view;
@@ -189,7 +187,13 @@ var CPViewControllerCachedCibs;
 */
 - (void)setView:(CPView)aView
 {
+    var viewWasLoaded = !_view;
+
     _view = aView;
+
+    // Make sure the viewDidLoad method is called if the view is set directly
+    if (viewWasLoaded)
+        [self viewDidLoad];
 }
 
 @end

From c8515225366bdf8daf91a8799854fd04ea57b771 Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Thu, 12 Aug 2010 23:12:14 -0400
Subject: [PATCH 13/41] Fixed: if the CPWebView iframe was destroyed before its
 HTML loader timer fired, an error would occur.

---
 AppKit/CPWebView.j | 91 +++++++++++++++++++++++-----------------------
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/AppKit/CPWebView.j b/AppKit/CPWebView.j
index bf36a7773..dca2637ab 100644
--- a/AppKit/CPWebView.j
+++ b/AppKit/CPWebView.j
@@ -50,23 +50,23 @@ CPWebViewScrollNative                           = 2;
 {
     CPScrollView    _scrollView;
     CPView          _frameView;
-    
+
     IFrame      _iframe;
     CPString    _mainFrameURL;
     CPArray     _backwardStack;
     CPArray     _forwardStack;
-    
+
     BOOL        _ignoreLoadStart;
     BOOL        _ignoreLoadEnd;
-    
+
     id          _downloadDelegate;
     id          _frameLoadDelegate;
     id          _policyDelegate;
     id          _resourceLoadDelegate;
     id          _UIDelegate;
-    
+
     CPWebScriptObject _wso;
-    
+
     CPString    _url;
     CPString    _html;
 
@@ -95,10 +95,10 @@ CPWebViewScrollNative                           = 2;
         _backwardStack  = [];
         _forwardStack   = [];
         _scrollMode     = CPWebViewScrollNative;
-        
+
         [self _initDOMWithFrame:aFrame];
     }
-    
+
     return self;
 }
 
@@ -106,52 +106,52 @@ CPWebViewScrollNative                           = 2;
 {
     _ignoreLoadStart = YES;
     _ignoreLoadEnd  = YES;
-    
+
     _iframe = document.createElement("iframe");
     _iframe.name = "iframe_" + Math.floor(Math.random()*10000);
     _iframe.style.width = "100%";
     _iframe.style.height = "100%";
     _iframe.style.borderWidth = "0px";
     _iframe.frameBorder = "0";
-    
+
     [self setDrawsBackground:YES];
-    
+
     _loadCallback = function() {
 	    // HACK: this block handles the case where we don't know about loads initiated by the user clicking a link
 	    if (!_ignoreLoadStart)
 	    {
 	        // post the start load notification
 	        [self _startedLoading];
-	        
+
 	        if (_mainFrameURL)
 	            [_backwardStack addObject:_mainFrameURL];
-	            
+
 	        // FIXME: this doesn't actually get the right URL for different domains. Not possible due to browser security restrictions.
             _mainFrameURL = _iframe.src;
             _mainFrameURL = _iframe.src;
-            
+
             // clear the forward
 	        [_forwardStack removeAllObjects];
 	    }
 	    else
             _ignoreLoadStart = NO;
-	    
+
 	    if (!_ignoreLoadEnd)
 	    {
             [self _finishedLoading];
 	    }
 	    else
 	        _ignoreLoadEnd = NO;
-        
+
         [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
 	}
-	
+
 	if (_iframe.addEventListener)
 	    _iframe.addEventListener("load", _loadCallback, false);
 	else if (_iframe.attachEvent)
 		_iframe.attachEvent("onload", _loadCallback);
-	
-	
+
+
     _frameView = [[CPView alloc] initWithFrame:[self bounds]];
     [_frameView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
 
@@ -159,9 +159,9 @@ CPWebViewScrollNative                           = 2;
     [_scrollView setAutohidesScrollers:YES];
     [_scrollView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
     [_scrollView setDocumentView:_frameView];
-	
+
     _frameView._DOMElement.appendChild(_iframe);
-    
+
     [self _setScrollMode:_scrollMode];
 
     [self addSubview:_scrollView];
@@ -169,7 +169,7 @@ CPWebViewScrollNative                           = 2;
 
 
 - (void)setFrameSize:(CPSize)aSize
-{   
+{
     [super setFrameSize:aSize];
     [self _resizeWebFrame];
 }
@@ -211,7 +211,7 @@ CPWebViewScrollNative                           = 2;
         {
             var visibleRect = [_frameView visibleRect];
             [_frameView setFrameSize:CGSizeMake(CGRectGetMaxX(visibleRect), CGRectGetMaxY(visibleRect))];
-            
+
             // try to get the document size so we can correctly set the frame
             var win = null;
             try { win = [self DOMWindow]; } catch (e) {}
@@ -229,7 +229,7 @@ CPWebViewScrollNative                           = 2;
             else
             {
                 CPLog.warn("using default size 800*1600");
-            
+
                 [_frameView setFrameSize:CGSizeMake(800, 1600)];
             }
 
@@ -242,7 +242,7 @@ CPWebViewScrollNative                           = 2;
 {
     if (_scrollMode == aScrollMode)
         return;
-        
+
     [self _setScrollMode:aScrollMode];
 }
 
@@ -252,7 +252,7 @@ CPWebViewScrollNative                           = 2;
         _scrollMode = CPWebViewScrollNative;
     else
         _scrollMode = aScrollMode;
-        
+
     _ignoreLoadStart = YES;
     _ignoreLoadEnd  = YES;
 
@@ -263,16 +263,16 @@ CPWebViewScrollNative                           = 2;
     {
         [_scrollView setHasHorizontalScroller:YES];
         [_scrollView setHasVerticalScroller:YES];
-        
+
         _iframe.setAttribute("scrolling", "no");
     }
     else
     {
         [_scrollView setHasHorizontalScroller:NO];
         [_scrollView setHasVerticalScroller:NO];
-        
+
         _iframe.setAttribute("scrolling", "auto");
-        
+
         [_frameView setFrameSize:[_scrollView bounds].size];
     }
 
@@ -293,13 +293,13 @@ CPWebViewScrollNative                           = 2;
     [_frameView setFrameSize:[_scrollView contentSize]];
 
     [self _startedLoading];
-    
+
     _ignoreLoadStart = YES;
     _ignoreLoadEnd = NO;
-    
+
     _url = null;
     _html = aString;
-    
+
     [self _load];
 }
 
@@ -308,13 +308,13 @@ CPWebViewScrollNative                           = 2;
     [self _setScrollMode:CPWebViewScrollNative];
 
     [self _startedLoading];
-    
+
     _ignoreLoadStart = YES;
     _ignoreLoadEnd = NO;
-    
+
     _url = _mainFrameURL;
     _html = null;
-    
+
     [self _load];
 }
 
@@ -335,12 +335,13 @@ CPWebViewScrollNative                           = 2;
             _loadHTMLStringTimer = nil;
         }
 
-        // need to give the browser a chance to reset iframe, otherwise we'll be document.write()-ing the previous document 
+        // need to give the browser a chance to reset iframe, otherwise we'll be document.write()-ing the previous document
         _loadHTMLStringTimer = window.setTimeout(function()
         {
             var win = [self DOMWindow];
-            
-            win.document.write(_html);
+
+            if (win)
+                win.document.write(_html);
 
             window.setTimeout(_loadCallback, 1);
         }, 0);
@@ -372,7 +373,7 @@ CPWebViewScrollNative                           = 2;
 }
 
 - (void)setMainFrameURL:(CPString)URLString
-{    
+{
     if (_mainFrameURL)
         [_backwardStack addObject:_mainFrameURL];
     _mainFrameURL = URLString;
@@ -389,9 +390,9 @@ CPWebViewScrollNative                           = 2;
             [_forwardStack addObject:_mainFrameURL];
         _mainFrameURL = [_backwardStack lastObject];
         [_backwardStack removeLastObject];
-        
+
         [self _loadMainFrameURL];
-        
+
         return YES;
     }
     return NO;
@@ -405,9 +406,9 @@ CPWebViewScrollNative                           = 2;
             [_backwardStack addObject:_mainFrameURL];
         _mainFrameURL = [_forwardStack lastObject];
         [_forwardStack removeLastObject];
-        
+
         [self _loadMainFrameURL];
-        
+
         return YES;
     }
     return NO;
@@ -630,7 +631,7 @@ CPWebViewScrollNative                           = 2;
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super initWithCoder:aCoder];
-    
+
     if (self)
     {
         // FIXME: encode/decode these?
@@ -638,14 +639,14 @@ CPWebViewScrollNative                           = 2;
         _backwardStack  = [];
         _forwardStack   = [];
         _scrollMode     = CPWebViewScrollNative;
-        
+
 #if PLATFORM(DOM)
         [self _initDOMWithFrame:[self frame]];
 #endif
 
         [self setBackgroundColor:[CPColor whiteColor]];
     }
-    
+
     return self;
 }
 

From 494f39dd86cd1598cc3f2577aa7b419633f06d5e Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Thu, 12 Aug 2010 23:37:53 -0400
Subject: [PATCH 14/41] Closes #752. Removed some debug code which snuck in
 with the merge of fix-752-CPValueTransformerNameBindingOption.

---
 AppKit/CPKeyValueBinding.j | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/AppKit/CPKeyValueBinding.j b/AppKit/CPKeyValueBinding.j
index 89fd10c13..1ea547e5d 100644
--- a/AppKit/CPKeyValueBinding.j
+++ b/AppKit/CPKeyValueBinding.j
@@ -182,9 +182,6 @@ var CPBindingOperationAnd = 0,
 
     if (valueTransformerName)
     {
-        if (valueTransformerName === @"ESIsEmptyIndexSetValueTransformer")
-            debugger;
-
         valueTransformer = [CPValueTransformer valueTransformerForName:valueTransformerName];
 
         if (!valueTransformer)

From 0683b46239be4d1c904483c407f53d9c8dc9cc84 Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Fri, 13 Aug 2010 14:18:25 -0400
Subject: [PATCH 15/41] Since issue #795 has not been decided on yet, make
 CPArrayControllerTest pass without those changes at this time.

---
 Tests/AppKit/CPArrayControllerTest.j | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Tests/AppKit/CPArrayControllerTest.j b/Tests/AppKit/CPArrayControllerTest.j
index 2029c51ed..abdb8719c 100644
--- a/Tests/AppKit/CPArrayControllerTest.j
+++ b/Tests/AppKit/CPArrayControllerTest.j
@@ -12,7 +12,8 @@
     [_contentArray addObject:[Person personWithName:@"Ross" age:30]];
     [_contentArray addObject:[Person personWithName:@"Tom" age:15]];
 
-    _arrayController = [[CPArrayController alloc] initWithContent:[self contentArray]];
+    // Copy the array since we'll reuse the original array later. Also see issue #795.
+    _arrayController = [[CPArrayController alloc] initWithContent:[[self contentArray] copy]];
 }
 
 - (void)testInitWithContent
@@ -26,7 +27,8 @@
     otherContent = [@"5", @"6"];
     [[self arrayController] setContent:otherContent];
 
-    [self assertFalse:otherContent === [[self arrayController] contentArray] message:@"array controller should copy it's content"];
+    // This has not been decided on yet. See Issue #795.
+    // [self assertFalse:otherContent === [[self arrayController] contentArray] message:@"array controller should copy it's content"];
     [self assert:otherContent equals:[[self arrayController] contentArray]];
     [self assert:[_CPObservableArray class] equals:[[[self arrayController] arrangedObjects] class]];
 }

From bcb22c7e46853599eb37e290f6597cc45e49b239 Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Fri, 13 Aug 2010 14:28:25 -0400
Subject: [PATCH 16/41] Remove debug output from CPArrayControllerTest.

---
 Tests/AppKit/CPArrayControllerTest.j | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Tests/AppKit/CPArrayControllerTest.j b/Tests/AppKit/CPArrayControllerTest.j
index abdb8719c..d311ccd56 100644
--- a/Tests/AppKit/CPArrayControllerTest.j
+++ b/Tests/AppKit/CPArrayControllerTest.j
@@ -94,7 +94,6 @@
 
     arrayController = [[CPArrayController alloc] initWithContent:[self contentArray]];
     [arrayController setPreservesSelection:YES];
-    print([self contentArray]);
 
     // Remove from middle
     var selectionIndexes = [CPIndexSet indexSetWithIndex:1];

From 4c0057e66af505d10dc5c4b8263f3235e2f96d31 Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Fri, 13 Aug 2010 14:37:26 -0400
Subject: [PATCH 17/41] Undoing this change since it is no longer necessary due
 to an alternative solution implemented by Ross Boucher. Revert "Merge commit
 'c17a3533ecae63d479b285b23ac3a490ebe8bd3c'"

This reverts commit 039f2ce449fe4767ffb5991b76732c7db5794fc4, reversing
changes made to 494f39dd86cd1598cc3f2577aa7b419633f06d5e.
---
 AppKit/CPArrayController.j | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/AppKit/CPArrayController.j b/AppKit/CPArrayController.j
index 6843f79c6..b04f4e0f9 100644
--- a/AppKit/CPArrayController.j
+++ b/AppKit/CPArrayController.j
@@ -407,23 +407,16 @@
 
     if (_filterPredicate === nil || [_filterPredicate evaluateWithObject:object])
     {
-        var position;
-        if ([_sortDescriptors count] > 0)
-             position = [_arrangedObjects insertObject:object inArraySortedByDescriptors:_sortDescriptors];
-        else
-        {
-            [_arrangedObjects addObject:object];
-            position = [_arrangedObjects count] - 1;
-        }
+        var pos = [_arrangedObjects insertObject:object inArraySortedByDescriptors:_sortDescriptors];
 
         if (_selectsInsertedObjects)
         {
-            [self setSelectionIndex:position];
+            [self setSelectionIndex:pos];
         }
         else
         {
             [self willChangeValueForKey:@"selectionIndexes"];
-            [_selectionIndexes shiftIndexesStartingAtIndex:position by:1];
+            [_selectionIndexes shiftIndexesStartingAtIndex:pos by:1];
             [self didChangeValueForKey:@"selectionIndexes"];
         }
     }

From 4eaf560ee62fe83ee73907aca7e231ed7cabfad3 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tom@280north.com>
Date: Fri, 13 Aug 2010 15:34:28 -0700
Subject: [PATCH 18/41] Fixes two bugs in compareObjectsUsingDescriptors
 causing test to fail: extra semi-colon after while() and uninitized "result"
 variable.

The former masked the latter when a single sort descriptor was used.
---
 Foundation/CPArray.j | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Foundation/CPArray.j b/Foundation/CPArray.j
index 14931c0bc..6ee14b6af 100755
--- a/Foundation/CPArray.j
+++ b/Foundation/CPArray.j
@@ -1378,12 +1378,12 @@ var selectorCompare = function selectorCompare(object1, object2, selector)
 // sort using sort descriptors
 var compareObjectsUsingDescriptors= function compareObjectsUsingDescriptors(lhs, rhs, descriptors)
 { 
-    var result,
+    var result = CPOrderedSame,
         i = 0,  
         n = [descriptors count];
         
-    while (i < n && result == CPOrderedSame);
-       result = [descriptors[i++] compareObject:lhs withObject:rhs];
+    while (i < n && result === CPOrderedSame)
+        result = [descriptors[i++] compareObject:lhs withObject:rhs];
     
     return result;
 }

From 6ce45d32dac642923c8d1b6f346ba01ad1bcb1dc Mon Sep 17 00:00:00 2001
From: Tom Robinson <tom@280north.com>
Date: Fri, 13 Aug 2010 15:40:33 -0700
Subject: [PATCH 19/41] Add comparison test for native sorting.

---
 Tests/Foundation/CPArrayPerformanceTest.j | 79 +++++++++++++++++------
 1 file changed, 58 insertions(+), 21 deletions(-)

diff --git a/Tests/Foundation/CPArrayPerformanceTest.j b/Tests/Foundation/CPArrayPerformanceTest.j
index f350e7ff5..e4d014aa5 100644
--- a/Tests/Foundation/CPArrayPerformanceTest.j
+++ b/Tests/Foundation/CPArrayPerformanceTest.j
@@ -3,20 +3,14 @@
 @import <Foundation/CPNumber.j>
 @import <Foundation/CPSortDescriptor.j>
 
+var ELEMENTS = 100,
+    REPEATS = 10;
+
 @implementation CPArrayPerformanceTest : OJTestCase
 
 - (void)testSortUsingDescriptorsSpeed
 {
-
-    var ELEMENTS = 1000,
-        REPEATS = 10,
-        array = [];
-    for (var i=0; i<ELEMENTS; i++) {
-        var s = [Sortable new];
-        [s setA:(i % 5)];
-        [s setB:(ELEMENTS-i)];
-        array.push(s);
-    }
+    var array = [self makeUnsorted];
 
     var descriptors = [
         [CPSortDescriptor sortDescriptorWithKey:"a" ascending:NO],
@@ -28,21 +22,64 @@
     for (var i=0; i<REPEATS; i++)
     {
         var sorted = [array sortedArrayUsingDescriptors:descriptors];
-
-        // Verify it really got sorted.
-        for (var j=0; j<ELEMENTS; j++) {
-            var expectedA = 4-FLOOR(j * 5 / ELEMENTS);
-            if (sorted[j].a != expectedA)
-                [self fail:"a out of order: "+expectedA+" != "+sorted[j].a];
-            var expectedB = (5-expectedA) + 5 * (j % (ELEMENTS / 5))
-            if (sorted[j].b != expectedB)
-                [self fail:"b out of order: "+expectedB+" != "+sorted[j].b];
-        }
+        [self checkSorted:sorted];
     }
 
     var end = (new Date).getTime();
 
-    CPLog.warn("testSortUsingDescriptorsSpeed: "+(end-start)+"ms");
+    CPLog.warn(_cmd+": "+(end-start)+"ms");
+}
+
+- (void)testSortUsingNativeSort
+{
+    var array = [self makeUnsorted];
+
+    var descriptors = [
+        [CPSortDescriptor sortDescriptorWithKey:"a" ascending:NO],
+        [CPSortDescriptor sortDescriptorWithKey:"b" ascending:YES]
+    ];
+    
+    function sortFunction(lhs, rhs) {
+        return ([lhs a] === [rhs a]) ? ([lhs b] - [rhs b]) : ([rhs a] - [lhs a]);
+    }
+
+    var start = (new Date).getTime();
+
+    for (var i=0; i<REPEATS; i++)
+    {
+        var sorted = [array copy];
+        sorted.sort(sortFunction)
+        [self checkSorted:sorted];
+    }
+
+    var end = (new Date).getTime();
+
+    CPLog.warn(_cmd+": "+(end-start)+"ms");
+}
+
+- (CPArray)makeUnsorted
+{
+    var array = [];
+    for (var i=0; i<ELEMENTS; i++) {
+        var s = [Sortable new];
+        [s setA:(i % 5)];
+        [s setB:(ELEMENTS-i)];
+        array.push(s);
+    }
+    return array;
+}
+
+- (void)checkSorted:(CPArray)sorted
+{
+    // Verify it really got sorted.
+    for (var j=0; j<ELEMENTS; j++) {
+        var expectedA = 4-FLOOR(j * 5 / ELEMENTS);
+        if (sorted[j].a != expectedA)
+            [self fail:"a out of order: "+expectedA+" != "+sorted[j].a];
+        var expectedB = (5-expectedA) + 5 * (j % (ELEMENTS / 5))
+        if (sorted[j].b != expectedB)
+            [self fail:"b out of order: "+expectedB+" != "+sorted[j].b];
+    }
 }
 
 @end

From 90a63e1b14ee7b0ff7e0e67d4e02dd6076ae6040 Mon Sep 17 00:00:00 2001
From: Aparajita Fishman <aparajita@vasudevaserver.org>
Date: Sat, 31 Jul 2010 18:18:40 -0400
Subject: [PATCH 20/41] Fixes/enhancements to jake docs:

- We now have class hierarchy information! Don't remove generated headers before doxygen runs so it can generate class hierarchies. Now the headers are cleaned up separately.

- Added inline collapsible class hierarchy diagrams within each class.

- Enabled the built-in search! It's awesome!

- Changed image format to gif, dot is generated invalid png on Mac OS X.

- Explicitly turned off generation of to do and bug list.

- Turned off most warnings, most of them are useless warnings arising from the fact that we are pretending Objective-J is Objective-C.

- Doxyfile format updated to 1.7.1.
---
 Jakefile                               |   18 +-
 Tools/Documentation/Cappuccino.doxygen | 1495 +++++++++++++-----------
 Tools/Documentation/cleanup_headers    |   10 +
 Tools/Documentation/make_headers       |   10 +-
 4 files changed, 841 insertions(+), 692 deletions(-)
 create mode 100755 Tools/Documentation/cleanup_headers

diff --git a/Jakefile b/Jakefile
index 9c7c523ce..8cedac05a 100644
--- a/Jakefile
+++ b/Jakefile
@@ -122,15 +122,19 @@ task ("documentation", function()
     {
         print("Using " + doxygen + " for doxygen binary.");
         
-        if (OS.system(["ruby", FILE.join("Tools", "Documentation", "make_headers")]))
+        var documentationDir = FILE.join("Tools", "Documentation");
+        
+        if (OS.system(["ruby", FILE.join(documentationDir, "make_headers")]))
             OS.exit(1); //rake abort if ($? != 0)
 
-        if (OS.system([doxygen, FILE.join("Tools", "Documentation", "Cappuccino.doxygen")]))
-            OS.exit(1); //rake abort if ($? != 0)
-
-        rm_rf($DOCUMENTATION_BUILD);
-        mv("debug.txt", FILE.join("Documentation", "debug.txt"));
-        mv("Documentation", $DOCUMENTATION_BUILD);
+        if (!OS.system([doxygen, FILE.join(documentationDir, "Cappuccino.doxygen")]))
+        {
+            rm_rf($DOCUMENTATION_BUILD);
+            mv("debug.txt", FILE.join("Documentation", "debug.txt"));
+            mv("Documentation", $DOCUMENTATION_BUILD);
+        }
+        
+        OS.system(["ruby", FILE.join(documentationDir, "cleanup_headers")]);
     }
     else
         print("doxygen not installed, skipping documentation generation.");
diff --git a/Tools/Documentation/Cappuccino.doxygen b/Tools/Documentation/Cappuccino.doxygen
index 698530b6b..aac9f3027 100644
--- a/Tools/Documentation/Cappuccino.doxygen
+++ b/Tools/Documentation/Cappuccino.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.6.1
+# Doxyfile 1.7.1
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -14,76 +14,76 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
 # http://www.gnu.org/software/libiconv for the list of possible encodings.
 
 DOXYFILE_ENCODING      = UTF-8
 
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
 PROJECT_NAME           = "Cappuccino API"
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.8
+PROJECT_NUMBER         = 0.8.1
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = Documentation
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
 # otherwise cause performance problems for the file system.
 
 CREATE_SUBDIRS         = NO
 
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, 
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English 
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, 
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, 
 # Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
 # Set to NO to disable this.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
 # brief descriptions will be completely suppressed.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
 # "represents" "a" "an" "the"
 
 ABBREVIATE_BRIEF       = "The $name class" \
@@ -98,202 +98,203 @@ ABBREVIATE_BRIEF       = "The $name class" \
                          an \
                          the
 
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
 # description.
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
 # operators of the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
 # to NO the shortest path that makes the file name unique will be used.
 
 FULL_PATH_NAMES        = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
 # path to strip.
 
-STRIP_FROM_PATH        =
+STRIP_FROM_PATH        = 
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
 # are normally passed to the compiler using the -I flag.
 
-STRIP_FROM_INC_PATH    =
+STRIP_FROM_INC_PATH    = 
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
 # doesn't support long names like on DOS, Mac, or CD-ROM.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like regular Qt-style comments 
 # (thus requiring an explicit @brief command for a brief description.)
 
 JAVADOC_AUTOBRIEF      = NO
 
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
 # an explicit \brief command for a brief description.)
 
 QT_AUTOBRIEF           = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
 # description. Set this tag to YES if you prefer the old behaviour instead.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
 # re-implements.
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
 # be part of the file/class/namespace that contains it.
 
 SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
 TAB_SIZE               = 8
 
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
 # You can put \n's in the value part of an alias to insert newlines.
 
-ALIASES                =
+ALIASES                = 
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
 # of all members will be omitted, etc.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Java. For instance, namespaces will be presented as packages, qualified 
 # scopes will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
 # Fortran.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
 # VHDL.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
-# Doxygen selects the parser to use depending on the extension of the files it parses.
-# With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this tag.
-# The format is ext=language, where ext is a file extension, and language is one of
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+# Doxygen selects the parser to use depending on the extension of the files it 
+# parses. With this tag you can assign which parser to use for a given extension. 
+# Doxygen has a built-in mapping, but you can override or extend it using this 
+# tag. The format is ext=language, where ext is a file extension, and language 
+# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, 
+# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make 
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C 
+# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions 
+# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
 
 EXTENSION_MAPPING      = j=Objective-C
 
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
 # diagrams that involve STL classes more complete and accurate.
 
 BUILTIN_STL_SUPPORT    = NO
 
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# If you use Microsoft's C++/CLI language, you should set this option to YES to 
 # enable parsing support.
 
 CPP_CLI_SUPPORT        = NO
 
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
 # instead of private inheritance when no explicit protection keyword is present.
 
 SIP_SUPPORT            = NO
 
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
+# For Microsoft's IDL there are propget and propput attributes to indicate getter 
+# and setter methods for a property. Setting this option to YES (the default) 
+# will make doxygen to replace the get and set methods by a property in the 
+# documentation. This will only work if the methods are indeed getting or 
+# setting a simple type. If this is not the case, or you want to show the 
 # methods anyway, you should set this option to NO.
 
-IDL_PROPERTY_SUPPORT   = YES
+IDL_PROPERTY_SUPPORT   = NO
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
 # all members of a group must be documented explicitly.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
 # the \nosubgrouping command.
 
 SUBGROUPING            = YES
 
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
 # types are typedef'ed and only the typedef is referenced, never the tag name.
 
 TYPEDEF_HIDES_STRUCT   = NO
 
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
+# determine which symbols to keep in memory and which to flush to disk. 
+# When the cache is full, less often used symbols will be written to disk. 
+# For small to medium size projects (<1000 input files) the default value is 
+# probably good enough. For larger projects a too small cache size can cause 
+# doxygen to be busy swapping symbols to and from disk most of the time 
+# causing a significant performance penality. 
+# If the system has enough physical memory increasing the cache will improve the 
+# performance by keeping more symbols in memory. Note that the value works on 
+# a logarithmic scale so increasing the size by one will rougly double the 
+# memory usage. The cache size is given by this formula: 
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
 # corresponding to a cache size of 2^16 = 65536 symbols
 
 SYMBOL_CACHE_SIZE      = 0
@@ -302,274 +303,280 @@ SYMBOL_CACHE_SIZE      = 0
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
 # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
 # will be included in the documentation.
 
 EXTRACT_PRIVATE        = YES
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
 # will be included in the documentation.
 
 EXTRACT_STATIC         = YES
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
 # If set to NO only classes defined in header files are included.
 
 EXTRACT_LOCAL_CLASSES  = YES
 
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
 # If set to NO (the default) only methods in the interface are included.
 
 EXTRACT_LOCAL_METHODS  = YES
 
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
 # anonymous namespace are hidden.
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
 # This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
 # overviews. This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
 # documentation.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
 # function's detailed documentation block.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
 # Set it to YES to include the internal documentation.
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
 # and Mac users are advised to set this option to NO.
 
 CASE_SENSE_NAMES       = NO
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
 # documentation. If set to YES the scope will be hidden.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
 # of that file.
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen 
+# will list include files with double quotes in the documentation 
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
 # is inserted in the documentation for inline members.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
 # declaration order.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
 # declaration order.
 
 SORT_BRIEF_DOCS        = YES
 
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO (the default) the constructors will
-# appear in the respective orders defined by SORT_MEMBER_DOCS and
-# SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is
-# set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen 
+# will sort the (brief and detailed) documentation of class members so that 
+# constructors and destructors are listed first. If set to NO (the default) 
+# the constructors will appear in the respective orders defined by 
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. 
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO 
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
 
 SORT_MEMBERS_CTORS_1ST = NO
 
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
 # the group names will appear in their defined order.
 
 SORT_GROUP_NAMES       = YES
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
+# Note: This option applies only to the class list, not to the 
 # alphabetical list.
 
 SORT_BY_SCOPE_NAME     = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
 # commands in the documentation.
 
-GENERATE_TODOLIST      = YES
+GENERATE_TODOLIST      = NO
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
 # commands in the documentation.
 
-GENERATE_TESTLIST      = YES
+GENERATE_TESTLIST      = NO
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
 # commands in the documentation.
 
-GENERATE_BUGLIST       = YES
+GENERATE_BUGLIST       = NO
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
 # \deprecated commands in the documentation.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional
+# The ENABLED_SECTIONS tag can be used to enable conditional 
 # documentation sections, marked by \if sectionname ... \endif.
 
-ENABLED_SECTIONS       =
+ENABLED_SECTIONS       = 
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
 # command in the documentation regardless of this setting.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
 # list will mention the files that were used to generate the documentation.
 
 SHOW_USED_FILES        = YES
 
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
 # in the documentation. The default is NO.
 
 SHOW_DIRECTORIES       = NO
 
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
+# This will remove the Files entry from the Quick Index and from the 
 # Folder Tree View (if specified). The default is YES.
 
 SHOW_FILES             = YES
 
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
 # and from the Folder Tree View (if specified). The default is YES.
 
 SHOW_NAMESPACES        = YES
 
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
 # is used as the file version. See the manual for examples.
 
-FILE_VERSION_FILTER    =
+FILE_VERSION_FILTER    = 
 
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
-# doxygen. The layout file controls the global structure of the generated output files
-# in an output format independent way. The create the layout file that represents
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name
-# of the layout file.
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed 
+# by doxygen. The layout file controls the global structure of the generated 
+# output files in an output format independent way. The create the layout file 
+# that represents doxygen's defaults, run doxygen with the -l option. 
+# You can optionally specify a file name after the option, if omitted 
+# DoxygenLayout.xml will be used as the name of the layout file.
 
-LAYOUT_FILE            =
+LAYOUT_FILE            = 
 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated
+# The QUIET tag can be used to turn on/off the messages that are generated 
 # by doxygen. Possible values are YES and NO. If left blank NO is used.
 
 QUIET                  = NO
 
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
 # NO is used.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
 # automatically be disabled.
 
-WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_UNDOCUMENTED   = NO
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
 # don't exist or using markup commands wrongly.
 
-WARN_IF_DOC_ERROR      = YES
+WARN_IF_DOC_ERROR      = NO
 
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
 # documentation.
 
 WARN_NO_PARAMDOC       = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
 # be obtained via FILE_VERSION_FILTER)
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
 # to stderr.
 
 WARN_LOGFILE           = debug.txt
@@ -578,116 +585,144 @@ WARN_LOGFILE           = debug.txt
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = AppKit Foundation
+INPUT                  = AppKit \
+                         Foundation
 
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
 # the list of possible encodings.
 
 INPUT_ENCODING         = UTF-8
 
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
 
-FILE_PATTERNS          = *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx \
-                         *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 \
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.d \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.idl \
+                         *.odl \
+                         *.cs \
+                         *.php \
+                         *.php3 \
+                         *.inc \
+                         *.m \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.f90 \
+                         *.f \
+                         *.vhd \
+                         *.vhdl \
                          *.j
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
 # If left blank NO is used.
 
 RECURSIVE              = YES
 
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
 EXCLUDE                = AppKit/Themes
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
 # from the input.
 
 EXCLUDE_SYMLINKS       = NO
 
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
 # for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       = _*
 
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
 # AClass::ANamespace, ANamespace::*Test
 
 EXCLUDE_SYMBOLS        = _*
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
 # the \include command).
 
-EXAMPLE_PATH           = ./README ./LICENSE
+EXAMPLE_PATH           = ./README \
+                         ./LICENSE
 
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
 # blank all files are included.
 
 EXAMPLE_PATTERNS       = *
 
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
 # Possible values are YES and NO. If left blank NO is used.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
 # the \image command).
 
-IMAGE_PATH             =
+IMAGE_PATH             = 
 
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
 # ignored.
 
-INPUT_FILTER           =
+INPUT_FILTER           = 
 
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
 # is applied to all files.
 
-FILTER_PATTERNS        =
+FILTER_PATTERNS        = 
 
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
 # files to browse (i.e. when SOURCE_BROWSER is set to YES).
 
 FILTER_SOURCE_FILES    = NO
@@ -696,54 +731,53 @@ FILTER_SOURCE_FILES    = NO
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
 # VERBATIM_HEADERS is set to NO.
 
 SOURCE_BROWSER         = YES
 
-# Setting the INLINE_SOURCES tag to YES will include the body
+# Setting the INLINE_SOURCES tag to YES will include the body 
 # of functions and classes directly in the documentation.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
 # fragments. Normal C and C++ comments will always remain visible.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
+# If the REFERENCED_BY_RELATION tag is set to YES 
+# then for each documented function all documented 
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = NO
 
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
+# If the REFERENCES_RELATION tag is set to YES 
+# then for each documented function all documented entities 
 # called/used by that function will be listed.
 
 REFERENCES_RELATION    = NO
 
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
+# link to the source code.  Otherwise they will link to the documentation.
 
 REFERENCES_LINK_SOURCE = YES
 
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
 # will need version 4.8.6 or higher.
 
 USE_HTAGS              = NO
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
 # which an include is specified. Set to NO to disable this.
 
 VERBATIM_HEADERS       = YES
@@ -752,324 +786,419 @@ VERBATIM_HEADERS       = YES
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
 # contains a lot of classes, structs, unions or interfaces.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
 # in which this list will be split (can be a number in the range [1..20])
 
 COLS_IN_ALPHA_INDEX    = 5
 
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
 # should be ignored while generating the index headers.
 
-IGNORE_PREFIX          =
+IGNORE_PREFIX          = 
 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
 # generate HTML output.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `html' will be used as the default path.
 
 HTML_OUTPUT            = html
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
 # doxygen will generate files with .html extension.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
 # standard header.
 
-HTML_HEADER            =
+HTML_HEADER            = 
 
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
 HTML_FOOTER            = 
 
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
 # stylesheet in the HTML output directory as well, or it will be erased!
 
-HTML_STYLESHEET        =
+HTML_STYLESHEET        = 
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. 
+# Doxygen will adjust the colors in the stylesheet and background images 
+# according to this color. Hue is specified as an angle on a colorwheel, 
+# see http://en.wikipedia.org/wiki/Hue for more information. 
+# For instance the value 0 represents red, 60 is yellow, 120 is green, 
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. 
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of 
+# the colors in the HTML output. For a value of 0 the output will use 
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT    = 98
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to 
+# the luminance component of the colors in the HTML output. Values below 
+# 100 gradually make the output lighter, whereas values above 100 make 
+# the output darker. The value divided by 100 is the actual gamma applied, 
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, 
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML 
+# page will contain the date and time when the page was generated. Setting 
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
 # NO a bullet list will be used.
 
 HTML_ALIGN_MEMBERS     = YES
 
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
 # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
 
-HTML_DYNAMIC_SECTIONS  = NO
+HTML_DYNAMIC_SECTIONS  = YES
 
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup. 
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html 
+# for more information.
 
 GENERATE_DOCSET        = NO
 
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
 # can be grouped.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
 # will append .docset to the name.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify 
+# the documentation publisher. This should be a reverse domain-name style 
+# string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
 # of the generated HTML documentation.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
 # written to the html output directory.
 
-CHM_FILE               =
+CHM_FILE               = 
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
 # the HTML help compiler on the generated index.hhp.
 
-HHC_LOCATION           =
+HHC_LOCATION           = 
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
 # it should be included in the master .chm file (NO).
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
 # content.
 
-CHM_INDEX_ENCODING     =
+CHM_INDEX_ENCODING     = 
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
 # normal table of contents (NO) in the .chm file.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
 # to the contents of the HTML help documentation and to the tree view.
 
 TOC_EXPAND             = NO
 
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
-# are set, an additional index file will be generated that can be used as input for
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
-# HTML documentation.
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and 
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated 
+# that can be used as input for Qt's qhelpgenerator to generate a 
+# Qt Compressed Help (.qch) of the generated HTML documentation.
 
 GENERATE_QHP           = NO
 
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
+# be used to specify the file name of the resulting .qch file. 
 # The path specified is relative to the HTML output folder.
 
-QCH_FILE               =
+QCH_FILE               = 
 
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
+# The QHP_NAMESPACE tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
 # http://doc.trolltech.com/qthelpproject.html#namespace
 
-QHP_NAMESPACE          =
+QHP_NAMESPACE          = org.doxygen.Project
 
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
 # http://doc.trolltech.com/qthelpproject.html#virtual-folders
 
 QHP_VIRTUAL_FOLDER     = doc
 
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
-# For more information please see
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to 
+# add. For more information please see 
 # http://doc.trolltech.com/qthelpproject.html#custom-filters
 
-QHP_CUST_FILTER_NAME   =
+QHP_CUST_FILTER_NAME   = 
 
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the 
+# custom filter to add. For more information please see 
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters"> 
+# Qt Help Project / Custom Filters</a>.
 
-QHP_CUST_FILTER_ATTRS  =
+QHP_CUST_FILTER_ATTRS  = 
 
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this 
+# project's 
+# filter section matches. 
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes"> 
+# Qt Help Project / Filter Attributes</a>.
 
-QHP_SECT_FILTER_ATTRS  =
+QHP_SECT_FILTER_ATTRS  = 
 
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
+# be used to specify the location of Qt's qhelpgenerator. 
+# If non-empty doxygen will try to run qhelpgenerator on the generated 
 # .qhp file.
 
-QHG_LOCATION           =
+QHG_LOCATION           = 
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files  
+# will be generated, which together with the HTML files, form an Eclipse help 
+# plugin. To install this plugin and make it available under the help contents 
+# menu in Eclipse, the contents of the directory containing the HTML and XML 
+# files needs to be copied into the plugins directory of eclipse. The name of 
+# the directory within the plugins directory should be the same as 
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before 
+# the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin 
+# the directory name containing the HTML and XML files should also have 
+# this name.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
 # the value YES disables it.
 
 DISABLE_INDEX          = NO
 
-# This tag can be used to set the number of enum values (range [1..20])
+# This tag can be used to set the number of enum values (range [1..20]) 
 # that doxygen will group on one line in the generated HTML documentation.
 
 ENUM_VALUES_PER_LINE   = 4
 
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
+# structure should be generated to display hierarchical information. 
+# If the tag value is set to YES, a side panel will be generated 
+# containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). 
 # Windows users are probably better off using the HTML help feature.
 
 GENERATE_TREEVIEW      = YES
 
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, 
 # and Class Hierarchy pages using a tree view instead of an ordered list.
 
 USE_INLINE_TREES       = NO
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
 # is shown.
 
 TREEVIEW_WIDTH         = 250
 
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open 
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included 
+# as images in the HTML documentation. The default is 10. Note that 
+# when you change the font size after a successful doxygen run you need 
+# to manually remove any form_*.png images from the HTML output directory 
 # to force them to be regenerated.
 
 FORMULA_FONTSIZE       = 10
 
-# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP)
-# there is already a search function so this one should typically
-# be disabled.
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images 
+# generated for formulas are transparent PNGs. Transparent PNGs are 
+# not supported properly for IE 6.0, but are supported on all modern browsers. 
+# Note that when changing this option you need to delete any form_*.png files 
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box 
+# for the HTML output. The underlying search engine uses javascript 
+# and DHTML and should work on any modern browser. Note that when using 
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets 
+# (GENERATE_DOCSET) there is already a search function so this one should 
+# typically be disabled. For large projects the javascript based search engine 
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
 
 SEARCHENGINE           = YES
 
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be 
+# implemented using a PHP enabled web server instead of at the web client 
+# using Javascript. Doxygen will generate the search PHP script and index 
+# file to put on the web server. The advantage of the server 
+# based approach is that it scales better to large projects and allows 
+# full text search. The disadvances is that it is more difficult to setup 
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH    = NO
+
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
 # generate Latex output.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `latex' will be used as the default path.
 
 LATEX_OUTPUT           = latex
 
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name. 
+# Note that when enabling USE_PDFLATEX this option is only used for 
+# generating bitmaps for formulas in the HTML output, but not in the 
+# Makefile that is written to the output directory.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
 # default command name.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
 # save some trees in general.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
 # executive. If left blank a4wide will be used.
 
 PAPER_TYPE             = a4wide
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
 # packages that should be included in the LaTeX output.
 
-EXTRA_PACKAGES         =
+EXTRA_PACKAGES         = 
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
 # standard header. Notice: only use this tag if you know what you are doing!
 
-LATEX_HEADER           =
+LATEX_HEADER           = 
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
 # This makes the output suitable for online browsing using a pdf viewer.
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
 # higher quality PDF documentation.
 
 USE_PDFLATEX           = YES
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
 # This option is also used when generating formulas in HTML.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
 # in the output.
 
 LATEX_HIDE_INDICES     = NO
 
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include 
+# source code with syntax highlighting in the LaTeX output. 
+# Note that which sources are shown also depends on other settings 
+# such as SOURCE_BROWSER.
 
 LATEX_SOURCE_CODE      = NO
 
@@ -1077,68 +1206,68 @@ LATEX_SOURCE_CODE      = NO
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
 # other RTF readers or editors.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `rtf' will be used as the default path.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
 # save some trees in general.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
 # Note: wordpad (write) and others do not support links.
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
 # replacements, missing definitions are set to their default value.
 
-RTF_STYLESHEET_FILE    =
+RTF_STYLESHEET_FILE    = 
 
-# Set optional variables used in the generation of an rtf document.
+# Set optional variables used in the generation of an rtf document. 
 # Syntax is similar to doxygen's config file.
 
-RTF_EXTENSIONS_FILE    =
+RTF_EXTENSIONS_FILE    = 
 
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
 # generate man pages
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `man' will be used as the default path.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to
+# The MAN_EXTENSION tag determines the extension that is added to 
 # the generated man pages (default is the subroutine's section .3)
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
 # would be unable to find the correct page. The default is NO.
 
 MAN_LINKS              = NO
@@ -1147,33 +1276,33 @@ MAN_LINKS              = NO
 # configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
 # the code including all documentation.
 
 GENERATE_XML           = YES
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `xml' will be used as the default path.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
 # syntax of the XML files.
 
-XML_SCHEMA             =
+XML_SCHEMA             = 
 
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
 # syntax of the XML files.
 
-XML_DTD                =
+XML_DTD                = 
 
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
 # enabling this will significantly increase the size of the XML output.
 
 XML_PROGRAMLISTING     = YES
@@ -1182,10 +1311,10 @@ XML_PROGRAMLISTING     = YES
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
 # and incomplete at the moment.
 
 GENERATE_AUTOGEN_DEF   = NO
@@ -1194,99 +1323,97 @@ GENERATE_AUTOGEN_DEF   = NO
 # configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
 # moment.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
 # to generate PDF and DVI output from the Perl module output.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
 # and Perl will parse it just the same.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
 # Makefile don't overwrite each other's variables.
 
-PERLMOD_MAKEVAR_PREFIX =
+PERLMOD_MAKEVAR_PREFIX = 
 
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
 # files.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
-MACRO_EXPANSION        = YES
+MACRO_EXPANSION        = NO
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
 # PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
 # in the INCLUDE_PATH (see below) will be search if a #include is found.
 
 SEARCH_INCLUDES        = YES
 
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
 # the preprocessor.
 
-INCLUDE_PATH           =
+INCLUDE_PATH           = 
 
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
 # be used.
 
-INCLUDE_FILE_PATTERNS  =
+INCLUDE_FILE_PATTERNS  = 
 
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             =
+PREDEFINED             = 
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
 # Use the PREDEFINED tag if you want to use a different macro definition.
 
-EXPAND_AS_DEFINED      =
+EXPAND_AS_DEFINED      = 
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
 # the parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
@@ -1295,43 +1422,41 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links. 
+# Note that each tag file must have a unique name 
+# (where the name does NOT include the path) 
+# If a tag file is not located in the directory in which doxygen 
 # is run, you must also specify the path to the tagfile here.
 
-TAGFILES               =
+TAGFILES               = 
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       =
+GENERATE_TAGFILE       = 
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
 # will be listed.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
 # be listed.
 
 EXTERNAL_GROUPS        = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script
+# The PERL_PATH should be the absolute path and name of the perl script 
 # interpreter (i.e. the result of `which perl').
 
 PERL_PATH              = /usr/bin/perl
@@ -1340,192 +1465,200 @@ PERL_PATH              = /usr/bin/perl
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
 # powerful graphs.
 
 CLASS_DIAGRAMS         = YES
 
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see 
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+# the mscgen tool resides. If left empty the tool is assumed to be found in the 
 # default search path.
 
-MSCGEN_PATH            =
+MSCGEN_PATH            = 
 
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
 # or is not a class.
 
 HIDE_UNDOC_RELATIONS   = YES
 
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
 # have no effect if this option is set to NO (the default)
 
 HAVE_DOT               = YES
 
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is 
+# allowed to run in parallel. When set to 0 (the default) doxygen will 
+# base this on the number of processors available in the system. You can set it 
+# explicitly to a value larger than 0 to get control over the balance 
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS        = 0
+
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
 # containing the font.
 
-DOT_FONTNAME           = FreeSans
+DOT_FONTNAME           = FreeSans.ttf
 
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
 # The default size is 10pt.
 
 DOT_FONTSIZE           = 10
 
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
 # can find it using this tag.
 
-DOT_FONTPATH           =
+DOT_FONTPATH           = 
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
 # the CLASS_DIAGRAMS tag to NO.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
 # class references variables) of the class with other documented classes.
 
 COLLABORATION_GRAPH    = NO
 
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for groups, showing the direct groups dependencies
 
 GROUP_GRAPHS           = YES
 
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
 # Language.
 
 UML_LOOK               = NO
 
-# If set to YES, the inheritance and collaboration graphs will show the
+# If set to YES, the inheritance and collaboration graphs will show the 
 # relations between templates and their instances.
 
 TEMPLATE_RELATIONS     = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
 # other documented files.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
 # indirectly include this file.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
+# doxygen will generate a call dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable call graphs 
 # for selected functions only using the \callgraph command.
 
 CALL_GRAPH             = NO
 
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+# doxygen will generate a caller dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable caller 
 # graphs for selected functions only using the \callergraph command.
 
 CALLER_GRAPH           = NO
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
 # will graphical hierarchy of all classes instead of a textual one.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include 
 # relations between the files in the directories.
 
 DIRECTORY_GRAPH        = YES
 
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif 
 # If left blank png will be used.
 
-DOT_IMAGE_FORMAT       = png
+DOT_IMAGE_FORMAT       = gif
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
 # found. If left blank, it is assumed the dot tool can be found in the path.
 
-DOT_PATH               =
+DOT_PATH               = 
 
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
 # \dotfile command).
 
-DOTFILE_DIRS           =
+DOTFILE_DIRS           = 
 
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the 
+# number of direct children of the root node in a graph is already larger than 
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
 # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
 DOT_GRAPH_MAX_NODES    = 50
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, because dot on Windows does not 
+# seem to support this out of the box. Warning: Depending on the platform used, 
+# enabling this option may lead to badly anti-aliased labels on the edges of 
 # a graph (i.e. they become hard to read).
 
 DOT_TRANSPARENT        = NO
 
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
 # support this, this feature is disabled by default.
 
 DOT_MULTI_TARGETS      = NO
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
 # arrows in the dot generated graphs.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
 # the various graphs.
 
 DOT_CLEANUP            = YES
diff --git a/Tools/Documentation/cleanup_headers b/Tools/Documentation/cleanup_headers
new file mode 100755
index 000000000..e2336a2b4
--- /dev/null
+++ b/Tools/Documentation/cleanup_headers
@@ -0,0 +1,10 @@
+#! /usr/bin/env ruby
+
+filename = File.dirname(__FILE__) + "/header_files"
+@files = File.new(filename).read.split("\n")
+
+for file in @files
+	File.delete(file)
+end
+
+File.delete(filename)
\ No newline at end of file
diff --git a/Tools/Documentation/make_headers b/Tools/Documentation/make_headers
index ac71ddf67..8553faf5f 100755
--- a/Tools/Documentation/make_headers
+++ b/Tools/Documentation/make_headers
@@ -9,6 +9,7 @@ def makeHeaderFileFrom(fileName)
   # Extract out all the "implementation" lines.  Note, there may be
   # more than on in a given .j file.
   m = data.scan(/.*?(@implementation.*?\{.*?\})/m)
+
   if m.length > 0
     for i in 0...m.length
       line = m[i][0]
@@ -18,6 +19,7 @@ def makeHeaderFileFrom(fileName)
       
         # Extract the class name
         m2 = line.scan(/.*?@implementation(.*?):.*/m)
+
         if !m2.nil? && !m2[0].nil?
           className = m2[0][0].strip()
         
@@ -35,12 +37,12 @@ def makeHeaderFileFrom(fileName)
   end
 end
 
-
 fileList = Dir['AppKit/**/*.j'] + Dir['Foundation/**/*.j']
+
 for fileName in fileList
   makeHeaderFileFrom(fileName)
 end
 
-for fileName in @outputFiles
-  File.delete(fileName)
-end
+f = File.new(File.dirname(__FILE__) + "/header_files", "w")
+f.write(@outputFiles.join("\n"))
+f.close()

From 6bc0880a0d6cc8eeabc8569df566b8201b194f87 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tom@280north.com>
Date: Fri, 13 Aug 2010 16:48:49 -0700
Subject: [PATCH 21/41] Fix Doxygen executable search logic

---
 Jakefile    | 35 +++++++++++------------------------
 common.jake | 13 ++++++++-----
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/Jakefile b/Jakefile
index 8cedac05a..a441cd4b7 100644
--- a/Jakefile
+++ b/Jakefile
@@ -90,37 +90,24 @@ task ("docs", ["documentation"]);
 
 task ("documentation", function()
 {
-    var doxygen = null,
-        DoxygenAppPath = "/Applications/Doxygen.app/Contents/Resources";
+    // try to find a doxygen executable in the PATH;
+    var doxygen = executableExists("doxygen");
     
     // If the Doxygen application is installed on Mac OS X, use that
-    if (executableExists("mdfind"))
+    if (!doxygen && executableExists("mdfind"))
     {
-        OS.system("mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemCFBundleIdentifier == 'org.doxygen'\" > doxygen_app");
-        
-        if (FILE.exists("doxygen_app"))
+        var p = OS.popen(["mdfind", "kMDItemContentType == 'com.apple.application-bundle' && kMDItemCFBundleIdentifier == 'org.doxygen'"]);
+        if (p.wait() === 0)
         {
-            doxygen = FILE.join(UTIL.trimEnd(FILE.read("doxygen_app")), "Contents/Resources/doxygen");
-            FILE.remove("doxygen_app");
+            var doxygenApps = p.stdout.read().split("\n");
+            if (doxygenApps[0])
+                doxygen = FILE.join(doxygenApps[0], "Contents/Resources/doxygen");
         }
     }
-    else
-    {
-        SYSTEM.env["PATH"].split(':').some(function(/*String*/ aPath)
-        {
-            var path = FILE.join(aPath, "doxygen");
-            
-            if (FILE.exists(path))
-            {
-                doxygen = path;
-                return true;
-            }
-        });
-    }
     
-    if (doxygen)
+    if (doxygen && FILE.exists(doxygen))
     {
-        print("Using " + doxygen + " for doxygen binary.");
+        stream.print("\0green(Using " + doxygen + " for doxygen binary.\0)");
         
         var documentationDir = FILE.join("Tools", "Documentation");
         
@@ -137,7 +124,7 @@ task ("documentation", function()
         OS.system(["ruby", FILE.join(documentationDir, "cleanup_headers")]);
     }
     else
-        print("doxygen not installed, skipping documentation generation.");
+        stream.print("\0yellow(Doxygen not installed, skipping documentation generation.\0)");
 });
 
 // Downloads
diff --git a/common.jake b/common.jake
index 3faaba09c..c600261ae 100644
--- a/common.jake
+++ b/common.jake
@@ -266,12 +266,15 @@ global.subjake = function(/*Array<String>*/ directories, /*String*/ aTaskName)
     });
 }
 
-global.executableExists = function(/*String*/ aFileName)
+global.executableExists = function(/*String*/ executableName)
 {
-    return SYSTEM.env["PATH"].split(':').some(function(/*String*/ aPath)
-    {
-        return FILE.exists(FILE.join(aPath, aFileName));
-    });
+    var paths = SYSTEM.env["PATH"].split(':');
+    for (var i = 0; i < paths.length; i++) {
+        var path = FILE.join(paths[i], executableName);
+        if (FILE.exists(path))
+            return path;
+    }
+    return null;
 }
 
 $OBJJ_TEMPLATE_EXECUTABLE = FILE.join($HOME_DIR, "Objective-J", "CommonJS", "objj-executable");

From 112ad658822eccddbe40880e93b13e05871cf9c2 Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Tue, 27 Jul 2010 14:14:57 -0400
Subject: [PATCH 22/41] Support value transformers in CPTableColumn when using
 bindings.

---
 AppKit/CPTableColumn.j | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/AppKit/CPTableColumn.j b/AppKit/CPTableColumn.j
index a6ebed652..a1d192913 100644
--- a/AppKit/CPTableColumn.j
+++ b/AppKit/CPTableColumn.j
@@ -226,12 +226,12 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
 /*!
     This method set's the "prototype" view which will be used to create all table cells in this column.
-    
-    It creates a snapshot of aView, using keyed archiving, which is then copied over and over for each 
+
+    It creates a snapshot of aView, using keyed archiving, which is then copied over and over for each
     individual cell that is shown. As a result, changes made after calling this method won't be reflected.
 
     Example:
-    
+
         [tableColumn setDataView:someView]; // snapshot taken
         [[tableColumn dataView] setSomething:x]; //won't work
 
@@ -291,7 +291,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
     // make sure only we have control over the size and placement
     [newDataView setAutoresizingMask:CPViewNotSizable];
-    
+
     return newDataView;
 }
 
@@ -350,9 +350,9 @@ CPTableColumnUserResizingMask   = 1 << 1;
     shouldBeHidden = !!shouldBeHidden
     if (_isHidden === shouldBeHidden)
         return;
-    
+
     _isHidden = shouldBeHidden;
-    
+
     [[self headerView] setHidden:shouldBeHidden];
     [[self tableView] _tableColumnVisibilityDidChange:self];
 }
@@ -407,7 +407,8 @@ CPTableColumnUserResizingMask   = 1 << 1;
     {
         var bindingName = keys[i],
             bindingPath = [aDataView _replacementKeyPathForBinding:bindingName],
-            bindingInfo = [bindingsDictionary objectForKey:bindingName]._info,
+            binding = [bindingsDictionary objectForKey:bindingName],
+            bindingInfo = binding._info,
             destination = [bindingInfo objectForKey:CPObservedObjectKey],
             keyPath = [bindingInfo objectForKey:CPObservedKeyPathKey],
             dotIndex = keyPath.lastIndexOf("."),
@@ -438,6 +439,8 @@ CPTableColumnUserResizingMask   = 1 << 1;
                 value = [[firstValue valueForKeyPath:secondPart] objectAtIndex:aRow];
         }
 
+        value = [binding transformValue:value withOptions:[bindingInfo objectForKey:CPOptionsKey]];
+
         // console.log(bindingName+" : "+keyPath+" : "+aRow+" : "+[[destination valueForKeyPath:keyPath] objectAtIndex:aRow]);
         [aDataView setValue:value forKey:bindingPath];
     }
@@ -488,7 +491,7 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
         _resizingMask  = [aCoder decodeBoolForKey:CPTableColumnResizingMaskKey];
         _isHidden = [aCoder decodeBoolForKey:CPTableColumnIsHiddenKey];
         _isEditable = [aCoder decodeBoolForKey:CPTableColumnIsEditableKey];
-        
+
         _sortDescriptorPrototype = [aCoder decodeObjectForKey:CPSortDescriptorPrototypeKey];
     }
 
@@ -509,7 +512,7 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
     [aCoder encodeObject:_resizingMask forKey:CPTableColumnResizingMaskKey];
     [aCoder encodeBool:_isHidden forKey:CPTableColumnIsHiddenKey];
     [aCoder encodeBool:_isEditable forKey:CPTableColumnIsEditableKey];
-    
+
     [aCoder encodeObject:_sortDescriptorPrototype forKey:CPSortDescriptorPrototypeKey];
 }
 

From 0292203ec0ec79139ac8279f30265d224f97811d Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Thu, 29 Jul 2010 22:44:38 -0400
Subject: [PATCH 23/41] Test that CPValueTransformerBindingOption works with
 CPTableColumn bindings. When run the rightmost column should read "right" and
 "also right" in the two initial rows.

---
 Tests/Manual/ArrayController1/AppController.j | 88 +++++++++++++------
 1 file changed, 62 insertions(+), 26 deletions(-)

diff --git a/Tests/Manual/ArrayController1/AppController.j b/Tests/Manual/ArrayController1/AppController.j
index cb9facb23..0acba1492 100644
--- a/Tests/Manual/ArrayController1/AppController.j
+++ b/Tests/Manual/ArrayController1/AppController.j
@@ -21,7 +21,7 @@ CPLogRegister(CPLogConsole);
     //CPTextField         selectedNameField;
     //CPTextField         selectedPriceField;
     CPTextField         totalCountField;
-    
+
     CPArrayController   arrayController;
 }
 
@@ -31,14 +31,16 @@ CPLogRegister(CPLogConsole);
 
     //create our non ui objects
 
-    itemsArray = [[Item new]];
+    var notWrongItem = [Item new];
+    [notWrongItem setRightOrWrong:"also right"];
+    itemsArray = [[Item new], notWrongItem];
 
     arrayController = [[CPArrayController alloc] init];
 
     [arrayController setEditable:YES];
     [arrayController setObjectClass:Item];
     [arrayController setAutomaticallyPreparesContent:YES];
-    
+
     [arrayController setSelectsInsertedObjects:YES];
     [arrayController setAvoidsEmptySelection:YES];
 
@@ -47,19 +49,23 @@ CPLogRegister(CPLogConsole);
     tableView = [[CPTableView alloc] initWithFrame:CGRectMake(0, 0, 400, 200)];
     //[tableView setCenter:[contentView center]];
     [tableView setBackgroundColor:[CPColor redColor]];
-    
+
     var column = [[CPTableColumn alloc] initWithIdentifier:@"name"];
-    
+
     [tableView addTableColumn:column];
 
     column = [[CPTableColumn alloc] initWithIdentifier:@"price"];
-    
+
     [tableView addTableColumn:column];
-    
+
+    column = [[CPTableColumn alloc] initWithIdentifier:@"all right"];
+
+    [tableView addTableColumn:column];
+
     //[tableView setDataSource:self];
-    
+
     [contentView addSubview:tableView];
-    
+
     //create our bindings
 
     [self createBindings];
@@ -96,9 +102,10 @@ CPLogRegister(CPLogConsole);
     [arrayController bind:@"contentArray" toObject:self
 			  withKeyPath:@"itemsArray" options:nil];
 
-   // bind the total field -- no options on this one
-	[totalCountField bind:CPValueBinding toObject:arrayController
-			  withKeyPath:@"arrangedObjects.@sum.price" options:nil];
+    // bind the total field -- no options on this one
+    // Currently broken, crashes the app as it tries to pull valueForKey @sum at some point.
+	//[totalCountField bind:CPValueBinding toObject:arrayController
+	//		  withKeyPath:@"arrangedObjects.@sum.price" options:nil];
 
 	var bindingOptions = [CPDictionary dictionary];
 
@@ -108,54 +115,60 @@ CPLogRegister(CPLogConsole);
 	// binding for selected "name" field
     //[selectedNameField bind: @"value" toObject: arrayController
 	//			withKeyPath:@"selection.name" options:bindingOptions];
-	
+
 	// binding for "name" column
     var tableColumn = [tableView tableColumnWithIdentifier:@"name"];
-	
+
 	[tableColumn bind:@"value" toObject: arrayController
 		  withKeyPath:@"arrangedObjects.name" options:bindingOptions];
-    
-	
+
+
     // binding options for "price"
 	// no need for placeholder as overridden by formatters
 	//[bindingOptions removeObjectForKey:@"NSNullPlaceholder"];
-	
+
 	//[bindingOptions setObject:YES
 	//				   forKey:CPValidatesImmediatelyBindingOption];
-	
+
 	// binding for selected "price" field
 	//[selectedPriceField bind: @"value" toObject: arrayController
 	//			 withKeyPath:@"selection.price" options:bindingOptions];
-	
-	
+
+
 	// binding for "price" column
     tableColumn = [tableView tableColumnWithIdentifier:@"price"];
-	
+
     [tableColumn bind:@"value" toObject: arrayController
 		  withKeyPath:@"arrangedObjects.price" options:bindingOptions];
+
+    tableColumn = [tableView tableColumnWithIdentifier:@"all right"];
+
+    var bindingOptions = [CPDictionary dictionaryWithObject:[WLWrongToRightTransformer new] forKey:CPValueTransformerBindingOption];
+    [tableColumn bind:@"value" toObject:arrayController withKeyPath:@"arrangedObjects.rightOrWrong" options:bindingOptions];
+
 }
 
-- (unsigned int)countOfItemsArray 
+- (unsigned int)countOfItemsArray
 {
     return [itemsArray count];
 }
 
-- (id)objectInItemsArrayAtIndex:(unsigned int)index 
+- (id)objectInItemsArrayAtIndex:(unsigned int)index
 {
     return [itemsArray objectAtIndex:index];
 }
 
-- (void)insertObject:(id)anObject inItemsArrayAtIndex:(unsigned int)index 
+- (void)insertObject:(id)anObject inItemsArrayAtIndex:(unsigned int)index
 {
     [itemsArray insertObject:anObject atIndex:index];
 }
 
-- (void)removeObjectFromItemsArrayAtIndex:(unsigned int)index 
+- (void)removeObjectFromItemsArrayAtIndex:(unsigned int)index
 {
     [itemsArray removeObjectAtIndex:index];
 }
 
-- (void)replaceObjectInItemsArrayAtIndex:(unsigned int)index withObject:(id)anObject 
+- (void)replaceObjectInItemsArrayAtIndex:(unsigned int)index withObject:(id)anObject
 {
     [itemsArray replaceObjectAtIndex:index withObject:anObject];
 }
@@ -166,6 +179,7 @@ CPLogRegister(CPLogConsole);
 {
     float price @accessors;
     CPString name @accessors;
+    CPString rightOrWrong @accessors;
 }
 
 - (id)init
@@ -173,6 +187,7 @@ CPLogRegister(CPLogConsole);
     self = [super init];
     price = 7.0;
     name = "bob";
+    rightOrWrong = "wrong";
     return self;
 }
 
@@ -185,3 +200,24 @@ CPLogRegister(CPLogConsole);
 }
 
 @end
+
+@implementation WLWrongToRightTransformer : CPValueTransformer
+{
+}
+
++ (BOOL)allowsReverseTransformation
+{
+    return NO;
+}
+
++ (Class)transformedValueClass
+{
+    return [CPString class];
+}
+
+- (id)transformedValue:(id)aValue
+{
+    return aValue == "wrong" ? "right" : aValue;
+}
+
+@end
\ No newline at end of file

From 66fcba846bdb8c99a907a7f5d8a86fffcbaa371d Mon Sep 17 00:00:00 2001
From: Randall Luecke <randyl@rclconcepts.com>
Date: Mon, 16 Aug 2010 01:26:48 -0500
Subject: [PATCH 24/41] Fix for endless loop when changing platform windows.

---
 AppKit/CPView.j | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AppKit/CPView.j b/AppKit/CPView.j
index c153dda8a..76f3ad5ea 100644
--- a/AppKit/CPView.j
+++ b/AppKit/CPView.j
@@ -553,7 +553,7 @@ var CPViewFlags                     = { },
 /* @ignore */
 - (void)_setWindow:(CPWindow)aWindow
 {
-    if (_window === aWindow)
+    if (_window === aWindow || !aWindow)
         return;
 
     [[self window] _dirtyKeyViewLoop];

From f58771379518189f126cebd663776b2aa57d770d Mon Sep 17 00:00:00 2001
From: Randall Luecke <randyl@rclconcepts.com>
Date: Mon, 16 Aug 2010 14:55:44 -0500
Subject: [PATCH 25/41] This was terrible, real fix soon...Revert "Fix for
 endless loop when changing platform windows."

This reverts commit 66fcba846bdb8c99a907a7f5d8a86fffcbaa371d.
---
 AppKit/CPView.j | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AppKit/CPView.j b/AppKit/CPView.j
index 76f3ad5ea..c153dda8a 100644
--- a/AppKit/CPView.j
+++ b/AppKit/CPView.j
@@ -553,7 +553,7 @@ var CPViewFlags                     = { },
 /* @ignore */
 - (void)_setWindow:(CPWindow)aWindow
 {
-    if (_window === aWindow || !aWindow)
+    if (_window === aWindow)
         return;
 
     [[self window] _dirtyKeyViewLoop];

From 6e796d7a223dbc9831e83c40befdccbc6a53c82e Mon Sep 17 00:00:00 2001
From: Randall Luecke <randyl@rclconcepts.com>
Date: Mon, 16 Aug 2010 15:05:46 -0500
Subject: [PATCH 26/41] Fix for endless loop with default buttons.

---
 AppKit/CPButton.j          | 3 +--
 AppKit/CPWindow/CPWindow.j | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j
index 7cfe38e54..01f173f8c 100644
--- a/AppKit/CPButton.j
+++ b/AppKit/CPButton.j
@@ -569,6 +569,7 @@ CPButtonStateMixed  = CPThemeState("mixed");
 */
 - (void)setKeyEquivalent:(CPString)aString
 {
+    _keyEquivalent = aString || @"";
     // Check if the key equivalent is the enter key
     // Treat \r and \n as the same key equivalent. See issue #710.
     if (aString === CPNewlineCharacter || aString === CPCarriageReturnCharacter)
@@ -581,8 +582,6 @@ CPButtonStateMixed  = CPThemeState("mixed");
         [[self window] setDefaultButton:nil];
         [self setDefaultButton:NO];
     }
-
-    _keyEquivalent = aString || @"";
 }
 
 - (void)viewWillMoveToWindow:(CPWindow)aWindow
diff --git a/AppKit/CPWindow/CPWindow.j b/AppKit/CPWindow/CPWindow.j
index de0744e7f..71210c9a3 100644
--- a/AppKit/CPWindow/CPWindow.j
+++ b/AppKit/CPWindow/CPWindow.j
@@ -2411,7 +2411,8 @@ CPTexturedBackgroundWindowMask
 
     _defaultButton = aButton;
 
-    [_defaultButton setKeyEquivalent:CPCarriageReturnCharacter];
+    if ([_defaultButton keyEquivalent] !== CPCarriageReturnCharacter)
+        [_defaultButton setKeyEquivalent:CPCarriageReturnCharacter];
 }
 
 - (CPButton)defaultButton

From 88408fc0ea2f0a5cada2031ba02f99c0a1e36cd8 Mon Sep 17 00:00:00 2001
From: Randall Luecke <randyl@rclconcepts.com>
Date: Mon, 16 Aug 2010 15:10:29 -0500
Subject: [PATCH 27/41] Missed a couple lines in tableview custom drawing
 because of a merge conflict.

---
 AppKit/CPTableView.j | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index 1b35d6c75..bc1bc6f2b 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -2472,6 +2472,9 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     [self drawBackgroundInClipRect:exposedRect];
     [self drawGridInClipRect:exposedRect];
     [self highlightSelectionInClipRect:exposedRect];
+
+    if (_implementsCustomDrawRow)
+        [self _drawRows:_exposedRows clipRect:exposedRect];
 }
 
 - (void)drawBackgroundInClipRect:(CGRect)aRect

From d7540eea8460020eee8e774092963227baa3a500 Mon Sep 17 00:00:00 2001
From: Randall Luecke <randyl@rclconcepts.com>
Date: Tue, 17 Aug 2010 00:01:33 -0500
Subject: [PATCH 28/41] if the new proposed selection is empty the tableview
 should not deselect any rows.

---
 AppKit/CPTableView.j | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index bc1bc6f2b..005920d36 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -3306,6 +3306,10 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
             if (![_delegate tableView:self shouldSelectRow:index])
                 [newSelection removeIndex:index];
         }
+
+        // as per cocoa
+        if ([newSelection count] === 0)
+            return;
     }
 
     // if empty selection is not allowed and the new selection has nothing selected, abort

From 111ac84a6503d2b73623b626c810eee8f855342d Mon Sep 17 00:00:00 2001
From: Francisco Ryan Tolmasky I <francisco@280north.com>
Date: Tue, 17 Aug 2010 11:23:50 -0700
Subject: [PATCH 29/41] Removed unecessary whitespace.

Reviewed by me.
---
 Objective-J/Runtime.js | 102 ++++++++++++++++++++---------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/Objective-J/Runtime.js b/Objective-J/Runtime.js
index 7c4566b4e..551113132 100644
--- a/Objective-J/Runtime.js
+++ b/Objective-J/Runtime.js
@@ -53,20 +53,20 @@ DISPLAY_NAME(objj_method);
 GLOBAL(objj_class) = function(displayName)
 {
     this.isa            = NULL;
-    
+
     this.super_class    = NULL;
     this.sub_classes    = [];
-    
+
     this.name           = NULL;
     this.info           = 0;
     this.ivars          = [];
-    
+
     this.method_list    = [];
     this.method_hash    = {};
-    
+
     this.method_store   = function() { };
     this.method_dtable  = this.method_store.prototype;
-    
+
 #if DEBUG
     // naming the allocator allows the WebKit heap snapshot tool to display object class names correctly
     // HACK: displayName property is not respected so we must eval a function to name it
@@ -94,7 +94,7 @@ GLOBAL(class_getName) = function(/*Class*/ aClass)
 {
     if (aClass == Nil)
         return "";
-    
+
     return aClass.name;
 }
 
@@ -104,7 +104,7 @@ GLOBAL(class_isMetaClass) = function(/*Class*/ aClass)
 {
     if (!aClass)
         return NO;
-    
+
     return ISMETA(aClass);
 }
 
@@ -114,7 +114,7 @@ GLOBAL(class_getSuperclass) = function(/*Class*/ aClass)
 {
     if (aClass == Nil)
         return Nil;
-    
+
     return aClass.super_class;
 }
 
@@ -132,13 +132,13 @@ DISPLAY_NAME(class_setSuperclass);
 GLOBAL(class_addIvar) = function(/*Class*/ aClass, /*String*/ aName, /*String*/ aType)
 {
     var thePrototype = aClass.allocator.prototype;
-    
+
     if (typeof thePrototype[aName] != "undefined")
         return NO;
-    
-    aClass.ivars.push(new objj_ivar(aName, aType)); 
+
+    aClass.ivars.push(new objj_ivar(aName, aType));
     thePrototype[aName] = NULL;
-    
+
     return YES;
 }
 
@@ -149,7 +149,7 @@ GLOBAL(class_addIvars) = function(/*Class*/ aClass, /*Array*/ivars)
     var index = 0,
         count = ivars.length,
         thePrototype = aClass.allocator.prototype;
-        
+
     for (; index < count; ++index)
     {
         var ivar = ivars[index],
@@ -157,7 +157,7 @@ GLOBAL(class_addIvars) = function(/*Class*/ aClass, /*Array*/ivars)
 
         if (typeof thePrototype[name] === "undefined")
         {
-            aClass.ivars.push(ivar); 
+            aClass.ivars.push(ivar);
             thePrototype[name] = NULL;
         }
     }
@@ -180,10 +180,10 @@ GLOBAL(class_addMethod) = function(/*Class*/ aClass, /*SEL*/ aName, /*IMP*/ anIm
 {
     if (aClass.method_hash[aName])
         return NO;
-    
+
     var method = new objj_method(aName, anImplementation, types);
-    
-    aClass.method_list.push(method); 
+
+    aClass.method_list.push(method);
     aClass.method_dtable[aName] = method;
 
 #if DEBUG
@@ -205,18 +205,18 @@ GLOBAL(class_addMethods) = function(/*Class*/ aClass, /*Array*/ methods)
 {
     var index = 0,
         count = methods.length,
-        
+
         method_list = aClass.method_list,
         method_dtable = aClass.method_dtable;
-    
+
     for (; index < count; ++index)
     {
         var method = methods[index];
-        
+
         if (aClass.method_hash[method.name])
             continue;
-        
-        method_list.push(method); 
+
+        method_list.push(method);
         method_dtable[method.name] = method;
 
 #if DEBUG
@@ -236,9 +236,9 @@ GLOBAL(class_getInstanceMethod) = function(/*Class*/ aClass, /*SEL*/ aSelector)
 {
     if (!aClass || !aSelector)
         return NULL;
-    
+
     var method = aClass.method_dtable[aSelector];
-    
+
     return method ? method : NULL;
 }
 
@@ -250,7 +250,7 @@ GLOBAL(class_getClassMethod) = function(/*Class*/ aClass, /*SEL*/ aSelector)
         return NULL;
 
     var method = GETMETA(aClass).method_dtable[aSelector];
-    
+
     return method ? method : NULL;
 }
 
@@ -284,17 +284,17 @@ DISPLAY_NAME(class_replaceMethod);
 var _class_initialize = function(/*Class*/ aClass)
 {
     var meta = GETMETA(aClass);
-    
+
     if (GETINFO(aClass, CLS_META))
         aClass = objj_getClass(aClass.name);
-    
+
     if (aClass.super_class && !ISINITIALIZED(aClass.super_class))
         _class_initialize(aClass.super_class);
-    
+
     if (!GETINFO(meta, CLS_INITIALIZED) && !GETINFO(meta, CLS_INITIALIZING))
     {
         SETINFO(meta, CLS_INITIALIZING);
-        
+
         objj_msgSend(aClass, "initialize");
 
         CHANGEINFO(meta, CLS_INITIALIZED, CLS_INITIALIZING);
@@ -321,7 +321,7 @@ var _objj_forward = new objj_method("forward", function(self, _cmd)
 GLOBAL(class_getMethodImplementation) = function(/*Class*/ aClass, /*SEL*/ aSelector)
 {
     CLASS_GET_METHOD_IMPLEMENTATION(var implementation, aClass, aSelector);
-    
+
     return implementation;
 }
 
@@ -335,25 +335,25 @@ GLOBAL(objj_allocateClassPair) = function(/*Class*/ superclass, /*String*/ aName
     var classObject = new objj_class(aName),
         metaClassObject = new objj_class(aName),
         rootClassObject = classObject;
-    
+
     // If we don't have a superclass, we are the root class.
     if (superclass)
     {
         rootClassObject = superclass;
-        
+
         while (rootClassObject.superclass)
             rootClassObject = rootClassObject.superclass;
-        
+
         // Give our current allocator all the instance variables of our super class' allocator.
         classObject.allocator.prototype = new superclass.allocator;
-        
+
         // "Inheret" parent methods.
         classObject.method_store.prototype = new superclass.method_store;
         classObject.method_dtable = classObject.method_store.prototype;
-        
+
         metaClassObject.method_store.prototype = new superclass.isa.method_store;
         metaClassObject.method_dtable = metaClassObject.method_store.prototype;
-        
+
         // Set up the actual class hierarchy.
         classObject.super_class = superclass;
         metaClassObject.super_class = superclass.isa;
@@ -406,7 +406,7 @@ GLOBAL(class_createInstance) = function(/*Class*/ aClass)
 DISPLAY_NAME(class_createInstance);
 
 // Opera 9.5.1 has a bug where prototypes "inheret" members from instances when "with" is used.
-// Given that the Opera team is so fond of bug-testing instead of version-testing, we'll go 
+// Given that the Opera team is so fond of bug-testing instead of version-testing, we'll go
 // ahead and do that.
 
 var prototype_bug = function() { }
@@ -417,7 +417,7 @@ with (new prototype_bug())
     member = true;
 
 // If the bug exists, go down the slow path.
-if (new prototype_bug().member) 
+if (new prototype_bug().member)
 {
 
 var fast_class_createInstance = class_createInstance;
@@ -425,23 +425,23 @@ var fast_class_createInstance = class_createInstance;
 class_createInstance = function(/*Class*/ aClass)
 {
     var object = fast_class_createInstance(aClass);
-    
+
     if (object)
     {
         var theClass = object.isa,
             actualClass = theClass;
-    
+
         while (theClass)
         {
             var ivars = theClass.ivars;
                 count = ivars.length;
-            
+
             while (count--)
                 object[ivars[count].name] = NULL;
-                
+
             theClass = theClass.super_class;
         }
-        
+
         object.isa = actualClass;
     }
 
@@ -464,11 +464,11 @@ GLOBAL(object_getClassName) = function(/*id*/ anObject)
 
 DISPLAY_NAME(object_getClassName);
 
-//objc_getClassList  
+//objc_getClassList
 GLOBAL(objj_lookUpClass) = function(/*String*/ aName)
 {
     var theClass = REGISTERED_CLASSES[aName];
-    
+
     return theClass ? theClass : Nil;
 }
 
@@ -477,22 +477,22 @@ DISPLAY_NAME(objj_lookUpClass);
 GLOBAL(objj_getClass) = function(/*String*/ aName)
 {
     var theClass = REGISTERED_CLASSES[aName];
-    
+
     if (!theClass)
     {
         // class handler callback???
     }
-    
+
     return theClass ? theClass : Nil;
 }
 
 DISPLAY_NAME(objj_getClass);
 
-//objc_getRequiredClass  
+//objc_getRequiredClass
 GLOBAL(objj_getMetaClass) = function(/*String*/ aName)
 {
     var theClass = objj_getClass(aName);
-    
+
     return GETMETA(theClass);
 }
 
@@ -569,9 +569,9 @@ DISPLAY_NAME(method_getImplementation);
 GLOBAL(method_setImplementation) = function(/*Method*/ aMethod, /*IMP*/ anImplementation)
 {
     var oldImplementation = aMethod.method_imp;
-    
+
     aMethod.method_imp = anImplementation;
-    
+
     return oldImplementation;
 }
 

From bfe01badc12375ee9cfe8e4c2facdd126fa83969 Mon Sep 17 00:00:00 2001
From: Aparajita Fishman <aparajita@vasudevaserver.org>
Date: Mon, 2 Aug 2010 17:52:59 -0400
Subject: [PATCH 30/41] Radically simplified the whole theming mechanism.
 Theming can now be done declaratively with less typing, better readability,
 easier maintenance.

Also fixed some oversights in the existing themes: text was not dimmed in disabled state for segmented controls, text was not dimmed for default buttons in disabled state in HUD (IIRC).
---
 AppKit/Themes/Aristo/ThemeDescriptors.j    | 1934 ++++++++++----------
 AppKit/Themes/BlendKit/BKThemeDescriptor.j |  129 ++
 2 files changed, 1133 insertions(+), 930 deletions(-)

diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index ec1245de8..3130fe1f7 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -1,5 +1,5 @@
 /*
- * AppController.j
+ * ThemeDescriptors.j
  * Aristo
  *
  * Created by Francisco Tolmasky.
@@ -10,6 +10,210 @@
 @import <AppKit/AppKit.j>
 @import <AppKit/CPTableHeaderView.j>
 
+/*
+    HOW TO ADD OR MODIFY THEMED ELEMENTS
+    
+    This file serves both as a means of defining default theme values
+    and of defining an interface for the automatically generated theme showcase,
+    so you have to keep both in mind.
+    
+    Let's say you define a new view class and you want to theme it.
+    Here's how to do it with minimum work.
+    
+    1. Define +themeAttributes in your class if you define custom attributes.
+    
+    2. If you want a custom name to appear in the theme showcase, define +themeClass
+       and return a string with the name all in lowercase and words separated by
+       dashes. If you don't provide +themeClass, Cappuccino will separate the themed
+       class name into words at each uppercased letter followed by lowercase letters.
+       
+    3. Use the following template for defining your themed view (using a calendar view as an example).
+       Note that we make a separate method for creating and configuring the view.
+       This is to more clearly separate the two functions of ThemeDescriptors.j (defining
+       themes and defining the showcase interface), and also to allow us to easily reuse
+       the creation/configuration code if we make a HUD version of our themed view.
+    
+    // Create a private variable to hold the theme values, we can share this with the HUD theme
+    var themedCalendarViewValues = nil;
+    
+    + (CPCalendarView)makeCalendarView
+    {
+        // Define the size of the sample that will appear in the theme showcase. 
+        // The maximum width/height is around 180 pixels.
+        
+        var calendar = [[CPCalendarView alloc] initWithFrame:CGRectMake(0.0, 0.0, 150.0, 100.0)];
+        
+        // Do any other initialization of the calendar you want to do here. In this case
+        // we want the calendar to show our birthdate instead of the current date.
+        [calendar setDate:new Date(1961, 2, 30)];
+        
+        return calendar;
+    }
+    
+    + (CPCalendarView)themedCalendarView
+    {
+        var calendar = [self makeCalendarView],
+        
+            // Now define some pattern colors. We want to define the bezel for the calendar
+            // using a nine part image, which consists of nine slices in the order top/left,
+            // top, top/right, left, center, right, bottom/left, bottom, bottom/right.
+            // We can do this declaritively using the PatternColor function, which takes an array
+            // of slice declarations, with each declaration being an array of [filename, width, height].
+            
+            bezelColor = PatternColor(
+                [
+                    [@"calendar-bezel-0.png", 10.0, 10.0],
+                    [@"calendar-bezel-1.png", 1.0,  10.0],
+                    [@"calendar-bezel-2.png", 10.0, 10.0],
+                    [@"calendar-bezel-3.png", 10.0, 1.0],
+                    [@"calendar-bezel-4.png", 1.0,  1.0],
+                    [@"calendar-bezel-5.png", 10.0, 1.0],
+                    [@"calendar-bezel-6.png", 10.0, 10.0],
+                    [@"calendar-bezel-7.png", 1.0,  10.0],
+                    [@"calendar-bezel-8.png", 10.0, 10.0]
+                ]),
+                
+            // Define an alternate bezel for when the calendar is disabled.
+            
+            disabledBezelColor = PatternColor(
+                [
+                    [@"calendar-disabled-bezel-0.png", 10.0, 10.0],
+                    [@"calendar-disabled-bezel-1.png", 1.0,  10.0],
+                    [@"calendar-disabled-bezel-2.png", 10.0, 10.0],
+                    [@"calendar-disabled-bezel-3.png", 10.0, 1.0],
+                    [@"calendar-disabled-bezel-4.png", 1.0,  1.0],
+                    [@"calendar-disabled-bezel-5.png", 10.0, 1.0],
+                    [@"calendar-disabled-bezel-6.png", 10.0, 10.0],
+                    [@"calendar-disabled-bezel-7.png", 1.0,  10.0],
+                    [@"calendar-disabled-bezel-8.png", 10.0, 10.0]
+                ]),
+                
+            // We would like the font to be dark blue and lighter blue when disabled
+            
+            textColor = [CPColor colorWithHexString:@"001B48"],
+            disabledTextColor = [textColor colorWithAlphaComponent:0.6];
+                
+        // Now we will define our theme values. These are done declaratively in an array,
+        // where each element is an array of 2 or 3 values: attribute name, value, and optional state.
+        
+        themedCalendarViewValues =
+        [
+            [@"bezel-color",    bezelColor],
+            [@"bezel-color",    disabledBezelColor,     CPThemeStateDisabled],
+            
+            [@"text-color",     textColor],
+            [@"text-color",     disabledTextColor,      CPThemeStateDisabled],
+            
+            // We will also define a minimum size
+            [@"min-size",       CGSizeMake(100.0, 100.0)]
+        ];
+        
+        // Now we just pass our values to utility function
+        
+        SetThemeValues(calendar, themedCalendarViewValues);
+    }
+    
+    That's all there is to it. Note that PatternColor can also be used to create a simple
+    patterned color:
+    
+    color = PatternColor(filename, width, height);
+    
+    It can also be used to create a three part image by specifying three images slices
+    with [filename, width, height] and an orientation:
+    
+    trackColor = PatternColor(
+    [
+        ["horizontal-track-left.png",   4.0, 5.0],
+        ["horizontal-track-center.png", 1.0, 5.0],
+        ["horizontal-track-right.png",  4.0, 5.0]
+    ],
+    PatternIsHorizontal);
+    
+    trackColor = PatternColor(
+    [
+        ["vertical-track-top.png",    5.0, 6.0],
+        ["vertical-track-center.png", 5.0, 1.0],
+        ["vertical-track-bottom.png", 5.0, 4.0]
+    ],
+    PatternIsVertical);
+
+    
+    HUD THEMES
+    
+    If you want to modify the look of your view when it is within a HUD window,
+    follow these steps:
+    
+    1. Decide which elements will be changed and which will stay the same.
+       For example, in a HUD window you may want to use a dark or black background
+       and white text.
+       
+    2. If you are using different color pattern artwork, use the same filename as
+       the main theme but put it in the HUD directory of the main theme directory.
+       
+    3. In the HUD class (such as AristoHUDThemeDescriptor), add a method with this template:
+    
+    + (CPCalendarView)themedCalendarView
+    {
+        var calendar = [AristoThemeDescriptor makeCalendarView];
+        
+        SetHUDThemeValues(calendar, themedCalendarViewValues);
+        
+        return calendar;
+    }
+    
+    In many cases that's all you need to do! SetHUDThemeValues() does the following:
+    
+    - Finds all colors defined with a pattern image, and redirects them to an image
+      with the same filename in the HUD directory.
+      
+    - Converts any "text-color" attributes to white in the normal state and
+      [CPColor colorWithCalibratedWhite:1.0 alpha:0.6] in the disabled state.
+      
+    - Converts any "text-shadow-color" to black.
+    
+    - Converts any "text-shadow-offset" to (-1.0, -1.0).
+    
+    These are the standards used by Aristo-HUD. If you want to override these defaults,
+    you can declare an array of overrides and pass it to SetHUDThemeValues().
+    For example, let's say with our calendar we decide to do the following for HUD:
+    
+    - Use a different, dark background bezel in normal state
+    - Use the same bezel in disabled state
+    - Use light blue text in normal state with a dark blue shadow
+    - Use the same text color with alpha 0.6 in disabled state
+    
+    Here is our modified method:
+    
+    + (CPCalendarView)themedCalendarView
+    {
+        var calendar = [AristoThemeDescriptor makeCalendarView],
+        
+            textColor = [CPColor colorWithHexString:@"#EEF3FF"],
+            disabledTextColor = [textColor colorWithAlphaComponent:0.6],
+        
+            overrides =
+            [
+                // We don't have to specify the normal bezel, that will be
+                // used automatically from the HUD directory. But we have
+                // to remove the disabled bezel by passing a nil value.
+                
+                [@"bezel-color", nil, CPThemeStateDisabled],
+                
+                // Now override the text colors
+                
+                [@"text-color", textColor],
+                [@"text-color", disabledTextColor, CPThemeStateDisabled]
+            ];
+    
+        // Pass the overrides when setting the theme values
+        
+        SetHUDThemeValues(calendar, themedCalendarViewValues, overrides);
+    
+        return calendar;
+    }
+    
+    That's it!
+*/
 
 @implementation AristoThemeDescriptor : BKThemeDescriptor
 {
@@ -20,81 +224,96 @@
     return @"Aristo";
 }
 
+var themedButtonValues = nil;
+
++ (CPButton)makeButton
+{
+    return [[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 24.0)];
+}
+
 + (CPButton)button
 {
-    var button = [[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 24.0)],
+    var button = [self makeButton],
 
-        bezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        bezelColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-right.png" size:CGSizeMake(4.0, 24.0)]
-            ]
-        isVertical:NO]],
+                ["button-bezel-left.png", 4.0, 24.0],
+                ["button-bezel-center.png", 1.0, 24.0],
+                ["button-bezel-right.png", 4.0, 24.0]
+            ],
+            PatternIsHorizontal),
 
-        highlightedBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        highlightedBezelColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-highlighted-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-highlighted-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-highlighted-right.png" size:CGSizeMake(4.0, 24.0)]
-            ]
-        isVertical:NO]],
+                ["button-bezel-highlighted-left.png", 4.0, 24.0],
+                ["button-bezel-highlighted-center.png", 1.0, 24.0],
+                ["button-bezel-highlighted-right.png", 4.0, 24.0]
+            ],
+            PatternIsHorizontal),
 
-        defaultBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        defaultBezelColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"default-button-bezel-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"default-button-bezel-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"default-button-bezel-right.png" size:CGSizeMake(4.0, 24.0)]
-            ]
-        isVertical:NO]],
+                ["default-button-bezel-left.png", 4.0, 24.0],
+                ["default-button-bezel-center.png", 1.0, 24.0],
+                ["default-button-bezel-right.png", 4.0, 24.0]
+            ],
+            PatternIsHorizontal),
 
-        defaultHighlightedBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        defaultHighlightedBezelColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"default-button-bezel-highlighted-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"default-button-bezel-highlighted-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"default-button-bezel-highlighted-right.png" size:CGSizeMake(4.0, 24.0)]
-            ]
-        isVertical:NO]],
+                ["default-button-bezel-highlighted-left.png", 4.0, 24.0],
+                ["default-button-bezel-highlighted-center.png", 1.0, 24.0],
+                ["default-button-bezel-highlighted-right.png", 4.0, 24.0]
+            ],
+            PatternIsHorizontal),
 
-        defaultDisabledBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        defaultDisabledBezelColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"default-button-bezel-disabled-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"default-button-bezel-disabled-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"default-button-bezel-disabled-right.png" size:CGSizeMake(4.0, 24.0)]
-            ]
-        isVertical:NO]],
+                ["default-button-bezel-disabled-left.png", 4.0, 24.0],
+                ["default-button-bezel-disabled-center.png", 1.0, 24.0],
+                ["default-button-bezel-disabled-right.png", 4.0, 24.0]
+            ],
+            PatternIsHorizontal),
         
-        disabledBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        disabledBezelColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-disabled-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-disabled-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-disabled-right.png" size:CGSizeMake(4.0, 24.0)]
-            ]
-        isVertical:NO]];
+                ["button-bezel-disabled-left.png", 4.0, 24.0],
+                ["button-bezel-disabled-center.png", 1.0, 24.0],
+                ["button-bezel-disabled-right.png", 4.0, 24.0]
+            ],
+            PatternIsHorizontal),
+            
+        defaultTextColor = [CPColor colorWithCalibratedRed:13.0/255.0 green:51.0/255.0 blue:70.0/255.0 alpha:1.0],
+        defaultDisabledTextColor = [CPColor colorWithCalibratedRed:13.0/255.0 green:51.0/255.0 blue:70.0/255.0 alpha:0.6];
+        
+    themedButtonValues = 
+        [
+            [@"font",               [CPFont boldSystemFontOfSize:12.0], CPThemeStateBordered],
+            [@"text-color",         [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0]],
+            [@"text-shadow-color",  [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0], CPThemeStateBordered],
+            [@"text-shadow-color",  [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0], CPThemeStateBordered | CPThemeStateDisabled],
+            [@"text-shadow-offset", CGSizeMake(0.0, 1.0), CPThemeStateBordered],
+            [@"line-break-mode",    CPLineBreakByTruncatingTail],
+            [@"content-inset",      CGInsetMake(0.0, 5.0, 0.0, 5.0), CPThemeStateBordered],
+            
+            [@"bezel-color",        bezelColor,             CPThemeStateBordered],
+            [@"bezel-color",        highlightedBezelColor,  CPThemeStateBordered | CPThemeStateHighlighted],
+            
+            [@"text-color",         [CPColor colorWithCalibratedWhite:0.6 alpha:1.0],   CPThemeStateDisabled],
+            [@"bezel-color",        disabledBezelColor,                                 CPThemeStateBordered | CPThemeStateDisabled],
+            [@"bezel-color",        defaultDisabledBezelColor,                          CPThemeStateBordered | CPThemeStateDefault | CPThemeStateDisabled],
+            
+            [@"text-color",         defaultTextColor,               CPThemeStateDefault],
+            [@"text-color",         defaultDisabledTextColor,       CPThemeStateDefault | CPThemeStateDisabled],
+            [@"bezel-color",        defaultBezelColor,              CPThemeStateBordered | CPThemeStateDefault],
+            [@"bezel-color",        defaultHighlightedBezelColor,   CPThemeStateBordered | CPThemeStateHighlighted | CPThemeStateDefault],
+            
+            [@"min-size",           CGSizeMake(0.0, 24.0)],
+            [@"max-size",           CGSizeMake(-1.0, 24.0)]
+        ];
 
-    [button setValue:[CPFont boldSystemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBordered];
-    [button setValue:[CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-color"];
-    [button setValue:[CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateBordered];
-    [button setValue:[CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:0.6] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateBordered|CPThemeStateDisabled];
-    [button setValue:CGSizeMake(0.0, 1.0) forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateBordered];
-    [button setValue:CPLineBreakByTruncatingTail forThemeAttribute:@"line-break-mode"];
+    SetThemeValues(button, themedButtonValues);
     
-    [button setValue:bezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
-    [button setValue:highlightedBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateHighlighted];
-    [button setValue:CGInsetMake(0.0, 5.0, 0.0, 5.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBordered];
-
-    [button setValue:[CPColor colorWithCalibratedWhite:0.6 alpha:1.0] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled];
-    [button setValue:disabledBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateDisabled];
-    [button setValue:defaultDisabledBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateDefault|CPThemeStateDisabled];
-    
-    [button setValue:defaultBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateDefault];
-    [button setValue:defaultHighlightedBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateHighlighted|CPThemeStateDefault];
-    [button setValue:[CPColor colorWithCalibratedRed:13.0/255.0 green:51.0/255.0 blue:70.0/255.0 alpha:1.0] forThemeAttribute:@"text-color" inState:CPThemeStateDefault];
-    [button setValue:[CPColor colorWithCalibratedRed:13.0/255.0 green:51.0/255.0 blue:70.0/255.0 alpha:0.6] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled|CPThemeStateDefault];
-
-    [button setValue:CGSizeMake(0.0, 24.0) forThemeAttribute:@"min-size"];
-    [button setValue:CGSizeMake(-1.0, 24.0) forThemeAttribute:@"max-size"];
-
     return button;
 }
 
@@ -120,40 +339,43 @@
 + (CPPopUpButton)themedPopUpButton
 {
     var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 24.0) pullsDown:NO],
-        color = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        color = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"popup-bezel-right.png" size:CGSizeMake(27.0, 24.0)]
-            ]
-        isVertical:NO]];
+                ["button-bezel-left.png", 4.0, 24.0],
+                ["button-bezel-center.png", 1.0, 24.0],
+                ["popup-bezel-right.png", 27.0, 24.0]
+            ],
+            PatternIsHorizontal),
 
-    var disabledBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        disabledColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-disabled-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-disabled-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"popup-bezel-disabled-right.png" size:CGSizeMake(27.0, 24.0)]
-            ]
-        isVertical:NO]];
+                ["button-bezel-disabled-left.png", 4.0, 24.0],
+                ["button-bezel-disabled-center.png", 1.0, 24.0],
+                ["popup-bezel-disabled-right.png", 27.0, 24.0]
+            ],
+            PatternIsHorizontal),
             
-    [button setTitle:@"Pop Up"];
+        themeValues = 
+        [
+            [@"bezel-color",        color,          CPThemeStateBordered],
+            [@"bezel-color",        disabledColor,  CPThemeStateBordered | CPThemeStateDisabled],
+                                    
+            [@"content-inset",      CGInsetMake(0, 27.0 + 5.0, 0, 5.0), CPThemeStateBordered],
+            [@"font",               [CPFont boldSystemFontOfSize:12.0]],
+            [@"text-color",         [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0]],
+            [@"text-shadow-color",  [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0]],
+
+            [@"text-color",         [CPColor colorWithCalibratedWhite:0.6 alpha:1.0],           CPThemeStateBordered | CPThemeStateDisabled],
+            [@"text-shadow-color",  [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:0.6], CPThemeStateBordered | CPThemeStateDisabled],
+            
+            [@"min-size",           CGSizeMake(32.0, 24.0)],
+            [@"max-size",           CGSizeMake(-1.0, 24.0)]
+        ];
+            
+    SetThemeValues(button, themeValues);
     
-    [button setValue:color forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
-    [button setValue:disabledBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateDisabled];
-
-    [button setValue:CGInsetMake(0, 27.0 + 5.0, 0, 5.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBordered];
-    [button setValue:[CPFont boldSystemFontOfSize:12.0] forThemeAttribute:@"font"];
-    [button setValue:[CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-color"];
-    [button setValue:[CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-shadow-color"];
-    [button setValue:CGSizeMake(0.0, 1.0) forThemeAttribute:@"text-shadow-offset"];
-
-    [button setValue:CGSizeMake(32.0, 24.0) forThemeAttribute:@"min-size"];
-    [button setValue:CGSizeMake(-1.0, 24.0) forThemeAttribute:@"max-size"];    
-
+    [button setTitle:@"Pop Up"];
     [button addItemWithTitle:@"item"];
-
-    [button setValue:[CPColor colorWithCalibratedWhite:0.6 alpha:1.0] forThemeAttribute:@"text-color" inState:CPThemeStateBordered|CPThemeStateDisabled];
-    [button setValue:[CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:0.6] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateBordered|CPThemeStateDisabled];
     
     return button;
 }
@@ -161,399 +383,468 @@
 + (CPPopUpButton)themedPullDownMenu
 {
     var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 24.0) pullsDown:YES],
-        color = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        color = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"popup-bezel-right-pullsdown.png" size:CGSizeMake(27.0, 24.0)]
-            ]
-        isVertical:NO]];
+                ["button-bezel-left.png", 4.0, 24.0],
+                ["button-bezel-center.png", 1.0, 24.0],
+                ["popup-bezel-right-pullsdown.png", 27.0, 24.0]
+            ],
+            PatternIsHorizontal),
 
-    var disabledColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        disabledColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-disabled-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"button-bezel-disabled-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"popup-bezel-disabled-right-pullsdown.png" size:CGSizeMake(27.0, 24.0)]
-            ]
-        isVertical:NO]];
+                ["button-bezel-disabled-left.png", 4.0, 24.0],
+                ["button-bezel-disabled-center.png", 1.0, 24.0],
+                ["popup-bezel-disabled-right-pullsdown.png", 27.0, 24.0]
+            ],
+            PatternIsHorizontal),
+            
+        themeValues = 
+        [
+            [@"bezel-color",        color,          CPPopUpButtonStatePullsDown | CPThemeStateBordered],
+            [@"bezel-color",        disabledColor,  CPPopUpButtonStatePullsDown | CPThemeStateBordered | CPThemeStateDisabled],
+                                
+            [@"content-inset",      CGInsetMake(0, 27.0 + 5.0, 0, 5.0), CPThemeStateBordered],
+            [@"font",               [CPFont boldSystemFontOfSize:12.0]],
+            [@"text-color",         [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0]],
+            [@"text-shadow-color",  [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0]],
 
+            [@"text-color",         [CPColor colorWithCalibratedWhite:0.6 alpha:1.0],           CPThemeStateBordered | CPThemeStateDisabled],
+            [@"text-shadow-color",  [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:0.6], CPThemeStateBordered | CPThemeStateDisabled],
+        
+            [@"min-size",           CGSizeMake(32.0, 24.0)],
+            [@"max-size",           CGSizeMake(-1.0, 24.0)]
+        ];
+
+    SetThemeValues(button, themeValues);
+    
     [button setTitle:@"Pull Down"];
-
-    [button setValue:color forThemeAttribute:@"bezel-color" inState:CPPopUpButtonStatePullsDown|CPThemeStateBordered];
-    [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled|CPPopUpButtonStatePullsDown|CPThemeStateBordered];
-
-    [button setValue:CGInsetMake(0, 27.0 + 5.0, 0, 5.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBordered];
-    [button setValue:[CPFont boldSystemFontOfSize:12.0] forThemeAttribute:@"font"];
-    [button setValue:[CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-color"];
-    [button setValue:[CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-shadow-color"];
-    [button setValue:CGSizeMake(0.0, 1.0) forThemeAttribute:@"text-shadow-offset"];
-
-    [button setValue:CGSizeMake(32.0, 24.0) forThemeAttribute:@"min-size"];
-    [button setValue:CGSizeMake(-1.0, 24.0) forThemeAttribute:@"max-size"];
-
-    [button setValue:[CPColor colorWithCalibratedWhite:0.6 alpha:1.0] forThemeAttribute:@"text-color" inState:CPThemeStateBordered|CPThemeStateDisabled];
-    [button setValue:[CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:0.6] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateBordered|CPThemeStateDisabled];
-
     [button addItemWithTitle:@"item"];
 
     return button;
 }
 
-+ (CPScroller)themedVerticalScroller
+var themedVerticalScrollerValues = nil;
+
++ (CPScroller)makeVerticalScroller
 {
-    var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 15.0, 170.0)],
-        trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-vertical-track.png" size:CGSizeMake(15.0, 1.0)]),
-        disabledTrackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-vertical-track-disabled.png" size:CGSizeMake(15.0, 1.0)]);
-        
-    [scroller setValue:21.0 forThemeAttribute:@"minimum-knob-length" inState:CPThemeStateVertical];
-    [scroller setValue:CGInsetMake(0.0, 0.0, 0.0, 0.0) forThemeAttribute:@"knob-inset" inState:CPThemeStateVertical];
-    [scroller setValue:CGInsetMake(-10.0, 0.0, -10.0, 0.0) forThemeAttribute:@"track-inset" inState:CPThemeStateVertical];
-
-    [scroller setValue:trackColor forThemeAttribute:@"knob-slot-color" inState:CPThemeStateVertical];
-    [scroller setValue:disabledTrackColor forThemeAttribute:@"knob-slot-color" inState:CPThemeStateVertical | CPThemeStateDisabled];
-
-    var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-up-arrow.png" size:CGSizeMake(15.0, 24.0)]),
-        highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-up-arrow-highlighted.png" size:CGSizeMake(15.0, 24.0)]),
-        disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-up-arrow-disabled.png" size:CGSizeMake(15.0, 24.0)]);
-
-    [scroller setValue:CGSizeMake(15.0, 24.0) forThemeAttribute:@"decrement-line-size" inState:CPThemeStateVertical];
-    [scroller setValue:arrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateVertical];
-    [scroller setValue:highlightedArrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateVertical | CPThemeStateHighlighted],
-    [scroller setValue:disabledArrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateVertical | CPThemeStateDisabled];
-
-    var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-down-arrow.png" size:CGSizeMake(15.0, 24.0)]),
-        highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-down-arrow-highlighted.png" size:CGSizeMake(15.0, 24.0)]),
-        disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-down-arrow-disabled.png" size:CGSizeMake(15.0, 24.0)]);
-
-    [scroller setValue:CGSizeMake(15.0, 24.0) forThemeAttribute:@"increment-line-size" inState:CPThemeStateVertical];
-    [scroller setValue:arrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateVertical];
-    [scroller setValue:highlightedArrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateVertical | CPThemeStateHighlighted];
-    [scroller setValue:disabledArrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateVertical | CPThemeStateDisabled];
-    
-    var knobColor = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"scroller-vertical-knob-top.png" size:CGSizeMake(15.0, 10.0)],
-                [_CPCibCustomResource imageResourceWithName:"scroller-vertical-knob-center.png" size:CGSizeMake(15.0, 1.0)],
-                [_CPCibCustomResource imageResourceWithName:"scroller-vertical-knob-bottom.png" size:CGSizeMake(15.0, 10.0)]
-            ]
-        isVertical:YES]);
-
-    var knobDisabledColor = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"scroller-vertical-knob-disabled-top.png" size:CGSizeMake(15.0, 10.0)],
-                [_CPCibCustomResource imageResourceWithName:"scroller-vertical-knob-disabled-center.png" size:CGSizeMake(15.0, 1.0)],
-                [_CPCibCustomResource imageResourceWithName:"scroller-vertical-knob-disabled-bottom.png" size:CGSizeMake(15.0, 10.0)]
-            ]
-        isVertical:YES]);
-    
-    [scroller setValue:knobColor forThemeAttribute:@"knob-color" inState:CPThemeStateVertical];
-    [scroller setValue:knobDisabledColor forThemeAttribute:@"knob-color" inState:CPThemeStateVertical|CPThemeStateDisabled];
+    var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 15.0, 170.0)];
     
     [scroller setFloatValue:0.1];
     [scroller setKnobProportion:0.5];
+    
+    return scroller;
+}
 
++ (CPScroller)themedVerticalScroller
+{
+    var scroller = [self makeVerticalScroller],
+        trackColor = PatternColor("scroller-vertical-track.png", 15.0, 1.0),
+        disabledTrackColor = PatternColor("scroller-vertical-track-disabled.png", 15.0, 1.0),
+        
+        upArrowColor = PatternColor("scroller-up-arrow.png", 15.0, 24.0),
+        highlightedUpArrowColor = PatternColor("scroller-up-arrow-highlighted.png", 15.0, 24.0),
+        disabledUpArrowColor = PatternColor("scroller-up-arrow-disabled.png", 15.0, 24.0),
+        
+        downArrowColor = PatternColor("scroller-down-arrow.png", 15.0, 24.0),
+        highlightedDownArrowColor = PatternColor("scroller-down-arrow-highlighted.png", 15.0, 24.0),
+        disabledDownArrowColor = PatternColor("scroller-down-arrow-disabled.png", 15.0, 24.0),
+        
+        knobColor = PatternColor(
+            [
+                ["scroller-vertical-knob-top.png", 15.0, 10.0],
+                ["scroller-vertical-knob-center.png", 15.0, 1.0],
+                ["scroller-vertical-knob-bottom.png", 15.0, 10.0]
+            ],
+            PatternIsVertical),
+            
+        disabledKnobColor = PatternColor(
+            [
+                ["scroller-vertical-knob-disabled-top.png", 15.0, 10.0],
+                ["scroller-vertical-knob-disabled-center.png", 15.0, 1.0],
+                ["scroller-vertical-knob-disabled-bottom.png", 15.0, 10.0]
+            ],
+            PatternIsVertical);
+            
+    themedVerticalScrollerValues =
+        [
+            [@"minimum-knob-length",    21.0,                                   CPThemeStateVertical],
+            [@"knob-inset",             CGInsetMake(0.0, 0.0, 0.0, 0.0),        CPThemeStateVertical],
+            [@"track-inset",            CGInsetMake(-10.0, 0.0, -10.0, 0.0),    CPThemeStateVertical],
+            
+            [@"knob-color",             knobColor,                  CPThemeStateVertical],
+            [@"knob-color",             disabledKnobColor,          CPThemeStateVertical | CPThemeStateDisabled],
+            
+            [@"knob-slot-color",        trackColor,                 CPThemeStateVertical],
+            [@"knob-slot-color",        disabledTrackColor,         CPThemeStateVertical | CPThemeStateDisabled],
+            
+            [@"decrement-line-size",    CGSizeMake(15.0, 24.0),     CPThemeStateVertical],
+            [@"decrement-line-color",   upArrowColor,               CPThemeStateVertical],
+            [@"decrement-line-color",   highlightedUpArrowColor,    CPThemeStateVertical | CPThemeStateHighlighted],
+            [@"decrement-line-color",   disabledUpArrowColor,       CPThemeStateVertical | CPThemeStateDisabled],
+            
+            [@"increment-line-size",    CGSizeMake(15.0, 24.0),     CPThemeStateVertical],
+            [@"increment-line-color",   downArrowColor,             CPThemeStateVertical],
+            [@"increment-line-color",   highlightedDownArrowColor,  CPThemeStateVertical | CPThemeStateHighlighted],
+            [@"increment-line-color",   disabledDownArrowColor,     CPThemeStateVertical | CPThemeStateDisabled]
+        ];
+                
+    SetThemeValues(scroller, themedVerticalScrollerValues);
+    
+    return scroller;
+}
+
+var themedHorizontalScrollerValues = nil;
+
++ (CPScroller)makeHorizontalScroller
+{
+    var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 170.0, 15.0)];
+    
+    [scroller setFloatValue:0.1];
+    [scroller setKnobProportion:0.5];
+    
     return scroller;
 }
 
 + (CPScroller)themedHorizontalScroller
 {
-    var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 170.0, 15.0)],
-        trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-horizontal-track.png" size:CGSizeMake(1.0, 15.0)]),
-        disabledTrackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-horizontal-track-disabled.png" size:CGSizeMake(1.0, 15.0)]);
+    var scroller = [self makeHorizontalScroller],
+        trackColor = PatternColor("scroller-horizontal-track.png", 1.0, 15.0),
+        disabledTrackColor = PatternColor("scroller-horizontal-track-disabled.png", 1.0, 15.0),
+        
+        leftArrowColor = PatternColor("scroller-left-arrow.png", 24.0, 15.0),
+        highlightedLeftArrowColor = PatternColor("scroller-left-arrow-highlighted.png", 24.0, 15.0),
+        disabledLeftArrowColor = PatternColor("scroller-left-arrow-disabled.png", 24.0, 15.0),
+        
+        rightArrowColor = PatternColor("scroller-right-arrow.png", 24.0, 15.0),
+        highlightedRightArrowColor = PatternColor("scroller-right-arrow-highlighted.png", 24.0, 15.0),
+        disabledRightArrowColor = PatternColor("scroller-right-arrow-disabled.png", 24.0, 15.0),
+        
+        knobColor = PatternColor(
+            [
+                ["scroller-horizontal-knob-left.png", 10.0, 15.0],
+                ["scroller-horizontal-knob-center.png", 1.0, 15.0],
+                ["scroller-horizontal-knob-right.png", 10.0, 15.0]
+            ],
+            PatternIsHorizontal),
+            
+        disabledKnobColor = PatternColor(
+            [
+                ["scroller-horizontal-knob-disabled-left.png", 10.0, 15.0],
+                ["scroller-horizontal-knob-disabled-center.png", 1.0, 15.0],
+                ["scroller-horizontal-knob-disabled-right.png", 10.0, 15.0]
+            ],
+            PatternIsHorizontal);
+            
+    themedHorizontalScrollerValues = 
+        [
+            [@"minimum-knob-length",    21.0],
+            [@"knob-inset",             CGInsetMake(0.0, 0.0, 0.0, 0.0)],
+            [@"track-inset",            CGInsetMake(0.0, -10.0, 0.0, -11.0)],
+        
+            [@"knob-color",             knobColor],
+            [@"knob-color",             disabledKnobColor,          CPThemeStateDisabled],
+        
+            [@"knob-slot-color",        trackColor],
+            [@"knob-slot-color",        disabledTrackColor,         CPThemeStateDisabled],
+        
+            [@"decrement-line-size",    CGSizeMake(24.0, 15.0)],
+            [@"decrement-line-color",   leftArrowColor],
+            [@"decrement-line-color",   highlightedLeftArrowColor,  CPThemeStateHighlighted],
+            [@"decrement-line-color",   disabledLeftArrowColor,     CPThemeStateDisabled],
+        
+            [@"increment-line-size",    CGSizeMake(24.0, 15.0)],
+            [@"increment-line-color",   rightArrowColor],
+            [@"increment-line-color",   highlightedRightArrowColor, CPThemeStateHighlighted],
+            [@"increment-line-color",   disabledRightArrowColor,    CPThemeStateDisabled]
+        ];
 
-    [scroller setValue:21.0 forThemeAttribute:@"minimum-knob-length"];
-    [scroller setValue:CGInsetMake(0.0, 0.0, 0.0, 0.0) forThemeAttribute:@"knob-inset"];
-    [scroller setValue:CGInsetMake(0.0, -10.0, 0.0, -11.0) forThemeAttribute:@"track-inset"];
-
-    [scroller setValue:trackColor forThemeAttribute:@"knob-slot-color"];
-    [scroller setValue:disabledTrackColor forThemeAttribute:@"knob-slot-color" inState:CPThemeStateDisabled];
-
-    var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-left-arrow.png" size:CGSizeMake(24.0, 15.0)]),
-        highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-left-arrow-highlighted.png" size:CGSizeMake(24.0, 15.0)]),
-        disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-left-arrow-disabled.png" size:CGSizeMake(24.0, 15.0)]);
-
-    [scroller setValue:CGSizeMake(24.0, 15.0) forThemeAttribute:@"decrement-line-size"];
-    [scroller setValue:arrowColor forThemeAttribute:@"decrement-line-color"];
-    [scroller setValue:highlightedArrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateHighlighted],
-    [scroller setValue:disabledArrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateDisabled];
-
-    var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-right-arrow.png" size:CGSizeMake(24.0, 15.0)]),
-        highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-right-arrow-highlighted.png" size:CGSizeMake(24.0, 15.0)]),
-        disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-right-arrow-disabled.png" size:CGSizeMake(24.0, 15.0)]);
-
-    [scroller setValue:CGSizeMake(24.0, 15.0) forThemeAttribute:@"increment-line-size"];
-    [scroller setValue:arrowColor forThemeAttribute:@"increment-line-color"];
-    [scroller setValue:highlightedArrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateHighlighted];
-    [scroller setValue:disabledArrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateDisabled];
+    SetThemeValues(scroller, themedHorizontalScrollerValues);
     
-    var knobColor = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"scroller-horizontal-knob-left.png" size:CGSizeMake(10.0, 15.0)],
-                [_CPCibCustomResource imageResourceWithName:"scroller-horizontal-knob-center.png" size:CGSizeMake(1.0, 15.0)],
-                [_CPCibCustomResource imageResourceWithName:"scroller-horizontal-knob-right.png" size:CGSizeMake(10.0, 15.0)]
-            ]
-        isVertical:NO]);
-
-    var knobDisabledColor = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"scroller-horizontal-knob-disabled-left.png" size:CGSizeMake(10.0, 15.0)],
-                [_CPCibCustomResource imageResourceWithName:"scroller-horizontal-knob-disabled-center.png" size:CGSizeMake(1.0, 15.0)],
-                [_CPCibCustomResource imageResourceWithName:"scroller-horizontal-knob-disabled-right.png" size:CGSizeMake(10.0, 15.0)]
-            ]
-        isVertical:NO]);
-
-    [scroller setValue:knobColor forThemeAttribute:@"knob-color"];
-    [scroller setValue:knobDisabledColor forThemeAttribute:@"knob-color" inState:CPThemeStateDisabled];
-
-    [scroller setFloatValue:0.1];
-    [scroller setKnobProportion:0.5];
-
     return scroller;
 }
 
 + (CPTextField)themedStandardTextField
 {
     var textfield = [[CPTextField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 29.0)],
-        bezelColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+    
+        bezelColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-0.png" size:CGSizeMake(2.0, 3.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-1.png" size:CGSizeMake(1.0, 3.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-2.png" size:CGSizeMake(2.0, 3.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-3.png" size:CGSizeMake(2.0, 1.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-4.png" size:CGSizeMake(1.0, 1.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-5.png" size:CGSizeMake(2.0, 1.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-6.png" size:CGSizeMake(2.0, 2.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-7.png" size:CGSizeMake(1.0, 2.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-8.png" size:CGSizeMake(2.0, 2.0)]
-            ]]],
+                ["textfield-bezel-square-0.png", 2.0, 3.0],
+                ["textfield-bezel-square-1.png", 1.0, 3.0],
+                ["textfield-bezel-square-2.png", 2.0, 3.0],
+                ["textfield-bezel-square-3.png", 2.0, 1.0],
+                ["textfield-bezel-square-4.png", 1.0, 1.0],
+                ["textfield-bezel-square-5.png", 2.0, 1.0],
+                ["textfield-bezel-square-6.png", 2.0, 2.0],
+                ["textfield-bezel-square-7.png", 1.0, 2.0],
+                ["textfield-bezel-square-8.png", 2.0, 2.0]
+            ]),
 
-        bezelFocusedColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+        bezelFocusedColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-focused-0.png" size:CGSizeMake(6.0, 7.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-focused-1.png" size:CGSizeMake(1.0, 7.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-focused-2.png" size:CGSizeMake(6.0, 7.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-focused-3.png" size:CGSizeMake(6.0, 1.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-focused-4.png" size:CGSizeMake(1.0, 1.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-focused-5.png" size:CGSizeMake(6.0, 1.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-focused-6.png" size:CGSizeMake(6.0, 5.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-focused-7.png" size:CGSizeMake(1.0, 5.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-square-focused-8.png" size:CGSizeMake(6.0, 5.0)]
-            ]]];
+                ["textfield-bezel-square-focused-0.png", 6.0, 7.0],
+                ["textfield-bezel-square-focused-1.png", 1.0, 7.0],
+                ["textfield-bezel-square-focused-2.png", 6.0, 7.0],
+                ["textfield-bezel-square-focused-3.png", 6.0, 1.0],
+                ["textfield-bezel-square-focused-4.png", 1.0, 1.0],
+                ["textfield-bezel-square-focused-5.png", 6.0, 1.0],
+                ["textfield-bezel-square-focused-6.png", 6.0, 5.0],
+                ["textfield-bezel-square-focused-7.png", 1.0, 5.0],
+                ["textfield-bezel-square-focused-8.png", 6.0, 5.0]
+            ]),
+            
+        placeholderColor = [CPColor colorWithCalibratedRed:189.0 / 255.0 green:199.0 / 255.0 blue:211.0 / 255.0 alpha:1.0],
+            
+        themeValues =
+        [
+            [@"bezel-color",        bezelColor,                         CPThemeStateBezeled],
+            [@"bezel-color",        bezelFocusedColor,                  CPThemeStateBezeled | CPThemeStateEditing],
+            [@"font",               [CPFont systemFontOfSize:12.0],     CPThemeStateBezeled],
+                                    
+            [@"content-inset",      CGInsetMake(9.0, 7.0, 5.0, 8.0),    CPThemeStateBezeled],
+            [@"bezel-inset",        CGInsetMake(4.0, 4.0, 3.0, 4.0),    CPThemeStateBezeled],
+            [@"bezel-inset",        CGInsetMake(0.0, 0.0, 0.0, 0.0),    CPThemeStateBezeled | CPThemeStateEditing],
+                                    
+            [@"text-color",         placeholderColor,                   CPTextFieldStatePlaceholder],
+            
+            [@"line-break-mode",    CPLineBreakByTruncatingTail,        CPThemeStateTableDataView],
+            [@"vertical-alignment", CPCenterVerticalTextAlignment,      CPThemeStateTableDataView],
+            [@"content-inset",      CGInsetMake(0.0, 0.0, 0.0, 5.0),    CPThemeStateTableDataView],
 
+            [@"text-color",         [CPColor colorWithCalibratedWhite:51.0 / 255.0 alpha:1.0], CPThemeStateTableDataView],
+            [@"text-color",         [CPColor whiteColor],               CPThemeStateTableDataView | CPThemeStateSelectedTableDataView],
+            [@"font",               [CPFont boldSystemFontOfSize:12.0], CPThemeStateTableDataView | CPThemeStateSelectedTableDataView],
+        ];
+
+    SetThemeValues(textfield, themeValues);
+    
     [textfield setBezeled:YES];
 
-    [textfield setValue:bezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBezeled];
-    [textfield setValue:bezelFocusedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBezeled|CPThemeStateEditing];
-    [textfield setValue:[CPFont systemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBezeled];
-    [textfield setValue:CGInsetMake(9.0, 7.0, 5.0, 8.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBezeled];
-
-    [textfield setValue:CGInsetMake(4.0, 4.0, 3.0, 4.0) forThemeAttribute:@"bezel-inset" inState:CPThemeStateBezeled];
-    [textfield setValue:CGInsetMake(0.0, 0.0, 0.0, 0.0) forThemeAttribute:@"bezel-inset" inState:CPThemeStateBezeled|CPThemeStateEditing];
-
-    [textfield setValue:[CPColor colorWithCalibratedRed:189.0 / 255.0 green:199.0 / 255.0 blue:211.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-color" inState:CPTextFieldStatePlaceholder];
-
     [textfield setPlaceholderString:"placeholder"];
     [textfield setStringValue:""];
     [textfield setEditable:YES];
-
-
-    // tableview dataview stuff 
-    [textfield setValue:[CPColor colorWithRed:51.0 / 255.0 green:51.0 / 255.0 blue:51.0 / 255.0 alpha:1.0] forThemeAttribute:"text-color" inState:CPThemeStateTableDataView];
-    [textfield setValue:CPLineBreakByTruncatingTail forThemeAttribute:@"line-break-mode" inState:CPThemeStateTableDataView|CPThemeStateTableDataView];
-    [textfield setValue:CPCenterVerticalTextAlignment forThemeAttribute:@"vertical-alignment" inState:CPThemeStateTableDataView|CPThemeStateTableDataView];
-    [textfield setValue:CGInsetMake(0.0, 0.0, 0.0, 5.0) forThemeAttribute:@"content-inset" inState:CPThemeStateTableDataView|CPThemeStateTableDataView];
-    [textfield setValue:[CPColor whiteColor] forThemeAttribute:@"text-color" inState:CPThemeStateTableDataView|CPThemeStateSelectedTableDataView];
-    [textfield setValue:[CPFont boldSystemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateTableDataView|CPThemeStateSelectedTableDataView];
     
-
     return textfield;
 }
 
 + (CPTextField)themedRoundedTextField
 {   
     var textfield = [[CPTextField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 30.0)],
-        bezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        bezelColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-rounded-left.png" size:CGSizeMake(13.0, 22.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-rounded-center.png" size:CGSizeMake(1.0, 22.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-rounded-right.png" size:CGSizeMake(13.0, 22.0)]
-            ] isVertical:NO]],
+                ["textfield-bezel-rounded-left.png", 13.0, 22.0],
+                ["textfield-bezel-rounded-center.png", 1.0, 22.0],
+                ["textfield-bezel-rounded-right.png", 13.0, 22.0]
+            ],
+            PatternIsHorizontal),
 
-        bezelFocusedColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        bezelFocusedColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-rounded-focused-left.png" size:CGSizeMake(17.0, 30.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-rounded-focused-center.png" size:CGSizeMake(1.0, 30.0)],
-                [_CPCibCustomResource imageResourceWithName:"textfield-bezel-rounded-focused-right.png" size:CGSizeMake(17.0, 30.0)]
-            ] isVertical:NO]];
+                ["textfield-bezel-rounded-focused-left.png", 17.0, 30.0],
+                ["textfield-bezel-rounded-focused-center.png", 1.0, 30.0],
+                ["textfield-bezel-rounded-focused-right.png", 17.0, 30.0]
+            ],
+            PatternIsHorizontal),
+            
+        placeholderColor = [CPColor colorWithCalibratedRed:189.0 / 255.0 green:199.0 / 255.0 blue:211.0 / 255.0 alpha:1.0],
 
+        themeValues =
+        [
+            [@"bezel-color",    bezelColor,                         CPTextFieldStateRounded | CPThemeStateBezeled],
+            [@"bezel-color",    bezelFocusedColor,                  CPTextFieldStateRounded | CPThemeStateBezeled | CPThemeStateEditing],
+            [@"font",           [CPFont systemFontOfSize:12.0]],
+
+            [@"content-inset",  CGInsetMake(9.0, 14.0, 6.0, 14.0),  CPTextFieldStateRounded | CPThemeStateBezeled],
+            [@"bezel-inset",    CGInsetMake(4.0, 4.0, 4.0, 4.0),    CPTextFieldStateRounded | CPThemeStateBezeled],
+            [@"bezel-inset",    CGInsetMake(0.0, 0.0, 0.0, 0.0),    CPTextFieldStateRounded | CPThemeStateBezeled | CPThemeStateEditing],
+
+            [@"text-color",     placeholderColor,       CPTextFieldStateRounded | CPTextFieldStatePlaceholder],
+    
+            [@"min-size",       CGSizeMake(0.0, 30.0),  CPTextFieldStateRounded | CPThemeStateBezeled],
+            [@"max-size",       CGSizeMake(-1.0, 30.0), CPTextFieldStateRounded | CPThemeStateBezeled]
+        ];
+
+    SetThemeValues(textfield, themeValues);
+    
     [textfield setBezeled:YES];
     [textfield setBezelStyle:CPTextFieldRoundedBezel];
 
-    [textfield setValue:bezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBezeled | CPTextFieldStateRounded];
-    [textfield setValue:bezelFocusedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBezeled | CPTextFieldStateRounded | CPThemeStateEditing];
-
-    [textfield setValue:[CPFont systemFontOfSize:12.0] forThemeAttribute:@"font"];
-    [textfield setValue:CGInsetMake(9.0, 14.0, 6.0, 14.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBezeled | CPTextFieldStateRounded];
-
-    [textfield setValue:CGInsetMake(4.0, 4.0, 4.0, 4.0) forThemeAttribute:@"bezel-inset" inState:CPThemeStateBezeled|CPTextFieldStateRounded];
-    [textfield setValue:CGInsetMake(0.0, 0.0, 0.0, 0.0) forThemeAttribute:@"bezel-inset" inState:CPThemeStateBezeled|CPTextFieldStateRounded|CPThemeStateEditing];
-
-    [textfield setValue:[CPColor colorWithCalibratedRed:189.0 / 255.0 green:199.0 / 255.0 blue:211.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-color" inState:CPTextFieldStatePlaceholder];
-
     [textfield setPlaceholderString:"placeholder"];
     [textfield setStringValue:""];
     [textfield setEditable:YES];
 
-    [textfield setValue:CGSizeMake(0.0, 30.0) forThemeAttribute:@"min-size" inState:CPThemeStateBezeled|CPTextFieldStateRounded];
-    [textfield setValue:CGSizeMake(-1.0, 30.0) forThemeAttribute:@"max-size" inState:CPThemeStateBezeled|CPTextFieldStateRounded];
-
     return textfield;
 }
 
 + (CPRadioButton)themedRadioButton
 {
-    var button = [[CPRadio alloc] initWithFrame:CGRectMake(0.0, 0.0, 120.0, 17.0)];
+    var button = [[CPRadio alloc] initWithFrame:CGRectMake(0.0, 0.0, 120.0, 17.0)],
+
+        bezelColor = PatternColor(
+            [
+                ["radio-bezel.png", 17.0, 17.0], nil, nil
+            ],
+            PatternIsHorizontal),
+            
+        bezelColorSelected = PatternColor(
+            [
+                ["radio-bezel-selected.png", 17.0, 17.0], nil, nil
+            ],
+            PatternIsHorizontal),
+            
+        bezelColorSelectedHighlighted = PatternColor(
+            [
+                ["radio-bezel-selected-highlighted.png", 17.0, 17.0], nil, nil
+            ],
+            PatternIsHorizontal),
+            
+        bezelColorSelectedDisabled = PatternColor(
+            [
+                ["radio-bezel-selected-disabled.png", 17.0, 17.0], nil, nil
+            ],
+            PatternIsHorizontal),
+            
+        bezelColorDisabled = PatternColor(
+            [
+                ["radio-bezel-disabled.png", 17.0, 17.0], nil, nil
+            ],
+            PatternIsHorizontal),
+            
+        bezelColorHighlighted = PatternColor(
+            [
+                ["radio-bezel-highlighted.png", 17.0, 17.0], nil, nil
+            ],
+            PatternIsHorizontal),
+            
+        themeValues =
+        [
+            [@"alignment",      CPLeftTextAlignment,                CPThemeStateBordered],
+            [@"font",           [CPFont systemFontOfSize:12.0],     CPThemeStateBordered],
+            [@"content-inset",  CGInsetMake(0.0, 0.0, 0.0, 20.0),   CPThemeStateBordered],
+            [@"bezel-color",    bezelColor,                         CPThemeStateBordered],
+            [@"bezel-color",    bezelColorSelected,                 CPThemeStateBordered | CPThemeStateSelected],
+            [@"bezel-color",    bezelColorSelectedHighlighted,      CPThemeStateBordered | CPThemeStateSelected | CPThemeStateHighlighted],
+            [@"bezel-color",    bezelColorHighlighted,              CPThemeStateBordered | CPThemeStateHighlighted],
+            [@"bezel-color",    bezelColorDisabled,                 CPThemeStateBordered | CPThemeStateDisabled],
+            [@"bezel-color",    bezelColorSelectedDisabled,         CPThemeStateBordered | CPThemeStateSelected | CPThemeStateDisabled],
+                                
+            [@"text-color",     [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0],  CPThemeStateDisabled],
+                                
+            [@"min-size",       CGSizeMake(0.0, 17.0)]
+        ];
+        
+    SetThemeValues(button, themeValues);
 
     [button setTitle:@"Hello Friend!"];
 
-    [button setValue:[CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled];
-
-    var bezelColor = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"radio-bezel.png" size:CGSizeMake(17.0, 17.0)], nil, nil
-            ]
-        isVertical:NO]),
-        bezelColorSelected = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"radio-bezel-selected.png" size:CGSizeMake(17.0, 17.0)], nil, nil
-            ]
-        isVertical:NO]),
-        bezelColorSelectedHighlighted = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"radio-bezel-selected-highlighted.png" size:CGSizeMake(17.0, 17.0)], nil, nil
-            ]
-        isVertical:NO]),
-        bezelColorSelectedDisabled = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"radio-bezel-selected-disabled.png" size:CGSizeMake(17.0, 17.0)], nil, nil
-            ]
-        isVertical:NO]),
-        bezelColorDisabled = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"radio-bezel-disabled.png" size:CGSizeMake(17.0, 17.0)], nil, nil
-            ]
-        isVertical:NO]),
-        bezelColorHighlighted = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"radio-bezel-highlighted.png" size:CGSizeMake(17.0, 17.0)], nil, nil
-            ]
-        isVertical:NO]);
-
-    [button setValue:CPLeftTextAlignment forThemeAttribute:@"alignment" inState:CPThemeStateBordered];
-    [button setValue:[CPFont systemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBordered];
-    [button setValue:CGInsetMake(0.0, 0.0, 0.0, 20.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBordered];
-    [button setValue:bezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];    
-    [button setValue:bezelColorSelected forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateSelected];
-    [button setValue:bezelColorSelectedHighlighted forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateSelected | CPThemeStateHighlighted];
-    [button setValue:bezelColorHighlighted forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
-    [button setValue:bezelColorDisabled forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
-    [button setValue:bezelColorSelectedDisabled forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled | CPThemeStateSelected];
-
-    [button setValue:CGSizeMake(0.0, 17.0) forThemeAttribute:@"min-size"];
-
     return button;
 }
 
 + (CPRadioButton)themedCheckBoxButton
 {
-    var button = [[CPCheckBox alloc] initWithFrame:CGRectMake(0.0, 0.0, 120.0, 17.0)];
+    var button = [[CPCheckBox alloc] initWithFrame:CGRectMake(0.0, 0.0, 120.0, 17.0)],
     
+        bezelColor = PatternColor(
+            [
+                ["check-box-bezel.png", 15.0, 16.0], nil, nil
+            ],
+            PatternIsHorizontal),
+            
+        bezelColorSelected = PatternColor(
+            [
+                ["check-box-bezel-selected.png", 15.0, 16.0], nil, nil
+            ],
+            PatternIsHorizontal),
+            
+        bezelColorSelectedHighlighted = PatternColor(
+            [
+                ["check-box-bezel-selected-highlighted.png", 15.0, 16.0], nil, nil
+            ],
+            PatternIsHorizontal),
+            
+        bezelColorSelectedDisabled = PatternColor(
+            [
+                ["check-box-bezel-selected-disabled.png", 15.0, 16.0], nil, nil
+            ],
+            PatternIsHorizontal),
+            
+        bezelColorDisabled = PatternColor(
+            [
+                ["check-box-bezel-disabled.png", 15.0, 16.0], nil, nil
+            ],
+            PatternIsHorizontal),
+            
+        bezelColorHighlighted = PatternColor(
+            [
+                ["check-box-bezel-highlighted.png", 15.0, 16.0], nil, nil
+            ],
+            PatternIsHorizontal),
+            
+        themeValues =
+        [
+            [@"alignment",      CPLeftTextAlignment,                CPThemeStateBordered],
+            [@"font",           [CPFont systemFontOfSize:12.0],     CPThemeStateBordered],
+            [@"content-inset",  CGInsetMake(0.0, 0.0, 0.0, 20.0),   CPThemeStateBordered],
+            [@"bezel-color",    bezelColor,                         CPThemeStateBordered],
+            [@"bezel-color",    bezelColorSelected,                 CPThemeStateBordered | CPThemeStateSelected],
+            [@"bezel-color",    bezelColorSelectedHighlighted,      CPThemeStateBordered | CPThemeStateSelected | CPThemeStateHighlighted],
+            [@"bezel-color",    bezelColorHighlighted,              CPThemeStateBordered | CPThemeStateHighlighted],
+            [@"bezel-color",    bezelColorDisabled,                 CPThemeStateBordered | CPThemeStateDisabled],
+            [@"bezel-color",    bezelColorSelectedDisabled,         CPThemeStateBordered | CPThemeStateSelected | CPThemeStateDisabled],
+                                
+            [@"text-color",     [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0],  CPThemeStateDisabled],
+                                
+            [@"min-size",       CGSizeMake(0.0, 17.0)]
+        ];
+
+    SetThemeValues(button, themeValues);
+        
     [button setTitle:@"Another option"];
 
-    [button setValue:[CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled];
-
-    var bezelColor = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"check-box-bezel.png" size:CGSizeMake(15.0, 16.0)], nil, nil
-            ]
-        isVertical:NO]),
-        bezelColorSelected = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"check-box-bezel-selected.png" size:CGSizeMake(15.0, 16.0)], nil, nil
-            ]
-        isVertical:NO]),
-        bezelColorSelectedHighlighted = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"check-box-bezel-selected-highlighted.png" size:CGSizeMake(15.0, 16.0)], nil, nil
-            ]
-        isVertical:NO]),
-        bezelColorSelectedDisabled = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"check-box-bezel-selected-disabled.png" size:CGSizeMake(15.0, 16.0)], nil, nil
-            ]
-        isVertical:NO]),
-        bezelColorDisabled = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"check-box-bezel-disabled.png" size:CGSizeMake(15.0, 16.0)], nil, nil
-            ]
-        isVertical:NO]),
-        bezelColorHighlighted = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"check-box-bezel-highlighted.png" size:CGSizeMake(15.0, 16.0)], nil, nil
-            ]
-        isVertical:NO]);
-    
-    [button setValue:CPLeftTextAlignment forThemeAttribute:@"alignment" inState:CPThemeStateBordered];
-    [button setValue:[CPFont systemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBordered];
-    [button setValue:CGInsetMake(0.0, 0.0, 0.0, 20.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBordered];
-    [button setValue:bezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];    
-    [button setValue:bezelColorSelected forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateSelected];
-    [button setValue:bezelColorSelectedHighlighted forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateSelected | CPThemeStateHighlighted];
-    [button setValue:bezelColorHighlighted forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
-    [button setValue:bezelColorDisabled forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
-    [button setValue:bezelColorSelectedDisabled forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled | CPThemeStateSelected];
-
-    [button setValue:CGSizeMake(0.0, 17.0) forThemeAttribute:@"min-size"];
-
     return button;
 }
 
 + (CPRadioButton)themedMixedCheckBoxButton
 {
-    button = [self themedCheckBoxButton];
+    var button = [self themedCheckBoxButton];
 
     [button setAllowsMixedState:YES];
     [button setState:CPMixedState];
 
-    var mixedSelectedColor = 
-        PatternColor([[CPThreePartImage alloc] initWithImageSlices:
+    var mixedSelectedColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"check-box-bezel-mixed-highlighted.png" size:CGSizeMake(15.0, 16.0)], nil, nil
-            ]
-        isVertical:NO]),
+                ["check-box-bezel-mixed-highlighted.png", 15.0, 16.0], nil, nil
+            ],
+            PatternIsHorizontal),
         
-        mixedDisabledColor = 
-        PatternColor([[CPThreePartImage alloc] initWithImageSlices:
+        mixedDisabledColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"check-box-bezel-mixed-disabled.png" size:CGSizeMake(15.0, 16.0)], nil, nil
-            ]
-        isVertical:NO]),
+                ["check-box-bezel-mixed-disabled.png", 15.0, 16.0], nil, nil
+            ],
+            PatternIsHorizontal),
         
-        mixedColor = 
-        PatternColor([[CPThreePartImage alloc] initWithImageSlices:
+        mixedColor = PatternColor(
             [
-                [_CPCibCustomResource imageResourceWithName:"check-box-bezel-mixed.png" size:CGSizeMake(15.0, 16.0)], nil, nil
-            ]
-        isVertical:NO]);
+                ["check-box-bezel-mixed.png", 15.0, 16.0], nil, nil
+            ],
+            PatternIsHorizontal),
+            
+        themeValues = 
+        [
+            [@"bezel-color",    mixedColor,         CPButtonStateMixed | CPThemeStateBordered],
+            [@"bezel-color",    mixedSelectedColor, CPButtonStateMixed | CPThemeStateBordered | CPThemeStateSelected],
+            [@"bezel-color",    mixedDisabledColor, CPButtonStateMixed | CPThemeStateBordered | CPThemeStateDisabled]
+        ];
 
-    [button setValue:mixedSelectedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeState("mixed")|CPThemeStateHighlighted];
-    [button setValue:mixedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeState("mixed")];
-    [button setValue:mixedDisabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeState("mixed")|CPThemeStateDisabled];
+    SetThemeValues(button, themeValues);
     
     return button;
 }
 
-+ (CPPopUpButton)themedSegmentedControl
+var themedSegmentedControlValues = nil;
+
++ (CPSegmentedControl)makeSegmentedControl
 {
     var segmentedControl = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 24.0)];
     
@@ -572,247 +863,325 @@
     [segmentedControl setLabel:@"1" forSegment:2];
     [segmentedControl setTag:3 forSegment:2];
     
-    //various colors
-    var centerBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-center.png" size:CGSizeMake(1.0, 24.0)]),
-        dividerBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-divider.png" size:CGSizeMake(1.0, 24.0)]),
-        centerHighlightedBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-highlighted-center.png" size:CGSizeMake(1.0, 24.0)]),
-        dividerHighlightedBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-highlighted-divider.png" size:CGSizeMake(1.0, 24.0)]),
-        leftHighlightedBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-highlighted-left.png" size:CGSizeMake(4.0, 24.0)]),
-        rightHighlightedBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-highlighted-right.png" size:CGSizeMake(4.0, 24.0)]),
-        inactiveCenterBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-disabled-center.png" size:CGSizeMake(1.0, 24.0)]),
-        inactiveDividerBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-disabled-divider.png" size:CGSizeMake(1.0, 24.0)]),
-        inactiveLeftBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-disabled-left.png" size:CGSizeMake(4.0, 24.0)]),
-        inactiveRightBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-disabled-right.png" size:CGSizeMake(4.0, 24.0)]),
-        inactiveHighlightedCenterBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-highlighted-disabled-center.png" size:CGSizeMake(1.0, 24.0)]),
-        inactiveHighlightedDividerBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-highlighted-disabled-divider.png" size:CGSizeMake(1.0, 24.0)]),
-        inactiveHighlightedLeftBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-highlighted-disabled-left.png" size:CGSizeMake(4.0, 24.0)]),
-        inactiveHighlightedRightBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-highlighted-disabled-right.png" size:CGSizeMake(4.0, 24.0)]),
-        leftBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-left.png" size:CGSizeMake(4.0, 24.0)]),
-        rightBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-right.png" size:CGSizeMake(4.0, 24.0)]),
-        pushedCenterBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-pushed-center.png" size:CGSizeMake(1.0, 24.0)]),
-        pushedLeftBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-pushed-left.png" size:CGSizeMake(4.0, 24.0)]),
-        pushedRightBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-pushed-right.png" size:CGSizeMake(4.0, 24.0)]);
-        pushedHighlightedCenterBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-pushed-highlighted-center.png" size:CGSizeMake(1.0, 24.0)]),
-        pushedHighlightedLeftBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-pushed-highlighted-left.png" size:CGSizeMake(4.0, 24.0)]),
-        pushedHighlightedRightBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"segmented-control-bezel-pushed-highlighted-right.png" size:CGSizeMake(4.0, 24.0)]);
-
-    [segmentedControl setValue:centerBezelColor forThemeAttribute:@"center-segment-bezel-color" inState:CPThemeStateNormal];
-    [segmentedControl setValue:inactiveCenterBezelColor forThemeAttribute:@"center-segment-bezel-color" inState:CPThemeStateDisabled];
-    [segmentedControl setValue:inactiveHighlightedCenterBezelColor forThemeAttribute:@"center-segment-bezel-color" inState:CPThemeStateSelected|CPThemeStateDisabled];
-    [segmentedControl setValue:centerHighlightedBezelColor forThemeAttribute:@"center-segment-bezel-color" inState:CPThemeStateSelected];
-    [segmentedControl setValue:pushedCenterBezelColor forThemeAttribute:@"center-segment-bezel-color" inState:CPThemeStateHighlighted];
-    [segmentedControl setValue:pushedHighlightedCenterBezelColor forThemeAttribute:@"center-segment-bezel-color" inState:CPThemeStateHighlighted|CPThemeStateSelected];
-
-    [segmentedControl setValue:dividerBezelColor forThemeAttribute:@"divider-bezel-color" inState:CPThemeStateNormal];
-    [segmentedControl setValue:inactiveDividerBezelColor forThemeAttribute:@"divider-bezel-color" inState:CPThemeStateDisabled];
-    [segmentedControl setValue:inactiveHighlightedDividerBezelColor forThemeAttribute:@"divider-bezel-color" inState:CPThemeStateSelected|CPThemeStateDisabled];
-    [segmentedControl setValue:dividerHighlightedBezelColor forThemeAttribute:@"divider-bezel-color" inState:CPThemeStateSelected];
-    [segmentedControl setValue:dividerBezelColor forThemeAttribute:@"divider-bezel-color" inState:CPThemeStateHighlighted];
-
-    [segmentedControl setValue:rightBezelColor forThemeAttribute:@"right-segment-bezel-color" inState:CPThemeStateNormal];
-    [segmentedControl setValue:inactiveRightBezelColor forThemeAttribute:@"right-segment-bezel-color" inState:CPThemeStateDisabled];
-    [segmentedControl setValue:inactiveHighlightedRightBezelColor forThemeAttribute:@"right-segment-bezel-color" inState:CPThemeStateSelected|CPThemeStateDisabled];
-    [segmentedControl setValue:rightHighlightedBezelColor forThemeAttribute:@"right-segment-bezel-color" inState:CPThemeStateSelected];
-    [segmentedControl setValue:pushedRightBezelColor forThemeAttribute:@"right-segment-bezel-color" inState:CPThemeStateHighlighted];
-    [segmentedControl setValue:pushedHighlightedRightBezelColor forThemeAttribute:@"right-segment-bezel-color" inState:CPThemeStateHighlighted|CPThemeStateSelected];
-
-    [segmentedControl setValue:leftBezelColor forThemeAttribute:@"left-segment-bezel-color" inState:CPThemeStateNormal];
-    [segmentedControl setValue:inactiveLeftBezelColor forThemeAttribute:@"left-segment-bezel-color" inState:CPThemeStateDisabled];
-    [segmentedControl setValue:inactiveHighlightedLeftBezelColor forThemeAttribute:@"left-segment-bezel-color" inState:CPThemeStateSelected|CPThemeStateDisabled];
-    [segmentedControl setValue:leftHighlightedBezelColor forThemeAttribute:@"left-segment-bezel-color" inState:CPThemeStateSelected];
-    [segmentedControl setValue:pushedLeftBezelColor forThemeAttribute:@"left-segment-bezel-color" inState:CPThemeStateHighlighted];
-    [segmentedControl setValue:pushedHighlightedLeftBezelColor forThemeAttribute:@"left-segment-bezel-color" inState:CPThemeStateHighlighted|CPThemeStateSelected];
-
-    [segmentedControl setValue:CGInsetMake(0.0, 4.0, 0.0, 4.0) forThemeAttribute:@"content-inset" inState:CPThemeStateNormal];
-
-    [segmentedControl setValue:CGInsetMake(0.0, 0.0, 0.0, 0.0) forThemeAttribute:@"bezel-inset" inState:CPThemeStateNormal];
-
-    [segmentedControl setValue:[CPFont boldSystemFontOfSize:12.0] forThemeAttribute:@"font"];
-    [segmentedControl setValue:[CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-color"];
-    [segmentedControl setValue:[CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-shadow-color"];
-    [segmentedControl setValue:CGSizeMake(0.0, 1.0) forThemeAttribute:@"text-shadow-offset"];
-    [segmentedControl setValue:CPLineBreakByTruncatingTail forThemeAttribute:@"line-break-mode"];
-
-    [segmentedControl setValue:1.0 forThemeAttribute:@"divider-thickness"];
-    [segmentedControl setValue:24.0 forThemeAttribute:@"default-height"];
-
     return segmentedControl;
+};
+
++ (CPSegmentedControl)themedSegmentedControl
+{
+    var segmentedControl = [self makeSegmentedControl],
+    
+        centerBezelColor = PatternColor("segmented-control-bezel-center.png", 1.0, 24.0),
+        dividerBezelColor = PatternColor("segmented-control-bezel-divider.png", 1.0, 24.0),
+        centerHighlightedBezelColor = PatternColor("segmented-control-bezel-highlighted-center.png", 1.0, 24.0),
+        dividerHighlightedBezelColor = PatternColor("segmented-control-bezel-highlighted-divider.png", 1.0, 24.0),
+        leftHighlightedBezelColor = PatternColor("segmented-control-bezel-highlighted-left.png", 4.0, 24.0),
+        rightHighlightedBezelColor = PatternColor("segmented-control-bezel-highlighted-right.png", 4.0, 24.0),
+        inactiveCenterBezelColor = PatternColor("segmented-control-bezel-disabled-center.png", 1.0, 24.0),
+        inactiveDividerBezelColor = PatternColor("segmented-control-bezel-disabled-divider.png", 1.0, 24.0),
+        inactiveLeftBezelColor = PatternColor("segmented-control-bezel-disabled-left.png", 4.0, 24.0),
+        inactiveRightBezelColor = PatternColor("segmented-control-bezel-disabled-right.png", 4.0, 24.0),
+        inactiveHighlightedCenterBezelColor = PatternColor("segmented-control-bezel-highlighted-disabled-center.png", 1.0, 24.0),
+        inactiveHighlightedDividerBezelColor = PatternColor("segmented-control-bezel-highlighted-disabled-divider.png", 1.0, 24.0),
+        inactiveHighlightedLeftBezelColor = PatternColor("segmented-control-bezel-highlighted-disabled-left.png", 4.0, 24.0),
+        inactiveHighlightedRightBezelColor = PatternColor("segmented-control-bezel-highlighted-disabled-right.png", 4.0, 24.0),
+        leftBezelColor = PatternColor("segmented-control-bezel-left.png", 4.0, 24.0),
+        rightBezelColor = PatternColor("segmented-control-bezel-right.png", 4.0, 24.0),
+        pushedCenterBezelColor = PatternColor("segmented-control-bezel-pushed-center.png", 1.0, 24.0),
+        pushedLeftBezelColor = PatternColor("segmented-control-bezel-pushed-left.png", 4.0, 24.0),
+        pushedRightBezelColor = PatternColor("segmented-control-bezel-pushed-right.png", 4.0, 24.0);
+        pushedHighlightedCenterBezelColor = PatternColor("segmented-control-bezel-pushed-highlighted-center.png", 1.0, 24.0),
+        pushedHighlightedLeftBezelColor = PatternColor("segmented-control-bezel-pushed-highlighted-left.png", 4.0, 24.0),
+        pushedHighlightedRightBezelColor = PatternColor("segmented-control-bezel-pushed-highlighted-right.png", 4.0, 24.0);
+        
+    themedSegmentedControlValues =
+        [
+            [@"center-segment-bezel-color",     centerBezelColor,                       CPThemeStateNormal],
+            [@"center-segment-bezel-color",     inactiveCenterBezelColor,               CPThemeStateDisabled],
+            [@"center-segment-bezel-color",     inactiveHighlightedCenterBezelColor,    CPThemeStateSelected | CPThemeStateDisabled],
+            [@"center-segment-bezel-color",     centerHighlightedBezelColor,            CPThemeStateSelected],
+            [@"center-segment-bezel-color",     pushedCenterBezelColor,                 CPThemeStateHighlighted],
+            [@"center-segment-bezel-color",     pushedHighlightedCenterBezelColor,      CPThemeStateHighlighted | CPThemeStateSelected],
+            
+            [@"divider-bezel-color",            dividerBezelColor,                      CPThemeStateNormal],
+            [@"divider-bezel-color",            inactiveDividerBezelColor,              CPThemeStateDisabled],
+            [@"divider-bezel-color",            inactiveHighlightedDividerBezelColor,   CPThemeStateSelected | CPThemeStateDisabled],
+            [@"divider-bezel-color",            dividerHighlightedBezelColor,           CPThemeStateSelected],
+            
+            [@"left-segment-bezel-color",       leftBezelColor,                         CPThemeStateNormal],
+            [@"left-segment-bezel-color",       inactiveLeftBezelColor,                 CPThemeStateDisabled],
+            [@"left-segment-bezel-color",       inactiveHighlightedLeftBezelColor,      CPThemeStateSelected | CPThemeStateDisabled],
+            [@"left-segment-bezel-color",       leftHighlightedBezelColor,              CPThemeStateSelected],
+            [@"left-segment-bezel-color",       pushedLeftBezelColor,                   CPThemeStateHighlighted],
+            [@"left-segment-bezel-color",       pushedHighlightedLeftBezelColor,        CPThemeStateHighlighted | CPThemeStateSelected],
+            
+            [@"right-segment-bezel-color",      rightBezelColor,                        CPThemeStateNormal],
+            [@"right-segment-bezel-color",      inactiveRightBezelColor,                CPThemeStateDisabled],
+            [@"right-segment-bezel-color",      inactiveHighlightedRightBezelColor,     CPThemeStateSelected | CPThemeStateDisabled],
+            [@"right-segment-bezel-color",      rightHighlightedBezelColor,             CPThemeStateSelected],
+            [@"right-segment-bezel-color",      pushedRightBezelColor,                  CPThemeStateHighlighted],
+            [@"right-segment-bezel-color",      pushedHighlightedRightBezelColor,       CPThemeStateHighlighted | CPThemeStateSelected],
+            
+            [@"content-inset",  CGInsetMake(0.0, 4.0, 0.0, 4.0), CPThemeStateNormal],
+            [@"bezel-inset",    CGInsetMake(0.0, 0.0, 0.0, 0.0), CPThemeStateNormal],
+            
+            [@"font",               [CPFont boldSystemFontOfSize:12.0]],
+            [@"text-color",         [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0]],
+            [@"text-color",         [CPColor colorWithCalibratedWhite:0.6 alpha:1.0], CPThemeStateDisabled],
+            [@"text-shadow-color",  [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0]],
+            [@"text-shadow-color",  [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0], CPThemeStateDisabled],
+            [@"text-shadow-offset", CGSizeMake(0.0, 1.0)],
+            [@"line-break-mode",    CPLineBreakByTruncatingTail],
+
+            [@"divider-thickness",  1.0],
+            [@"default-height",     24.0]
+        ];
+
+    SetThemeValues(segmentedControl, themedSegmentedControlValues);
+    
+    return segmentedControl;
+}
+
+var themedHorizontalSliderValues = nil;
+
++ (CPSlider)makeHorizontalSlider
+{
+    return [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 50.0, 24.0)];
 }
 
 + (CPSlider)themedHorizontalSlider
 {
-    var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 50.0, 24.0)],
-        trackColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-        [
-            [_CPCibCustomResource imageResourceWithName:"horizontal-track-left.png" size:CGSizeMake(4.0, 5.0)],
-            [_CPCibCustomResource imageResourceWithName:"horizontal-track-center.png" size:CGSizeMake(1.0, 5.0)],
-            [_CPCibCustomResource imageResourceWithName:"horizontal-track-right.png" size:CGSizeMake(4.0, 5.0)]
-        ]
-        isVertical:NO]],
-        
-        trackDisabledColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-        [
-            [_CPCibCustomResource imageResourceWithName:"horizontal-track-disabled-left.png" size:CGSizeMake(4.0, 5.0)],
-            [_CPCibCustomResource imageResourceWithName:"horizontal-track-disabled-center.png" size:CGSizeMake(1.0, 5.0)],
-            [_CPCibCustomResource imageResourceWithName:"horizontal-track-disabled-right.png" size:CGSizeMake(4.0, 5.0)]
-        ]
-        isVertical:NO]];
-
-    [slider setValue:5.0 forThemeAttribute:@"track-width"];
-    [slider setValue:trackColor forThemeAttribute:@"track-color"];
-    [slider setValue:trackDisabledColor forThemeAttribute:@"track-color" inState:CPThemeStateDisabled];
+    var slider = [self makeHorizontalSlider],
     
-        var knobColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"knob.png" size:CGSizeMake(23.0, 24.0)]],
-            knobHighlightedColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"knob-highlighted.png" size:CGSizeMake(23.0, 24.0)]],
-            knobDisabledColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"knob-disabled.png" size:CGSizeMake(23.0, 24.0)]];
-
-    [slider setValue:CGSizeMake(23.0, 24.0) forThemeAttribute:@"knob-size"];
-    [slider setValue:knobColor forThemeAttribute:@"knob-color"];
-    [slider setValue:knobHighlightedColor forThemeAttribute:@"knob-color" inState:CPThemeStateHighlighted];
-    [slider setValue:knobDisabledColor forThemeAttribute:@"knob-color" inState:CPThemeStateDisabled];
+        trackColor = PatternColor(
+        [
+            ["horizontal-track-left.png", 4.0, 5.0],
+            ["horizontal-track-center.png", 1.0, 5.0],
+            ["horizontal-track-right.png", 4.0, 5.0]
+        ],
+        PatternIsHorizontal),
+        
+        trackDisabledColor = PatternColor(
+        [
+            ["horizontal-track-disabled-left.png", 4.0, 5.0],
+            ["horizontal-track-disabled-center.png", 1.0, 5.0],
+            ["horizontal-track-disabled-right.png", 4.0, 5.0]
+        ],
+        PatternIsHorizontal),
+        
+        knobColor =             PatternColor("knob.png", 23.0, 24.0),
+        knobHighlightedColor =  PatternColor("knob-highlighted.png", 23.0, 24.0),
+        knobDisabledColor =     PatternColor("knob-disabled.png", 23.0, 24.0);
+        
+    themedHorizontalSliderValues = 
+    [
+        [@"track-width", 5.0],
+        [@"track-color", trackColor],
+        [@"track-color", trackDisabledColor, CPThemeStateDisabled],
+        
+        [@"knob-size",  CGSizeMake(23.0, 24.0)],
+        [@"knob-color", knobColor],
+        [@"knob-color", knobHighlightedColor,   CPThemeStateHighlighted],
+        [@"knob-color", knobDisabledColor,      CPThemeStateDisabled]
+    ];
+    
+    SetThemeValues(slider, themedHorizontalSliderValues);
     
     return slider;
 }
 
+var themedVerticalSliderValues = nil;
+
++ (CPSlider)makeVerticalSlider
+{
+    return [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 24.0, 50.0)];
+}
+
 + (CPSlider)themedVerticalSlider
 {
-    var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 24.0, 50.0)],
-        trackColor =  [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-        [
-            [_CPCibCustomResource imageResourceWithName:"vertical-track-top.png" size:CGSizeMake(5.0, 6.0)],
-            [_CPCibCustomResource imageResourceWithName:"vertical-track-center.png" size:CGSizeMake(5.0, 1.0)],
-            [_CPCibCustomResource imageResourceWithName:"vertical-track-bottom.png" size:CGSizeMake(5.0, 4.0)]
-        ]
-        isVertical:YES]],
-        trackDisabledColor =  [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-        [
-            [_CPCibCustomResource imageResourceWithName:"vertical-track-disabled-top.png" size:CGSizeMake(5.0, 6.0)],
-            [_CPCibCustomResource imageResourceWithName:"vertical-track-disabled-center.png" size:CGSizeMake(5.0, 1.0)],
-            [_CPCibCustomResource imageResourceWithName:"vertical-track-disabled-bottom.png" size:CGSizeMake(5.0, 4.0)]
-        ]
-        isVertical:YES]];
-        
-    [slider setValue:5.0 forThemeAttribute:@"track-width"];
-    [slider setValue:trackColor forThemeAttribute:@"track-color" inState:CPThemeStateVertical];
-    [slider setValue:trackDisabledColor forThemeAttribute:@"track-color" inState:CPThemeStateDisabled];
+    var slider = [self makeVerticalSlider],
     
-        var knobColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"knob.png" size:CGSizeMake(23.0, 24.0)]],
-            knobHighlightedColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"knob-highlighted.png" size:CGSizeMake(23.0, 24.0)]],
-            knobDisabledColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"knob-disabled.png" size:CGSizeMake(23.0, 24.0)]];
+        trackColor = PatternColor(
+        [
+            ["vertical-track-top.png", 5.0, 6.0],
+            ["vertical-track-center.png", 5.0, 1.0],
+            ["vertical-track-bottom.png", 5.0, 4.0]
+        ],
+        PatternIsVertical),
+        
+        trackDisabledColor = PatternColor(
+        [
+            ["vertical-track-disabled-top.png", 5.0, 6.0],
+            ["vertical-track-disabled-center.png", 5.0, 1.0],
+            ["vertical-track-disabled-bottom.png", 5.0, 4.0]
+        ],
+        PatternIsVertical),
+        
+        knobColor =             PatternColor("knob.png", 23.0, 24.0),
+        knobHighlightedColor =  PatternColor("knob-highlighted.png", 23.0, 24.0),
+        knobDisabledColor =     PatternColor("knob-disabled.png", 23.0, 24.0);
+        
+    themedVerticalSliderValues = 
+    [
+        [@"track-width", 5.0],
+        [@"track-color", trackColor,            CPThemeStateVertical],
+        [@"track-color", trackDisabledColor,    CPThemeStateDisabled],
+    
+        [@"knob-size",  CGSizeMake(23.0, 24.0)],
+        [@"knob-color", knobColor],
+        [@"knob-color", knobHighlightedColor,   CPThemeStateHighlighted],
+        [@"knob-color", knobDisabledColor,      CPThemeStateDisabled]
+    ]
+    
+    SetThemeValues(slider, themedVerticalSliderValues);
+    
+    return slider;
+}
 
-    [slider setValue:CGSizeMake(23.0, 24.0) forThemeAttribute:@"knob-size"];
-    [slider setValue:knobColor forThemeAttribute:@"knob-color"];
-    [slider setValue:knobHighlightedColor forThemeAttribute:@"knob-color" inState:CPThemeStateHighlighted];
-    [slider setValue:knobDisabledColor forThemeAttribute:@"knob-color" inState:CPThemeStateDisabled];
+var themedCircularSliderValues = nil;
+
++ (CPSlider)makeCircularSlider
+{
+    var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 34.0, 34.0)];
+    
+    [slider setSliderType:CPCircularSlider];
     
     return slider;
 }
 
 + (CPSlider)themedCircularSlider
 {
-    var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 34.0, 34.0)],
-        trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"slider-circular-bezel.png" size:CGSizeMake(34.0, 34.0)]),
-        trackDisabledColor = PatternColor([_CPCibCustomResource imageResourceWithName:"slider-circular-disabled-bezel.png" size:CGSizeMake(34.0, 34.0)]);
-
-    [slider setSliderType:CPCircularSlider];
-    [slider setValue:trackColor forThemeAttribute:@"track-color" inState:CPThemeStateCircular];
-    [slider setValue:trackDisabledColor forThemeAttribute:@"track-color" inState:CPThemeStateDisabled|CPThemeStateCircular];
-
-    var knobColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"slider-circular-knob.png" size:CGSizeMake(5.0, 5.0)]],
-        knobDisabledColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"slider-circular-disabled-knob.png" size:CGSizeMake(5.0, 5.0)]],
+    var slider = [self makeCircularSlider],
+    
+        trackColor = PatternColor("slider-circular-bezel.png", 34.0, 34.0),
+        trackDisabledColor = PatternColor("slider-circular-disabled-bezel.png", 34.0, 34.0)
+        knobColor = PatternColor("slider-circular-knob.png", 5.0, 5.0),
+        knobDisabledColor = PatternColor("slider-circular-disabled-knob.png", 5.0, 5.0),
         knobHighlightedColor = knobColor;
+        
+    themedCircularSliderValues =
+    [
+        [@"track-color", trackColor,            CPThemeStateCircular],
+        [@"track-color", trackDisabledColor,    CPThemeStateCircular | CPThemeStateDisabled],
 
-    [slider setValue:CGSizeMake(5.0, 5.0) forThemeAttribute:@"knob-size" inState:CPThemeStateCircular];
-    [slider setValue:knobColor forThemeAttribute:@"knob-color" inState:CPThemeStateCircular];
-    [slider setValue:knobDisabledColor forThemeAttribute:@"knob-color" inState:CPThemeStateDisabled|CPThemeStateCircular];
-    [slider setValue:knobHighlightedColor forThemeAttribute:@"knob-color" inState:CPThemeStateCircular|CPThemeStateHighlighted];
+        [@"knob-size",  CGSizeMake(5.0, 5.0),   CPThemeStateCircular],
+        [@"knob-color", knobColor,              CPThemeStateCircular],
+        [@"knob-color", knobHighlightedColor,   CPThemeStateCircular | CPThemeStateHighlighted],
+        [@"knob-color", knobDisabledColor,      CPThemeStateCircular | CPThemeStateDisabled]
+    ];
 
+    SetThemeValues(slider, themedCircularSliderValues);
+    
     return slider;
 }
 
-+ (CPButtonBar)themedButtonBar
+var themedButtonBarValues = nil;
+
++ (CPButtonBar)makeButtonBar
 {
-    var buttonBar = [[CPButtonBar alloc] initWithFrame:CGRectMake(0.0, 0.0, 147.0, 26.0)],
-        color = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"buttonbar-bezel.png" size:CGSizeMake(1.0, 26.0)]];
-
+    var buttonBar = [[CPButtonBar alloc] initWithFrame:CGRectMake(0.0, 0.0, 147.0, 26.0)];
+    
     [buttonBar setHasResizeControl:YES];
-
-    [buttonBar setValue:color forThemeAttribute:@"bezel-color"];
-
-    var resizeColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"buttonbar-resize-control.png" size:CGSizeMake(5.0, 10.0)]];
-
-    [buttonBar setValue:CGSizeMake(5.0, 10.0) forThemeAttribute:@"resize-control-size"];
-    [buttonBar setValue:CGInsetMake(9.0, 4.0, 7.0, 4.0) forThemeAttribute:@"resize-control-inset"];
-    [buttonBar setValue:resizeColor forThemeAttribute:@"resize-control-color"];
-
-    var buttonBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"buttonbar-button-bezel-left.png" size:CGSizeMake(2.0, 25.0)],
-                [_CPCibCustomResource imageResourceWithName:"buttonbar-button-bezel-center.png" size:CGSizeMake(1.0, 25.0)],
-                [_CPCibCustomResource imageResourceWithName:"buttonbar-button-bezel-right.png" size:CGSizeMake(2.0, 25.0)]
-            ]
-        isVertical:NO]],
-
-        buttonBezelHighlightedColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"buttonbar-button-bezel-highlighted-left.png" size:CGSizeMake(2.0, 25.0)],
-                [_CPCibCustomResource imageResourceWithName:"buttonbar-button-bezel-highlighted-center.png" size:CGSizeMake(1.0, 25.0)],
-                [_CPCibCustomResource imageResourceWithName:"buttonbar-button-bezel-highlighted-right.png" size:CGSizeMake(2.0, 25.0)]
-            ]
-        isVertical:NO]],
-
-        buttonBezelDisabledColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"buttonbar-button-bezel-disabled-left.png" size:CGSizeMake(2.0, 25.0)],
-                [_CPCibCustomResource imageResourceWithName:"buttonbar-button-bezel-disabled-center.png" size:CGSizeMake(1.0, 25.0)],
-                [_CPCibCustomResource imageResourceWithName:"buttonbar-button-bezel-disabled-right.png" size:CGSizeMake(2.0, 25.0)]
-            ]
-        isVertical:NO]];
-
-    [buttonBar setValue:buttonBezelColor forThemeAttribute:@"button-bezel-color"];
-    [buttonBar setValue:buttonBezelHighlightedColor forThemeAttribute:@"button-bezel-color" inState:CPThemeStateHighlighted];
-    [buttonBar setValue:buttonBezelDisabledColor forThemeAttribute:@"button-bezel-color" inState:CPThemeStateDisabled];
-    [buttonBar setValue:[CPColor blackColor] forThemeAttribute:@"button-text-color"];
-
+    
     var popup = [CPButtonBar actionPopupButton];
     [popup addItemWithTitle:"Item 1"];
     [popup addItemWithTitle:"Item 2"];
 
     [buttonBar setButtons:[[CPButtonBar plusButton], [CPButtonBar minusButton], popup]];
-
+    
     return buttonBar;
 }
 
++ (CPButtonBar)themedButtonBar
+{
+    var buttonBar = [self makeButtonBar],
+    
+        color = PatternColor("buttonbar-bezel.png", 1.0, 26.0),
+        resizeColor = PatternColor("buttonbar-resize-control.png", 5.0, 10.0),
+        buttonBezelColor = PatternColor(
+            [
+                ["buttonbar-button-bezel-left.png", 2.0, 25.0],
+                ["buttonbar-button-bezel-center.png", 1.0, 25.0],
+                ["buttonbar-button-bezel-right.png", 2.0, 25.0]
+            ],
+            PatternIsHorizontal),
+
+        buttonBezelHighlightedColor = PatternColor(
+            [
+                ["buttonbar-button-bezel-highlighted-left.png", 2.0, 25.0],
+                ["buttonbar-button-bezel-highlighted-center.png", 1.0, 25.0],
+                ["buttonbar-button-bezel-highlighted-right.png", 2.0, 25.0]
+            ],
+            PatternIsHorizontal),
+
+        buttonBezelDisabledColor = PatternColor(
+            [
+                ["buttonbar-button-bezel-disabled-left.png", 2.0, 25.0],
+                ["buttonbar-button-bezel-disabled-center.png", 1.0, 25.0],
+                ["buttonbar-button-bezel-disabled-right.png", 2.0, 25.0]
+            ],
+            PatternIsHorizontal);
+
+    themedButtonBarValues =
+    [
+        [@"bezel-color", color],
+        
+        [@"resize-control-size",    CGSizeMake(5.0, 10.0)],
+        [@"resize-control-inset",   CGInsetMake(9.0, 4.0, 7.0, 4.0)],
+        [@"resize-control-color",   resizeColor],
+        
+        [@"button-bezel-color",     buttonBezelColor],
+        [@"button-bezel-color",     buttonBezelHighlightedColor,    CPThemeStateHighlighted],
+        [@"button-bezel-color",     buttonBezelDisabledColor,       CPThemeStateDisabled],
+        [@"button-text-color",      [CPColor blackColor]]
+    ];
+    
+    SetThemeValues(buttonBar, themedButtonBarValues);
+    
+    return buttonBar;
+}
+
++ (_CPTableColumnHeaderView)makeColumnHeader
+{
+    var header = [[_CPTableColumnHeaderView alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 24.0)];
+    
+    [header setStringValue:@"Table Header"];
+    
+    return header;
+}
+
 + (_CPTableColumnHeaderView)themedColumnHeader
 {
-    var header             = [[_CPTableColumnHeaderView alloc] initWithFrame:CGRectMake(0,0,50,24)],
-        highlightedPressed = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"tableview-headerview-highlighted-pressed.png" size:CGSizeMake(1.0, 23.0)]],
-        highlighted        = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"tableview-headerview-highlighted.png" size:CGSizeMake(1.0, 23.0)]],
-        pressed            = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"tableview-headerview-pressed.png" size:CGSizeMake(1.0, 23.0)]],
-        normal             = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"tableview-headerview.png" size:CGSizeMake(1.0, 23.0)]];
-
-
-    [header setStringValue:@"Table Header"];
-
-    [header setValue:normal forThemeAttribute:@"background-color"];
-    [header setValue:CGInsetMake(0, 5, 0, 5) forThemeAttribute:@"text-inset"];
-    [header setValue:[CPColor colorWithRed:51.0 / 255.0 green:51.0 / 255.0 blue:51.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-color"];
-    [header setValue:[CPFont boldSystemFontOfSize:12.0] forThemeAttribute:@"text-font"];
-    [header setValue:[CPColor whiteColor] forThemeAttribute:@"text-shadow-color"];
-    [header setValue:CGSizeMake(0,1) forThemeAttribute:@"text-shadow-offset"];
-    [header setValue:CPLeftTextAlignment forThemeAttribute:@"text-alignment"];
-
-    [header setValue:pressed forThemeAttribute:@"background-color" inState:CPThemeStateHighlighted];
-    [header setValue:highlighted forThemeAttribute:@"background-color" inState:CPThemeStateSelected];
-    [header setValue:highlightedPressed forThemeAttribute:@"background-color" inState:CPThemeStateHighlighted|CPThemeStateSelected];
+    var header = [self makeColumnHeader],
+        highlightedPressed = PatternColor("tableview-headerview-highlighted-pressed.png", 1.0, 23.0),
+        highlighted        = PatternColor("tableview-headerview-highlighted.png", 1.0, 23.0),
+        pressed            = PatternColor("tableview-headerview-pressed.png", 1.0, 23.0),
+        normal             = PatternColor("tableview-headerview.png", 1.0, 23.0),
+        
+        themedColumnHeaderValues =
+        [
+            [@"background-color",   normal],
+        
+            [@"text-inset",         CGInsetMake(0, 5, 0, 5)],
+            [@"text-color",         [CPColor colorWithCalibratedWhite:51.0 / 255.0 alpha:1.0]],
+            [@"text-font",          [CPFont boldSystemFontOfSize:12.0]],
+            [@"text-shadow-color",  [CPColor whiteColor]],
+            [@"text-shadow-offset", CGSizeMake(0.0, 1.0)],
+            [@"text-alignment",     CPLeftTextAlignment],
+        
+            [@"background-color",   pressed,            CPThemeStateHighlighted],
+            [@"background-color",   highlighted,        CPThemeStateSelected],
+            [@"background-color",   highlightedPressed, CPThemeStateHighlighted | CPThemeStateSelected]
+        ];
 
+    SetThemeValues(header, themedColumnHeaderValues);
+    
     return header;
 }
 
 + (CPTableHeaderView)themedTableHeaderRow
 {
-    var header = [[CPTableHeaderView alloc] initWithFrame:CGRectMake(0,0,50,24)],
-        normal = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"tableview-headerview.png" size:CGSizeMake(1.0, 23.0)]];
+    var header = [[CPTableHeaderView alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 24.0)],
+        normal = PatternColor("tableview-headerview.png", 1.0, 23.0);
 
     [header setValue:normal forThemeAttribute:@"background-color"];
 
@@ -821,8 +1190,9 @@
 
 + (_CPCornerView)themedCornerview
 {
-    var corner = [[_CPCornerView alloc] initWithFrame:CGRectMake(0,0,25, 23)],
-        normal = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"tableview-headerview.png" size:CGSizeMake(1.0, 23.0)]];
+    var scrollerWidth = [CPScroller scrollerWidth],
+        corner = [[_CPCornerView alloc] initWithFrame:CGRectMake(0.0, 0.0, 25.0, scrollerWidth)],
+        normal = PatternColor("tableview-headerview.png", 1.0, scrollerWidth);
 
     [corner setValue:normal forThemeAttribute:"background-color"];
 
@@ -833,27 +1203,31 @@
 {
     // This is a bit more complicated than the rest because we actually set theme values for several different (table related) controls in this method
 
-    var tableview = [[CPTableView alloc] initWithFrame:CGRectMake(0,0,200,200)];
-
-    // Now theme the tableview
-    var sortImage = [_CPCibCustomResource imageResourceWithName:"tableview-headerview-ascending.png" size:CGSizeMake(9.0, 8.0)],
-        sortImageReversed = [_CPCibCustomResource imageResourceWithName:"tableview-headerview-descending.png" size:CGSizeMake(9.0, 8.0)],
+    var tableview = [[CPTableView alloc] initWithFrame:CGRectMake(0.0, 0.0, 150.0, 150.0)],
+    
+        sortImage = PatternColor("tableview-headerview-ascending.png", 9.0, 8.0),
+        sortImageReversed = PatternColor("tableview-headerview-descending.png", 9.0, 8.0),
         alternatingRowColors = [[CPColor whiteColor], [CPColor colorWithRed:245.0 / 255.0 green:249.0 / 255.0 blue:252.0 / 255.0 alpha:1.0]],
         gridColor = [CPColor colorWithHexString:@"dce0e2"],
         selectionColor = [CPColor colorWithHexString:@"5f83b9"],
-        sourceListSelectionColor = [CPDictionary dictionaryWithObjects: [ CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [89.0/255.0, 153.0/255.0, 209.0/255.0,1.0, 33.0/255.0, 94.0/255.0, 208.0/255.0,1.0], [0,1], 2), 
+        sourceListSelectionColor = [CPDictionary dictionaryWithObjects: [CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [89.0/255.0, 153.0/255.0, 209.0/255.0,1.0, 33.0/255.0, 94.0/255.0, 208.0/255.0,1.0], [0,1], 2), 
                                                                           [CPColor colorWithCalibratedRed:(61.0/255.0) green:(123.0/255.0) blue:(218.0/255.0) alpha:1.0],
                                                                           [CPColor colorWithCalibratedRed:(31.0/255.0) green:(92.0/255.0) blue:(207.0/255.0) alpha:1.0]
                                                                         ]
-                                                               forKeys: [CPSourceListGradient, CPSourceListTopLineColor, CPSourceListBottomLineColor]];
+                                                               forKeys: [CPSourceListGradient, CPSourceListTopLineColor, CPSourceListBottomLineColor]],
+                                                               
+        themedTableViewValues =
+        [
+            [@"alternating-row-colors",     alternatingRowColors],
+            [@"grid-color",                 gridColor],
+            [@"highlighted-grid-color",     [CPColor whiteColor]],
+            [@"selection-color",            selectionColor],
+            [@"sourcelist-selection-color", sourceListSelectionColor],
+            [@"sort-image",                 sortImage],
+            [@"sort-image-reversed",        sortImageReversed]
+        ];
 
-    [tableview setValue:alternatingRowColors forThemeAttribute:"alternating-row-colors"];
-    [tableview setValue:gridColor forThemeAttribute:"grid-color"];
-    [tableview setValue:[CPColor whiteColor] forThemeAttribute:"highlighted-grid-color"];
-    [tableview setValue:selectionColor forThemeAttribute:"selection-color"];
-    [tableview setValue:sourceListSelectionColor forThemeAttribute:"sourcelist-selection-color"];
-    [tableview setValue:sortImage forThemeAttribute:"sort-image"];
-    [tableview setValue:sortImageReversed forThemeAttribute:"sort-image-reversed"];
+    SetThemeValues(tableview, themedTableViewValues);
 
     return tableview;
 }
@@ -887,166 +1261,20 @@
 
 + (CPPopUpButton)themedSegmentedControl
 {
-    var segmentedControl = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 24.0)];
+    var segmentedControl = [AristoThemeDescriptor makeSegmentedControl];
     
-    [segmentedControl setTrackingMode:CPSegmentSwitchTrackingSelectAny];
-    [segmentedControl setSegmentCount:3];
-    
-    [segmentedControl setWidth:40.0 forSegment:0];
-    [segmentedControl setLabel:@"foo" forSegment:0];
-    [segmentedControl setTag:1 forSegment:0];
-
-    [segmentedControl setWidth:60.0 forSegment:1];
-    [segmentedControl setLabel:@"bar" forSegment:1];
-    [segmentedControl setTag:2 forSegment:1];
-
-    [segmentedControl setWidth:35.0 forSegment:2];
-    [segmentedControl setLabel:@"1" forSegment:2];
-    [segmentedControl setTag:3 forSegment:2];
-    
-    //various colors
-    var centerBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-center.png" size:CGSizeMake(1.0, 24.0)]),
-        dividerBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-divider.png" size:CGSizeMake(1.0, 24.0)]),
-        centerHighlightedBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-highlighted-center.png" size:CGSizeMake(1.0, 24.0)]),
-        dividerHighlightedBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-highlighted-divider.png" size:CGSizeMake(1.0, 24.0)]),
-        leftHighlightedBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-highlighted-left.png" size:CGSizeMake(4.0, 24.0)]),
-        rightHighlightedBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-highlighted-right.png" size:CGSizeMake(4.0, 24.0)]),
-        inactiveCenterBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-disabled-center.png" size:CGSizeMake(1.0, 24.0)]),
-        inactiveDividerBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-disabled-divider.png" size:CGSizeMake(1.0, 24.0)]),
-        inactiveLeftBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-disabled-left.png" size:CGSizeMake(4.0, 24.0)]),
-        inactiveRightBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-disabled-right.png" size:CGSizeMake(4.0, 24.0)]),
-        inactiveHighlightedCenterBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-highlighted-disabled-center.png" size:CGSizeMake(1.0, 24.0)]),
-        inactiveHighlightedDividerBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-highlighted-disabled-divider.png" size:CGSizeMake(1.0, 24.0)]),
-        inactiveHighlightedLeftBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-highlighted-disabled-left.png" size:CGSizeMake(4.0, 24.0)]),
-        inactiveHighlightedRightBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-highlighted-disabled-right.png" size:CGSizeMake(4.0, 24.0)]),
-        leftBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-left.png" size:CGSizeMake(4.0, 24.0)]),
-        rightBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-right.png" size:CGSizeMake(4.0, 24.0)]),
-        pushedCenterBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-pushed-center.png" size:CGSizeMake(1.0, 24.0)]),
-        pushedLeftBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-pushed-left.png" size:CGSizeMake(4.0, 24.0)]),
-        pushedRightBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-pushed-right.png" size:CGSizeMake(4.0, 24.0)]);
-        pushedHighlightedCenterBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-pushed-highlighted-center.png" size:CGSizeMake(1.0, 24.0)]),
-        pushedHighlightedLeftBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-pushed-highlighted-left.png" size:CGSizeMake(4.0, 24.0)]),
-        pushedHighlightedRightBezelColor = PatternColor([_CPCibCustomResource imageResourceWithName:@"HUD/segmented-control-bezel-pushed-highlighted-right.png" size:CGSizeMake(4.0, 24.0)]);
-
-    [segmentedControl setValue:centerBezelColor forThemeAttribute:@"center-segment-bezel-color" inState:CPThemeStateNormal];
-    [segmentedControl setValue:inactiveCenterBezelColor forThemeAttribute:@"center-segment-bezel-color" inState:CPThemeStateDisabled];
-    [segmentedControl setValue:inactiveHighlightedCenterBezelColor forThemeAttribute:@"center-segment-bezel-color" inState:CPThemeStateSelected|CPThemeStateDisabled];
-    [segmentedControl setValue:centerHighlightedBezelColor forThemeAttribute:@"center-segment-bezel-color" inState:CPThemeStateSelected];
-    [segmentedControl setValue:pushedCenterBezelColor forThemeAttribute:@"center-segment-bezel-color" inState:CPThemeStateHighlighted];
-    [segmentedControl setValue:pushedHighlightedCenterBezelColor forThemeAttribute:@"center-segment-bezel-color" inState:CPThemeStateHighlighted|CPThemeStateSelected];
-
-    [segmentedControl setValue:dividerBezelColor forThemeAttribute:@"divider-bezel-color" inState:CPThemeStateNormal];
-    [segmentedControl setValue:inactiveDividerBezelColor forThemeAttribute:@"divider-bezel-color" inState:CPThemeStateDisabled];
-    [segmentedControl setValue:inactiveHighlightedDividerBezelColor forThemeAttribute:@"divider-bezel-color" inState:CPThemeStateSelected|CPThemeStateDisabled];
-    [segmentedControl setValue:dividerHighlightedBezelColor forThemeAttribute:@"divider-bezel-color" inState:CPThemeStateSelected];
-    [segmentedControl setValue:dividerBezelColor forThemeAttribute:@"divider-bezel-color" inState:CPThemeStateHighlighted];
-
-    [segmentedControl setValue:rightBezelColor forThemeAttribute:@"right-segment-bezel-color" inState:CPThemeStateNormal];
-    [segmentedControl setValue:inactiveRightBezelColor forThemeAttribute:@"right-segment-bezel-color" inState:CPThemeStateDisabled];
-    [segmentedControl setValue:inactiveHighlightedRightBezelColor forThemeAttribute:@"right-segment-bezel-color" inState:CPThemeStateSelected|CPThemeStateDisabled];
-    [segmentedControl setValue:rightHighlightedBezelColor forThemeAttribute:@"right-segment-bezel-color" inState:CPThemeStateSelected];
-    [segmentedControl setValue:pushedRightBezelColor forThemeAttribute:@"right-segment-bezel-color" inState:CPThemeStateHighlighted];
-    [segmentedControl setValue:pushedHighlightedRightBezelColor forThemeAttribute:@"right-segment-bezel-color" inState:CPThemeStateHighlighted|CPThemeStateSelected];
-
-    [segmentedControl setValue:leftBezelColor forThemeAttribute:@"left-segment-bezel-color" inState:CPThemeStateNormal];
-    [segmentedControl setValue:inactiveLeftBezelColor forThemeAttribute:@"left-segment-bezel-color" inState:CPThemeStateDisabled];
-    [segmentedControl setValue:inactiveHighlightedLeftBezelColor forThemeAttribute:@"left-segment-bezel-color" inState:CPThemeStateSelected|CPThemeStateDisabled];
-    [segmentedControl setValue:leftHighlightedBezelColor forThemeAttribute:@"left-segment-bezel-color" inState:CPThemeStateSelected];
-    [segmentedControl setValue:pushedLeftBezelColor forThemeAttribute:@"left-segment-bezel-color" inState:CPThemeStateHighlighted];
-    [segmentedControl setValue:pushedHighlightedLeftBezelColor forThemeAttribute:@"left-segment-bezel-color" inState:CPThemeStateHighlighted|CPThemeStateSelected];
-
-    [segmentedControl setValue:CGInsetMake(0.0, 4.0, 0.0, 4.0) forThemeAttribute:@"content-inset" inState:CPThemeStateNormal];
-
-    [segmentedControl setValue:CGInsetMake(0.0, 0.0, 0.0, 0.0) forThemeAttribute:@"bezel-inset" inState:CPThemeStateNormal];
-
-    [segmentedControl setValue:[CPFont boldSystemFontOfSize:12.0] forThemeAttribute:@"font"];
-    [segmentedControl setValue:[CPColor colorWithCalibratedWhite:255.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-color"];
-    [segmentedControl setValue:[CPColor colorWithCalibratedWhite:0.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-shadow-color"];
-    [segmentedControl setValue:CGSizeMake(-1.0, -1.0) forThemeAttribute:@"text-shadow-offset"];
-    [segmentedControl setValue:CPLineBreakByTruncatingTail forThemeAttribute:@"line-break-mode"];
-
-    [segmentedControl setValue:1.0 forThemeAttribute:@"divider-thickness"];
-    [segmentedControl setValue:24.0 forThemeAttribute:@"default-height"];
+    SetHUDThemeValues(segmentedControl, themedSegmentedControlValues);
 
     return segmentedControl;
 }
 
+var 
 + (CPButton)button
 {
-    var button = [[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 24.0)],
+    var button = [AristoThemeDescriptor makeButton];
 
-        bezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-right.png" size:CGSizeMake(4.0, 24.0)]
-            ]
-        isVertical:NO]],
-
-        highlightedBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-highlighted-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-highlighted-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-highlighted-right.png" size:CGSizeMake(4.0, 24.0)]
-            ]
-        isVertical:NO]],
-
-        defaultBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-right.png" size:CGSizeMake(4.0, 24.0)]
-            ]
-        isVertical:NO]],
-
-        defaultHighlightedBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-highlighted-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-highlighted-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-highlighted-right.png" size:CGSizeMake(4.0, 24.0)]
-            ]
-        isVertical:NO]],
-
-        defaultDisabledBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-disabled-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-disabled-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-disabled-right.png" size:CGSizeMake(4.0, 24.0)]
-            ]
-        isVertical:NO]],
-        
-        disabledBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-disabled-left.png" size:CGSizeMake(4.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-disabled-center.png" size:CGSizeMake(1.0, 24.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-disabled-right.png" size:CGSizeMake(4.0, 24.0)]
-            ]
-        isVertical:NO]];
-
-    [button setValue:[CPFont boldSystemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBordered];
-
-    [button setValue:[CPColor colorWithCalibratedWhite:255.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-color"];
-    [button setValue:[CPColor colorWithCalibratedWhite:0.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateBordered];
-    [button setValue:[CPColor colorWithCalibratedWhite:0.0 / 255.0 alpha:0.6] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateBordered|CPThemeStateDisabled];
-    [button setValue:CGSizeMake(-1.0,-1.0) forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateBordered];
-    [button setValue:CPLineBreakByTruncatingTail forThemeAttribute:@"line-break-mode"];
+    SetHUDThemeValues(button, themedButtonValues);
     
-    [button setValue:bezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
-    [button setValue:highlightedBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateHighlighted];
-    [button setValue:CGInsetMake(0.0, 5.0, 0.0, 5.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBordered];
-
-    [button setValue:[CPColor colorWithCalibratedWhite:0.97 alpha:1.0] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled];
-    [button setValue:disabledBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateDisabled];
-    [button setValue:defaultDisabledBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateDefault|CPThemeStateDisabled];
-    
-    [button setValue:defaultBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateDefault];
-    [button setValue:defaultHighlightedBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateHighlighted|CPThemeStateDefault];
-    [button setValue:[CPColor colorWithCalibratedRed:250.0/255.0 green:250.0/255.0 blue:250.0/255.0 alpha:1.0] forThemeAttribute:@"text-color" inState:CPThemeStateDefault];
-    [button setValue:[CPColor colorWithCalibratedRed:250.0/255.0 green:250.0/255.0 blue:250.0/255.0 alpha:0.6] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled|CPThemeStateDefault];
-
-    [button setValue:CGSizeMake(0.0, 24.0) forThemeAttribute:@"min-size"];
-    [button setValue:CGSizeMake(-1.0, 24.0) forThemeAttribute:@"max-size"];
-
     return button;
 }
 
@@ -1071,209 +1299,55 @@
 
 + (CPScroller)themedVerticalScroller
 {
-    var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 15.0, 170.0)],
-        trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-vertical-track.png" size:CGSizeMake(15.0, 1.0)]),
-        disabledTrackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-vertical-track-disabled.png" size:CGSizeMake(15.0, 1.0)]);
-        
-    [scroller setValue:21.0 forThemeAttribute:@"minimum-knob-length" inState:CPThemeStateVertical];
-    [scroller setValue:CGInsetMake(0.0, 0.0, 0.0, 0.0) forThemeAttribute:@"knob-inset" inState:CPThemeStateVertical];
-    [scroller setValue:CGInsetMake(-9.0, 0.0, -9.0, 0.0) forThemeAttribute:@"track-inset" inState:CPThemeStateVertical];
-
-    [scroller setValue:trackColor forThemeAttribute:@"knob-slot-color" inState:CPThemeStateVertical];
-    [scroller setValue:disabledTrackColor forThemeAttribute:@"knob-slot-color" inState:CPThemeStateVertical | CPThemeStateDisabled];
-
-    var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-up-arrow.png" size:CGSizeMake(15.0, 24.0)]),
-        highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-up-arrow-highlighted.png" size:CGSizeMake(15.0, 24.0)]),
-        disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-up-arrow-disabled.png" size:CGSizeMake(15.0, 24.0)]);
-
-    [scroller setValue:CGSizeMake(15.0, 24.0) forThemeAttribute:@"decrement-line-size" inState:CPThemeStateVertical];
-    [scroller setValue:arrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateVertical];
-    [scroller setValue:highlightedArrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateVertical | CPThemeStateHighlighted],
-    [scroller setValue:disabledArrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateVertical | CPThemeStateDisabled];
-
-    var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-down-arrow.png" size:CGSizeMake(15.0, 24.0)]),
-        highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-down-arrow-highlighted.png" size:CGSizeMake(15.0, 24.0)]),
-        disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-down-arrow-disabled.png" size:CGSizeMake(15.0, 24.0)]);
-
-    [scroller setValue:CGSizeMake(15.0, 24.0) forThemeAttribute:@"increment-line-size" inState:CPThemeStateVertical];
-    [scroller setValue:arrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateVertical];
-    [scroller setValue:highlightedArrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateVertical | CPThemeStateHighlighted];
-    [scroller setValue:disabledArrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateVertical | CPThemeStateDisabled];
+    var scroller = [AristoThemeDescriptor makeVerticalScroller],
+        overrides =
+        [
+            [@"knob-color", nil, CPThemeStateVertical | CPThemeStateDisabled]
+        ];
     
-    var knobColor = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"HUD/scroller-vertical-knob-top.png" size:CGSizeMake(15.0, 10.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/scroller-vertical-knob-center.png" size:CGSizeMake(15.0, 1.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/scroller-vertical-knob-bottom.png" size:CGSizeMake(15.0, 10.0)]
-            ]
-        isVertical:YES]);
-
-    /*var knobDisabledColor = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"HUD/scroller-vertical-knob-disabled-top.png" size:CGSizeMake(15.0, 10.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/scroller-vertical-knob-disabled-center.png" size:CGSizeMake(15.0, 1.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/scroller-vertical-knob-disabled-bottom.png" size:CGSizeMake(15.0, 10.0)]
-            ]
-        isVertical:YES]);*/
+    SetHUDThemeValues(scroller, themedVerticalScrollerValues, overrides);
     
-    [scroller setValue:knobColor forThemeAttribute:@"knob-color" inState:CPThemeStateVertical];
-    //[scroller setValue:knobDisabledColor forThemeAttribute:@"knob-color" inState:CPThemeStateVertical|CPThemeStateDisabled];
-    
-    [scroller setFloatValue:0.1];
-    [scroller setKnobProportion:0.5];
-
     return scroller;
 }
 
 + (CPScroller)themedHorizontalScroller
 {
-    var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 170.0, 15.0)],
-        trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-horizontal-track.png" size:CGSizeMake(1.0, 15.0)]),
-        disabledTrackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-horizontal-track-disabled.png" size:CGSizeMake(1.0, 15.0)]);
-
-    [scroller setValue:21.0 forThemeAttribute:@"minimum-knob-length"];
-    [scroller setValue:CGInsetMake(0.0, 0.0, 0.0, 0.0) forThemeAttribute:@"knob-inset"];
-    [scroller setValue:CGInsetMake(0.0, -7.0, 0.0, -9.0) forThemeAttribute:@"track-inset"];
-
-    [scroller setValue:trackColor forThemeAttribute:@"knob-slot-color"];
-    [scroller setValue:disabledTrackColor forThemeAttribute:@"knob-slot-color" inState:CPThemeStateDisabled];
-
-    var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-left-arrow.png" size:CGSizeMake(24.0, 15.0)]),
-        highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-left-arrow-highlighted.png" size:CGSizeMake(24.0, 15.0)]),
-        disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-left-arrow-disabled.png" size:CGSizeMake(24.0, 15.0)]);
-
-    [scroller setValue:CGSizeMake(24.0, 15.0) forThemeAttribute:@"decrement-line-size"];
-    [scroller setValue:arrowColor forThemeAttribute:@"decrement-line-color"];
-    [scroller setValue:highlightedArrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateHighlighted],
-    [scroller setValue:disabledArrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateDisabled];
-
-    var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-right-arrow.png" size:CGSizeMake(24.0, 15.0)]),
-        highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-right-arrow-highlighted.png" size:CGSizeMake(24.0, 15.0)]),
-        disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/scroller-right-arrow-disabled.png" size:CGSizeMake(24.0, 15.0)]);
-
-    [scroller setValue:CGSizeMake(24.0, 15.0) forThemeAttribute:@"increment-line-size"];
-    [scroller setValue:arrowColor forThemeAttribute:@"increment-line-color"];
-    [scroller setValue:highlightedArrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateHighlighted];
-    [scroller setValue:disabledArrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateDisabled];
+    var scroller = [AristoThemeDescriptor makeHorizontalScroller],
+        overrides =
+        [
+            [@"knob-color", nil, CPThemeStateDisabled]
+        ];
     
-    var knobColor = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"HUD/scroller-horizontal-knob-left.png" size:CGSizeMake(10.0, 15.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/scroller-horizontal-knob-center.png" size:CGSizeMake(1.0, 15.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/scroller-horizontal-knob-right.png" size:CGSizeMake(10.0, 15.0)]
-            ]
-        isVertical:NO]);
-
-    /*var knobDisabledColor = PatternColor([[CPThreePartImage alloc] initWithImageSlices:
-            [
-                [_CPCibCustomResource imageResourceWithName:"HUD/scroller-horizontal-knob-disabled-left.png" size:CGSizeMake(10.0, 15.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/scroller-horizontal-knob-disabled-center.png" size:CGSizeMake(1.0, 15.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/scroller-horizontal-knob-disabled-right.png" size:CGSizeMake(10.0, 15.0)]
-            ]
-        isVertical:NO]);*/
-
-    [scroller setValue:knobColor forThemeAttribute:@"knob-color"];
-    //[scroller setValue:knobDisabledColor forThemeAttribute:@"knob-color" inState:CPThemeStateDisabled];
-
-    [scroller setFloatValue:0.1];
-    [scroller setKnobProportion:0.5];
+    SetHUDThemeValues(scroller, themedHorizontalScrollerValues, overrides);
 
     return scroller;
 }
 
 + (CPSlider)themedHorizontalSlider
 {
-    var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 50.0, 24.0)],
-        trackColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-        [
-            [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-left.png" size:CGSizeMake(4.0, 5.0)],
-            [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-center.png" size:CGSizeMake(1.0, 5.0)],
-            [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-right.png" size:CGSizeMake(4.0, 5.0)]
-        ]
-        isVertical:NO]],
-        
-        trackDisabledColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-        [
-            [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-disabled-left.png" size:CGSizeMake(4.0, 5.0)],
-            [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-disabled-center.png" size:CGSizeMake(1.0, 5.0)],
-            [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-disabled-right.png" size:CGSizeMake(4.0, 5.0)]
-        ]
-        isVertical:NO]];
-
-    [slider setValue:5.0 forThemeAttribute:@"track-width"];
-    [slider setValue:trackColor forThemeAttribute:@"track-color"];
-    [slider setValue:trackDisabledColor forThemeAttribute:@"track-color" inState:CPThemeStateDisabled];
+    var slider = [AristoThemeDescriptor makeHorizontalSlider];
     
-        var knobColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob.png" size:CGSizeMake(23.0, 24.0)]],
-            knobHighlightedColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob-highlighted.png" size:CGSizeMake(23.0, 24.0)]],
-            knobDisabledColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob-disabled.png" size:CGSizeMake(23.0, 24.0)]];
-
-    [slider setValue:CGSizeMake(23.0, 24.0) forThemeAttribute:@"knob-size"];
-    [slider setValue:knobColor forThemeAttribute:@"knob-color"];
-    [slider setValue:knobHighlightedColor forThemeAttribute:@"knob-color" inState:CPThemeStateHighlighted];
-    [slider setValue:knobDisabledColor forThemeAttribute:@"knob-color" inState:CPThemeStateDisabled];
+    SetHUDThemeValues(slider, themedHorizontalSliderValues);
     
     return slider;
 }
 
 + (CPSlider)themedVerticalSlider
 {
-    var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 24.0, 50.0)],
-        trackColor =  [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-        [
-            [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-top.png" size:CGSizeMake(5.0, 6.0)],
-            [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-center.png" size:CGSizeMake(5.0, 1.0)],
-            [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-bottom.png" size:CGSizeMake(5.0, 4.0)]
-        ]
-        isVertical:YES]],
-        trackDisabledColor =  [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
-        [
-            [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-disabled-top.png" size:CGSizeMake(5.0, 6.0)],
-            [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-disabled-center.png" size:CGSizeMake(5.0, 1.0)],
-            [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-disabled-bottom.png" size:CGSizeMake(5.0, 4.0)]
-        ]
-        isVertical:YES]];
-        
-    [slider setValue:5.0 forThemeAttribute:@"track-width"];
-    [slider setValue:trackColor forThemeAttribute:@"track-color" inState:CPThemeStateVertical];
-    [slider setValue:trackDisabledColor forThemeAttribute:@"track-color" inState:CPThemeStateDisabled];
+    var slider = [AristoThemeDescriptor makeVerticalSlider];
     
-        var knobColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob.png" size:CGSizeMake(23.0, 24.0)]],
-            knobHighlightedColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob-highlighted.png" size:CGSizeMake(23.0, 24.0)]],
-            knobDisabledColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob-disabled.png" size:CGSizeMake(23.0, 24.0)]];
-
-    [slider setValue:CGSizeMake(23.0, 24.0) forThemeAttribute:@"knob-size"];
-    [slider setValue:knobColor forThemeAttribute:@"knob-color"];
-    [slider setValue:knobHighlightedColor forThemeAttribute:@"knob-color" inState:CPThemeStateHighlighted];
-    [slider setValue:knobDisabledColor forThemeAttribute:@"knob-color" inState:CPThemeStateDisabled];
+    SetHUDThemeValues(slider, themedVerticalSliderValues);
     
     return slider;
 }
+
 + (CPSlider)themedCircularSlider
 {
-    var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 34.0, 34.0)],
-        trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/slider-circular-bezel.png" size:CGSizeMake(34.0, 34.0)]),
-        trackDisabledColor = PatternColor([_CPCibCustomResource imageResourceWithName:"HUD/slider-circular-disabled-bezel.png" size:CGSizeMake(34.0, 34.0)]);
-
-    [slider setSliderType:CPCircularSlider];
-    [slider setValue:trackColor forThemeAttribute:@"track-color" inState:CPThemeStateCircular];
-    [slider setValue:trackDisabledColor forThemeAttribute:@"track-color" inState:CPThemeStateDisabled|CPThemeStateCircular];
-
-    var knobColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/slider-circular-knob.png" size:CGSizeMake(5.0, 5.0)]],
-        knobDisabledColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/slider-circular-disabled-knob.png" size:CGSizeMake(5.0, 5.0)]],
-        knobHighlightedColor = knobColor;
-
-    [slider setValue:CGSizeMake(5.0, 5.0) forThemeAttribute:@"knob-size" inState:CPThemeStateCircular];
-    [slider setValue:knobColor forThemeAttribute:@"knob-color" inState:CPThemeStateCircular];
-    [slider setValue:knobDisabledColor forThemeAttribute:@"knob-color" inState:CPThemeStateDisabled|CPThemeStateCircular];
-    [slider setValue:knobHighlightedColor forThemeAttribute:@"knob-color" inState:CPThemeStateCircular|CPThemeStateHighlighted];
-
+    var slider = [AristoThemeDescriptor makeCircularSlider];
+    
+    SetHUDThemeValues(slider, themedCircularSliderValues);
+    
     return slider;
 }
 
 @end
-
-function PatternColor(anImage)
-{
-    return [CPColor colorWithPatternImage:anImage];
-}
\ No newline at end of file
diff --git a/AppKit/Themes/BlendKit/BKThemeDescriptor.j b/AppKit/Themes/BlendKit/BKThemeDescriptor.j
index 4c4801ffb..b32680053 100644
--- a/AppKit/Themes/BlendKit/BKThemeDescriptor.j
+++ b/AppKit/Themes/BlendKit/BKThemeDescriptor.j
@@ -219,3 +219,132 @@ function BKLabelFromIdentifier(anIdentifier)
     return label;
 }
 
+
+
+PatternIsVertical = YES,
+PatternIsHorizontal = NO;
+    
+/*
+    To create a simple color with a pattern image:
+        PatternColor(name, width, height)
+        
+    To create a color with a three part pattern image:
+        PatternColor(slices, orientation)
+        
+    where slices is an array of three [name, width, height] arrays,
+    and orientation is PatternIsVertical or PatternIsHorizontal.
+    
+    To create a color with a nine part pattern image:
+        PatternColor(slices);
+        
+    where slices is an array of nine [name, width, height] arrays.    
+*/
+function PatternColor()
+{
+    if (arguments.length < 3)
+    {
+        var slices = arguments[0],
+            imageSlices = [];
+            
+        for (var i = 0; i < slices.length; ++i)
+        {
+            var slice = slices[i];
+            
+            imageSlices.push(slice ? [_CPCibCustomResource imageResourceWithName:slice[0] size:CGSizeMake(slice[1], slice[2])] : nil);
+        }
+        
+        if (arguments.length == 2)
+            return [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:imageSlices isVertical:arguments[1]]];
+        else
+            return [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:imageSlices]];
+    }
+    else if (arguments.length == 3)
+    {
+        return [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:arguments[0] size:CGSizeMake(arguments[1], arguments[2])]];
+    }
+    else
+    {
+        return nil;
+    }
+}
+
+function SetThemeValues(object, values)
+{
+    for (var i = 0; i < values.length; ++i)
+    {
+        var attributeValueState = values[i],
+            attribute = attributeValueState[0],
+            value = attributeValueState[1],
+            state = attributeValueState[2];
+            
+        if (state)
+            [object setValue:value forThemeAttribute:attribute inState:state];
+        else
+            [object setValue:value forThemeAttribute:attribute];
+    }
+}
+
+function SetHUDThemeValues(object, values, overrides)
+{
+    for (var i = 0; i < values.length; ++i)
+    {
+        var attributeValueState = values[i],
+            attribute = attributeValueState[0],
+            value = attributeValueState[1],
+            state = attributeValueState[2];
+            
+        if (attribute == "text-color" || attribute == "text-shadow-color")
+        {
+            var whiteValue = attribute == "text-color" ? 1.0 : 0.0,
+                alpha = (state && (state & CPThemeStateDisabled)) ? 0.6 : 1.0;
+            
+            value = [CPColor colorWithCalibratedWhite:whiteValue alpha:alpha];
+        }
+        else if (typeof(value) === "object" && value.hasOwnProperty("isa") && [value isKindOfClass:CPColor])
+        {
+            var pattern = [value patternImage];
+            
+            if (pattern)
+            {
+                if ([pattern isThreePartImage] || [pattern isNinePartImage])
+                {
+                    var slices = [pattern imageSlices],
+                        newSlices = [];
+                    
+                    for (var sliceIndex = 0; sliceIndex < slices.length; ++sliceIndex)
+                    {
+                        var slice = slices[sliceIndex],
+                            filename = "HUD/" + [[slice filename] lastPathComponent],
+                            size = [slice size];
+                        
+                        newSlices.push([filename, size.width, size.height]);
+                    }
+                    
+                    if ([pattern isThreePartImage])
+                        value = PatternColor(newSlices, [pattern isVertical]);
+                    else
+                        value = PatternColor(newSlices);
+                }
+                else
+                {
+                    var filename = "HUD/" + [[pattern filename] lastPathComponent],
+                        size = [pattern size];
+                    
+                    value = PatternColor(filename, size.width, size.height);
+                }
+            }
+        }
+        else if (attribute == "text-shadow-offset")
+        {
+            value = CGSizeMake(-1.0, -1.0);
+        }
+        
+        if (state)
+            [object setValue:value forThemeAttribute:attribute inState:state];
+        else
+            [object setValue:value forThemeAttribute:attribute];
+    }
+    
+    if (overrides)
+        SetThemeValues(object, overrides);
+}

From c9718783af12014a4ad4a73ddbdabd6b7e917acc Mon Sep 17 00:00:00 2001
From: Aparajita Fishman <aparajita@vasudevaserver.org>
Date: Tue, 3 Aug 2010 15:45:41 -0400
Subject: [PATCH 31/41] Made the new theming mechanism generic (see ecbbe57)

---
 AppKit/Themes/Aristo/ThemeDescriptors.j    | 261 ++++++++++++++-------
 AppKit/Themes/BlendKit/BKThemeDescriptor.j | 169 ++++++-------
 2 files changed, 259 insertions(+), 171 deletions(-)

diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 3130fe1f7..98b7af5ad 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -108,9 +108,9 @@
             [@"min-size",       CGSizeMake(100.0, 100.0)]
         ];
         
-        // Now we just pass our values to utility function
+        // Now we just register our values
         
-        SetThemeValues(calendar, themedCalendarViewValues);
+        [self registerThemeValues:themedCalendarViewValues forView:calendar];
     }
     
     That's all there is to it. Note that PatternColor can also be used to create a simple
@@ -138,81 +138,146 @@
     PatternIsVertical);
 
     
-    HUD THEMES
+    SUBTHEMES
     
-    If you want to modify the look of your view when it is within a HUD window,
-    follow these steps:
+    If you want to create a theme that inherits from another theme, for example the way
+    the Aristo-HUD theme inherits from Aristo, you can do this easily by following
+    these steps:
     
-    1. Decide which elements will be changed and which will stay the same.
-       For example, in a HUD window you may want to use a dark or black background
+    1. Your subtheme should be named "<inherited>-<identifier>", where <inherited> is the name
+       of the theme from which you are inheriting, and <identifier> is the subtheme identifier.
+       For example, "Aristo-HUD" inherits from "Aristo".
+       
+    2. Decide which elements in the subtheme will be changed and which will be inherited.
+       For example, in a HUD theme you may want to use a dark or black background
        and white text.
        
-    2. If you are using different color pattern artwork, use the same filename as
-       the main theme but put it in the HUD directory of the main theme directory.
+    3. If your subtheme will replace pattern colors in the inherited theme, use the same filename as
+       in the inherited theme and put the pattern images in a subdirectory of the inherited
+       directory. The subdirectory's name should be the same as the subtheme identifier.
+       For example, Aristo-HUD's pattern images are in a "HUD" subdirectory of the "Aristo" directory.
        
-    3. In the HUD class (such as AristoHUDThemeDescriptor), add a method with this template:
+    4. In the subtheme class (such as AristoHUDThemeDescriptor), add a method with this template:
     
-    + (CPCalendarView)themedCalendarView
-    {
-        var calendar = [AristoThemeDescriptor makeCalendarView];
+        + (CPCalendarView)themedCalendarView
+        {
+            var calendar = [AristoThemeDescriptor makeCalendarView],
+                subthemeValues = nil;  // This may change according to your needs, see below
         
-        SetHUDThemeValues(calendar, themedCalendarViewValues);
+            [self registerThemeValues:subthemeValues forView:calendar inherit:themedCalendarViewValues];
         
-        return calendar;
-    }
+            return calendar;
+        }
     
-    In many cases that's all you need to do! SetHUDThemeValues() does the following:
+       NOTE: If you pass nil or an empty array for the subthemeValues, ALL pattern images
+       will be automatically inherited and MUST be present in the subtheme directory.
+       
+       Depending on your subtheme, you will change subthemeValues to indicate which values you
+       wish to override or remove from the inherited theme.
+        
+       For example, let's say in your subtheme you want to use white text instead of dark blue,
+       and slightly gray text when it is disabled. In addition, you decide not to inherit the
+       disabled bezel color pattern. Here is how your updated theme method would look:
+
+        + (CPCalendarView)themedCalendarView
+        {
+            var calendar = [AristoThemeDescriptor makeCalendarView],
+            
+                textColor = [CPColor whiteColor],
+                disabledTextColor = [textColor colorWithAlphaComponent:0.6],
+                subthemeValues = 
+                [
+                    [@"bezel-color",    nil,                CPThemeStateDisabled],
+                    [@"text-color",     textColor],
+                    [@"text-color",     disabledTextColor,  CPThemeStateDisabled]
+                ];
+
+            [self registerThemeValues:subthemeValues forView:calendar inherit:themedCalendarViewValues];
+
+            return calendar;
+        }
+        
+       If your subtheme consistently applies the same overrides to all themed views, you may
+       want to create a separate method that supplies those overrides. For example, Aristo-HUD
+       uses the following method:
+       
+        + (CPArray)defaultThemeOverridesAddedTo:(CPArray)themeValues
+       
+       For the example we used above, we could define such a method as follows:
+       
+        + (CPArray)defaultThemeOverridesAddedTo:(CPArray)themeValues
+        {
+            var textColor = [CPColor whiteColor],
+                disabledTextColor = [textColor colorWithAlphaComponent:0.6],
+                overrides = [CPArray arrayWithObjects:
+                    [@"bezel-color",    nil,                CPThemeStateDisabled],
+                    [@"text-color",     textColor],
+                    [@"text-color",     disabledTextColor,  CPThemeStateDisabled]
+                ];
+
+            if (themeValues)
+                [overrides addObjectsFromArray:themeValues];
+
+            return overrides;
+        }
+        
+       Note that the values in the themeValues parameter override the defaults provided
+       by the method.
+       
+       Our themed view method becomes:
+
+        + (CPCalendarView)themedCalendarView
+        {
+            var calendar = [AristoThemeDescriptor makeCalendarView];
+
+            [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] 
+                              forView:calendar 
+                              inherit:themedCalendarViewValues];
+
+            return calendar;
+        }
+        
+       As a last example, let's assume another type of themed view in your subtheme wants
+       to add some new theme values to the default overrides. The theme method might look like this:
+
+        + (CPCalendarView)themedCalendarHeaderView
+        {
+            var header = [AristoThemeDescriptor makeCalendarHeaderView],
+                headerColor = PatternColor(
+                    [
+                        ["calendar-header-left.png",   5.0, 23.0],
+                        ["calendar-header-center.png", 1.0, 23.0],
+                        ["calendar-header-right.png",  5.0, 23.0]
+                    ],
+                    PatternIsHorizontal),
+                subthemeValues = 
+                [
+                    [@"background-color", headerColor]
+                ];
+
+            [self registerThemeValues:[self defaultThemeOverridesAddedTo:subthemeValues] 
+                              forView:calendar 
+                              inherit:themedCalendarHeaderViewValues];;
+
+            return calendar;
+        }
+
+       
+    ADDING ARISTO-HUD CONTROLS
     
-    - Finds all colors defined with a pattern image, and redirects them to an image
-      with the same filename in the HUD directory.
-      
-    - Converts any "text-color" attributes to white in the normal state and
+    If you want to add a new themed control to Aristo-HUD, you should use the
+    +defaultThemeOverridesAddedTo: method to ensure visual consistency with the rest
+    of Aristo-HUD. The overrides returned by this method do the following:
+    
+    - Sets the "text-color" attribute to white in the normal state and
       [CPColor colorWithCalibratedWhite:1.0 alpha:0.6] in the disabled state.
       
-    - Converts any "text-shadow-color" to black.
+    - Set "text-shadow-color" to black.
     
-    - Converts any "text-shadow-offset" to (-1.0, -1.0).
+    - Sets "text-shadow-offset" to (-1.0, -1.0).
     
     These are the standards used by Aristo-HUD. If you want to override these defaults,
-    you can declare an array of overrides and pass it to SetHUDThemeValues().
-    For example, let's say with our calendar we decide to do the following for HUD:
-    
-    - Use a different, dark background bezel in normal state
-    - Use the same bezel in disabled state
-    - Use light blue text in normal state with a dark blue shadow
-    - Use the same text color with alpha 0.6 in disabled state
-    
-    Here is our modified method:
-    
-    + (CPCalendarView)themedCalendarView
-    {
-        var calendar = [AristoThemeDescriptor makeCalendarView],
-        
-            textColor = [CPColor colorWithHexString:@"#EEF3FF"],
-            disabledTextColor = [textColor colorWithAlphaComponent:0.6],
-        
-            overrides =
-            [
-                // We don't have to specify the normal bezel, that will be
-                // used automatically from the HUD directory. But we have
-                // to remove the disabled bezel by passing a nil value.
-                
-                [@"bezel-color", nil, CPThemeStateDisabled],
-                
-                // Now override the text colors
-                
-                [@"text-color", textColor],
-                [@"text-color", disabledTextColor, CPThemeStateDisabled]
-            ];
-    
-        // Pass the overrides when setting the theme values
-        
-        SetHUDThemeValues(calendar, themedCalendarViewValues, overrides);
-    
-        return calendar;
-    }
-    
-    That's it!
+    simply add those overrides to the values you pass to +defaultThemeOverridesAddedTo:.
 */
 
 @implementation AristoThemeDescriptor : BKThemeDescriptor
@@ -311,8 +376,8 @@ var themedButtonValues = nil;
             [@"min-size",           CGSizeMake(0.0, 24.0)],
             [@"max-size",           CGSizeMake(-1.0, 24.0)]
         ];
-
-    SetThemeValues(button, themedButtonValues);
+    
+    [self registerThemeValues:themedButtonValues forView:button];
     
     return button;
 }
@@ -372,7 +437,7 @@ var themedButtonValues = nil;
             [@"max-size",           CGSizeMake(-1.0, 24.0)]
         ];
             
-    SetThemeValues(button, themeValues);
+    [self registerThemeValues:themeValues forView:button];
     
     [button setTitle:@"Pop Up"];
     [button addItemWithTitle:@"item"];
@@ -416,7 +481,7 @@ var themedButtonValues = nil;
             [@"max-size",           CGSizeMake(-1.0, 24.0)]
         ];
 
-    SetThemeValues(button, themeValues);
+    [self registerThemeValues:themeValues forView:button];
     
     [button setTitle:@"Pull Down"];
     [button addItemWithTitle:@"item"];
@@ -489,7 +554,7 @@ var themedVerticalScrollerValues = nil;
             [@"increment-line-color",   disabledDownArrowColor,     CPThemeStateVertical | CPThemeStateDisabled]
         ];
                 
-    SetThemeValues(scroller, themedVerticalScrollerValues);
+    [self registerThemeValues:themedVerticalScrollerValues forView:scroller];
     
     return scroller;
 }
@@ -559,7 +624,7 @@ var themedHorizontalScrollerValues = nil;
             [@"increment-line-color",   disabledRightArrowColor,    CPThemeStateDisabled]
         ];
 
-    SetThemeValues(scroller, themedHorizontalScrollerValues);
+    [self registerThemeValues:themedHorizontalScrollerValues forView:scroller];
     
     return scroller;
 }
@@ -617,7 +682,7 @@ var themedHorizontalScrollerValues = nil;
             [@"font",               [CPFont boldSystemFontOfSize:12.0], CPThemeStateTableDataView | CPThemeStateSelectedTableDataView],
         ];
 
-    SetThemeValues(textfield, themeValues);
+    [self registerThemeValues:themeValues forView:textfield];
     
     [textfield setBezeled:YES];
 
@@ -665,7 +730,7 @@ var themedHorizontalScrollerValues = nil;
             [@"max-size",       CGSizeMake(-1.0, 30.0), CPTextFieldStateRounded | CPThemeStateBezeled]
         ];
 
-    SetThemeValues(textfield, themeValues);
+    [self registerThemeValues:themeValues forView:textfield];
     
     [textfield setBezeled:YES];
     [textfield setBezelStyle:CPTextFieldRoundedBezel];
@@ -734,7 +799,7 @@ var themedHorizontalScrollerValues = nil;
             [@"min-size",       CGSizeMake(0.0, 17.0)]
         ];
         
-    SetThemeValues(button, themeValues);
+    [self registerThemeValues:themeValues forView:button];
 
     [button setTitle:@"Hello Friend!"];
 
@@ -798,7 +863,7 @@ var themedHorizontalScrollerValues = nil;
             [@"min-size",       CGSizeMake(0.0, 17.0)]
         ];
 
-    SetThemeValues(button, themeValues);
+    [self registerThemeValues:themeValues forView:button];
         
     [button setTitle:@"Another option"];
 
@@ -837,7 +902,7 @@ var themedHorizontalScrollerValues = nil;
             [@"bezel-color",    mixedDisabledColor, CPButtonStateMixed | CPThemeStateBordered | CPThemeStateDisabled]
         ];
 
-    SetThemeValues(button, themeValues);
+    [self registerThemeValues:themeValues forView:button];
     
     return button;
 }
@@ -936,7 +1001,7 @@ var themedSegmentedControlValues = nil;
             [@"default-height",     24.0]
         ];
 
-    SetThemeValues(segmentedControl, themedSegmentedControlValues);
+    [self registerThemeValues:themedSegmentedControlValues forView:segmentedControl];
     
     return segmentedControl;
 }
@@ -984,7 +1049,7 @@ var themedHorizontalSliderValues = nil;
         [@"knob-color", knobDisabledColor,      CPThemeStateDisabled]
     ];
     
-    SetThemeValues(slider, themedHorizontalSliderValues);
+    [self registerThemeValues:themedHorizontalSliderValues forView:slider];
     
     return slider;
 }
@@ -1032,7 +1097,7 @@ var themedVerticalSliderValues = nil;
         [@"knob-color", knobDisabledColor,      CPThemeStateDisabled]
     ]
     
-    SetThemeValues(slider, themedVerticalSliderValues);
+    [self registerThemeValues:themedVerticalSliderValues forView:slider];
     
     return slider;
 }
@@ -1069,7 +1134,7 @@ var themedCircularSliderValues = nil;
         [@"knob-color", knobDisabledColor,      CPThemeStateCircular | CPThemeStateDisabled]
     ];
 
-    SetThemeValues(slider, themedCircularSliderValues);
+    [self registerThemeValues:themedCircularSliderValues forView:slider];
     
     return slider;
 }
@@ -1135,7 +1200,7 @@ var themedButtonBarValues = nil;
         [@"button-text-color",      [CPColor blackColor]]
     ];
     
-    SetThemeValues(buttonBar, themedButtonBarValues);
+    [self registerThemeValues:themedButtonBarValues forView:buttonBar];
     
     return buttonBar;
 }
@@ -1173,14 +1238,14 @@ var themedButtonBarValues = nil;
             [@"background-color",   highlightedPressed, CPThemeStateHighlighted | CPThemeStateSelected]
         ];
 
-    SetThemeValues(header, themedColumnHeaderValues);
+    [self registerThemeValues:themedColumnHeaderValues forView:header];
     
     return header;
 }
 
 + (CPTableHeaderView)themedTableHeaderRow
 {
-    var header = [[CPTableHeaderView alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 24.0)],
+    var header = [[CPTableHeaderView alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 23.0)],
         normal = PatternColor("tableview-headerview.png", 1.0, 23.0);
 
     [header setValue:normal forThemeAttribute:@"background-color"];
@@ -1191,8 +1256,8 @@ var themedButtonBarValues = nil;
 + (_CPCornerView)themedCornerview
 {
     var scrollerWidth = [CPScroller scrollerWidth],
-        corner = [[_CPCornerView alloc] initWithFrame:CGRectMake(0.0, 0.0, 25.0, scrollerWidth)],
-        normal = PatternColor("tableview-headerview.png", 1.0, scrollerWidth);
+        corner = [[_CPCornerView alloc] initWithFrame:CGRectMake(0.0, 0.0, scrollerWidth, 23.0)],
+        normal = PatternColor("tableview-headerview.png", 1.0, 23.0);
 
     [corner setValue:normal forThemeAttribute:"background-color"];
 
@@ -1227,7 +1292,7 @@ var themedButtonBarValues = nil;
             [@"sort-image-reversed",        sortImageReversed]
         ];
 
-    SetThemeValues(tableview, themedTableViewValues);
+    [self registerThemeValues:themedTableViewValues forView:tableview];
 
     return tableview;
 }
@@ -1259,11 +1324,27 @@ var themedButtonBarValues = nil;
     return [CPColor blackColor];
 }
 
++ (CPArray)defaultThemeOverridesAddedTo:(CPArray)themeValues
+{
+    var overrides = [CPArray arrayWithObjects:
+            [@"text-color",         [CPColor whiteColor]],
+            [@"text-color",         [CPColor colorWithCalibratedWhite:1.0 alpha:0.6], CPThemeStateDisabled],
+            [@"text-shadow-color",  [CPColor blackColor]],
+            [@"text-shadow-color",  [CPColor blackColor], CPThemeStateDisabled],
+            [@"text-shadow-offset", CGSizeMake(-1.0, -1.0)]
+        ];
+        
+    if (themeValues)
+        [overrides addObjectsFromArray:themeValues];
+        
+    return overrides;
+}
+
 + (CPPopUpButton)themedSegmentedControl
 {
     var segmentedControl = [AristoThemeDescriptor makeSegmentedControl];
     
-    SetHUDThemeValues(segmentedControl, themedSegmentedControlValues);
+    [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:segmentedControl inherit:themedSegmentedControlValues];
 
     return segmentedControl;
 }
@@ -1273,7 +1354,7 @@ var
 {
     var button = [AristoThemeDescriptor makeButton];
 
-    SetHUDThemeValues(button, themedButtonValues);
+    [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:button inherit:themedButtonValues];;
     
     return button;
 }
@@ -1305,7 +1386,7 @@ var
             [@"knob-color", nil, CPThemeStateVertical | CPThemeStateDisabled]
         ];
     
-    SetHUDThemeValues(scroller, themedVerticalScrollerValues, overrides);
+    [self registerThemeValues:[self defaultThemeOverridesAddedTo:overrides] forView:scroller inherit:themedVerticalScrollerValues];;
     
     return scroller;
 }
@@ -1318,7 +1399,7 @@ var
             [@"knob-color", nil, CPThemeStateDisabled]
         ];
     
-    SetHUDThemeValues(scroller, themedHorizontalScrollerValues, overrides);
+    [self registerThemeValues:[self defaultThemeOverridesAddedTo:overrides] forView:scroller inherit:themedHorizontalScrollerValues];;
 
     return scroller;
 }
@@ -1327,7 +1408,7 @@ var
 {
     var slider = [AristoThemeDescriptor makeHorizontalSlider];
     
-    SetHUDThemeValues(slider, themedHorizontalSliderValues);
+    [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:slider inherit:themedHorizontalSliderValues];;
     
     return slider;
 }
@@ -1336,7 +1417,7 @@ var
 {
     var slider = [AristoThemeDescriptor makeVerticalSlider];
     
-    SetHUDThemeValues(slider, themedVerticalSliderValues);
+    [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:slider inherit:themedVerticalSliderValues];;
     
     return slider;
 }
@@ -1345,7 +1426,7 @@ var
 {
     var slider = [AristoThemeDescriptor makeCircularSlider];
     
-    SetHUDThemeValues(slider, themedCircularSliderValues);
+    [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:slider inherit:themedCircularSliderValues];;
     
     return slider;
 }
diff --git a/AppKit/Themes/BlendKit/BKThemeDescriptor.j b/AppKit/Themes/BlendKit/BKThemeDescriptor.j
index b32680053..6d0f49cb3 100644
--- a/AppKit/Themes/BlendKit/BKThemeDescriptor.j
+++ b/AppKit/Themes/BlendKit/BKThemeDescriptor.j
@@ -176,6 +176,94 @@ var ItemSizes               = { },
     return [[self themeName] compare:[aThemeDescriptor themeName]];
 }
 
++ (void)registerThemeValues:(CPArray)themeValues forView:(CPView)aView
+{    
+    for (var i = 0; i < themeValues.length; ++i)
+    {
+        var attributeValueState = themeValues[i],
+            attribute = attributeValueState[0],
+            value = attributeValueState[1],
+            state = attributeValueState[2];
+            
+        if (state)
+            [aView setValue:value forThemeAttribute:attribute inState:state];
+        else
+            [aView setValue:value forThemeAttribute:attribute];
+    }
+}
+
++ (void)registerThemeValues:(CPArray)themeValues forView:aView inherit:(CPArray)inheritedValues
+{
+    // Register inherited values first, then override those with the subtheme values.
+    if (inheritedValues)
+    {
+        // Check the class name to see if it is a subtheme of another theme. If so,
+        // use the subtheme name as a relative path to image patterns.
+        var themeName = [self themeName],
+            index = themeName.indexOf("-");
+
+        if (index < 0)
+        {
+            // This theme is a subtheme, register the inherited values directly
+            [self registerThemeValues:inheritedValues forView:aView];
+        }
+        else
+        {
+            var themePath = themeName.substr(index + 1) + "/";
+
+            for (var i = 0; i < inheritedValues.length; ++i)
+            {
+                var attributeValueState = inheritedValues[i],
+                    attribute = attributeValueState[0],
+                    value = attributeValueState[1],
+                    state = attributeValueState[2],
+                    pattern = nil;
+            
+                if (typeof(value) === "object" && 
+                    value.hasOwnProperty("isa") && 
+                    [value isKindOfClass:CPColor] &&
+                    (pattern = [value patternImage]))
+                {
+                    if ([pattern isThreePartImage] || [pattern isNinePartImage])
+                    {
+                        var slices = [pattern imageSlices],
+                            newSlices = [];
+                
+                        for (var sliceIndex = 0; sliceIndex < slices.length; ++sliceIndex)
+                        {
+                            var slice = slices[sliceIndex],
+                                filename = themePath + [[slice filename] lastPathComponent],
+                                size = [slice size];
+                    
+                            newSlices.push([filename, size.width, size.height]);
+                        }
+                
+                        if ([pattern isThreePartImage])
+                            value = PatternColor(newSlices, [pattern isVertical]);
+                        else
+                            value = PatternColor(newSlices);
+                    }
+                    else
+                    {
+                        var filename = themePath + [[pattern filename] lastPathComponent],
+                            size = [pattern size];
+                
+                        value = PatternColor(filename, size.width, size.height);
+                    }
+                }
+        
+                if (state)
+                    [aView setValue:value forThemeAttribute:attribute inState:state];
+                else
+                    [aView setValue:value forThemeAttribute:attribute];
+            }
+        }
+    }
+    
+    if (themeValues)
+        [self registerThemeValues:themeValues forView:aView];
+}
+
 @end
 
 function BKLabelFromIdentifier(anIdentifier)
@@ -267,84 +355,3 @@ function PatternColor()
         return nil;
     }
 }
-
-function SetThemeValues(object, values)
-{
-    for (var i = 0; i < values.length; ++i)
-    {
-        var attributeValueState = values[i],
-            attribute = attributeValueState[0],
-            value = attributeValueState[1],
-            state = attributeValueState[2];
-            
-        if (state)
-            [object setValue:value forThemeAttribute:attribute inState:state];
-        else
-            [object setValue:value forThemeAttribute:attribute];
-    }
-}
-
-function SetHUDThemeValues(object, values, overrides)
-{
-    for (var i = 0; i < values.length; ++i)
-    {
-        var attributeValueState = values[i],
-            attribute = attributeValueState[0],
-            value = attributeValueState[1],
-            state = attributeValueState[2];
-            
-        if (attribute == "text-color" || attribute == "text-shadow-color")
-        {
-            var whiteValue = attribute == "text-color" ? 1.0 : 0.0,
-                alpha = (state && (state & CPThemeStateDisabled)) ? 0.6 : 1.0;
-            
-            value = [CPColor colorWithCalibratedWhite:whiteValue alpha:alpha];
-        }
-        else if (typeof(value) === "object" && value.hasOwnProperty("isa") && [value isKindOfClass:CPColor])
-        {
-            var pattern = [value patternImage];
-            
-            if (pattern)
-            {
-                if ([pattern isThreePartImage] || [pattern isNinePartImage])
-                {
-                    var slices = [pattern imageSlices],
-                        newSlices = [];
-                    
-                    for (var sliceIndex = 0; sliceIndex < slices.length; ++sliceIndex)
-                    {
-                        var slice = slices[sliceIndex],
-                            filename = "HUD/" + [[slice filename] lastPathComponent],
-                            size = [slice size];
-                        
-                        newSlices.push([filename, size.width, size.height]);
-                    }
-                    
-                    if ([pattern isThreePartImage])
-                        value = PatternColor(newSlices, [pattern isVertical]);
-                    else
-                        value = PatternColor(newSlices);
-                }
-                else
-                {
-                    var filename = "HUD/" + [[pattern filename] lastPathComponent],
-                        size = [pattern size];
-                    
-                    value = PatternColor(filename, size.width, size.height);
-                }
-            }
-        }
-        else if (attribute == "text-shadow-offset")
-        {
-            value = CGSizeMake(-1.0, -1.0);
-        }
-        
-        if (state)
-            [object setValue:value forThemeAttribute:attribute inState:state];
-        else
-            [object setValue:value forThemeAttribute:attribute];
-    }
-    
-    if (overrides)
-        SetThemeValues(object, overrides);
-}

From 98049aeb788740120bf9b34db4874a1dd5fba625 Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Wed, 18 Aug 2010 17:02:22 -0400
Subject: [PATCH 32/41] Whitespace cleanup.

---
 AppKit/Themes/Aristo/ThemeDescriptors.j    | 416 ++++++++++-----------
 AppKit/Themes/BlendKit/BKThemeDescriptor.j |  42 +--
 2 files changed, 229 insertions(+), 229 deletions(-)

diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 98b7af5ad..388d59ff5 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -12,54 +12,54 @@
 
 /*
     HOW TO ADD OR MODIFY THEMED ELEMENTS
-    
+
     This file serves both as a means of defining default theme values
     and of defining an interface for the automatically generated theme showcase,
     so you have to keep both in mind.
-    
+
     Let's say you define a new view class and you want to theme it.
     Here's how to do it with minimum work.
-    
+
     1. Define +themeAttributes in your class if you define custom attributes.
-    
+
     2. If you want a custom name to appear in the theme showcase, define +themeClass
        and return a string with the name all in lowercase and words separated by
        dashes. If you don't provide +themeClass, Cappuccino will separate the themed
        class name into words at each uppercased letter followed by lowercase letters.
-       
+
     3. Use the following template for defining your themed view (using a calendar view as an example).
        Note that we make a separate method for creating and configuring the view.
        This is to more clearly separate the two functions of ThemeDescriptors.j (defining
        themes and defining the showcase interface), and also to allow us to easily reuse
        the creation/configuration code if we make a HUD version of our themed view.
-    
+
     // Create a private variable to hold the theme values, we can share this with the HUD theme
     var themedCalendarViewValues = nil;
-    
+
     + (CPCalendarView)makeCalendarView
     {
-        // Define the size of the sample that will appear in the theme showcase. 
+        // Define the size of the sample that will appear in the theme showcase.
         // The maximum width/height is around 180 pixels.
-        
+
         var calendar = [[CPCalendarView alloc] initWithFrame:CGRectMake(0.0, 0.0, 150.0, 100.0)];
-        
+
         // Do any other initialization of the calendar you want to do here. In this case
         // we want the calendar to show our birthdate instead of the current date.
         [calendar setDate:new Date(1961, 2, 30)];
-        
+
         return calendar;
     }
-    
+
     + (CPCalendarView)themedCalendarView
     {
         var calendar = [self makeCalendarView],
-        
+
             // Now define some pattern colors. We want to define the bezel for the calendar
             // using a nine part image, which consists of nine slices in the order top/left,
             // top, top/right, left, center, right, bottom/left, bottom, bottom/right.
             // We can do this declaritively using the PatternColor function, which takes an array
             // of slice declarations, with each declaration being an array of [filename, width, height].
-            
+
             bezelColor = PatternColor(
                 [
                     [@"calendar-bezel-0.png", 10.0, 10.0],
@@ -72,9 +72,9 @@
                     [@"calendar-bezel-7.png", 1.0,  10.0],
                     [@"calendar-bezel-8.png", 10.0, 10.0]
                 ]),
-                
+
             // Define an alternate bezel for when the calendar is disabled.
-            
+
             disabledBezelColor = PatternColor(
                 [
                     [@"calendar-disabled-bezel-0.png", 10.0, 10.0],
@@ -87,40 +87,40 @@
                     [@"calendar-disabled-bezel-7.png", 1.0,  10.0],
                     [@"calendar-disabled-bezel-8.png", 10.0, 10.0]
                 ]),
-                
+
             // We would like the font to be dark blue and lighter blue when disabled
-            
+
             textColor = [CPColor colorWithHexString:@"001B48"],
             disabledTextColor = [textColor colorWithAlphaComponent:0.6];
-                
+
         // Now we will define our theme values. These are done declaratively in an array,
         // where each element is an array of 2 or 3 values: attribute name, value, and optional state.
-        
+
         themedCalendarViewValues =
         [
             [@"bezel-color",    bezelColor],
             [@"bezel-color",    disabledBezelColor,     CPThemeStateDisabled],
-            
+
             [@"text-color",     textColor],
             [@"text-color",     disabledTextColor,      CPThemeStateDisabled],
-            
+
             // We will also define a minimum size
             [@"min-size",       CGSizeMake(100.0, 100.0)]
         ];
-        
+
         // Now we just register our values
-        
+
         [self registerThemeValues:themedCalendarViewValues forView:calendar];
     }
-    
+
     That's all there is to it. Note that PatternColor can also be used to create a simple
     patterned color:
-    
+
     color = PatternColor(filename, width, height);
-    
+
     It can also be used to create a three part image by specifying three images slices
     with [filename, width, height] and an orientation:
-    
+
     trackColor = PatternColor(
     [
         ["horizontal-track-left.png",   4.0, 5.0],
@@ -128,7 +128,7 @@
         ["horizontal-track-right.png",  4.0, 5.0]
     ],
     PatternIsHorizontal);
-    
+
     trackColor = PatternColor(
     [
         ["vertical-track-top.png",    5.0, 6.0],
@@ -137,44 +137,44 @@
     ],
     PatternIsVertical);
 
-    
+
     SUBTHEMES
-    
+
     If you want to create a theme that inherits from another theme, for example the way
     the Aristo-HUD theme inherits from Aristo, you can do this easily by following
     these steps:
-    
+
     1. Your subtheme should be named "<inherited>-<identifier>", where <inherited> is the name
        of the theme from which you are inheriting, and <identifier> is the subtheme identifier.
        For example, "Aristo-HUD" inherits from "Aristo".
-       
+
     2. Decide which elements in the subtheme will be changed and which will be inherited.
        For example, in a HUD theme you may want to use a dark or black background
        and white text.
-       
+
     3. If your subtheme will replace pattern colors in the inherited theme, use the same filename as
        in the inherited theme and put the pattern images in a subdirectory of the inherited
        directory. The subdirectory's name should be the same as the subtheme identifier.
        For example, Aristo-HUD's pattern images are in a "HUD" subdirectory of the "Aristo" directory.
-       
+
     4. In the subtheme class (such as AristoHUDThemeDescriptor), add a method with this template:
-    
+
         + (CPCalendarView)themedCalendarView
         {
             var calendar = [AristoThemeDescriptor makeCalendarView],
                 subthemeValues = nil;  // This may change according to your needs, see below
-        
+
             [self registerThemeValues:subthemeValues forView:calendar inherit:themedCalendarViewValues];
-        
+
             return calendar;
         }
-    
+
        NOTE: If you pass nil or an empty array for the subthemeValues, ALL pattern images
        will be automatically inherited and MUST be present in the subtheme directory.
-       
+
        Depending on your subtheme, you will change subthemeValues to indicate which values you
        wish to override or remove from the inherited theme.
-        
+
        For example, let's say in your subtheme you want to use white text instead of dark blue,
        and slightly gray text when it is disabled. In addition, you decide not to inherit the
        disabled bezel color pattern. Here is how your updated theme method would look:
@@ -182,10 +182,10 @@
         + (CPCalendarView)themedCalendarView
         {
             var calendar = [AristoThemeDescriptor makeCalendarView],
-            
+
                 textColor = [CPColor whiteColor],
                 disabledTextColor = [textColor colorWithAlphaComponent:0.6],
-                subthemeValues = 
+                subthemeValues =
                 [
                     [@"bezel-color",    nil,                CPThemeStateDisabled],
                     [@"text-color",     textColor],
@@ -196,15 +196,15 @@
 
             return calendar;
         }
-        
+
        If your subtheme consistently applies the same overrides to all themed views, you may
        want to create a separate method that supplies those overrides. For example, Aristo-HUD
        uses the following method:
-       
+
         + (CPArray)defaultThemeOverridesAddedTo:(CPArray)themeValues
-       
+
        For the example we used above, we could define such a method as follows:
-       
+
         + (CPArray)defaultThemeOverridesAddedTo:(CPArray)themeValues
         {
             var textColor = [CPColor whiteColor],
@@ -220,23 +220,23 @@
 
             return overrides;
         }
-        
+
        Note that the values in the themeValues parameter override the defaults provided
        by the method.
-       
+
        Our themed view method becomes:
 
         + (CPCalendarView)themedCalendarView
         {
             var calendar = [AristoThemeDescriptor makeCalendarView];
 
-            [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] 
-                              forView:calendar 
+            [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil]
+                              forView:calendar
                               inherit:themedCalendarViewValues];
 
             return calendar;
         }
-        
+
        As a last example, let's assume another type of themed view in your subtheme wants
        to add some new theme values to the default overrides. The theme method might look like this:
 
@@ -250,32 +250,32 @@
                         ["calendar-header-right.png",  5.0, 23.0]
                     ],
                     PatternIsHorizontal),
-                subthemeValues = 
+                subthemeValues =
                 [
                     [@"background-color", headerColor]
                 ];
 
-            [self registerThemeValues:[self defaultThemeOverridesAddedTo:subthemeValues] 
-                              forView:calendar 
+            [self registerThemeValues:[self defaultThemeOverridesAddedTo:subthemeValues]
+                              forView:calendar
                               inherit:themedCalendarHeaderViewValues];;
 
             return calendar;
         }
 
-       
+
     ADDING ARISTO-HUD CONTROLS
-    
+
     If you want to add a new themed control to Aristo-HUD, you should use the
     +defaultThemeOverridesAddedTo: method to ensure visual consistency with the rest
     of Aristo-HUD. The overrides returned by this method do the following:
-    
+
     - Sets the "text-color" attribute to white in the normal state and
       [CPColor colorWithCalibratedWhite:1.0 alpha:0.6] in the disabled state.
-      
+
     - Set "text-shadow-color" to black.
-    
+
     - Sets "text-shadow-offset" to (-1.0, -1.0).
-    
+
     These are the standards used by Aristo-HUD. If you want to override these defaults,
     simply add those overrides to the values you pass to +defaultThemeOverridesAddedTo:.
 */
@@ -339,7 +339,7 @@ var themedButtonValues = nil;
                 ["default-button-bezel-disabled-right.png", 4.0, 24.0]
             ],
             PatternIsHorizontal),
-        
+
         disabledBezelColor = PatternColor(
             [
                 ["button-bezel-disabled-left.png", 4.0, 24.0],
@@ -347,11 +347,11 @@ var themedButtonValues = nil;
                 ["button-bezel-disabled-right.png", 4.0, 24.0]
             ],
             PatternIsHorizontal),
-            
+
         defaultTextColor = [CPColor colorWithCalibratedRed:13.0/255.0 green:51.0/255.0 blue:70.0/255.0 alpha:1.0],
         defaultDisabledTextColor = [CPColor colorWithCalibratedRed:13.0/255.0 green:51.0/255.0 blue:70.0/255.0 alpha:0.6];
-        
-    themedButtonValues = 
+
+    themedButtonValues =
         [
             [@"font",               [CPFont boldSystemFontOfSize:12.0], CPThemeStateBordered],
             [@"text-color",         [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0]],
@@ -360,25 +360,25 @@ var themedButtonValues = nil;
             [@"text-shadow-offset", CGSizeMake(0.0, 1.0), CPThemeStateBordered],
             [@"line-break-mode",    CPLineBreakByTruncatingTail],
             [@"content-inset",      CGInsetMake(0.0, 5.0, 0.0, 5.0), CPThemeStateBordered],
-            
+
             [@"bezel-color",        bezelColor,             CPThemeStateBordered],
             [@"bezel-color",        highlightedBezelColor,  CPThemeStateBordered | CPThemeStateHighlighted],
-            
+
             [@"text-color",         [CPColor colorWithCalibratedWhite:0.6 alpha:1.0],   CPThemeStateDisabled],
             [@"bezel-color",        disabledBezelColor,                                 CPThemeStateBordered | CPThemeStateDisabled],
             [@"bezel-color",        defaultDisabledBezelColor,                          CPThemeStateBordered | CPThemeStateDefault | CPThemeStateDisabled],
-            
+
             [@"text-color",         defaultTextColor,               CPThemeStateDefault],
             [@"text-color",         defaultDisabledTextColor,       CPThemeStateDefault | CPThemeStateDisabled],
             [@"bezel-color",        defaultBezelColor,              CPThemeStateBordered | CPThemeStateDefault],
             [@"bezel-color",        defaultHighlightedBezelColor,   CPThemeStateBordered | CPThemeStateHighlighted | CPThemeStateDefault],
-            
+
             [@"min-size",           CGSizeMake(0.0, 24.0)],
             [@"max-size",           CGSizeMake(-1.0, 24.0)]
         ];
-    
+
     [self registerThemeValues:themedButtonValues forView:button];
-    
+
     return button;
 }
 
@@ -419,12 +419,12 @@ var themedButtonValues = nil;
                 ["popup-bezel-disabled-right.png", 27.0, 24.0]
             ],
             PatternIsHorizontal),
-            
-        themeValues = 
+
+        themeValues =
         [
             [@"bezel-color",        color,          CPThemeStateBordered],
             [@"bezel-color",        disabledColor,  CPThemeStateBordered | CPThemeStateDisabled],
-                                    
+
             [@"content-inset",      CGInsetMake(0, 27.0 + 5.0, 0, 5.0), CPThemeStateBordered],
             [@"font",               [CPFont boldSystemFontOfSize:12.0]],
             [@"text-color",         [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0]],
@@ -432,16 +432,16 @@ var themedButtonValues = nil;
 
             [@"text-color",         [CPColor colorWithCalibratedWhite:0.6 alpha:1.0],           CPThemeStateBordered | CPThemeStateDisabled],
             [@"text-shadow-color",  [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:0.6], CPThemeStateBordered | CPThemeStateDisabled],
-            
+
             [@"min-size",           CGSizeMake(32.0, 24.0)],
             [@"max-size",           CGSizeMake(-1.0, 24.0)]
         ];
-            
+
     [self registerThemeValues:themeValues forView:button];
-    
+
     [button setTitle:@"Pop Up"];
     [button addItemWithTitle:@"item"];
-    
+
     return button;
 }
 
@@ -463,12 +463,12 @@ var themedButtonValues = nil;
                 ["popup-bezel-disabled-right-pullsdown.png", 27.0, 24.0]
             ],
             PatternIsHorizontal),
-            
-        themeValues = 
+
+        themeValues =
         [
             [@"bezel-color",        color,          CPPopUpButtonStatePullsDown | CPThemeStateBordered],
             [@"bezel-color",        disabledColor,  CPPopUpButtonStatePullsDown | CPThemeStateBordered | CPThemeStateDisabled],
-                                
+
             [@"content-inset",      CGInsetMake(0, 27.0 + 5.0, 0, 5.0), CPThemeStateBordered],
             [@"font",               [CPFont boldSystemFontOfSize:12.0]],
             [@"text-color",         [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0]],
@@ -476,13 +476,13 @@ var themedButtonValues = nil;
 
             [@"text-color",         [CPColor colorWithCalibratedWhite:0.6 alpha:1.0],           CPThemeStateBordered | CPThemeStateDisabled],
             [@"text-shadow-color",  [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:0.6], CPThemeStateBordered | CPThemeStateDisabled],
-        
+
             [@"min-size",           CGSizeMake(32.0, 24.0)],
             [@"max-size",           CGSizeMake(-1.0, 24.0)]
         ];
 
     [self registerThemeValues:themeValues forView:button];
-    
+
     [button setTitle:@"Pull Down"];
     [button addItemWithTitle:@"item"];
 
@@ -494,10 +494,10 @@ var themedVerticalScrollerValues = nil;
 + (CPScroller)makeVerticalScroller
 {
     var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 15.0, 170.0)];
-    
+
     [scroller setFloatValue:0.1];
     [scroller setKnobProportion:0.5];
-    
+
     return scroller;
 }
 
@@ -506,15 +506,15 @@ var themedVerticalScrollerValues = nil;
     var scroller = [self makeVerticalScroller],
         trackColor = PatternColor("scroller-vertical-track.png", 15.0, 1.0),
         disabledTrackColor = PatternColor("scroller-vertical-track-disabled.png", 15.0, 1.0),
-        
+
         upArrowColor = PatternColor("scroller-up-arrow.png", 15.0, 24.0),
         highlightedUpArrowColor = PatternColor("scroller-up-arrow-highlighted.png", 15.0, 24.0),
         disabledUpArrowColor = PatternColor("scroller-up-arrow-disabled.png", 15.0, 24.0),
-        
+
         downArrowColor = PatternColor("scroller-down-arrow.png", 15.0, 24.0),
         highlightedDownArrowColor = PatternColor("scroller-down-arrow-highlighted.png", 15.0, 24.0),
         disabledDownArrowColor = PatternColor("scroller-down-arrow-disabled.png", 15.0, 24.0),
-        
+
         knobColor = PatternColor(
             [
                 ["scroller-vertical-knob-top.png", 15.0, 10.0],
@@ -522,7 +522,7 @@ var themedVerticalScrollerValues = nil;
                 ["scroller-vertical-knob-bottom.png", 15.0, 10.0]
             ],
             PatternIsVertical),
-            
+
         disabledKnobColor = PatternColor(
             [
                 ["scroller-vertical-knob-disabled-top.png", 15.0, 10.0],
@@ -530,32 +530,32 @@ var themedVerticalScrollerValues = nil;
                 ["scroller-vertical-knob-disabled-bottom.png", 15.0, 10.0]
             ],
             PatternIsVertical);
-            
+
     themedVerticalScrollerValues =
         [
             [@"minimum-knob-length",    21.0,                                   CPThemeStateVertical],
             [@"knob-inset",             CGInsetMake(0.0, 0.0, 0.0, 0.0),        CPThemeStateVertical],
             [@"track-inset",            CGInsetMake(-10.0, 0.0, -10.0, 0.0),    CPThemeStateVertical],
-            
+
             [@"knob-color",             knobColor,                  CPThemeStateVertical],
             [@"knob-color",             disabledKnobColor,          CPThemeStateVertical | CPThemeStateDisabled],
-            
+
             [@"knob-slot-color",        trackColor,                 CPThemeStateVertical],
             [@"knob-slot-color",        disabledTrackColor,         CPThemeStateVertical | CPThemeStateDisabled],
-            
+
             [@"decrement-line-size",    CGSizeMake(15.0, 24.0),     CPThemeStateVertical],
             [@"decrement-line-color",   upArrowColor,               CPThemeStateVertical],
             [@"decrement-line-color",   highlightedUpArrowColor,    CPThemeStateVertical | CPThemeStateHighlighted],
             [@"decrement-line-color",   disabledUpArrowColor,       CPThemeStateVertical | CPThemeStateDisabled],
-            
+
             [@"increment-line-size",    CGSizeMake(15.0, 24.0),     CPThemeStateVertical],
             [@"increment-line-color",   downArrowColor,             CPThemeStateVertical],
             [@"increment-line-color",   highlightedDownArrowColor,  CPThemeStateVertical | CPThemeStateHighlighted],
             [@"increment-line-color",   disabledDownArrowColor,     CPThemeStateVertical | CPThemeStateDisabled]
         ];
-                
+
     [self registerThemeValues:themedVerticalScrollerValues forView:scroller];
-    
+
     return scroller;
 }
 
@@ -564,10 +564,10 @@ var themedHorizontalScrollerValues = nil;
 + (CPScroller)makeHorizontalScroller
 {
     var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 170.0, 15.0)];
-    
+
     [scroller setFloatValue:0.1];
     [scroller setKnobProportion:0.5];
-    
+
     return scroller;
 }
 
@@ -576,15 +576,15 @@ var themedHorizontalScrollerValues = nil;
     var scroller = [self makeHorizontalScroller],
         trackColor = PatternColor("scroller-horizontal-track.png", 1.0, 15.0),
         disabledTrackColor = PatternColor("scroller-horizontal-track-disabled.png", 1.0, 15.0),
-        
+
         leftArrowColor = PatternColor("scroller-left-arrow.png", 24.0, 15.0),
         highlightedLeftArrowColor = PatternColor("scroller-left-arrow-highlighted.png", 24.0, 15.0),
         disabledLeftArrowColor = PatternColor("scroller-left-arrow-disabled.png", 24.0, 15.0),
-        
+
         rightArrowColor = PatternColor("scroller-right-arrow.png", 24.0, 15.0),
         highlightedRightArrowColor = PatternColor("scroller-right-arrow-highlighted.png", 24.0, 15.0),
         disabledRightArrowColor = PatternColor("scroller-right-arrow-disabled.png", 24.0, 15.0),
-        
+
         knobColor = PatternColor(
             [
                 ["scroller-horizontal-knob-left.png", 10.0, 15.0],
@@ -592,7 +592,7 @@ var themedHorizontalScrollerValues = nil;
                 ["scroller-horizontal-knob-right.png", 10.0, 15.0]
             ],
             PatternIsHorizontal),
-            
+
         disabledKnobColor = PatternColor(
             [
                 ["scroller-horizontal-knob-disabled-left.png", 10.0, 15.0],
@@ -600,24 +600,24 @@ var themedHorizontalScrollerValues = nil;
                 ["scroller-horizontal-knob-disabled-right.png", 10.0, 15.0]
             ],
             PatternIsHorizontal);
-            
-    themedHorizontalScrollerValues = 
+
+    themedHorizontalScrollerValues =
         [
             [@"minimum-knob-length",    21.0],
             [@"knob-inset",             CGInsetMake(0.0, 0.0, 0.0, 0.0)],
             [@"track-inset",            CGInsetMake(0.0, -10.0, 0.0, -11.0)],
-        
+
             [@"knob-color",             knobColor],
             [@"knob-color",             disabledKnobColor,          CPThemeStateDisabled],
-        
+
             [@"knob-slot-color",        trackColor],
             [@"knob-slot-color",        disabledTrackColor,         CPThemeStateDisabled],
-        
+
             [@"decrement-line-size",    CGSizeMake(24.0, 15.0)],
             [@"decrement-line-color",   leftArrowColor],
             [@"decrement-line-color",   highlightedLeftArrowColor,  CPThemeStateHighlighted],
             [@"decrement-line-color",   disabledLeftArrowColor,     CPThemeStateDisabled],
-        
+
             [@"increment-line-size",    CGSizeMake(24.0, 15.0)],
             [@"increment-line-color",   rightArrowColor],
             [@"increment-line-color",   highlightedRightArrowColor, CPThemeStateHighlighted],
@@ -625,14 +625,14 @@ var themedHorizontalScrollerValues = nil;
         ];
 
     [self registerThemeValues:themedHorizontalScrollerValues forView:scroller];
-    
+
     return scroller;
 }
 
 + (CPTextField)themedStandardTextField
 {
     var textfield = [[CPTextField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 29.0)],
-    
+
         bezelColor = PatternColor(
             [
                 ["textfield-bezel-square-0.png", 2.0, 3.0],
@@ -658,21 +658,21 @@ var themedHorizontalScrollerValues = nil;
                 ["textfield-bezel-square-focused-7.png", 1.0, 5.0],
                 ["textfield-bezel-square-focused-8.png", 6.0, 5.0]
             ]),
-            
+
         placeholderColor = [CPColor colorWithCalibratedRed:189.0 / 255.0 green:199.0 / 255.0 blue:211.0 / 255.0 alpha:1.0],
-            
+
         themeValues =
         [
             [@"bezel-color",        bezelColor,                         CPThemeStateBezeled],
             [@"bezel-color",        bezelFocusedColor,                  CPThemeStateBezeled | CPThemeStateEditing],
             [@"font",               [CPFont systemFontOfSize:12.0],     CPThemeStateBezeled],
-                                    
+
             [@"content-inset",      CGInsetMake(9.0, 7.0, 5.0, 8.0),    CPThemeStateBezeled],
             [@"bezel-inset",        CGInsetMake(4.0, 4.0, 3.0, 4.0),    CPThemeStateBezeled],
             [@"bezel-inset",        CGInsetMake(0.0, 0.0, 0.0, 0.0),    CPThemeStateBezeled | CPThemeStateEditing],
-                                    
+
             [@"text-color",         placeholderColor,                   CPTextFieldStatePlaceholder],
-            
+
             [@"line-break-mode",    CPLineBreakByTruncatingTail,        CPThemeStateTableDataView],
             [@"vertical-alignment", CPCenterVerticalTextAlignment,      CPThemeStateTableDataView],
             [@"content-inset",      CGInsetMake(0.0, 0.0, 0.0, 5.0),    CPThemeStateTableDataView],
@@ -683,18 +683,18 @@ var themedHorizontalScrollerValues = nil;
         ];
 
     [self registerThemeValues:themeValues forView:textfield];
-    
+
     [textfield setBezeled:YES];
 
     [textfield setPlaceholderString:"placeholder"];
     [textfield setStringValue:""];
     [textfield setEditable:YES];
-    
+
     return textfield;
 }
 
 + (CPTextField)themedRoundedTextField
-{   
+{
     var textfield = [[CPTextField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 30.0)],
         bezelColor = PatternColor(
             [
@@ -711,7 +711,7 @@ var themedHorizontalScrollerValues = nil;
                 ["textfield-bezel-rounded-focused-right.png", 17.0, 30.0]
             ],
             PatternIsHorizontal),
-            
+
         placeholderColor = [CPColor colorWithCalibratedRed:189.0 / 255.0 green:199.0 / 255.0 blue:211.0 / 255.0 alpha:1.0],
 
         themeValues =
@@ -725,13 +725,13 @@ var themedHorizontalScrollerValues = nil;
             [@"bezel-inset",    CGInsetMake(0.0, 0.0, 0.0, 0.0),    CPTextFieldStateRounded | CPThemeStateBezeled | CPThemeStateEditing],
 
             [@"text-color",     placeholderColor,       CPTextFieldStateRounded | CPTextFieldStatePlaceholder],
-    
+
             [@"min-size",       CGSizeMake(0.0, 30.0),  CPTextFieldStateRounded | CPThemeStateBezeled],
             [@"max-size",       CGSizeMake(-1.0, 30.0), CPTextFieldStateRounded | CPThemeStateBezeled]
         ];
 
     [self registerThemeValues:themeValues forView:textfield];
-    
+
     [textfield setBezeled:YES];
     [textfield setBezelStyle:CPTextFieldRoundedBezel];
 
@@ -751,37 +751,37 @@ var themedHorizontalScrollerValues = nil;
                 ["radio-bezel.png", 17.0, 17.0], nil, nil
             ],
             PatternIsHorizontal),
-            
+
         bezelColorSelected = PatternColor(
             [
                 ["radio-bezel-selected.png", 17.0, 17.0], nil, nil
             ],
             PatternIsHorizontal),
-            
+
         bezelColorSelectedHighlighted = PatternColor(
             [
                 ["radio-bezel-selected-highlighted.png", 17.0, 17.0], nil, nil
             ],
             PatternIsHorizontal),
-            
+
         bezelColorSelectedDisabled = PatternColor(
             [
                 ["radio-bezel-selected-disabled.png", 17.0, 17.0], nil, nil
             ],
             PatternIsHorizontal),
-            
+
         bezelColorDisabled = PatternColor(
             [
                 ["radio-bezel-disabled.png", 17.0, 17.0], nil, nil
             ],
             PatternIsHorizontal),
-            
+
         bezelColorHighlighted = PatternColor(
             [
                 ["radio-bezel-highlighted.png", 17.0, 17.0], nil, nil
             ],
             PatternIsHorizontal),
-            
+
         themeValues =
         [
             [@"alignment",      CPLeftTextAlignment,                CPThemeStateBordered],
@@ -793,12 +793,12 @@ var themedHorizontalScrollerValues = nil;
             [@"bezel-color",    bezelColorHighlighted,              CPThemeStateBordered | CPThemeStateHighlighted],
             [@"bezel-color",    bezelColorDisabled,                 CPThemeStateBordered | CPThemeStateDisabled],
             [@"bezel-color",    bezelColorSelectedDisabled,         CPThemeStateBordered | CPThemeStateSelected | CPThemeStateDisabled],
-                                
+
             [@"text-color",     [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0],  CPThemeStateDisabled],
-                                
+
             [@"min-size",       CGSizeMake(0.0, 17.0)]
         ];
-        
+
     [self registerThemeValues:themeValues forView:button];
 
     [button setTitle:@"Hello Friend!"];
@@ -809,43 +809,43 @@ var themedHorizontalScrollerValues = nil;
 + (CPRadioButton)themedCheckBoxButton
 {
     var button = [[CPCheckBox alloc] initWithFrame:CGRectMake(0.0, 0.0, 120.0, 17.0)],
-    
+
         bezelColor = PatternColor(
             [
                 ["check-box-bezel.png", 15.0, 16.0], nil, nil
             ],
             PatternIsHorizontal),
-            
+
         bezelColorSelected = PatternColor(
             [
                 ["check-box-bezel-selected.png", 15.0, 16.0], nil, nil
             ],
             PatternIsHorizontal),
-            
+
         bezelColorSelectedHighlighted = PatternColor(
             [
                 ["check-box-bezel-selected-highlighted.png", 15.0, 16.0], nil, nil
             ],
             PatternIsHorizontal),
-            
+
         bezelColorSelectedDisabled = PatternColor(
             [
                 ["check-box-bezel-selected-disabled.png", 15.0, 16.0], nil, nil
             ],
             PatternIsHorizontal),
-            
+
         bezelColorDisabled = PatternColor(
             [
                 ["check-box-bezel-disabled.png", 15.0, 16.0], nil, nil
             ],
             PatternIsHorizontal),
-            
+
         bezelColorHighlighted = PatternColor(
             [
                 ["check-box-bezel-highlighted.png", 15.0, 16.0], nil, nil
             ],
             PatternIsHorizontal),
-            
+
         themeValues =
         [
             [@"alignment",      CPLeftTextAlignment,                CPThemeStateBordered],
@@ -857,14 +857,14 @@ var themedHorizontalScrollerValues = nil;
             [@"bezel-color",    bezelColorHighlighted,              CPThemeStateBordered | CPThemeStateHighlighted],
             [@"bezel-color",    bezelColorDisabled,                 CPThemeStateBordered | CPThemeStateDisabled],
             [@"bezel-color",    bezelColorSelectedDisabled,         CPThemeStateBordered | CPThemeStateSelected | CPThemeStateDisabled],
-                                
+
             [@"text-color",     [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0],  CPThemeStateDisabled],
-                                
+
             [@"min-size",       CGSizeMake(0.0, 17.0)]
         ];
 
     [self registerThemeValues:themeValues forView:button];
-        
+
     [button setTitle:@"Another option"];
 
     return button;
@@ -882,20 +882,20 @@ var themedHorizontalScrollerValues = nil;
                 ["check-box-bezel-mixed-highlighted.png", 15.0, 16.0], nil, nil
             ],
             PatternIsHorizontal),
-        
+
         mixedDisabledColor = PatternColor(
             [
                 ["check-box-bezel-mixed-disabled.png", 15.0, 16.0], nil, nil
             ],
             PatternIsHorizontal),
-        
+
         mixedColor = PatternColor(
             [
                 ["check-box-bezel-mixed.png", 15.0, 16.0], nil, nil
             ],
             PatternIsHorizontal),
-            
-        themeValues = 
+
+        themeValues =
         [
             [@"bezel-color",    mixedColor,         CPButtonStateMixed | CPThemeStateBordered],
             [@"bezel-color",    mixedSelectedColor, CPButtonStateMixed | CPThemeStateBordered | CPThemeStateSelected],
@@ -903,7 +903,7 @@ var themedHorizontalScrollerValues = nil;
         ];
 
     [self registerThemeValues:themeValues forView:button];
-    
+
     return button;
 }
 
@@ -912,10 +912,10 @@ var themedSegmentedControlValues = nil;
 + (CPSegmentedControl)makeSegmentedControl
 {
     var segmentedControl = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 24.0)];
-    
+
     [segmentedControl setTrackingMode:CPSegmentSwitchTrackingSelectAny];
     [segmentedControl setSegmentCount:3];
-    
+
     [segmentedControl setWidth:40.0 forSegment:0];
     [segmentedControl setLabel:@"foo" forSegment:0];
     [segmentedControl setTag:1 forSegment:0];
@@ -927,14 +927,14 @@ var themedSegmentedControlValues = nil;
     [segmentedControl setWidth:35.0 forSegment:2];
     [segmentedControl setLabel:@"1" forSegment:2];
     [segmentedControl setTag:3 forSegment:2];
-    
+
     return segmentedControl;
 };
 
 + (CPSegmentedControl)themedSegmentedControl
 {
     var segmentedControl = [self makeSegmentedControl],
-    
+
         centerBezelColor = PatternColor("segmented-control-bezel-center.png", 1.0, 24.0),
         dividerBezelColor = PatternColor("segmented-control-bezel-divider.png", 1.0, 24.0),
         centerHighlightedBezelColor = PatternColor("segmented-control-bezel-highlighted-center.png", 1.0, 24.0),
@@ -957,7 +957,7 @@ var themedSegmentedControlValues = nil;
         pushedHighlightedCenterBezelColor = PatternColor("segmented-control-bezel-pushed-highlighted-center.png", 1.0, 24.0),
         pushedHighlightedLeftBezelColor = PatternColor("segmented-control-bezel-pushed-highlighted-left.png", 4.0, 24.0),
         pushedHighlightedRightBezelColor = PatternColor("segmented-control-bezel-pushed-highlighted-right.png", 4.0, 24.0);
-        
+
     themedSegmentedControlValues =
         [
             [@"center-segment-bezel-color",     centerBezelColor,                       CPThemeStateNormal],
@@ -966,29 +966,29 @@ var themedSegmentedControlValues = nil;
             [@"center-segment-bezel-color",     centerHighlightedBezelColor,            CPThemeStateSelected],
             [@"center-segment-bezel-color",     pushedCenterBezelColor,                 CPThemeStateHighlighted],
             [@"center-segment-bezel-color",     pushedHighlightedCenterBezelColor,      CPThemeStateHighlighted | CPThemeStateSelected],
-            
+
             [@"divider-bezel-color",            dividerBezelColor,                      CPThemeStateNormal],
             [@"divider-bezel-color",            inactiveDividerBezelColor,              CPThemeStateDisabled],
             [@"divider-bezel-color",            inactiveHighlightedDividerBezelColor,   CPThemeStateSelected | CPThemeStateDisabled],
             [@"divider-bezel-color",            dividerHighlightedBezelColor,           CPThemeStateSelected],
-            
+
             [@"left-segment-bezel-color",       leftBezelColor,                         CPThemeStateNormal],
             [@"left-segment-bezel-color",       inactiveLeftBezelColor,                 CPThemeStateDisabled],
             [@"left-segment-bezel-color",       inactiveHighlightedLeftBezelColor,      CPThemeStateSelected | CPThemeStateDisabled],
             [@"left-segment-bezel-color",       leftHighlightedBezelColor,              CPThemeStateSelected],
             [@"left-segment-bezel-color",       pushedLeftBezelColor,                   CPThemeStateHighlighted],
             [@"left-segment-bezel-color",       pushedHighlightedLeftBezelColor,        CPThemeStateHighlighted | CPThemeStateSelected],
-            
+
             [@"right-segment-bezel-color",      rightBezelColor,                        CPThemeStateNormal],
             [@"right-segment-bezel-color",      inactiveRightBezelColor,                CPThemeStateDisabled],
             [@"right-segment-bezel-color",      inactiveHighlightedRightBezelColor,     CPThemeStateSelected | CPThemeStateDisabled],
             [@"right-segment-bezel-color",      rightHighlightedBezelColor,             CPThemeStateSelected],
             [@"right-segment-bezel-color",      pushedRightBezelColor,                  CPThemeStateHighlighted],
             [@"right-segment-bezel-color",      pushedHighlightedRightBezelColor,       CPThemeStateHighlighted | CPThemeStateSelected],
-            
+
             [@"content-inset",  CGInsetMake(0.0, 4.0, 0.0, 4.0), CPThemeStateNormal],
             [@"bezel-inset",    CGInsetMake(0.0, 0.0, 0.0, 0.0), CPThemeStateNormal],
-            
+
             [@"font",               [CPFont boldSystemFontOfSize:12.0]],
             [@"text-color",         [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0]],
             [@"text-color",         [CPColor colorWithCalibratedWhite:0.6 alpha:1.0], CPThemeStateDisabled],
@@ -1002,7 +1002,7 @@ var themedSegmentedControlValues = nil;
         ];
 
     [self registerThemeValues:themedSegmentedControlValues forView:segmentedControl];
-    
+
     return segmentedControl;
 }
 
@@ -1016,7 +1016,7 @@ var themedHorizontalSliderValues = nil;
 + (CPSlider)themedHorizontalSlider
 {
     var slider = [self makeHorizontalSlider],
-    
+
         trackColor = PatternColor(
         [
             ["horizontal-track-left.png", 4.0, 5.0],
@@ -1024,7 +1024,7 @@ var themedHorizontalSliderValues = nil;
             ["horizontal-track-right.png", 4.0, 5.0]
         ],
         PatternIsHorizontal),
-        
+
         trackDisabledColor = PatternColor(
         [
             ["horizontal-track-disabled-left.png", 4.0, 5.0],
@@ -1032,25 +1032,25 @@ var themedHorizontalSliderValues = nil;
             ["horizontal-track-disabled-right.png", 4.0, 5.0]
         ],
         PatternIsHorizontal),
-        
+
         knobColor =             PatternColor("knob.png", 23.0, 24.0),
         knobHighlightedColor =  PatternColor("knob-highlighted.png", 23.0, 24.0),
         knobDisabledColor =     PatternColor("knob-disabled.png", 23.0, 24.0);
-        
-    themedHorizontalSliderValues = 
+
+    themedHorizontalSliderValues =
     [
         [@"track-width", 5.0],
         [@"track-color", trackColor],
         [@"track-color", trackDisabledColor, CPThemeStateDisabled],
-        
+
         [@"knob-size",  CGSizeMake(23.0, 24.0)],
         [@"knob-color", knobColor],
         [@"knob-color", knobHighlightedColor,   CPThemeStateHighlighted],
         [@"knob-color", knobDisabledColor,      CPThemeStateDisabled]
     ];
-    
+
     [self registerThemeValues:themedHorizontalSliderValues forView:slider];
-    
+
     return slider;
 }
 
@@ -1064,7 +1064,7 @@ var themedVerticalSliderValues = nil;
 + (CPSlider)themedVerticalSlider
 {
     var slider = [self makeVerticalSlider],
-    
+
         trackColor = PatternColor(
         [
             ["vertical-track-top.png", 5.0, 6.0],
@@ -1072,7 +1072,7 @@ var themedVerticalSliderValues = nil;
             ["vertical-track-bottom.png", 5.0, 4.0]
         ],
         PatternIsVertical),
-        
+
         trackDisabledColor = PatternColor(
         [
             ["vertical-track-disabled-top.png", 5.0, 6.0],
@@ -1080,25 +1080,25 @@ var themedVerticalSliderValues = nil;
             ["vertical-track-disabled-bottom.png", 5.0, 4.0]
         ],
         PatternIsVertical),
-        
+
         knobColor =             PatternColor("knob.png", 23.0, 24.0),
         knobHighlightedColor =  PatternColor("knob-highlighted.png", 23.0, 24.0),
         knobDisabledColor =     PatternColor("knob-disabled.png", 23.0, 24.0);
-        
-    themedVerticalSliderValues = 
+
+    themedVerticalSliderValues =
     [
         [@"track-width", 5.0],
         [@"track-color", trackColor,            CPThemeStateVertical],
         [@"track-color", trackDisabledColor,    CPThemeStateDisabled],
-    
+
         [@"knob-size",  CGSizeMake(23.0, 24.0)],
         [@"knob-color", knobColor],
         [@"knob-color", knobHighlightedColor,   CPThemeStateHighlighted],
         [@"knob-color", knobDisabledColor,      CPThemeStateDisabled]
     ]
-    
+
     [self registerThemeValues:themedVerticalSliderValues forView:slider];
-    
+
     return slider;
 }
 
@@ -1107,22 +1107,22 @@ var themedCircularSliderValues = nil;
 + (CPSlider)makeCircularSlider
 {
     var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 34.0, 34.0)];
-    
+
     [slider setSliderType:CPCircularSlider];
-    
+
     return slider;
 }
 
 + (CPSlider)themedCircularSlider
 {
     var slider = [self makeCircularSlider],
-    
+
         trackColor = PatternColor("slider-circular-bezel.png", 34.0, 34.0),
         trackDisabledColor = PatternColor("slider-circular-disabled-bezel.png", 34.0, 34.0)
         knobColor = PatternColor("slider-circular-knob.png", 5.0, 5.0),
         knobDisabledColor = PatternColor("slider-circular-disabled-knob.png", 5.0, 5.0),
         knobHighlightedColor = knobColor;
-        
+
     themedCircularSliderValues =
     [
         [@"track-color", trackColor,            CPThemeStateCircular],
@@ -1135,7 +1135,7 @@ var themedCircularSliderValues = nil;
     ];
 
     [self registerThemeValues:themedCircularSliderValues forView:slider];
-    
+
     return slider;
 }
 
@@ -1144,22 +1144,22 @@ var themedButtonBarValues = nil;
 + (CPButtonBar)makeButtonBar
 {
     var buttonBar = [[CPButtonBar alloc] initWithFrame:CGRectMake(0.0, 0.0, 147.0, 26.0)];
-    
+
     [buttonBar setHasResizeControl:YES];
-    
+
     var popup = [CPButtonBar actionPopupButton];
     [popup addItemWithTitle:"Item 1"];
     [popup addItemWithTitle:"Item 2"];
 
     [buttonBar setButtons:[[CPButtonBar plusButton], [CPButtonBar minusButton], popup]];
-    
+
     return buttonBar;
 }
 
 + (CPButtonBar)themedButtonBar
 {
     var buttonBar = [self makeButtonBar],
-    
+
         color = PatternColor("buttonbar-bezel.png", 1.0, 26.0),
         resizeColor = PatternColor("buttonbar-resize-control.png", 5.0, 10.0),
         buttonBezelColor = PatternColor(
@@ -1189,28 +1189,28 @@ var themedButtonBarValues = nil;
     themedButtonBarValues =
     [
         [@"bezel-color", color],
-        
+
         [@"resize-control-size",    CGSizeMake(5.0, 10.0)],
         [@"resize-control-inset",   CGInsetMake(9.0, 4.0, 7.0, 4.0)],
         [@"resize-control-color",   resizeColor],
-        
+
         [@"button-bezel-color",     buttonBezelColor],
         [@"button-bezel-color",     buttonBezelHighlightedColor,    CPThemeStateHighlighted],
         [@"button-bezel-color",     buttonBezelDisabledColor,       CPThemeStateDisabled],
         [@"button-text-color",      [CPColor blackColor]]
     ];
-    
+
     [self registerThemeValues:themedButtonBarValues forView:buttonBar];
-    
+
     return buttonBar;
 }
 
 + (_CPTableColumnHeaderView)makeColumnHeader
 {
     var header = [[_CPTableColumnHeaderView alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 24.0)];
-    
+
     [header setStringValue:@"Table Header"];
-    
+
     return header;
 }
 
@@ -1221,25 +1221,25 @@ var themedButtonBarValues = nil;
         highlighted        = PatternColor("tableview-headerview-highlighted.png", 1.0, 23.0),
         pressed            = PatternColor("tableview-headerview-pressed.png", 1.0, 23.0),
         normal             = PatternColor("tableview-headerview.png", 1.0, 23.0),
-        
+
         themedColumnHeaderValues =
         [
             [@"background-color",   normal],
-        
+
             [@"text-inset",         CGInsetMake(0, 5, 0, 5)],
             [@"text-color",         [CPColor colorWithCalibratedWhite:51.0 / 255.0 alpha:1.0]],
             [@"text-font",          [CPFont boldSystemFontOfSize:12.0]],
             [@"text-shadow-color",  [CPColor whiteColor]],
             [@"text-shadow-offset", CGSizeMake(0.0, 1.0)],
             [@"text-alignment",     CPLeftTextAlignment],
-        
+
             [@"background-color",   pressed,            CPThemeStateHighlighted],
             [@"background-color",   highlighted,        CPThemeStateSelected],
             [@"background-color",   highlightedPressed, CPThemeStateHighlighted | CPThemeStateSelected]
         ];
 
     [self registerThemeValues:themedColumnHeaderValues forView:header];
-    
+
     return header;
 }
 
@@ -1269,18 +1269,18 @@ var themedButtonBarValues = nil;
     // This is a bit more complicated than the rest because we actually set theme values for several different (table related) controls in this method
 
     var tableview = [[CPTableView alloc] initWithFrame:CGRectMake(0.0, 0.0, 150.0, 150.0)],
-    
+
         sortImage = PatternColor("tableview-headerview-ascending.png", 9.0, 8.0),
         sortImageReversed = PatternColor("tableview-headerview-descending.png", 9.0, 8.0),
         alternatingRowColors = [[CPColor whiteColor], [CPColor colorWithRed:245.0 / 255.0 green:249.0 / 255.0 blue:252.0 / 255.0 alpha:1.0]],
         gridColor = [CPColor colorWithHexString:@"dce0e2"],
         selectionColor = [CPColor colorWithHexString:@"5f83b9"],
-        sourceListSelectionColor = [CPDictionary dictionaryWithObjects: [CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [89.0/255.0, 153.0/255.0, 209.0/255.0,1.0, 33.0/255.0, 94.0/255.0, 208.0/255.0,1.0], [0,1], 2), 
+        sourceListSelectionColor = [CPDictionary dictionaryWithObjects: [CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [89.0/255.0, 153.0/255.0, 209.0/255.0,1.0, 33.0/255.0, 94.0/255.0, 208.0/255.0,1.0], [0,1], 2),
                                                                           [CPColor colorWithCalibratedRed:(61.0/255.0) green:(123.0/255.0) blue:(218.0/255.0) alpha:1.0],
                                                                           [CPColor colorWithCalibratedRed:(31.0/255.0) green:(92.0/255.0) blue:(207.0/255.0) alpha:1.0]
                                                                         ]
                                                                forKeys: [CPSourceListGradient, CPSourceListTopLineColor, CPSourceListBottomLineColor]],
-                                                               
+
         themedTableViewValues =
         [
             [@"alternating-row-colors",     alternatingRowColors],
@@ -1333,29 +1333,29 @@ var themedButtonBarValues = nil;
             [@"text-shadow-color",  [CPColor blackColor], CPThemeStateDisabled],
             [@"text-shadow-offset", CGSizeMake(-1.0, -1.0)]
         ];
-        
+
     if (themeValues)
         [overrides addObjectsFromArray:themeValues];
-        
+
     return overrides;
 }
 
 + (CPPopUpButton)themedSegmentedControl
 {
     var segmentedControl = [AristoThemeDescriptor makeSegmentedControl];
-    
+
     [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:segmentedControl inherit:themedSegmentedControlValues];
 
     return segmentedControl;
 }
 
-var 
+var
 + (CPButton)button
 {
     var button = [AristoThemeDescriptor makeButton];
 
     [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:button inherit:themedButtonValues];;
-    
+
     return button;
 }
 
@@ -1385,9 +1385,9 @@ var
         [
             [@"knob-color", nil, CPThemeStateVertical | CPThemeStateDisabled]
         ];
-    
+
     [self registerThemeValues:[self defaultThemeOverridesAddedTo:overrides] forView:scroller inherit:themedVerticalScrollerValues];;
-    
+
     return scroller;
 }
 
@@ -1398,7 +1398,7 @@ var
         [
             [@"knob-color", nil, CPThemeStateDisabled]
         ];
-    
+
     [self registerThemeValues:[self defaultThemeOverridesAddedTo:overrides] forView:scroller inherit:themedHorizontalScrollerValues];;
 
     return scroller;
@@ -1407,27 +1407,27 @@ var
 + (CPSlider)themedHorizontalSlider
 {
     var slider = [AristoThemeDescriptor makeHorizontalSlider];
-    
+
     [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:slider inherit:themedHorizontalSliderValues];;
-    
+
     return slider;
 }
 
 + (CPSlider)themedVerticalSlider
 {
     var slider = [AristoThemeDescriptor makeVerticalSlider];
-    
+
     [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:slider inherit:themedVerticalSliderValues];;
-    
+
     return slider;
 }
 
 + (CPSlider)themedCircularSlider
 {
     var slider = [AristoThemeDescriptor makeCircularSlider];
-    
+
     [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:slider inherit:themedCircularSliderValues];;
-    
+
     return slider;
 }
 
diff --git a/AppKit/Themes/BlendKit/BKThemeDescriptor.j b/AppKit/Themes/BlendKit/BKThemeDescriptor.j
index 6d0f49cb3..7f248c8b2 100644
--- a/AppKit/Themes/BlendKit/BKThemeDescriptor.j
+++ b/AppKit/Themes/BlendKit/BKThemeDescriptor.j
@@ -177,14 +177,14 @@ var ItemSizes               = { },
 }
 
 + (void)registerThemeValues:(CPArray)themeValues forView:(CPView)aView
-{    
+{
     for (var i = 0; i < themeValues.length; ++i)
     {
         var attributeValueState = themeValues[i],
             attribute = attributeValueState[0],
             value = attributeValueState[1],
             state = attributeValueState[2];
-            
+
         if (state)
             [aView setValue:value forThemeAttribute:attribute inState:state];
         else
@@ -218,9 +218,9 @@ var ItemSizes               = { },
                     value = attributeValueState[1],
                     state = attributeValueState[2],
                     pattern = nil;
-            
-                if (typeof(value) === "object" && 
-                    value.hasOwnProperty("isa") && 
+
+                if (typeof(value) === "object" &&
+                    value.hasOwnProperty("isa") &&
                     [value isKindOfClass:CPColor] &&
                     (pattern = [value patternImage]))
                 {
@@ -228,16 +228,16 @@ var ItemSizes               = { },
                     {
                         var slices = [pattern imageSlices],
                             newSlices = [];
-                
+
                         for (var sliceIndex = 0; sliceIndex < slices.length; ++sliceIndex)
                         {
                             var slice = slices[sliceIndex],
                                 filename = themePath + [[slice filename] lastPathComponent],
                                 size = [slice size];
-                    
+
                             newSlices.push([filename, size.width, size.height]);
                         }
-                
+
                         if ([pattern isThreePartImage])
                             value = PatternColor(newSlices, [pattern isVertical]);
                         else
@@ -247,11 +247,11 @@ var ItemSizes               = { },
                     {
                         var filename = themePath + [[pattern filename] lastPathComponent],
                             size = [pattern size];
-                
+
                         value = PatternColor(filename, size.width, size.height);
                     }
                 }
-        
+
                 if (state)
                     [aView setValue:value forThemeAttribute:attribute inState:state];
                 else
@@ -259,7 +259,7 @@ var ItemSizes               = { },
             }
         }
     }
-    
+
     if (themeValues)
         [self registerThemeValues:themeValues forView:aView];
 }
@@ -281,7 +281,7 @@ function BKLabelFromIdentifier(anIdentifier)
             isCapital = /^[A-Z]/.test(character);
 
         if (isCapital)
-        {        
+        {
             if (!isLeadingCapital)
             {
                 if (lastCapital === null)
@@ -311,21 +311,21 @@ function BKLabelFromIdentifier(anIdentifier)
 
 PatternIsVertical = YES,
 PatternIsHorizontal = NO;
-    
+
 /*
     To create a simple color with a pattern image:
         PatternColor(name, width, height)
-        
+
     To create a color with a three part pattern image:
         PatternColor(slices, orientation)
-        
+
     where slices is an array of three [name, width, height] arrays,
     and orientation is PatternIsVertical or PatternIsHorizontal.
-    
+
     To create a color with a nine part pattern image:
         PatternColor(slices);
-        
-    where slices is an array of nine [name, width, height] arrays.    
+
+    where slices is an array of nine [name, width, height] arrays.
 */
 function PatternColor()
 {
@@ -333,14 +333,14 @@ function PatternColor()
     {
         var slices = arguments[0],
             imageSlices = [];
-            
+
         for (var i = 0; i < slices.length; ++i)
         {
             var slice = slices[i];
-            
+
             imageSlices.push(slice ? [_CPCibCustomResource imageResourceWithName:slice[0] size:CGSizeMake(slice[1], slice[2])] : nil);
         }
-        
+
         if (arguments.length == 2)
             return [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:imageSlices isVertical:arguments[1]]];
         else

From 8fbd24c86198cc2c7bf6d404428d7fe241fbe1d0 Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Wed, 18 Aug 2010 21:32:51 -0400
Subject: [PATCH 33/41] Moved file globals to the top of the file. Removed a
 misplaced var. Eliminated empty statements.

---
 AppKit/Themes/Aristo/ThemeDescriptors.j | 40 ++++++++++---------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 388d59ff5..34076d58a 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -10,6 +10,15 @@
 @import <AppKit/AppKit.j>
 @import <AppKit/CPTableHeaderView.j>
 
+var themedButtonValues = nil,
+    themedVerticalScrollerValues = nil,
+    themedHorizontalScrollerValues = nil,
+    themedSegmentedControlValues = nil,
+    themedHorizontalSliderValues = nil,
+    themedVerticalSliderValues = nil,
+    themedCircularSliderValues = nil,
+    themedButtonBarValues = nil;
+
 /*
     HOW TO ADD OR MODIFY THEMED ELEMENTS
 
@@ -257,7 +266,7 @@
 
             [self registerThemeValues:[self defaultThemeOverridesAddedTo:subthemeValues]
                               forView:calendar
-                              inherit:themedCalendarHeaderViewValues];;
+                              inherit:themedCalendarHeaderViewValues];
 
             return calendar;
         }
@@ -279,7 +288,6 @@
     These are the standards used by Aristo-HUD. If you want to override these defaults,
     simply add those overrides to the values you pass to +defaultThemeOverridesAddedTo:.
 */
-
 @implementation AristoThemeDescriptor : BKThemeDescriptor
 {
 }
@@ -289,7 +297,6 @@
     return @"Aristo";
 }
 
-var themedButtonValues = nil;
 
 + (CPButton)makeButton
 {
@@ -489,8 +496,6 @@ var themedButtonValues = nil;
     return button;
 }
 
-var themedVerticalScrollerValues = nil;
-
 + (CPScroller)makeVerticalScroller
 {
     var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 15.0, 170.0)];
@@ -559,8 +564,6 @@ var themedVerticalScrollerValues = nil;
     return scroller;
 }
 
-var themedHorizontalScrollerValues = nil;
-
 + (CPScroller)makeHorizontalScroller
 {
     var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 170.0, 15.0)];
@@ -907,8 +910,6 @@ var themedHorizontalScrollerValues = nil;
     return button;
 }
 
-var themedSegmentedControlValues = nil;
-
 + (CPSegmentedControl)makeSegmentedControl
 {
     var segmentedControl = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 24.0)];
@@ -1006,8 +1007,6 @@ var themedSegmentedControlValues = nil;
     return segmentedControl;
 }
 
-var themedHorizontalSliderValues = nil;
-
 + (CPSlider)makeHorizontalSlider
 {
     return [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 50.0, 24.0)];
@@ -1054,8 +1053,6 @@ var themedHorizontalSliderValues = nil;
     return slider;
 }
 
-var themedVerticalSliderValues = nil;
-
 + (CPSlider)makeVerticalSlider
 {
     return [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 24.0, 50.0)];
@@ -1102,8 +1099,6 @@ var themedVerticalSliderValues = nil;
     return slider;
 }
 
-var themedCircularSliderValues = nil;
-
 + (CPSlider)makeCircularSlider
 {
     var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 34.0, 34.0)];
@@ -1139,8 +1134,6 @@ var themedCircularSliderValues = nil;
     return slider;
 }
 
-var themedButtonBarValues = nil;
-
 + (CPButtonBar)makeButtonBar
 {
     var buttonBar = [[CPButtonBar alloc] initWithFrame:CGRectMake(0.0, 0.0, 147.0, 26.0)];
@@ -1349,12 +1342,11 @@ var themedButtonBarValues = nil;
     return segmentedControl;
 }
 
-var
 + (CPButton)button
 {
     var button = [AristoThemeDescriptor makeButton];
 
-    [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:button inherit:themedButtonValues];;
+    [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:button inherit:themedButtonValues];
 
     return button;
 }
@@ -1386,7 +1378,7 @@ var
             [@"knob-color", nil, CPThemeStateVertical | CPThemeStateDisabled]
         ];
 
-    [self registerThemeValues:[self defaultThemeOverridesAddedTo:overrides] forView:scroller inherit:themedVerticalScrollerValues];;
+    [self registerThemeValues:[self defaultThemeOverridesAddedTo:overrides] forView:scroller inherit:themedVerticalScrollerValues];
 
     return scroller;
 }
@@ -1399,7 +1391,7 @@ var
             [@"knob-color", nil, CPThemeStateDisabled]
         ];
 
-    [self registerThemeValues:[self defaultThemeOverridesAddedTo:overrides] forView:scroller inherit:themedHorizontalScrollerValues];;
+    [self registerThemeValues:[self defaultThemeOverridesAddedTo:overrides] forView:scroller inherit:themedHorizontalScrollerValues];
 
     return scroller;
 }
@@ -1408,7 +1400,7 @@ var
 {
     var slider = [AristoThemeDescriptor makeHorizontalSlider];
 
-    [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:slider inherit:themedHorizontalSliderValues];;
+    [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:slider inherit:themedHorizontalSliderValues];
 
     return slider;
 }
@@ -1417,7 +1409,7 @@ var
 {
     var slider = [AristoThemeDescriptor makeVerticalSlider];
 
-    [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:slider inherit:themedVerticalSliderValues];;
+    [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:slider inherit:themedVerticalSliderValues];
 
     return slider;
 }
@@ -1426,7 +1418,7 @@ var
 {
     var slider = [AristoThemeDescriptor makeCircularSlider];
 
-    [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:slider inherit:themedCircularSliderValues];;
+    [self registerThemeValues:[self defaultThemeOverridesAddedTo:nil] forView:slider inherit:themedCircularSliderValues];
 
     return slider;
 }

From d56bc733ad522920ddff1a984e36d333619331d9 Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Wed, 18 Aug 2010 22:01:18 -0400
Subject: [PATCH 34/41] Remove some accidental globals.

---
 AppKit/Themes/BlendKit/BKThemeDescriptor.j | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AppKit/Themes/BlendKit/BKThemeDescriptor.j b/AppKit/Themes/BlendKit/BKThemeDescriptor.j
index 7f248c8b2..535bf22c2 100644
--- a/AppKit/Themes/BlendKit/BKThemeDescriptor.j
+++ b/AppKit/Themes/BlendKit/BKThemeDescriptor.j
@@ -268,7 +268,7 @@ var ItemSizes               = { },
 
 function BKLabelFromIdentifier(anIdentifier)
 {
-    var string = anIdentifier.substr("themed".length);
+    var string = anIdentifier.substr("themed".length),
         index = 0,
         count = string.length,
         label = "",

From 077e5482194baf16edc119a8f8efd4af93bf577c Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Thu, 19 Aug 2010 19:08:25 -0400
Subject: [PATCH 35/41] Manual test for CPAlert which cycles through all 6
 possible alert types for visual verification.

---
 Tests/Manual/CPAlertTest/AppController.j      |  76 +++++++++++++
 Tests/Manual/CPAlertTest/Info.plist           |  12 ++
 Tests/Manual/CPAlertTest/Jakefile             |  93 ++++++++++++++++
 .../Manual/CPAlertTest/Resources/spinner.gif  | Bin 0 -> 1849 bytes
 Tests/Manual/CPAlertTest/index-debug.html     | 104 ++++++++++++++++++
 Tests/Manual/CPAlertTest/index.html           |  79 +++++++++++++
 Tests/Manual/CPAlertTest/main.j               |  18 +++
 7 files changed, 382 insertions(+)
 create mode 100644 Tests/Manual/CPAlertTest/AppController.j
 create mode 100644 Tests/Manual/CPAlertTest/Info.plist
 create mode 100644 Tests/Manual/CPAlertTest/Jakefile
 create mode 100644 Tests/Manual/CPAlertTest/Resources/spinner.gif
 create mode 100644 Tests/Manual/CPAlertTest/index-debug.html
 create mode 100644 Tests/Manual/CPAlertTest/index.html
 create mode 100644 Tests/Manual/CPAlertTest/main.j

diff --git a/Tests/Manual/CPAlertTest/AppController.j b/Tests/Manual/CPAlertTest/AppController.j
new file mode 100644
index 000000000..4207446ec
--- /dev/null
+++ b/Tests/Manual/CPAlertTest/AppController.j
@@ -0,0 +1,76 @@
+/*
+ * AppController.j
+ * CPAlertTest
+ *
+ * Created by Alexander Ljungberg on August 19, 2010.
+ * Copyright 2010, WireLoad, LLC All rights reserved.
+ */
+
+@import <Foundation/CPObject.j>
+
+
+@implementation AppController : CPObject
+{
+    CPTextField label;
+    CPArray     variations;
+}
+
+- (void)applicationDidFinishLaunching:(CPNotification)aNotification
+{
+    variations = [
+        [nil, CPWarningAlertStyle],
+        [nil, CPInformationalAlertStyle],
+        [nil, CPCriticalAlertStyle],
+        [CPHUDBackgroundWindowMask, CPWarningAlertStyle],
+        [CPHUDBackgroundWindowMask, CPInformationalAlertStyle],
+        [CPHUDBackgroundWindowMask, CPCriticalAlertStyle],
+    ];
+
+    var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask],
+        contentView = [theWindow contentView];
+
+    label = [[CPTextField alloc] initWithFrame:CGRectMake(15, 15, 400, 24)];
+
+    [label setStringValue:"Respond to the alert dialog with the mouse or the keyboard."];
+    [contentView addSubview:label];
+
+    [theWindow orderFront:self];
+
+    [self showNextAlertVariation];
+
+    // Uncomment the following line to turn on the standard menu bar.
+    //[CPMenu setMenuBarVisible:YES];
+}
+
+- (void)alertDidEnd:(CPAlert)anAlert returnCode:(id)returnCode
+{
+    if (returnCode === 0)
+        [label setStringValue:"You chose 'Theorise'."];
+    else
+        [label setStringValue:"You cancelled the dialog."];
+
+    [self showNextAlertVariation];
+}
+
+- (void)showNextAlertVariation
+{
+    if (![variations count])
+        return;
+
+    var variation = [variations objectAtIndex:0],
+        alert = [[CPAlert alloc] init];
+
+    [variations removeObjectAtIndex:0];
+
+    [alert setDelegate:self];
+    [alert addButtonWithTitle:@"Theorise"];
+    [alert addButtonWithTitle:@"Cancel"];
+    [alert setMessageText:@"Do you want to theorise before you have data?"];
+    [alert setInformativeText:@"Invariably, you end up twisting facts to suit theories, instead of theories to suit facts."];
+    [alert setWindowStyle:variation[0]];
+    [alert setAlertStyle:variation[1]];
+
+    [alert runModal];
+}
+
+@end
diff --git a/Tests/Manual/CPAlertTest/Info.plist b/Tests/Manual/CPAlertTest/Info.plist
new file mode 100644
index 000000000..72c8e59a8
--- /dev/null
+++ b/Tests/Manual/CPAlertTest/Info.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CPApplicationDelegateClass</key>
+	<string>AppController</string>
+	<key>CPBundleName</key>
+	<string>CPAlertTest</string>
+	<key>CPPrincipalClass</key>
+	<string>CPApplication</string>
+</dict>
+</plist>
diff --git a/Tests/Manual/CPAlertTest/Jakefile b/Tests/Manual/CPAlertTest/Jakefile
new file mode 100644
index 000000000..a776e282b
--- /dev/null
+++ b/Tests/Manual/CPAlertTest/Jakefile
@@ -0,0 +1,93 @@
+/*
+ * Jakefile
+ * CPAlertTest
+ *
+ * Created by Alexander Ljungberg on August 19, 2010.
+ * Copyright 2010, WireLoad, LLC All rights reserved.
+ */
+
+var ENV = require("system").env,
+    FILE = require("file"),
+    JAKE = require("jake"),
+    task = JAKE.task,
+    FileList = JAKE.FileList,
+    app = require("cappuccino/jake").app,
+    configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
+    OS = require("os");
+
+app ("CPAlertTest", function(task)
+{
+    task.setBuildIntermediatesPath(FILE.join("Build", "CPAlertTest.build", configuration));
+    task.setBuildPath(FILE.join("Build", configuration));
+
+    task.setProductName("CPAlertTest");
+    task.setIdentifier("com.yourcompany.CPAlertTest");
+    task.setVersion("1.0");
+    task.setAuthor("WireLoad, LLC");
+    task.setEmail("feedback @nospam@ yourcompany.com");
+    task.setSummary("CPAlertTest");
+    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
+    task.setResources(new FileList("Resources/**"));
+    task.setIndexFilePath("index.html");
+    task.setInfoPlistPath("Info.plist");
+
+    if (configuration === "Debug")
+        task.setCompilerFlags("-DDEBUG -g");
+    else
+        task.setCompilerFlags("-O");
+});
+
+task ("default", ["CPAlertTest"], function()
+{
+    printResults(configuration);
+});
+
+task ("build", ["default"]);
+
+task ("debug", function()
+{
+    ENV["CONFIGURATION"] = "Debug";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("release", function()
+{
+    ENV["CONFIGURATION"] = "Release";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("run", ["debug"], function()
+{
+    OS.system(["open", FILE.join("Build", "Debug", "CPAlertTest", "index.html")]);
+});
+
+task ("run-release", ["release"], function()
+{
+    OS.system(["open", FILE.join("Build", "Release", "CPAlertTest", "index.html")]);
+});
+
+task ("deploy", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Deployment", "CPAlertTest"));
+    OS.system(["press", "-f", FILE.join("Build", "Release", "CPAlertTest"), FILE.join("Build", "Deployment", "CPAlertTest")]);
+    printResults("Deployment")
+});
+
+task ("desktop", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Desktop", "CPAlertTest"));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "CPAlertTest"), FILE.join("Build", "Desktop", "CPAlertTest", "CPAlertTest.app"));
+    printResults("Desktop")
+});
+
+task ("run-desktop", ["desktop"], function()
+{
+    OS.system([FILE.join("Build", "Desktop", "CPAlertTest", "CPAlertTest.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, "CPAlertTest"));
+    print("----------------------------");
+}
diff --git a/Tests/Manual/CPAlertTest/Resources/spinner.gif b/Tests/Manual/CPAlertTest/Resources/spinner.gif
new file mode 100644
index 0000000000000000000000000000000000000000..06dbc2bc21dddcf0e09b566d5b211aee89570f52
GIT binary patch
literal 1849
zcma*odr(tX9tZHtz31lM+(&Y`A`Ou`NeG&R#DrIfV%?hng21vs6<Qu85kn1y8d4G3
zB9aF}khfHe)haF9qWFOLm|a&8BQx4|+?A=*PIucG?9h(3mO>v>ooRQQFbk7E_K!V(
z{?5!fpZWgIZ%*d6t%i*j24bL}AZUJm9)h6R*;%L4IWse3G#VWaN1#$zSSXcBhlYlH
zJ|D}n{r&w2f+Qp)SS*&n?*G4}{}!h?td_mjU6Kad-rW*QwWYCUk7d^e+sjpZAn6kT
z5rM;`{~_}-wm+L@%+E;JphLm}C3WzQAQD0wBoY|rOTQX{(@pp-WAA8Iw0HKl|15j)
zhGh(SFWu#5zUCw^T!}C~eC}~?{xG-r7ugQC>taC+|L^xr&a%{#cgUOZXIM&v?)k^2
z1i5%0!U00wq)r4vlAwXBA_m5J5WNeuBm-XJQ5pG4GD%vc|K){+TJ{AkHqN@SJKczX
zU}QRd9n*_bf^h9<l-a&pF6v6N#Bvg}^VUOq)@d9+!HhLdY=xcv`e(fnj619`rWK_D
z@Nc;Oh3DY&5mnvcAQ!HXAt+%d5>4)6Ctv{CUfz_;qs#RDuQ$DR%y1&5G-a6rhf*4Y
zl+UOD1*GE{GQ7vv;c-tTIMkz0ovO>9j%b5hpa@a*CBJ#W!0@ndSwF|%hMkdFtXiU)
z`BEp+yhkt8ZY>tg&uyH@%^%K4jDrbA;et&vnnzZ3z22@e6<27z2Vk13kb7OtISyxv
z(XoO-LNQCZe3lfzc%*pNqU<9T+p~teThOEB+~e&U0mC|zS{Q)dJZ)!^1f7L(zg*L>
z*vSW%?dR~@@0(}x6-V^A`~ImD;)NaBUnP8;RH=bS2@pk`wp>>8r&jGjmGPy%1BW}v
zoPo}ca$~bze@efc3kapuEVW1!%teOZT3j2Tw5=hjiAf02d}7dL0oFC%@=RXp5Ow#%
z@a>+AM|YWt$n&e`>sB-32gBcuTi>R>*|8@lp`y6thc7ydyqDsuUn~YzZf|{-R@-3y
zL#wx{Ii}xxL_csiW*LBn0-A$>zp4WOmkf6=il<e?!Bom#crh0CjK%19!^g}+k}2`}
zo0Wr#;Yeg4o8zL_UVrMwWi~>rjlW?-l9+bCd7|i?*b5NTmy<<6NZ0T8$SN@mwdC2f
z6jqK=N@bS@!=YSj%>h0}*4p+%0HbTIrE$w7UMT6+AZZ&DAo*qZAAi(OtNbIfl#Dw^
zJWeiCp~zi#&t6x}m9)O^eR4HiLV3QA<<0>HZ8%$^lrSE94Wb}=+MM^!b>n#5&-JQR
zkr-CEu9C;_F*7DqDisulV6Pmg$nFL0TPn%~*m^-`Z3^BgU(sNpnx%nW(!eV9A&FvI
zHL3X3lw8Wji^6=8KbQDE-e%b?<z*f{V{H_@=6jT_Yqwt4Px-l`rX8awSWLQlCB4?y
z8Y>svdFxxdh$8r97@7$ojeI`6AL8Ob6QC$qh&>ZWVDX1F{0vJnT%%mE;GveKWR%C}
zM&4d;Jf3s9|HAA)yVUPo`Aq;0do#)uHSXi5*QF*)x@MVVHr+cN)uMZ__F|&Ta#p8d
z53TOKtce!PJUuie8UWol-S(`c2nH?UGqJP{!4RR4u$LCfn)q-hj0^f=h(VYy)T6eN
zhRO!ja-aDBTcgeyP(8Ua4IdiOog^*CQa?R(cP#9AgL9`j>EX-6Yf1lzX(!~``M1XC
zNmM<4<6d~wWZ$Xrk0K}UteTrq@LBBk#MsjkK;pbuVhe)NI7(7Pf(l?lxC7=1Z7Pzl
zMbS;nV4NI5_N{1$P)&XC)huOGQ+h^zpYUZfb*1n6>!`#*b3y52LGmi+<4sY5jyD#-
zw&$d}DTguLAfnRtjrM*JfqtHqUu6rQoU=g%1E9xk%;)TDm^2<8n-0<WJO&60lJpcB
zz|giz8_eK&)w%}Sqg)v&GE}nCr43Zw<Ore8gvs;S4CGK;h|cacP<UI~!kj9+qwS#S
zl6p|w-TKWs(PpC6*?H+-QS9z<s<>IhT<bH>sQFaek)MY}>PK4;nBk=ow4pF>vzkO&
gna%Org-kgQCf=+BeMi^RbuY;YE~rTjend;_cdi8t>i_@%

literal 0
HcmV?d00001

diff --git a/Tests/Manual/CPAlertTest/index-debug.html b/Tests/Manual/CPAlertTest/index-debug.html
new file mode 100644
index 000000000..d5cebcf0d
--- /dev/null
+++ b/Tests/Manual/CPAlertTest/index-debug.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!--
+ index-debug.html
+ CPAlertTest
+
+ Created by Alexander Ljungberg on August 19, 2010.
+ Copyright 2010, WireLoad, LLC All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+        <meta http-equiv="X-UA-Compatible" content="chrome=1" />
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+
+        <link rel="apple-touch-icon" href="Resources/icon.png" />
+        <link rel="apple-touch-startup-image" href="Resources/default.png" />
+
+        <title>CPAlertTest</title>
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
+        </script>
+        
+        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
+        
+        <script type="text/javascript">
+            objj_msgSend_reset();
+
+            // DEBUG OPTIONS:
+
+            // Uncomment to enable printing of backtraces on exceptions:
+            //objj_msgSend_decorate(objj_backtrace_decorator);
+            
+            // Uncomment to supress exceptions that take place inside a message
+            //objj_msgSend_decorate(objj_supress_exceptions_decorator)
+
+            // Uncomment to enable runtime type checking:
+            //objj_msgSend_decorate(objj_typecheck_decorator);
+
+            // Uncomment (along with both above) to print backtraces on type check errors:
+            //objj_typecheck_prints_backtrace = true;
+
+            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
+            //CPLogUnregister(CPLogDefault);
+
+            // Uncomment to enable a specific logger:
+            //CPLogRegister(CPLogConsole);
+            //CPLogRegister(CPLogPopup);
+        </script>
+        
+        <style type="text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="cappuccino-body">
+            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+                <script type="text/javascript">
+                    document.write("<div id='container'><p id='content'>" +
+                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                                   "Loading CPAlertTest...</p></div>");
+                </script>
+        
+                <noscript>
+                    <div id="container">
+                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </noscript>
+            </div>
+        </div>
+    </body>
+
+</html>
diff --git a/Tests/Manual/CPAlertTest/index.html b/Tests/Manual/CPAlertTest/index.html
new file mode 100644
index 000000000..71ac40da9
--- /dev/null
+++ b/Tests/Manual/CPAlertTest/index.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!--
+ index.html
+ CPAlertTest
+
+ Created by Alexander Ljungberg on August 19, 2010.
+ Copyright 2010, WireLoad, LLC All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+        <meta http-equiv="X-UA-Compatible" content="chrome=1" />
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+
+        <link rel="apple-touch-icon" href="Resources/icon.png" />
+        <link rel="apple-touch-startup-image" href="Resources/default.png" />
+
+        <title>CPAlertTest</title>
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+        </script>
+        
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <style type="text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="cappuccino-body">
+            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+                <script type="text/javascript">
+                    document.write("<div id='container'><p id='content'>" +
+                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                                   "Loading CPAlertTest...</p></div>");
+                </script>
+        
+                <noscript>
+                    <div id="container">
+                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </noscript>
+            </div>
+        </div>
+    </body>
+
+</html>
+
diff --git a/Tests/Manual/CPAlertTest/main.j b/Tests/Manual/CPAlertTest/main.j
new file mode 100644
index 000000000..a589c11ea
--- /dev/null
+++ b/Tests/Manual/CPAlertTest/main.j
@@ -0,0 +1,18 @@
+/*
+ * AppController.j
+ * CPAlertTest
+ *
+ * Created by Alexander Ljungberg on August 19, 2010.
+ * Copyright 2010, WireLoad, LLC All rights reserved.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+@import "AppController.j"
+
+
+function main(args, namedArgs)
+{
+    CPApplicationMain(args, namedArgs);
+}

From 62f81f26016c33fc0d1707d15bbdb18f760a1ba2 Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Thu, 19 Aug 2010 19:11:52 -0400
Subject: [PATCH 36/41] Remove hardcoded Aristo theme from CPAlert. New CPTheme
 method to get the default HUD theme style, which defaults to the default
 theme + "-HUD". Clean up CPAlert slightly.

---
 AppKit/CPAlert.j | 46 +++++++++++++++++++++++-----------------------
 AppKit/CPTheme.j | 44 +++++++++++++++++++++++++++++++++-----------
 2 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j
index 9f04ec545..28b4a3cb6 100644
--- a/AppKit/CPAlert.j
+++ b/AppKit/CPAlert.j
@@ -39,17 +39,17 @@
     @global
     @group CPAlertStyle
 */
-CPWarningAlertStyle =        0;
+CPWarningAlertStyle         = 0;
 /*
     @global
     @group CPAlertStyle
 */
-CPInformationalAlertStyle =  1;
+CPInformationalAlertStyle   = 1;
 /*
     @global
     @group CPAlertStyle
 */
-CPCriticalAlertStyle =       2;
+CPCriticalAlertStyle        = 2;
 
 
 var CPAlertWarningImage,
@@ -58,7 +58,7 @@ var CPAlertWarningImage,
 
 /*!
     @ingroup appkit
-    
+
     CPAlert is an alert panel that can be displayed modally to present the
     user with a message and one or more options.
 
@@ -74,7 +74,7 @@ var CPAlertWarningImage,
     @delegate -(void)alertDidEnd:(CPAlert)theAlert returnCode:(int)returnCode;
     Called when the user dismisses the alert by clicking one of the buttons.
     @param theAlert the alert panel that the user dismissed
-    @param returnCode the index of the button that the user clicked (starting from 0, 
+    @param returnCode the index of the button that the user clicked (starting from 0,
            representing the first button added to the alert which appears on the
            right, 1 representing the next button to the left and so on)
 */
@@ -100,15 +100,15 @@ var CPAlertWarningImage,
     if (self != CPAlert)
         return;
 
-    var bundle = [CPBundle bundleForClass:[self class]];   
+    var bundle = [CPBundle bundleForClass:[self class]];
 
-    CPAlertWarningImage     = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-warning.png"] 
+    CPAlertWarningImage     = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-warning.png"]
                                                                  size:CGSizeMake(32.0, 32.0)];
-                                                             
-    CPAlertInformationImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-information.png"] 
+
+    CPAlertInformationImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-information.png"]
                                                                  size:CGSizeMake(32.0, 32.0)];
-                                                                 
-    CPAlertErrorImage       = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-error.png"] 
+
+    CPAlertErrorImage       = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-error.png"]
                                                                  size:CGSizeMake(32.0, 32.0)];
 }
 
@@ -125,7 +125,7 @@ var CPAlertWarningImage,
 
         [self setWindowStyle:nil];
     }
-    
+
     return self;
 }
 
@@ -136,16 +136,16 @@ var CPAlertWarningImage,
 - (void)setWindowStyle:(int)styleMask
 {
     _windowStyle = styleMask;
-    
+
     _alertPanel = [[CPPanel alloc] initWithContentRect:CGRectMake(0.0, 0.0, 400.0, 110.0) styleMask:styleMask ? styleMask | CPTitledWindowMask : CPTitledWindowMask];
     [_alertPanel setFloatingPanel:YES];
     [_alertPanel center];
 
     var count = [_buttons count];
-    for(var i=0; i < count; i++)
+    for (var i = 0; i < count; i++)
     {
         var button = _buttons[i];
-        [button setTheme:(_windowStyle === CPHUDBackgroundWindowMask) ? [CPTheme themeNamed:"Aristo-HUD"] : [CPTheme defaultTheme]];
+        [button setTheme:(_windowStyle === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
 
         [[_alertPanel contentView] addSubview:button];
     }
@@ -160,7 +160,6 @@ var CPAlertWarningImage,
         [_messageLabel setAlignment:CPJustifiedTextAlignment];
         [_messageLabel setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
 
-
         _alertImageView = [[CPImageView alloc] initWithFrame:CGRectMake(15.0, 12.0, 32.0, 32.0)];
 
         _informativeLabel = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
@@ -294,12 +293,12 @@ var CPAlertWarningImage,
     [button setTarget:self];
     [button setTag:_buttonCount];
     [button setAction:@selector(_notifyDelegate:)];
-    
-    [button setTheme:(_windowStyle === CPHUDBackgroundWindowMask) ? [CPTheme themeNamed:"Aristo-HUD"] : [CPTheme defaultTheme]];
+
+    [button setTheme:(_windowStyle === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
     [button setAutoresizingMask:CPViewMinXMargin | CPViewMinYMargin];
 
     [[_alertPanel contentView] addSubview:button];
-    
+
     if (_buttonCount == 0)
         [button setKeyEquivalent:CPCarriageReturnCharacter];
     else if ([title lowercaseString] === "cancel")
@@ -319,7 +318,8 @@ var CPAlertWarningImage,
         count = [_buttons count],
         offsetX = CGRectGetWidth(bounds),
         offsetY = CGRectGetHeight(bounds) - 34.0;
-    for(var i=0; i < count; i++)
+
+    for (var i = 0; i < count; i++)
     {
         var button = _buttons[i];
 
@@ -353,7 +353,7 @@ var CPAlertWarningImage,
 - (void)runModal
 {
     var theTitle;
-    
+
     switch (_alertStyle)
     {
         case CPWarningAlertStyle:       [_alertImageView setImage:CPAlertWarningImage];
@@ -366,9 +366,9 @@ var CPAlertWarningImage,
                                         theTitle = @"Error";
                                         break;
     }
-    
+
     [_alertPanel setTitle:_windowTitle ? _windowTitle : theTitle];
-    
+
     [CPApp runModalForWindow:_alertPanel];
 }
 
diff --git a/AppKit/CPTheme.j b/AppKit/CPTheme.j
index a1d27c8e5..c0b91722c 100644
--- a/AppKit/CPTheme.j
+++ b/AppKit/CPTheme.j
@@ -24,8 +24,9 @@
 @import <Foundation/CPString.j>
 @import <Foundation/CPKeyedUnarchiver.j>
 
-var CPThemesByName      = { },
-    CPThemeDefaultTheme = nil;
+var CPThemesByName          = { },
+    CPThemeDefaultTheme     = nil,
+    CPThemeDefaultHudTheme  = nil;
 
 
 /*!
@@ -48,6 +49,27 @@ var CPThemesByName      = { },
     return CPThemeDefaultTheme;
 }
 
+/*!
+    Set the default HUD theme. If set to nil, the default described in defaultHudTheme
+    will be used.
+*/
++ (void)setDefaultHudTheme:(CPTheme)aTheme
+{
+    CPThemeDefaultHudTheme = aTheme;
+}
+
+/*!
+    The default HUD theme is (sometimes) used for windows with the CPHUDBackgroundWindowMask
+    style mask. The default is theme with the name of the default theme with -HUD appended
+    at the end.
+*/
++ (CPTheme)defaultHudTheme
+{
+    if (!CPThemeDefaultHudTheme)
+        CPThemeDefaultHudTheme = [CPTheme themeNamed:[[self defaultTheme] name] + "-HUD"];
+    return CPThemeDefaultHudTheme;
+}
+
 + (CPTheme)themeNamed:(CPString)aName
 {
     return CPThemesByName[aName];
@@ -474,15 +496,15 @@ CPThemeStateCircular        = CPThemeState("circular");
 
 @end
 
-var cachedNumberOfOnes = [  0 /*000000*/, 1 /*000001*/, 1 /*000010*/, 2 /*000011*/, 1 /*000100*/, 2 /*000101*/, 2 /*000110*/, 
-                            3 /*000111*/, 1 /*001000*/, 2 /*001001*/, 2 /*001010*/, 3 /*001011*/, 2 /*001100*/, 3 /*001101*/, 
-                            3 /*001110*/, 4 /*001111*/, 1 /*010000*/, 2 /*010001*/, 2 /*010010*/, 3 /*010011*/, 2 /*010100*/, 
-                            3 /*010101*/, 3 /*010110*/, 4 /*010111*/, 2 /*011000*/, 3 /*011001*/, 3 /*011010*/, 4 /*011011*/, 
-                            3 /*011100*/, 4 /*011101*/, 4 /*011110*/, 5 /*011111*/, 1 /*100000*/, 2 /*100001*/, 2 /*100010*/, 
-                            3 /*100011*/, 2 /*100100*/, 3 /*100101*/, 3 /*100110*/, 4 /*100111*/, 2 /*101000*/, 3 /*101001*/, 
-                            3 /*101010*/, 4 /*101011*/, 3 /*101100*/, 4 /*101101*/, 4 /*101110*/, 5 /*101111*/, 2 /*110000*/, 
-                            3 /*110001*/, 3 /*110010*/, 4 /*110011*/, 3 /*110100*/, 4 /*110101*/, 4 /*110110*/, 5 /*110111*/, 
-                            3 /*111000*/, 4 /*111001*/, 4 /*111010*/, 5 /*111011*/, 4 /*111100*/, 5 /*111101*/, 5 /*111110*/, 
+var cachedNumberOfOnes = [  0 /*000000*/, 1 /*000001*/, 1 /*000010*/, 2 /*000011*/, 1 /*000100*/, 2 /*000101*/, 2 /*000110*/,
+                            3 /*000111*/, 1 /*001000*/, 2 /*001001*/, 2 /*001010*/, 3 /*001011*/, 2 /*001100*/, 3 /*001101*/,
+                            3 /*001110*/, 4 /*001111*/, 1 /*010000*/, 2 /*010001*/, 2 /*010010*/, 3 /*010011*/, 2 /*010100*/,
+                            3 /*010101*/, 3 /*010110*/, 4 /*010111*/, 2 /*011000*/, 3 /*011001*/, 3 /*011010*/, 4 /*011011*/,
+                            3 /*011100*/, 4 /*011101*/, 4 /*011110*/, 5 /*011111*/, 1 /*100000*/, 2 /*100001*/, 2 /*100010*/,
+                            3 /*100011*/, 2 /*100100*/, 3 /*100101*/, 3 /*100110*/, 4 /*100111*/, 2 /*101000*/, 3 /*101001*/,
+                            3 /*101010*/, 4 /*101011*/, 3 /*101100*/, 4 /*101101*/, 4 /*101110*/, 5 /*101111*/, 2 /*110000*/,
+                            3 /*110001*/, 3 /*110010*/, 4 /*110011*/, 3 /*110100*/, 4 /*110101*/, 4 /*110110*/, 5 /*110111*/,
+                            3 /*111000*/, 4 /*111001*/, 4 /*111010*/, 5 /*111011*/, 4 /*111100*/, 5 /*111101*/, 5 /*111110*/,
                             6 /*111111*/ ];
 
 var numberOfOnes = function(aNumber)

From c06068c9318217ea21bd8d0b9e62cdf1f6e757ac Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Thu, 19 Aug 2010 23:03:35 -0400
Subject: [PATCH 37/41] Themable CPAlert which automatically grows height-wise
 to accommodate all text. Adjustable icons, margins, spacing and fonts.

---
 AppKit/CPAlert.j                              | 234 ++++++++++--------
 .../Aristo/Resources}/dialog-error.png        | Bin
 .../Aristo/Resources/dialog-icons-LICENSE}    |   0
 .../Aristo/Resources}/dialog-information.png  | Bin
 .../Aristo/Resources}/dialog-warning.png      | Bin
 AppKit/Themes/Aristo/ThemeDescriptors.j       |  49 +++-
 AppKit/Themes/BlendKit/BKThemeDescriptor.j    |  10 +-
 Tests/Manual/CPAlertTest/AppController.j      |  27 +-
 8 files changed, 212 insertions(+), 108 deletions(-)
 rename AppKit/{Resources/CPAlert => Themes/Aristo/Resources}/dialog-error.png (100%)
 rename AppKit/{Resources/CPAlert/LICENSE => Themes/Aristo/Resources/dialog-icons-LICENSE} (100%)
 rename AppKit/{Resources/CPAlert => Themes/Aristo/Resources}/dialog-information.png (100%)
 rename AppKit/{Resources/CPAlert => Themes/Aristo/Resources}/dialog-warning.png (100%)

diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j
index 28b4a3cb6..7f8c6ccc2 100644
--- a/AppKit/CPAlert.j
+++ b/AppKit/CPAlert.j
@@ -52,10 +52,6 @@ CPInformationalAlertStyle   = 1;
 CPCriticalAlertStyle        = 2;
 
 
-var CPAlertWarningImage,
-    CPAlertInformationImage,
-    CPAlertErrorImage;
-
 /*!
     @ingroup appkit
 
@@ -78,7 +74,7 @@ var CPAlertWarningImage,
            representing the first button added to the alert which appears on the
            right, 1 representing the next button to the left and so on)
 */
-@implementation CPAlert : CPObject
+@implementation CPAlert : CPView
 {
     CPPanel         _alertPanel;
 
@@ -89,27 +85,34 @@ var CPAlertWarningImage,
     CPAlertStyle    _alertStyle;
     CPString        _windowTitle;
     int             _windowStyle;
-    int             _buttonCount;
     CPArray         _buttons;
 
     id              _delegate;
 }
 
-+ (void)initialize
++ (CPString)themeClass
 {
-    if (self != CPAlert)
-        return;
+    return @"alert";
+}
 
-    var bundle = [CPBundle bundleForClass:[self class]];
-
-    CPAlertWarningImage     = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-warning.png"]
-                                                                 size:CGSizeMake(32.0, 32.0)];
-
-    CPAlertInformationImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-information.png"]
-                                                                 size:CGSizeMake(32.0, 32.0)];
-
-    CPAlertErrorImage       = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-error.png"]
-                                                                 size:CGSizeMake(32.0, 32.0)];
++ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[CGSizeMake(400.0, 110.0), CGInsetMake(15, 15, 15, 50), 6, 10,
+                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont boldSystemFontOfSize:13.0], [CPNull null], CGSizeMakeZero(),
+                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont systemFontOfSize:12.0], [CPNull null], CGSizeMakeZero(),
+                                                CGPointMake(15, 12),
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null]
+                                                ]
+                                       forKeys:[@"size", @"content-inset", @"informative-offset", @"button-offset",
+                                                @"message-text-alignment", @"message-text-color", @"message-text-font", @"message-text-shadow-color", @"message-text-shadow-offset",
+                                                @"informative-text-alignment", @"informative-text-color", @"informative-text-font", @"informative-text-shadow-color", @"informative-text-shadow-offset",
+                                                @"image-offset",
+                                                @"information-image",
+                                                @"warning-image",
+                                                @"error-image"
+                                                ]];
 }
 
 /*!
@@ -119,9 +122,13 @@ var CPAlertWarningImage,
 {
     if (self = [super init])
     {
-        _buttonCount = 0;
         _buttons = [CPArray array];
         _alertStyle = CPWarningAlertStyle;
+        _alertPanel = nil;
+
+        _messageLabel = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+        _alertImageView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
+        _informativeLabel = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
 
         [self setWindowStyle:nil];
     }
@@ -130,52 +137,38 @@ var CPAlertWarningImage,
 }
 
 /*!
-    Sets the window appearance.
+    Sets the window appearance. If CPHUDBackgroundWindowMask is set, the default HUD theme
+    will be activated.
+
     @param styleMask - Either CPHUDBackgroundWindowMask or nil for standard.
 */
 - (void)setWindowStyle:(int)styleMask
 {
     _windowStyle = styleMask;
 
-    _alertPanel = [[CPPanel alloc] initWithContentRect:CGRectMake(0.0, 0.0, 400.0, 110.0) styleMask:styleMask ? styleMask | CPTitledWindowMask : CPTitledWindowMask];
-    [_alertPanel setFloatingPanel:YES];
-    [_alertPanel center];
+    [self setTheme:(_windowStyle === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
 
-    var count = [_buttons count];
-    for (var i = 0; i < count; i++)
-    {
-        var button = _buttons[i];
-        [button setTheme:(_windowStyle === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
+    // We'll need to recreate the panel to get the new window style.
+    _alertPanel = nil;
+}
 
-        [[_alertPanel contentView] addSubview:button];
-    }
+- (void)_createPanel
+{
+    var frame = CGRectMakeZero();
+    frame.size = [self currentValueForThemeAttribute:@"size"];
+    _alertPanel = [[CPPanel alloc] initWithContentRect:frame styleMask:_windowStyle ? _windowStyle | CPTitledWindowMask : CPTitledWindowMask];
 
-    [self _layoutButtons];
+    var contentView = [_alertPanel contentView],
+        count = [_buttons count];
+    while (count--)
+        [contentView addSubview:_buttons[count]];
 
-    if (!_messageLabel)
-    {
-        _messageLabel = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-        [_messageLabel setFont:[CPFont boldSystemFontOfSize:13.0]];
-        [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];
-        [_messageLabel setAlignment:CPJustifiedTextAlignment];
-        [_messageLabel setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
+    [contentView addSubview:_messageLabel];
+    [contentView addSubview:_alertImageView];
+    [contentView addSubview:_informativeLabel];
 
-        _alertImageView = [[CPImageView alloc] initWithFrame:CGRectMake(15.0, 12.0, 32.0, 32.0)];
-
-        _informativeLabel = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-        [_informativeLabel setFont:[CPFont systemFontOfSize:12.0]];
-        [_informativeLabel setLineBreakMode:CPLineBreakByWordWrapping];
-        [_informativeLabel setAlignment:CPJustifiedTextAlignment];
-        [_informativeLabel setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
-    }
-    [_messageLabel setTextColor:(styleMask & CPHUDBackgroundWindowMask) ? [CPColor whiteColor] : [CPColor blackColor]];
-    [_informativeLabel setTextColor:(styleMask & CPHUDBackgroundWindowMask) ? [CPColor whiteColor] : [CPColor blackColor]];
-
-    [[_alertPanel contentView] addSubview:_messageLabel];
-    [[_alertPanel contentView] addSubview:_alertImageView];
-    [[_alertPanel contentView] addSubview:_informativeLabel];
-
-    [self _layoutMessage];
+    // For reference: does not actually work since this 'view' is not in the hierarchy.
+    // [self setNeedsLayout];
 }
 
 /*!
@@ -227,6 +220,9 @@ var CPAlertWarningImage,
 - (void)setAlertStyle:(CPAlertStyle)style
 {
     _alertStyle = style;
+
+    // For reference: does not actually work since this 'view' is not in the hierarchy.
+    // [self setNeedsLayout];
 }
 
 /*!
@@ -244,7 +240,9 @@ var CPAlertWarningImage,
 - (void)setMessageText:(CPString)messageText
 {
     [_messageLabel setStringValue:messageText];
-    [self _layoutMessage];
+
+    // For reference: does not actually work since this 'view' is not in the hierarchy.
+    // [self setNeedsLayout];
 }
 
 /*!
@@ -287,16 +285,14 @@ var CPAlertWarningImage,
 - (void)addButtonWithTitle:(CPString)title
 {
     var bounds = [[_alertPanel contentView] bounds],
-        button = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
+        button = [[CPButton alloc] initWithFrame:CGRectMakeZero()],
+        _buttonCount = [_buttons count];
 
     [button setTitle:title];
     [button setTarget:self];
     [button setTag:_buttonCount];
     [button setAction:@selector(_notifyDelegate:)];
 
-    [button setTheme:(_windowStyle === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
-    [button setAutoresizingMask:CPViewMinXMargin | CPViewMinYMargin];
-
     [[_alertPanel contentView] addSubview:button];
 
     if (_buttonCount == 0)
@@ -306,43 +302,97 @@ var CPAlertWarningImage,
     else
         [button setKeyEquivalent:nil];
 
-    _buttonCount++;
     [_buttons addObject:button];
 
-    [self _layoutButtons];
+    // For reference: does not actually work since this 'view' is not in the hierarchy.
+    // [self setNeedsLayout];
 }
 
-- (void)_layoutButtons
+- (void)layoutSubviews
 {
-    var bounds = [[_alertPanel contentView] bounds],
-        count = [_buttons count],
-        offsetX = CGRectGetWidth(bounds),
-        offsetY = CGRectGetHeight(bounds) - 34.0;
+    if (!_alertPanel)
+        [self _createPanel];
 
-    for (var i = 0; i < count; i++)
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        iconOffset = [self currentValueForThemeAttribute:@"image-offset"],
+        theTitle,
+        theImage;
+
+    switch (_alertStyle)
     {
-        var button = _buttons[i];
+        case CPWarningAlertStyle:       theImage = [self currentValueForThemeAttribute:@"warning-image"];
+                                        theTitle = @"Warning";
+                                        break;
+        case CPInformationalAlertStyle: theImage = [self currentValueForThemeAttribute:@"information-image"];
+                                        theTitle = @"Information";
+                                        break;
+        case CPCriticalAlertStyle:      theImage = [self currentValueForThemeAttribute:@"error-image"];
+                                        theTitle = @"Error";
+                                        break;
+    }
 
+    [_alertImageView setImage:theImage];
+    var imageSize = theImage ? [theImage size] : CGSizeMakeZero();
+    [_alertImageView setFrame:CGRectMake(iconOffset.x, iconOffset.y, imageSize.width, imageSize.height)];
+
+    [_alertPanel setTitle:_windowTitle ? _windowTitle : theTitle];
+    [_alertPanel setFloatingPanel:YES];
+    [_alertPanel center];
+
+    [_messageLabel setTextColor:[self currentValueForThemeAttribute:@"message-text-color"]];
+    [_messageLabel setFont:[self currentValueForThemeAttribute:@"message-text-font"]];
+    [_messageLabel setTextShadowColor:[self currentValueForThemeAttribute:@"message-text-shadow-color"]];
+    [_messageLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"message-text-shadow-offset"]];
+    [_messageLabel setAlignment:[self currentValueForThemeAttribute:@"message-text-alignment"]];
+    [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];
+
+    [_informativeLabel setTextColor:[self currentValueForThemeAttribute:@"informative-text-color"]];
+    [_informativeLabel setFont:[self currentValueForThemeAttribute:@"informative-text-font"]];
+    [_informativeLabel setTextShadowColor:[self currentValueForThemeAttribute:@"informative-text-shadow-color"]];
+    [_informativeLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
+    [_informativeLabel setLineBreakMode:CPLineBreakByWordWrapping];
+
+    // FIXME sizeWithFontCorrection shouldn't be needed.
+    var bounds = [[_alertPanel contentView] bounds],
+        offsetX = CGRectGetWidth(bounds) - inset.right,
+        informativeOffset = [self currentValueForThemeAttribute:@"informative-offset"],
+        buttonOffset = [self currentValueForThemeAttribute:@"button-offset"],
+
+        textWidth = offsetX - inset.left,
+        messageSize = [([_messageLabel stringValue] || " ") sizeWithFont:[_messageLabel font] inWidth:textWidth],
+        informativeSize = [([_informativeLabel stringValue] || " ") sizeWithFont:[_informativeLabel font] inWidth:textWidth],
+        sizeWithFontCorrection = 6.0;
+
+    [_messageLabel setFrame:CGRectMake(inset.left, inset.top, textWidth, messageSize.height + sizeWithFontCorrection)];
+    [_informativeLabel setFrame:CGRectMake(inset.left, CGRectGetMaxY([_messageLabel frame]) + informativeOffset, textWidth, informativeSize.height + sizeWithFontCorrection)];
+
+    var aRepresentativeButton = _buttons[0],
+        buttonY = CGRectGetMaxY([_informativeLabel frame]) + buttonOffset;
+    [aRepresentativeButton setTheme:[self theme]];
+    [aRepresentativeButton sizeToFit];
+
+    // Make the window just tall enough to fit everything. Bit of a hack really.
+    var extraY = buttonY + CGRectGetHeight([aRepresentativeButton bounds]) + inset.bottom - CGRectGetHeight(bounds),
+        frameSize = CGSizeMakeCopy([_alertPanel frame].size);
+    frameSize.height += extraY;
+    [_alertPanel setFrameSize:frameSize];
+
+    var count = [_buttons count];
+    while (count--)
+    {
+        var button = _buttons[count];
+
+        [button setTheme:[self theme]];
         [button sizeToFit];
+
         var buttonBounds = [button bounds],
             width = MAX(80.0, CGRectGetWidth(buttonBounds)),
             height = CGRectGetHeight(buttonBounds);
-        offsetX -= (width + 10);
-        [button setFrame:CGRectMake(offsetX, offsetY, width, height)];
+        offsetX -= width;
+        [button setFrame:CGRectMake(offsetX, buttonY, width, height)];
+        offsetX -= 10;
     }
-}
 
-- (void)_layoutMessage
-{
-    var bounds = [[_alertPanel contentView] bounds],
-        width = CGRectGetWidth(bounds) - 73.0,
-        size = [([_messageLabel stringValue] || " ") sizeWithFont:[_messageLabel currentValueForThemeAttribute:@"font"] inWidth:width],
-        contentInset = [_messageLabel currentValueForThemeAttribute:@"content-inset"],
-        height = size.height + contentInset.top + contentInset.bottom;
-
-    [_messageLabel setFrame:CGRectMake(57.0, 10.0, width, height)];
-
-    [_informativeLabel setFrame:CGRectMake(57.0, 10.0 + height + 6.0, width, CGRectGetHeight(bounds) - height - 50.0)];
 }
 
 /*!
@@ -352,23 +402,7 @@ var CPAlertWarningImage,
 */
 - (void)runModal
 {
-    var theTitle;
-
-    switch (_alertStyle)
-    {
-        case CPWarningAlertStyle:       [_alertImageView setImage:CPAlertWarningImage];
-                                        theTitle = @"Warning";
-                                        break;
-        case CPInformationalAlertStyle: [_alertImageView setImage:CPAlertInformationImage];
-                                        theTitle = @"Information";
-                                        break;
-        case CPCriticalAlertStyle:      [_alertImageView setImage:CPAlertErrorImage];
-                                        theTitle = @"Error";
-                                        break;
-    }
-
-    [_alertPanel setTitle:_windowTitle ? _windowTitle : theTitle];
-
+    [self layoutSubviews];
     [CPApp runModalForWindow:_alertPanel];
 }
 
diff --git a/AppKit/Resources/CPAlert/dialog-error.png b/AppKit/Themes/Aristo/Resources/dialog-error.png
similarity index 100%
rename from AppKit/Resources/CPAlert/dialog-error.png
rename to AppKit/Themes/Aristo/Resources/dialog-error.png
diff --git a/AppKit/Resources/CPAlert/LICENSE b/AppKit/Themes/Aristo/Resources/dialog-icons-LICENSE
similarity index 100%
rename from AppKit/Resources/CPAlert/LICENSE
rename to AppKit/Themes/Aristo/Resources/dialog-icons-LICENSE
diff --git a/AppKit/Resources/CPAlert/dialog-information.png b/AppKit/Themes/Aristo/Resources/dialog-information.png
similarity index 100%
rename from AppKit/Resources/CPAlert/dialog-information.png
rename to AppKit/Themes/Aristo/Resources/dialog-information.png
diff --git a/AppKit/Resources/CPAlert/dialog-warning.png b/AppKit/Themes/Aristo/Resources/dialog-warning.png
similarity index 100%
rename from AppKit/Resources/CPAlert/dialog-warning.png
rename to AppKit/Themes/Aristo/Resources/dialog-warning.png
diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 34076d58a..6a5554b7f 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -17,7 +17,8 @@ var themedButtonValues = nil,
     themedHorizontalSliderValues = nil,
     themedVerticalSliderValues = nil,
     themedCircularSliderValues = nil,
-    themedButtonBarValues = nil;
+    themedButtonBarValues = nil,
+    themedAlertValues = nil;
 
 /*
     HOW TO ADD OR MODIFY THEMED ELEMENTS
@@ -1301,6 +1302,37 @@ var themedButtonValues = nil,
     return view;
 }
 
++ (CPAlert)themedAlert
+{
+    var alert = [CPAlert new],
+        size = CGSizeMake(400.0, 110.0),
+        inset =  CGInsetMake(10, 15, 15, 55),
+        messageFont = [CPFont boldSystemFontOfSize:13.0],
+        informativeFont = [CPFont systemFontOfSize:12.0],
+        informationIcon = PatternImage("dialog-information.png", 32.0, 32.0),
+        warningIcon = PatternImage("dialog-warning.png", 32.0, 32.0),
+        errorIcon = PatternImage("dialog-error.png", 32.0, 32.0);
+
+    themedAlertValues =
+    [
+        [@"size",		                    size],
+        [@"content-inset",		            inset],
+        [@"message-text-alignment",	        CPJustifiedTextAlignment],
+        [@"message-text-color",		        [CPColor blackColor]],
+        [@"message-text-font",		        messageFont],
+        [@"informative-text-alignment",	    CPJustifiedTextAlignment],
+        [@"informative-text-color",		    [CPColor blackColor]],
+        [@"informative-text-font",		    informativeFont],
+        [@"information-image",		        informationIcon],
+        [@"warning-image",		            warningIcon],
+        [@"error-image",                    errorIcon]
+    ];
+
+    [self registerThemeValues:themedAlertValues forView:alert];
+
+    return alert;
+}
+
 @end
 
 @implementation AristoHUDThemeDescriptor : BKThemeDescriptor
@@ -1423,4 +1455,19 @@ var themedButtonValues = nil,
     return slider;
 }
 
++ (CPAlert)themedAlert
+{
+    var alert = [CPAlert new],
+
+        hudSpecificValues =
+        [
+            [@"message-text-color",		        [CPColor whiteColor]],
+            [@"informative-text-color",		    [CPColor whiteColor]],
+        ];
+
+    [self registerThemeValues:hudSpecificValues forView:alert inherit:themedAlertValues];
+
+    return alert;
+}
+
 @end
diff --git a/AppKit/Themes/BlendKit/BKThemeDescriptor.j b/AppKit/Themes/BlendKit/BKThemeDescriptor.j
index 535bf22c2..4841fb21e 100644
--- a/AppKit/Themes/BlendKit/BKThemeDescriptor.j
+++ b/AppKit/Themes/BlendKit/BKThemeDescriptor.j
@@ -348,10 +348,18 @@ function PatternColor()
     }
     else if (arguments.length == 3)
     {
-        return [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:arguments[0] size:CGSizeMake(arguments[1], arguments[2])]];
+        return [CPColor colorWithPatternImage:PatternImage(arguments[0], arguments[1], arguments[2])];
     }
     else
     {
         return nil;
     }
 }
+
+/*
+    Like the 3 argument PatternColor, but return an image instead of a color.
+*/
+function PatternImage(name, width, height)
+{
+    return [_CPCibCustomResource imageResourceWithName:name size:CGSizeMake(width, height)];
+}
diff --git a/Tests/Manual/CPAlertTest/AppController.j b/Tests/Manual/CPAlertTest/AppController.j
index 4207446ec..4467d2fcb 100644
--- a/Tests/Manual/CPAlertTest/AppController.j
+++ b/Tests/Manual/CPAlertTest/AppController.j
@@ -13,10 +13,22 @@
 {
     CPTextField label;
     CPArray     variations;
+    CPArray     messages;
+    int         messageIndex;
 }
 
 - (void)applicationDidFinishLaunching:(CPNotification)aNotification
 {
+    messages = [
+        [@"Are you sure you want to theorise before you have data?",
+         @"Invariably, you end up twisting facts to suit theories, instead of theories to suit facts.",
+         "Theorise", "Cancel"],
+        [@"Snakes. Why did it have to be snakes?",
+         nil,
+         "Torch", "Cancel"]
+    ];
+    messageIndex = 0;
+
     variations = [
         [nil, CPWarningAlertStyle],
         [nil, CPInformationalAlertStyle],
@@ -45,7 +57,7 @@
 - (void)alertDidEnd:(CPAlert)anAlert returnCode:(id)returnCode
 {
     if (returnCode === 0)
-        [label setStringValue:"You chose 'Theorise'."];
+        [label setStringValue:"You chose the default action."];
     else
         [label setStringValue:"You cancelled the dialog."];
 
@@ -57,16 +69,19 @@
     if (![variations count])
         return;
 
-    var variation = [variations objectAtIndex:0],
+
+    var variation = variations[0],
+        message = messages[messageIndex],
         alert = [[CPAlert alloc] init];
 
+    messageIndex = 1 - messageIndex;
     [variations removeObjectAtIndex:0];
 
     [alert setDelegate:self];
-    [alert addButtonWithTitle:@"Theorise"];
-    [alert addButtonWithTitle:@"Cancel"];
-    [alert setMessageText:@"Do you want to theorise before you have data?"];
-    [alert setInformativeText:@"Invariably, you end up twisting facts to suit theories, instead of theories to suit facts."];
+    [alert setMessageText:message[0]];
+    [alert setInformativeText:message[1]];
+    [alert addButtonWithTitle:message[2]];
+    [alert addButtonWithTitle:message[3]];
     [alert setWindowStyle:variation[0]];
     [alert setAlertStyle:variation[1]];
 

From 5335a611a003765e753ae93917618684aa6ad660 Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Fri, 20 Aug 2010 01:49:46 -0400
Subject: [PATCH 38/41] Use Aristo icons for CPAlert.

---
 .../Themes/Aristo/Resources/alert-error.png   | Bin 0 -> 1738 bytes
 AppKit/Themes/Aristo/Resources/alert-info.png | Bin 0 -> 2472 bytes
 .../Themes/Aristo/Resources/alert-warning.png | Bin 0 -> 2126 bytes
 .../Themes/Aristo/Resources/dialog-error.png  | Bin 1656 -> 0 bytes
 .../Aristo/Resources/dialog-icons-LICENSE     |  58 ------------------
 .../Aristo/Resources/dialog-information.png   | Bin 1899 -> 0 bytes
 .../Aristo/Resources/dialog-warning.png       | Bin 1399 -> 0 bytes
 AppKit/Themes/Aristo/ThemeDescriptors.j       |  10 +--
 8 files changed, 6 insertions(+), 62 deletions(-)
 create mode 100644 AppKit/Themes/Aristo/Resources/alert-error.png
 create mode 100644 AppKit/Themes/Aristo/Resources/alert-info.png
 create mode 100644 AppKit/Themes/Aristo/Resources/alert-warning.png
 delete mode 100644 AppKit/Themes/Aristo/Resources/dialog-error.png
 delete mode 100644 AppKit/Themes/Aristo/Resources/dialog-icons-LICENSE
 delete mode 100644 AppKit/Themes/Aristo/Resources/dialog-information.png
 delete mode 100644 AppKit/Themes/Aristo/Resources/dialog-warning.png

diff --git a/AppKit/Themes/Aristo/Resources/alert-error.png b/AppKit/Themes/Aristo/Resources/alert-error.png
new file mode 100644
index 0000000000000000000000000000000000000000..edded831068734ab20d818bc615ba5a2aa3d013d
GIT binary patch
literal 1738
zcmV;*1~vJKP)<h;3K|Lk000e1NJLTq001=r001rs1^@s6i1$$_0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&Y)M2xRCwCdSzT-tRTMruJG<NMw)Agj
zTMWtqLQ5&p7kMGkL?3wZg~UXkOiX;x1SJqcjE31vl@}$};1dbacV2wJm=GV-m>7Se
zh%Kd5pg+*kA4-2_w!1sOo-;GsZky81+&hqXlassK?w<2~_k8Efy?0}d<G@BE7K_1F
zW2kF;^`(ra0RJeU^#=WL=Z(n?|1R<%@Yh3betwUV?cM>RfD2*U;T;JAn6?8C2Ja~g
zf8T~M#3Cn!@a2|+NJ!cSvEjR*>jty0crpQ5sR<nPH{Z`kjG0vbz7Dy$XO|*L4d6`A
zfl(~4q>g1+u?mQ~36j(T4*GrAe}|bE6RB%^JLHz0-AYbs1bcQ4%wmO$P*ux@Rszwn
zAt$vWvE9lXBeBq=uI_D@TYK_Kt}O#5X2@KQfY2&4(A6@C)*R%rl(D?>U|=LPu~4M`
ze70R~JFp80HGnbuFk(Wh8Pie9qVv!rhVf=Y5(`Y~k3BiLts67cngM<0F%hcGm{!I{
z>JhUs?(Fs8!~&7}b$3qA?$0ajt@SP;BLpF8)i>vhFte;fu09E!Eg7%%2PEbovG!~;
zI2eC=a5NAxVXF`PvP+VsuANG*r5-9X^H8A`v}{~OCy-rTGQd3gCUl*@=+1vF8iBt{
zaVQ?erTB!yb{rWE>`fMR(@g!G&&s*Zol1MNN609Jmt6MPY1sSP8xW7j;pxLK!oT@E
z*k7FsB}H!`=b^m~GlqEX4{e^Y*rT>dKjkI)sjg>~4wQ>Nw*Y#Ht%g#UeuPFza!Fa1
z1;vF0C>=c<zRYmjmQ1H0iNvN*&XYsqg_lNWdqc?&)2nR9Cwv*ZT%{OJa<!I7BtR5J
z+zAQp94Frleq1Rc4#GpY2w!OVS(p`PaTy&|z~Sg}<(VmH$Y$5PCy=aN(MCLVh|6NB
zDGR@&FPFhY$?%NQ7`Ec>o>fxgBVe&?dTR#ZvK#=WOjRYvGpwmeH`8>Kp}8`82Lw)^
zgo`m#4z8$YTmUdLRr%6v-5bYe59dM=E@o1+A{L)i;O^KOQVz+F)2GFrsnssUGlaXN
zYe>Z=#`&}FW{RbzT<O`|MQz=m086j9tzFkN(5I)kcZMD=X8C!>sTEin8G+P+9#FAK
zaQkyzGS-wy-OsjN;~m<_9msYc0PXgzNc@oxleMOz=zcURBOV!jY$OtY7IRHS)%~bJ
z3|s^CpR4X1g+GhuITc0sqp@)1JJ+HbHuH1JhDf^K;}{+;R{2FxQwI7OE*YR9kPPnB
zJJShB#9|TD6s!C!&v?eIWIc3$@*zn3_rrtXVHi03F?1WtoO?f>Z4#|0n#HkGKPW5k
z-0R-ScjpU-Al=jiOUK_~zsaS;CSlry)FTgxi?-7@rj<ZQq>z`ucCbV1JaPom=`_^U
z)w%P&mtSG_MK}l#;UavYN%b!4h5m)bzDdL6B32o^?yfGKd}%KIdy|V0;UQdvkL5N=
zJzFvg0}D$?%z#)j=}FP=h(T@W<Z+n({))SqrTNCOcSHN2xD=mo5FWyHHl0vIU%b@(
zKGk?Sl~B63HJs>(3t*PZTs6j0Ln2Cd3VZnAlGgWW#VGXFd4$fCbmq%Ul^mT~RKaR&
zII%sM0{aOOb7hP1CJYO1s9N7S-7FMRqH1k%XA<<<StW-jmo%`S5U~|PrtK2?+%OAg
zlA;>qu_=Uzqmtw6s@gY!QV>$uJh1qyx1~`U`6d4phvHG(j}mcp{pYxUAgB`i!mtYO
zX)4&6$CI&@3{edgwZ1P6yYN9mP%Q|)2@n|KsuXBI)A}atXfw8wA@ocBDb8t8a3!~q
z@pQkHKdrN-x8s7`lgYflgLWXC8KVrvvCG}V*8|1k`HPlKSIUd-4W@6W;=&rRpP3f7
z{D?@x{|;Fk17A3*X^n?6nYX$c8$mEl_WhhF!jP`R@5SQR-`LIt@{g9GLpbe=y~B90
ztKu-E=(8!bI^VXTwIYDalUh+~g5s;Xk08upMerRby|jG$o8w%@ms$T`OLVF0TgeXS
zT8yB!O9<o=&Oi7ooAy^Z@JWJvpcT<({ns03GvJ+mn3@vS$uH#-Ncan#^5;az24ws4
zqC{8x+3?9#YUQ_H1dqhd(I|u(i`C3k3w(u9V|LAK*SxQ_ElG(C!D~svChwW<XtsFI
gC%^ym_)mZV0Ih5QjPIpM7XSbN07*qoM6N<$f;yg4QUCw|

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/alert-info.png b/AppKit/Themes/Aristo/Resources/alert-info.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ebf637898b8c2068c0de261b06fec204869da31
GIT binary patch
literal 2472
zcmV;Z30L-sP)<h;3K|Lk000e1NJLTq001=r001rs1^@s6i1$$_0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU*N=ZaPRCwCdT5D_^R~0_9vokxp>&JTi
z_9k``=S7^*H130{K`Ct{qNuG%g;bP6p$ZC$5>X*lzz;-Kel$YrgMuKHf}oHlBDAQL
zN+_hDCMdK@MVp5p&dc%IvAy1>_ciZ3Gn_k_HLkJao!Lz!j&ywQ%<R2$zIz_`+%sk@
z%YwPYFbph2PanPji%<-Ci^Cg`mm_!0dOqgxS>%(*r;w+hN_ypqbu<0>WT)f@mt<Pz
ze7AYzoygw^3*45jmJoDA!q6BDfDqt-_p`PDbg>kj^r{-^ElSGfR9@VdoR&aR$)9oT
zYsg2T4&)k?W&RJS-N-*&9czj8b+$k#6aY~%K-3IKi6*Fd35aO{T~ulSoZkll)(1g8
z2>r1ze0GH&ilVeFJ~h4VTB5KY=Xw_T&}{`}8b+nN68U#)ds_$lx}so!4>FPtrRgGS
z!?b}A#BXA2&ax680%P$H;sOra0Ox}y!4E5zbilH%=<?A-?zdMaa=Y-SPda9L8$jLA
z)HdY9gKL&Vqmf3K$SY7(2*{c_qm>26Ba=`0FF;<@AzjqaTv_OgwL>__Z~5f%<Y|2T
z81jd=0hF;1o1ff&M?b6M@S#KrWYw_2cqM|$m(g5{G6Q*uKsWm1-Je<7b^71&6ZrUB
zj=$X+P`h6J@cV0)w(ak1Ye7>pAX6-XhBjtdP!~d6pcB-%szXPU0Gsbv$tTjeUthkS
z4&vhjbqDp-&rj`K-rcglE!qrYXl?~jLjg><6-3Z)ClH+2z(W@<;KlgV&m8|cRyR;z
z|LKW!ra^w$7Hxre4gr-_Fsd{+g9;cQgM2mzk=7{0mh}S5vWt$B4bxsUYMOVi?`Kb+
zy?6*6a1bAjEH>7+*blz?^50m4kR$6?^#;>ua=D@mnoewCtKrd$7hz*mg}qy2b{iiW
zs(P%d>5$2bkW(!fSh=(X<)|vuGmB*uJ74(Ao>hI_zu+USFqJ9c%DFSSje!(w|6D)t
zJP(?t!Mmr2;f&JZY7UNLp{K18im4>TCsI!wdFG2pZkAEp6x8EC{u7TQNABFTp=UBH
zfr1X~mY(^1BgDGeQ7{e&`bjFCh3DVTyPhW$<e{^PhqLD{Tt)%c9sS;R!&90>bnVII
zy*)kCxR1z+YHy^jg$ac~5Crh~e6}z7`G9R&Zb_7IFBCZF?uf1)pGxn*TW@*_6llZW
z6q=eLl`n&?>z*Q6uB1XwCo^LK^x80p>v`xpOrsoakqD5n@!g(4J^JkLdjkT0FJ?X<
z%j$ymyBJO8L>O?ASvp4o6IenFPjiWe0!<A9rd`&9C|{JWnJZ94Q@1yDc0j3wLU_~?
zrA$$=Q!8qIw4FeZXaSz*E1*2Btu1VFD)|szzTplO(eGyi0+eLM-VD7`BCk~PMY~O5
zj#tZkqNHMO7^eQd#Wg6*#@84Y1DdLOa_kvRm6;jSwLz8inlz;$3x3X)&$Uk(hPgr`
zmc6%FH6(Y*GJHx?>9THzcCSR|AVH2UbiZp*rb!~yOmyPipKMK)h@BY(gFz@`z{!@C
zn&x9n24yl(Q>4iisLgv`VNt!TrqyODw#I2DI+cf}#s;{a%-1|0jiPj+aa-VA<$k9Q
zJZ)gaLne0kt(C8*3pesW1XqvwbPaRQo0!nTKBem=qUjNOe79;mFpZ^4HmFJ5qiWR@
z-5Lyy`lViU4T=!;D$(V;X!WR;=tt>VMurQcX&6r9o@dks%Fp;wQ*`fCM_hx_HT9~l
zA}EusDO%a)Je07x9z->zsTxfVuDA!K$fxB}{wuyvv}Tj3D`B=T6?32|(g&_VDaG`=
z#p&jkBjHv&<(i)Tiuz<BF$t)3;4njJ?v8=4ij(g`k&p2)kWVKJF+2WO*P!AjUcb8P
zk?))}HF+Z~V0!f{lAVIR53h%nOWI*%G7ATfodd4D$D2R-{Xpb05LNm6_y>QO@^bVr
zbh&g$%BMH_!finJEHB#H^XMjcZ0n$X^1TPMljepHym<VYCoS<j3+3!2Xj0*jQ$loK
zqsR>X<5&5_Xv$|%K&E{Ta?4xqTMyA_6e4&IqU{6suJbex9^O&y3KY^4!^yM9-|$>`
zDNhU)RH^WiG@Z0nZ#rh^hDTCmTT662ZLen~*K<${q2tBe6lh}p1tm98uBAj~WzHQx
z0BqoEQGZ~7^#xrgxIa343Ijv{9^AAN-aj)8&%JgMqp9J_>^RKIjdBhOsp}t2o;vcI
znyX2aqU*PA4zw<PFS=}lK+D7AHidW_5QcEUZ$UQxuacaOKajt0;**&b_fk!ot<l!I
zc6_@zw)#b`u^kkR%$UWk1Vjrpp@1K<Bj*hwPVdT{dFOQ}N4_a2U)7QMpKraIAHTF;
zEhHh}_u<aY+SMgIch#Ngyex}8h})TzOMosFet>|Ew%xb0D!X;_fk4WA{Pyz(d06xX
z#-5Az4X_rPhN`M{)fi2KXh30288Y!9-BiloEu24gu;re|m1_4&#_cy>q;SL9hrYyy
zBL^a}RgG4l85HG49ikR+^qmwCtr3DejakTWij=dv#Y-pNYaaZvG*fu__`j90x_$F)
zymN<GI`h_>Lf_!EoIwsYwD%4OP3@qYemgR{1y}JMJM04iEjI>YX5u3)JGxgLKX)GA
zr<ta^Y^EAbF%HkYrVG*<T>XWod|YT>xP3_{-_!w?U$6_G)Kn<IxgaYVp+M}4E$%;z
zE`nN2gOr&VH#PAk`N~Q9K|AXN1<T<X1y!!SMnA?0CKYDq^y!g0!mxa|zhm_yOd!0C
z6B-8i#wY|D+W@bD;ez-}e&*{uCT?KqGFU1CDP@qecuPEEspaE(^3oqM1Ex70Jpk$s
zDAVEDee(t;Z=igRMk>rXO#AfT4A23fnQmps?X+e5LO;U^YcUn?!-=A}reS<PKWlmw
z?~5o>4ootN054cX8*!?wY2<0@I`p96RK$n_P<Q$jHtXh73uPX*u$Wm{M43dUFP)@X
zL~fY#9x9xOoOggEoolUbdt4pNk7@z60RcyIAsSDddm-l@JEy=zwIDfQN={#K7N!F5
zmYLtp0!76<nOR_&S!P-R&dwQcIRaLMteBNGOL%M6(ZY40@K<SC^NnU^rz~^s&)1)C
m-ue1a#eMhY_y11+5nuq;%Zs^R-R<fC0000<MNUMnLSTX+^Qlh&

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/alert-warning.png b/AppKit/Themes/Aristo/Resources/alert-warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5e480421adb09430d0bcf4bcc5db971728aee59
GIT binary patch
literal 2126
zcmV-U2(kBxP)<h;3K|Lk000e1NJLTq001=r001rs1^@s6i1$$_0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU(@JU2LRCwCdSzBx)R~i1s*Tf#*;yAwB
z*|oRXY_glBQK=x6KolgDJOPSC7YQLm5r`MGm8g(Gm5}<Br$~7y2=)OXAyJhFREnTl
zv8v#4p;c+wt+FJIooutt)wh}P%$(t$ak5><c49luW^<%Z<1?Of{_~&z{NMS`42LFV
z_2#QMfig+>kRafMi>293P1Aa5<8y?+SzSS1F0NPU_blO0C+U>wgePr)@TPC<tNhSs
zzX|`<ui2>nIwAeoozf%K3#g2}>KdLLaD@ES>k9h(eQ;m+yp1t7-zyu<aFWaKDhIsi
zJ|6?vd(c<`9Or~9k%F|DoEA1do}p*{{P-f(129cn@Qpre26qpdvP3uTLsM7i&yV1Y
zC-nd4={cL$BYTgcc~0q(Iv%d^;q(+AqZE=?sV)*&?W%l&{y`b;#CVF9;Y&TR)qs=8
zDV_#9$HyY%K$fCZq$sh6(3CPcnuTjPs2j@A^U+@C)JZs%@tnIHv3p81_&hlx*Et2I
zK$ACNu|9zB!qZM7les6|sWjobClvy!IWV<C_gEtsEyL;>JSiXgec>0V&2x{zsqR35
zm>;+}X)|f76re35D)mv?hf4o%1JW|F;jn&df!dpUl~%os)Qn>&G3`k@i4U@XDjI`t
z4GEfbAN-I8cXD)s+JFB^TYj{mYV+<S?McEC<;?Ehz}cZNNJLzQCmE!w_KHq2C*~CG
zAss;>YWAKVOF2CvSe5o8RwbxyK&Iy(z-G<En;H*NUztvAH$yKJMU-~Dj5iseD3NlI
z%lfo@IzddsAKzNXa!$l>tPfwG4#H&OKDEV&OoV0l&rf1&QM*pJenVJ1Rh3RN^RwWk
zNvD;xohlK9YjWNHzkA~o{QCE+59<{{#kao^s_&z^1+#Stfw8A;>+j#5=Qzxqrl2+S
zoj=LbZ0qD8HRR1dZ;N$(8})<vrB=ZzISfQ?;6ur2oper(C}?RdgswbehH#h0wL?ou
zX~-Lnv)1*k*Bf(7A&Mt*soaGx5!L(ERlMyqoVw<TUzqX@Nl?pcB#9_Ws@i~o0Z07-
zORqP14oVfOunwNj!=D;Yk<xgnx9rEXqrj`GHs_1eIjOuzX;f-S+wq9Au5Y8>isEG=
zjWUr&g4gwLhU`S!7)t}XjZ`M^)a8iNmV+X0(2+uJN!!t2Js0WqmK0C@DB>op?0*Pd
zy4tla?8YfW-wh30Y1w^j%<f^zA?T}T(ujTtK1^vSBK4cYP(lGe*qtuy*eN}UBjZ<W
zX7L`FNXe}#hpLA75DqxSj!+t;3&jFZya#_xX^<||%so&PtQBV5;plWAT!B)gy+>|N
z4v!+}6kxT~%;?u3FCN)OCk>^%4xe`u1Lsl`WcNFVjHv;gM9R>2g9$HKfubZ8n^O2e
z(C842x@-BQU#Z@Xgkse)*`W=YR0!GqMJKwjZKrgK4PHp6JdXQND;qSU@)0V09|~fj
zexqOGY8*$}Xh;34!ZsYH6@*685v_JgK8907iw8hEA~M0aiDoYcttuR;!0YlVY_HL|
ze(j*0CKG8CRuN7ZW4caAHyK+4+EVGH!snvnX{W8a1i7+(D1|qr^}rsT2hdSFjYvol
z3NTle5WAeVskHptQR(e0zpK2@^FlNx5IL+9IaE8EZ5@*%R{Z40pTRSuwvO9Eks%k>
z5e^sOjRf1$g-5D%`nfQaBy!kZq+BZ2)_aE~WZ%W~gb7-aqAYjbo{1&0zl>mF6k9n>
zSMhJt?P|9w{n}tMG!-1!gj(D%sJ1<FsD~yJlWkBgN|mnK>(Nq6oAC8femxaGQWqW;
zDWXu!h2j>dJ2^U42(`Bwr&Lr)1h=z>NZgCnJIK)Rf2)6W>NHZB*u`kX&1IpKc59nr
zr};pTB!=s+NqGKc0Y6$0QLeDA`qAwxr2=eX7Rk%8Lv>**rwn};OA3&8?;F%gRMZvT
zepkhNOSR+uovenx+*Z5p%TOA->!kE|;0btI>cSRB56qvN2;0nsEQ!lf*HO~p^4A|d
zc)zpjzV!T3E0mwxS%ioCTfQ$eA9U!}uU?$-N4>A4&lOP3>l>|ftT&6vqyuHEi<Y5=
zsb@X-))&a6P(IchQ;mqjGiZgt214Z>IxYk6*PX5(t^EC$-=iZmKD_eWV9Hay19^M9
zHbciLWWkb%!Q|$_N+g7rv&SbK;&iLmi?ZV){`Jn*8dXQ=ZmH?pB>mG$d~_(~x2-|i
z+&fkrx6t^N<(1x2A@!*i3vfHKNQ@>UEC0=B=<ZJ&B6ah%??!0??@oQi=``m*f>J1+
zDuuTbEi><cDKdh0{wnAj@!0<R!hNFP6h(Xa{FOncU05aR+*1z5hq5OW25D4aCc&GY
z7_`y&fByUrZg6@W^ySBmjm?@QSsCN|1ybP!N<^jho$*O8G)|Sq>vok;Rg_D*A7B3A
z4Q830oi!~l=liqk-ghI5+Lt^LI~)!t&Pq{Cb}TLKVl`j+x5KgBPyPs&d_HfsSeWa^
z&D@*04e!V;m-UM#uK&z<MGH#YE<O0it^e%4VX^eN$e-#%_Osa?<+pC{+)!ls540<r
z&WckU$1#i5T<&)`ceuTju>=AEm6l)8%4w^PK7PyWti8E8Lr#(4;Z$M>K~}h8EEZ6?
zeWKv`6^qH_HQDVFhci|r$*wWB!%C%u^1%nMv;PY)05`tYWuFqIsQ>@~07*qoM6N<$
Eg4B2;t^fc4

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/dialog-error.png b/AppKit/Themes/Aristo/Resources/dialog-error.png
deleted file mode 100644
index aa4ae750980f97cff34495d166e36fab1ba242a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1656
zcmV-;28a2HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&8c9S!R9M5sms@OHM;XU|Gw1Bp>veYB
zwVmRms*4jly(mdVQISA|m)<CbhFYSkP~La~scHoeJRl+Qh7cF^p}d6$qL!i{H8QPu
zKnMz@A!=(ob`qscf-5_lwH>c_&+gehXJ-1a=WNdLHRgqpKF!g8M&I}UF6WyWVT|Gb
zIcxwS#I76PhGH9@N!s=cNO@Q*)vvVfv7~e?DVL4b^PW;?1WbJ$ZttcqbX*u?b|ml?
zjM|p<YYks54G!x44<5<p_79ON6iN2=(yp%KuCC%N-DK(FT%%GhTf&&Xc*eXm0ayQL
z0&hSvC*`kzQ=dP6EP4NvPe{x6V0jfB2U>0LJ+KpyN<dE!^cPUJ&Bs&k=uf6+S{QSB
zLF*rU54=4Qn1T{QymQaM!1yEIeKDO>K3uy2O?R^=8^5y|xNn%YCHd%gzjs$F%NMmV
zPd*FFcSYbF6oe2nBje+Pho3)bbNMo?t?y_wR2D1eeSL6vge!0U$-gmw`KDvcLz7V5
zk-!^Z^$PLNk+HGkqbI*<Gdl-vYqOVuf-UhVk#q|2;3yxTJ?H)R(v|ZyW4<y8DoQ{`
zN#~{fS*gGH@aXg3vdzpKCNORQZA?tMctlh%clS44)bu4rPJSa%=r114N%_-_DeOkz
zkFY-{<@|}4zTYPo7Gb@%DYRR8X*T3_(;j0WpTi6f@~_|gcCDrL*aVa}MIbBXFAg0U
z&&jrjuC8~z)Z0ktr3oUUjJdNO;3mY@>j>ZH;Mk#DQp%r4BOrs^_i1A$?tS(tOWj!5
z*6^lOMAyR91i0EjL|tFx-lx81D`TFUf_#iX2A=6J7L-s5-D<}TN4(Tqc-h5;=tv~|
zA*Q56wLOH8^yPcC2T#NZB!u|R;OGN6wX%kZDAA!3DKS!Z6`BCkmW8n_jFgxNu7dqt
z32^`RI{hODbG8sK#LfZ(W7&fT(2Yh{5kkQ0ug5DkkiCrN<YcFqg+Mo3WInea@!`es
z7y%8X<Uk2iUg<CnA|UU=fH4NGb@y8cft0e_TS9#R+Ve^D@54YTmI7@|E>SF?mFk2x
z2;FW&YmHK>TWBE(r4+vJqqXkTN>~fVkm$>yjp>aMkV4ekj)P7l@8o+I0!pc_=Q|N>
zT)2R@veK!QL;|;5K?qTc-v{7Uvr_5nNhi^*)~-r-GaMt@XyDJzBC=T$_YdP54*``J
z0pL>o>b23HV@EMHr&EA{d+Jmtw8r3<%XrtXV;ra3;mj6YG1@(2xZ_~C4vqCX8s=gI
zd}Gd(XXj3ozHlrTE1G&8RjJ@FE_VKqZCdR{Y$L&NO%4^QUcOe-#+-=}aA9h_R=3&<
zpWyvx9%DeaS{T>e(#yN?K1RqGWHyCKNF29icW!u*BAkS(5aR68zo&h9-w<B4igMlV
z>83ZdU=?Y#8(VXTtMGgX@Wi15l;5BCrQr_~P>T@&aJ7DAX|Y^4`7EN4zhf+N(5P+B
z0tI)B1q7qSWg!RIBrCU8>puK&(_sW~5|$9+wX1)9zma-$43kdo>b=_LjEJt8Op46$
zQ5OC_?MNYBoq+O|1OVz<|JZ4|)1Ut1126sf!<bBJQ)svHJ{GNr_heJ_eDN@g@6NQ{
zR{O)c)<4<yLK2R%u+N6sVyQ4N{N-Z_=fWlY<!Zd(wy5xp7ZSVFN6*m*SbBHXtF2U*
zn()Z3cf!b9;2r^QXENy{2TwejF%6gI#p@`ix$SQliq)GXGd7IKB>D7jA2mI<J=2D#
zpM#Y>y$fE0#1OnHg?O<rSWFE(c0}T~Xx&`JUvtoI3+*XLSjcn=t1nApsDMmb+&X{7
zuim=twc+$>c=;`8?B!h`fE>^R<h~7K6Y!%vJeJO+RDP(KN%!Zmd$ZU*X*{P%tJ<Kw
zy3X3o+fC1HS!;0qP59+GxB}DxCo=C!AR7?qjm`&P=xKQTD10doLn+AFko3WGp}q!{
z58%B&!}-NdrPt~F@8Mjd^JY|clY%Urds`TZY%pg6NdZZ~3R17=JilC^Nhjo?gobOO
z@x44w1&{~~W`J~HI2qtJ;716wfmUGH4KTIS<McDJmtWYW;IR<^0000<MNUMnLSTYp
C^(`R)

diff --git a/AppKit/Themes/Aristo/Resources/dialog-icons-LICENSE b/AppKit/Themes/Aristo/Resources/dialog-icons-LICENSE
deleted file mode 100644
index 4fa7dc4fb..000000000
--- a/AppKit/Themes/Aristo/Resources/dialog-icons-LICENSE
+++ /dev/null
@@ -1,58 +0,0 @@
-These graphics come from the Tango Desktop Project (http://tango.freedesktop.org/Tango_Desktop_Project).
-They are released under the Creative Commons Attribution Share-Alike license, full text below.
-
-
-(license available from CC here: http://creativecommons.org/licenses/by-sa/2.5/)
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-"Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License.
-"Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License.
-"Licensor" means the individual or entity that offers the Work under the terms of this License.
-"Original Author" means the individual or entity who created the Work.
-"Work" means the copyrightable work of authorship offered under the terms of this License.
-"You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-"License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works;
-to create and reproduce Derivative Works;
-to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works;
-to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works.
-For the avoidance of doubt, where the work is a musical composition:
-
-Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work.
-Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights society or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions).
-Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions).
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any credit as required by clause 4(c), as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any credit as required by clause 4(c), as requested.
-You may distribute, publicly display, publicly perform, or publicly digitally perform a Derivative Work only under the terms of this License, a later version of this License with the same License Elements as this License, or a Creative Commons iCommons license that contains the same License Elements as this License (e.g. Attribution-ShareAlike 2.5 Japan). You must include a copy of, or the Uniform Resource Identifier for, this License or other license specified in the previous sentence with every copy or phonorecord of each Derivative Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Derivative Works that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder, and You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Derivative Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Derivative Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Derivative Work itself to be made subject to the terms of this License.
-If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for attribution in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit.
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-8. Miscellaneous
-
-Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
diff --git a/AppKit/Themes/Aristo/Resources/dialog-information.png b/AppKit/Themes/Aristo/Resources/dialog-information.png
deleted file mode 100644
index cbaf6dbc4c48719a07c51564139064d9c5d7ebe9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1899
zcmV-x2bB1UP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU(4M{{nR9M5smuqYl#}&u_=gjWjm#^(>
z<0s}3I|N*)5f24H)zGS>q%V;)vRVQKmr~SLRhzU@)i0Iu0irfiN}_ydYZ4Syl~S-s
zA0jm+rU@v`gAkGsuuW_*U}IlD?)81{-PzalLoX_IYw%4Ib)~;{G`pJrZ_b>VJxfX{
z{68;kwg*J?AARkQJQ9lJu!Ti%tAbh!&#eLg2rWsVGrng%pD)9oy7uoc%r@@K3Day5
zm<h0J_mB60#n0;&FE^T6+9LIJbqI$IXiV@u2UAm17#eur9O`>lD$o7t!DpW6{73-W
z+aEQeF{`V*y7qHz8@5ECmmxl#M>221aczKn=o-)v3!}9uhKLUQ_2?hX`0&-9>~yfb
ztLstwRsh;<mWZM;*)?zR^35yO+#9$&UVx{jvAABxC!5Pr5z&2J2;Z_@mCD=xU_7Z@
zM~U{YZw>dHc=^7*v!}ZN+z(*ZM7w1Kc76LN--*^OexmJD4}=Fs3us-ap`|ehO~7X&
zj|d(SeC0!VN<k@wvzHT2D(8s%*EL5Dbsdo-AN2m{;DN_~JzE5LHnNV6hbtj?@6t72
z3}230xO-_3cg_z&6Y!YHW`a!wn~5YbNhXp+kgW?Ueb4hUC*B**Jovzt0BO9pqvPSq
z*?eXNV1u{SEL<6uzK+IfLTyX~0WL^6L}ardDTpK!q##(Dpn_ns!iFX*%K~P$V5hRu
zm1{TL6J~?Al?(t5?5tb3ER@VySX6Johwl+9hd?$#*+h_n$ztXL3$ln{X@X55s1VRO
z7c@A3C7wyIUA<ZZ8#_xr2jF`xWzkBE#PbN~0RZGek;4L#iEKe^6DyZN4glY0Qp#75
zj^{B^I%sI2R9@2jnx+~kueoFZrM#%7Yw(mr!S?K+t~o@o31l;qWQP1F1i1it8sIz1
zr&P|F3<iW^BER5xFmyr6_oJnsgsf$tWHqyk;mN#J88JM7Z6Zh}vKV9uCP~Z=6I|sh
zKT&WdY}b`RjYCAFh)5{FXQq6~IY1;XWHSj=MGbp0WtoYzl?5OPBn4A}1qwotsWEc4
z>y1rh3h!I4d;PBYv8te<<$}zGhN`fZOlK`-ZLnkj&nx_DWZ>QGqMC9~Xk=fR%1^Jn
zBi0l$NF=k?Xgcd$n##$(@#(^uoayxHf)f!r@%h~N;1>eAW*P>Ych<)m-g^7(ysMn&
zO9puE!2Uyt(V^i&deUD~UnvBWJ(e`%i)x~cYg%IWHdOGcDBI1tn_8-Ssr3<+-quiC
zy~6R;<$ytEOKohSfEPX4^OC3g+254D4FN@t+;XPp4^nrt!Is*}$eF=JuW5UU-fO8p
zgH>i;MYv^Qef9e4%4n+qO+#q!L~8EnY^thQS`{@`KK;~_Lb~40&dyHrLmkBcuw(ZR
z+d@X@Zx8PHmZ|i};QXq9A|c{t!M+d)Y183=$QVL5b#hja2>KbzMKoZ1Z{NPh^h`Sa
z-Gc{ydE{0fBfee1@Y`peI_EgnH(q=BCB3>l6pJUVYtl@`n3Ssvwhf`1#Eu*o=&N=-
z`(jx@U((mxTS%v}oioi#U4nl_!>2dLM@K5cx(K<-vqrCvWfSA0)x_+wp`2Gw^fZo+
zjSU)_o)g6NSFa9}f_ru@W6ufT*=P4BUDrQ%edIdLD+@N8cCO;Rw@!R{=z~|c4xI1V
zd7<~Uhng2f4FbgkaqAmzyk222UjLs;vYD533VU8S^t)5v+`VIQQ*E^|IjqB$=})i%
z?piV*(TeD29Xqd%zIc4ZcI>VLollO<DY|nl$pB#6j;|c8h_!y{GaEOewRI`VqY((9
zfeA<?C-IjTkE6G@@5)5nSk~SBw46&xHs=TcKwZuBr#Ids;VZ`B!@oyjG6To;P*xUz
zuGyGQUb2%@{a$x>pPcKMB>{|H&x!LF`q9zxRjl7|HyqbPaw>)KcpOSu=<iJ!sp()#
zDPwXeFMFQ**yMzXS6=x$jDUeytO897YSFT!38zlIi3@#~;5g2qj}1Tw+P7-e0<^b(
zADYks0JiO-zyBKA+S;(ZwFRM&{<V({KuX^n92`S;_g<Vk_YTI#CowsdMD@HVhOP{u
z|Kerj^VZP1byej6#7DIYw4(G48x|}pFAwd}^}s`b3Jbwd%7;=6r9?t0^Z4o0@t;jh
zq_Y4#01g1Rcz6EWF1Q_lQIvjDJF;ohrd<sU4L{hveR}`^jvP56FJ8QO@Z`yphXI&H
z<p4+kcG27hAk_@RTLI8brZ*G-5Df-{vCW$|KOPQ;R|7ykpFe->*s)*Oww(r$FPi6y
z?HlGc0IL)L0HB*@uNS4=fN5-Otnqzc#N+Wa0KaG^i*k#y0azb)3I46Cn6z3k!T2Vj
l2yjDgF$a9i_${01_YXwLbU*)u?alxI002ovPDHLkV1i{hj!^&r

diff --git a/AppKit/Themes/Aristo/Resources/dialog-warning.png b/AppKit/Themes/Aristo/Resources/dialog-warning.png
deleted file mode 100644
index 47d84e49d3ce9dd4ecc09856fba2a27325dedbac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1399
zcmV--1&I2IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%8A(JzR9M5sS8HffR~-M{bMH;=O=1$8
zHfp+>ki`0G#1LCVYt=U3qabyHld827KeUCyR1~L`>fFXYh;;knm%W+$&@W{Q;sc*3
zC?bMITEQn`9|&`4+BI#=&Hm@sW?5{v*#|xF=bU@aJ@^0nzkcT)A(>2KDjUO8xAAzO
z84!;E(s*=_*#qAJd;5VuJV5kE;MiEdBXAUgAiUQmQdn+uIDQLNR*Fa@aQD=ycq|gB
z{uuam(mlZ4PJo*hZQaU}4;}!I9${fcg+w1Z{taN9^d#&BsvN<f$0CYC^vV@PFI|Ey
zD@(BY{SFIIH>m)~dQ}v~ukzQfm3q#c0n5$?NTTP@V_rCHV1jV;2f#jQ0R9B(XB8Ju
zm%F<$K(1E~9)x=IC}M4GPzDCz3<QjnO`lE*fK$M9QBe;2SFe_P&Yp!>Pyo5S9ENZh
z(vl^JUc3ljaj}6((kI^oc@qv`5NOCND>G`8c=66oDEs$AU_;y00|zkp@+HKM4!A-g
zfo8v)PypN_qs><DDJ+zu7cM|vxf1fSWqSE?k%K`P)~!SI+BLX?L7Ay)CFMe3!T@lK
zJZshngST!W5sgCGw=cyV!@Y?-!q>F+cDM@*HQIAxLI8XV6sR+1RJ!u>rQWMoVW_Bp
zG=DzvPXawXJ%~gi&@>IA+YNR5cJ$r84VT|9Nj6(4d9HNa0Ep;M_{z(ZF{*jaT<Y%K
z`g|wlL6BU}g^#%>O!f6hiX!6o?!jAB#P>GQNh6FI08ws<#p^B0b~r?CnQ_MsFqcbL
zW;UBs@9{C8V-5$*b#>@(ZAErg7Be`V^XMBNjR`<f53lg`-1Y0xM~Np`EKq7{QZdg2
zFq{vjUAw??auB<F7rszPr)VND!+Qhx3HZ>yXi>nTX{`VLeHd$N!R+>wB2`sEtf-5k
zD5;8ICKJqi_hR7jW7rrI%(G`Z`+(Z_0&s*v&qVQfemKl}&z;lVu2fZ}l%z7BlyOO)
z*S)ZLGvv8*(NA9R1_H9k*k`{0*8dH_4eW9*U7Blr^-36c@&xLhJz!*IdfD;bYPIT;
z35?hf)`kYeySkuKmDs#qB{2#`zXRZB3Mo<U7v7Q*nIAIJf(1~h^fHy}mS%V$eN82b
zHZEU|7=_O>XO2OT<vkSE-2Vii(VtFkNy#)ugc7Gi$3!#>qTEacyq!LMT9?ca42!+7
zQ70#fC_2aQ=ZXFKzXBlQ$T8S#2i&2M%+Gn5ERa{M7*RRztE;O~^)@%s*N4TpcrnZy
zH)7!7L*%+#1`1;pmF2=w0f@li*=1#tcIOTfy}i2iqgkh)0kTZaVIwLZp0gi1q!XC%
z{5fX%{p8?(QZ!4m-b=($H_PXfdvDx;al;14fxxKNb7^jFMoUY}sLHt*JRVqg?!@5J
zr<iH8NwUQf<^-3<v?=S4c~-4T#&6z)7K=gIv<XD^JZ?iDB}pHrWJsI7HrhLuEn5&d
zc@o;QXK>}^C113)9jDid(g85qSnl-sr0C_#`b2~dmWghO*RNsE%M+ggA>tZd*Rf#$
zrZ+%W=k@E;KG?R6F^Vk(4oN!k=%~|seaw4$#@pxg@jGjobJTOscD;DPuR^~Q0HG0o
z-wVw2J6jr})0dLMiAih(=T$3E(*&F$-SPB`2`BpL^MIL@4~jO9E7u6M{)QV%K8dvh
z9W?GH>DP5<+>A)K9vdSj_TtLRFAn|JQWrgEQvjy2{RM~kz?_asK|cTh002ovPDHLk
FV1id7oK64$

diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 6a5554b7f..8feeda898 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -1306,12 +1306,13 @@ var themedButtonValues = nil,
 {
     var alert = [CPAlert new],
         size = CGSizeMake(400.0, 110.0),
-        inset =  CGInsetMake(10, 15, 15, 55),
+        inset =  CGInsetMake(15, 15, 15, 80),
+        imageOffset = CGPointMake(15, 18),
         messageFont = [CPFont boldSystemFontOfSize:13.0],
         informativeFont = [CPFont systemFontOfSize:12.0],
-        informationIcon = PatternImage("dialog-information.png", 32.0, 32.0),
-        warningIcon = PatternImage("dialog-warning.png", 32.0, 32.0),
-        errorIcon = PatternImage("dialog-error.png", 32.0, 32.0);
+        informationIcon = PatternImage("alert-info.png", 53.0, 46.0),
+        warningIcon = PatternImage("alert-warning.png", 53.0, 46.0),
+        errorIcon = PatternImage("alert-error.png", 53.0, 46.0);
 
     themedAlertValues =
     [
@@ -1323,6 +1324,7 @@ var themedButtonValues = nil,
         [@"informative-text-alignment",	    CPJustifiedTextAlignment],
         [@"informative-text-color",		    [CPColor blackColor]],
         [@"informative-text-font",		    informativeFont],
+        [@"image-offset",                   imageOffset],
         [@"information-image",		        informationIcon],
         [@"warning-image",		            warningIcon],
         [@"error-image",                    errorIcon]

From f39c1a2eb89ba5511c61be9694fcbc2bea7e41d4 Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Fri, 20 Aug 2010 03:01:37 -0400
Subject: [PATCH 39/41] Try to help the build bot by not calling CPAlert
 setWindowStyle: in init.

---
 AppKit/CPAlert.j | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j
index 7f8c6ccc2..fe53e804e 100644
--- a/AppKit/CPAlert.j
+++ b/AppKit/CPAlert.j
@@ -125,12 +125,11 @@ CPCriticalAlertStyle        = 2;
         _buttons = [CPArray array];
         _alertStyle = CPWarningAlertStyle;
         _alertPanel = nil;
+        _windowStyle = nil;
 
         _messageLabel = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
         _alertImageView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
         _informativeLabel = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-
-        [self setWindowStyle:nil];
     }
 
     return self;

From fbd5a78cf0b9088d0c15d5012e50599bf1bc4045 Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Fri, 20 Aug 2010 12:41:20 -0400
Subject: [PATCH 40/41] Don't make space for CPAlert informative text if there
 is none. Consider the theme size a minimum size.

---
 AppKit/CPAlert.j | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j
index fe53e804e..a3e719d68 100644
--- a/AppKit/CPAlert.j
+++ b/AppKit/CPAlert.j
@@ -359,21 +359,24 @@ CPCriticalAlertStyle        = 2;
 
         textWidth = offsetX - inset.left,
         messageSize = [([_messageLabel stringValue] || " ") sizeWithFont:[_messageLabel font] inWidth:textWidth],
-        informativeSize = [([_informativeLabel stringValue] || " ") sizeWithFont:[_informativeLabel font] inWidth:textWidth],
+        informationString = [_informativeLabel stringValue],
+        informativeSize = [(informationString || " ") sizeWithFont:[_informativeLabel font] inWidth:textWidth],
         sizeWithFontCorrection = 6.0;
 
     [_messageLabel setFrame:CGRectMake(inset.left, inset.top, textWidth, messageSize.height + sizeWithFontCorrection)];
     [_informativeLabel setFrame:CGRectMake(inset.left, CGRectGetMaxY([_messageLabel frame]) + informativeOffset, textWidth, informativeSize.height + sizeWithFontCorrection)];
 
     var aRepresentativeButton = _buttons[0],
-        buttonY = CGRectGetMaxY([_informativeLabel frame]) + buttonOffset;
+        buttonY = MAX(CGRectGetMaxY([_alertImageView frame]), CGRectGetMaxY(informationString ? [_informativeLabel frame] : [_messageLabel frame])) + buttonOffset; // the lower of the bottom of the text and the bottom of the icon.
     [aRepresentativeButton setTheme:[self theme]];
     [aRepresentativeButton sizeToFit];
 
     // Make the window just tall enough to fit everything. Bit of a hack really.
-    var extraY = buttonY + CGRectGetHeight([aRepresentativeButton bounds]) + inset.bottom - CGRectGetHeight(bounds),
+    var minimumSize = [self currentValueForThemeAttribute:@"size"],
+        desiredHeight = MAX(minimumSize.height, buttonY + CGRectGetHeight([aRepresentativeButton bounds]) + inset.bottom),
+        deltaY = desiredHeight - CGRectGetHeight(bounds),
         frameSize = CGSizeMakeCopy([_alertPanel frame].size);
-    frameSize.height += extraY;
+    frameSize.height += deltaY;
     [_alertPanel setFrameSize:frameSize];
 
     var count = [_buttons count];

From e766a2c945dbd06831f0fee8a38235c2404abfc9 Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Sat, 21 Aug 2010 17:47:03 -0400
Subject: [PATCH 41/41] Fixed: if a CPAlert message was 3 lines or more and
 there was no informative text, the upper half of the CPAlert buttons would
 not react to clicks as the blank informative label partially covered them.

---
 AppKit/CPAlert.j                         | 2 ++
 Tests/Manual/CPAlertTest/AppController.j | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j
index a3e719d68..4ce109051 100644
--- a/AppKit/CPAlert.j
+++ b/AppKit/CPAlert.j
@@ -365,6 +365,8 @@ CPCriticalAlertStyle        = 2;
 
     [_messageLabel setFrame:CGRectMake(inset.left, inset.top, textWidth, messageSize.height + sizeWithFontCorrection)];
     [_informativeLabel setFrame:CGRectMake(inset.left, CGRectGetMaxY([_messageLabel frame]) + informativeOffset, textWidth, informativeSize.height + sizeWithFontCorrection)];
+    // Don't let an empty informative label partially cover the buttons.
+    [_informativeLabel setHidden:!informationString];
 
     var aRepresentativeButton = _buttons[0],
         buttonY = MAX(CGRectGetMaxY([_alertImageView frame]), CGRectGetMaxY(informationString ? [_informativeLabel frame] : [_messageLabel frame])) + buttonOffset; // the lower of the bottom of the text and the bottom of the icon.
diff --git a/Tests/Manual/CPAlertTest/AppController.j b/Tests/Manual/CPAlertTest/AppController.j
index 4467d2fcb..1b7ffe44c 100644
--- a/Tests/Manual/CPAlertTest/AppController.j
+++ b/Tests/Manual/CPAlertTest/AppController.j
@@ -25,7 +25,10 @@
          "Theorise", "Cancel"],
         [@"Snakes. Why did it have to be snakes?",
          nil,
-         "Torch", "Cancel"]
+         "Torch", "Cancel"],
+         [@"Sometimes a message can be really long and just appear to go on and on. It could be a speech. It could be the television.",
+          nil,
+          "Off", "Cancel"]
     ];
     messageIndex = 0;
 
@@ -69,12 +72,11 @@
     if (![variations count])
         return;
 
-
     var variation = variations[0],
         message = messages[messageIndex],
         alert = [[CPAlert alloc] init];
 
-    messageIndex = 1 - messageIndex;
+    messageIndex = (messageIndex + 1) % messages.length;
     [variations removeObjectAtIndex:0];
 
     [alert setDelegate:self];