Skip to content

Commit

Permalink
Merge pull request cappuccino#2266 from zittix/patch-2
Browse files Browse the repository at this point in the history
Docs: fixed bootstrap.sh URL due to github URL change
  • Loading branch information
aljungberg committed Nov 28, 2014
2 parents 81e6c5c + c3fc6a0 commit b2557c3
Show file tree
Hide file tree
Showing 108 changed files with 999 additions and 299 deletions.
97 changes: 49 additions & 48 deletions AppKit/CPAlert.j
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
var CPAlertDelegate_alertShowHelp_ = 1 << 0,
CPAlertDelegate_alertDidEnd_returnCode_ = 1 << 1;

@typedef CPAlertStyle
/*
@global
@group CPAlertStyle
Expand All @@ -70,6 +71,54 @@ var bottomHeight = 71;

@end


@implementation _CPAlertThemeView : CPView

+ (CPString)defaultThemeClass
{
return @"alert";
}

+ (CPDictionary)themeAttributes
{
return @{
@"size": CGSizeMake(400.0, 110.0),
@"content-inset": CGInsetMake(15, 15, 15, 50),
@"informative-offset": 6,
@"button-offset": 10,
@"message-text-alignment": CPJustifiedTextAlignment,
@"message-text-color": [CPColor blackColor],
@"message-text-font": [CPFont boldSystemFontOfSize:13.0],
@"message-text-shadow-color": [CPNull null],
@"message-text-shadow-offset": CGSizeMakeZero(),
@"informative-text-alignment": CPJustifiedTextAlignment,
@"informative-text-color": [CPColor blackColor],
@"informative-text-font": [CPFont systemFontOfSize:12.0],
@"informative-text-shadow-color": [CPNull null],
@"informative-text-shadow-offset": CGSizeMakeZero(),
@"image-offset": CGPointMake(15, 12),
@"information-image": [CPNull null],
@"warning-image": [CPNull null],
@"error-image": [CPNull null],
@"help-image": [CPNull null],
@"help-image-left-offset": 15,
@"help-image-pressed": [CPNull null],
@"suppression-button-y-offset": 0.0,
@"suppression-button-x-offset": 0.0,
@"default-elements-margin": 3.0,
@"suppression-button-text-color": [CPColor blackColor],
@"suppression-button-text-font": [CPFont systemFontOfSize:12.0],
@"suppression-button-text-shadow-color": [CPNull null],
@"suppression-button-text-shadow-offset": 0.0,
@"modal-window-button-margin-y": 0.0,
@"modal-window-button-margin-x": 0.0,
@"standard-window-button-margin-y": 0.0,
@"standard-window-button-margin-x": 0.0,
};
}

@end

/*!
@ingroup appkit
Expand Down Expand Up @@ -813,51 +862,3 @@ var bottomHeight = 71;
}

@end


@implementation _CPAlertThemeView : CPView

+ (CPString)defaultThemeClass
{
return @"alert";
}

+ (CPDictionary)themeAttributes
{
return @{
@"size": CGSizeMake(400.0, 110.0),
@"content-inset": CGInsetMake(15, 15, 15, 50),
@"informative-offset": 6,
@"button-offset": 10,
@"message-text-alignment": CPJustifiedTextAlignment,
@"message-text-color": [CPColor blackColor],
@"message-text-font": [CPFont boldSystemFontOfSize:13.0],
@"message-text-shadow-color": [CPNull null],
@"message-text-shadow-offset": CGSizeMakeZero(),
@"informative-text-alignment": CPJustifiedTextAlignment,
@"informative-text-color": [CPColor blackColor],
@"informative-text-font": [CPFont systemFontOfSize:12.0],
@"informative-text-shadow-color": [CPNull null],
@"informative-text-shadow-offset": CGSizeMakeZero(),
@"image-offset": CGPointMake(15, 12),
@"information-image": [CPNull null],
@"warning-image": [CPNull null],
@"error-image": [CPNull null],
@"help-image": [CPNull null],
@"help-image-left-offset": 15,
@"help-image-pressed": [CPNull null],
@"suppression-button-y-offset": 0.0,
@"suppression-button-x-offset": 0.0,
@"default-elements-margin": 3.0,
@"suppression-button-text-color": [CPColor blackColor],
@"suppression-button-text-font": [CPFont systemFontOfSize:12.0],
@"suppression-button-text-shadow-color": [CPNull null],
@"suppression-button-text-shadow-offset": 0.0,
@"modal-window-button-margin-y": 0.0,
@"modal-window-button-margin-x": 0.0,
@"standard-window-button-margin-y": 0.0,
@"standard-window-button-margin-x": 0.0,
};
}

@end
17 changes: 1 addition & 16 deletions AppKit/CPAnimation.j
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,10 @@ var CPAnimationDelegate_animationShouldStart_ = 1 << 1,
CPAnimationDelegate_animationDidEnd_ = 1 << 3,
CPAnimationDelegate_animationDidStop_ = 1 << 4;

/*
@global
@group CPAnimationCurve
*/
@typedef CPAnimationCurve
CPAnimationEaseInOut = 0;
/*
@global
@group CPAnimationCurve
*/
CPAnimationEaseIn = 1;
/*
@global
@group CPAnimationCurve
*/
CPAnimationEaseOut = 2;
/*
@global
@group CPAnimationCurve
*/
CPAnimationLinear = 3;

