CodeMirror/Rare
1
0
Fork 0
mirror of synced 2024-06-02 02:34:40 +12:00
Code Issues Projects Releases Wiki Activity

Fixed typos in Downloads, better download text in tab_widget.py

Browse source
This commit is contained in:
Dummerle 2021-04-12 14:24:10 +02:00
parent 8aebcf5dc9
commit b0dd8b18dd
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
rare/components/tab_widget.py
View file

@ -4,6 +4,7 @@ from PyQt5.QtCore import QSize, pyqtSignal
from PyQt5.QtWidgets import QMenu, QTabWidget, QWidget, QWidgetAction
from qtawesome import icon
from custom_legendary.core import LegendaryCore
from rare.components.tab_utils import TabBar, TabButtonWidget
from rare.components.tabs.account import MiniWidget
from rare.components.tabs.cloud_saves import SyncSaves
@ -11,11 +12,9 @@ from rare.components.tabs.downloads.__init__ import DownloadTab
from rare.components.tabs.games import GameTab
from rare.components.tabs.settings import SettingsTab
from rare.utils.models import InstallOptions
from custom_legendary.core import LegendaryCore
class TabWidget(QTabWidget):
delete_presence = pyqtSignal()
def __init__(self, core: LegendaryCore):
@ -64,7 +63,7 @@ class TabWidget(QTabWidget):
# Download finished
self.downloadTab.finished.connect(self.dl_finished)
# start download
self.games_tab.default_widget.game_list.install_game.connect(lambda x: self.downloadTab.install_game(x))
self.games_tab.default_widget.game_list.install_game.connect(self.start_download)
# repair game
self.games_tab.game_info.info.verify_game.connect(lambda app_name: self.downloadTab.install_game(
@ -78,8 +77,6 @@ class TabWidget(QTabWidget):
self.games_tab.default_widget.game_list.game_exited.connect(self.game_finished)
self.setIconSize(QSize(25, 25))
# Sync game and delete dc rpc
@ -88,10 +85,16 @@ class TabWidget(QTabWidget):
self.cloud_saves.sync_game(app_name, True)
# Update gamelist and set text of Downlaods to "Downloads"
def dl_finished(self):
self.games_tab.default_widget.game_list.update_list()
# Todo: len updates, queue
self.setTabText(1, "Downloads")
def dl_finished(self, update_list):
if update_list:
self.games_tab.default_widget.game_list.update_list()
downloads = len(self.downloadTab.dl_queue) + len(self.downloadTab.update_widgets.keys())
self.setTabText(1, "Downloads" + ((" (" + str(downloads) + ")") if downloads != 0 else ""))
def start_download(self, app_name):
self.downloadTab.install_game(app_name)
downloads = len(self.downloadTab.dl_queue) + len(self.downloadTab.update_widgets.keys()) + 1
self.setTabText(1, "Downloads" + ((" (" + str(downloads) + ")") if downloads != 0 else ""))
def resizeEvent(self, event):
self.tabBar().setMinimumWidth(self.width())

10
rare/components/tabs/downloads/__init__.py
View file

@ -19,7 +19,7 @@ logger = getLogger("Download")
class DownloadTab(QWidget):
finished = pyqtSignal()
finished = pyqtSignal(bool)
thread: QThread
dl_queue = []
@ -139,6 +139,9 @@ class DownloadTab(QWidget):
def start_installation(self, dlm, game, status_queue, igame, repair_file, options: InstallOptions, analysis):
print("start installation", game.app_title)
if self.dl_queue:
self.dl_queue.pop(0)
self.queue_widget.update_queue(self.dl_queue)
self.active_game = game
self.thread = DownloadThread(dlm, self.core, status_queue, igame, options.repair, repair_file)
self.thread.status.connect(self.status)
@ -219,7 +222,7 @@ class DownloadTab(QWidget):
for i in self.update_widgets.values():
i.update_button.setDisabled(False)
self.finished.emit()
self.finished.emit(True)
self.reset_infos()
if len(self.dl_queue) != 0:
@ -233,6 +236,9 @@ class DownloadTab(QWidget):
elif text == "stop":
self.reset_infos()
self.active_game = None
self.finished.emit(False)
if self.dl_queue:
self.start_installation(*self.dl_queue[0])
def reset_infos(self):
self.kill_button.setDisabled(True)