From 3519f4f9c707b54b12f7135fee533fd3ba04fb3e Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 17:07:05 -0800 Subject: [PATCH 1/5] Remove unused AppKit resources --- .../CPImageView/CPImageViewBottomLeftShadow.png | Bin 144 -> 0 bytes .../CPImageView/CPImageViewBottomRightShadow.png | Bin 144 -> 0 bytes .../CPImageView/CPImageViewBottomShadow.png | Bin 83 -> 0 bytes .../CPImageView/CPImageViewLeftShadow.png | Bin 72 -> 0 bytes .../CPImageView/CPImageViewRightShadow.png | Bin 72 -> 0 bytes .../CPImageView/CPImageViewTopLeftShadow.png | Bin 128 -> 0 bytes .../CPImageView/CPImageViewTopRightShadow.png | Bin 138 -> 0 bytes .../CPImageView/CPImageViewTopShadow.png | Bin 77 -> 0 bytes .../Resources/CPMenuItem/CPMenuItemOnState.png | Bin 105 -> 0 bytes .../CPMenuItem/CPMenuItemOnStateHighlighted.png | Bin 105 -> 0 bytes .../_CPMenuBarWindowBackground.png | Bin 1010 -> 0 bytes .../_CPMenuBarWindowBackgroundSelected.png | Bin 1013 -> 0 bytes .../Resources/_CPMenuWindow/_CPMenuWindow1.png | Bin 73 -> 0 bytes .../Resources/_CPMenuWindow/_CPMenuWindow3.png | Bin 70 -> 0 bytes .../Resources/_CPMenuWindow/_CPMenuWindow4.png | Bin 82 -> 0 bytes .../Resources/_CPMenuWindow/_CPMenuWindow5.png | Bin 70 -> 0 bytes .../Resources/_CPMenuWindow/_CPMenuWindow7.png | Bin 70 -> 0 bytes .../_CPMenuWindow/_CPMenuWindowMoreAbove.png | Bin 160 -> 0 bytes .../_CPMenuWindow/_CPMenuWindowMoreBelow.png | Bin 183 -> 0 bytes .../_CPMenuWindow/_CPMenuWindowRounded0.png | Bin 97 -> 0 bytes .../_CPMenuWindow/_CPMenuWindowRounded2.png | Bin 100 -> 0 bytes .../_CPMenuWindow/_CPMenuWindowRounded6.png | Bin 90 -> 0 bytes .../_CPMenuWindow/_CPMenuWindowRounded8.png | Bin 96 -> 0 bytes 23 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 AppKit/Resources/CPImageView/CPImageViewBottomLeftShadow.png delete mode 100644 AppKit/Resources/CPImageView/CPImageViewBottomRightShadow.png delete mode 100644 AppKit/Resources/CPImageView/CPImageViewBottomShadow.png delete mode 100644 AppKit/Resources/CPImageView/CPImageViewLeftShadow.png delete mode 100644 AppKit/Resources/CPImageView/CPImageViewRightShadow.png delete mode 100644 AppKit/Resources/CPImageView/CPImageViewTopLeftShadow.png delete mode 100644 AppKit/Resources/CPImageView/CPImageViewTopRightShadow.png delete mode 100644 AppKit/Resources/CPImageView/CPImageViewTopShadow.png delete mode 100644 AppKit/Resources/CPMenuItem/CPMenuItemOnState.png delete mode 100644 AppKit/Resources/CPMenuItem/CPMenuItemOnStateHighlighted.png delete mode 100644 AppKit/Resources/_CPMenuBarWindow/_CPMenuBarWindowBackground.png delete mode 100644 AppKit/Resources/_CPMenuBarWindow/_CPMenuBarWindowBackgroundSelected.png delete mode 100644 AppKit/Resources/_CPMenuWindow/_CPMenuWindow1.png delete mode 100644 AppKit/Resources/_CPMenuWindow/_CPMenuWindow3.png delete mode 100644 AppKit/Resources/_CPMenuWindow/_CPMenuWindow4.png delete mode 100644 AppKit/Resources/_CPMenuWindow/_CPMenuWindow5.png delete mode 100644 AppKit/Resources/_CPMenuWindow/_CPMenuWindow7.png delete mode 100644 AppKit/Resources/_CPMenuWindow/_CPMenuWindowMoreAbove.png delete mode 100644 AppKit/Resources/_CPMenuWindow/_CPMenuWindowMoreBelow.png delete mode 100644 AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded0.png delete mode 100644 AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded2.png delete mode 100644 AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded6.png delete mode 100644 AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded8.png diff --git a/AppKit/Resources/CPImageView/CPImageViewBottomLeftShadow.png b/AppKit/Resources/CPImageView/CPImageViewBottomLeftShadow.png deleted file mode 100644 index 9869030cf424bab4be7aaa5cf1562557a3db2ed5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>0wld=oSO}#!aZFaLpWqv4;u0{IS4QuxVhI_ zG@~O-f_wgh$u;|B4aH{3SR8)ykdvYFE*nGU^}h@YUhTUl=I-kx5p(BG?A+dfQhEI~ rYU~`Y#xv%ausV6H)CzK7U}~^m!@?W$c0%eSpcM?Bu6{1-oD!M0wld=oSO}#!aZFaLpWqv5AGH{WFWv`U|D!x zVvXzZO)DiDq@*%F6xWrz&0;*j`FVdQ&MBb@0Hymc`~Uy| diff --git a/AppKit/Resources/CPImageView/CPImageViewBottomShadow.png b/AppKit/Resources/CPImageView/CPImageViewBottomShadow.png deleted file mode 100644 index 4fa1250f82700c3626cf6a0272da60484b590e5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 83 zcmeAS@N?(olHy`uVBq!ia0vp^j6lrE!2%>B{rmEPl$587V+eV!Z diff --git a/AppKit/Resources/CPImageView/CPImageViewLeftShadow.png b/AppKit/Resources/CPImageView/CPImageViewLeftShadow.png deleted file mode 100644 index e897b0fc4680591f5c57c041f7cea7cea6359d53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y@!2%>VzPw`(r1(8u978x{lM@6I3=%wmlI{!( U6)(>g0!lG>y85}Sb4q9e0L1+cfB*mh diff --git a/AppKit/Resources/CPImageView/CPImageViewRightShadow.png b/AppKit/Resources/CPImageView/CPImageViewRightShadow.png deleted file mode 100644 index 91f8fc2420f256d23bbcb032b7aa47f38ccd62b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRT!2%?go%Z<#r1(8u978x{lhYj7I33RMGcc<# V#ux^@F$796c)I$ztaD0e0sz334oCn1 diff --git a/AppKit/Resources/CPImageView/CPImageViewTopLeftShadow.png b/AppKit/Resources/CPImageView/CPImageViewTopLeftShadow.png deleted file mode 100644 index bb6b59f14bfd666c42570145b6e6a9538c3af401..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>0wld=oSO}#+&x_!LpWqv4{j7ZY{0`}FyYVS zsdKcn+a diff --git a/AppKit/Resources/CPImageView/CPImageViewTopRightShadow.png b/AppKit/Resources/CPImageView/CPImageViewTopRightShadow.png deleted file mode 100644 index 0c31dfedd3496e10d19b010094a7d4bdc9db97c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>0wld=oSO}#0zF+ELpWqv4?1!kG7w-ma5Fc6 ztBd`h_wWDDzXnBR8FU&eG8inVXk3_GH!E(g l!-I!v!VGtOl^7j3{%yG;>Lb(j;waE?22WQ%mvv4FO#p?2EdT%j diff --git a/AppKit/Resources/CPImageView/CPImageViewTopShadow.png b/AppKit/Resources/CPImageView/CPImageViewTopShadow.png deleted file mode 100644 index df08a10a68db566a8872a93672ee527a54ae65cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmeAS@N?(olHy`uVBq!ia0vp^j6lr7!2%?oUYxrTNQrp5IEHY@CMP7MBnTuVTu4lK az{V!Z diff --git a/AppKit/Resources/CPMenuItem/CPMenuItemOnStateHighlighted.png b/AppKit/Resources/CPMenuItem/CPMenuItemOnStateHighlighted.png deleted file mode 100644 index 5f0899daf6e2d8098e260331c1ef6f6dfb8553c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh0wlLOK8*rW2A(dCArhC9f1GcSHo6cu>23Y* z|IZz6@TDYrZ2RBdSmtx`dBMr&DqfFF#nv~!5OrcWIOX2f0$ufXpk4+~S3j3^P6s;kx*betvr;mRr0#|9b>c# zG>9}6iWk>W)6}u4wZQz5g*6t9&A#i+Z3)SeC!A-ds!pd0O+m>RjOYQkWZ~&~2ubGq7sP2kPn1ZRS_GMj6sRUi8P`lZ z=Y8_WjZ3xj!BIxkKFR3;3q?J~D-~Ge?rKA&qVUFi#9~pDVBe+TK|)gAb1hliC{Y}l z5Vb`XTTR%~AZ{aMAZWO*hdtZ&8ran;j?1vNjx^M^y=GT)5bA1eggXv~y6x%>13R4x z+e>pEq#>#7#=`C#+r1KNI*bIIvH_+0RR?TMD5v>^X299jfggl%TFPa4&ZBh+iw{ZU zF`9r`e$Dt2`_T9|?sf}#MiXL;VaIDX9C?n7{wHUua7Hbg(_*jgU+;i}-9xR;w+){B-KQetWXyeEf1#*^w5Ybcd}z|MBj@ PQaOda?xy>u^Yq1UITtmT diff --git a/AppKit/Resources/_CPMenuBarWindow/_CPMenuBarWindowBackgroundSelected.png b/AppKit/Resources/_CPMenuBarWindow/_CPMenuBarWindowBackgroundSelected.png deleted file mode 100644 index cee49cf31fc9b1c9ceec927d8ee7aecaacc11883..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1013 zcmbVLO>5LZ7>*x^6boMUAVZ2C#7$Wm~wvzu)G2uSQM@)v!6J938!8lqH|9MSiK6%$4h=SAlJJgW$>K%{ zqtJw?A+lJn!MX-<10e%J!*N{fHk)o0J6g$c61J%$4K-TTT3fRbYHJOITQ-Jz)6uI2 zwp%5(lVsda0#e$Igxx7tI~8l%jQE_g9;F*)2P}^$r`d?6z+TaT=Lb@)R5XPtH`~j9N6uU(He;i4H8b$E`1f z4ETEal| cA)A~4WHT`^o2EkOEIvKbLh*2~7aX01$!z diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindow7.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindow7.png deleted file mode 100644 index 9125d382ecc1abbf77d2d61a9b0b36cea8b73be0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 70 zcmeAS@N?(olHy`uVBq!ia0vp^j6lr70VEi*Hgi1#QoNonjv*Yf$$t)UG*vV3t1!>q Sz&SG#q`=eF&t;ucLK6V8?GEAq diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowMoreAbove.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindowMoreAbove.png deleted file mode 100644 index f7aba4e91029f41f267cb653f2d56b45999153d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^YCtT+!2%@b-cOkaq|!ZI978NlC;vF_V0*$KOX4d} zw|m|$4jC)I#B{FRH?OI{~|78czN(N6? KKbLh*2~7aXa6mBt diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowMoreBelow.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindowMoreBelow.png deleted file mode 100644 index b46b9fec3ff75f62550ede99542cbd7abc6fd431..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^YCtT+!3HGFudNXUQgxm#jv*Dd-d@?r*X&-4HKZ`hQ6CEmVsT$dN<5(ZCKKbLh*2~7aE@AZ$WZgxe9tKZWKbLh*2~7Y+^&sT{ diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded2.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded2.png deleted file mode 100644 index 4243fd990da531a1cd635b2017f9344887d038cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^EFjDQBAI`LeFak5o-U3d9I~tj7xFSFGO!#B4*AFF wo2y(Q^2?*(x3Qy{yz;LYqu}*ZCr4@jyH+RNBxN?;7^scG)78&qol`;+09HyG<^TWy diff --git a/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded6.png b/AppKit/Resources/_CPMenuWindow/_CPMenuWindowRounded6.png deleted file mode 100644 index 51fbeea38afc053dc160ccc626127b27c27c8c5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^EFjDQBAI`LeFajAo-U3d9MQ=)KL6*IFnUw@Rqj;A n{!jmHXB^zNy!`xU+y9Jg$tKFw$3@G~%ITydX= sXZ=ivE5U4StUBrv5^)AP$txHc)|Yes{o5nK4b;Nm>FVdQ&MBb@01D+8{r~^~ From 41650d58a2c897a4cf525d17e9e07f4e5aa3857b Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 17:22:34 -0800 Subject: [PATCH 2/5] Add new theme attribute to get general open/save/new icons --- AppKit/CPMenu/_CPMenuWindow.j | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 From b9c0e969337bf5f1efadb5c1d07281c0b06fab5c Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 17:23:03 -0800 Subject: [PATCH 3/5] Add theme descriptors for new/open/save icons --- ... => menu-general-icon-new-highlighted.png} | Bin .../new.png => menu-general-icon-new.png} | Bin ...=> menu-general-icon-open-highlighted.png} | Bin .../open.png => menu-general-icon-open.png} | Bin ...=> menu-general-icon-save-highlighted.png} | Bin .../save.png => menu-general-icon-save.png} | Bin AppKit/Themes/Aristo2/ThemeDescriptors.j | 19 ++++++++++++++++-- 7 files changed, 17 insertions(+), 2 deletions(-) rename AppKit/Themes/Aristo2/Resources/{application-icons/new-highlighted.png => menu-general-icon-new-highlighted.png} (100%) rename AppKit/Themes/Aristo2/Resources/{application-icons/new.png => menu-general-icon-new.png} (100%) rename AppKit/Themes/Aristo2/Resources/{application-icons/open-highlighted.png => menu-general-icon-open-highlighted.png} (100%) rename AppKit/Themes/Aristo2/Resources/{application-icons/open.png => menu-general-icon-open.png} (100%) rename AppKit/Themes/Aristo2/Resources/{application-icons/save-highlighted.png => menu-general-icon-save-highlighted.png} (100%) rename AppKit/Themes/Aristo2/Resources/{application-icons/save.png => menu-general-icon-save.png} (100%) 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] ]; From 54ab7ea9eebf3135d5c2c55f0bad3181fd383d47 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 17:23:22 -0800 Subject: [PATCH 4/5] use _CPMenuItemView to get general open/save/new icons --- AppKit/CPApplication.j | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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]]; From 6ba77c146bf35731b81c9fda66c40f9cb1aca945 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 17:26:12 -0800 Subject: [PATCH 5/5] Backport Aristo2 changes to Aristo1 --- ...ed.png => menu-general-icon-new-highlighted.png} | Bin .../new.png => menu-general-icon-new.png} | Bin ...d.png => menu-general-icon-open-highlighted.png} | Bin .../open.png => menu-general-icon-open.png} | Bin ...d.png => menu-general-icon-save-highlighted.png} | Bin .../save.png => menu-general-icon-save.png} | Bin 6 files changed, 0 insertions(+), 0 deletions(-) rename AppKit/Themes/Aristo/Resources/{application-icons/new-highlighted.png => menu-general-icon-new-highlighted.png} (100%) rename AppKit/Themes/Aristo/Resources/{application-icons/new.png => menu-general-icon-new.png} (100%) rename AppKit/Themes/Aristo/Resources/{application-icons/open-highlighted.png => menu-general-icon-open-highlighted.png} (100%) rename AppKit/Themes/Aristo/Resources/{application-icons/open.png => menu-general-icon-open.png} (100%) rename AppKit/Themes/Aristo/Resources/{application-icons/save-highlighted.png => menu-general-icon-save-highlighted.png} (100%) rename AppKit/Themes/Aristo/Resources/{application-icons/save.png => menu-general-icon-save.png} (100%) 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