ACTUAL_FRAME_RATE = 0;
Expand Down
2 changes: 2 additions & 0 deletions AppKit/CPApplication.j
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
@import "CPWindowController.j"
@import "_CPPopoverWindow.j"

@typedef CPModalSession

var CPMainCibFile = @"CPMainCibFile",
CPMainCibFileHumanFriendly = @"Main cib file base name",
CPEventModifierFlags = 0;
Expand Down
2 changes: 1 addition & 1 deletion AppKit/CPArrayController.j
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/

@import <Foundation/CPIndexSet.j>

@import <Foundation/CPPredicate.j>
@import "CPObjectController.j"
@import "CPKeyValueBinding.j"

Expand Down
3 changes: 3 additions & 0 deletions AppKit/CPBox.j
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,22 @@
@import "CPView.j"

// CPBoxType
@typedef CPBoxType
CPBoxPrimary = 0;
CPBoxSecondary = 1;
CPBoxSeparator = 2;
CPBoxOldStyle = 3;
CPBoxCustom = 4;

// CPBorderType
@typedef CPBorderType
CPNoBorder = 0;
CPLineBorder = 1;
CPBezelBorder = 2;
CPGrooveBorder = 3;

// CPTitlePosition
@typedef CPTitlePosition
CPNoTitle = 0;
CPAboveTop = 1;
CPAtTop = 2;
Expand Down
4 changes: 2 additions & 2 deletions AppKit/CPButton.j
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
@import "CPWindow_Constants.j"

/* @group CPBezelStyle */

// IB style
@typedef CPBezelStyle
CPRoundedBezelStyle = 1; // Push
CPRegularSquareBezelStyle = 2; // Bevel
CPThickSquareBezelStyle = 3;
Expand All @@ -49,6 +48,7 @@ CPHUDBezelStyle = -1;


/* @group CPButtonType */
@typedef CPButtonType
CPMomentaryLightButton = 0;
CPPushOnPushOffButton = 1;
CPToggleButton = 2;
Expand Down
1 change: 1 addition & 0 deletions AppKit/CPCollectionView.j
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
@import "CPPasteboard.j"
@import "CPView.j"

@class _CPCollectionViewDropIndicator

var CPCollectionViewDelegate_collectionView_acceptDrop_index_dropOperation_ = 1 << 0,
CPCollectionViewDelegate_collectionView_canDragItemsAtIndexes_withEvent_ = 1 << 1,
Expand Down
3 changes: 3 additions & 0 deletions AppKit/CPColorPanel.j
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
@import "CPView.j"

@class CPSlider
@class _CPColorPanelToolbar
@class _CPColorPanelSwatches
@class _CPColorPanelPreview

@global CPApp

Expand Down
2 changes: 2 additions & 0 deletions AppKit/CPColorPicker.j
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
@import "CPView.j"

@class CPSlider
@class CPColorPanel
@class __CPColorWheel

@global CPColorPickerViewWidth
@global CPColorPickerViewHeight
Expand Down
26 changes: 13 additions & 13 deletions AppKit/CPComboBox.j
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@ var CPComboBoxTextSubview = @"text",

@implementation CPComboBox : CPTextField
{
CPArray _items;
_CPPopUpList _listDelegate;
CPComboBoxDataSource _dataSource;
BOOL _usesDataSource;
BOOL _completes;
BOOL _canComplete;
int _numberOfVisibleItems;
BOOL _forceSelection;
BOOL _hasVerticalScroller;
CPString _selectedStringValue;
CGSize _intercellSpacing;
float _itemHeight;
BOOL _popUpButtonCausedResign;
CPArray _items;
_CPPopUpList _listDelegate;
id<CPComboBoxDataSource> _dataSource;
BOOL _usesDataSource;
BOOL _completes;
BOOL _canComplete;
int _numberOfVisibleItems;
BOOL _forceSelection;
BOOL _hasVerticalScroller;
CPString _selectedStringValue;
CGSize _intercellSpacing;
float _itemHeight;
BOOL _popUpButtonCausedResign;
}

+ (CPString)defaultThemeClass
Expand Down
6 changes: 6 additions & 0 deletions AppKit/CPControl.j
Original file line number Diff line number Diff line change
Expand Up @@ -42,28 +42,33 @@

@end

@typedef CPTextAlignment
CPLeftTextAlignment = 0;
CPRightTextAlignment = 1;
CPCenterTextAlignment = 2;
CPJustifiedTextAlignment = 3;
CPNaturalTextAlignment = 4;

