From 4237358909ce896c11508db5108b96d18a648e42 Mon Sep 17 00:00:00 2001 From: Dummerle Date: Wed, 7 Apr 2021 15:34:52 +0200 Subject: [PATCH] Download Tab: Show Summary direct; more translations --- Rare/Components/Tabs/Downloads/DownloadTab.py | 30 +++--- Rare/languages/de.qm | Bin 18133 -> 19018 bytes Rare/languages/de.ts | 86 ++++++++++++++---- 3 files changed, 84 insertions(+), 32 deletions(-) diff --git a/Rare/Components/Tabs/Downloads/DownloadTab.py b/Rare/Components/Tabs/Downloads/DownloadTab.py index 71ae2d2a..3dcbe6a6 100644 --- a/Rare/Components/Tabs/Downloads/DownloadTab.py +++ b/Rare/Components/Tabs/Downloads/DownloadTab.py @@ -187,13 +187,8 @@ class DownloadTab(QWidget): def stop_download(self): self.thread.kill = True - def install_game(self, options: InstallOptions, no_confirm=False): - if self.active_game is not None: - self.dl_queue.append(options) - self.queue_label.setText(self.tr("Download queue: ") + ", ".join(self.core.get_game(i.app_name).app_title for i in self.dl_queue)) - return - self.queue_label.setText( - self.tr("Download queue: ") + ", ".join(self.core.get_game(i.app_name).app_title for i in self.dl_queue)) + def install_game(self, options: InstallOptions): + status_queue = MPQueue() try: dlm, analysis, game, igame, repair, repair_file = self.core.prepare_download( @@ -230,10 +225,21 @@ class DownloadTab(QWidget): if not analysis.dl_size: QMessageBox.information(self, "Warning", self.tr("Download size is 0. Game already exists")) return + # Information - if not no_confirm: - if not InstallInfoDialog(dl_size=analysis.dl_size, install_size=analysis.install_size).get_accept(): - return + + if not InstallInfoDialog(dl_size=analysis.dl_size, install_size=analysis.install_size).get_accept(): + return + + if self.active_game is None: + self.start_installation(dlm, game, status_queue, igame, repair_file, options) + else: + self.dl_queue.append((dlm, game, status_queue, igame, repair_file, options)) + self.queue_label.setText( + self.tr("Download queue: ") + ", ".join( + i[1].app_title for i in self.dl_queue) if self.dl_queue else self.tr("Empty")) + + def start_installation(self, dlm, game, status_queue, igame, repair_file, options: InstallOptions): self.active_game = game self.thread = DownloadThread(dlm, self.core, status_queue, igame, options.repair, repair_file) @@ -299,7 +305,7 @@ class DownloadTab(QWidget): # QMessageBox.information(self, "Info", "Download finished") logger.info("Download finished: " + self.active_game.app_title) - if self.dl_queue[0].app_name == self.active_game.app_name: + if self.dl_queue[0][1] == self.active_game.app_name: self.dl_queue.pop(0) if self.active_game.app_name in self.update_widgets.keys(): @@ -321,7 +327,7 @@ class DownloadTab(QWidget): self.time_left.setText("") if len(self.dl_queue) != 0: - self.install_game(self.dl_queue[0]) + self.start_installation(*self.dl_queue[0]) else: self.queue_label.setText(self.tr("Download queue: Empty")) diff --git a/Rare/languages/de.qm b/Rare/languages/de.qm index 7312743e566e5ea5312b0b14ab84fa5292c5dfcb..9022e87c32cc0e733c65dc7a23da9eed60552a86 100644 GIT binary patch delta 1889 zcmaJ>3rtf76g{PV^!r+*bo@jfDi#Ehj|fx-iUn6inNk;jI4V@>R@zF7(4p4pbh^zc z7M&; zy!8<-Mg+l!TY-pMK2)<1{3rl&PJ-Ed76^~_VfyEeH0eG0ECk<>&wN!a9ba`kQ9em&*(E`vU9t0#gc+bLF64dOc>meSk#&6O(4hYiueRq6=ixjQ&J268ABrf+m z6;BV8kNy5~{!PRTUyx1{1}*0Yv{7UBDL*iHBPr7GLz+^6gjM`_FC(yw~G;1rhgMSAl>QL9%-YkhVgw zS$7nOUGKxxLq5!TENHs6lPo_dI3k`&jk_4ZA`%vr&cvMAOiuLpFb+)8MLjvx%B0>t z1B`mW6wDzZahX1hpU%83tp|o#n6l;`U_c4;iL1oaJFGnfYJX;PZU9Br)x zqV-I(r^(lG! zTzGRSg)L&WutRx^R#7MHa6TcSKZw!>tN~sx6X~XskhFHulzntREnlQhNgyY4Mb&$L z0|eJa+m@W5#=)Z2-A{pmyTzkwrvo9weHc|K&U_=A-e2t!XEwG{I%CB3sUpgNT6}lu zav*uX_>t!(FsNSq+(tq|+9biV4%5!2NMerBwf3?kZsjrx-AGC1*CAAIlgwGCA>lhE zHN8IrDeaOK4_5#gV#&T(Cxy9Ja^_UMQkT`ma;UPeG&fzE<_HJ^S0CO;;zbv71JL` z>;-uYS4dykC3&K42YtsM$!83iOy9L!Zl6m+#1Zl)fsh1km7fdKQdqaiTX$tpSP#kD z{-j1BHS%s{H956WG2ZKJPJtr7h#D(yE2i(_(?E%e;$LzpTZxMDwy&sQbg!bmXeU{C zMse~Cg)O_%1mp&Lx&--*dtdg%5dJuujYpNRK?^IYV1XG1Slz|!h-eP)(z%6x9NvKu z4!lPPhXr(QrwS9H*?noPv%zVYXEt&c zYZc7~Z%a>-WG_EF8RLlCjuMnnS1;QQIxHxK(OsLWjI=`oj*?4%4|D|d_gGkItTbvk z_rd^Gc;^3eB=m7$67iad+1SsfdX+7=+~#n4DLuE?@w_m}f7CGlz7wr5@OTMsMYzh{ z5D*&PPdh+ou{#WAv&pic&j1bQSr||i<0?f?pM-L%zlxCDYLkO=Sh+%{-C-=}^r8xb xlhc)0E$;Q2*F2r+=cEaN)Z-Q7`|AbXdhf18dMfOz%Sw-R8*_s^ceM9-{{SKL;4uII delta 1288 zcmX9-Yfw}L7(Kgp@9y4v_ud6I-YhKgS{^RKvH^y?MJSLAoIwJD8jYqXX0S#|U5Rm! zQ9~XYuOTxTwHjd9Nr&Vm?@XI%(9~&kM9LT@#qb3s)Mxwa-0$8y-#Ono-*>S|cJ;9A zh~BE0f}*Ak@Z4iZ|I=Wb#{sutJ6f#pa{3O?{sPO-0|1+bc#kGPSc~M$96-H@3{wN( zDk7_T6i7IN&H4bqd=NQ>tAH{C`KNaSM!}Az3FJSc+QIjKv?3`7@4x*B2Ne?IWvSa|7_Lmn|Rg2Ew(n zXPzR!pOa@SQ=cSO{z{zzaQsbvZis{`tK`FZ&VWfT9|<#9=|i1-p>l~PIL;_yXfh`~ z<8YaXg=379>rqm)o^k6o17W^Q7)PaJwjGVHGCP0B2K=uwwMB0MA)A=`*M0|Fx|xnX z8?fOi(>1RE^byS9^E!S>p?`24kV+JhjebB>m7+Pr+7ASU(gUG6$Bqd@itZboWOc9N zJhzRAYgolcB+Pr7HI6j{&P{eSwy_bHa>=2;Sj*ipAo38KT|h#N*X$VlfPF(~A%PrQ zI(qz9ngw>iR!j|&*-Ld~r9;0`_k9ImIji)a`vX{8 zrmT;q(cN2>t!YH4iBMkoh9-(#P~O)p5>~3rLo`v`jLJOg4@69=5@SaIgQQ9`>xeK@ zReq%h5aU(5f89?)hE>;{KO-wwRMwfjv|OHks#)C~$~IgzTlts->`+HL){^r()EQey zNYu1?b1%J*dRd)oHc_M7>RmlI0mUu#i9N$a?5v*p_8-7w6Bkv#l^hzkqmKg@m!3d` zeq3C~6b(4awOG_N&ZEo)bpJle z_97qmwHrkw@C9}2NqHy#$=}m7X*plLSPi_W;(LQDfxx4De-jZV*7AcH9YAmof2)9Y zDZECIo!v{zC)v?3FBmq`vIbZ)g^-DDw9Re8!BQVUS0YU08mQqTVJ66toaqw&>^lMY z6lr{Wf1<0X)I<)qk^pG7=(ZDqN%Q(X3sr|T6%ItCSMly6ot_A~rmvA9;(|Q_)RU zwTc(!%ILnIiWk46#(|7DXBelbo`|bqkIBJ4N%j>*6I>w$7SovpZI_IO93c9Vw66Rl zoo9fQ=a)s-a7L;qB0jadH0hCwJZv~FO`VDb{Boqr_o%Upi}XadiyUawraZSSAxoQC zC{gBB+O4M;AjYIEzP6FF{!v?Y`3yy}q-`neBxgpn7shCZ;ws*u-0s-I*i5#uDBaE0 gBs4I#Wo?Sg_O4@z%oeJ9(`XBcn-pyR>4Eb90H?526#xJL diff --git a/Rare/languages/de.ts b/Rare/languages/de.ts index 016760a2..92f56cc6 100644 --- a/Rare/languages/de.ts +++ b/Rare/languages/de.ts @@ -34,6 +34,19 @@ Neueste Version herunterladen + + App + + + Download finished + Download abgeschlossen + + + + Download finished. Game is playable now + Downlaod abgeschlossen. Spiel kann jetzt gespielt werden + + BaseInstalledWidget @@ -68,70 +81,90 @@ DownloadTab - + No active Download Kein aktiver Download - + Stop Download Download anhalten - + No updates available Keine Updates verfügbar - + Error preparing download Fehler beim Vorbereiten des Downloads - + Download size is 0. Game already exists Die Größe des Downloads ist 0. Spiel existiert bereits - + Installation finished Installation abgeschlossen - + Installing Game: No active download Installierendes Spiel: Kein aktiver Download - + Download speed Geschwindigkeit - + Cache used Benutzter Cache - + Downloaded Runtergeladen - + Time left: Zeit übrig: - + Finished Download of game {} Downlaod von {} abgeschlossen - + Download finished. Reload library Download abgeschlossen. Spiele neu laden + + + Download queue: Empty + Anschließende Downloads: Keine + + + + Download queue: + Anschließende Downloads: + + + + Empty + Keine + + + + Installing Game: + Installierendes Spiel: + DxvkWidget @@ -625,7 +658,7 @@ Installationsgröße: {} GB MainWindow - + There is a download active. Do you really want to exit app? Ein Download läuft noch. Möchtest du die App wirklich beenden? @@ -682,30 +715,35 @@ Installationsgröße: {} GB Rare Einstellungen - + Save Speichern - + Image Directory Ordner für Bilder - + Language Sprache - + Restart Application to activate changes Starte die App neu um die Änderungen zu aktivieren - + Confirm launch of game Start des Spiels bestätigen + + + Exit to System Tray Icon + Beim verlassen auf das System Tray Icon minimieren + SyncSaves @@ -846,6 +884,14 @@ Installationsgröße: {} GB Spiele + + TrayIcon + + + Exit + Schließen + + UninstallDialog @@ -877,7 +923,7 @@ Installationsgröße: {} GB UpdateWidget - + Update Game Spiel updaten