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 00000000..4f52b08e Binary files /dev/null and b/Rare/utils/__pycache__/RareConfig.cpython-38.pyc differ diff --git a/Rare/utils/__pycache__/RareConfig.cpython-39.pyc b/Rare/utils/__pycache__/RareConfig.cpython-39.pyc new file mode 100644 index 00000000..8491728f Binary files /dev/null and b/Rare/utils/__pycache__/RareConfig.cpython-39.pyc differ diff --git a/Rare/utils/__pycache__/RareUtils.cpython-38.pyc b/Rare/utils/__pycache__/RareUtils.cpython-38.pyc new file mode 100644 index 00000000..9852e714 Binary files /dev/null and b/Rare/utils/__pycache__/RareUtils.cpython-38.pyc differ diff --git a/Rare/utils/__pycache__/RareUtils.cpython-39.pyc b/Rare/utils/__pycache__/RareUtils.cpython-39.pyc new file mode 100644 index 00000000..09ea6d99 Binary files /dev/null and b/Rare/utils/__pycache__/RareUtils.cpython-39.pyc differ diff --git a/Rare/utils/__pycache__/__init__.cpython-38.pyc b/Rare/utils/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..f5c32051 Binary files /dev/null and b/Rare/utils/__pycache__/__init__.cpython-38.pyc differ diff --git a/Rare/utils/__pycache__/__init__.cpython-39.pyc b/Rare/utils/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..92205ccf Binary files /dev/null and b/Rare/utils/__pycache__/__init__.cpython-39.pyc differ diff --git a/Rare/utils/__pycache__/legendaryConfig.cpython-38.pyc b/Rare/utils/__pycache__/legendaryConfig.cpython-38.pyc new file mode 100644 index 00000000..8517ae07 Binary files /dev/null and b/Rare/utils/__pycache__/legendaryConfig.cpython-38.pyc differ diff --git a/Rare/utils/__pycache__/legendaryConfig.cpython-39.pyc b/Rare/utils/__pycache__/legendaryConfig.cpython-39.pyc new file mode 100644 index 00000000..641c424f Binary files /dev/null and b/Rare/utils/__pycache__/legendaryConfig.cpython-39.pyc differ diff --git a/Rare/utils/__pycache__/legendaryUtils.cpython-38.pyc b/Rare/utils/__pycache__/legendaryUtils.cpython-38.pyc new file mode 100644 index 00000000..d6daa7f3 Binary files /dev/null and b/Rare/utils/__pycache__/legendaryUtils.cpython-38.pyc differ diff --git a/Rare/utils/__pycache__/legendaryUtils.cpython-39.pyc b/Rare/utils/__pycache__/legendaryUtils.cpython-39.pyc new file mode 100644 index 00000000..465b9c6c Binary files /dev/null and b/Rare/utils/__pycache__/legendaryUtils.cpython-39.pyc differ 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" ]