From 747729464875c5dddc42dfb2844f93ec7fcb6dc0 Mon Sep 17 00:00:00 2001 From: Alexandre Wilhelm Date: Tue, 30 Apr 2013 14:39:31 -0700 Subject: [PATCH] Added test for toolbar sheet --- Tests/Manual/AttachedSheet/AppController.j | 51 +++++++++++++++++- .../Resources/CPImageNameColorPanel.png | Bin 0 -> 1767 bytes Tests/Manual/AttachedSheet/Resources/New.png | Bin 0 -> 455 bytes 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 Tests/Manual/AttachedSheet/Resources/CPImageNameColorPanel.png create mode 100644 Tests/Manual/AttachedSheet/Resources/New.png diff --git a/Tests/Manual/AttachedSheet/AppController.j b/Tests/Manual/AttachedSheet/AppController.j index 4b48a33cb..dc39da44f 100644 --- a/Tests/Manual/AttachedSheet/AppController.j +++ b/Tests/Manual/AttachedSheet/AppController.j @@ -13,6 +13,7 @@ CPWindow wind; CPWindow sheet; CPTextField textField; + CPToolbar toolbar; } - (void)applicationDidFinishLaunching:(CPNotification)aNotification @@ -21,10 +22,14 @@ [wind setMinSize:CGSizeMake(300, 200)]; [wind setTitle:@"Untitled"]; - sheet = [[CPWindow alloc] initWithContentRect:CGRectMake(0, 0, 300, 100) styleMask:CPDocModalWindowMask | CPResizableWindowMask]; + sheet = [[CPWindow alloc] initWithContentRect:CGRectMake(50, 50, 300, 100) styleMask:CPTitledWindowMask | CPResizableWindowMask]; [sheet setMinSize:CGSizeMake(300, 100)]; [sheet setMaxSize:CGSizeMake(600, 300)]; + toolbar = [CPToolbar new]; + [toolbar setDisplayMode:CPToolbarDisplayModeIconAndLabel] + [toolbar setDelegate:self]; + var sheetContent = [sheet contentView]; textField = [[CPTextField alloc] initWithFrame:CGRectMake(10, 30, 280, 30)]; @@ -57,13 +62,30 @@ [displayButton setAction:@selector(displaySheet:)]; [[wind contentView] addSubview:displayButton]; + var displayButton = [[CPButton alloc] initWithFrame:CGRectMake(160, 180, 180, buttonHeight)]; + [displayButton setTitle:"Display Sheet with toolbar"]; + [displayButton setTarget:self]; + [displayButton setAction:@selector(displaySheetWithToolBar:)]; + [[wind contentView] addSubview:displayButton]; + [wind orderFront:self] } +- (void)displaySheetWithToolBar:(id)sender +{ + [textField setStringValue:""]; + [sheet makeFirstResponder:textField]; + [sheet setToolbar:toolbar]; + + [CPApp beginSheet:sheet modalForWindow:wind modalDelegate:self didEndSelector:@selector(didEndSheet:returnCode:contextInfo:) contextInfo:nil]; + +} + - (void)displaySheet:(id)sender { [textField setStringValue:""]; [sheet makeFirstResponder:textField]; + [sheet setToolbar:nil]; [CPApp beginSheet:sheet modalForWindow:wind modalDelegate:self didEndSelector:@selector(didEndSheet:returnCode:contextInfo:) contextInfo:nil]; } @@ -83,4 +105,31 @@ [wind setTitle:str]; } +- (CPArray)toolbarDefaultItemIdentifiers:(CPToolbar)toolbar +{ + return ["item1", "item2"]; +} + +- (CPArray)toolbarAllowedItemIdentifiers:(CPToolbar)toolbar +{ + return ["item1", "item2"]; +} + +- (CPToolbarItem)toolbar:(CPToolbar)toolbar itemForItemIdentifier:(CPString)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag +{ + var toolbarItem = [[CPToolbarItem alloc] initWithItemIdentifier:itemIdentifier]; + if (itemIdentifier == "item1") + { + [toolbarItem setLabel:@"Color"]; + [toolbarItem setImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle mainBundle] pathForResource:@"CPImageNameColorPanel.png"] size:CGSizeMake(26, 29)]]; + return toolbarItem; + } + else if (itemIdentifier == "item2") + { + [toolbarItem setLabel:@"Small New"]; + [toolbarItem setImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle mainBundle] pathForResource:@"New.png"] size:CGSizeMake(16, 16)]]; + return toolbarItem; + } +} + @end diff --git a/Tests/Manual/AttachedSheet/Resources/CPImageNameColorPanel.png b/Tests/Manual/AttachedSheet/Resources/CPImageNameColorPanel.png new file mode 100644 index 0000000000000000000000000000000000000000..a18918665d2f2357b452299130590124b30c6839 GIT binary patch literal 1767 zcmV6?000KANkloTnG@2Mq z+E~*smJe#8Vl1wd6t3)!J21%L0|s1-jd1W_Ir9dU^c6nIl=UAx(Tve&>0g z5A*)^|ICM3g-@u>&yB8%?eyW;PVP(Wv@fyJ^{F8+jp&qR1`XTvUn9SN?V;~p#Q#&< zfAI3gtv`C{_+u{|Y5d|ZXFi&!yY2H~7`P&$IUfeWgj;L>a`NQ#Y-fQ|qGyRQH!fdfGvDN0bVA$YfbzIyQF zi(XA;Usj0rjc)r@ctg>nPmK?xmK@%2+p?99KQyx12UM9a-vVNi+JNM=D20KD#IV>M zNinGMC;;-Ci31nj`S`>~N}`7AU(w zD*%E7NWc=pN=e9fhoXvd@d3)Xf|`1CWcTp4HCsOgiC+E2k!{Wbk&5K`&#ztHf5(R5 z6_Xc%nKIC612HAqV5ER41oKIuNP>t$53{J^94_Gt!}lz|bH$wlO2X%_6Mb{n(UB!R zYRA1_y6x8gT;RGW@hD03?ji~_6j>S}(1=FMNWv+k%0(S>OgE*zGO~TufHAP+k;5BD zz_JKbm_EDd%Xg@$DVWtJkW!y30ftSqB%vS%>?{@aL?7hN8?zn{S;oFz>&8 zry4!++_M1gwf5Zi()zwWwYJ!I)8N#Hf;dsI3lv#^3Mk1_5^+w6aLzQ6iBu+vGf|3w zk4KugdFjoAORS-_PmHc#ZyAy7`pn3%KYbA@>L|dVz#@@OlO;(gA^B`|1_V4J&Jv|s zbS;%W1)L*H(dTTADIo>Uju0rqndGUl ziJ4(TNW#fQ3p40lIgqzS?y}5C)>wYAV6`bI0fm?#!=OMh4M@s!wmz$yCQByW93+JS zR))^xp-}8A*}xjhj%BDZX&G??=vfJrD032^DC}TY>;|P~SK<&$UkqKs$7DD7C;}od zkpKu0;A41}pDVx|vh@B7lys&5zr_U0DWTBRDQrr#Sf|kv%4~Eoq4*ft#VG(E3EGHI z;WW+j425&((QD?(qODwt{gP!C7wff@LMCgoI~3-aL_>jNcg3bjYwE+wM=(sE5|6Y1 zbfDM`xSS*8AqY6xe$a7Xx2+<~bD>{bz0@u)RtW_$1*8<5& z#T1BXciOOW9hj7x@F@#4T8I*#$;qb6L~k1|0FUtCi41Gk-r`iIdec{YQISN8Iji0 zBH@#g3NMg7GI8p$v!e&M9tX=HC<6P+<@fv01Fts)avgzc`9QP76pe0zDw9+yK)I|t z`CqRxU9Fq8)$FEA66nQWJk{>A#oTvI^x!`qnCOjiV{cwLb{0bbf&gf>^oO%GRWnif zdRaLWRrMNcgfce(%q2MXyYgfK$b~TPBuDoTa}ZS{%{&AEe|CVQY&YP zx`G8zB4s8rih#AuAOHE(>H6hrS^Rj*wr`DlH~Qy9y|C*0`E|~!pLKHe&9|=T?F;d|%^k37n=TFVd6!T8{`rj_MpZdw+vjG6fxK3nd z*u>g@%eTLHi|KsNH=C<-1779R%WP+{6Xu2nOG9AI)+*I%=mn=bGkznf4VVS_;7XAG z_=m?nd<#HGViJ)=GhdV=4k?lz(n}U?Dz5(Q?S;Y3Lw33@MXOXY{hJbasHwP;=HX6D zJo%4S_{QHW-WdQ5(k88}yTl`*g-@tA-3!y?j{x4$Vp1Xn;%67u$yK7r4QswA$?P$4 zNj*zhn1`M%&Aiow#LEatv~YC`{|dE$ZW;6EtP4Tb)9dDi;J=5vj7HpxcYy!^002ov JPDHLkV1oKSVgdjF literal 0 HcmV?d00001 diff --git a/Tests/Manual/AttachedSheet/Resources/New.png b/Tests/Manual/AttachedSheet/Resources/New.png new file mode 100644 index 0000000000000000000000000000000000000000..2ca371152ed836c53047310d1dcf00bdec112e22 GIT binary patch literal 455 zcmV;&0XY7NP)uK#$*rX+aO|KV?ShU!G%7hAKATytpxJCPbX|vBE=MDtWE+|13T)eEG#U*k zm&>3i3S=@FkYyRN*({xo3OmRWSI}y;7>?tBWm&9Huh*ekt92NH&XKx93bY38$#J*Q< z1C`ag<#&%@Fc^3^eu~0_UHn6~@(dDqzC>Q=zKL@!0aqXQ5GlmIMo+;01tgAKAW0s< xq~MT1ya^c8@%)WLNeBt^5GB7!W!jx}Fu&6+3H5P(-f{o{002ovPDHLkV1gV-#7qDH literal 0 HcmV?d00001