From 67b4339d5892dcc450d81570b7981941c7f2e97c Mon Sep 17 00:00:00 2001 From: Sacha Date: Sun, 24 Nov 2013 15:49:32 +1000 Subject: [PATCH] Qt: Lots of misc fixes. Use QtMultimedia everywhere except Ubuntu (they forgot to include it). Makes audio much better. It is supported now on Symbian. Remove unused resources. Include translations that weren't being included. Consolidate in to a single resource to fix a rebuilding issue. --- Qt/PPSSPP.pro | 18 ++++++---- Qt/ctrldisasmview.cpp | 2 +- Qt/desktop_assets.qrc | 24 ++++++++++++++ Qt/resources.qrc | 31 ------------------ Qt/resources/{icon1.ico => breakpoint.ico} | Bin .../{stop1.ico => breakpointDisable.ico} | Bin Qt/resources/psp.png | Bin 13993 -> 0 bytes Qt/resources/psp_adown.png | Bin 304 -> 0 bytes Qt/resources/psp_aleft.png | Bin 322 -> 0 bytes Qt/resources/psp_aright.png | Bin 321 -> 0 bytes Qt/resources/psp_aup.png | Bin 319 -> 0 bytes Qt/resources/psp_down_red.png | Bin 278 -> 0 bytes Qt/resources/psp_left_red.png | Bin 295 -> 0 bytes Qt/resources/psp_lt_red.png | Bin 349 -> 0 bytes Qt/resources/psp_map.png | Bin 4564 -> 0 bytes Qt/resources/psp_right_red.png | Bin 312 -> 0 bytes Qt/resources/psp_rightbtn_red.png | Bin 399 -> 0 bytes Qt/resources/psp_rt_red.png | Bin 350 -> 0 bytes Qt/resources/psp_smallbtn_red.png | Bin 290 -> 0 bytes Qt/resources/psp_up_red.png | Bin 292 -> 0 bytes 20 files changed, 36 insertions(+), 39 deletions(-) create mode 100644 Qt/desktop_assets.qrc delete mode 100644 Qt/resources.qrc rename Qt/resources/{icon1.ico => breakpoint.ico} (100%) rename Qt/resources/{stop1.ico => breakpointDisable.ico} (100%) delete mode 100644 Qt/resources/psp.png delete mode 100644 Qt/resources/psp_adown.png delete mode 100644 Qt/resources/psp_aleft.png delete mode 100644 Qt/resources/psp_aright.png delete mode 100644 Qt/resources/psp_aup.png delete mode 100644 Qt/resources/psp_down_red.png delete mode 100644 Qt/resources/psp_left_red.png delete mode 100644 Qt/resources/psp_lt_red.png delete mode 100644 Qt/resources/psp_map.png delete mode 100644 Qt/resources/psp_right_red.png delete mode 100644 Qt/resources/psp_rightbtn_red.png delete mode 100644 Qt/resources/psp_rt_red.png delete mode 100644 Qt/resources/psp_smallbtn_red.png delete mode 100644 Qt/resources/psp_up_red.png diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro index a9ad2bfa5c..dab7775911 100755 --- a/Qt/PPSSPP.pro +++ b/Qt/PPSSPP.pro @@ -13,16 +13,20 @@ lessThan(QT_MAJOR_VERSION, 5) { # Extra Qt modules linux: CONFIG += link_pkgconfig -win32|greaterThan(QT_MAJOR_VERSION,4): QT += multimedia -else:linux:packagesExist(QtMultimedia): QT += multimedia -else { +linux:lessThan(QT_MAJOR_VERSION,5):!packagesExist(QtMultimedia) { + # Ubuntu et al workaround. They forgot QtMultimedia CONFIG += mobility MOBILITY += multimedia } +else: QT += multimedia + greaterThan(QT_MAJOR_VERSION,4): QT += widgets -mobile_platform: MOBILITY += sensors -symbian: MOBILITY += systeminfo feedback +mobile_platform { + CONFIG += mobility + MOBILITY += sensors + symbian: MOBILITY += systeminfo feedback +} # PPSSPP Libs QMAKE_LIBDIR += $$CONFIG_DIR @@ -90,7 +94,7 @@ INCLUDEPATH += $$P $$P/Common $$P/native SOURCES += $$P/Qt/*.cpp HEADERS += $$P/Qt/*.h FORMS += $$P/Qt/*.ui - RESOURCES += $$P/Qt/resources.qrc + RESOURCES += $$P/Qt/desktop_assets.qrc INCLUDEPATH += $$P/Qt # Translations @@ -105,9 +109,9 @@ INCLUDEPATH += $$P $$P/Common $$P/native PRE_TARGETDEPS += compiler_lang_make_all } else { # Desktop handles the Init separately + RESOURCES += $$P/Qt/assets.qrc SOURCES += $$P/UI/NativeApp.cpp } -RESOURCES += assets.qrc # Packaging symbian { diff --git a/Qt/ctrldisasmview.cpp b/Qt/ctrldisasmview.cpp index e334d72a72..55625b052e 100644 --- a/Qt/ctrldisasmview.cpp +++ b/Qt/ctrldisasmview.cpp @@ -257,7 +257,7 @@ void CtrlDisAsmView::paintEvent(QPaintEvent *) painter.setFont(normalFont); - QImage breakPoint(":/images/breakpoint"); + QImage breakPoint(":/resources/breakpoint.ico"); int i; curAddress&=~(align-1); diff --git a/Qt/desktop_assets.qrc b/Qt/desktop_assets.qrc new file mode 100644 index 0000000000..89434e8b35 --- /dev/null +++ b/Qt/desktop_assets.qrc @@ -0,0 +1,24 @@ + + + ../assets/ui_atlas_lowmem.zim + ../assets/ppge_atlas.zim + ../lang + ../assets/langregion.ini + ../assets/unknown.png + ../assets/shaders + ../flash0/font + languages/ppsspp_de.qm + languages/ppsspp_en.qm + languages/ppsspp_fr.qm + languages/ppsspp_gr.qm + languages/ppsspp_hu.qm + languages/ppsspp_id.qm + languages/ppsspp_pl.qm + languages/ppsspp_pt-br.qm + languages/ppsspp_ru.qm + languages/ppsspp_zh-cn.qm + languages/ppsspp_zh-tw.qm + resources/breakpointDisable.ico + resources/breakpoint.ico + + diff --git a/Qt/resources.qrc b/Qt/resources.qrc deleted file mode 100644 index c4012a239c..0000000000 --- a/Qt/resources.qrc +++ /dev/null @@ -1,31 +0,0 @@ - - - resources/psp.png - resources/psp_map.png - resources/psp_rightbtn_red.png - resources/psp_smallbtn_red.png - resources/psp_down_red.png - resources/psp_up_red.png - resources/psp_right_red.png - resources/psp_left_red.png - resources/psp_rt_red.png - resources/psp_lt_red.png - resources/psp_aright.png - resources/psp_adown.png - resources/psp_aleft.png - resources/psp_aup.png - resources/stop1.ico - resources/icon1.ico - - - languages/ppsspp_zh-cn.qm - languages/ppsspp_en.qm - languages/ppsspp_fr.qm - languages/ppsspp_pl.qm - languages/ppsspp_de.qm - languages/ppsspp_zh-tw.qm - languages/ppsspp_pt-br.qm - languages/ppsspp_id.qm - languages/ppsspp_ru.qm - - diff --git a/Qt/resources/icon1.ico b/Qt/resources/breakpoint.ico similarity index 100% rename from Qt/resources/icon1.ico rename to Qt/resources/breakpoint.ico diff --git a/Qt/resources/stop1.ico b/Qt/resources/breakpointDisable.ico similarity index 100% rename from Qt/resources/stop1.ico rename to Qt/resources/breakpointDisable.ico diff --git a/Qt/resources/psp.png b/Qt/resources/psp.png deleted file mode 100644 index 7de480766bf1b8327769cd65b7586aea09fb95d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13993 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 diff --git a/Qt/resources/psp_aleft.png b/Qt/resources/psp_aleft.png deleted file mode 100644 index 60545be238b83c53c1459db4249f140f6c6f710c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eU!3HFY*6?ouQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#E)%nuj@-p57cKyWBuiW)N}Tg^b5rw57@Uhz6H8K4 z6v{J8G8EiBeFMT9`NV;WR(ZNOhFF|lI@y}b$xy)6UueT7fq78{VLT6PP?Yv2`m3Z-DP7x=(^yJ z@5z>AMt?7kXO$woU)D|&cq8>;MN7hMK_96)L6sd`Z7*(w?%dpw@OZ~xoroJA+4?z7 zLN>MqJ9jj*hkc#yXS+je(gQ=*)#sWOp1uEjOnO0F$D#XzZ%@XX#=d$ud9v?opsN`? MUHx3vIVCg!00H`SCIA2c diff --git a/Qt/resources/psp_aright.png b/Qt/resources/psp_aright.png deleted file mode 100644 index f951c2bb93b64f64658a52519567766e91ef55ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eU!3HFY*6?ouQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#E)%nuuJAUyxjH~0$r9Iy66gHf+|;}h2Ir#G#FEq$ zh4Rdj3=MI0~;7b zvKQwG4+tM&8qG@}=iN=cp?zfl4N;PV4SYeXeae!-w#iRX}HVx6AjsAX`&vkCwc6x=<11Hv2m#DR*Id%8G=Se(8(ko4h$s(jGXUnDAXqk>y`)OH5#FZQeAow0}GwR+@2dYufD~yp!{r>4T*Y zrZ6tIc|DfK1q~cBjpYvyD&L*zTQ={RLWSk-{aj{c``sT*<#|wa z$aYfT4~Iooo?>xY9;)^aO`GD1J|0-Bu;PuS*@4AR_ROJgl(8&y*u6{1- HoD!M% diff --git a/Qt/resources/psp_down_red.png b/Qt/resources/psp_down_red.png deleted file mode 100644 index 0ec28673b274796326a3548ee2ee416ed45dde5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^fjA5L~c#`DCC7XMsm# zF#`j)FbFd;%$g$s6l5>)^mS#w%fuvLE&EYlP8%pBS>hT|;+&tGo0?a`;9QiNSdyBe zP@Y+mq2TW68xY>eCk|9p=jq}YVsZNInYCPp7#LbF9u_zYYe@5(U3%#PI zHv4ImnL*D+Uctk5JMNTaXyzO;p3)|A?V(`M+Be*54*g|*!QPs>!<6Cff(;zg#TLkN zeJ*&%VB(x8{XE)7O>#E)$c00;_ka?{lD#WQl7;iF1B#Zfaf$gL6@8Vo7R> zLV0FMhJw4NZ$Nk>pEyuazo(01h{fr(mpAerG7xBe`2U5FOQ*=C4Q$#QCfc${>NW>l zm|$Y!-WaRkS~g{mdgQ)Czf^9QvppzyKAkNixYqACr^T{gi654TvB&RBYmehh`?84T z^$WHQJ$Wp5AHKbyc`&s^{YQHg+s*mn1-1)LCm5_;Co?r)V(NaGskIVQCJRm39CM^d j{$AL&W5*M8WPdPed)B8Eo-r-~I*q~8)z4*}Q$iB}e1m9% diff --git a/Qt/resources/psp_lt_red.png b/Qt/resources/psp_lt_red.png deleted file mode 100644 index a44504f1f2322bc47bcd68c198d0e59ea67c53c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^7C{XE)7O>#E)$c0obrvmm(zhlk|nMYCC>S|xv6<249-QVi6yBi z3gww484B*6z5(HleBwYwM?GB}Ln02py>7_GWGK-3(0=s`K@pMjiRp=H44!mVjEVREvSo{MnpFP}!5SU`njxgN@xNAEjW7Q diff --git a/Qt/resources/psp_map.png b/Qt/resources/psp_map.png deleted file mode 100644 index f164010885f5675fe60c6c34362a772427b341ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4564 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 diff --git a/Qt/resources/psp_right_red.png b/Qt/resources/psp_right_red.png deleted file mode 100644 index 81b809e0555eed023c73582edf60671d6ea4abc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^qChOf!3HF^2u;-kQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#E)$c0f?|2uN;9C4WQl7;iF1B#Zfaf$gL6@8Vo7R> zLV0FMhJw4NZ$Nk>pEyv_0#6sm5R21WFFA4@G7xEbXunXqQ1fUNul|I&%Rk8Ju47$) zjeEz+bb*6=&-)5Sdwlkp$9%K3Us1AMiOFFdgVmx)P0(Rwm}A}>%#vcxr_#5q4VH#M(>!MP|ku_QG` zp**uBL&4qCHz2%`PaLS|yQhm|h{fr(SM9x+9Yv0Re7`1wL(wBZOfhzrfY64(*H`2m zKd_ipGZr@|q(7HbS>id}dx=00%Rv#w*!&Nh3)tIIZ`$Ad{ve!(N4`z+o^(b)lkgfZ z0dAp#+Z~$19sft@2>GzS=FvXoWRTTlb+DRq#(BRBYnk_(I@E4!x@=@($@DdnD@M>N zxAB)v<@uk-nSx&32`&99vm|ia4pS$_q#yR02W-nqMGwWdeNbrm-uA(ug}?1XDaU__ zLyrainYP4#;x#hQ5a877-t~T`>MpI>;<+DYuj0J^B+8DZzo~my@lNF(!e?0KTjnTN m2z=4mx5D_KOF>-vfB6n|139^hxFdgVmx)P0&LZfBR5wsavcxr_#5q4VH#M(>!MP|ku_QG` zp**uBL&4qCHz2%`PaLS|n5Tz0md4_4U4m-pv;lFL)$vWzKQ8b;d5Sg|`L%zc`~%BE?-2 ov!k_!u~ed)d8w-LQ})j+k6Ev8Ie9C23D8Fjp00i_>zopr0KasBOaK4? diff --git a/Qt/resources/psp_smallbtn_red.png b/Qt/resources/psp_smallbtn_red.png deleted file mode 100644 index 4239c46fc510d3fdf771d08e879a6dc89af540d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^;y}#J!3HF!*oip+DYhhUcNd2LAh=-f^2tCE&H|6f zVxTHv5N2eUHAey{$X?><>&kwYiAg|F?gsZ(FQAZQiEBiObAE1aYF-J0b5UwyNotBh zd1gt5g1e`0KzJh`$gVC=7sn8d^H(qK=41*KXnmNkdmuyDQ230_fo*RNOP#q>QoMQt zS1YTd0JEq}^X@~UW}l@h5)$}~|D0)-Uv#Z_^q}0Q=))ETizeBgs(*~XoA%Ff{dYbguHe(r3wLKTJt!-fzCe#* c{olQDmp8wUtp61G73eAkPgg&ebxsLQ0A~zo^Z)<= diff --git a/Qt/resources/psp_up_red.png b/Qt/resources/psp_up_red.png deleted file mode 100644 index dd6f718a7965cafc7d830c47721387782d07746f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^f|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sfT_z?01;ea^J3&TCmbgZgIOpf)rskC}I2WZRmZYXA zlxLP?D7bt2281{Ai31h&c)B=-Se(9l=`<&kp#a;1e9_&TSa)yW*u6pgqf*88X?r>B z1X+$ZzvhlHOZ%?yPhf`3r-`1+8WLI-Ml&r<_q(z8&323MuS*jO?M-==l5-a{_ZPgA+SjgwE_1+2SE(T9mKbLh*2~7YE2V%Sc