From c81b8fb3c382ebd6fafde3b51a7b09b1ae785aa8 Mon Sep 17 00:00:00 2001 From: Alexander Ljungberg Date: Tue, 8 Jan 2013 18:07:15 +0000 Subject: [PATCH 01/10] Formatting. --- AppKit/CPCookie.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppKit/CPCookie.j b/AppKit/CPCookie.j index 76ae57560..cbbf45e27 100644 --- a/AppKit/CPCookie.j +++ b/AppKit/CPCookie.j @@ -94,7 +94,7 @@ domain = ""; #if PLATFORM(DOM) - document.cookie = _cookieName+"="+value+expires+"; path=/"+domain; + document.cookie = _cookieName + "=" + value + expires + "; path=/" + domain; #else _cookieValue = value; _expires = expires; From 32eafb770851605e2df8dc241f9ed7c80745e9d8 Mon Sep 17 00:00:00 2001 From: Alexander Ljungberg Date: Tue, 8 Jan 2013 18:21:29 +0000 Subject: [PATCH 02/10] Fix import. --- AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j b/AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j index a16b0d13a..d2f182647 100644 --- a/AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j +++ b/AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j @@ -3,7 +3,7 @@ * Copyright (c) 2011 Pear, Inc. All rights reserved. */ -@import @"CPPopUpButton.j" +@import "CPPopUpButton.j" var GRADIENT_START_COLOR = "#fcfcfc", GRADIENT_END_COLOR = "#dfdfdf", From 50031dbc89102dd1780b4944282815fd84f0c5a0 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Tue, 8 Jan 2013 16:29:06 -0800 Subject: [PATCH 03/10] Remove wrong import string --- AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j b/AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j index a16b0d13a..d2f182647 100644 --- a/AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j +++ b/AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j @@ -3,7 +3,7 @@ * Copyright (c) 2011 Pear, Inc. All rights reserved. */ -@import @"CPPopUpButton.j" +@import "CPPopUpButton.j" var GRADIENT_START_COLOR = "#fcfcfc", GRADIENT_END_COLOR = "#dfdfdf", From b82225e27991e6f2fff10dfe7e54dae8cae46e07 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Tue, 8 Jan 2013 17:05:33 -0800 Subject: [PATCH 04/10] Make CPLevelIndicator themable --- AppKit/CPLevelIndicator.j | 87 ++++++++++----------------------------- 1 file changed, 22 insertions(+), 65 deletions(-) diff --git a/AppKit/CPLevelIndicator.j b/AppKit/CPLevelIndicator.j index 27d688800..8ae219b2e 100644 --- a/AppKit/CPLevelIndicator.j +++ b/AppKit/CPLevelIndicator.j @@ -32,14 +32,6 @@ CPContinuousCapacityLevelIndicatorStyle = 1; CPDiscreteCapacityLevelIndicatorStyle = 2; CPRatingLevelIndicatorStyle = 3; -var _CPLevelIndicatorBezelColor = nil, - _CPLevelIndicatorSegmentEmptyColor = nil, - _CPLevelIndicatorSegmentNormalColor = nil, - _CPLevelIndicatorSegmentWarningColor = nil, - _CPLevelIndicatorSegmentCriticalColor = nil, - - _CPLevelIndicatorSpacing = 1; - /*! @ingroup appkit @class CPLevelIndicator @@ -62,59 +54,23 @@ var _CPLevelIndicatorBezelColor = nil, BOOL _isTracking; } -+ (void)initialize ++ (CPString)defaultThemeClass { - if (self !== [CPLevelIndicator class]) - return; - - var bundle = [CPBundle bundleForClass:CPLevelIndicator]; - - _CPLevelIndicatorBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices: - [ - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-left.png"] size:CGSizeMake(3.0, 18.0)], - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-center.png"] size:CGSizeMake(1.0, 18.0)], - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-right.png"] size:CGSizeMake(3.0, 18.0)] - ] - isVertical:NO - ]]; - - _CPLevelIndicatorSegmentEmptyColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices: - [ - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-left.png"] size:CGSizeMake(3.0, 17.0)], - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-center.png"] size:CGSizeMake(1.0, 17.0)], - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-right.png"] size:CGSizeMake(3.0, 17.0)] - ] - isVertical:NO - ]]; - - _CPLevelIndicatorSegmentNormalColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices: - [ - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-left.png"] size:CGSizeMake(3.0, 17.0)], - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-center.png"] size:CGSizeMake(1.0, 17.0)], - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-right.png"] size:CGSizeMake(3.0, 17.0)] - ] - isVertical:NO - ]]; - - _CPLevelIndicatorSegmentWarningColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices: - [ - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-left.png"] size:CGSizeMake(3.0, 17.0)], - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-center.png"] size:CGSizeMake(1.0, 17.0)], - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-right.png"] size:CGSizeMake(3.0, 17.0)] - ] - isVertical:NO - ]]; - - _CPLevelIndicatorSegmentCriticalColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices: - [ - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-left.png"] size:CGSizeMake(3.0, 17.0)], - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-center.png"] size:CGSizeMake(1.0, 17.0)], - [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-right.png"] size:CGSizeMake(3.0, 17.0)] - ] - isVertical:NO - ]]; + return "level-indicator"; } ++ (id)themeAttributes +{ + return [CPDictionary dictionaryWithObjectsAndKeys: [CPNull null], @"bezel-color", + [CPNull null], @"color-empty", + [CPNull null], @"color-normal", + [CPNull null], @"color-warning", + [CPNull null], @"color-critical", + 1.0, @"spacing"]; +} + + + - (id)initWithFrame:(CGRect)aFrame { self = [super initWithFrame:aFrame]; @@ -142,20 +98,20 @@ var _CPLevelIndicatorBezelColor = nil, positioned:CPWindowBelow relativeToEphemeralSubviewNamed:nil]; // TODO Make themable. - [bezelView setBackgroundColor:_CPLevelIndicatorBezelColor]; + [bezelView setBackgroundColor:[self valueForThemeAttribute:@"bezel-color"]]; var segmentCount = _maxValue - _minValue; if (segmentCount <= 0) return; - var filledColor = _CPLevelIndicatorSegmentNormalColor, + var filledColor = [self valueForThemeAttribute:@"color-normal"], value = [self doubleValue]; if (value <= _criticalValue) - filledColor = _CPLevelIndicatorSegmentCriticalColor; + filledColor = [self valueForThemeAttribute:@"color-critical"]; else if (value <= _warningValue) - filledColor = _CPLevelIndicatorSegmentWarningColor; + filledColor = [self valueForThemeAttribute:@"color-warning"]; for (var i = 0; i < segmentCount; i++) { @@ -163,7 +119,7 @@ var _CPLevelIndicatorBezelColor = nil, positioned:CPWindowAbove relativeToEphemeralSubviewNamed:bezelView]; - [segmentView setBackgroundColor:(_minValue + i) < value ? filledColor : _CPLevelIndicatorSegmentEmptyColor]; + [segmentView setBackgroundColor:(_minValue + i) < value ? filledColor : [self valueForThemeAttribute:@"color-empty"]]; } } @@ -194,11 +150,12 @@ var _CPLevelIndicatorBezelColor = nil, return _CGRectMakeZero(); var basicSegmentWidth = bounds.size.width / segmentCount, - segmentFrame = CGRectCreateCopy([self bounds]); + segmentFrame = CGRectCreateCopy([self bounds]), + spacing = [self valueForThemeAttribute:@"spacing"]; segmentFrame.origin.y = (_CGRectGetHeight(bounds) - bezelHeight) / 2.0; segmentFrame.origin.x = FLOOR(segment * basicSegmentWidth); - segmentFrame.size.width = (segment == segmentCount - 1) ? bounds.size.width - segmentFrame.origin.x : FLOOR(((segment + 1) * basicSegmentWidth)) - FLOOR((segment * basicSegmentWidth)) - _CPLevelIndicatorSpacing; + segmentFrame.size.width = (segment == segmentCount - 1) ? bounds.size.width - segmentFrame.origin.x : FLOOR(((segment + 1) * basicSegmentWidth)) - FLOOR((segment * basicSegmentWidth)) - spacing; segmentFrame.size.height = segmentHeight; return segmentFrame; From 911df72aeb315d7f6af9fb50e2804d34e2c132de Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Tue, 8 Jan 2013 17:05:58 -0800 Subject: [PATCH 05/10] Add theme for CPLevelIndicator --- .../level-indicator-bezel-center.png | Bin 0 -> 75 bytes .../Resources/level-indicator-bezel-left.png | Bin 0 -> 106 bytes .../Resources/level-indicator-bezel-right.png | Bin 0 -> 108 bytes ...evel-indicator-segment-critical-center.png | Bin 0 -> 143 bytes .../level-indicator-segment-critical-left.png | Bin 0 -> 172 bytes ...level-indicator-segment-critical-right.png | Bin 0 -> 194 bytes .../level-indicator-segment-empty-center.png | Bin 0 -> 108 bytes .../level-indicator-segment-empty-left.png | Bin 0 -> 126 bytes .../level-indicator-segment-empty-right.png | Bin 0 -> 131 bytes .../level-indicator-segment-normal-center.png | Bin 0 -> 146 bytes .../level-indicator-segment-normal-left.png | Bin 0 -> 173 bytes .../level-indicator-segment-normal-right.png | Bin 0 -> 195 bytes ...level-indicator-segment-warning-center.png | Bin 0 -> 147 bytes .../level-indicator-segment-warning-left.png | Bin 0 -> 172 bytes .../level-indicator-segment-warning-right.png | Bin 0 -> 189 bytes AppKit/Themes/Aristo2/ThemeDescriptors.j | 55 ++++++++++++++++++ 16 files changed, 55 insertions(+) create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-bezel-center.png create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-bezel-left.png create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-bezel-right.png create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-segment-critical-center.png create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-segment-critical-left.png create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-segment-critical-right.png create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-segment-empty-center.png create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-segment-empty-left.png create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-segment-empty-right.png create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-segment-normal-center.png create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-segment-normal-left.png create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-segment-normal-right.png create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-segment-warning-center.png create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-segment-warning-left.png create mode 100644 AppKit/Themes/Aristo2/Resources/level-indicator-segment-warning-right.png diff --git a/AppKit/Themes/Aristo2/Resources/level-indicator-bezel-center.png b/AppKit/Themes/Aristo2/Resources/level-indicator-bezel-center.png new file mode 100644 index 0000000000000000000000000000000000000000..07549e6949f59307e1b4b4e260f5b0c23159c7d0 GIT binary patch literal 75 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{J!2%==;%dx698VX=5RT~N6~ajsf99Kr=x{Q4 XC&gTe~DWM4f^HmU+ literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/level-indicator-bezel-left.png b/AppKit/Themes/Aristo2/Resources/level-indicator-bezel-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6a40c857246f92e88b1ce7e061e998a9ebfc6519 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!}!2%>rR<8j`7<#%mhHykDuY8=EkeZP2^Z2ZP zVlIXa45#hg48Dq=Y7VFmWC^VN-!ZNE=7-e|U5$(kf+ivp*SwTW1!`vSboFyt=akR{ E0JAk9oB#j- literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/level-indicator-bezel-right.png b/AppKit/Themes/Aristo2/Resources/level-indicator-bezel-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a8960f80655a58395bbaf39472cf3419dd26109f GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!}!2%>rR<8j`7<;-nhHykDuM%c*id%MN`^x

