Merge branch 'master' of github.mv.usa.alcatel.com:amercada/Cappuccino

AppKit/CPProgressIndicator.j

@@ -288,6 +288,8 @@ var CPProgressIndicatorSpinningStyleColors  = nil;
 
     _style = aStyle;
 
+    [self setTheme:(_style === CPProgressIndicatorHUDBarStyle) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
+
     [self updateBackgroundColor];
 }
 
@@ -403,17 +405,16 @@ var CPProgressIndicatorSpinningStyleColors  = nil;
         }
         else
         {
-            // TODO: HUD theme
-           [self setBackgroundColor:[self valueForThemeAttribute:@"bezel-color"]];
+           [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
 
            var barView = [self layoutEphemeralSubviewNamed:"bar-view"
                                                  positioned:CPWindowBelow
                             relativeToEphemeralSubviewNamed:nil];
 
            if (_isIndeterminate)
-               [barView setBackgroundColor:[self valueForThemeAttribute:@"inderterminate-bar-color"]];
+               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"inderterminate-bar-color"]];
            else
-               [barView setBackgroundColor:[self valueForThemeAttribute:@"bar-color"]];
+               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"bar-color"]];
 
         }
     }

AppKit/Themes/Aristo/ThemeDescriptors.j

@@ -1056,9 +1056,22 @@ var themedButtonValues = nil,
 
 + (CPSearchField)themedSearchField
 {
-    var searchField = [[CPSearchField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 30.0)];
+    var searchField = [[CPSearchField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 30.0)],
 
-    [self registerThemeValues:nil forView:searchField inherit:themedRoundedTextFieldValues];
+        imageSearch = PatternImage("search-field-search.png", 25.0, 22.0),
+        imageFind = PatternImage("search-field-find.png", 25.0, 22.0),
+        imageCancel = PatternImage("search-field-cancel.png", 22.0, 22.0),
+        imageCancelPressed = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
+
+        overrides =
+        [
+            [@"image-search", imageSearch],
+            [@"image-find", imageFind],
+            [@"image-cancel", imageCancel],
+            [@"image-cancel-pressed", imageCancelPressed]
+        ];
+
+    [self registerThemeValues:overrides forView:searchField inherit:themedRoundedTextFieldValues];
     return searchField;
 }