diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-center.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-center.png index 1e82207f0..455b25dec 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-center.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-center.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-center.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-center.png index 0632660c4..a32359e5c 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-center.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-center.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-divider.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-divider.png index 1ebec04fa..a07b15d5c 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-divider.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-divider.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-left.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-left.png index 26ddb947c..cca119c66 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-left.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-left.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-right.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-right.png index 63cc8bb29..9f3a03b7d 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-right.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-right.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-divider.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-divider.png index aa7955d2d..6811fc89a 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-divider.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-divider.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-center.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-center.png index 920b7280b..ac04df7bb 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-center.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-center.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-center.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-center.png index 15fd9d929..06105ca17 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-center.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-center.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png index 6ad27c168..513282884 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-left.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-left.png index 1a82ba435..e8bf1b6b0 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-left.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-left.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-right.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-right.png index 7a3462af6..73880f0de 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-right.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-right.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-divider.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-divider.png index e5b2c7250..6811fc89a 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-divider.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-divider.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-left.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-left.png index 48429370a..56ac58d65 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-left.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-left.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-right.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-right.png index 99e0d5075..2941208e8 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-right.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-right.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-left.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-left.png index e98032497..61b659212 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-left.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-left.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-center.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-center.png index a5881501a..aa78a13bc 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-center.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-center.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-center.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-center.png index a5881501a..dc64067fe 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-center.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-center.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-left.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-left.png index 3077ebaf0..c81b5aba0 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-left.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-left.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-right.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-right.png index 3ed9302ff..6eb94808d 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-right.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-right.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-left.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-left.png index 3077ebaf0..a1c5e0323 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-left.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-left.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-right.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-right.png index 3ed9302ff..949864422 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-right.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-right.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-right.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-right.png index f9cc2fc65..12e90829c 100644 Binary files a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-right.png and b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-right.png differ diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index e0112fadb..96c2aada0 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -1021,6 +1021,74 @@ return scroller; } ++ (CPSlider)themedHorizontalSlider +{ + var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 50.0, 24.0)], + trackColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices: + [ + [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-left.png" size:CGSizeMake(4.0, 5.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-center.png" size:CGSizeMake(1.0, 5.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-right.png" size:CGSizeMake(4.0, 5.0)] + ] + isVertical:NO]], + + trackDisabledColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices: + [ + [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-disabled-left.png" size:CGSizeMake(4.0, 5.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-disabled-center.png" size:CGSizeMake(1.0, 5.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-disabled-right.png" size:CGSizeMake(4.0, 5.0)] + ] + isVertical:NO]]; + + [slider setValue:5.0 forThemeAttribute:@"track-width"]; + [slider setValue:trackColor forThemeAttribute:@"track-color"]; + [slider setValue:trackDisabledColor forThemeAttribute:@"track-color" inState:CPThemeStateDisabled]; + + var knobColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob.png" size:CGSizeMake(23.0, 24.0)]], + knobHighlightedColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob-highlighted.png" size:CGSizeMake(23.0, 24.0)]], + knobDisabledColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob-disabled.png" size:CGSizeMake(23.0, 24.0)]]; + + [slider setValue:CGSizeMake(23.0, 24.0) forThemeAttribute:@"knob-size"]; + [slider setValue:knobColor forThemeAttribute:@"knob-color"]; + [slider setValue:knobHighlightedColor forThemeAttribute:@"knob-color" inState:CPThemeStateHighlighted]; + [slider setValue:knobDisabledColor forThemeAttribute:@"knob-color" inState:CPThemeStateDisabled]; + + return slider; +} + ++ (CPSlider)themedVerticalSlider +{ + var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 24.0, 50.0)], + trackColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices: + [ + [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-top.png" size:CGSizeMake(5.0, 6.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-center.png" size:CGSizeMake(5.0, 1.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-bottom.png" size:CGSizeMake(5.0, 4.0)] + ] + isVertical:YES]], + trackDisabledColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices: + [ + [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-disabled-top.png" size:CGSizeMake(5.0, 6.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-disabled-center.png" size:CGSizeMake(5.0, 1.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-disabled-bottom.png" size:CGSizeMake(5.0, 4.0)] + ] + isVertical:YES]]; + + [slider setValue:5.0 forThemeAttribute:@"track-width"]; + [slider setValue:trackColor forThemeAttribute:@"track-color" inState:CPThemeStateVertical]; + [slider setValue:trackDisabledColor forThemeAttribute:@"track-color" inState:CPThemeStateDisabled]; + + var knobColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob.png" size:CGSizeMake(23.0, 24.0)]], + knobHighlightedColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob-highlighted.png" size:CGSizeMake(23.0, 24.0)]], + knobDisabledColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob-disabled.png" size:CGSizeMake(23.0, 24.0)]]; + + [slider setValue:CGSizeMake(23.0, 24.0) forThemeAttribute:@"knob-size"]; + [slider setValue:knobColor forThemeAttribute:@"knob-color"]; + [slider setValue:knobHighlightedColor forThemeAttribute:@"knob-color" inState:CPThemeStateHighlighted]; + [slider setValue:knobDisabledColor forThemeAttribute:@"knob-color" inState:CPThemeStateDisabled]; + + return slider; +} + (CPSlider)themedCircularSlider { var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 34.0, 34.0)],