diff --git a/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bar-bar-regular-center.png b/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bar-bar-regular-center.png new file mode 100644 index 000000000..e0a0bd241 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bar-bar-regular-center.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bar-bar-regular-left.png b/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bar-bar-regular-left.png new file mode 100644 index 000000000..de32b01b1 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bar-bar-regular-left.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bar-bar-regular-right.png b/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bar-bar-regular-right.png new file mode 100644 index 000000000..b0e9559a1 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bar-bar-regular-right.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bezel-border-bar-regular-center.png b/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bezel-border-bar-regular-center.png new file mode 100644 index 000000000..8a3924309 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bezel-border-bar-regular-center.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bezel-border-bar-regular-left.png b/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bezel-border-bar-regular-left.png new file mode 100644 index 000000000..6f52b1008 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bezel-border-bar-regular-left.png differ diff --git a/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bezel-border-bar-regular-right.png b/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bezel-border-bar-regular-right.png new file mode 100644 index 000000000..f46d6e2b1 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/HUD/progress-indicator-bezel-border-bar-regular-right.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-bar-window-background-selected.png b/AppKit/Themes/Aristo/Resources/menu-bar-window-background-selected.png new file mode 100644 index 000000000..24656a5e8 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-bar-window-background-selected.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-bar-window-background.png b/AppKit/Themes/Aristo/Resources/menu-bar-window-background.png new file mode 100644 index 000000000..63c16b49e Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-bar-window-background.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-item-on-state-highlighted.png b/AppKit/Themes/Aristo/Resources/menu-item-on-state-highlighted.png new file mode 100644 index 000000000..5f0899daf Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-item-on-state-highlighted.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-item-on-state.png b/AppKit/Themes/Aristo/Resources/menu-item-on-state.png new file mode 100644 index 000000000..d67d4f03d Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-item-on-state.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-window-1.png b/AppKit/Themes/Aristo/Resources/menu-window-1.png new file mode 100644 index 000000000..51a55035e Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-window-1.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-window-3.png b/AppKit/Themes/Aristo/Resources/menu-window-3.png new file mode 100644 index 000000000..3b5543e65 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-window-3.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-window-4.png b/AppKit/Themes/Aristo/Resources/menu-window-4.png new file mode 100644 index 000000000..3334e6648 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-window-4.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-window-5.png b/AppKit/Themes/Aristo/Resources/menu-window-5.png new file mode 100644 index 000000000..cf9849b9e Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-window-5.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-window-7.png b/AppKit/Themes/Aristo/Resources/menu-window-7.png new file mode 100644 index 000000000..9125d382e Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-window-7.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-window-more-above.png b/AppKit/Themes/Aristo/Resources/menu-window-more-above.png new file mode 100644 index 000000000..f7aba4e91 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-window-more-above.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-window-more-below.png b/AppKit/Themes/Aristo/Resources/menu-window-more-below.png new file mode 100644 index 000000000..b46b9fec3 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-window-more-below.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-window-rounded-0.png b/AppKit/Themes/Aristo/Resources/menu-window-rounded-0.png new file mode 100644 index 000000000..b1b69b034 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-window-rounded-0.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-window-rounded-2.png b/AppKit/Themes/Aristo/Resources/menu-window-rounded-2.png new file mode 100644 index 000000000..4243fd990 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-window-rounded-2.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-window-rounded-6.png b/AppKit/Themes/Aristo/Resources/menu-window-rounded-6.png new file mode 100644 index 000000000..51fbeea38 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-window-rounded-6.png differ diff --git a/AppKit/Themes/Aristo/Resources/menu-window-rounded-8.png b/AppKit/Themes/Aristo/Resources/menu-window-rounded-8.png new file mode 100644 index 000000000..93b44c354 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/menu-window-rounded-8.png differ diff --git a/AppKit/Themes/Aristo/Resources/progress-indicator-bar-bar-regular-center.png b/AppKit/Themes/Aristo/Resources/progress-indicator-bar-bar-regular-center.png new file mode 100644 index 000000000..453892b24 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/progress-indicator-bar-bar-regular-center.png differ diff --git a/AppKit/Themes/Aristo/Resources/progress-indicator-bar-bar-regular-left.png b/AppKit/Themes/Aristo/Resources/progress-indicator-bar-bar-regular-left.png new file mode 100644 index 000000000..185ae1649 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/progress-indicator-bar-bar-regular-left.png differ diff --git a/AppKit/Themes/Aristo/Resources/progress-indicator-bar-bar-regular-right.png b/AppKit/Themes/Aristo/Resources/progress-indicator-bar-bar-regular-right.png new file mode 100644 index 000000000..bcbf22ce6 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/progress-indicator-bar-bar-regular-right.png differ diff --git a/AppKit/Themes/Aristo/Resources/progress-indicator-bezel-border-bar-regular-center.png b/AppKit/Themes/Aristo/Resources/progress-indicator-bezel-border-bar-regular-center.png new file mode 100644 index 000000000..e42a7c458 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/progress-indicator-bezel-border-bar-regular-center.png differ diff --git a/AppKit/Themes/Aristo/Resources/progress-indicator-bezel-border-bar-regular-left.png b/AppKit/Themes/Aristo/Resources/progress-indicator-bezel-border-bar-regular-left.png new file mode 100644 index 000000000..3db8ec41d Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/progress-indicator-bezel-border-bar-regular-left.png differ diff --git a/AppKit/Themes/Aristo/Resources/progress-indicator-bezel-border-bar-regular-right.png b/AppKit/Themes/Aristo/Resources/progress-indicator-bezel-border-bar-regular-right.png new file mode 100644 index 000000000..0a1939345 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/progress-indicator-bezel-border-bar-regular-right.png differ diff --git a/AppKit/Themes/Aristo/Resources/progress-indicator-spinning-style-mini.gif b/AppKit/Themes/Aristo/Resources/progress-indicator-spinning-style-mini.gif new file mode 100644 index 000000000..702a575ee Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/progress-indicator-spinning-style-mini.gif differ diff --git a/AppKit/Themes/Aristo/Resources/progress-indicator-spinning-style-regular.gif b/AppKit/Themes/Aristo/Resources/progress-indicator-spinning-style-regular.gif new file mode 100644 index 000000000..598cab3dc Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/progress-indicator-spinning-style-regular.gif differ diff --git a/AppKit/Themes/Aristo/Resources/progress-indicator-spinning-style-small.gif b/AppKit/Themes/Aristo/Resources/progress-indicator-spinning-style-small.gif new file mode 100644 index 000000000..cbd275d4c Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/progress-indicator-spinning-style-small.gif differ diff --git a/AppKit/Themes/Aristo/Resources/toolbar-background-bottom.png b/AppKit/Themes/Aristo/Resources/toolbar-background-bottom.png new file mode 100644 index 000000000..a31f07b4c Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/toolbar-background-bottom.png differ diff --git a/AppKit/Themes/Aristo/Resources/toolbar-background-center.png b/AppKit/Themes/Aristo/Resources/toolbar-background-center.png new file mode 100644 index 000000000..7df3663bd Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/toolbar-background-center.png differ diff --git a/AppKit/Themes/Aristo/Resources/toolbar-background-top.png b/AppKit/Themes/Aristo/Resources/toolbar-background-top.png new file mode 100644 index 000000000..1ad992f1c Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/toolbar-background-top.png differ diff --git a/AppKit/Themes/Aristo/Resources/toolbar-view-extra-items-alternate-image.png b/AppKit/Themes/Aristo/Resources/toolbar-view-extra-items-alternate-image.png new file mode 100644 index 000000000..e3787b91f Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/toolbar-view-extra-items-alternate-image.png differ diff --git a/AppKit/Themes/Aristo/Resources/toolbar-view-extra-items-image.png b/AppKit/Themes/Aristo/Resources/toolbar-view-extra-items-image.png new file mode 100644 index 000000000..d0fcbaab0 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/toolbar-view-extra-items-image.png differ diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index 6d0a3db40..eb89fefb8 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -19,7 +19,9 @@ var themedButtonValues = nil, themedVerticalSliderValues = nil, themedCircularSliderValues = nil, themedButtonBarValues = nil, - themedAlertValues = nil; + themedAlertValues = nil, + themedProgressIndicator = nil, + themedIndeterminateProgressIndicator = nil; /* HOW TO ADD OR MODIFY THEMED ELEMENTS @@ -1971,65 +1973,65 @@ var themedButtonValues = nil, + (CPProgressIndicator)themedBarProgressIndicator { - var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0,0,75,25)]; + var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0, 0, 75, 16)]; [progressBar setDoubleValue:30]; var bezelColor = PatternColor( [ - ["progress-indicator-bezel-border-bar-regular-left.png", 1.0, 25.0], - ["progress-indicator-bezel-border-bar-regular-center.png", 1.0, 25.0], - ["progress-indicator-bezel-border-bar-regular-right.png", 1.0, 25.0] + ["progress-indicator-bezel-border-bar-regular-left.png", 3.0, 16.0], + ["progress-indicator-bezel-border-bar-regular-center.png", 1.0, 16.0], + ["progress-indicator-bezel-border-bar-regular-right.png", 3.0, 16.0] ], PatternIsHorizontal), barColor = PatternColor( [ - ["progress-indicator-bar-bar-regular-left.png", 1.0, 25.0], - ["progress-indicator-bar-bar-regular-center.png", 1.0, 25.0], - ["progress-indicator-bar-bar-regular-right.png", 1.0, 25.0] + ["progress-indicator-bar-bar-regular-left.png", 3.0, 16.0], + ["progress-indicator-bar-bar-regular-center.png", 1.0, 16.0], + ["progress-indicator-bar-bar-regular-right.png", 3.0, 16.0] ], - PatternIsHorizontal), + PatternIsHorizontal); - themeValues = - [ - [@"bezel-color", bezelColor], - [@"bar-color", barColor] - ]; + themedProgressIndicator = + [ + [@"bezel-color", bezelColor], + [@"bar-color", barColor] + ]; - [self registerThemeValues:themeValues forView:progressBar]; + [self registerThemeValues:themedProgressIndicator forView:progressBar]; return progressBar; } + (CPProgressIndicator)themedIndeterminateBarProgressIndicator { - var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0,0,75,25)]; + var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0, 0, 75, 16)]; [progressBar setIndeterminate:YES]; var bezelColor = PatternColor( [ - ["progress-indicator-bezel-border-bar-regular-left.png", 1.0, 25.0], - ["progress-indicator-bezel-border-bar-regular-center.png", 1.0, 25.0], - ["progress-indicator-bezel-border-bar-regular-right.png", 1.0, 25.0] + ["progress-indicator-bezel-border-bar-regular-left.png", 3.0, 16.0], + ["progress-indicator-bezel-border-bar-regular-center.png", 1.0, 16.0], + ["progress-indicator-bezel-border-bar-regular-right.png", 3.0, 16.0] ], PatternIsHorizontal), barColor = PatternColor( [ - ["progress-indicator-inderterminate-bar-bar-regular-left.png", 1.0, 25.0], - ["progress-indicator-inderterminate-bar-bar-regular-center.png", 20.0, 25.0], - ["progress-indicator-inderterminate-bar-bar-regular-right.png", 1.0, 25.0] + ["progress-indicator-inderterminate-bar-bar-regular-left.png", 3.0, 16.0], + ["progress-indicator-inderterminate-bar-bar-regular-center.png", 1.0, 16.0], + ["progress-indicator-inderterminate-bar-bar-regular-right.png", 3.0, 16.0] ], - PatternIsHorizontal), + PatternIsHorizontal); - themeValues = - [ - [@"bezel-color", bezelColor], - [@"inderterminate-bar-color", barColor] - ]; + themedIndeterminateProgressIndicator = + [ + [@"bezel-color", bezelColor], + [@"inderterminate-bar-color", barColor] + ]; - [self registerThemeValues:themeValues forView:progressBar]; + [self registerThemeValues:themedIndeterminateProgressIndicator forView:progressBar]; return progressBar; } @@ -2488,7 +2490,7 @@ var themedButtonValues = nil, + (_CPMenuItemMenuBarView)themedMenuItemMenuBarView { - var menuItemMenuBarView = [[_CPMenuItemMenuBarView alloc] initWithFrame:CGRectMakeZero()], + var menuItemMenuBarView = [[_CPMenuItemMenuBarView alloc] initWithFrame:CGRectMake(0.0, 0.0, 16.0, 16.0)], selectionColor = PatternColor(@"menu-bar-window-background-selected.png", 1.0, 28.0), @@ -2510,7 +2512,7 @@ var themedButtonValues = nil, + (_CPMenuItemStandardView)themedMenuItemStandardView { - var menuItemStandardView = [[_CPMenuItemStandardView alloc] initWithFrame:CGRectMakeZero()], + var menuItemStandardView = [[_CPMenuItemStandardView alloc] initWithFrame:CGRectMake(0.0, 0.0, 16.0, 16.0)], menuItemDefaultOnStateImage = PatternImage(@"menu-item-on-state.png", 14.0, 14.0), menuItemDefaultOnStateHighlightedImage = PatternImage(@"menu-item-on-state-highlighted.png", 14.0, 14.0), @@ -2541,7 +2543,7 @@ var themedButtonValues = nil, + (_CPMenuView)themedMenuView { - var menuView = [[_CPMenuView alloc] initWithFrame:CGRectMakeZero()], + var menuView = [[_CPMenuView alloc] initWithFrame:CGRectMake(0.0, 0.0, 200.0, 100.0)], menuWindowMoreAboveImage = PatternImage(@"menu-window-more-above.png", 38.0, 18.0), @@ -2555,33 +2557,33 @@ var themedButtonValues = nil, 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-rounded-0.png", 4.0, 4.0], + [@"menu-window-1.png", 1.0, 4.0], + [@"menu-window-rounded-2.png", 4.0, 4.0], + [@"menu-window-3.png", 4.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] + [@"menu-window-5.png", 4.0, 1.0], + [@"menu-window-rounded-6.png", 4.0, 4.0], + [@"menu-window-7.png", 1.0, 4.0], + [@"menu-window-rounded-8.png", 4.0, 4.0] ] ), menuWindowMenuBarBackgroundStyleColor = PatternColor( [ - [@"menu-window-3.png", 6.0, 0.0], + [@"menu-window-3.png", 4.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-5.png", 4.0, 0.0], + [@"menu-window-3.png", 4.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] + [@"menu-window-5.png", 4.0, 1.0], + [@"menu-window-rounded-6.png", 4.0, 4.0], + [@"menu-window-7.png", 1.0, 4.0], + [@"menu-window-rounded-8.png", 4.0, 4.0] ] ), - menuBarWindowBackgroundColor = PatternColor(@"menu-bar-window-background.png", 1.0, 30.0), + menuBarWindowBackgroundColor = PatternColor(@"menu-bar-window-background.png", 1.0, 28.0), themeValues = [ @@ -2589,12 +2591,12 @@ var themedButtonValues = nil, [@"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-margin-inset", CGInsetMake(3.0, 1.0, 3.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-height", 28.0], [@"menu-bar-window-margin", 10.0], [@"menu-bar-window-left-margin", 10.0], [@"menu-bar-window-right-margin", 10.0], @@ -2772,4 +2774,25 @@ var themedButtonValues = nil, return [alert themeView]; } ++ (CPProgressIndicator)themedBarProgressIndicator +{ + var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0, 0, 75, 16)]; + [progressBar setDoubleValue:30]; + + [self registerThemeValues:nil forView:progressBar inherit:themedProgressIndicator]; + + return progressBar; + +} + ++ (CPProgressIndicator)themedIndeterminateBarProgressIndicator +{ + var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0, 0, 75, 16)]; + [progressBar setDoubleValue:30]; + + [self registerThemeValues:nil forView:progressBar inherit:themedIndeterminateProgressIndicator]; + + return progressBar; +} + @end diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index b6ec751bd..14c652209 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -18,7 +18,9 @@ var themedButtonValues = nil, themedCircularSliderValues = nil, themedButtonBarValues = nil, themedAlertValues = nil, - themedWindowViewValues = nil; + themedWindowViewValues = nil, + themedProgressIndicator = nil, + themedIndeterminateProgressIndicator = nil; @implementation Aristo2ThemeDescriptor : BKThemeDescriptor @@ -1701,15 +1703,15 @@ 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); - themeValues = - [ - [@"bezel-color", bezelColor], - [@"bar-color", barColor] - ]; + themedProgressIndicator = + [ + [@"bezel-color", bezelColor], + [@"bar-color", barColor] + ]; - [self registerThemeValues:themeValues forView:progressBar]; + [self registerThemeValues:themedProgressIndicator forView:progressBar]; return progressBar; } @@ -1734,15 +1736,15 @@ 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); - themeValues = - [ - [@"bezel-color", bezelColor], - [@"inderterminate-bar-color", barColor] - ]; + themedIndeterminateProgressIndicator = + [ + [@"bezel-color", bezelColor], + [@"inderterminate-bar-color", barColor] + ]; - [self registerThemeValues:themeValues forView:progressBar]; + [self registerThemeValues:themedIndeterminateProgressIndicator forView:progressBar]; return progressBar; } @@ -2482,4 +2484,25 @@ var themedButtonValues = nil, return [alert themeView]; } ++ (CPProgressIndicator)themedBarProgressIndicator +{ + var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0, 0, 75, 16)]; + [progressBar setDoubleValue:30]; + + [self registerThemeValues:nil forView:progressBar inherit:themedProgressIndicator]; + + return progressBar; + +} + ++ (CPProgressIndicator)themedIndeterminateBarProgressIndicator +{ + var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0, 0, 75, 16)]; + [progressBar setDoubleValue:30]; + + [self registerThemeValues:nil forView:progressBar inherit:themedIndeterminateProgressIndicator]; + + return progressBar; +} + @end