From 3242e35250ced8f3202b4162e1098ec777331ffc Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Wed, 11 May 2011 23:56:01 -0400 Subject: [PATCH] Added CPMenu -removeAll method, removed unused internal _itemIsHighlighted method, test app --- AppKit/CPMenu/CPMenu.j | 27 +++-- AppKit/CPPopUpButton.j | 6 +- .../CPMenuRemoveAllTest/AppController.j | 73 +++++++++++++ Tests/Manual/CPMenuRemoveAllTest/Info.plist | 12 ++ Tests/Manual/CPMenuRemoveAllTest/Jakefile | 93 ++++++++++++++++ .../CPMenuRemoveAllTest/Resources/spinner.gif | Bin 0 -> 1849 bytes .../CPMenuRemoveAllTest/index-debug.html | 103 ++++++++++++++++++ Tests/Manual/CPMenuRemoveAllTest/index.html | 78 +++++++++++++ Tests/Manual/CPMenuRemoveAllTest/main.j | 18 +++ 9 files changed, 397 insertions(+), 13 deletions(-) create mode 100644 Tests/Manual/CPMenuRemoveAllTest/AppController.j create mode 100644 Tests/Manual/CPMenuRemoveAllTest/Info.plist create mode 100644 Tests/Manual/CPMenuRemoveAllTest/Jakefile create mode 100644 Tests/Manual/CPMenuRemoveAllTest/Resources/spinner.gif create mode 100644 Tests/Manual/CPMenuRemoveAllTest/index-debug.html create mode 100644 Tests/Manual/CPMenuRemoveAllTest/index.html create mode 100644 Tests/Manual/CPMenuRemoveAllTest/main.j diff --git a/AppKit/CPMenu/CPMenu.j b/AppKit/CPMenu/CPMenu.j index db5aa8e61..961f2a421 100644 --- a/AppKit/CPMenu/CPMenu.j +++ b/AppKit/CPMenu/CPMenu.j @@ -337,6 +337,25 @@ var _CPMenuBarVisible = NO, [self removeObjectFromItemsAtIndex:anIndex]; } +/*! + Removes all the menu items in the receiver. + This method is more efficient than removing menu items individually. + + Unlike the other remove methods, this method does not post CPMenuDidChangeItemNotification notifications. +*/ +- (void)removeAllItems +{ + var count = [_items count]; + + // Remove the connection to this menu in case + // someone else has a reference to the menu item. + while (count--) + [_items[count] setMenu:nil]; + + _items = [CPMutableArray array]; + _highlightedIndex = CPNotFound; +} + /*! Called when a menu item has visually changed. @param aMenuItem the item that changed @@ -970,14 +989,6 @@ var _CPMenuBarVisible = NO, } // -/* - @ignore -*/ -- (BOOL)_itemIsHighlighted:(CPMenuItem)aMenuItem -{ - return _items[_highlightedIndex] == aMenuItem; -} - /* @ignore */ diff --git a/AppKit/CPPopUpButton.j b/AppKit/CPPopUpButton.j index ca1a548cb..193b5bcd5 100644 --- a/AppKit/CPPopUpButton.j +++ b/AppKit/CPPopUpButton.j @@ -192,11 +192,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down"); */ - (void)removeAllItems { - var menu = [self menu], - count = [menu numberOfItems]; - - while (count--) - [menu removeItemAtIndex:0]; + [[self menu] removeAllItems]; } /*! diff --git a/Tests/Manual/CPMenuRemoveAllTest/AppController.j b/Tests/Manual/CPMenuRemoveAllTest/AppController.j new file mode 100644 index 000000000..a8104a1e4 --- /dev/null +++ b/Tests/Manual/CPMenuRemoveAllTest/AppController.j @@ -0,0 +1,73 @@ +/* + * AppController.j + * CPMenuRemoveAllTest + * + * Created by aparajita on May 11, 2011. + * Copyright 2011, Victory-Heart Productions All rights reserved. + */ + +@import + + +@implementation AppController : CPObject +{ + CPMenu menu; +} + +- (void)applicationDidFinishLaunching:(CPNotification)aNotification +{ + var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask], + contentView = [theWindow contentView]; + + menu = [[CPPopUpButton alloc] initWithFrame:CGRectMakeZero()]; + + [self addStandardItems]; + [menu setPullsDown:YES]; + [menu sizeToFit]; + [menu setFrameSize:CGSizeMake(150, [menu frameSize].height)]; + [self setupAction]; + + [menu setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin | CPViewMinYMargin | CPViewMaxYMargin]; + [menu setCenter:[contentView center]]; + + [contentView addSubview:menu]; + + [theWindow orderFront:self]; + + // Uncomment the following line to turn on the standard menu bar. + //[CPMenu setMenuBarVisible:YES]; +} + +- (void)addStandardItems +{ + [menu addItemsWithTitles:[@"One", @"Two", @"Alternate Items"]]; +} + +- (void)addAlternateItems +{ + [menu addItemsWithTitles:[@"Three", @"Four", @"Default Items"]]; +} + +- (void)setupAction +{ + var item = [menu itemAtIndex:2]; + + [item setTarget:self]; + [item setAction:@selector(itemWasSelected:)]; +} + +- (void)itemWasSelected:(id)sender +{ + var title = [menu itemTitleAtIndex:0]; + + [menu removeAllItems]; + + if (title === @"One") + [self addAlternateItems]; + else + [self addStandardItems]; + + [self setupAction]; +} + +@end diff --git a/Tests/Manual/CPMenuRemoveAllTest/Info.plist b/Tests/Manual/CPMenuRemoveAllTest/Info.plist new file mode 100644 index 000000000..c542bb1e4 --- /dev/null +++ b/Tests/Manual/CPMenuRemoveAllTest/Info.plist @@ -0,0 +1,12 @@ + + + + + CPApplicationDelegateClass + AppController + CPBundleName + CPMenuRemoveAllTest + CPPrincipalClass + CPApplication + + diff --git a/Tests/Manual/CPMenuRemoveAllTest/Jakefile b/Tests/Manual/CPMenuRemoveAllTest/Jakefile new file mode 100644 index 000000000..3fcf47fb2 --- /dev/null +++ b/Tests/Manual/CPMenuRemoveAllTest/Jakefile @@ -0,0 +1,93 @@ +/* + * Jakefile + * CPMenuRemoveAllTest + * + * Created by aparajita on May 11, 2011. + * Copyright 2011, Victory-Heart Productions All rights reserved. + */ + +var ENV = require("system").env, + FILE = require("file"), + JAKE = require("jake"), + task = JAKE.task, + FileList = JAKE.FileList, + app = require("cappuccino/jake").app, + configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug", + OS = require("os"); + +app ("CPMenuRemoveAllTest", function(task) +{ + task.setBuildIntermediatesPath(FILE.join("Build", "CPMenuRemoveAllTest.build", configuration)); + task.setBuildPath(FILE.join("Build", configuration)); + + task.setProductName("CPMenuRemoveAllTest"); + task.setIdentifier("com.aparajita.CPMenuRemoveAllTest"); + task.setVersion("1.0"); + task.setAuthor("Victory-Heart Productions"); + task.setEmail("feedback @nospam@ yourcompany.com"); + task.setSummary("CPMenuRemoveAllTest"); + task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**"))); + task.setResources(new FileList("Resources/**")); + task.setIndexFilePath("index.html"); + task.setInfoPlistPath("Info.plist"); + + if (configuration === "Debug") + task.setCompilerFlags("-DDEBUG -g"); + else + task.setCompilerFlags("-O"); +}); + +task ("default", ["CPMenuRemoveAllTest"], function() +{ + printResults(configuration); +}); + +task ("build", ["default"]); + +task ("debug", function() +{ + ENV["CONFIGURATION"] = "Debug"; + JAKE.subjake(["."], "build", ENV); +}); + +task ("release", function() +{ + ENV["CONFIGURATION"] = "Release"; + JAKE.subjake(["."], "build", ENV); +}); + +task ("run", ["debug"], function() +{ + OS.system(["open", FILE.join("Build", "Debug", "CPMenuRemoveAllTest", "index.html")]); +}); + +task ("run-release", ["release"], function() +{ + OS.system(["open", FILE.join("Build", "Release", "CPMenuRemoveAllTest", "index.html")]); +}); + +task ("deploy", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Deployment", "CPMenuRemoveAllTest")); + OS.system(["press", "-f", FILE.join("Build", "Release", "CPMenuRemoveAllTest"), FILE.join("Build", "Deployment", "CPMenuRemoveAllTest")]); + printResults("Deployment") +}); + +task ("desktop", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Desktop", "CPMenuRemoveAllTest")); + require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "CPMenuRemoveAllTest"), FILE.join("Build", "Desktop", "CPMenuRemoveAllTest", "CPMenuRemoveAllTest.app")); + printResults("Desktop") +}); + +task ("run-desktop", ["desktop"], function() +{ + OS.system([FILE.join("Build", "Desktop", "CPMenuRemoveAllTest", "CPMenuRemoveAllTest.app", "Contents", "MacOS", "NativeHost"), "-i"]); +}); + +function printResults(configuration) +{ + print("----------------------------"); + print(configuration+" app built at path: "+FILE.join("Build", configuration, "CPMenuRemoveAllTest")); + print("----------------------------"); +} diff --git a/Tests/Manual/CPMenuRemoveAllTest/Resources/spinner.gif b/Tests/Manual/CPMenuRemoveAllTest/Resources/spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..06dbc2bc21dddcf0e09b566d5b211aee89570f52 GIT binary patch literal 1849 zcma*odr(tX9tZHtz31lM+(&Y`A`Ou`NeG&R#DrIfV%?hng21vs6v>ooRQQFbk7E_K!V( z{?5!fpZWgIZ%*d6t%i*j24bL}AZUJm9)h6R*;%L4IWse3G#VWaN1#$zSSXcBhlYlH zJ|D}n{r&w2f+Qp)SS*&n?*G4}{}!h?td_mjU6Kad-rW*QwWYCUk7d^e+sjpZAn6kT z5rM;`{~_}-wm+L@%+E;JphLm}C3WzQAQD0wBoY|rOTQX{(@pp-WAA8Iw0HKl|15j) zhGh(SFWu#5zUCw^T!}C~eC}~?{xG-r7ugQC>taC+|L^xr&a%{#cgUOZXIM&v?)k^2 z1i5%0!U00wq)r4vlAwXBA_m5J5WNeuBm-XJQ5pG4GD%vc|K){+TJ{AkHqN@SJKczX zU}QRd9n*_bf^h94)6Ctv{CUfz_;qs#RDuQ$DR%y1&5G-a6rhf*4Y zl+UOD1*GE{GQ7vv;c-tTIMkz0ovO>9j%b5hpa@a*CBJ#W!0@ndSwF|%hMkdFtXiU) z`BEp+yhkt8ZY>tg&uyH@%^%K4jDrbA;et&vnnzZ3z22@e6<27z2Vk13kb7OtISyxv z(XoO-LNQCZe3lfzc%*pNqU<9T+p~teThOEB+~e&U0mC|zS{Q)dJZ)!^1f7L(zg*L> z*vSW%?dR~@@0(}x6-V^A`~ImD;)NaBUnP8;RH=bS2@pk`wp>>8r&jGjmGPy%1BW}v zoPo}ca$~bze@efc3kapuEVW1!%teOZT3j2Tw5=hjiAf02d}7dL0oFC%@=RXp5Ow#% z@a>+AM|YWt$n&e`>sB-32gBcuTi>R>*|8@lp`y6thc7ydyqDsuUn~YzZf|{-R@-3y zL#wx{Ii}xxL_csiW*LBn0-A$>zp4WOmkf6=ilrjlW?-l9+bCd7|i?*b5NTmy<<6NZ0T8$SN@mwdC2f z6jqK=N@bS@!=YSj%>h0}*4p+%0HbTIrE$w7UMT6+AZZ&DAo*qZAAi(OtNbIfl#Dw^ zJWeiCp~zi#&t6x}m9)O^eR4HiLV3QA<<0>HZ8%$^lrSE94Wb}=+MM^!b>n#5&-JQR zkr-CEu9C;_F*7DqDisulV6Pmg$nFL0TPn%~*m^-`Z3^BgU(sNpnx%nW(!eV9A&FvI zHL3X3lw8Wji^6=8KbQDE-e%b?svdFxxdh$8r97@7$ojeI`6AL8Ob6QC$qh&>ZWVDX1F{0vJnT%%mE;GveKWR%C} zM&4d;Jf3s9|HAA)yVUPo`Aq;0do#)uHSXi5*QF*)x@MVVHr+cN)uMZ__F|&Ta#p8d z53TOKtce!PJUuie8UWol-S(`c2nH?UGqJP{!4RR4u$LCfn)q-hj0^f=h(VYy)T6eN zhRO!ja-aDBTcgeyP(8Ua4IdiOog^*CQa?R(cP#9AgL9`j>EX-6Yf1lzX(!~``M1XC zNmM<4<6d~wWZ$Xrk0K}UteTrq@LBBk#MsjkK;pbuVhe)NI7(7Pf(l?lxC7=1Z7Pzl zMbS;nV4NI5_N{1$P)&XC)huOGQ+h^zpYUZfb*1n6>!`#*b3y52LGmi+<4sY5jyD#- zw&$d}DTguLAfnRtjrM*JfqtHqUu6rQoU=g%1E9xk%;)TDm^2<8n-0IhTsQFaek)MY}>PK4;nBk=ow4pF>vzkO& gna%Org-kgQCf=+BeMi^RbuY;YE~rTjend;_cdi8t>i_@% literal 0 HcmV?d00001 diff --git a/Tests/Manual/CPMenuRemoveAllTest/index-debug.html b/Tests/Manual/CPMenuRemoveAllTest/index-debug.html new file mode 100644 index 000000000..bb52b4dad --- /dev/null +++ b/Tests/Manual/CPMenuRemoveAllTest/index-debug.html @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + CPMenuRemoveAllTest + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + diff --git a/Tests/Manual/CPMenuRemoveAllTest/index.html b/Tests/Manual/CPMenuRemoveAllTest/index.html new file mode 100644 index 000000000..a748831e5 --- /dev/null +++ b/Tests/Manual/CPMenuRemoveAllTest/index.html @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + CPMenuRemoveAllTest + + + + + + + + + + + + +
+
+ + + +
+
+ + + + diff --git a/Tests/Manual/CPMenuRemoveAllTest/main.j b/Tests/Manual/CPMenuRemoveAllTest/main.j new file mode 100644 index 000000000..b2f046c3c --- /dev/null +++ b/Tests/Manual/CPMenuRemoveAllTest/main.j @@ -0,0 +1,18 @@ +/* + * AppController.j + * CPMenuRemoveAllTest + * + * Created by aparajita on May 11, 2011. + * Copyright 2011, Victory-Heart Productions All rights reserved. + */ + +@import +@import + +@import "AppController.j" + + +function main(args, namedArgs) +{ + CPApplicationMain(args, namedArgs); +}