From b98b9d60ca9f88e6737b142dcbabdfd1f780d4a8 Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Sat, 21 May 2016 03:28:19 -0500 Subject: [PATCH] Adds images for Save State and Load State pause items --- Delta/Emulation/EmulationViewController.swift | 4 +-- .../LoadSaveState.imageset/Contents.json | 26 ++++++++++++++++++ .../LoadSaveState.imageset/LoadSaveState.png | Bin 0 -> 1526 bytes .../LoadSaveState@2x.png | Bin 0 -> 1933 bytes .../LoadSaveState@3x.png | Bin 0 -> 2386 bytes .../SaveSaveState.imageset/Contents.json | 26 ++++++++++++++++++ .../SaveSaveState.imageset/SaveSaveState.png | Bin 0 -> 1500 bytes .../SaveSaveState@2x.png | Bin 0 -> 1923 bytes .../SaveSaveState@3x.png | Bin 0 -> 2344 bytes 9 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 Resources/Assets.xcassets/Pause Icons/LoadSaveState.imageset/Contents.json create mode 100644 Resources/Assets.xcassets/Pause Icons/LoadSaveState.imageset/LoadSaveState.png create mode 100644 Resources/Assets.xcassets/Pause Icons/LoadSaveState.imageset/LoadSaveState@2x.png create mode 100644 Resources/Assets.xcassets/Pause Icons/LoadSaveState.imageset/LoadSaveState@3x.png create mode 100644 Resources/Assets.xcassets/Pause Icons/SaveSaveState.imageset/Contents.json create mode 100644 Resources/Assets.xcassets/Pause Icons/SaveSaveState.imageset/SaveSaveState.png create mode 100644 Resources/Assets.xcassets/Pause Icons/SaveSaveState.imageset/SaveSaveState@2x.png create mode 100644 Resources/Assets.xcassets/Pause Icons/SaveSaveState.imageset/SaveSaveState@3x.png diff --git a/Delta/Emulation/EmulationViewController.swift b/Delta/Emulation/EmulationViewController.swift index ee4e401..95d62f2 100644 --- a/Delta/Emulation/EmulationViewController.swift +++ b/Delta/Emulation/EmulationViewController.swift @@ -190,11 +190,11 @@ class EmulationViewController: UIViewController // Specifically, if you pause a game, open the save states menu, go back, return to menu, select a new game, then try to pause it, it will crash // As a dirty workaround, we just use a weak reference, and force unwrap it if needed - let saveStateItem = PauseItem(image: UIImage(named: "SmallPause")!, text: NSLocalizedString("Save State", comment: ""), action: { [unowned self] _ in + let saveStateItem = PauseItem(image: UIImage(named: "SaveSaveState")!, text: NSLocalizedString("Save State", comment: ""), action: { [unowned self] _ in pauseViewController.presentSaveStateViewControllerWithMode(.Saving, delegate: self) }) - let loadStateItem = PauseItem(image: UIImage(named: "SmallPause")!, text: NSLocalizedString("Load State", comment: ""), action: { [unowned self] _ in + let loadStateItem = PauseItem(image: UIImage(named: "LoadSaveState")!, text: NSLocalizedString("Load State", comment: ""), action: { [unowned self] _ in pauseViewController.presentSaveStateViewControllerWithMode(.Loading, delegate: self) }) diff --git a/Resources/Assets.xcassets/Pause Icons/LoadSaveState.imageset/Contents.json b/Resources/Assets.xcassets/Pause Icons/LoadSaveState.imageset/Contents.json new file mode 100644 index 0000000..4ef7677 --- /dev/null +++ b/Resources/Assets.xcassets/Pause Icons/LoadSaveState.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LoadSaveState.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LoadSaveState@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LoadSaveState@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Resources/Assets.xcassets/Pause Icons/LoadSaveState.imageset/LoadSaveState.png b/Resources/Assets.xcassets/Pause Icons/LoadSaveState.imageset/LoadSaveState.png new file mode 100644 index 0000000000000000000000000000000000000000..4bebbe8f7038ae9eb67b5babd27e0d3bcbc2794a GIT binary patch literal 1526 zcmeAS@N?(olHy`uVBq!ia0vp^3P7yF!3HE>yta4*q!^2X+?^QKos)S9vL>4nJ za0`PlBg3pY5)2H?D>6eON+NuHtdjF{^%7I^lT!66atnZ}85nFTtboki)RIJnirk#M zVyg;UC9n!BAR8pCucQE0Qj%?}6yY17;GAESs$i;TqGzCF$EBd4U{jQmW)z9|8>y;bpKhp88yV>WRp=I1=9MH?=;jqGLkxkLnOgw2D6bgmE1>`MD-sLz4fPE4v1uyFOhY&i zMHfg0r?%9JOdQ%kG7xRxz<{{X1{k7NzWFJcX_YRCC8>5s28L$32Bx}3h9L&VRtBb4 z#>O`KXlf8X1nYJ#N=+=uFAB-e&#?>0tVqqt1#uOOf#Gff(Tl7CNi)bFR{lkqslWgR z1*4szjXs7Lx_amQ+=8Oi;$o0`Q>c1mF?97osm1v@r6A)&^D;~9jG$W3gwb_HBINDN zVS11S(KSS1(||09qyZEWR^X6|aLLR~%>(3m!ZcrL#r&BP&nXKkX|W zDwg%koOgW7%&V&%XY16&q&=JcUfOK7Z;-~5h(ek3&8;#*Kcfuo*`_Dx%nx!fU-o(d zYsyt-l|#`6I?dIE@7B4`n_6(RXYP!*U*`y)Kip%KSi%#2ApFpd??LzadJRI)>+yI! zSoJ)k!fwLsPg73&IoF&{SQY&H=2Tm&f=H(Ix6TTfpIlqz@hezBhWR<0arCQMPABgt zG6-+nb@t@M`*I4e!;dXslHya2e%b4E_59I;PESredoXc-gYmlw<MAy}}FfdWk9dNvV1jxdlMg3=B3ERzPNMYDuC(MQ%=B zu~mhw5?F;5kPQ;nS5g2gDap1~itr6kaLzAERWQ{v(KAr8<5EyiuqjGOvkG!?gK7uz zY?U%fN(!v>^~=l4^~#O)@{7{-4J|D#^$m>ljf`}GDs+o0^GXscbn}XpA%?)raY-#s zF3Kz@$;{7F0GXSZlwVq6tE2?72o9j`%q@UhlvfP(70`eB6^RAN8HhG;U_jhx0}N3s-~5!!v`Ux6l2kh*14A=i15;fi!w>^wD+5z2 zQxh9~G&Kkxf^|C=r6!i-7lq{K=hy{gR;1?Sg18FCz;K7^MOJ~N8RQQu|Dw!PU;u-H z(az9DA43dXy>otUK~ZXPF-W~BR6Vj7y858h;{2Rakny2;nI(2cP%UV}=(-{i@^=o+2#bMlLV3lfu4LE#0~f+U2l z8f;A@!Wxig5Y`|`KsDOvgVHim+J5d-gbTbY%!~lm!NHbhR$ZNL}puk1==4mWygr6H*uZT3IV+WG)nY#=pT} zL2HM`iWMv7Om%czbWCO5{^jKcIW4ujtv{#vr9arXxjO&e_u729;_}VL1_B#Pt>((! zxYr@_$Vs`5ueu?(=d=ow)uR3+?HOB&1vQQ|yL^!N7BQv#w$k;vA0;G}mA@tV?=0Ty zTz_Fkm#vJ__eAf$g6-9p=1o*o@^ar$z3!3If7|bm+ot3!6e!=O@FRbF@wPQR7Xqw0 zPbP(53oEq9b2-h%=Gc7WtvFHtc3}5qIAA;9!{lmcOlyS5_)rZuq|W-;C;x zmJ6I~WCIEezZmiJRWEp_&XTfDTvFwZ`mnv#ntxI%YvN&V)j}!YIXt%D<_~FNNi|c-=-r?8t zG~^k62!4;j(pNvnD&}6p$6beJM6C<;+9cLsydrDs)p;`Po3~`oYzQ(klqq6L zO0iWv6T_%^){RGRC(*paIiYXE7*4Z2_1?B3WwqANHnp3zvyOQ6KRmtdvU2O9=Re*Y z3=`R>xuauU^o?~!MvqolRxSFdd3e*m7>ntjuIV+^2L5X0S#6Om9MJLi{henl66aE< z3eW$v?tDs-Pn=!JPX)N;kwC2;L$Exv*S6%<8>yo+YYjZ>XZmlQr z)3$9b{1f#^XSvU|=|8UgjIfw4cmJZ=0=~w55|fi8XRGO{A27Mg+4Pjlqaesf^C_2s hZ+TO~|60~RObos!qVGRzJOQdBJzf1=);T3K0RZZ(;aC6w literal 0 HcmV?d00001 diff --git a/Resources/Assets.xcassets/Pause Icons/LoadSaveState.imageset/LoadSaveState@3x.png b/Resources/Assets.xcassets/Pause Icons/LoadSaveState.imageset/LoadSaveState@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..b288c851a27f99c4bb37aac4769a925866f1826e GIT binary patch literal 2386 zcma);2~<;O7RTSqVgr#~0g-A5g$4$)QNV)(BxF*s{oR*F>(Q4D5c7su`3Fy@?B*n zU@_kev4kOyzlptu*7^8fnUo zQvF1cyr_5&whW?^i6jSGqP;Dd6hO42678v^uV{odnhzDO(C!k5EfYxsL?S+&$&*8T zfoh7eQ}%t8RadCNsye7UB|J#kU{xFGBpTs=Y-{!IB7s-}Nu?^i{iR1c9 zi})f5OU&j%s(!5?YNoa7l{BFr(vXPT)bpr$R!JH`wVBm6_q&s`VpSd;x~6hFyg!C? z&2njjJ^&!yyggh4EB38Ll}O`+L=i(n~&Up@FW~5ax>5?L>xgvsr2>Re<7x@sLLmZ;XgRdY3D9SclXy+ zv!grd(%FUiH3J(4yxM=hP~MSrs6eZ}p5nLfTXsoyE+BcXk-V?>BvH0FwLyWm? zv8Tu9a#@A1e3Sk-sB>5P`J21)P^kE`v5mbYb&R?Bz6R5gFwdOSO2nhFEs90TlJl2C zP%UlXA}BI&7}9x4>5OlW&GD>+Pv-Z=Nfpy`UWw92X6;vi|Sm*P}b@nuXP^ zWOz6C)L?{9U$|XR>8~)=4oR(?<4<$h+6OMf1iFfk*IH8i&F39@bs{c$vq+lzMzMm72xc_=W@%*n3~|Hw1{H96Ayq6IXmtG=&yV08$hC8w@!N(?^c0+Pg;|2WOWsBi8?R`WN_z%avlgiNIo$-)1LbihmWeYu zp@JwYYNp*a%cw?B6Q@;A%x%yZ9)sOpcoP}~G7_?};Wu{(bWX^-%d9GFT^skh&6HjB z+EFsnc_4in=hNj#dDcdOhg*!@Qzd3C;Ef(k-}4@-=m4_z>@3tJAjePX@x}o6Np!k!HJi2co+b|ZjT*WR}0)mWH&Fa7lYXvxF6;=jlysSOzjtT zjYy_tf$8wR|1$t#RO7LE66NUYmRDnqSK;>SQ=M?Q$??pISN}GG^V;&v@r}0fofYv8 zDcp`1K>Sq8fGzB%4F@5f*Fe<*8kp8vG02&;FrI>ap)ekALZ%hwMqEZ`0Gy-fDOmCM zPD9UkXN3+M9IwMtTeqA~ygDAjn0u1p>UWf63)E2QU~+Gx!<5h6#^ir!N7%;mrn9W7hhErZmGl@SMzP*!uXNNYgfykg|R1YT< zn~(T@u{GGCZQAsgf6e&^jW`mU-iR4DNwAcb*QC!8oRbCG!NXc+qp%dF&$d=117+8e zgVuGk9Wyq@u0Z(1Kc@hRXf7?5V;WBUECaMh2F N_x5i*uDC@c{|9>$uGs(p literal 0 HcmV?d00001 diff --git a/Resources/Assets.xcassets/Pause Icons/SaveSaveState.imageset/Contents.json b/Resources/Assets.xcassets/Pause Icons/SaveSaveState.imageset/Contents.json new file mode 100644 index 0000000..d3e5408 --- /dev/null +++ b/Resources/Assets.xcassets/Pause Icons/SaveSaveState.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "SaveSaveState.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "SaveSaveState@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "SaveSaveState@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Resources/Assets.xcassets/Pause Icons/SaveSaveState.imageset/SaveSaveState.png b/Resources/Assets.xcassets/Pause Icons/SaveSaveState.imageset/SaveSaveState.png new file mode 100644 index 0000000000000000000000000000000000000000..ebef637f30214067a08f539c8f21ceba388ec0c8 GIT binary patch literal 1500 zcmeAS@N?(olHy`uVBq!ia0vp^3P7yF!3HE>yta4*q!^2X+?^QKos)S9vL>4nJ za0`PlBg3pY5)2H?D>6eON+NuHtdjF{^%7I^lT!66atnZ}85nFTtboki)RIJnirk#M zVyg;UC9n!BAR8pCucQE0Qj%?}6yY17;GAESs$i;TqGzCF$EBd4U{jQmW)z9|8>y;bpKhp88yV>WRp=I1=9MH?=;jqGLkxkLnOgw2D6bgmE1>`MD-sLz4fPE4v1uyFOhY&i zMHfg0r?%9JOdQ%kG7xRxz<{{X1{k7NzWFJcX_YRCC8>5s28L$32Bx}3h9L&VRtBb4 z24*(;Xlf8X1nYJ#N=+=uFAB-e&#?>0tVqqt1#uOOf#Gff(Tl7CNi)bFR{lkqslWgR z1*4szjXs7Lx_amQ+=8Oi;$o0`Q>c1mF?97osm1v@r6A)&^D;~9jG$W3gwb_HBINDN zVS11S(KSS1(||09qyZEWR^X6|aLLR~%>(Eb^zW$G>_~ z=b*=M`_PEtnc@8lBdUo)^ z>{+3`&$qH=9B)3bFx)s=@ND)AUpArsCw@0J?5Sl~w;-N*LdK-c5AU7`<@j)rfyFOI zVrP^U)LO67x?*3taRI~$~o>Ce|WQY3Kw4GWqGQQEA*L=mHl`~gwEI`g_2dY|5W zK4}SaXU>sDN4qj-H_Q>7R}FfdWk9dNvV1jxdlMg3=B3ERzPNMYDuC(MQ%=B zu~mhw5?F;5kPQ;nS5g2gDap1~itr6kaLzAERWQ{v(KAr8<5EyiuqjGOvkG!?gK7uz zY?U%fN(!v>^~=l4^~#O)@{7{-4J|D#^$m>ljf`}GDs+o0^GXscbn}XpA%?)raY-#s zF3Kz@$;{7F0GXSZlwVq6tE2?72o9j`%q@UhlvfP(70`eB6^RAN8HhG;U_jhx0}N3s-~5!!v`Ux6l2kh*14A=i15;fi!w>^wD+5z2 zb4we2G&Kkxf^|C=r6!i-7lq{K=hy{gR;1?Sg18FCz;HK#=tWk6q#5K7EB~U*RA2yu zg3->B6fV@L(# z+u8fGMI1$r7thLIQB_zmH$r2@j3C3UP4x}+O$+w!m$sG`y>iM)_l*mycQT8&>lR^^ zCJsjKPA)|;Ikn}_pU<=|zWHWnep>ncbI;Nq?6fYJMTch+ki2d85lOf7q?#O@@qMy!xAa$D0dA^dn#^cn{4sm{kbLMPuVHEjRRXwz&w3b=F=nP%YQs zn5Pxk5dE&FCw;;ngKukC1nq=^>+0I?D^xMe)(>d8f5b|z?wKu*V$DVe#&_Ra)*aV9 znSUrwRN+v1(wjBz*EpvM%s(*8($!)jNA!BVlkq1N4+uY7w?6zB=Qb6Cw!NPP68kKF z3q5>wQ*~l;#Oc76&0o)K7Oj=@P@xf zo-?Z(oHgEcrQpn8rfZdUH4|QKu&H3aZ+<%VyLG`6&+BqJySoaey-%BVQqAm$JoA0wDcyz>j&thN-G0U^xrcc@yDq$LM!~t9TkJ~r zmd^KS{4_7|O;FLCf3bGe^NikEFL^vi^Wvn#Cexj?95yLVdt)2yz3~6P=og;-9YKtT zEH`IrA1D_MdcN_}r(3U0zU_Tn(6@2@%5$pxRr>=@obGN(oxIC$PT@QG=e^IZ_Zu-< zwX82%`{iQUQl<@`d|3omuL<469x^SLt3X7-bxNaD(MpE9{M`mmf{U-_H5KiUczXVt zlluOc^;f;GteE|S%^*bPX~CtrU+m*1?O@T}d{*#JG`quwCypz$I?v5{;(9bv+rj9^ zte3mrFlMX0yyvorVQ&`CquMnMjxk^F%}HkcvdXaIJ99i^J;PmJ(}iC4+WMfH(bLt> JWt~$(6987p*=+y- literal 0 HcmV?d00001 diff --git a/Resources/Assets.xcassets/Pause Icons/SaveSaveState.imageset/SaveSaveState@3x.png b/Resources/Assets.xcassets/Pause Icons/SaveSaveState.imageset/SaveSaveState@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..c744d496bb6179f18b98a5f5b46ae335caea7ed7 GIT binary patch literal 2344 zcmeAS@N?(olHy`uVBq!ia0vp^2|%2~!3HF!Ms0TnQjEnx?oJHr&dIz4aySb-B8wRq zxP?KOkzv*x2?hq{m6;(CB@w}FfdWk9dNvV1jxdlMg3=B3ERzPNMYDuC(MQ%=B zu~mhw5?F;5kPQ;nS5g2gDap1~itr6kaLzAERWQ{v(KAr8<5EyiuqjGOvkG!?gK7uz zY?U%fN(!v>^~=l4^~#O)@{7{-4J|D#^$m>ljf`}GDs+o0^GXscbn}XpA%?)raY-#s zF3Kz@$;{7F0GXSZlwVq6tE2?72o9j`%q@UhlvfP(70`eB6^RAN8HhG;U_jhx0}N3s-~5!!v`Ux6l2kh*14A=i15;fi!w>^wD+5z2 zQ)3%_G&Kkxf^|C=r6!i-7lq{K=hy{gR;1?Sg18FCz;HK#=tWk6q#5K7EB~U*RA2yu zg3->KQE)+Gaw;giz*>-m z&{c!2i9}dqXkdYC50VU2r;R=+F(V~zNX`L^0<(@C7cfd;+0c$_nNcJo0|Tpsr;B4q z1>@V<)+i>Q`u-!Yw}0U4`(FBP-p%UuH}BLROnP?aOkDQc_w!Ak z7o??~n!@#0|U-g~RpUTre#MIk#moGEB zdv9^a@4a#F-%A|5k{t2i#jzA|;V(9J+EoSn8|Et?=-+sGyQTKAHLXtn6Q6%GIs{>q1xtDGH!TkS(op{do6}77BSHFrBdt71+(_pu7X9J)x19>V^-OD$C&n;%A9B&#a3lM5>kZXccjhj>_GJ2kETNdLdx?K#_HDU! z?c&nXS5kgbt4(*NzGRrqDqMBoP@U-C^!e5~zl#r+CpxIh9NC?9T_eZM&)}w>`pKYyEIkUwQDxqx;F9Y!#f}DKJyj-@*)1i zx*NJ&GheeEQ8pBgYq zC^1@hYnV3Ef%{V(8@iuts217ukcHv1S)J-a4(20qrZ(&Cu5&PC=>9XA$Z`K#P-dwP z(*gSl4h^f1Y^fI7RL8<#D!pGYuqFM-uO0DmZ`TVl+*rQjufOnNzN=2zrHfb;{s*)C zGVe_Mu8^{jg~42Yf3Lae>jk9?D@%b6V7P9+^!$$ak0*cnr}rkV4rRDyzwG$OfX&ss z+)=9M4Q{;i`Fp|OJZs)V*&GYA3<*=c!~>BvX$KDUUYY*%^z>h5LDx?;+=`Pu^kBw9%n!Vztl|)~ z=Wnxj!@r(Ma*B+T9=(;1VfvCjrp-aQH1_ROZ~Wlcl$3neIUr6$gV&JD61*V&)yZNC`WR YLA*LbW&i*H literal 0 HcmV?d00001