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

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

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