Changeset [f6b378513d3fa362cbd396c94f52ad41159fdbbe] by Martin Carlberg
July 22nd, 2012 @ 11:19 PM
Merge branch 'master' of https://github.com/cappuccino/cappuccino into binding_support_popup_button
Conflicts:
AppKit/CPKeyValueBinding.j
AppKit/CPPopUpButton.j
Tests/AppKit/CPPopUpButtonTest.j
https://github.com/cappuccino/cappuccino/commit/f6b378513d3fa362cbd...
Committed by Martin Carlberg
- A AppKit/CPComboBox.j
- A AppKit/Themes/Aristo/Resources/colorwell-bezel-center.png
- A AppKit/Themes/Aristo/Resources/colorwell-bezel-disabled-center.png
- A AppKit/Themes/Aristo/Resources/colorwell-bezel-disabled-left.png
- A AppKit/Themes/Aristo/Resources/colorwell-bezel-disabled-right.png
- A AppKit/Themes/Aristo/Resources/colorwell-bezel-highlighted-center.png
- A AppKit/Themes/Aristo/Resources/colorwell-bezel-highlighted-left.png
- A AppKit/Themes/Aristo/Resources/colorwell-bezel-highlighted-right.png
- A AppKit/Themes/Aristo/Resources/colorwell-bezel-left.png
- A AppKit/Themes/Aristo/Resources/colorwell-bezel-right.png
- A AppKit/Themes/Aristo/Resources/colorwell-content-border-center.png
- A AppKit/Themes/Aristo/Resources/colorwell-content-border-left.png
- A AppKit/Themes/Aristo/Resources/colorwell-content-border-right.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-center.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-disabled-center.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-disabled-left.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-disabled-right.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-focused-center.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-focused-left.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-focused-right.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-left.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-center.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-disabled-center.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-disabled-left.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-disabled-right.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-focused-center.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-focused-left.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-focused-right.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-left.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-right.png
- A AppKit/Themes/Aristo/Resources/combobox-bezel-right.png
- A AppKit/Themes/Aristo/Resources/textfield-bezel-rounded-disabled-center.png
- A AppKit/Themes/Aristo/Resources/textfield-bezel-rounded-disabled-left.png
- A AppKit/Themes/Aristo/Resources/textfield-bezel-rounded-disabled-right.png
- A AppKit/Themes/Aristo/Resources/token-center-disabled.png
- A AppKit/Themes/Aristo/Resources/token-left-disabled.png
- A AppKit/Themes/Aristo/Resources/token-right-disabled.png
- A AppKit/_CPPopUpList.j
- A AppKit/_CPPopUpListDataSource.j
- A CommonJS/lib/cappuccino/imagesize.j
- A Foundation/CPGeometry.j
- A Foundation/_CGGeometry.h
- A Foundation/_CGGeometry.j
- A Tests/AppKit/CPColorWellTest.j
- A Tests/AppKit/CPFontManagerTest.j
- A Tests/Foundation/CPGeometryTest.j
- A Tests/Manual/ArrayControllerRemovingFirstTest/AppController.j
- A Tests/Manual/ArrayControllerRemovingFirstTest/Info.plist
- A Tests/Manual/ArrayControllerRemovingFirstTest/Jakefile
- A Tests/Manual/ArrayControllerRemovingFirstTest/Resources/spinner.gif
- A Tests/Manual/ArrayControllerRemovingFirstTest/index-debug.html
- A Tests/Manual/ArrayControllerRemovingFirstTest/index.html
- A Tests/Manual/ArrayControllerRemovingFirstTest/main.j
- A Tests/Manual/CPComboBoxTest/AppController.j
- A Tests/Manual/CPComboBoxTest/Info.plist
- A Tests/Manual/CPComboBoxTest/Jakefile
- A Tests/Manual/CPComboBoxTest/Resources/MainMenu.cib
- A Tests/Manual/CPComboBoxTest/Resources/MainMenu.xib
- A Tests/Manual/CPComboBoxTest/Resources/spinner.gif
- A Tests/Manual/CPComboBoxTest/index-debug.html
- A Tests/Manual/CPComboBoxTest/index.html
- A Tests/Manual/CPComboBoxTest/main.j
- A Tests/Manual/NewTextFieldBezel/AppController.j
- A Tests/Manual/NewTextFieldBezel/Info.plist
- A Tests/Manual/NewTextFieldBezel/Jakefile
- A Tests/Manual/NewTextFieldBezel/Resources/spinner.gif
- A Tests/Manual/NewTextFieldBezel/index-debug.html
- A Tests/Manual/NewTextFieldBezel/index.html
- A Tests/Manual/NewTextFieldBezel/main.j
- A Tests/Manual/Nib2CibAlignment/AppController.j
- A Tests/Manual/Nib2CibAlignment/Info.plist
- A Tests/Manual/Nib2CibAlignment/Jakefile
- A Tests/Manual/Nib2CibAlignment/Resources/MainMenu.cib
- A Tests/Manual/Nib2CibAlignment/Resources/MainMenu.xib
- A Tests/Manual/Nib2CibAlignment/Resources/spinner.gif
- A Tests/Manual/Nib2CibAlignment/index-debug.html
- A Tests/Manual/Nib2CibAlignment/index.html
- A Tests/Manual/Nib2CibAlignment/main.j
- A Tests/Manual/Nib2CibBaselineAlignementTest/AppController.j
- A Tests/Manual/Nib2CibBaselineAlignementTest/Info.plist
- A Tests/Manual/Nib2CibBaselineAlignementTest/Jakefile
- A Tests/Manual/Nib2CibBaselineAlignementTest/Resources/MainMenu.cib
- A Tests/Manual/Nib2CibBaselineAlignementTest/Resources/MainMenu.xib
- A Tests/Manual/Nib2CibBaselineAlignementTest/Resources/spinner.gif
- A Tests/Manual/Nib2CibBaselineAlignementTest/index-debug.html
- A Tests/Manual/Nib2CibBaselineAlignementTest/index.html
- A Tests/Manual/Nib2CibBaselineAlignementTest/main.j
- A Tests/Manual/TableTest/EditingControls/AppController.j
- A Tests/Manual/TableTest/EditingControls/Info.plist
- A Tests/Manual/TableTest/EditingControls/Jakefile
- A Tests/Manual/TableTest/EditingControls/Resources/MainMenu.cib
- A Tests/Manual/TableTest/EditingControls/Resources/MainMenu.xib
- A Tests/Manual/TableTest/EditingControls/Resources/spinner.gif
- A Tests/Manual/TableTest/EditingControls/index-debug.html
- A Tests/Manual/TableTest/EditingControls/index.html
- A Tests/Manual/TableTest/EditingControls/main.j
- A Tools/imagesize/.gitignore
- A Tools/imagesize/Jakefile
- A Tools/imagesize/README
- A Tools/imagesize/imagesize.m
- A Tools/imagesize/imagesize.xcodeproj/project.pbxproj
- A Tools/imagesize/imagesize.xcodeproj/project.xcworkspace/contents.xcworkspacedata
- A Tools/nib2cib/NSComboBox.j
- R CommonJS/lib/cappuccino/image-utility.js
- R AppKit/CPGeometry.j
- R AppKit/CoreGraphics/CGGeometry.h
- R Tests/AppKit/CPGeometryTest.j
- R Tests/Manual/Nib2CibAligment/Resources/spinner.gif
- R Tests/Manual/Nib2CibAligment/Jakefile
- R Tests/Manual/Nib2CibAligment/AppController.j
- R Tests/Manual/Nib2CibAligment/Resources/MainMenu.cib
- R Tests/Manual/Nib2CibAligment/Resources/MainMenu.xib
- R Tests/Manual/Nib2CibAligment/index-debug.html
- R Tests/Manual/Nib2CibAligment/index.html
- R Tests/Manual/Nib2CibAligment/main.j
- R Tests/Manual/Nib2CibAligment/Info.plist
- R Tools/fontinfo/fontinfo_Prefix.pch
- M AppKit/AppKit.j
- M AppKit/CPApplication.j
- M AppKit/CPArrayController.j
- M AppKit/CPButton.j
- M AppKit/CPColorPanel.j
- M AppKit/CPColorPicker.j
- M AppKit/CPColorWell.j
- M AppKit/CPControl.j
- M AppKit/CPFont.j
- M AppKit/CPFontManager.j
- M AppKit/CPImage.j
- M AppKit/CPKeyValueBinding.j
- M AppKit/CPMenu/CPMenu.j
- M AppKit/CPMenu/_CPMenuBarWindow.j
- M AppKit/CPMenuItem/CPMenuItem.j
- M AppKit/CPMenuItem/_CPMenuItemView.j
- M AppKit/CPOutlineView.j
- M AppKit/CPPopUpButton.j
- M AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j
- M AppKit/CPRuleEditor/CPRuleEditor.j
- M AppKit/CPRuleEditor/_CPRuleEditorLocalizer.j
- M AppKit/CPSliderColorPicker.j
- M AppKit/CPSplitView.j
- M AppKit/CPTableColumn.j
- M AppKit/CPTableHeaderView.j
- M AppKit/CPTableView.j
- M AppKit/CPTextField.j
- M AppKit/CPTokenField.j
- M AppKit/CPView.j
- M AppKit/CPWindow/_CPHUDWindowView.j
- M AppKit/CPWindow/_CPStandardWindowView.j
- M AppKit/CPWindowController.j
- M AppKit/CoreGraphics/CGAffineTransform.h
- M AppKit/CoreGraphics/CGGeometry.j
- M AppKit/Platform/DOM/CPPlatformString.j
- M AppKit/Themes/Aristo/Resources/textfield-bezel-rounded-center.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-rounded-focused-center.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-rounded-focused-left.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-rounded-focused-right.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-rounded-left.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-rounded-right.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-0.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-1.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-2.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-3.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-4.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-5.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-6.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-7.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-8.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-0.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-1.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-2.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-3.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-4.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-5.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-6.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-7.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-disabled-8.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-0.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-1.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-2.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-3.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-4.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-5.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-6.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-7.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-square-focused-8.png
- M AppKit/Themes/Aristo/ThemeDescriptors.j
- M AppKit/Themes/BlendKit/BKThemeDescriptor.j
- M AppKit/Themes/Default/AppController.j
- M AppKit/_CPImageAndTextView.j
- M Foundation/CPArray/CPArray.j
- M Foundation/CPArray/CPMutableArray.j
- M Foundation/CPDictionary.j
- M Foundation/CPIndexSet.j
- M Foundation/CPKeyValueObserving.j
- M Foundation/CPNumberFormatter.j
- M Foundation/CPRange.h
- M Foundation/CPRange.j
- M Foundation/CPString.j
- M Foundation/Foundation.j
- M Foundation/Jakefile
- M Objective-J/Bootstrap.js
- M Objective-J/Debug.js
- M Tests/AppKit/CPButtonTest.j
- M Tests/AppKit/CPFontTest.j
- M Tests/AppKit/CPPopUpButtonTest.j
- M Tests/AppKit/CPSplitViewTest.j
- M Tests/AppKit/CPTableViewTest.j
- M Tests/AppKit/CPWindowTest.j
- M Tests/Foundation/CPArrayTest.j
- M Tests/Foundation/CPDictionaryTest.j
- M Tests/Foundation/CPIndexSetTest.j
- M Tests/Foundation/CPKVOTest.j
- M Tests/Foundation/CPNumberFormatterTest.j
- M Tests/Manual/CPButtonTest/Resources/MainMenu.cib
- M Tests/Manual/CPButtonTest/Resources/MainMenu.xib
- M Tests/Manual/CPColorWellBindings/Resources/MainMenu.cib
- M Tests/Manual/CPColorWellBindings/Resources/MainMenu.xib
- M Tests/Manual/CPPredicateEditorCibTest/Resources/MainMenu.cib
- M Tests/Manual/CPPredicateEditorCibTest/Resources/MainMenu.xib
- M Tests/Manual/CPSplitViewTest/AppController.j
- M Tests/Manual/CPSplitViewTest/Resources/MainMenu.cib
- M Tests/Manual/CPSplitViewTest/Resources/MainMenu.xib
- M Tests/Manual/FontEnhancementTest/AppController.j
- M Tests/Manual/FontEnhancementTest/Info.plist
- M Tests/Manual/FontEnhancementTest/Resources/MainMenu.cib
- M Tests/Manual/FontEnhancementTest/Resources/MainMenu.xib
- M Tests/Manual/FontEnhancementTest/index-debug.html
- M Tests/Manual/FontEnhancementTest/index.html
- M Tests/Manual/FontMetricsExplorer/Resources/MainMenu.cib
- M Tests/Manual/FontMetricsExplorer/Resources/MainMenu.xib
- M Tests/Manual/TableTest/TableBindings/AppController.j
- M Tests/Manual/TableTest/TableBindings/Resources/MainMenu.cib
- M Tests/Manual/TableTest/TableBindings/Resources/MainMenu.xib
- M Tools/Jakefile
- M Tools/XcodeCapp/FSEventCallback.m
- M Tools/capp/Resources/Templates/ThemeDescriptor/Jakefile
- M Tools/fontinfo/Jakefile
- M Tools/fontinfo/fontinfo.xcodeproj/project.pbxproj
- M Tools/nib2cib/Converter+Mac.j
- M Tools/nib2cib/NSAppKit.j
- M Tools/nib2cib/NSButton.j
- M Tools/nib2cib/NSCell.j
- M Tools/nib2cib/NSClipView.j
- M Tools/nib2cib/NSColor.j
- M Tools/nib2cib/NSColorWell.j
- M Tools/nib2cib/NSCustomResource.j
- M Tools/nib2cib/NSFont.j
- M Tools/nib2cib/NSMatrix.j
- M Tools/nib2cib/NSRuleEditor.j
- M Tools/nib2cib/NSSplitView.j
- M Tools/nib2cib/NSTableColumn.j
- M Tools/nib2cib/NSTableView.j
- M Tools/nib2cib/NSTextField.j
- M Tools/nib2cib/Nib2Cib.j
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
The Cappuccino Web Framework, including AppKit, Foundation, and Objective-J.