IjqA&pn|$1^;M6i=Fchq(`^ox#)9&t;uc GLK6U@PcFR~i-+7i?6Vv|wJlz@c-D^QYxHU*5Iop5>P~@m;}A-zyhQGtOGN tV0+k?t!*hhM%NY{tTw6gH$VR4&&f|xZx?)gS_-s*!PC{xWt~$(699Q*Hr42R z={7GpA-HMzO|1ukN0=*^`xEB=j$pa8)MK(pW9r`B_}$Uu+fJuGJzKXMdX978x{Sq~l*Y*64~IQaQd z^F*ecZY|B@b&nDXrW;mnGmpEm;lt4*t=#rHHXn{Sbk4JP4CVSKao|b~P&V+230Nq+C5+978ywlQ~zUT}VqvNW8SF zlO^a({ZUDWJ@qj>33BW$zt|VnIj)$W@anug2fx$bpWTZl2|8_b&`9f;>638pt>jc5 a9)^=EB^@p%$eRKUWbkzLb6Mw<&;$U}jVRmz literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/level-indicator-segment-empty-right.png b/AppKit/Themes/Aristo2/Resources/level-indicator-segment-empty-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e546ae62d4ea9a231e21d1650c21a725ee6c4a97 GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^%s?#2!2%>V+230Nq`W*`978ywlQ|=f9XL=hb*bK@ z#)YYp-4+uL|C!#(?P2&g`C-F{e~v5S1zxGQ{9<18&tb)Woq9!^6<%%~3fwJ8Z2>+4 f#_1tUmERdMYNRC!691kDn#$nm>gTe~DWM4fMByy= literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/level-indicator-segment-normal-center.png b/AppKit/Themes/Aristo2/Resources/level-indicator-segment-normal-center.png new file mode 100644 index 0000000000000000000000000000000000000000..443ecf43e74846648f509c690568524c2bf4fec4 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{N!3HE{4j&T&Qjwl6jv*Yf$$T6f5y#f-eRxdj z*`l@!Y|qa8dcgK<&8`l%XETDPv!(5inaq}U-K3W-?Rd&lwzSzUH`&rwS7<6sWKek% v^hA0_?52iIcCBr^XBtzd@t$$pV`tCU!7jO3ag)3c&=LkuS3j3^P6! literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/level-indicator-segment-normal-left.png b/AppKit/Themes/Aristo2/Resources/level-indicator-segment-normal-left.png new file mode 100644 index 0000000000000000000000000000000000000000..09616818627fe544531aa13b7e25c7c9ca9b5bd5 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^%s?#2!3HEH%*6D8REejHV+hC0WKIr_6=?|x7ub^6 z#MIQ(bdPN-otVI9Z2URid}09Gj5GF`ex__Yc& z{QdjgPt^SV$*K7H@ptoHayUHx3vIVCg!0Ndz4wg3PC literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/level-indicator-segment-normal-right.png b/AppKit/Themes/Aristo2/Resources/level-indicator-segment-normal-right.png new file mode 100644 index 0000000000000000000000000000000000000000..93d128c981e113b87dd98e6538cd4759451c0b28 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^%s?#2!3HEH%*6D8RF|iVV+e<=?m2C~LjfW!4^LV$ zWpJ8GT;df73##O8S}I_6KN<%oo1S9CF>=DM$vOIF-359m5K?<3=-Pnq!wy0Q10w#=~h vFqBABIBGG!L8LOQ;mg}C+SjK{d(6L$)$N>Y?`uDxs~9|8{an^LB{Ts55Ti;8 literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/level-indicator-segment-warning-center.png b/AppKit/Themes/Aristo2/Resources/level-indicator-segment-warning-center.png new file mode 100644 index 0000000000000000000000000000000000000000..9b21ace3e187cbad6d57b205009f7b680af2f9ec GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{N!3HE{4j&T&Qc<2Rjv*YftOqypHXDezUR?cM zQ>JH5+aYBGp4RR&CoHy{ahRxN*wv%!cusNYmJMs~NImAZ{lyt69=KLi_GfR=y+BR* wl4<%`Z`;?cRy1}#_w~f@hCTI3&NI&2|N1R$zFj?KGtd?WPgg&ebxsLQ0L@i33IG5A literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/level-indicator-segment-warning-left.png b/AppKit/Themes/Aristo2/Resources/level-indicator-segment-warning-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c26b6db9d8eff72f2ad6df6c1dc067a7b7baba3d GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^%s?#2!3HEH%*6D8RI#UvV+hC0WKIr_6=?|x7ub^6 z#MIQ()?S-cIx&II*!Xk2V5b1vj5GFrdZBDPc#OMQnm)h2uFvxP^z-c;=boR}e>lh9 zzHX2Ei9dfnaw>lQ{oTCf%>MfQ6W=7JxfNJg>=2O2%d=~_y<_Lkheq4e&rV;*Qpm7E WN2|MbqreWJ^$eb_elF{r5}E*^@;_k! literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/level-indicator-segment-warning-right.png b/AppKit/Themes/Aristo2/Resources/level-indicator-segment-warning-right.png new file mode 100644 index 0000000000000000000000000000000000000000..02ce4ffada912c53a87778f7dad8bf363fb480c8 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^%s?#2!3HEH%*6D8REwvJV+hC0WKIr_h+_ zW_kYk`E-tR{qph)We(cw*w@!I6}bSF{QJwh><$0v{q_3=s~T9E4j(+&`k Date: Tue, 8 Jan 2013 17:06:13 -0800 Subject: [PATCH 06/10] Remove old CPLevelIndicator ressources --- .../level-indicator-bezel-center.png | Bin 75 -> 0 bytes .../level-indicator-bezel-left.png | Bin 106 -> 0 bytes .../level-indicator-bezel-right.png | Bin 108 -> 0 bytes .../level-indicator-segment-critical-center.png | Bin 143 -> 0 bytes .../level-indicator-segment-critical-left.png | Bin 172 -> 0 bytes .../level-indicator-segment-critical-right.png | Bin 194 -> 0 bytes .../level-indicator-segment-empty-center.png | Bin 108 -> 0 bytes .../level-indicator-segment-empty-left.png | Bin 126 -> 0 bytes .../level-indicator-segment-empty-right.png | Bin 131 -> 0 bytes .../level-indicator-segment-normal-center.png | Bin 146 -> 0 bytes .../level-indicator-segment-normal-left.png | Bin 173 -> 0 bytes .../level-indicator-segment-normal-right.png | Bin 195 -> 0 bytes .../level-indicator-segment-warning-center.png | Bin 147 -> 0 bytes .../level-indicator-segment-warning-left.png | Bin 172 -> 0 bytes .../level-indicator-segment-warning-right.png | Bin 189 -> 0 bytes 15 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-bezel-center.png delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-bezel-left.png delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-bezel-right.png delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-segment-critical-center.png delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-segment-critical-left.png delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-segment-critical-right.png delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-segment-empty-center.png delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-segment-empty-left.png delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-segment-empty-right.png delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-segment-normal-center.png delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-segment-normal-left.png delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-segment-normal-right.png delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-segment-warning-center.png delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-segment-warning-left.png delete mode 100644 AppKit/Resources/CPLevelIndicator/level-indicator-segment-warning-right.png diff --git a/AppKit/Resources/CPLevelIndicator/level-indicator-bezel-center.png b/AppKit/Resources/CPLevelIndicator/level-indicator-bezel-center.png deleted file mode 100644 index 07549e6949f59307e1b4b4e260f5b0c23159c7d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 75 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{J!2%==;%dx698VX=5RT~N6~ajsf99Kr=x{Q4 XC&gTe~DWM4f^HmU+ diff --git a/AppKit/Resources/CPLevelIndicator/level-indicator-bezel-left.png b/AppKit/Resources/CPLevelIndicator/level-indicator-bezel-left.png deleted file mode 100644 index 6a40c857246f92e88b1ce7e061e998a9ebfc6519..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!}!2%>rR<8j`7<#%mhHykDuY8=EkeZP2^Z2ZP zVlIXa45#hg48Dq=Y7VFmWC^VN-!ZNE=7-e|U5$(kf+ivp*SwTW1!`vSboFyt=akR{ E0JAk9oB#j- diff --git a/AppKit/Resources/CPLevelIndicator/level-indicator-bezel-right.png b/AppKit/Resources/CPLevelIndicator/level-indicator-bezel-right.png deleted file mode 100644 index a8960f80655a58395bbaf39472cf3419dd26109f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!}!2%>rR<8j`7<;-nhHykDuM%c*id%MN`^x

