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

AppKit/CPApplication.j

@@ -1357,26 +1357,25 @@ var _CPAppBootstrapperActions = nil;
     // FIXME: We should implement autoenabling.
     [mainMenu setAutoenablesItems:NO];
 
-    var themeBundle = [[CPApp themeBlend] bundle],
-        newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
+    var newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
 
-    [newMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/new.png"] size:CGSizeMake(16.0, 16.0)]];
-    [newMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/new-highlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [newMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-new" forClass:_CPMenuView]];
+    [newMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-new" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
 
     [mainMenu addItem:newMenuItem];
 
     var openMenuItem = [[CPMenuItem alloc] initWithTitle:@"Open" action:@selector(openDocument:) keyEquivalent:@"o"];
 
-    [openMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/open.png"] size:CGSizeMake(16.0, 16.0)]];
-    [openMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/open-highlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [openMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-open" forClass:_CPMenuView]];
+    [openMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-open" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
 
     [mainMenu addItem:openMenuItem];
 
     var saveMenu = [[CPMenu alloc] initWithTitle:@"Save"],
         saveMenuItem = [[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:nil];
 
-    [saveMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/save.png"] size:CGSizeMake(16.0, 16.0)]];
-    [saveMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/save-highlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [saveMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-save" forClass:_CPMenuView]];
+    [saveMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-save" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
 
     [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]];
     [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save As" action:@selector(saveDocumentAs:) keyEquivalent:nil]];

AppKit/CPMenu/_CPMenuWindow.j

@@ -414,7 +414,8 @@ var STICKY_TIME_INTERVAL        = 500;
 {
     return [CPDictionary dictionaryWithObjects:[    [CPNull null], [CPNull null], [CPNull null], [CPNull null], CGInsetMake(5.0, 1.0, 1.0, 5.0), 16.0,
                                                     [CPNull null], [CPNull null], 30.0, 10.0, 10.0, 10.0,
-                                                    [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], 28.0, [CPNull null], 1.0]
+                                                    [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], 28.0, [CPNull null], 1.0,
+                                                    [CPNull null], [CPNull null], [CPNull null]]
                                        forKeys:[    @"menu-window-more-above-image",
                                                     @"menu-window-more-below-image",
                                                     @"menu-window-pop-up-background-style-color",
@@ -438,7 +439,11 @@ var STICKY_TIME_INTERVAL        = 500;
                                                     @"menu-bar-highlight-text-shadow-color",
                                                     @"menu-bar-height",
                                                     @"menu-bar-icon-image",
-                                                    @"menu-bar-icon-image-alpha-value"]];
+                                                    @"menu-bar-icon-image-alpha-value",
+
+                                                    @"menu-general-icon-new",
+                                                    @"menu-general-icon-save",
+                                                    @"menu-general-icon-open"]];
 }
 
 - (unsigned)numberOfUnhiddenItems

AppKit/Themes/Aristo2/ThemeDescriptors.j

@@ -2180,6 +2180,12 @@ var themedButtonValues = nil,
 
         menuWindowMoreAboveImage = PatternImage(@"menu-window-more-above.png", 38.0, 18.0),
         menuWindowMoreBelowImage = PatternImage(@"menu-window-more-below.png", 38.0, 18.0),
+        generalIconNew = PatternImage(@"menu-general-icon-new.png", 16.0, 16.0),
+        generalIconNewHighlighted = PatternImage(@"menu-general-icon-new-highlighted.png", 16.0, 16.0),
+        generalIconOpen = PatternImage(@"menu-general-icon-open.png", 16.0, 16.0),
+        generalIconOpenHighlighted = PatternImage(@"menu-general-icon-open-highlighted.png", 16.0, 16.0),
+        generalIconSave = PatternImage(@"menu-general-icon-save.png", 16.0, 16.0),
+        generalIconSaveHighlighted = PatternImage(@"menu-general-icon-save-highlighted.png", 16.0, 16.0),
 
         menuWindowPopUpBackgroundStyleColor = PatternColor(
             [
@@ -2217,7 +2223,7 @@ 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, 1.0, 1.0)],
+            [@"menu-window-margin-inset",                           CGInsetMake(5.0, 1.0, 5.0, 1.0)],
             [@"menu-window-scroll-indicator-height",                16.0],
 
             [@"menu-bar-window-background-color",                   menuBarWindowBackgroundColor],
@@ -2236,7 +2242,16 @@ var themedButtonValues = nil,
             [@"menu-bar-highlight-text-shadow-color",               [CPColor blackColor]],
             [@"menu-bar-height",                                    28.0],
             [@"menu-bar-icon-image",                                nil],
-            [@"menu-bar-icon-image-alpha-value",                    1.0]
+            [@"menu-bar-icon-image-alpha-value",                    1.0],
+
+            [@"menu-general-icon-new",                              generalIconNew],
+            [@"menu-general-icon-new",                              generalIconNewHighlighted, CPThemeStateHighlighted],
+
+            [@"menu-general-icon-save",                             generalIconSave],
+            [@"menu-general-icon-save",                             generalIconSaveHighlighted, CPThemeStateHighlighted],
+
+            [@"menu-general-icon-open",                             generalIconOpen],
+            [@"menu-general-icon-open",                             generalIconOpenHighlighted, CPThemeStateHighlighted]
         ];