From fdbc7cc585b7f0072c90591c80fee2c0297cd7d5 Mon Sep 17 00:00:00 2001
From: Antoine Mercadal <antoine.mercadal@gmail.com>
Date: Fri, 11 Jan 2013 11:49:55 -0800
Subject: [PATCH] Add showcase for HUD progress indicators

---
 AppKit/Themes/Aristo/ThemeDescriptors.j  | 53 +++++++++++++++++-------
 AppKit/Themes/Aristo2/ThemeDescriptors.j | 53 +++++++++++++++++-------
 2 files changed, 76 insertions(+), 30 deletions(-)

diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 309319a4c..030ae1216 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
@@ -1988,15 +1990,15 @@ var themedButtonValues = nil,
                 ["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;
 }
@@ -2021,15 +2023,15 @@ var themedButtonValues = nil,
                 ["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;
 }
@@ -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