IjqA&pn|$1^;M6i=Fchq(`^ox#)9&t;uc GLK6U@PcFR~i-+7i?6Vv|wJlz@c-D^QYxHU*5Iop5>P~@m;}A-zyhQGtOGN tV0+k?t!*hhM%NY{tTw6gH$VR4&&f|xZx?)gS_-s*!PC{xWt~$(699Q*Hr42R z={7GpA-HMzO|1ukN0=*^`xEB=j$pa8)MK(pW9r`B_}$Uu+fJuGJzKXMdX978x{Sq~l*Y*64~IQaQd z^F*ecZY|B@b&nDXrW;mnGmpEm;lt4*t=#rHHXn{Sbk4JP4CVSKao|b~P&V+230Nq+C5+978ywlQ~zUT}VqvNW8SF zlO^a({ZUDWJ@qj>33BW$zt|VnIj)$W@anug2fx$bpWTZl2|8_b&`9f;>638pt>jc5 a9)^=EB^@p%$eRKUWbkzLb6Mw<&;$U}jVRmz diff --git a/AppKit/Resources/CPLevelIndicator/level-indicator-segment-empty-right.png b/AppKit/Resources/CPLevelIndicator/level-indicator-segment-empty-right.png deleted file mode 100644 index e546ae62d4ea9a231e21d1650c21a725ee6c4a97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^%s?#2!2%>V+230Nq`W*`978ywlQ|=f9XL=hb*bK@ z#)YYp-4+uL|C!#(?P2&g`C-F{e~v5S1zxGQ{9<18&tb)Woq9!^6<%%~3fwJ8Z2>+4 f#_1tUmERdMYNRC!691kDn#$nm>gTe~DWM4fMByy= diff --git a/AppKit/Resources/CPLevelIndicator/level-indicator-segment-normal-center.png b/AppKit/Resources/CPLevelIndicator/level-indicator-segment-normal-center.png deleted file mode 100644 index 443ecf43e74846648f509c690568524c2bf4fec4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{N!3HE{4j&T&Qjwl6jv*Yf$$T6f5y#f-eRxdj z*`l@!Y|qa8dcgK<&8`l%XETDPv!(5inaq}U-K3W-?Rd&lwzSzUH`&rwS7<6sWKek% v^hA0_?52iIcCBr^XBtzd@t$$pV`tCU!7jO3ag)3c&=LkuS3j3^P6! diff --git a/AppKit/Resources/CPLevelIndicator/level-indicator-segment-normal-left.png b/AppKit/Resources/CPLevelIndicator/level-indicator-segment-normal-left.png deleted file mode 100644 index 09616818627fe544531aa13b7e25c7c9ca9b5bd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^%s?#2!3HEH%*6D8REejHV+hC0WKIr_6=?|x7ub^6 z#MIQ(bdPN-otVI9Z2URid}09Gj5GF`ex__Yc& z{QdjgPt^SV$*K7H@ptoHayUHx3vIVCg!0Ndz4wg3PC diff --git a/AppKit/Resources/CPLevelIndicator/level-indicator-segment-normal-right.png b/AppKit/Resources/CPLevelIndicator/level-indicator-segment-normal-right.png deleted file mode 100644 index 93d128c981e113b87dd98e6538cd4759451c0b28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^%s?#2!3HEH%*6D8RF|iVV+e<=?m2C~LjfW!4^LV$ zWpJ8GT;df73##O8S}I_6KN<%oo1S9CF>=DM$vOIF-359m5K?<3=-Pnq!wy0Q10w#=~h vFqBABIBGG!L8LOQ;mg}C+SjK{d(6L$)$N>Y?`uDxs~9|8{an^LB{Ts55Ti;8 diff --git a/AppKit/Resources/CPLevelIndicator/level-indicator-segment-warning-center.png b/AppKit/Resources/CPLevelIndicator/level-indicator-segment-warning-center.png deleted file mode 100644 index 9b21ace3e187cbad6d57b205009f7b680af2f9ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{N!3HE{4j&T&Qc<2Rjv*YftOqypHXDezUR?cM zQ>JH5+aYBGp4RR&CoHy{ahRxN*wv%!cusNYmJMs~NImAZ{lyt69=KLi_GfR=y+BR* wl4<%`Z`;?cRy1}#_w~f@hCTI3&NI&2|N1R$zFj?KGtd?WPgg&ebxsLQ0L@i33IG5A diff --git a/AppKit/Resources/CPLevelIndicator/level-indicator-segment-warning-left.png b/AppKit/Resources/CPLevelIndicator/level-indicator-segment-warning-left.png deleted file mode 100644 index c26b6db9d8eff72f2ad6df6c1dc067a7b7baba3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^%s?#2!3HEH%*6D8RI#UvV+hC0WKIr_6=?|x7ub^6 z#MIQ()?S-cIx&II*!Xk2V5b1vj5GFrdZBDPc#OMQnm)h2uFvxP^z-c;=boR}e>lh9 zzHX2Ei9dfnaw>lQ{oTCf%>MfQ6W=7JxfNJg>=2O2%d=~_y<_Lkheq4e&rV;*Qpm7E WN2|MbqreWJ^$eb_elF{r5}E*^@;_k! diff --git a/AppKit/Resources/CPLevelIndicator/level-indicator-segment-warning-right.png b/AppKit/Resources/CPLevelIndicator/level-indicator-segment-warning-right.png deleted file mode 100644 index 02ce4ffada912c53a87778f7dad8bf363fb480c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^%s?#2!3HEH%*6D8REwvJV+hC0WKIr_h+_ zW_kYk`E-tR{qph)We(cw*w@!I6}bSF{QJwh><$0v{q_3=s~T9E4j(+&`k Date: Tue, 8 Jan 2013 17:09:38 -0800 Subject: [PATCH 07/10] remove old non themable CPProgressIndicator art files --- .../CPProgressIndicatorBarBarRegular0.png | Bin 218 -> 0 bytes .../CPProgressIndicatorBarBarRegular1.png | Bin 123 -> 0 bytes .../CPProgressIndicatorBarBarRegular2.png | Bin 213 -> 0 bytes .../CPProgressIndicatorBarHUDBarRegular0.png | Bin 205 -> 0 bytes .../CPProgressIndicatorBarHUDBarRegular1.png | Bin 120 -> 0 bytes .../CPProgressIndicatorBarHUDBarRegular2.png | Bin 205 -> 0 bytes ...CPProgressIndicatorBezelBorderBarRegular0.png | Bin 142 -> 0 bytes ...CPProgressIndicatorBezelBorderBarRegular1.png | Bin 88 -> 0 bytes ...CPProgressIndicatorBezelBorderBarRegular2.png | Bin 137 -> 0 bytes ...rogressIndicatorBezelBorderHUDBarRegular0.png | Bin 140 -> 0 bytes ...rogressIndicatorBezelBorderHUDBarRegular1.png | Bin 89 -> 0 bytes ...rogressIndicatorBezelBorderHUDBarRegular2.png | Bin 140 -> 0 bytes .../CPProgressIndicatorSpinningStyleMini.gif | Bin 2334 -> 0 bytes .../CPProgressIndicatorSpinningStyleRegular.gif | Bin 3120 -> 0 bytes .../CPProgressIndicatorSpinningStyleSmall.gif | Bin 5956 -> 0 bytes 15 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBarBarRegular0.png delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBarBarRegular1.png delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBarBarRegular2.png delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBarHUDBarRegular0.png delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBarHUDBarRegular1.png delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBarHUDBarRegular2.png delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBezelBorderBarRegular0.png delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBezelBorderBarRegular1.png delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBezelBorderBarRegular2.png delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBezelBorderHUDBarRegular0.png delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBezelBorderHUDBarRegular1.png delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBezelBorderHUDBarRegular2.png delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleMini.gif delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif delete mode 100644 AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleSmall.gif diff --git a/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBarBarRegular0.png b/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBarBarRegular0.png deleted file mode 100644 index 185ae16490faed5b0a231cd66d6cf8f2321adc86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 218 zcmV<0044v4P)d)h3k%bK6AK-6$5%fYxmo`F{=@zG*MDvXhCd7} z4FCQz|M~le0R&hW{{LnE{RhVR`5D7-+vICKYtK<;HELL zGc*4B`u*DvkX_7%&OVCoK7W%G5fT()y!-T}Tv*M7kgNBeXfXc&|DO@4TpEal0Ftax Uo4wr!MgRZ+07*qoM6N<$f}@09Jpcdz diff --git a/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBarBarRegular1.png b/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBarBarRegular1.png deleted file mode 100644 index 453892b24a6c235d68d4a8a822272502c4dbe495..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{F!3HF+&llYeq?|lm978ywlan~s>8I~9-oC8) z<+a`Od3@^s|4B{w_4zwL^X2#U3Xi_WOT0dxFCc#6*JpM$wlMZ*VcWm!rT(hVskCP} XT%;2?Tg)H=Xc~j3tDnm{r-UW|DTOPC diff --git a/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBarBarRegular2.png b/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBarBarRegular2.png deleted file mode 100644 index bcbf22ce603c933a3102157b506959e74138399c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmV;`04o29P)cymCcXN%|V|saL<{xmo@nSk;`rf#LuE|9U_y1H_B~?tNU4%{Vs& P00000NkvXXu0mjfswHHJ diff --git a/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBarHUDBarRegular0.png b/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBarHUDBarRegular0.png deleted file mode 100644 index 6f52b10082f40a3c5ecab63038f553a5edc884d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmV;;05boHP)SYYqdDlV!_wQg@X;b+Tu;H)C~5HkV*iOFD{?;6E)00000NkvXX Hu0mjfM&em? diff --git a/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBezelBorderBarRegular0.png b/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBezelBorderBarRegular0.png deleted file mode 100644 index 3db8ec41daeefe099331c56358ffd46f4eec0c63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!_!2%>JlX)3|RH&zmV+coda#BKqK$1anlEA&& ze@eB5+n2eT%;vbvuP64ep2vsB=f8x5$m967{Ty<_E$qTB6Pr0c{rUfq^F(p&?)tym q`F)D@-bLiiJEig`@oXpmb%wQ>Y7sfY=@)<&FnGH9xvX}r`@#yQu3ZIjv*Y;$%zGNKX diff --git a/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBezelBorderBarRegular2.png b/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBezelBorderBarRegular2.png deleted file mode 100644 index 0a1939345250d2eb0460e92afaabb2cc2bfb81a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!_!2%>JlX)3|RDh?8V+coda-u=8}Np1!^& zyn4>-h#M|Ci!7&Y{*#>W@c%*9B@GRoPxU*JTpk`|U1(D>b-&%mKj}ZeJ^bKyeY?)H nm3s4^$E5r$=zXa9*qtG)L*enht_kOXW;1xY`njxgN@xNAgUC13 diff --git a/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBezelBorderHUDBarRegular0.png b/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBezelBorderHUDBarRegular0.png deleted file mode 100644 index de32b01b1427b4156ca5d82e527d5d0cafd79488..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!_!2%>JlX)3|RIsOuV+coda#BKqK$1anlEAl| zzWb++EYuV`t8(Z|b9du^d1hhe%l2#nM}JIzsNdAC)}eHqV_C(&|36ul#N6K(_5U~X o}r`@#yQVO0fjv*Y;$%zGNp0^Hvn&0?T nUgEE7(t(=-Ta=rg{+DIQs}v~ynf$2`sFuOg)z4*}Q$iB}*83Yg diff --git a/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBezelBorderHUDBarRegular2.png b/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorBezelBorderHUDBarRegular2.png deleted file mode 100644 index b0e9559a1b517f952506393bb4a6148d102008a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!_!2%>JlX)3|RIsOuV+coda-u=8}NRO?=^ z4!!+4Vus6+MV8Yx|4B}G@c$s|A_<8Z5&xPr+$8uzKj?Qou%B_NetyNj&42!VC|mqG pdRp*Gz4_^}DL)H(A8I~!X9y@(tY`nkc@bzlgQu&X%Q~loCIF3{HKG6j diff --git a/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleMini.gif b/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleMini.gif deleted file mode 100644 index 702a575ee78ca0c238116e8133d05e023f7123f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2334 zcmZvceNYnz8piiCyPIq_yPM5!vg8X05JCbWfD%Oun?y*$DWU{KYXupnQfuQ!J9CkSfxd+aOm`|&W-KiId<$#YrPwL7o$&$kDT4YW45K6?15 zwXM~=#QWfH4=#;edh)L)!$ZT{w{D-gHS_2nj}QpyIMgxw?d*f^9(4C~51trYQ@Li% z+BLWTbUWLX{p6odhCdmu*-&FiuxzT`)Y0CtvUKIh`4O+=t^0LdWOu}pY#Hbun3^{=HY4aw%Q6FiDCp-l^kQj-*ILhLCcS z<2k*kkN>w~sc+>9PeF;#mF|Q=0082DMo<}m0`|FkE+h@)%TA9roEhE8)o{xS+=H1t zv2V_7i5V*mLi75M_hvUVO3Pp8Y`ZW^!}6qxXnx;CmweUGQut>)Z2%SAxy2p`YSOz! zG2^XW6y*>~O^gZMtcJGKqt1A|(67ciJQ_X9xU5Aryhx1{)8dSl$BFx^%H_pI$)V^hh6KOFC$@maN(|!N8u)g+|+azt&mWNs0m+o6vg3|9NX#dx zJaS#9o$_MxuCX-uGqoCn20p)GglC=++n)E^nSU@Gn|4NvZWgYv8Qq5b_753%StHf( z_-xE3Mlx^2|4OuKQlN?0yx!$djkSvGYdV2MyUku*a(sM>Qj+5vi_9o1Y4>YEzb3Ua zRY4rBFG}QkIh(Q8f*RIOsME93d@Vb#M$vgYzcBiao zbZlFNB_QNeaEr4ty88G-b1R#eB=^u3gQ3i0a)v+#Zl+E2ve3@t`N=xG`(RM(>T^j( z9#MrXfM9F{?NpM_!{%`=9XLm3SMq!?EtlgoAnOw_=;LNm?b(EFd^e=Tl+(97r=(cu zg}B{wxMAjcf;1WSR}4Z|>U~+2a&+$(vyZzrE}kq){K4PRFV+C_7_%#K`PGhs-t365 zw@+U5U05xtlj6u6g}ia6DwG9a5^?}xL!d6#lAB8<^&AS}h5>`>U1cC-wt@|(APigY zp;KMiG&uKV%^s12Jny$Vzn<=; zL#%W$oLUeDoCD_mN_kwg^Bx}a>L6rWO(BiT%IwT z1g?^6J_>zPF=4?ccON%z(XZ9{p`X5DReL5cO(hJEbWf)~Ots$O`Sp@L3t%#W0`__k z*YL%BV6GUQOz4P7d|x~g%F-ykA*2ya${|H61id6fHH;z2O_FbW0M0_XGzJ*8rv&wR zi}+E&V)%V9g>$1hE~R6<7x#_IQB&-NhP&nr-(fz{k6jM`G1m$d=EGB!@i*Ilxi)=!($tu4FaX^@vvUg_v44MeZ0j1!>8pW- zJ1Q1Oi(3|LM?}d}Yg#qr)H=0`xF+-+VlN?A%C$K`8?83_?G{(O!fOYZtSbFs5+uS`m{Kjxm z_KxO>zI$PR0;)$de<#@}{x28l-jZsl|4#3jVf`MWws6WFl{X}gx<#b%#=xi5-z&-F z2A~L|_n1;$EeS;|{vNI_)uBc78%tzqaR!4^pzRB@;#a+w74}24ct<;{~$Ey$MN`$_tG52hf0L))f2tg5P{!&mt+7Kze zg-@amdNLCHl-;P3*i4edqnHlQcn$k7fl2@lWf1zL*lL0{;$kAfPy`M_Nl_>c2CV?7 ZC0M^s)CFF_6ytt}L}aSHg$2OE{{Zwufc^jg diff --git a/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif b/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif deleted file mode 100644 index 598cab3dc5dda5d7df462e6702de1e0c8335c13f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3120 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 LP^(_M1o-LSyVK+l diff --git a/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleSmall.gif b/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleSmall.gif deleted file mode 100644 index cbd275d4c7518ea70badd731ffc21f42944d19d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5956 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 Date: Tue, 8 Jan 2013 17:21:32 -0800 Subject: [PATCH 08/10] CPSplitView is now fully themable --- AppKit/CPSplitView.j | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/AppKit/CPSplitView.j b/AppKit/CPSplitView.j index cd6734518..53b280207 100644 --- a/AppKit/CPSplitView.j +++ b/AppKit/CPSplitView.j @@ -51,10 +51,7 @@ CPSplitViewDidResizeSubviewsNotification = @"CPSplitViewDidResizeSubviewsNotification"; CPSplitViewWillResizeSubviewsNotification = @"CPSplitViewWillResizeSubviewsNotification"; -var CPSplitViewHorizontalImage = nil, - CPSplitViewVerticalImage = nil, - - ShouldSuppressResizeNotifications = 1, +var ShouldSuppressResizeNotifications = 1, DidPostWillResizeNotification = 1 << 1, DidSuppressResizeNotification = 1 << 2; @@ -104,22 +101,16 @@ var CPSplitViewHorizontalImage = nil, + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[1.0, 10.0, [CPColor grayColor]] - forKeys:[@"divider-thickness", @"pane-divider-thickness", @"pane-divider-color"]]; -} - -/* - @ignore -*/ -+ (void)initialize -{ - if (self !== [CPSplitView class]) - return; - - var bundle = [CPBundle bundleForClass:self]; - - CPSplitViewHorizontalImage = CPImageInBundle("CPSplitView/CPSplitViewHorizontal.png", CGSizeMake(5.0, 10.0), bundle); - CPSplitViewVerticalImage = CPImageInBundle("CPSplitView/CPSplitViewVertical.png", CGSizeMake(10.0, 5.0), bundle); + return [CPDictionary dictionaryWithObjects:[ 1.0, + 10.0, + [CPColor grayColor], + [CPNull null], + [CPNull null]] + forKeys:[ @"divider-thickness", + @"pane-divider-thickness", + @"pane-divider-color", + @"horizontal-divider-color", + @"vertical-divider-color"]]; } - (id)initWithFrame:(CGRect)aFrame @@ -202,7 +193,7 @@ var CPSplitViewHorizontalImage = nil, _originComponent = [self isVertical] ? "x" : "y"; _sizeComponent = [self isVertical] ? "width" : "height"; - _dividerImagePath = [self isVertical] ? [CPSplitViewVerticalImage filename] : [CPSplitViewHorizontalImage filename]; + _dividerImagePath = [self isVertical] ? [[self valueForThemeAttribute:@"vertical-divider-color"] filename] : [[self valueForThemeAttribute:@"horizontal-divider-color"] filename]; return changed; } From 5ec6d571eb2981826df83d29dab82de7ad3278f0 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Tue, 8 Jan 2013 17:22:10 -0800 Subject: [PATCH 09/10] Improve theme for CPSplitView --- .../Resources/splitview-divider-horizontal.png | Bin 0 -> 86 bytes .../Resources/splitview-divider-vertical.png | Bin 0 -> 79 bytes AppKit/Themes/Aristo2/ThemeDescriptors.j | 6 +++++- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 AppKit/Themes/Aristo2/Resources/splitview-divider-horizontal.png create mode 100644 AppKit/Themes/Aristo2/Resources/splitview-divider-vertical.png diff --git a/AppKit/Themes/Aristo2/Resources/splitview-divider-horizontal.png b/AppKit/Themes/Aristo2/Resources/splitview-divider-horizontal.png new file mode 100644 index 0000000000000000000000000000000000000000..6fd8bf2191caefa5e1025459361796a0fa6847fb GIT binary patch literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y=0VEhge0Hw}QnH>djv*Y;$&sfH91!9<^1tDS jzQF&+NBcd#D6+9Jto_Y#?pf87Lm&;Fu6{1-oD!MhH%Ix$7CHoa^}#PLx=WE b6Vw)F2wu$cnQyU4AxNdCtDnm{r-UW|umKeV literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index 1444688bf..f5aa170d7 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -1331,6 +1331,8 @@ var themedButtonValues = nil, [splitView addSubview:leftView]; [splitView addSubview:rightView]; + var horizontalDividerColor = PatternImage("splitview-divider-horizontal.png", 5.0, 10.0), + verticalDividerColor = PatternImage("splitview-divider-vertical.png", 10.0, 5.0); [splitView setIsPaneSplitter:YES]; @@ -1338,7 +1340,9 @@ var themedButtonValues = nil, [ [@"divider-thickness", 1.0], [@"pane-divider-thickness", 10.0], - [@"pane-divider-color", [CPColor colorWithRed:165.0 / 255.0 green:165.0 / 255.0 blue:165.0 / 255.0 alpha:1.0]] + [@"pane-divider-color", [CPColor colorWithRed:165.0 / 255.0 green:165.0 / 255.0 blue:165.0 / 255.0 alpha:1.0]], + [@"horizontal-divider-color", horizontalDividerColor], + [@"vertical-divider-color", verticalDividerColor] ]; [self registerThemeValues:themedSplitViewValues forView:splitView]; From 0f0dcb9eae17ce2032bee5c2d0ea68efbb94e9c9 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Tue, 8 Jan 2013 17:22:19 -0800 Subject: [PATCH 10/10] Remove old static theme for CPSplitView --- .../CPSplitView/CPSplitViewHorizontal.png | Bin 86 -> 0 bytes .../Resources/CPSplitView/CPSplitViewVertical.png | Bin 79 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 AppKit/Resources/CPSplitView/CPSplitViewHorizontal.png delete mode 100644 AppKit/Resources/CPSplitView/CPSplitViewVertical.png diff --git a/AppKit/Resources/CPSplitView/CPSplitViewHorizontal.png b/AppKit/Resources/CPSplitView/CPSplitViewHorizontal.png deleted file mode 100644 index 6fd8bf2191caefa5e1025459361796a0fa6847fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y=0VEhge0Hw}QnH>djv*Y;$&sfH91!9<^1tDS jzQF&+NBcd#D6+9Jto_Y#?pf87Lm&;Fu6{1-oD!MhH%Ix$7CHoa^}#PLx=WE b6Vw)F2wu$cnQyU4AxNdCtDnm{r-UW|umKeV