From 6d29e63095a2d3ea0f48c730fe0797519525f9cf Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Mon, 13 Jun 2011 15:50:55 -0500 Subject: [PATCH] add missing routine stuff, plus some freem voodoo for icon positioning. --- Themes/_fallback/metrics.ini | 1 + Themes/default/Graphics/_SelectIcon Routine.png | Bin 0 -> 5527 bytes Themes/default/metrics.ini | 13 +++++++++---- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 Themes/default/Graphics/_SelectIcon Routine.png diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 1a9b00cb5a..e14fd53744 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1834,6 +1834,7 @@ ChoiceDouble="name,Double;style,double;text,Double;screen,"..Branch.AfterSelectP ChoiceSolo="name,Solo;style,solo;text,Solo;screen,"..Branch.AfterSelectPlayMode() ChoiceVersus="name,Versus;style,versus;text,Versus;screen,"..Branch.AfterSelectPlayMode() ChoiceCouple="name,Couple;style,couple;text,Couple;screen,"..Branch.AfterSelectPlayMode() +ChoiceRoutine="name,Routine;style,routine;text,Routine;screen,"..Branch.AfterSelectPlayMode() ChoiceHalfDouble="name,HalfDouble;style,halfdouble;text,HalfDouble;screen,"..Branch.AfterSelectPlayMode() Choice5Keys="name,5Keys;style,single5;text,5Keys;screen,"..Branch.AfterSelectPlayMode() Choice7Keys="name,7Keys;style,single7;text,7Keys;screen,"..Branch.AfterSelectPlayMode() diff --git a/Themes/default/Graphics/_SelectIcon Routine.png b/Themes/default/Graphics/_SelectIcon Routine.png new file mode 100644 index 0000000000000000000000000000000000000000..27323219314aba46259645bf69ce6f0ec866de62 GIT binary patch literal 5527 zcmV;I6=>>-P) z6e==xl>IdT000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP000#xNklUwZPA8Hs9GKf_x=lwH2BGT0q$#NKupe!FQj~`TdKIPYf z_)+^b@RK5s6e)t#2ucMMwQA9Zg1!nSpwB0Spa=m>APGr!_uVs_ot@d8nR{n^(&%K!iAP9mW2!bF8f*=TjAP9mW2!c2lkvRYFW|GAun@Jjzg!b+* zK@f4{V^YuL6qE0nv=}LxIfx`CxlFEN(uawwz0Zmu2;1;8sbcaTlWHbSdP;7S3NUK8 z;hBZAM%**!zKO}*^3&S;j0l3ThqK2j>X$wDhu7vVT9L|r-N@uSJw3AsB9F<6$r+*1`eEyC4NplUx)*5QGE32%@10QxJjB zA;bKln_pc3(vn>uk#isjM}QA{v}u)tFof?Q0s)X{ag!h%h5Wn^*x?`$np+S=r$op> zPy|5`ofDxP1nr+B2q$7w4uYl_1mQsJ$w35YlQls&5}O<&=8S3f*Dy#fZT?25WCU{{oQUUV&NRV^B z1i4*lDVg}8p;e41N;dgqu}Us8;=BtaxMr{mibseiWy&l4uxztm{%Ho*{i|OjnAXkf z`|5da@aAdD_n+QmsE@i>X4=vgZvRBNcS3?JygEN$75)oj)I)tU?qFjx{}%0yXf__9 za}ymqQS`>R<6_$?hJ&7NF>d;*J|2)|#~wedc}s%d-I*vGwHXhuY=N>5#BR#ULjidB z#TL2l(gjK2(R+UvukU!BtX?a-udPe44{99&{qp^IA4c4+BI6;dD@rV5e9ppuC88uQe}%}{*;4BN5d9HQ!8(hPNtV7>2>PG3y*!L~86T&L!|_#MD;i5e5L zVv+@2OXqhE+{1Q>Km;M^Aiz0d(~VMB&z|@znswVK`_LDYa|ls+&<{)2wpj1G-ud#d zJ6e`3v}>iGjJH|z7V~)6y2?o6}hcahJq{vEq~uwX{`67l*jxh%fBLkjBW zUF6a==<>bB=i*71ApfH1Lb=_gU>|sWRrOO6G+uPP`w#hp{pF2^6wwB!KgHK1KyEj_ zr|jKRa*#dPwTj`S7gBPqESxm+WJs`hP9hY~J!_~gM;NL)&5Q~ik0(QG4MhbBh7O|o zy8ttapwU_FyOr@+Fe6d-zw(P442z+2C|#6nt*ywu>V4)=zApfIKejL)f^AH^I{aYh zJkS&)8qs-tD|r`lZkmWt7L8g|SEN6GxL=T@1+S*br1a+>(DymGP{^Tcn2l4N#A9wiTT>{ z%39c?V8JkVeC!LCH64$L{@FfuPQb1R!by=AcP{~G&bRU_^Fhr2i7Tvcv2M#{VyWLw zeJf=}p4g(g5tQ%s1)VK-AB2TA;u(t$i%k)P5apt0UuIlqGS=(%?UpU;Y=pXqG z%#oz1vE+>{PFWNki+vXwjySHZU1fRoWU?r&_H_7We&=I96by0;jYs$wbKTc=_+Zyw zbA$0->Iyn0$3PK8G@N_70wV^dQ+t}-G;cM-+dGY?4c?z6Kz`rw;Fv9MDs5YgAgYfB zI(-CDI6MK$wukqYl>f`e-~41Tf>76Q#Oyng!qYuRU{?;J6FG>*%bSF%$?Yk@^N%OT zAI4hQ?I^l)&OrGa8*s({`k}Ty(5BNET^u(Ju_JbWyt2GaOfC!K z#&mJKE4~a*|H?o0LGcYH#v0i_+ad@D*#hmP)WN26DgUGeN>(?)f;lPTb?fbP6zNY$ zr;T<}#*AHM1rsXwr7n41+Vaz1d9}(h>SwjE*?N5SS?x zT;`5i?!@aO+y-atesf=na@{)*cKx}x99ua>c!YJmgA<{6Op>W~D^0Y3Cvob zBDB#ww1oqT!Cnd9~^ljx=}Hru~a$?3^x?gV4d^JU-K7ZYXtU!gYEtGrxiV!9wEM z5$$8L%?$65L};rVggiCsAUO!6Kpx*SZP$jA?sFk%nNtUg6M62rYZD8(Y?@L1jfv4m z)yJ7)cM>!K{6( z*OpgSB(Gqltsr=QVh+OExs`2cl&=pDjOf&3>~zE;2xn~{Y{HG*G_htZB_tZ}LFo*cZtTNZ&xP&B95?A+K*D``ltW)xqc_ zzh68zx&%Mm8)LNN3veoi{@L}Ai@ZNNGPW&qx*Q~;5rkUIkfQWw&&)C{QE{M|>l`MH zK}VBlxo(Uuux`^l2qRbzZ>)IOSyo)PXjG~|{gLJDnkGkI?~W^WEpxW}iTscbLVE+` z^)-L*VsI^9+s33Z9(EI_L9F0ZV!{1gbo-y%D~W}<*)i9RVBfHh@i_>dp;&Rm)||F? zut?++**|g+(PGyZ=d}BY{E!YptDos{n=W;h?`hO+r{swq%m_31!y5rQhd-6{lG`;p zhuJgFV@~2c%XK5@92P&)O>nGu*jZLww`i2;xRQftdj}C}VQ5#EgwkfO?X2OEd9 z6$hH&cfUWO+t%Vodcc~J9Pkd|hs3yAvG|eh@LFjf$joqa&tvwCE^^&PKTj9Bt@BwV zRPsbmC|S}=sQ%zsnIXkF&T4%tx-5$7nWS0W5$d0v4x+v9VcUf7Ak0Q>5R-|4<_{l* z#--ef2y<#r`=RncBOLyw8IF7#T)DtRB^oZ~8iM(T*eTx=Ok9?K5`I-ZPLDEK8+rXw z_Dn=-RAmSo39V3wpCI$)uuZ1uJ>sJ4?yMDrf2t*KK z8>ReCS=J#4!U_Trgr6b^f^Z@MyEaM%D1sme=V8Yb1M3KMwijs-L?=KXFGWd8g6OQ+ zlcXdEK@iTwmMKPnRxt>|iP#cBU;sf5f*>4+$XBw6MG%hp^Hzc&6zqy1Xo^7)4#buS zLWUd!L3Bn0la#cIK@g6^wkZbfq$CLEVNa40H2Wa->^%zqwd$X+??6p^pB_OFf(+=_ z6@ESaau_nONBE$CgAjXRjO<5(@|!2#C+9#A9SpQtv|Y6=+c?Dt`;nTH_=>g8_B|N{ z(eaUOSG_CRo>dI`YtFV{+=QE8$mPQzC#R46`~Lm=;BW74gWbD!8kTwC#f`ehvE1vM z)9B#e+PFT3$K6vvDeWOAhqvNB;PKLW?+z7pT^;YznTl`R4*94gv z(QoGNmp34)zM7hou<+sgq2EsjfG0EfdVTM(LfH4&UfFOj8+wI&?BkC_TkuqXcp<(PNa2xvUptT+c`#S6>0{qy+(Otdc~!T#>t z`GN9#CUZj9-Y`jaWVhTtQ#p>~f#VXQ=-ScXhh%P>ga|5I7I@eTY;cHt?Y%@2hp3;Z zXe?Xbd;_*_`HOO_PoE3m^qD4u@?jobxBy09Hwq3{9a4^Y3q~-95c!rM{eBEl8GOiS zvF)BL0(tqR@YG@W@R2Zn;?2tMRjfVib9$QAU~eoQ135i16?yup#kzgIW%77fwQ{*~ ztpC7EprKLgfL>YuXL$eJ?Xc?~;px`Jefu+qXM8>+qGIi}_m-2CM0|WxeHfNM_mmtZ z96o#qk`vu<;g2p<{=fG7@1e!Ve-#*#m5~BRzpaMe%&?KntSs>P#mcG;@}s|hC_4hA zfJF@Ny|oG6-LVy}E)3=ZrcIxv=&oF`4BQDWNJ);qbgfk{o`6ch#Xo zQBLi#MT_CVU(bZQXHJ2dll5@6xkb2sf`k1@O0f1d>VzprjvR&+%YUy-Bf9tK26x^Q zP731F+$Hh9$6>(0OQCm8ca5R%+xuC>yi$tz86+pCw~`#)x${H#h)IZHS6m6({#piG zHg8lM1hy4oJ$t&RrzS_$xv^}E=J&g%Pl4ULKGGbUeABJae0Cy?n>a-|hS5R-b2#t4 zvkk7g<~pUlt?!h>=CTd2<@JqG^$>9&S$o(EYOB^xiMT<7@T4b0PS0+zX6>u8!G>75 zV!6;$5}&fqmi)Ko*tR#fK!S_!z|~Hr>d-+s3JEcM#7JmrYLN}Ly1GhJ4s!z-;iRVW zzr&;EmG#!I)h=VM{Nr+F%t^Wt4n{B7en`HTja^?S1Uk7%#gmvrOoRiK zpTp>)VergTOJpac=I%KULBWW^cE4th6I)g>6gAQBTqHzzVbyw#bHJxFN_J)%GZ?;i z$EPnQ27gg_B@|qK3B0}iuh1ncO^!}@s3VB$Zx{=IUcX7R&j9lfxB{`C8Lb*L@bt7K zgZ|8y6Ogw}nIOxT`zu&9E9vTN+^|kLHg>`<~_ZdCM$ zc(7*6+&d93aX>w9p%g^i%)0x5DCdCDLt1JQ6S1%0lb1O^+YO0s7j)~I!G5+z4w2U< zBKQdAAHq|b0Ru0Is(aWKBiMAMO!rzRCK^wFvOFnV=Y~2bYQ9x|&&o#mwoCof#{DM8%)r3NRoLcm0T@4B5A$+=R8eRX#7A=AL z`qRp0rr<8l$A!vcVig@`C^z99b~PM2co4F(vlX3i0+#N-_^>t$5O5HZ<;*8xOuxMT ziXkAlH2L7a&)4WY&BAL>dP>}FVci%FglKN@u_ti&+rZH|+*mvol9`i1y>%Nl$;ah9 zM2{RxZAC^R*j8;_qi}glijJEQ+{%6b+aYa&WqZC#elJ-ulba27s zB#*k&XAR0nU2Q?VAh@&AJ1o3W3!@iw4qea7V5PM4`vRut*WHB4Zzt3iItjh<2UJlE zMme~n@|mTJ;4d3rj?z{qV1xT7+W#7MXwld*KTBzLl?O4I7&x}=(LlpN<>1gUzvWg+ zn1joI$4{O%)ye6Rt$X~)(NoIj^O<4mO)=`uG%_cn|MW(OfCp_2cxRmx&|0D*eicV=YWD6 zvobxYnhjP&Z0y?du<}_-{Sipru6vAqe2vMcdiwk+2D%UzB`NJBDcKD%Uh(%lGkG$+4Bt=4=o*>#1 zj51KjIoOA6yDD3@$w35yUZ+(aeqcOw?c#xUpG%RDkO&LfEZVNxmPNifM{tS}b~VEb z`oh)?4{?hT1aXcd5J3nyh}O&}K@iSD-~~LEBM5>Z973ECL~tF<6`&VM5rh+QDLDwk zmx!1-2;8j`X!18SBqk=OvQO=OIs`%3g_HzMEe#D2+%0w1NX^VaoMdu*tM zF(J_t|K4AMAkGPVEoU27u6`Bw)*pwUt?Obo3&FqZ#n%quYlXVC_X!aMVLQi|Y-NIP z2GX4(@X{3MByhW1m)6g;oIwyBAIv$RLpZ_Y6c{)Mf*=TjAP9mW2!bF8f*=TjAc%99 Z{|8xcw|a7RS%?4t002ovPDHLkV1js4pV9yT literal 0 HcmV?d00001 diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 85ecd68ca8..12844adf17 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -705,7 +705,7 @@ IconChoiceDoubleX=SCREEN_CENTER_X-160 IconChoiceDoubleY=SCREEN_CENTER_Y IconChoiceDoubleOnCommand=zoom,0;bounceend,0.35;zoom,1 IconChoiceDoubleOffCommand=linear,0.1175;zoomx,0 -# +#### IconChoiceSoloX=SCREEN_CENTER_X-160 IconChoiceSoloY=SCREEN_CENTER_Y+96 IconChoiceSoloOnCommand=zoom,0;bounceend,0.35;zoom,1 @@ -715,17 +715,22 @@ IconChoiceHalfDoubleX=SCREEN_CENTER_X-160 IconChoiceHalfDoubleY=SCREEN_CENTER_Y+96 IconChoiceHalfDoubleOnCommand=zoom,0;bounceend,0.35;zoom,1 IconChoiceHalfDoubleOffCommand=linear,0.1175;zoomx,0 -# +#### IconChoiceVersusX=SCREEN_CENTER_X+160 -IconChoiceVersusY=SCREEN_CENTER_Y-48 +IconChoiceVersusY=string.find(THEME:GetMetric("ScreenSelectStyle","ChoiceNames"),"Routine") and SCREEN_CENTER_Y-96 or SCREEN_CENTER_Y-48 IconChoiceVersusOnCommand=zoom,0;bounceend,0.35;zoom,1 IconChoiceVersusOffCommand=linear,0.1175;zoomx,0 # IconChoiceCoupleX=SCREEN_CENTER_X+160 -IconChoiceCoupleY=SCREEN_CENTER_Y+48 +IconChoiceCoupleY=string.find(THEME:GetMetric("ScreenSelectStyle","ChoiceNames"),"Routine") and SCREEN_CENTER_Y or SCREEN_CENTER_Y+48 IconChoiceCoupleOnCommand=zoom,0;bounceend,0.35;zoom,1 IconChoiceCoupleOffCommand=linear,0.1175;zoomx,0 # +IconChoiceRoutineX=SCREEN_CENTER_X+160 +IconChoiceRoutineY=SCREEN_CENTER_Y+96 +IconChoiceRoutineOnCommand=zoom,0;bounceend,0.35;zoom,1 +IconChoiceRoutineOffCommand=linear,0.1175;zoomx,0 +# IconChoicekb7X=SCREEN_CENTER_X IconChoicekb7Y=SCREEN_CENTER_Y IconChoicekb7OnCommand=zoom,0;bounceend,0.35;zoom,1