colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-12 05:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Aristo2' of github.mv.usa.alcatel.com:amercada/Cappuccino into Aristo2

Browse Source
This commit is contained in:
Alexandre Wilhelm
2013-01-10 18:15:03 -08:00
parent 8ffa8b6657 0a92b98110
commit c6f0589ed5
6 changed files with 147 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPMenu/CPMenu.j
-4
View File
@@ -38,12 +38,8 @@ CPMenuDidRemoveItemNotification = @"CPMenuDidRemoveItemNotification";
CPMenuDidEndTrackingNotification = @"CPMenuDidEndTrackingNotification";
//var MENUBAR_HEIGHT = 28.0;
var _CPMenuBarVisible = NO,
_CPMenuBarTitle = @"",
// _CPMenuBarIconImage = nil,
// _CPMenuBarIconImageAlphaValue = 1.0,
_CPMenuBarAttributes = nil,
_CPMenuBarSharedWindow = nil;
AppKit/CPWindow/CPWindow.j
+1 -16
View File
@@ -198,7 +198,6 @@ CPWindowResizeStyle = CPWindowResizeStyleModern;
CPWindowResizeSlop = 3;
var CPWindowSaveImage = nil,
CPWindowSavingImage = nil,
CPWindowResizeTime = 0.2,
CPWindowResizeStyleGlobalChangeNotification = @"CPWindowResizeStyleGlobalChangeNotification";
@@ -355,20 +354,6 @@ var CPWindowActionMessageKeys = [
_CPWindowFrameAnimation _frameAnimation;
}
/*
Private initializer for Objective-J
@ignore
*/
+ (void)initialize
{
if (self !== [CPWindow class])
return;
var bundle = [CPBundle bundleForClass:[CPWindow class]];
CPWindowSavingImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(16.0, 16.0)]
}
- (id)init
{
return [self initWithContentRect:_CGRectMakeZero() styleMask:CPTitledWindowMask];
@@ -2093,7 +2078,7 @@ CPTexturedBackgroundWindowMask
CPWindowSaveImage = [item image];
[item setTitle:@"Saving..."];
[item setImage:CPWindowSavingImage];
[item setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"spinning-regular-gif" forClass:CPProgressIndicator]];
[item setEnabled:NO];
}
else
AppKit/Themes/Aristo/ThemeDescriptors.j
+118
View File
@@ -2508,6 +2508,124 @@ var themedButtonValues = nil,
return menuItemMenuBarView;
}
+ (_CPMenuItemStandardView)themedMenuItemStandardView
{
var menuItemStandardView = [[_CPMenuItemStandardView alloc] initWithFrame:CGRectMakeZero()],
menuItemDefaultOnStateImage = PatternImage(@"menu-item-on-state.png", 14.0, 14.0),
menuItemDefaultOnStateHighlightedImage = PatternImage(@"menu-item-on-state-highlighted.png", 14.0, 14.0),
themeValues =
[
[@"submenu-indicator-color", [CPColor grayColor]],
[@"menu-item-selection-color", [CPColor colorWithHexString:@"5C85D8"]],
[@"menu-item-text-shadow-color", [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0]],
[@"menu-item-default-off-state-image", nil],
[@"menu-item-default-off-state-highlighted-image", nil],
[@"menu-item-default-on-state-image", menuItemDefaultOnStateImage],
[@"menu-item-default-on-state-highlighted-image", menuItemDefaultOnStateHighlightedImage],
[@"menu-item-default-mixed-state-image", nil],
[@"menu-item-default-mixed-state-highlighted-image", nil],
[@"left-margin", 3.0],
[@"right-margin", 17.0],
[@"state-column-width", 14.0],
[@"indentation-width", 17.0],
[@"vertical-margin", 4.0],
[@"right-columns-margin", 30.0]
];
[self registerThemeValues:themeValues forView:menuItemStandardView];
return menuItemStandardView;
}
+ (_CPMenuView)themedMenuView
{
var menuView = [[_CPMenuView alloc] initWithFrame:CGRectMakeZero()],
menuWindowMoreAboveImage = PatternImage(@"menu-window-more-above.png", 38.0, 18.0),
menuWindowMoreBelowImage = PatternImage(@"menu-window-more-below.png", 38.0, 18.0),
generalIconNew = PatternImage(@"menu-general-icon-new.png", 16.0, 16.0),
generalIconNewHighlighted = PatternImage(@"menu-general-icon-new-highlighted.png", 16.0, 16.0),
generalIconOpen = PatternImage(@"menu-general-icon-open.png", 16.0, 16.0),
generalIconOpenHighlighted = PatternImage(@"menu-general-icon-open-highlighted.png", 16.0, 16.0),
generalIconSave = PatternImage(@"menu-general-icon-save.png", 16.0, 16.0),
generalIconSaveHighlighted = PatternImage(@"menu-general-icon-save-highlighted.png", 16.0, 16.0),
menuWindowPopUpBackgroundStyleColor = PatternColor(
[
[@"menu-window-rounded-0.png", 6.0, 6.0],
[@"menu-window-1.png", 1.0, 6.0],
[@"menu-window-rounded-2.png", 6.0, 6.0],
[@"menu-window-3.png", 6.0, 1.0],
[@"menu-window-4.png", 1.0, 1.0],
[@"menu-window-5.png", 6.0, 1.0],
[@"menu-window-rounded-6.png", 6.0, 6.0],
[@"menu-window-7.png", 1.0, 6.0],
[@"menu-window-rounded-8.png", 6.0, 6.0]
]
),
menuWindowMenuBarBackgroundStyleColor = PatternColor(
[
[@"menu-window-3.png", 6.0, 0.0],
[@"menu-window-4.png", 1.0, 0.0],
[@"menu-window-5.png", 6.0, 0.0],
[@"menu-window-3.png", 6.0, 1.0],
[@"menu-window-4.png", 1.0, 1.0],
[@"menu-window-5.png", 6.0, 1.0],
[@"menu-window-rounded-6.png", 6.0, 6.0],
[@"menu-window-7.png", 1.0, 6.0],
[@"menu-window-rounded-8.png", 6.0, 6.0]
]
),
menuBarWindowBackgroundColor = PatternColor(@"menu-bar-window-background.png", 1.0, 30.0),
themeValues =
[
[@"menu-window-more-above-image", menuWindowMoreAboveImage],
[@"menu-window-more-below-image", menuWindowMoreBelowImage],
[@"menu-window-pop-up-background-style-color", menuWindowPopUpBackgroundStyleColor],
[@"menu-window-menu-bar-background-style-color", menuWindowMenuBarBackgroundStyleColor],
[@"menu-window-margin-inset", CGInsetMake(5.0, 1.0, 5.0, 1.0)],
[@"menu-window-scroll-indicator-height", 16.0],
[@"menu-bar-window-background-color", menuBarWindowBackgroundColor],
[@"menu-bar-window-font", [CPFont boldSystemFontOfSize:[CPFont systemFontSize]]],
[@"menu-bar-window-height", 30.0],
[@"menu-bar-window-margin", 10.0],
[@"menu-bar-window-left-margin", 10.0],
[@"menu-bar-window-right-margin", 10.0],
[@"menu-bar-text-color", [CPColor colorWithRed:0.051 green:0.2 blue:0.275 alpha:1.0]],
[@"menu-bar-title-color", [CPColor colorWithRed:0.051 green:0.2 blue:0.275 alpha:1.0]],
[@"menu-bar-text-shadow-color", [CPColor whiteColor]],
[@"menu-bar-title-shadow-color", [CPColor whiteColor]],
[@"menu-bar-highlight-color", [CPColor colorWithCalibratedRed:94.0 / 255.0 green:130.0 / 255.0 blue:186.0 / 255.0 alpha:1.0]],
[@"menu-bar-highlight-text-color", [CPColor whiteColor]],
[@"menu-bar-highlight-text-shadow-color", [CPColor blackColor]],
[@"menu-bar-height", 28.0],
[@"menu-bar-icon-image", nil],
[@"menu-bar-icon-image-alpha-value", 1.0],
[@"menu-general-icon-new", generalIconNew],
[@"menu-general-icon-new", generalIconNewHighlighted, CPThemeStateHighlighted],
[@"menu-general-icon-save", generalIconSave],
[@"menu-general-icon-save", generalIconSaveHighlighted, CPThemeStateHighlighted],
[@"menu-general-icon-open", generalIconOpen],
[@"menu-general-icon-open", generalIconOpenHighlighted, CPThemeStateHighlighted]
];
[self registerThemeValues:themeValues forView:menuView];
return menuView;
}
@end
AppKit/Themes/Aristo2/Resources/toolbar-background-center.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1011 B

