diff --git a/AppKit/CPMenu/CPMenu.j b/AppKit/CPMenu/CPMenu.j index cae9b7723..958114b91 100644 --- a/AppKit/CPMenu/CPMenu.j +++ b/AppKit/CPMenu/CPMenu.j @@ -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; diff --git a/AppKit/CPWindow/CPWindow.j b/AppKit/CPWindow/CPWindow.j index 900f16d87..c0d58dd89 100644 --- a/AppKit/CPWindow/CPWindow.j +++ b/AppKit/CPWindow/CPWindow.j @@ -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 diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index 52e6e949c..a7e78295b 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -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 diff --git a/AppKit/Themes/Aristo2/Resources/toolbar-background-center.png b/AppKit/Themes/Aristo2/Resources/toolbar-background-center.png index e459f1aed..6dee1d552 100644 Binary files a/AppKit/Themes/Aristo2/Resources/toolbar-background-center.png and b/AppKit/Themes/Aristo2/Resources/toolbar-background-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/toolbar-background-top.png b/AppKit/Themes/Aristo2/Resources/toolbar-background-top.png deleted file mode 100644 index ed3e9bd84..000000000 Binary files a/AppKit/Themes/Aristo2/Resources/toolbar-background-top.png and /dev/null differ diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index 4a94def50..2c600c426 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -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 {