diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-0.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-0.png index 1f0cfabe5..93d50d397 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-0.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-0.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-1.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-1.png index 72c8add06..276c732e7 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-1.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-1.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-2.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-2.png index 3679527d6..b8ff55b0d 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-2.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-2.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-3.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-3.png index 1cda75fe5..c64440c21 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-3.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-3.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-4.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-4.png index 6dcbf53ef..b9d310c91 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-4.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-4.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-5.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-5.png index db566f219..fd3d0f353 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-5.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-5.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-6.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-6.png index 8bd048b99..bd0ee7b88 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-6.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-6.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-7.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-7.png index e96d14560..516547dd3 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-7.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-7.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-8.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-8.png index bf9f2b88d..622ab127e 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-8.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-8.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-0.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-0.png index 86d3a0b3c..00a8c59ab 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-0.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-0.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-1.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-1.png index 2dc080f27..be7fee6f4 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-1.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-1.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-2.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-2.png index 9a8ffa1bc..ff0ae8e22 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-2.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-2.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-3.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-3.png index ee5aff6fa..5cb7b08c4 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-3.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-3.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-4.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-4.png index 2e66015ba..b9d310c91 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-4.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-4.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-5.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-5.png index 785335b23..e2e930b43 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-5.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-5.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-6.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-6.png index cd3848f17..fd0cf835a 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-6.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-6.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-7.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-7.png index af73498eb..e6544b38f 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-7.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-7.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-8.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-8.png index 992854957..b7995ccdf 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-8.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-8.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-0.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-0.png index de1254128..d0b734b15 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-0.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-0.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-1.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-1.png index fbd78313e..35fe2fe5c 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-1.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-1.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-2.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-2.png index bb4be64f4..8d25f7753 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-2.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-2.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-3.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-3.png index 2ad2b9e6e..e9b375777 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-3.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-3.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-4.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-4.png index 6b4c7b191..b9d310c91 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-4.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-4.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-5.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-5.png index 62394f613..b3cf6b448 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-5.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-5.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-6.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-6.png index 22aa9f17e..f5cde3d4f 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-6.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-6.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-7.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-7.png index 474edf7ec..0474aec29 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-7.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-7.png differ diff --git a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-8.png b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-8.png index e77d1c1eb..362f87162 100644 Binary files a/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-8.png and b/AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-8.png differ diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index d24fced93..506fd9655 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -762,41 +762,41 @@ var themedButtonValues = nil, bezelColor = PatternColor( [ - ["textfield-bezel-square-0.png", 3.0, 4.0], - ["textfield-bezel-square-1.png", 1.0, 4.0], - ["textfield-bezel-square-2.png", 3.0, 4.0], - ["textfield-bezel-square-3.png", 3.0, 1.0], + ["textfield-bezel-square-0.png", 6.0, 6.0], + ["textfield-bezel-square-1.png", 1.0, 6.0], + ["textfield-bezel-square-2.png", 6.0, 6.0], + ["textfield-bezel-square-3.png", 6.0, 1.0], ["textfield-bezel-square-4.png", 1.0, 1.0], - ["textfield-bezel-square-5.png", 3.0, 1.0], - ["textfield-bezel-square-6.png", 3.0, 4.0], - ["textfield-bezel-square-7.png", 1.0, 4.0], - ["textfield-bezel-square-8.png", 3.0, 4.0] + ["textfield-bezel-square-5.png", 6.0, 1.0], + ["textfield-bezel-square-6.png", 6.0, 6.0], + ["textfield-bezel-square-7.png", 1.0, 6.0], + ["textfield-bezel-square-8.png", 6.0, 6.0] ]), bezelFocusedColor = PatternColor( [ - ["textfield-bezel-square-focused-0.png", 7.0, 7.0], - ["textfield-bezel-square-focused-1.png", 1.0, 7.0], - ["textfield-bezel-square-focused-2.png", 7.0, 7.0], - ["textfield-bezel-square-focused-3.png", 7.0, 1.0], + ["textfield-bezel-square-focused-0.png", 6.0, 6.0], + ["textfield-bezel-square-focused-1.png", 1.0, 6.0], + ["textfield-bezel-square-focused-2.png", 6.0, 6.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", 7.0, 1.0], - ["textfield-bezel-square-focused-6.png", 7.0, 7.0], - ["textfield-bezel-square-focused-7.png", 1.0, 7.0], - ["textfield-bezel-square-focused-8.png", 7.0, 7.0] + ["textfield-bezel-square-focused-5.png", 6.0, 1.0], + ["textfield-bezel-square-focused-6.png", 6.0, 6.0], + ["textfield-bezel-square-focused-7.png", 1.0, 6.0], + ["textfield-bezel-square-focused-8.png", 6.0, 6.0] ]), bezelDisabledColor = PatternColor( [ - ["textfield-bezel-square-disabled-0.png", 3.0, 4.0], - ["textfield-bezel-square-disabled-1.png", 1.0, 4.0], - ["textfield-bezel-square-disabled-2.png", 3.0, 4.0], - ["textfield-bezel-square-disabled-3.png", 3.0, 1.0], + ["textfield-bezel-square-disabled-0.png", 6.0, 6.0], + ["textfield-bezel-square-disabled-1.png", 1.0, 6.0], + ["textfield-bezel-square-disabled-2.png", 6.0, 6.0], + ["textfield-bezel-square-disabled-3.png", 6.0, 1.0], ["textfield-bezel-square-disabled-4.png", 1.0, 1.0], - ["textfield-bezel-square-disabled-5.png", 3.0, 1.0], - ["textfield-bezel-square-disabled-6.png", 3.0, 4.0], - ["textfield-bezel-square-disabled-7.png", 1.0, 4.0], - ["textfield-bezel-square-disabled-8.png", 3.0, 4.0] + ["textfield-bezel-square-disabled-5.png", 6.0, 1.0], + ["textfield-bezel-square-disabled-6.png", 6.0, 6.0], + ["textfield-bezel-square-disabled-7.png", 1.0, 6.0], + ["textfield-bezel-square-disabled-8.png", 6.0, 6.0] ]), placeholderColor = [CPColor colorWithCalibratedRed:189.0 / 255.0 green:199.0 / 255.0 blue:211.0 / 255.0 alpha:1.0]; @@ -810,9 +810,9 @@ var themedButtonValues = nil, [@"bezel-color", bezelDisabledColor, CPThemeStateBezeled | CPThemeStateDisabled], [@"font", [CPFont systemFontOfSize:12.0], CPThemeStateBezeled], - [@"content-inset", CGInsetMake(7.0, 7.0, 6.0, 8.0), CPThemeStateBezeled], - [@"content-inset", CGInsetMake(6.0, 7.0, 6.0, 8.0), CPThemeStateBezeled | CPThemeStateEditing], - [@"bezel-inset", CGInsetMake(3.0, 4.0, 3.0, 4.0), CPThemeStateBezeled], + [@"content-inset", CGInsetMake(7.0, 8.0, 6.0, 8.0), CPThemeStateBezeled], + [@"content-inset", CGInsetMake(6.0, 7.0, 7.0, 8.0), CPThemeStateBezeled | CPThemeStateEditing], + [@"bezel-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), CPThemeStateBezeled], [@"bezel-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), CPThemeStateBezeled | CPThemeStateEditing], [@"text-color", placeholderColor, CPTextFieldStatePlaceholder], @@ -825,9 +825,9 @@ var themedButtonValues = nil, [@"text-color", [CPColor whiteColor], CPThemeStateTableDataView | CPThemeStateSelectedTableDataView], [@"font", [CPFont boldSystemFontOfSize:12.0], CPThemeStateTableDataView | CPThemeStateSelectedTableDataView], [@"text-color", [CPColor blackColor], CPThemeStateTableDataView | CPThemeStateEditing], - [@"content-inset", CGInsetMake(7.0, 7.0, 5.0, 8.0), CPThemeStateTableDataView | CPThemeStateEditing], + [@"content-inset", CGInsetMake(6.0, 5.0, 6.0, 5.0), CPThemeStateTableDataView | CPThemeStateEditing], [@"font", [CPFont systemFontOfSize:12.0], CPThemeStateTableDataView | CPThemeStateEditing], - [@"bezel-inset", CGInsetMake(-2.0, -2.0, -2.0, -2.0), CPThemeStateTableDataView | CPThemeStateEditing], + [@"bezel-inset", CGInsetMake(-1.0, -1.0, -1.0, -1.0), CPThemeStateTableDataView | CPThemeStateEditing], [@"text-color", [CPColor colorWithCalibratedWhite:125.0 / 255.0 alpha:1.0], CPThemeStateTableDataView | CPThemeStateGroupRow], [@"text-color", [CPColor colorWithCalibratedWhite:1.0 alpha:1.0], CPThemeStateTableDataView | CPThemeStateGroupRow | CPThemeStateSelectedTableDataView], diff --git a/Tests/Manual/NewTextField/AppController.j b/Tests/Manual/NewTextField/AppController.j new file mode 100644 index 000000000..b965b4931 --- /dev/null +++ b/Tests/Manual/NewTextField/AppController.j @@ -0,0 +1,159 @@ +/* + * AppController.j + * NewTextField + * + * Created by Aparajita Fishman. + * Copyright (c) 2011, Intalio, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@import + + +@implementation AppController : CPObject +{ + CPTextField newField; + CPTextField oldField; + CPCheckBox newFieldEnabler; + CPCheckBox oldFieldEnabler; +} + +- (void)applicationDidFinishLaunching:(CPNotification)aNotification +{ + var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask], + contentView = [theWindow contentView]; + + newField = [CPTextField textFieldWithStringValue:@"" placeholder:@"New text field" width:200]; + + [newField setFrameOrigin:CGPointMake(50, 50)]; + [contentView addSubview:newField]; + + newFieldEnabler = [CPCheckBox checkBoxWithTitle:@"Enabled"]; + + [newFieldEnabler setFrameOrigin:CGPointMake(270, 54)]; + [newFieldEnabler setTarget:self]; + [newFieldEnabler setAction:@selector(enableField:)]; + [newFieldEnabler setState:CPOnState]; + [contentView addSubview:newFieldEnabler]; + + var bezelColor = CPColorWithImages( + [ + ["textfield-bezel-square-0.png", 3.0, 4.0], + ["textfield-bezel-square-1.png", 1.0, 4.0], + ["textfield-bezel-square-2.png", 3.0, 4.0], + ["textfield-bezel-square-3.png", 3.0, 1.0], + ["textfield-bezel-square-4.png", 1.0, 1.0], + ["textfield-bezel-square-5.png", 3.0, 1.0], + ["textfield-bezel-square-6.png", 3.0, 4.0], + ["textfield-bezel-square-7.png", 1.0, 4.0], + ["textfield-bezel-square-8.png", 3.0, 4.0] + ]), + + bezelFocusedColor = CPColorWithImages( + [ + ["textfield-bezel-square-focused-0.png", 7.0, 7.0], + ["textfield-bezel-square-focused-1.png", 1.0, 7.0], + ["textfield-bezel-square-focused-2.png", 7.0, 7.0], + ["textfield-bezel-square-focused-3.png", 7.0, 1.0], + ["textfield-bezel-square-focused-4.png", 1.0, 1.0], + ["textfield-bezel-square-focused-5.png", 7.0, 1.0], + ["textfield-bezel-square-focused-6.png", 7.0, 7.0], + ["textfield-bezel-square-focused-7.png", 1.0, 7.0], + ["textfield-bezel-square-focused-8.png", 7.0, 7.0] + ]), + + bezelDisabledColor = CPColorWithImages( + [ + ["textfield-bezel-square-disabled-0.png", 3.0, 4.0], + ["textfield-bezel-square-disabled-1.png", 1.0, 4.0], + ["textfield-bezel-square-disabled-2.png", 3.0, 4.0], + ["textfield-bezel-square-disabled-3.png", 3.0, 1.0], + ["textfield-bezel-square-disabled-4.png", 1.0, 1.0], + ["textfield-bezel-square-disabled-5.png", 3.0, 1.0], + ["textfield-bezel-square-disabled-6.png", 3.0, 4.0], + ["textfield-bezel-square-disabled-7.png", 1.0, 4.0], + ["textfield-bezel-square-disabled-8.png", 3.0, 4.0] + ]), + + themeValues = + [ + [@"bezel-color", bezelColor, CPThemeStateBezeled], + [@"bezel-color", bezelFocusedColor, CPThemeStateBezeled | CPThemeStateEditing], + [@"bezel-color", bezelDisabledColor, CPThemeStateBezeled | CPThemeStateDisabled], + + [@"content-inset", CGInsetMake(7.0, 7.0, 6.0, 8.0), CPThemeStateBezeled], + [@"content-inset", CGInsetMake(6.0, 7.0, 6.0, 8.0), CPThemeStateBezeled | CPThemeStateEditing], + [@"bezel-inset", CGInsetMake(3.0, 4.0, 3.0, 4.0), CPThemeStateBezeled], + [@"bezel-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), CPThemeStateBezeled | CPThemeStateEditing] + ]; + + oldField = [CPTextField textFieldWithStringValue:@"" placeholder:@"Old text field" width:200]; + + [oldField registerThemeValues:themeValues]; + [oldField setFrameOrigin:CGPointMake(50, 100)]; + [contentView addSubview:oldField]; + + oldFieldEnabler = [CPCheckBox checkBoxWithTitle:@"Enabled"]; + + [oldFieldEnabler setFrameOrigin:CGPointMake(270, 104)]; + [oldFieldEnabler setTarget:self]; + [oldFieldEnabler setAction:@selector(enableField:)]; + [oldFieldEnabler setState:CPOnState]; + [contentView addSubview:oldFieldEnabler]; + + var scrollView = [[CPScrollView alloc] initWithFrame:CGRectMake(50, 150, 200, 200)], + table = [[CPTableView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)], + column = [[CPTableColumn alloc] initWithIdentifier:@"1"]; + + [scrollView setBorderType:CPBezelBorder]; + [table setDataSource:self]; + [table setVerticalMotionCanBeginDrag:NO]; + //[table setSelectionHighlightStyle:CPTableViewSelectionHighlightStyleNone]; + [column setResizingMask:CPTableColumnAutoresizingMask]; + [column setEditable:YES]; + [table setColumnAutoresizingStyle:CPTableViewLastColumnOnlyAutoresizingStyle]; + [table addTableColumn:column]; + [contentView addSubview:scrollView]; + [scrollView setDocumentView:table]; + + [theWindow orderFront:self]; + + // Uncomment the following line to turn on the standard menu bar. + //[CPMenu setMenuBarVisible:YES]; +} + +- (void)enableField:(id)sender +{ + var field = sender === newFieldEnabler ? newField : oldField; + [field setEnabled:[sender state] === CPOnState]; +} + +- (int)numberOfRowsInTableView:(CPTableView)aTableView +{ + return 7; +} + +- (id)tableView:(CPTableView)aTableView objectValueForTableColumn:(CPTableColumn)column row:(int)row +{ + return "Row " + row; +} + +- (void)tableView:(CPTableView)aTableView setObjectValue:(id)anObject forTableColumn:(CPTableColumn)aTableColumn row:(int)rowIndex +{ + +} + +@end diff --git a/Tests/Manual/NewTextField/Info.plist b/Tests/Manual/NewTextField/Info.plist new file mode 100644 index 000000000..19de2f81c --- /dev/null +++ b/Tests/Manual/NewTextField/Info.plist @@ -0,0 +1,12 @@ + + + + + CPApplicationDelegateClass + AppController + CPBundleName + NewTextField + CPPrincipalClass + CPApplication + + diff --git a/Tests/Manual/NewTextField/Jakefile b/Tests/Manual/NewTextField/Jakefile new file mode 100644 index 000000000..684e5113f --- /dev/null +++ b/Tests/Manual/NewTextField/Jakefile @@ -0,0 +1,93 @@ +/* + * Jakefile + * NewTextField + * + * Created by aparajita on August 10, 2011. + * Copyright 2011, Victory-Heart Productions 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 ("NewTextField", function(task) +{ + task.setBuildIntermediatesPath(FILE.join("Build", "NewTextField.build", configuration)); + task.setBuildPath(FILE.join("Build", configuration)); + + task.setProductName("NewTextField"); + task.setIdentifier("com.aparajita.NewTextField"); + task.setVersion("1.0"); + task.setAuthor("Victory-Heart Productions"); + task.setEmail("feedback @nospam@ yourcompany.com"); + task.setSummary("NewTextField"); + 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", ["NewTextField"], 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", "NewTextField", "index.html")]); +}); + +task ("run-release", ["release"], function() +{ + OS.system(["open", FILE.join("Build", "Release", "NewTextField", "index.html")]); +}); + +task ("deploy", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Deployment", "NewTextField")); + OS.system(["press", "-f", FILE.join("Build", "Release", "NewTextField"), FILE.join("Build", "Deployment", "NewTextField")]); + printResults("Deployment") +}); + +task ("desktop", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Desktop", "NewTextField")); + require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "NewTextField"), FILE.join("Build", "Desktop", "NewTextField", "NewTextField.app")); + printResults("Desktop") +}); + +task ("run-desktop", ["desktop"], function() +{ + OS.system([FILE.join("Build", "Desktop", "NewTextField", "NewTextField.app", "Contents", "MacOS", "NativeHost"), "-i"]); +}); + +function printResults(configuration) +{ + print("----------------------------"); + print(configuration+" app built at path: "+FILE.join("Build", configuration, "NewTextField")); + print("----------------------------"); +} diff --git a/Tests/Manual/NewTextField/Resources/spinner.gif b/Tests/Manual/NewTextField/Resources/spinner.gif new file mode 100644 index 000000000..06dbc2bc2 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/spinner.gif differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-0.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-0.png new file mode 100644 index 000000000..1f0cfabe5 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-0.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-1.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-1.png new file mode 100644 index 000000000..72c8add06 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-1.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-2.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-2.png new file mode 100644 index 000000000..3679527d6 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-2.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-3.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-3.png new file mode 100644 index 000000000..1cda75fe5 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-3.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-4.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-4.png new file mode 100644 index 000000000..6dcbf53ef Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-4.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-5.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-5.png new file mode 100644 index 000000000..db566f219 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-5.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-6.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-6.png new file mode 100644 index 000000000..8bd048b99 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-6.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-7.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-7.png new file mode 100644 index 000000000..e96d14560 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-7.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-8.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-8.png new file mode 100644 index 000000000..bf9f2b88d Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-8.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-0.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-0.png new file mode 100644 index 000000000..86d3a0b3c Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-0.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-1.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-1.png new file mode 100644 index 000000000..2dc080f27 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-1.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-2.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-2.png new file mode 100644 index 000000000..9a8ffa1bc Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-2.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-3.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-3.png new file mode 100644 index 000000000..ee5aff6fa Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-3.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-4.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-4.png new file mode 100644 index 000000000..2e66015ba Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-4.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-5.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-5.png new file mode 100644 index 000000000..785335b23 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-5.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-6.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-6.png new file mode 100644 index 000000000..cd3848f17 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-6.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-7.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-7.png new file mode 100644 index 000000000..af73498eb Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-7.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-8.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-8.png new file mode 100644 index 000000000..992854957 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-disabled-8.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-0.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-0.png new file mode 100644 index 000000000..de1254128 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-0.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-1.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-1.png new file mode 100644 index 000000000..fbd78313e Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-1.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-2.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-2.png new file mode 100644 index 000000000..bb4be64f4 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-2.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-3.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-3.png new file mode 100644 index 000000000..2ad2b9e6e Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-3.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-4.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-4.png new file mode 100644 index 000000000..6b4c7b191 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-4.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-5.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-5.png new file mode 100644 index 000000000..62394f613 Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-5.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-6.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-6.png new file mode 100644 index 000000000..22aa9f17e Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-6.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-7.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-7.png new file mode 100644 index 000000000..474edf7ec Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-7.png differ diff --git a/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-8.png b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-8.png new file mode 100644 index 000000000..e77d1c1eb Binary files /dev/null and b/Tests/Manual/NewTextField/Resources/textfield-bezel-square-focused-8.png differ diff --git a/Tests/Manual/NewTextField/index-debug.html b/Tests/Manual/NewTextField/index-debug.html new file mode 100644 index 000000000..b6874d87e --- /dev/null +++ b/Tests/Manual/NewTextField/index-debug.html @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + NewTextField + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + diff --git a/Tests/Manual/NewTextField/index.html b/Tests/Manual/NewTextField/index.html new file mode 100644 index 000000000..d288174a1 --- /dev/null +++ b/Tests/Manual/NewTextField/index.html @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + NewTextField + + + + + + + + + + + + +
+
+ + + +
+
+ + + + diff --git a/Tests/Manual/NewTextField/main.j b/Tests/Manual/NewTextField/main.j new file mode 100644 index 000000000..c5515727b --- /dev/null +++ b/Tests/Manual/NewTextField/main.j @@ -0,0 +1,18 @@ +/* + * AppController.j + * NewTextField + * + * Created by aparajita on August 10, 2011. + * Copyright 2011, Victory-Heart Productions All rights reserved. + */ + +@import +@import + +@import "AppController.j" + + +function main(args, namedArgs) +{ + CPApplicationMain(args, namedArgs); +}