Merge branch 'master' of http://github.com/280north/cappuccino into my_master

This commit is contained in:
Aparajita Fishman committed 2010-07-27 07:37:23 -04:00
commit a8b0e7eee2
6 files changed
+54 -18

No files matched your search

+1
View File
@@ -88,3 +88,4 @@
@import "CPWebView.j"
@import "CPWindow.j"
@import "CPWindowController.j"
@import "CPArrayController.j"
+1 -1
View File
@@ -154,7 +154,7 @@
value = [value];
var oldSelection = nil,
oldSelectionIndexes = [[self selectionIndexes] copy];
oldSelectionIndexes = [self selectionIndexes];
if ([self preservesSelection])
oldSelection = [self selectedObjects];
+1
View File
@@ -545,6 +545,7 @@ var CPControlBlackColor = [CPColor blackColor];
return;
[self _reverseSetBinding];
[[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
}
+1 -1
View File
@@ -838,7 +838,7 @@
// 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)],
alternatingRowColors = [[CPColor whiteColor], [CPColor colorWithHexString:@"e4e7ff"]],
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),