@typedef CPControlSize
CPRegularControlSize = 0;
CPSmallControlSize = 1;
CPMiniControlSize = 2;

@typedef CPLineBreakMode
CPLineBreakByWordWrapping = 0;
CPLineBreakByCharWrapping = 1;
CPLineBreakByClipping = 2;
CPLineBreakByTruncatingHead = 3;
CPLineBreakByTruncatingTail = 4;
CPLineBreakByTruncatingMiddle = 5;

@typedef CPVerticalTextAlignment
CPTopVerticalTextAlignment = 1;
CPCenterVerticalTextAlignment = 2;
CPBottomVerticalTextAlignment = 3;

// Deprecated for use with images, use the CPImageScale constants
@typedef CPImageScaling
CPScaleProportionally = 0;
CPScaleToFit = 1;
CPScaleNone = 2;
Expand All @@ -73,6 +78,7 @@ CPImageScaleAxesIndependently = 1;
CPImageScaleNone = 2;
CPImageScaleProportionallyUpOrDown = 3;

@typedef CPCellImagePosition
CPNoImage = 0;
CPImageOnly = 1;
CPImageLeft = 2;
Expand Down
9 changes: 6 additions & 3 deletions AppKit/CPDatePicker/_CPDatePickerCalendar.j
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
@import <Foundation/Foundation.j>

@class CPDatePicker
@class _CPDatePickerMonthView
@class _CPDatePickerHeaderView
@class _CPDatePickerBox

@global CPApp
@global CPSingleDateMode
Expand Down Expand Up @@ -63,7 +66,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
_CPDatePickerMonthView _monthView;
_CPDatePickerHeaderView _headerView;
_CPDatePickerClock _datePickerClock;
CPBox _box;
_CPDatePickerBox _box;
CPDatePicker _datePicker;
CPInteger _startSelectionIndex;
CPInteger _currentSelectionIndex;
Expand Down Expand Up @@ -97,7 +100,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
sizeCalendar = [_datePicker valueForThemeAttribute:@"size-calendar"],
sizeClock = [_datePicker valueForThemeAttribute:@"size-clock"];

_box = [[_DatePickerBox alloc] initWithFrame:CGRectMake(0, 0, sizeCalendar.width, sizeHeader.height + sizeCalendar.height)];
_box = [[_CPDatePickerBox alloc] initWithFrame:CGRectMake(0, 0, sizeCalendar.width, sizeHeader.height + sizeCalendar.height)];
[_box setDatePicker:_datePicker];

_headerView = [[_CPDatePickerHeaderView alloc] initWithFrame:CGRectMake(0, 0, sizeHeader.width, sizeHeader.height) datePicker:_datePicker delegate:self];
Expand Down Expand Up @@ -1266,7 +1269,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
@end


@implementation _DatePickerBox : CPView
@implementation _CPDatePickerBox : CPView
{
CPDatePicker _datePicker @accessors(property=datePicker);
}
Expand Down
6 changes: 5 additions & 1 deletion AppKit/CPDatePicker/_CPDatePickerTextField.j
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
@import <Foundation/CPLocale.j>

@class CPDatePicker
@class _CPDatePickerElementTextField
@class _CPDatePickerElementView
@class _CPDatePickerMonthView
@class _CPDatePickerHeaderView

@global CPSingleDateMode
@global CPRangeDateMode
Expand Down Expand Up @@ -1847,4 +1851,4 @@ var CPMonthDateType = 0,
return CGRectMakeCopy(bounds);
}

@end
@end
1 change: 1 addition & 0 deletions AppKit/CPDragServer_Constants.j
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

@typedef CPDragOperation
CPDragOperationNone = 0;
CPDragOperationCopy = 1 << 1;
CPDragOperationLink = 1 << 1;
Expand Down
5 changes: 5 additions & 0 deletions AppKit/CPEvent.j
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,14 @@
@import "CPText.j"

@class CPTextField
@class CPWindow

@global CPApp

@typedef DOMEvent
@typedef CPEventType


var _CPEventPeriodicEventPeriod = 0,
_CPEventPeriodicEventTimer = nil,
_CPEventUpperCaseRegex = new RegExp("[A-Z]"),
Expand Down
1 change: 1 addition & 0 deletions AppKit/CPImageView.j
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
@global CPImagesPboardType
@global appkit_tag_dom_elements

@typedef CPImageAlignment
CPImageAlignCenter = 0;
CPImageAlignTop = 1;
CPImageAlignTopLeft = 2;
Expand Down
1 change: 1 addition & 0 deletions AppKit/CPKeyValueBinding.j
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
var exposedBindingsMap = @{},
bindingsMap = @{};

@typedef CPBindingOperationKind
var CPBindingOperationAnd = 0,
CPBindingOperationOr = 1;

Expand Down
Loading

0 comments on commit b2557c3

Please sign in to comment.