From 89d7b62f925a4dcc98b42df9d400fee14c34d3d4 Mon Sep 17 00:00:00 2001 From: Dummerle <44114474+Dummerle@users.noreply.github.com> Date: Sat, 11 Jun 2022 23:45:02 +0200 Subject: [PATCH] Fix click on unreal engine assets --- rare/components/tabs/games/__init__.py | 26 +++++++++---------- .../tabs/games/game_info/uninstalled_info.py | 9 ++++--- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/rare/components/tabs/games/__init__.py b/rare/components/tabs/games/__init__.py index 34e7331a..9a38e74a 100644 --- a/rare/components/tabs/games/__init__.py +++ b/rare/components/tabs/games/__init__.py @@ -69,7 +69,19 @@ class GamesTab(QStackedWidget, Ui_GamesTab): self.import_sync_tabs.back_clicked.connect(lambda: self.setCurrentIndex(0)) self.addWidget(self.import_sync_tabs) - self.uninstalled_info_tabs = UninstalledInfoTabs(self) + for i in self.game_list: + if i.app_name.startswith("UE_4"): + pixmap = get_pixmap(i.app_name) + if pixmap.isNull(): + continue + self.ue_name = i.app_name + logger.debug(f"Found Unreal AppName {self.ue_name}") + break + else: + logger.warning("No Unreal engine in library found") + self.ue_name = "" + + self.uninstalled_info_tabs = UninstalledInfoTabs(self.ue_name, self) self.uninstalled_info_tabs.back_clicked.connect(lambda: self.setCurrentIndex(0)) self.addWidget(self.uninstalled_info_tabs) @@ -83,18 +95,6 @@ class GamesTab(QStackedWidget, Ui_GamesTab): else: self.no_assets = [] - for i in self.game_list: - if i.app_name.startswith("UE_4"): - pixmap = get_pixmap(i.app_name) - if pixmap.isNull(): - continue - self.ue_name = i.app_name - logger.debug(f"Found Unreal AppName {self.ue_name}") - break - else: - logger.warning("No Unreal engine in library found") - self.ue_name = "" - self.installed = self.core.get_installed_list() self.setup_game_list() diff --git a/rare/components/tabs/games/game_info/uninstalled_info.py b/rare/components/tabs/games/game_info/uninstalled_info.py index e7e0df11..05dd63f8 100644 --- a/rare/components/tabs/games/game_info/uninstalled_info.py +++ b/rare/components/tabs/games/game_info/uninstalled_info.py @@ -15,13 +15,13 @@ from rare.utils.utils import get_pixmap class UninstalledInfoTabs(SideTabWidget): - def __init__(self, parent=None): + def __init__(self, ue_default_name, parent=None): super(UninstalledInfoTabs, self).__init__(show_back=True, parent=parent) self.core = LegendaryCoreSingleton() self.signals = GlobalSignalsSingleton() self.args = ArgumentsSingleton() - self.info = UninstalledInfo() + self.info = UninstalledInfo(ue_default_name) self.info.install_button.setDisabled(self.args.offline) self.addTab(self.info, self.tr("Information")) @@ -65,7 +65,7 @@ class GameMetadataView(QTreeView): class UninstalledInfo(QWidget, Ui_GameInfo): game: Game - def __init__(self, parent=None): + def __init__(self, ue_default_name, parent=None): super(UninstalledInfo, self).__init__(parent=parent) self.setupUi(self) self.core = LegendaryCoreSingleton() @@ -89,6 +89,7 @@ class UninstalledInfo(QWidget, Ui_GameInfo): self.game_actions_stack.setCurrentIndex(1) self.game_actions_stack.resize(self.game_actions_stack.minimumSize()) self.lbl_platform.setText(self.tr("Platforms")) + self.ue_default_name = ue_default_name def install_game(self): self.signals.install_game.emit(InstallOptionsModel(app_name=self.game.app_name)) @@ -105,7 +106,7 @@ class UninstalledInfo(QWidget, Ui_GameInfo): pixmap = get_pixmap(game.app_name) if pixmap.isNull(): - pixmap = get_pixmap(self.parent().parent().parent().ue_name) + pixmap = get_pixmap(self.ue_default_name) w = 200 pixmap = pixmap.scaled(w, int(w * 4 / 3)) self.image.setPixmap(pixmap)