From cd4efb7a36592f19e1e44135d0a6c0aedf887d99 Mon Sep 17 00:00:00 2001 From: markgrebe Date: Fri, 3 Jun 2005 05:21:01 +0000 Subject: [PATCH] Added Mac Menus for key insertion events back in git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@460 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/src/macosx/SDLMain.nib/classes.nib | 18 ++++-------------- stella/src/macosx/SDLMain.nib/info.nib | 4 ++-- stella/src/macosx/SDLMain.nib/objects.nib | Bin 1501 -> 4502 bytes 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/stella/src/macosx/SDLMain.nib/classes.nib b/stella/src/macosx/SDLMain.nib/classes.nib index c21b28931..8da7ae163 100644 --- a/stella/src/macosx/SDLMain.nib/classes.nib +++ b/stella/src/macosx/SDLMain.nib/classes.nib @@ -11,24 +11,22 @@ { ACTIONS = { biggerScreen = id; + doPrefs = id; fullScreen = id; grabMouse = id; heightMinus = id; heightPlus = id; - leftJoyChange = id; ntscPalMode = id; openCart = id; paddleChange = id; pauseGame = id; - prefsMenu = id; - prefsOK = id; restartGame = id; - rightJoyChange = id; - romdirSelect = id; smallerScreen = id; speedLimit = id; toggleGlFilter = id; togglePallette = id; + volumeMinus = id; + volumePlus = id; widthMinus = id; widthPlus = id; xStartMinus = id; @@ -38,15 +36,7 @@ }; CLASS = Menus; LANGUAGE = ObjC; - OUTLETS = { - aspectRatioField = id; - filterMenu = id; - limitSpeedMenu = id; - paddlesMenu = id; - romDirField = id; - videoModeMatrix = id; - volumeSlider = id; - }; + OUTLETS = {}; 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 9ed0690e5..82ede646b 100644 --- a/stella/src/macosx/SDLMain.nib/info.nib +++ b/stella/src/macosx/SDLMain.nib/info.nib @@ -3,11 +3,11 @@ IBDocumentLocation - 451 517 359 316 0 0 1280 1002 + 111 514 359 316 0 0 1280 1002 IBEditorPositions 29 - 116 460 205 44 0 0 1280 1002 + 116 460 389 44 0 0 1280 1002 IBFramework Version 437.0 diff --git a/stella/src/macosx/SDLMain.nib/objects.nib b/stella/src/macosx/SDLMain.nib/objects.nib index 045694e61d71703962c3258f668be7e34300f65c..70fea249ffd42a49ed8b72dacf5fc33ac5727c26 100644 GIT binary patch literal 4502 zcmb_geQXrh5#N0r_&9&yh~P?;ij$~SqEH9OKP~+uXG{TC`0V5m&^9Vr`_|_rcemHQ zJq)C2Gibg2{)l5g;cH4wn?z_@t|eS(p+zXPLP%6p^hApUQV>X}K_?+0gbcW3l?*0yvl1#|xGs1e6;TB5P;wY~j2^Z|RFW^15a zahzZ@=1G*1QO~3+m$l85CwykiVG#jc5RLWZY^^`3$85_;Csc{_zmGZUv(3?1XC{+0 z1~l6+)9#4tsK%E#A?FcNPv=1S+n5tDB9VyVOiav;nYnb_^#b~iJ1tAwtvF5td6Hkp z@=Q<)c@Da5Jq7HSW21SencQ@D3ty2nhV-|fJ3T;0&FbMTW-^!3U5cT;?(S7u6=m;t z9zJ}ijF6|+Xv{m@OM2GKSp)hrW1I{rV0TJONRT)uvF#et2VPBS)~l{N;=Ie>BP#+6 zO^>llkH>7y)=5Pwa0k8Gjgzk6InVi>iqm|0d0t_+ti~O zY1i4GZx9{}(xVWEDYN24%9DdMq@~Z&2X#wN59ryB zjt-ff`EDgMRg6U3;^f|lq9{j>RA+CRjiB7L(TMBeDuU|JlME|I^&AUOqXhNZL%Nl9 zXO0n!4VlB?&SY{1+gWpdF=yD1asFm4<}s+r7TlMeSWzmf9;!V7-ylr;+;AR0*7Y z6P^i`g8KNt=owjxMZFn49ggb5;V#XhM=74rufFk~tjMQpRm4L+O?sFZei zgXTB7Rr3TR)r{wEp>mmZDF1_~HVUdGNwqmfy-Z}+8i|B%Ns7)m1 zD%RKMEQg4X?h^^LY0yv~s+sz@*`{#*I(?^}G&98J$)i@a?!-iu9W}*#QQop_iZ-8I zbaSlhxxP+1n`xyqTXGz%$I*j78r0iph+4LLq{bBT&8Oz+?98XGfv^5=-e+b0sVVPU zjkrA&uKdh!hPJ6QJO-Nq^(fdz-AD}CvkbOqDp)n_6JycsLswY!fN1P8)3#-b$9DQ? ze$*awDibXrJEEaai^r3CJwyW`0-}e467f`zDIPc@8}^{#m9l+S)@z>{$W;=#Y8p~~ zbTijLu9nEv(~xXNinqz>gJqfbnZ3ey7aam+|rqe(nrk-p((T_`CrBu*ie+I4kf_kY6lu%yWm! zRj{&zjkx2yHOL>7eZ^eCCrhOr=Z6Y>S%Kdz^Q$F(tIU@y=EsZt>=~|D?1-Y)ZnL4LZx4;T2&GM~)n z8+kiz5$bA}7w9uMl@>lue>REz<8#???{JzN@Q&yBiqG?7l)4!fH`8 z7B%|)u|XecdbKbuQ2s7oHawLlduq&?6NyAlj8pKoAzDP_23YmVkX<82QRLupVKG-& z_=1xXl1mE_?Sa!Ej`Or+(VMgBx~wMAd2oCMISa=1q@Iu)y9jVo)n_cPWetMJbO|U(ne1z9g7!>mHC(HUE3%F`w`v& z_Cr*FP2xgOkKq?zhDN~IIaZcKez|jA>0M*T|{7qu?v)am@BN#ANz$mDf@$eTg5A1h% z3DmFSF;M=Bw}AZ^zX5C)egx`o@HD78ehb+9xB`?@SORq;4gq@;zXog&3!lLYpl-!$ zz+S|Ypm012YCFb(y@sH?0j!9}L2>Z}C~x9oQ2&MZfc*kPpdQ6}pnibcfW`4Xu>JTl zumnD!{~KWY4qO82Kk+4Cui(ePzK?f-{RI1g?ZFR08ONKzeuig29mGCh+p!tcKj3vx zPhcykf5afDMZ5~?pK%kY7jP-4m+%I#pW;POw;==7!Og%lI`#*7Wt7H7YxmkNbHLQr NTlDM>o8n&y{{?8<#j5}S delta 619 zcmXYt!D|yi6vk)LZJTaZFg8V_Ev6{yHB!MULWEj+F!qpx2TzMxla+K+Hd_LM$jEl^ zXfp25tRnFuVX_#z6hdeYVP!#LJgV4QL=f?x5S&dim*M@s@4Ywk(Q`+U=XmirHBEEs zPA08rTL=tZn1Y&0rGU9po4TuN*siL|WAxd8Qo#w58RU4YXhD_wzY zVoPUZ2aP?8nz7s6SkpyXsj8EM^Z&O}4eH&l(oafcs_ zm?`n#f;7gkzRfqzZYuhNqP~$JkRzKuvqIV^B%IF z2-H|FmtlVp{KAe9*kN@957{09nEgfY2eT3U%A5r@K;R$iBjB+P0+hMStcl<^_8oyL Z>mu-s{X*aaYa>u$e$hsucjR$2{vRi>6cPXc