From f6defc091c89dd868b6b2d3ec2f11a515409bd85 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 17:50:25 -0800 Subject: [PATCH 1/4] cleanup --- AppKit/CPMenu/CPMenu.j | 4 ---- 1 file changed, 4 deletions(-) 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; From 676efe247f98341fb0e98347fb9125882e7a1f7f Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 17:50:51 -0800 Subject: [PATCH 2/4] make toolbar art pixel perfect --- AppKit/Themes/Aristo/ThemeDescriptors.j | 118 ++++++++++++++++++ .../Resources/toolbar-background-center.png | Bin 1011 -> 1856 bytes .../Resources/toolbar-background-top.png | Bin 991 -> 0 bytes AppKit/Themes/Aristo2/ThemeDescriptors.j | 6 +- 4 files changed, 121 insertions(+), 3 deletions(-) delete mode 100644 AppKit/Themes/Aristo2/Resources/toolbar-background-top.png 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 e459f1aedda88a69644d5ef4078d959520ca6943..6dee1d552da934422d0d86eb18d0bac4927af319 100644 GIT binary patch delta 1608 zcmey&et>U+c)b+|8v_GF;R@sD3=AwPna<7up3cq+0Y&*~nK`Kp3>Jc|q4)D|hltp9 z<_9eivsZ|4Z|^#~J~TLbr?k}CV{D$2m%jB9Tl(^bmdX<=^Ujsh?6+TTTjgKfXwLSB z(cvaDzlV(?FI!Ue&2I;`cm}s?t@8A!esP3fQSB{j=)>J*N%iW%M`FJII&FF1^11c% zxZ5ta@tIp^NrrYzTfJ`Xd6lV?my1oA=i7B@^A&IAE304n=}tU-R!Hxl==XE4AIf%d zoPIm;-9Nu?%KNLj?_BIu@;{I#DqAc0gD3FJmF#WaBKz5Y|H$0VcIUIqhs$OxOskou z*Uk~DxOiOM)=$x%v+sh|>w3|(9DCSo_S{I*-<}xHEOBD;!_YkGT}o*aH?N(PSaklO zet+S1!~gtxvrE6ciEWPfJ!k38>vwu4*0cWT|8=Q` zsX{*R%gRZ$CHJ1Y$H%V~xyN>owfbVga&F(>S*3>6G7=jvepP)v8rU1`x2)Z> zg7xerD|6#TVxPRjv-8%ibiB20R%9UeU!$4Uas4MWb9YZYG)4Y2->$NSlBdPIj$M4I zR=+l_DqZl_4c6WB#BWWQfA`Xx5;lp-8}@sw>h+(o$=r^;5|p%U@d5W2E-uP`V!BCJ zS9)1537BUz<;Y$)GaFT-6D_TWPbV5G`Ck&sxm#)3|M+-I&nEG`x{CsrS|49uu>a)7 z2>alhjDO^lHoq~DP8VLX!TiSTHyqvvtq$_BauwxTiE3T0)%f~(kAG>1n3Z3^r#}w0 z8XbY>ZoaRV`gOMdU)!t=-r8T3{Vy1rM86eQU>D9PHNRxHJUiR|4WG>^w%tF@z1^3c zUGk^!bMM{m+~Z~&@{Vmg^y9|*jki7#m(pLA*s1#_>akkxe!q9V>W%94@rlBByJ9o0X3sZO5B57%{Y3ofls|j^ zY_gHwAhI)FZu0Ucdq2G4{C1Y-uk2ol60XfzzFVtxKe9-e@T;=TWxIYX$460ykJ z^CvG0GCOhX#uw$~WifM}POI;#u$tGU?$PYkCwXC z_Q9{_nen1-_OHA4K6<{`;|bfuV5<%Hf6Kn~ess5F`^Ace@1f__U99EJrT(uom$Hsm z`Y(1d^|O5>Lt#aZw6-v?_~0z?h%9Dc;0Cg}g&7%U&5>YWV5*qtB|UMrj&Ou;fP!;= zQL2Keo}r$Rk{y?V!en+vCpI7r1d}}(<-{ONFkeBTA~z?m*s3D8VDdsnIa#oJsEiFz z(8{?eHL)bWC?r2W$8PdTCRsxpeRN@{aW?uzDQQ+Nsl~}fnFS@8`FS9#fdH44C7EfH z7ch#~1L-t|=i(`m{WOBvNPfzRB z*c1|eeSa^{+`{^-sq_E;|G{c*EsXyq^&HCnuogrwv|Sr#$nLwtYi4ry~U Y9Ii0_d!bfxD$pnfPgg&ebxsLQ07yu+U;qFB literal 1011 zcmbVLJ#W)M7&e3fRdhgI3IjSh69|8tKQ6HqQ#p1_BjL76Bglks>`P)=`;2`hZbv3q z`5`P!hygJ&qDly{@e9~k7|J<~3rJN5EZcYQ-TOT6_p6<)`>QKAS2&Ja?QgmRwq9bN zarH9$myf^PV#^KM8_``dq4OZeoE?!d2K^+M;sFk#!)KpxhvOQPcsQaX|A85jL<}k& zu}m_C=D5yAnFZk4;~wag zCL>5N4M3Ufr-fNs{DRkH`|4QY!9s=ZS^TL}BYy`tB*#D(RUwoi1PF;x(-DGqfg(di zlG%#{sF^x4l@?e&JhPTZ6La8tOIu8`_!*^{DM|DBT%4;S$)^%D45Q*u6oF|7#bHW= zQb>zt&EVo9%;Sv4Bn1^?FeV4o;+dzXAtagapAo0UGEppLQW<0t6lEz%s<;-~1s&i& zZk(%K3=cCb4RApY@{rYI(yYNOcNZI~6qz^Xb{?~$1p6)t4-%ZxzH9O9MvUUflwq4? zv8Bl^MMiB14JaF~>mkp!Jr%i1&2b*K-L-pa%hR-;Vnf(d+7NXeB+Mb9-P7!4Cf&LI`TOm+ P)fo1BTkf0glNY}MNq9A{ 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 ed3e9bd84b6d60091ebf665921b2f0a767195a8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 991 zcmbVL&u-H&7|+Herb*MzaI&&1P3*LBlW5sUlZI6yV`?i=#058T*Jw+eIUdb+Lfp9V z9!Q+Hao`M(z<~oVz$@T%%>ZfIfhdXn+28N?{eO3S^kjSM;g+H(+k?YkDA%?6+gz9b z_lwaFxjYd4i5Rh&SP)JXFJV&(1{pb_LrRj%^RIMIQSQys@kC6br%uc=jnq0?l@$`L zD0>H0LE=*?z?7b(xvT#A{6z(6;;PTh2u6iZ=jq`Ur=zQ*aeQ?e+lhLx5B4fY5@b{m zP-SO%=~S+| zLqN-zr-eva4r)d+Wf#I#rKi^+WJMI+5a;D8Q8HzEMG75hP|vbDuBCP5cP@r?M#IEMW0PMsqO;Tvgs^Nt!qiSu%^=4(u8b zTL{?*+CdQF(DTAJ4vdE5Hmue2`t5FLb^3;fP~Wf+?)ey+USPIu?Drb%ATI^UW7^nF zrQH>_dneZMIVFPeF=J;<2OQ6tVC9?@z#o|)B5|76a$TP5XamaA*E9(^%fK?fPI`-d zX#X3x)kUG*ff!@h3$3=VuCU4fpIYZXHy*!PQ#L-WzxeR2w^@(epnnv6?7e#X8?tCCH~;_u diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index 2d2231898..2c9862b8f 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], From b6c31757a71200f660f83e22964e10eb52d8ce21 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 17:55:06 -0800 Subject: [PATCH 3/4] fix a bug in CPWindow using old AppKit resource --- AppKit/CPWindow/CPWindow.j | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) 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 From 0a92b98110055dce89d6480f945da3374647a825 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 18:13:02 -0800 Subject: [PATCH 4/4] Comment out non-implemented HUD descriptors --- AppKit/Themes/Aristo2/ThemeDescriptors.j | 50 ++++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index 2c9862b8f..236c0e29c 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -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 {