Changeset [1c3411f808bf2534334dbbb61e355162c79f4aa1] by Martin Carlberg
January 7th, 2013 @ 10:25 PM
Merge remote-tracking branch 'upstream/master' into objj_compiler2
Conflicts:
AppKit/CPWindow/CPWindow.j
https://github.com/cappuccino/cappuccino/commit/1c3411f808bf2534334...
Committed by Martin Carlberg
- A Tests/Manual/CPSegmentedControlTest/AppController.j
- A Tests/Manual/CPSegmentedControlTest/CPSegmentedControlTest.xcodeproj/project.pbxproj
- A Tests/Manual/CPSegmentedControlTest/CPSegmentedControlTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
- A Tests/Manual/CPSegmentedControlTest/Info.plist
- A Tests/Manual/CPSegmentedControlTest/Jakefile
- A Tests/Manual/CPSegmentedControlTest/Resources/MainMenu.cib
- A Tests/Manual/CPSegmentedControlTest/Resources/MainMenu.xib
- A Tests/Manual/CPSegmentedControlTest/Resources/spinner.gif
- A Tests/Manual/CPSegmentedControlTest/index-debug.html
- A Tests/Manual/CPSegmentedControlTest/index.html
- A Tests/Manual/CPSegmentedControlTest/main.j
- M AppKit/CPAlert.j
- M AppKit/CPCompatibility.j
- M AppKit/CPPanel.j
- M AppKit/CPSegmentedControl.j
- M AppKit/CPWindow/_CPWindow.j
- M AppKit/Resources/CPApplication/Save.png
- M AppKit/Resources/CPImage/CPImageNameColorPanel.png
- M AppKit/Resources/CPImageView/CPImageViewBottomShadow.png
- M AppKit/Resources/CPLevelIndicator/level-indicator-bezel-center.png
- M AppKit/Resources/CPMenuItem/CPMenuItemOnState.png
- M AppKit/Resources/CPMenuItem/CPMenuItemOnStateHighlighted.png
- M AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleMini.gif
- M AppKit/Resources/CPSearchField/CPSearchFieldCancel.png
- M AppKit/Resources/CPSearchField/CPSearchFieldCancelPressed.png
- M AppKit/Resources/CPSearchField/CPSearchFieldFind.png
- M AppKit/Resources/CPSearchField/CPSearchFieldSearch.png
- M AppKit/Resources/CPShadowView/CPShadowViewHeavyBottom.png
- M AppKit/Resources/CPShadowView/CPShadowViewHeavyBottomLeft.png
- M AppKit/Resources/CPShadowView/CPShadowViewHeavyBottomRight.png
- M AppKit/Resources/CPShadowView/CPShadowViewHeavyTop.png
- M AppKit/Resources/CPShadowView/CPShadowViewHeavyTopLeft.png
- M AppKit/Resources/CPShadowView/CPShadowViewHeavyTopRight.png
- M AppKit/Resources/CPShadowView/CPShadowViewLightBottom.png
- M AppKit/Resources/CPWindow/CPWindowAttachedSheetShadow.png
- M AppKit/Resources/CPWindow/CPWindowShadow0.png
- M AppKit/Resources/CPWindow/CPWindowShadow6.png
- M AppKit/Resources/CPWindow/CPWindowShadow8.png
- M AppKit/Resources/CPWindow/HUD/CPWindowHUDBackground3.png
- M AppKit/Resources/CPWindow/HUD/CPWindowHUDBackground4.png
- M AppKit/Resources/CPWindow/HUD/CPWindowHUDBackground5.png
- M AppKit/Resources/CPWindow/HUD/CPWindowHUDBackground6.png
- M AppKit/Resources/CPWindow/HUD/CPWindowHUDBackground8.png
- M AppKit/Resources/CPWindow/Standard/CPWindowStandardMaximizeButtonHighlighted.png
- M AppKit/Resources/CPWindow/Standard/CPWindowStandardTop0.png
- M AppKit/Resources/CPWindow/Standard/CPWindowStandardTop2.png
- M AppKit/Resources/CPWindowResizeIndicator.png
- M AppKit/Resources/FIXME_ImageShadow.png
- M AppKit/Resources/GenericFile.png
- M AppKit/Resources/_CPMenuWindow/_CPMenuWindowMoreAbove.png
- M AppKit/Resources/_CPWindowView/_CPWindowViewResizeIndicator.png
- M AppKit/Resources/brightness_bar.png
- M AppKit/Resources/browser-resize-control.png
- M AppKit/Resources/minus_button.png
- M AppKit/Resources/plus_button.png
- M AppKit/Resources/wheel_black.png
- M AppKit/Resources/wheel_button.png
- M AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-divider.png
- M AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-divider.png
- M AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png
- M AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-divider.png
- M AppKit/Themes/Aristo/Resources/alert-error.png
- M AppKit/Themes/Aristo/Resources/alert-help-pressed.png
- M AppKit/Themes/Aristo/Resources/alert-help.png
- M AppKit/Themes/Aristo/Resources/alert-info.png
- M AppKit/Themes/Aristo/Resources/check-box-image-disabled.png
- M AppKit/Themes/Aristo/Resources/check-box-image-highlighted.png
- M AppKit/Themes/Aristo/Resources/check-box-image.png
- M AppKit/Themes/Aristo/Resources/colorwell-content-border-center.png
- M AppKit/Themes/Aristo/Resources/colorwell-content-border-left.png
- M AppKit/Themes/Aristo/Resources/colorwell-content-border-right.png
- M AppKit/Themes/Aristo/Resources/combobox-bezel-center.png
- M AppKit/Themes/Aristo/Resources/combobox-bezel-disabled-center.png
- M AppKit/Themes/Aristo/Resources/combobox-bezel-disabled-left.png
- M AppKit/Themes/Aristo/Resources/combobox-bezel-left.png
- M AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-center.png
- M AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-disabled-center.png
- M AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-disabled-left.png
- M AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-disabled-right.png
- M AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-left.png
- M AppKit/Themes/Aristo/Resources/combobox-bezel-no-border-right.png
- M AppKit/Themes/Aristo/Resources/rule-editor-add.png
- M AppKit/Themes/Aristo/Resources/rule-editor-remove.png
- M AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-center.png
- M AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-dark-center.png
- M AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-dark-left.png
- M AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-dark-right.png
- M AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-light-center.png
- M AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-light-left.png
- M AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-light-right.png
- M AppKit/Themes/Aristo/Resources/scroller-horizontal-track-light-center.png
- M AppKit/Themes/Aristo/Resources/scroller-horizontal-track-light-left.png
- M AppKit/Themes/Aristo/Resources/scroller-horizontal-track-light-right.png
- M AppKit/Themes/Aristo/Resources/scroller-legacy-horizontal-knob-center.png
- M AppKit/Themes/Aristo/Resources/scroller-legacy-horizontal-knob-left.png
- M AppKit/Themes/Aristo/Resources/scroller-legacy-horizontal-knob-right.png
- M AppKit/Themes/Aristo/Resources/scroller-legacy-vertical-knob-bottom.png
- M AppKit/Themes/Aristo/Resources/scroller-legacy-vertical-knob-center.png
- M AppKit/Themes/Aristo/Resources/scroller-legacy-vertical-knob-top.png
- M AppKit/Themes/Aristo/Resources/scroller-vertical-knob-bottom.png
- M AppKit/Themes/Aristo/Resources/scroller-vertical-knob-center.png
- M AppKit/Themes/Aristo/Resources/scroller-vertical-knob-dark-bottom.png
- M AppKit/Themes/Aristo/Resources/scroller-vertical-knob-dark-center.png
- M AppKit/Themes/Aristo/Resources/scroller-vertical-knob-dark-top.png
- M AppKit/Themes/Aristo/Resources/scroller-vertical-knob-light-bottom.png
- M AppKit/Themes/Aristo/Resources/scroller-vertical-knob-light-center.png
- M AppKit/Themes/Aristo/Resources/scroller-vertical-knob-light-top.png
- M AppKit/Themes/Aristo/Resources/scroller-vertical-track-dark-bottom.png
- M AppKit/Themes/Aristo/Resources/scroller-vertical-track-dark-top.png
- M AppKit/Themes/Aristo/Resources/scroller-vertical-track-light-bottom.png
- M AppKit/Themes/Aristo/Resources/scroller-vertical-track-light-center.png
- M AppKit/Themes/Aristo/Resources/scroller-vertical-track-light-top.png
- M AppKit/Themes/Aristo/Resources/scrollview-bottom-corner-color.png
- M AppKit/Themes/Aristo/Resources/slider-circular-disabled-bezel.png
- M AppKit/Themes/Aristo/Resources/spinner.gif
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-disabled-down-center.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-disabled-down-left.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-disabled-down-right.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-disabled-up-center.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-disabled-up-left.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-disabled-up-right.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-down-center.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-down-left.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-down-right.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-highlighted-down-center.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-highlighted-down-left.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-highlighted-down-right.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-highlighted-up-center.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-highlighted-up-left.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-highlighted-up-right.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-up-center.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-up-left.png
- M AppKit/Themes/Aristo/Resources/stepper-bezel-big-up-right.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-rounded-center.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-rounded-disabled-center.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-rounded-disabled-left.png
- M AppKit/Themes/Aristo/Resources/textfield-bezel-rounded-disabled-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-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-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/ThemeDescriptors.j
- M AppKit/Themes/BlendKit/Resources/dark-checkers.png
- M AppKit/Themes/BlendKit/Resources/light-checkers.png
- M AppKit/Themes/Default/Resources/knob.png
- M AppKit/_CPAttachedWindow.j
- M CONTRIBUTING.md
- M Foundation/CPRunLoop.j
- M Foundation/CPTimer.j
- M Foundation/CPURL.j
- M Tests/Manual/ArrayController1/Resources/spinner.gif
- M Tests/Manual/ArrayControllerRemovingFirstTest/Resources/spinner.gif
- M Tests/Manual/AttachedSheet/Resources/spinner.gif
- M Tests/Manual/AttachedSheet2/Resources/spinner.gif
- M Tests/Manual/Bindings/Resources/spinner.gif
- M Tests/Manual/CPAlertTest/Resources/spinner.gif
- M Tests/Manual/CPBinder-echo-bug/Resources/spinner.gif
- M Tests/Manual/CPBoxTest/Resources/spinner.gif
- M Tests/Manual/CPBrowserTest/Resources/browser-resize-control.png
- M Tests/Manual/CPBrowserTest/Resources/spinner.gif
- M Tests/Manual/CPButtonKeyEquivalentDefaultTest/Resources/spinner.gif
- M Tests/Manual/CPButtonTest/Resources/spinner.gif
- M Tests/Manual/CPColor-CPImage-description/Resources/spinner.gif
- M Tests/Manual/CPColorWellBindings/Resources/spinner.gif
- M Tests/Manual/CPComboBoxTest/Resources/spinner.gif
- M Tests/Manual/CPControlPerformClickExceptionTest/Resources/spinner.gif
- M Tests/Manual/CPCursor/Resources/spinner.gif
- M Tests/Manual/CPDocumentControllerTest/withNib/Resources/spinner.gif
- M Tests/Manual/CPDocumentControllerTest/withoutNib/Resources/spinner.gif
- M Tests/Manual/CPFormatterTest/Resources/spinner.gif
- M Tests/Manual/CPGraphicsTest/Resources/spinner.gif
- M Tests/Manual/CPImageViewAlignmentScaling/Resources/box.png
- M Tests/Manual/CPImageViewAlignmentScaling/Resources/spinner.gif
- M Tests/Manual/CPImageViewTest/Resources/280px-1730_Homann_Map_of_Scandinavia,_Norway,_Sweden,_Denmark,_Finland_and_the_Baltics_-_Geographicus_-_Scandinavia-homann-1730.jpg
- M Tests/Manual/CPImageViewTest/Resources/spinner.gif
- M Tests/Manual/CPImageViewbindingsTest/Resources/spinner.gif
- M Tests/Manual/CPImageViewbindingsTest/Resources/value.jpg
- M Tests/Manual/CPImageViewbindingsTest/Resources/valueURL.jpg
- M Tests/Manual/CPLevelIndicator/Resources/spinner.gif
- M Tests/Manual/CPLogTest/Resources/spinner.gif
- M Tests/Manual/CPMenuKeyEquivalents/Resources/spinner.gif
- M Tests/Manual/CPMenuRemoveAllTest/Resources/spinner.gif
- M Tests/Manual/CPMenuTest/Resources/spinner.gif
- M Tests/Manual/CPOutlineViewCibTest/Resources/spinner.gif
- M Tests/Manual/CPOutlineViewTest/Resources/spinner.gif
- M Tests/Manual/CPPopUpButtonBindings/Resources/spinner.gif
- M Tests/Manual/CPPopUpButtonTest/Resources/spinner.gif
- M Tests/Manual/CPPopover/Resources/MainMenu.cib
- M Tests/Manual/CPPopover/Resources/spinner.gif
- M Tests/Manual/CPPredicateEditorCibTest/Resources/spinner.gif
- M Tests/Manual/CPProgressIndicator/Resources/spinner.gif
- M Tests/Manual/CPPropertyListSerializationTest/Resources/spinner.gif
- M Tests/Manual/CPRuleEditorCibTest/Resources/spinner.gif
- M Tests/Manual/CPScrollView/Resources/photo.jpg
- M Tests/Manual/CPScrollView/Resources/spinner.gif
- M Tests/Manual/CPScrollView2/Resources/photo.jpg
- M Tests/Manual/CPScrollView2/Resources/spinner.gif
- M Tests/Manual/CPSearchField/Resources/spinner.gif
- M Tests/Manual/CPSoundTest/Resources/spinner.gif
- M Tests/Manual/CPSplitViewTest/Resources/spinner.gif
- M Tests/Manual/CPStepperBindings/Resources/spinner.gif
- M Tests/Manual/CPStepperNibTest/Resources/spinner.gif
- M Tests/Manual/CPTabView2/Resources/spinner.gif
- M Tests/Manual/CPTabViewNib/Resources/spinner.gif
- M Tests/Manual/CPTableViewGroupRows/Resources/spinner.gif
- M Tests/Manual/CPTextField/Resources/spinner.gif
- M Tests/Manual/CPTextFieldHeightTest/Resources/spinner.gif
- M Tests/Manual/CPTokenFieldTest/Resources/spinner.gif
- M Tests/Manual/CPToolTip/Resources/spinner.gif
- M Tests/Manual/CPToolTip/Resources/test.png
- M Tests/Manual/CPToolbarTest/Resources/CPImageNameColorPanel.png
- M Tests/Manual/CPToolbarTest/Resources/spinner.gif
- M Tests/Manual/CPUserDefaults/Resources/spinner.gif
- M Tests/Manual/CPUserDefaultsControllerTest/Resources/spinner.gif
- M Tests/Manual/CPWebViewTest/Resources/spinner.gif
- M Tests/Manual/CPWebViewTest2/Resources/spinner.gif
- M Tests/Manual/CPWindowMovableTest/Resources/spinner.gif
- M Tests/Manual/ContinuouslyUpdatesValueBinding/Resources/spinner.gif
- M Tests/Manual/FF4096Test/Resources/spinner.gif
- M Tests/Manual/FontEnhancementTest/Resources/spinner.gif
- M Tests/Manual/FontMetricsExplorer/Resources/spinner.gif
- M Tests/Manual/KeyEquivalents/Resources/spinner.gif
- M Tests/Manual/LayoutTest/Resources/horizontal-border-0.png
- M Tests/Manual/LayoutTest/Resources/horizontal-border-1.png
- M Tests/Manual/LayoutTest/Resources/horizontal-border-2.png
- M Tests/Manual/LayoutTest/Resources/round-border-0.png
- M Tests/Manual/LayoutTest/Resources/round-border-1.png
- M Tests/Manual/LayoutTest/Resources/round-border-2.png
- M Tests/Manual/LayoutTest/Resources/round-border-3.png
- M Tests/Manual/LayoutTest/Resources/round-border-5.png
- M Tests/Manual/LayoutTest/Resources/round-border-6.png
- M Tests/Manual/LayoutTest/Resources/round-border-7.png
- M Tests/Manual/LayoutTest/Resources/round-border-8.png
- M Tests/Manual/LayoutTest/Resources/spinner.gif
- M Tests/Manual/LayoutTest/Resources/vertical-border-0.png
- M Tests/Manual/LayoutTest/Resources/vertical-border-1.png
- M Tests/Manual/LayoutTest/Resources/vertical-border-2.png
- M Tests/Manual/LoadTimeTest/Resources/spinner.gif
- M Tests/Manual/LongBindings/Resources/spinner.gif
- M Tests/Manual/NSBoxTest/Resources/spinner.gif
- M Tests/Manual/NewTextFieldBezel/Resources/spinner.gif
- M Tests/Manual/Nib2CibAlignment/Resources/spinner.gif
- M Tests/Manual/Nib2CibBaselineAlignementTest/Resources/spinner.gif
- M Tests/Manual/NibAppRemixed/Resources/spinner.gif
- M Tests/Manual/PatternFillTest/Resources/spinner.gif
- M Tests/Manual/PlatformWindows/Resources/spinner.gif
- M Tests/Manual/ScrollviewTheming/Resources/spinner.gif
- M Tests/Manual/SmartFoldersDemo/Resources/spinner.gif
- M Tests/Manual/TableTest/BorderTableTest/Resources/spinner.gif
- M Tests/Manual/TableTest/ColumnResize/Resources/spinner.gif
- M Tests/Manual/TableTest/ColumnSizing2/Resources/spinner.gif
- M Tests/Manual/TableTest/DragAndDrop/Resources/spinner.gif
- M Tests/Manual/TableTest/DrawRowTest/Resources/spinner.gif
- M Tests/Manual/TableTest/Editing/Resources/spinner.gif
- M Tests/Manual/TableTest/EditingControls/Resources/spinner.gif
- M Tests/Manual/TableTest/GroupRowTest/Resources/spinner.gif
- M Tests/Manual/TableTest/HeaderCornerView/Resources/spinner.gif
- M Tests/Manual/TableTest/OldTest/Resources/spinner.gif
- M Tests/Manual/TableTest/TableBindings/Resources/spinner.gif
- M Tests/Manual/TableTest/TableCibTest/Resources/spinner.gif
- M Tests/Manual/TableTest/VariableRows/Resources/spinner.gif
- M Tests/Manual/ThemeBrowser/Resources/spinner.gif
- M Tests/Manual/UndoRedoWithMenuUpdate/Resources/spinner.gif
- M Tests/Manual/UserlandNSTest/Resources/spinner.gif
- M Tests/Manual/layoutEphemeralSubviewTest/Resources/spinner.gif
- M Tests/Manual/performKeyEquivalentTest/Resources/spinner.gif
- M Tests/Manual/predicateWithFormat/Resources/spinner.gif
- M Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/Resources/spinner.gif
- M Tests/Manual/sizeToFitFix/Resources/spinner.gif
- M Tools/XcodeCapp/help.rtfd/action.png
- M Tools/XcodeCapp/help.rtfd/menu1.png
- M Tools/XcodeCapp/help.rtfd/menu2.png
- M Tools/XcodeCapp/help.rtfd/outlets.png
- M Tools/XcodeCapp/help.rtfd/outlets2.png
- M Tools/capp/Resources/Templates/Application/Resources/spinner.gif
- M Tools/capp/Resources/Templates/NibApplication/Resources/spinner.gif
- M Tools/capp/Resources/Templates/ThemeDescriptor/Resources/spinner.gif
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.