From f4ccaf4c29099e0991b98c060ecc4d41ceaa1d72 Mon Sep 17 00:00:00 2001 From: Dummerle Date: Thu, 17 Dec 2020 11:54:59 +0100 Subject: [PATCH] bugfix --- Rare/GameWidget.py | 27 +++++++++++------- Rare/utils/RareConfig.py | 2 +- .../__pycache__/RareConfig.cpython-38.pyc | Bin 0 -> 828 bytes .../__pycache__/RareConfig.cpython-39.pyc | Bin 0 -> 826 bytes .../__pycache__/RareUtils.cpython-38.pyc | Bin 0 -> 2179 bytes .../__pycache__/RareUtils.cpython-39.pyc | Bin 0 -> 2467 bytes .../utils/__pycache__/__init__.cpython-38.pyc | Bin 0 -> 155 bytes .../utils/__pycache__/__init__.cpython-39.pyc | Bin 0 -> 155 bytes .../legendaryConfig.cpython-38.pyc | Bin 0 -> 688 bytes .../legendaryConfig.cpython-39.pyc | Bin 0 -> 688 bytes .../__pycache__/legendaryUtils.cpython-38.pyc | Bin 0 -> 4453 bytes .../__pycache__/legendaryUtils.cpython-39.pyc | Bin 0 -> 4427 bytes setup.py | 3 +- 13 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 Rare/utils/__pycache__/RareConfig.cpython-38.pyc create mode 100644 Rare/utils/__pycache__/RareConfig.cpython-39.pyc create mode 100644 Rare/utils/__pycache__/RareUtils.cpython-38.pyc create mode 100644 Rare/utils/__pycache__/RareUtils.cpython-39.pyc create mode 100644 Rare/utils/__pycache__/__init__.cpython-38.pyc create mode 100644 Rare/utils/__pycache__/__init__.cpython-39.pyc create mode 100644 Rare/utils/__pycache__/legendaryConfig.cpython-38.pyc create mode 100644 Rare/utils/__pycache__/legendaryConfig.cpython-39.pyc create mode 100644 Rare/utils/__pycache__/legendaryUtils.cpython-38.pyc create mode 100644 Rare/utils/__pycache__/legendaryUtils.cpython-39.pyc diff --git a/Rare/GameWidget.py b/Rare/GameWidget.py index ea763abe..27d33eae 100644 --- a/Rare/GameWidget.py +++ b/Rare/GameWidget.py @@ -7,6 +7,8 @@ from PyQt5.QtGui import QPixmap from PyQt5.QtWidgets import QWidget, QLabel, QHBoxLayout, QVBoxLayout, QPushButton, QStyle from legendary.core import LegendaryCore +from Rare.config import IMAGE_DIR + from Rare.Dialogs import InstallDialog, GameSettingsDialog from Rare.utils import legendaryUtils @@ -50,18 +52,21 @@ class GameWidget(QWidget): # self.dev = self.game_running = False self.layout = QHBoxLayout() - if os.path.exists(f"../images/{game.app_name}/FinalArt.png"): - pixmap = QPixmap(f"../images/{game.app_name}/FinalArt.png") - elif os.path.exists(f"../images/{game.app_name}/DieselGameBoxTall.png"): - pixmap = QPixmap(f"../images/{game.app_name}/DieselGameBoxTall.png") - elif os.path.exists(f"../images/{game.app_name}/DieselGameBoxLogo.png"): - pixmap = QPixmap(f"../images/{game.app_name}/DieselGameBoxLogo.png") + if os.path.exists(f"{IMAGE_DIR}/{game.app_name}/FinalArt.png"): + pixmap = QPixmap(f"{IMAGE_DIR}/{game.app_name}/FinalArt.png") + elif os.path.exists(f"{IMAGE_DIR}/{game.app_name}/DieselGameBoxTall.png"): + pixmap = QPixmap(f"{IMAGE_DIR}/{game.app_name}/DieselGameBoxTall.png") + elif os.path.exists(f"{IMAGE_DIR}/{game.app_name}/DieselGameBoxLogo.png"): + pixmap = QPixmap(f"{IMAGE_DIR}/{game.app_name}/DieselGameBoxLogo.png") else: - logger.warning("No Image found") - pixmap = pixmap.scaled(180, 240) - self.image = QLabel() - self.image.setPixmap(pixmap) - self.layout.addWidget(self.image) + logger.warning(f"No Image found: {self.game.title}") + pixmap=None + if pixmap: + + pixmap = pixmap.scaled(180, 240) + self.image = QLabel() + self.image.setPixmap(pixmap) + self.layout.addWidget(self.image) ##Layout on the right self.childLayout = QVBoxLayout() diff --git a/Rare/utils/RareConfig.py b/Rare/utils/RareConfig.py index 9ebb94ea..91b65de7 100644 --- a/Rare/utils/RareConfig.py +++ b/Rare/utils/RareConfig.py @@ -7,7 +7,7 @@ rare_config = configparser.ConfigParser() if not os.path.exists(config_path): os.mkdir(config_path) rare_config["Rare"] = { - "image_dir": "../", + "image_dir": ".", "theme": "light" } rare_config.write(open(config_path + "config.ini", "w")) diff --git a/Rare/utils/__pycache__/RareConfig.cpython-38.pyc b/Rare/utils/__pycache__/RareConfig.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..4f52b08e9b5c3771c4462540dd46c52447e7351d GIT binary patch literal 828 zcmYjOy{^+R6tv z;z7JJ@d_Of$4+%sOaAQ7K0f}wb3P_Xgkb!>`c-}*2>r3-as)u$!c;#2D57|aihjif zW_UvmoN{46pep{2~FC088lvSW58+ls)+i+R*ZZzuhIXx)Y!HI)7hD zmfv}^S#E+YUpG1<#fZ1nnw6AG6X=Gu%=k9!6!mXrTyTT0Gi(Nu>Ae)SO?x?@KxhF| z*_vsz!4$tjAb>2*s8p=hyb~%TW-K9X*=IFj2|w1lEFX}J;hlriyS(XImT#F5m8AKi zqg<@>)otBWvR%n;1KCvX!dcmCzU}$K8Jz8IO|)kE{L3?|%F07nrhpIFM1ozPZ)QVI+xbguIj<9?IYc?@)pI}!>#iSvfGQQ1a{7uJ&iP+7q z5_AuD@;N*(abJ&>3wNT-fZcGVl?mF<&};b=!lW&b@g=LMtB?EaLYdR(f6#XAmIby>sH)12P`hP`qSz&-#6h+Z?>$vr+P|UG8(@6@ zk~?$c9F9Y00bw5VS^t6Z0UOK-9~?tI;yw#r5jOmR zF@VSfZ=>$caY0!40BppfpI#Oti;*R4j4WaBnWQ&=u{N?i!}t4mS~l{FSkFEciq9-e zt-lrP%A__yoC#%pQ}LQx&pDmL?#EO}Vd0R1?JI8fN|r9@^}_a$1#ay+X2=E@ zydjvLF6}VayfmVbI;D1`Fl^pMwLy*Bw8iTJJe5APmpU5fj|iAC7$WnMqPkip)^;PHrjeFmi0D`kT&GEyF#)(zNr`Z z!A4y_R;_zml(ytK$ U2a>%E}qK)7?{NlHR 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 literal 0 HcmV?d00001 diff --git a/Rare/utils/__pycache__/legendaryUtils.cpython-38.pyc b/Rare/utils/__pycache__/legendaryUtils.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d6daa7f301be5e71a2a2b388123a8c5e1210f8dd GIT binary patch literal 4453 zcmaJ^O>^7E8OAO^68scJNsi=C#&znjiKX--?V+xl89VaD)yQ=cH*8!E#DyqO5Wwt$ zw#7ozgWaPKJ=dL~j{XDr0r?qw?J3vx=1FGyybF>h?YO{TvHM~_-p}WK@p-jcvT%Lh z`nIEMmi2EM%wJ^;KEb1E%(8?fSZKAgH)}I9=53BQ5A7qT?HuLWIY!^@Fn?5N7ntQ+ zV^=t*tX=dAPpo!H&IaPh8)qA1~A6=hMuyXG&6>T@P)V(F>Vu8X=@26b69 z#0uUGv5K2bZ=dy7#M&VjY`^F)`2~L!_ma6+dzLu!yeQrg>rZp-HL)SiV*MF$PMpX4 z9q}`oB`!SY;-a{O8SA1c-o=*3rmJ`So*xNM9^Z_m-?s1EzSX70^Ou9c zO+0E9O=2Z%%uk_k!Jk5%&o~ZrcDk^_?4mwB_wcAZn$+rJ@Ph5 R_2q5pzuC-RQ` z7nUqy!prTggZRkb3jHYZq}aL{iy-Q4?H+dzJb45e`hGW2TYvPVpEbiI2olJ`V%PuTu|}7Ae$ojdm3U$3i_Pm{-1S0r1D$LpSg{ZN0l-sXy4GL4WiK|ea*C(SYvi--LjsL@$5xi z(pI#@=#rN7pv?!R6PB{R^$-5Fb1%~%q;S2#phHT9;rZrAngy@3TDneBbmODJjb&`5 z$g+8hTcfKBGMG)&yr!nBT3pt#M$+oJ&B=t)C}ZVEHlh_%m8_$`pc0a8=3tu`^sEy& z*%Rx8CF}{5@?iahr@YToc36=0)Ee6f+1|v_q6R5e)asv_TZlxeM*1$fg!^Se}(|SD3tr@q!dIfh=_sk7}aHOsdus zV89b_o7jSzw>5T7!8gqOvT`Tx1yOU`3*eXEQNXlvM!h;0(ifc@$RJ9z<3A1(y*3rD z<3*w)!tUEW(s-_scsf@R$I3-xG1uJkJ@jP(%^RUhCNYALPDqf{I)!Ius?HohyHjq= z7O(5EKKnjxfWi_RRH#mHVFPy@gFCq$c?t91 zkl;taC*z*!A_a+oAYc)D{2J$y(h7N@B%6=UP32e!h72|&AJ@?BbTnVKau86=Pa z-fAPcL96l18O7m-`i5?1_Bez26WuftKDGs;Kp^e3_|C}PiJQi65Dq3ti78zG3BJ_R zIbX_H&dK{KXlLe9oeTkgPK=RB$Xnz!ytg$+z9?pK<%T`cF&J5h_xHmf0$8fUV9YGsm;95#8DhZzPlgfQ7y69L*`LHCPGh{Y|GZO{c<4eQApRBaf zui(7up)F~DcXl4@*HSCxX(@HmT$)b{shbu>@mcXJ`=okOJ6TGW0Cn}WKCY)VvSzZ3 z@p8HZ;9EUuq|4(*+DMnu#)fsu0eb(z%$0PRW}>&6Rz+#ULR%Kr-+4ACt-~KGJEPid zIA9ZK*4&SWkr3pCF2sMv!!oW)oblym!bY%kc9inE@Ng<)@SP{h; z$0k!`Im1)RPju-EFC6-xQkdxK-Y^Ko)S-1@;@KGrhu$#i9$;??RucHUBYW%& z$Uyi;kMfr^jZ`RqOU=jB{F<5zXmmb==~SZghDoLE?jxaXKYFMOgRCNKmob`Ff||XN z3(FHJN!_%s+C^hICFDWZb8fviA!a0OKXDuF%%y6@nfL%@BAnjoJ73M16}2$9OGx&Q?OcF3v~ zN;?^Rl_>>G3@UFE`7D|iZ&&6VLm55J!KEn>%9IeYS&G=6ptl2YFEdFs+JZ0`zbXsx z7X$R}o9a13t}G|nSJWiH4wLij9c^v5ChBv&VRFz>fk1|*UN;t02irtJJ&&j{%A0A>fP%tN6BCx; zlO=AbZ#N+o1!TfL7i=R-ySfbA8id~Q4&r3OjQkAqwEKSzXbLC_>%S5Y6U7Mh0)%XiRu_CM3#w)-2k1h@f`s4% z(S9tyB%a&U{Fxe3&g+)^4QNmCOe&T-lSFCZZ}X!3fad?68rn!#c8~8SA8+1G=x^7c zb_US3884eu*GQ7hq=q|&7kNNC7**0QnEBfexBwo`T#Nru;^<{4{6poMTX3C54)dH^?tcYc;BNo` literal 0 HcmV?d00001 diff --git a/Rare/utils/__pycache__/legendaryUtils.cpython-39.pyc b/Rare/utils/__pycache__/legendaryUtils.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..465b9c6cbb9600c225c54ca7b1142c5ff3d5d57d GIT binary patch literal 4427 zcmaJ^%a7Z}8RrZsiF&S9yX)-w5i71!M~%JfKGGJb>jto61BJV=>m)|hxB^$h)l$nP zl^M$Rs$BG7_vk~ftqW+6zUME$}!B9bL1me^Y1vDx>o;9#vzOB`m>0tDU`Bo0&dubG&(IA2@C2AlJ?@`fi8$gF?H& zEZ-Wt!Z~K`qF;DwwM!x=^3SYxSrmkecSRIM3Gb>XiwfQ~e@RqdFi{gr&zyE$)WtGJ zmqkOY;N1|bxY_jfS${>W?Q_9)i~f>d@KK(u5N5YebH)83x?K`(`c4_ha z<)Cu|k6Hyutb~pEF%&NNGpO@9$AQjv7gm^E)TZY?9+d}4tv)(0*)~qhB|#GUFPU~C z@4$a)$s#7ay0x_zANX6LA4Q%NTQ_16M7^!Mhuu9-9zce^-%ZrkA3f=3WS9h@!t@FA zpHX*naH!pDp?9z&yz5o$`d>WO=zPylIzgloFAROLc`b~)UZ}34kAT` zy{Jptik28%(vlvu`LJ}vQr5Tr&cAZ*XBvbQt~VHTNU1P9-@K|>aFW&1HIkwm9}KQ9 zV=GC_jxH_mZ#Gc#TAHqCaapHDW+fTzJmr0!vPVqTQ)_Ie{FpK8E3_eZ4og~&q79?F1Y!>Tzm zs*5uh&<>59(yYToh!_~f?~EUlbTug-<^Mdt=Gh!XAiPl80RO@-@tk?4r9 z`*v?MUTY+t&Q-**azQNSnp?h)wk&|W5w>I!BM7-R36fgJ@XAcpnFDBd%8l9Lq#oIK-Zu;9OElAur6r;>=WzgBB^QV+fn;z%26(HDxU;A0`)-3@~XK&keFLFbV#RS-v= z?w;S>*Y0C{>FmIfOQtoDyTKFfhF;VgdOcqkqPRmJz}k~UdR@}}^jblK`o<40!=5P{ z1N4sBQ8_KE(+Scng%io1mit^@#)t{9%vbu(IEV54F;lnj#h%UO>TC2J>SM>kv8DcO z_OLPTj*E1H`g+s=u$EGb%7N$nsPe#y&N^07KKutmPD3y=QJ@{ZFy~*j(n`OA)2jQn zq}|=wX{=vMt(2#w)Jbz`J}snfS`@|S#V_rn>QU`zDOm#0)zkX8p4P~g$uj!O=@MXX z^{A09j~i(tT}m4p)-ea<{RcBw(q)>7)@oW6r40+TEUdrrY))E-H&nJqwcBvNCa|oz z8xJEfDw}?wnm~?G!*oRKtLReF1iYwZRGK(SGl)J#Xyk_j;U)g))F1rBL(6L}PH)@| zeNXw#Y+AF2(FQ{91ED58fu82T+JE3nJ zLQ?$7CP-`TWD2H(Or+_2pa=#vk8#4lOZIf$NTPIQ0`naj&0>=RLf5e(iZhN)p2#wW zr<9-Q(&t_{^gp2>(bb({5Q?cg>%zpZGYk&BVbtBj-V&@N@OVkc-(JBc4`R8GSi2cW zlq#`2loYyPG=ls|dkr%trPy2nrgNxDWYStOu_d>#!e~%Z5Vn^|b(GILF_@5n@Qohj z&uJQ|Q2vI@FJ=KQ~-Sha^Jx_hfuqWS|FbS0wdJ;2#(6@dY~{@rBJ%bV5>~fKQX1e zO~a=_TD)DEa|vZMI0uskA5?wg7^L#!+p z*;%f)0j7E-h#q-iKoQp=i&MbO@$ed|^N7-TnDnvdG@pKs_Di05&&OzYNtM%!+EgOl zz@tc9${zw5{h!vq_?QcnQnMUlZ;#ey)pYa9A&|fn%*|Ju-Y23zRxVwl3ac58-rLABv@>z_)@Kk>Y{AHM2 zXK!okR%@a@*Bd5#9Tf;#sUN!Nza6!i>5nhM~zScHyC<_Q91!OHb<)qK9&Vlvy}sAp;AFAaDr$zmR}IhZ6bdn zLdrR5$zNgY8J9@=LWtigMRL^j-L`s7%RLz+>Nm7liot-!i4aOO4kQAcE`?F*u zs7qST1SGEKWP2U#?zMwh3`74qsa^dV#MJJ*&MF*eYP$~Zl3S=buIuK2v*gR)mw28z R-&d}<1=nfh@WrX+{s#fU-@^a^ literal 0 HcmV?d00001 diff --git a/setup.py b/setup.py index 94d5502d..a7b4f206 100644 --- a/setup.py +++ b/setup.py @@ -27,8 +27,7 @@ setuptools.setup( "legendary-gl", "requests<3.0", "pillow", - "PyQT5", - "PyQTWebEngine", + "PyQtWebEngine", "setuptools", "wheel" ]