After

Width:  |  Height:  |  Size: 1.8 KiB

AppKit/Themes/Aristo2/Resources/toolbar-background-top.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 991 B

AppKit/Themes/Aristo2/ThemeDescriptors.j
+28 -28
View File
@@ -2074,8 +2074,8 @@ var themedButtonValues = nil,
toolbarBackgroundColor = PatternColor(
[
[@"toolbar-background-top.png", 1.0, 1.0],
[@"toolbar-background-center.png", 1.0, 57.0],
nil,
[@"toolbar-background-center.png", 1.0, 58.0],
[@"toolbar-background-bottom.png", 1.0, 1.0]
], PatternIsVertical)
@@ -2240,7 +2240,7 @@ var themedButtonValues = nil,
[@"menu-bar-highlight-color", [CPColor colorWithCalibratedRed:94.0 / 255.0 green:130.0 / 255.0 blue:186.0 / 255.0 alpha:1.0]],
[@"menu-bar-highlight-text-color", [CPColor whiteColor]],
[@"menu-bar-highlight-text-shadow-color", [CPColor blackColor]],
[@"menu-bar-height", 28.0],
[@"menu-bar-height", 30.0],
[@"menu-bar-icon-image", nil],
[@"menu-bar-icon-image-alpha-value", 1.0],
@@ -2335,31 +2335,31 @@ var themedButtonValues = nil,
return button;
}
+ (CPScroller)themedVerticalScroller
{
var scroller = [Aristo2ThemeDescriptor makeVerticalScroller],
overrides =
[
[@"knob-color", nil, CPThemeStateVertical | CPThemeStateDisabled]
];
[self registerThemeValues:[self defaultThemeOverridesAddedTo:overrides] forView:scroller inherit:themedVerticalScrollerValues];
return scroller;
}
+ (CPScroller)themedHorizontalScroller
{
var scroller = [Aristo2ThemeDescriptor makeHorizontalScroller],
overrides =
[
[@"knob-color", nil, CPThemeStateDisabled]
];
[self registerThemeValues:[self defaultThemeOverridesAddedTo:overrides] forView:scroller inherit:themedHorizontalScrollerValues];
return scroller;
}
// + (CPScroller)themedVerticalScroller
// {
// var scroller = [Aristo2ThemeDescriptor makeVerticalScroller],
// overrides =
// [
// [@"knob-color", nil, CPThemeStateVertical | CPThemeStateDisabled]
// ];
//
// [self registerThemeValues:[self defaultThemeOverridesAddedTo:overrides] forView:scroller inherit:themedVerticalScrollerValues];
//
// return scroller;
// }
//
// + (CPScroller)themedHorizontalScroller
// {
// var scroller = [Aristo2ThemeDescriptor makeHorizontalScroller],
// overrides =
// [
// [@"knob-color", nil, CPThemeStateDisabled]
// ];
//
// [self registerThemeValues:[self defaultThemeOverridesAddedTo:overrides] forView:scroller inherit:themedHorizontalScrollerValues];
//
// return scroller;
// }
+ (CPSlider)themedHorizontalSlider
{