diff --git a/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd b/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd index 69ab62f39..86ecfe3ec 100755 Binary files a/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd and b/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-center.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-center.png index 382522ffa..20d2795ee 100755 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-center.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-divider.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-divider.png index 1e6d549e9..229e07910 100644 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-divider.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-divider.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-left.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-left.png index 03086c31b..8171628e5 100755 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-left.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-right.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-right.png index 64ae24d07..15fcfcbeb 100755 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-right.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-center.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-center.png index 382522ffa..1e03d7f60 100755 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-center.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-divider.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-divider.png index 1e6d549e9..183c85c41 100644 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-divider.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-divider.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-left.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-left.png index 03086c31b..fb9bf8b55 100755 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-left.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-right.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-right.png index 64ae24d07..931479a7d 100755 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-right.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-right.png differ diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index dd369a2ee..68ca43f10 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -1114,7 +1114,7 @@ var themedButtonValues = nil, [@"font", [CPFont boldSystemFontOfSize:12.0]], [@"text-color", [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0]], [@"text-color", [CPColor colorWithCalibratedWhite:0.6 alpha:1.0], CPThemeStateDisabled], - [@"text-color", [CPColor colorWithCalibratedWhite:0.6 alpha:1.0], CPThemeStateDisabled | CPThemeStateSelected], + [@"text-color", [CPColor colorWithCalibratedWhite:1.0 alpha:0.5], CPThemeStateDisabled | CPThemeStateSelected], [@"text-color", [CPColor whiteColor], CPThemeStateSelected], [@"text-shadow-color", [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0]], [@"text-shadow-color", [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0], CPThemeStateDisabled], @@ -1712,7 +1712,7 @@ var themedButtonValues = nil, ["progress-indicator-bar-bar-regular-center.png", 1.0, 25.0], ["progress-indicator-bar-bar-regular-right.png", 1.0, 25.0] ], - PatternIsHorizontal); + PatternIsHorizontal), themedProgressIndicator = [ @@ -1745,7 +1745,7 @@ var themedButtonValues = nil, ["progress-indicator-inderterminate-bar-bar-regular-center.png", 20.0, 25.0], ["progress-indicator-inderterminate-bar-bar-regular-right.png", 1.0, 25.0] ], - PatternIsHorizontal); + PatternIsHorizontal), themedIndeterminateProgressIndicator = [