diff --git a/AppKit/CPApplication.j b/AppKit/CPApplication.j index 8eb73df9e..ade55ccfb 100644 --- a/AppKit/CPApplication.j +++ b/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]]; diff --git a/AppKit/CPMenu/_CPMenuWindow.j b/AppKit/CPMenu/_CPMenuWindow.j index 5c109ebec..a91146f3c 100644 --- a/AppKit/CPMenu/_CPMenuWindow.j +++ b/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 diff --git a/AppKit/Resources/CPImageView/CPImageViewBottomLeftShadow.png b/AppKit/Resources/CPImageView/CPImageViewBottomLeftShadow.png deleted file mode 100644 index 9869030cf..000000000 Binary files a/AppKit/Resources/CPImageView/CPImageViewBottomLeftShadow.png and /dev/null differ diff --git a/AppKit/Resources/CPImageView/CPImageViewBottomRightShadow.png b/AppKit/Resources/CPImageView/CPImageViewBottomRightShadow.png deleted file mode 100644 index f0149cf72..000000000 Binary files a/AppKit/Resources/CPImageView/CPImageViewBottomRightShadow.png and /dev/null differ diff --git a/AppKit/Resources/CPImageView/CPImageViewBottomShadow.png b/AppKit/Resources/CPImageView/CPImageViewBottomShadow.png deleted file mode 100644 index 4fa1250f8..000000000 Binary files a/AppKit/Resources/CPImageView/CPImageViewBottomShadow.png and /dev/null differ diff --git a/AppKit/Resources/CPImageView/CPImageViewLeftShadow.png b/AppKit/Resources/CPImageView/CPImageViewLeftShadow.png deleted file mode 100644 index e897b0fc4..000000000 Binary files a/AppKit/Resources/CPImageView/CPImageViewLeftShadow.png and /dev/null differ diff --git a/AppKit/Resources/CPImageView/CPImageViewRightShadow.png b/AppKit/Resources/CPImageView/CPImageViewRightShadow.png deleted file mode 100644 index 91f8fc242..000000000 Binary files a/AppKit/Resources/CPImageView/CPImageViewRightShadow.png and /dev/null differ diff --git a/AppKit/Resources/CPImageView/CPImageViewTopLeftShadow.png b/AppKit/Resources/CPImageView/CPImageViewTopLeftShadow.png deleted file mode 100644 index bb6b59f14..000000000 Binary files a/AppKit/Resources/CPImageView/CPImageViewTopLeftShadow.png and /dev/null differ diff --git a/AppKit/Resources/CPImageView/CPImageViewTopRightShadow.png b/AppKit/Resources/CPImageView/CPImageViewTopRightShadow.png deleted file mode 100644 index 0c31dfedd..000000000 Binary files a/AppKit/Resources/CPImageView/CPImageViewTopRightShadow.png and /dev/null differ diff --git a/AppKit/Resources/CPImageView/CPImageViewTopShadow.png b/AppKit/Resources/CPImageView/CPImageViewTopShadow.png deleted file mode 100644 index df08a10a6..000000000 Binary files a/AppKit/Resources/CPImageView/CPImageViewTopShadow.png and /dev/null differ diff --git a/AppKit/Resources/CPMenuItem/CPMenuItemOnState.png b/AppKit/Resources/CPMenuItem/CPMenuItemOnState.png deleted file mode 100644 index d67d4f03d..000000000 Binary files a/AppKit/Resources/CPMenuItem/CPMenuItemOnState.png and /dev/null differ diff --git a/AppKit/Resources/CPMenuItem/CPMenuItemOnStateHighlighted.png b/AppKit/Resources/CPMenuItem/CPMenuItemOnStateHighlighted.png deleted file mode 100644 index 5f0899daf..000000000 Binary files a/AppKit/Resources/CPMenuItem/CPMenuItemOnStateHighlighted.png and /dev/null differ diff --git a/AppKit/Resources/_CPMenuBarWindow/_CPMenuBarWindowBackground.png b/AppKit/Resources/_CPMenuBarWindow/_CPMenuBarWindowBackground.png deleted file mode 100644 index ea3d910ee..000000000 Binary files a/AppKit/Resources/_CPMenuBarWindow/_CPMenuBarWindowBackground.png and /dev/null differ diff --git a/AppKit/Resources/_CPMenuBarWindow/_CPMenuBarWindowBackgroundSelected.png b/AppKit/Resources/_CPMenuBarWindow/_CPMenuBarWindowBackgroundSelected.png deleted file mode 100644 index cee49cf31..000000000 Binary files a/AppKit/Resources/_CPMenuBarWindow/_CPMenuBarWindowBackgroundSelected.png and /dev/null differ diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindow1.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindow1.png deleted file mode 100644 index 51a55035e..000000000 Binary files a/AppKit/Resources/_CPMenuWindow/_CPMenuWindow1.png and /dev/null differ diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindow3.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindow3.png deleted file mode 100644 index 3b5543e65..000000000 Binary files a/AppKit/Resources/_CPMenuWindow/_CPMenuWindow3.png and /dev/null differ diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindow4.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindow4.png deleted file mode 100644 index 3334e6648..000000000 Binary files a/AppKit/Resources/_CPMenuWindow/_CPMenuWindow4.png and /dev/null differ diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindow5.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindow5.png deleted file mode 100644 index cf9849b9e..000000000 Binary files a/AppKit/Resources/_CPMenuWindow/_CPMenuWindow5.png and /dev/null differ diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindow7.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindow7.png deleted file mode 100644 index 9125d382e..000000000 Binary files a/AppKit/Resources/_CPMenuWindow/_CPMenuWindow7.png and /dev/null differ diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowMoreAbove.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindowMoreAbove.png deleted file mode 100644 index f7aba4e91..000000000 Binary files a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowMoreAbove.png and /dev/null differ diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowMoreBelow.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindowMoreBelow.png deleted file mode 100644 index b46b9fec3..000000000 Binary files a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowMoreBelow.png and /dev/null differ diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded0.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded0.png deleted file mode 100644 index b1b69b034..000000000 Binary files a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded0.png and /dev/null differ diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded2.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded2.png deleted file mode 100644 index 4243fd990..000000000 Binary files a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded2.png and /dev/null differ diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded6.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded6.png deleted file mode 100644 index 51fbeea38..000000000 Binary files a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded6.png and /dev/null differ diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded8.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded8.png deleted file mode 100644 index 93b44c354..000000000 Binary files a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded8.png and /dev/null differ diff --git a/AppKit/Themes/Aristo/Resources/application-icons/new-highlighted.png b/AppKit/Themes/Aristo/Resources/menu-general-icon-new-highlighted.png similarity index 100% rename from AppKit/Themes/Aristo/Resources/application-icons/new-highlighted.png rename to AppKit/Themes/Aristo/Resources/menu-general-icon-new-highlighted.png diff --git a/AppKit/Themes/Aristo/Resources/application-icons/new.png b/AppKit/Themes/Aristo/Resources/menu-general-icon-new.png similarity index 100% rename from AppKit/Themes/Aristo/Resources/application-icons/new.png rename to AppKit/Themes/Aristo/Resources/menu-general-icon-new.png diff --git a/AppKit/Themes/Aristo/Resources/application-icons/open-highlighted.png b/AppKit/Themes/Aristo/Resources/menu-general-icon-open-highlighted.png similarity index 100% rename from AppKit/Themes/Aristo/Resources/application-icons/open-highlighted.png rename to AppKit/Themes/Aristo/Resources/menu-general-icon-open-highlighted.png diff --git a/AppKit/Themes/Aristo/Resources/application-icons/open.png b/AppKit/Themes/Aristo/Resources/menu-general-icon-open.png similarity index 100% rename from AppKit/Themes/Aristo/Resources/application-icons/open.png rename to AppKit/Themes/Aristo/Resources/menu-general-icon-open.png diff --git a/AppKit/Themes/Aristo/Resources/application-icons/save-highlighted.png b/AppKit/Themes/Aristo/Resources/menu-general-icon-save-highlighted.png similarity index 100% rename from AppKit/Themes/Aristo/Resources/application-icons/save-highlighted.png rename to AppKit/Themes/Aristo/Resources/menu-general-icon-save-highlighted.png diff --git a/AppKit/Themes/Aristo/Resources/application-icons/save.png b/AppKit/Themes/Aristo/Resources/menu-general-icon-save.png similarity index 100% rename from AppKit/Themes/Aristo/Resources/application-icons/save.png rename to AppKit/Themes/Aristo/Resources/menu-general-icon-save.png diff --git a/AppKit/Themes/Aristo2/Resources/application-icons/new-highlighted.png b/AppKit/Themes/Aristo2/Resources/menu-general-icon-new-highlighted.png similarity index 100% rename from AppKit/Themes/Aristo2/Resources/application-icons/new-highlighted.png rename to AppKit/Themes/Aristo2/Resources/menu-general-icon-new-highlighted.png diff --git a/AppKit/Themes/Aristo2/Resources/application-icons/new.png b/AppKit/Themes/Aristo2/Resources/menu-general-icon-new.png similarity index 100% rename from AppKit/Themes/Aristo2/Resources/application-icons/new.png rename to AppKit/Themes/Aristo2/Resources/menu-general-icon-new.png diff --git a/AppKit/Themes/Aristo2/Resources/application-icons/open-highlighted.png b/AppKit/Themes/Aristo2/Resources/menu-general-icon-open-highlighted.png similarity index 100% rename from AppKit/Themes/Aristo2/Resources/application-icons/open-highlighted.png rename to AppKit/Themes/Aristo2/Resources/menu-general-icon-open-highlighted.png diff --git a/AppKit/Themes/Aristo2/Resources/application-icons/open.png b/AppKit/Themes/Aristo2/Resources/menu-general-icon-open.png similarity index 100% rename from AppKit/Themes/Aristo2/Resources/application-icons/open.png rename to AppKit/Themes/Aristo2/Resources/menu-general-icon-open.png diff --git a/AppKit/Themes/Aristo2/Resources/application-icons/save-highlighted.png b/AppKit/Themes/Aristo2/Resources/menu-general-icon-save-highlighted.png similarity index 100% rename from AppKit/Themes/Aristo2/Resources/application-icons/save-highlighted.png rename to AppKit/Themes/Aristo2/Resources/menu-general-icon-save-highlighted.png diff --git a/AppKit/Themes/Aristo2/Resources/application-icons/save.png b/AppKit/Themes/Aristo2/Resources/menu-general-icon-save.png similarity index 100% rename from AppKit/Themes/Aristo2/Resources/application-icons/save.png rename to AppKit/Themes/Aristo2/Resources/menu-general-icon-save.png diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index 1284c1f80..2d2231898 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/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] ];