From 1a18b354c2601a8b4f62be31b5e3306ba9ffe854 Mon Sep 17 00:00:00 2001 From: markgrebe Date: Wed, 29 Mar 2006 04:02:47 +0000 Subject: [PATCH] Added Outlet labels to menu items in preperation for functions which will enable/disable them in the different modes (emulation, launcher, etc.) git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1070 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/src/macosx/Menus.h | 28 +++++++++++++++++++- stella/src/macosx/SDLMain.nib/classes.nib | 30 ++++++++++++++++++++-- stella/src/macosx/SDLMain.nib/info.nib | 4 +-- stella/src/macosx/SDLMain.nib/objects.nib | Bin 4802 -> 5801 bytes 4 files changed, 57 insertions(+), 5 deletions(-) diff --git a/stella/src/macosx/Menus.h b/stella/src/macosx/Menus.h index 0c13a6af5..de1460228 100755 --- a/stella/src/macosx/Menus.h +++ b/stella/src/macosx/Menus.h @@ -4,11 +4,37 @@ Mark Grebe */ -/* $Id: Menus.h,v 1.7 2005-10-15 19:02:15 markgrebe Exp $ */ +/* $Id: Menus.h,v 1.8 2006-03-29 04:02:47 markgrebe Exp $ */ #import @interface Menus : NSObject { + IBOutlet id preferencesMenuItem; + IBOutlet id openMenuItem; + IBOutlet id restartMenuItem; + IBOutlet id savePropsMenuItem; + IBOutlet id mergePropsMenuItem; + IBOutlet id screenBiggerMenuItem; + IBOutlet id screenSmallerMenuItem; + IBOutlet id fullScreenMenuItem; + IBOutlet id pauseMenuItem; + IBOutlet id togglePalletteMenuItem; + IBOutlet id ntscPalMenuItem; + IBOutlet id increaseXStartMenuItem; + IBOutlet id decreaseXStartMenuItem; + IBOutlet id increaseYStartMenuItem; + IBOutlet id decreaseYStartMenuItem; + IBOutlet id increaseWidthMenuItem; + IBOutlet id decreaseWidthMenuItem; + IBOutlet id increaseHeightMenuItem; + IBOutlet id decreaseHeightMenuItem; + IBOutlet id mousePaddle0MenuItem; + IBOutlet id mousePaddle1MenuItem; + IBOutlet id mousePaddle2MenuItem; + IBOutlet id mousePaddle3MenuItem; + IBOutlet id grabMouseMenuItem; + IBOutlet id increaseVolumeMenuItem; + IBOutlet id decreaseVolumeMenuItem; } + (Menus *)sharedInstance; diff --git a/stella/src/macosx/SDLMain.nib/classes.nib b/stella/src/macosx/SDLMain.nib/classes.nib index d4adb5494..b8554bfea 100644 --- a/stella/src/macosx/SDLMain.nib/classes.nib +++ b/stella/src/macosx/SDLMain.nib/classes.nib @@ -24,8 +24,6 @@ restartGame = id; saveProps = id; smallerScreen = id; - speedLimit = id; - toggleGlFilter = id; togglePallette = id; volumeMinus = id; volumePlus = id; @@ -38,6 +36,34 @@ }; CLASS = Menus; LANGUAGE = ObjC; + OUTLETS = { + decreaseHeightMenuItem = id; + decreaseVolumeMenuItem = id; + decreaseWidthMenuItem = id; + decreaseXStartMenuItem = id; + decreaseYStartMenuItem = id; + fullScreenMenuItem = id; + grabMouseMenuItem = id; + increaseHeightMenuItem = id; + increaseVolumeMenuItem = id; + increaseWidthMenuItem = id; + increaseXStartMenuItem = id; + increaseYStartMenuItem = id; + mergePropsMenuItem = id; + mousePaddle0MenuItem = id; + mousePaddle1MenuItem = id; + mousePaddle2MenuItem = id; + mousePaddle3MenuItem = id; + ntscPalMenuItem = id; + openMenuItem = id; + pauseMenuItem = id; + preferencesMenuItem = id; + restartMenuItem = id; + savePropsMenuItem = id; + screenBiggerMenuItem = id; + screenSmallerMenuItem = id; + togglePalletteMenuItem = id; + }; SUPERCLASS = NSObject; }, {CLASS = Preferences; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, diff --git a/stella/src/macosx/SDLMain.nib/info.nib b/stella/src/macosx/SDLMain.nib/info.nib index 61b996699..583eab490 100644 --- a/stella/src/macosx/SDLMain.nib/info.nib +++ b/stella/src/macosx/SDLMain.nib/info.nib @@ -10,12 +10,12 @@ 116 460 447 44 0 0 1280 1002 IBFramework Version - 437.0 + 443.0 IBOpenObjects 29 IBSystem Version - 8C46 + 8H14 diff --git a/stella/src/macosx/SDLMain.nib/objects.nib b/stella/src/macosx/SDLMain.nib/objects.nib index d3f2adc6ff19b2dcc0e0393c99068ef2ea0637c1..0e157436c85a595f2d700265b9e710a8bff3ba08 100644 GIT binary patch literal 5801 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 literal 4802 zcmb_geQXrh5#N2bdNdG46~?yC!jIlcqyUKe&VhsHobjkWe87g*NCa)F6ZqLI`1rT8PS>_jd1m z0x_=W^17Q z$8mhYkSkI8`dyWlRMIx%uJF+ThXn+*F&Jt~*;;2z580NHh^i9lJr6kQWA(vMb5Bpq z2y3=sCenRrM>PVRkTrzV6RB2Pj{|#iKsb5G6@l{i0jJUk1OkdPG*sQ8MItdhnRZ!t z-kL2-+pRcGHJO)>1H+a5&d>TsoO%MbwhDA$ogpne+-9bdy5C6pT~q$Y(_~kDJiSk8 zQj~o!PE1TFePq2U7;$F6vqrbG|H7a5$VX{IpS#b}OxB7nFr+UcYX|Ss#c2x049uVe}1yoUm= zsZF<{CBRTQU_M2UP{C~q#@~{%EIncSpVZ>A+^SU$n&C1k2)CDgLKqj|G`qiMx8TT{p9ZJSKOA5c}zsSF*ln zakpDEcbX~NU%-_qv8&wBVd-5ub*ZqPT()eP+-x(Z?7Pzb{WqFxwr&%(u>u8g=(?xd z!7iv)g4*qF-Aa~(Tj>9VIDMgRv)A7oi`_@}fjK{wGA7d|I6q&Gvq)3jc6Suf#e14+ zIaxCIHTUTT=GH5d?!PsuS=(YJY|9kwxisR*0yk2DnLss-DsN0}cSQQ9bz)ZYq@{KG z<&+}p8J#YSS_)$$u_%e6DrBY-k&@g_vid@v)ja8SvbQ{K#!}u3Z*Mu*A{q}@I5S1K zJ>_uX*i7c{p{+(DV)jl$lBSNl646x!bdjX%Ycmo?+<3u#CB)16qkJ|{id;v@k}Oqj z(qq$|O)>RImAv<*Zn8qQ9*b%I_Ru!JyG+~d>t#uZUO_}etwf7(S&S-wn|d!~)BJRn zU&-<7IsS2$SC8|hOSm%5$8YmnWBg2(&zs9X$?-emd}b40IL0qzxo@01Tui4v**w;p zyC~6v{6>x+&G4%^o~h%D7J4c)g3Aq~B{VUO2)%|ezI-VknaL~0`PnR=KaXF^dD>Ni zY*K379p?u|c-Ic-1(cJH~I1@mWp$Vve88@`-VNXoN2r<0mr1b$pPrUMFVFuO|KNy$K@8*F3?; zNa`!3k1wHr)fH*(qo^xa&?n88lSoPPwd?q*ukj|5Ga+3~4|O79f14LFUn;OG(|m%K ziY^|sGaaXnYUEvEbepaeRl!h*9_aGYs*u9y@Rx+v>|iKpbb801z7lj%$HK&`}s%(%&m!RZ2aU@#bQG`a7(C`FR5|T;?5w*z@h~qpWS+u8Y z8jgxdeB+(LwPef}(PMg4UOt2aU!Mrq)~&daAfe}Fx$rV0NxfKXWKX!bk1{liMx!p8 zVZ=$(?36`^&09XQMqp@kN{FG~6P^^p`c66Hx}&SNa7rvRB;7Igo|Q9VrM8QP(R;+_ zgt(?h43lD(^vs+W(nebjg!y^UTRI??>U-qPu%%l|MDv(~KCOvVJE{BaGP1!8P|lo zrdP~SMNY3v<5F5|h>`=+$*ii_0`OS$DrJ}%@nNxIC5yIkJL327uQu4={NJFBEJ?aK}=p~ooS>HgKjVTT2b^Pv6- z=K?!~+ktiB0$_i@I#6|7ZsIVg?;|KL0n6YaP(Q#4P_pi?^g`)}VHCzkIU+^ZdQCtnm|L`cV_b>`Q+1l z>KR-NY7UQp+Jnym`wo5t>Tz5HYzy&t1=vx%1MD=O2K8Ay0qlLe2<#`c^gUpI#2_d` z*aYfJxChuTa22o*@mrvtM+KBLUI+FDCV~AFF9Z7l-hKji0NaC$K>a6XLEVH)pTkq2 zZo_W_)9^U3BV_kgVE>@6K46FO8nFGi7uYXxE2#g*dBA>$)u0Sw3fKUC4D4m3-+T7r xSx^t+po$q#yYLdQS8)W?4C=sk4Ffwntn^buYHD5IVunp^qeWez*A&0E{2zfxSndD-