diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Rare/Components/TabWidget.py b/Rare/Components/TabWidget.py index 78d92a7d..b4b66134 100644 --- a/Rare/Components/TabWidget.py +++ b/Rare/Components/TabWidget.py @@ -14,7 +14,6 @@ class TabWidget(QTabWidget): self.game_list = Games(core) self.addTab(self.game_list, self.tr("Games")) - self.downloadTab = DownloadTab(core) self.addTab(self.downloadTab, "Downloads") self.downloadTab.finished.connect(self.game_list.game_list.update_list) @@ -26,11 +25,9 @@ class TabWidget(QTabWidget): self.account = QWidget() self.addTab(self.account, "") self.setTabEnabled(3, False) - # self.settings = SettingsTab(core) self.settings = QWidget() self.addTab(self.settings, QIcon(style_path + "/Icons/settings.png"), "") - self.tabBar().setTabButton(3, self.tabBar().RightSide, TabButtonWidget(core)) def resizeEvent(self, event): diff --git a/Rare/Components/Tabs/Games/GameWidgetInstalled.py b/Rare/Components/Tabs/Games/GameWidgetInstalled.py index f2b84c5c..cdab9256 100644 --- a/Rare/Components/Tabs/Games/GameWidgetInstalled.py +++ b/Rare/Components/Tabs/Games/GameWidgetInstalled.py @@ -50,17 +50,19 @@ class GameWidgetInstalled(QWidget): self.title_label = QLabel(f"

{game.title}

") self.title_label.setWordWrap(True) - self.title_label.setFixedWidth(180) + self.title_label.setFixedWidth(175) minilayout = QHBoxLayout() self.title_label.setObjectName("game_widget") minilayout.addWidget(self.title_label) # minilayout.addStretch(1) - self.menu_btn = QPushButton(QIcon(style_path + "/Icons/menu.png"), "") + self.menu_btn = QPushButton() + self.menu_btn.setIcon(QIcon(style_path + "/Icons/menu.png")) + self.menu_btn.setObjectName("installed_menu_button") self.menu = Menu() self.menu.action.connect(self.menu_action) self.menu_btn.setMenu(self.menu) self.menu_btn.setObjectName("menu") - self.menu_btn.setFixedWidth(10) + self.menu_btn.setFixedWidth(17) minilayout.addWidget(self.menu_btn) minilayout.addStretch(1) self.layout.addLayout(minilayout) diff --git a/Rare/Components/Tabs/Games/GameWidgetUninstalled.py b/Rare/Components/Tabs/Games/GameWidgetUninstalled.py index f7c508cc..ef5fe6a4 100644 --- a/Rare/Components/Tabs/Games/GameWidgetUninstalled.py +++ b/Rare/Components/Tabs/Games/GameWidgetUninstalled.py @@ -11,6 +11,7 @@ from legendary.models.game import Game from Rare.utils.Dialogs.InstallDialog import InstallDialog from Rare.utils.QtExtensions import ClickableLabel from Rare.utils.RareConfig import IMAGE_DIR +from Rare.utils.utils import download_image logger = getLogger("Uninstalled") @@ -29,18 +30,20 @@ class GameWidgetUninstalled(QWidget): else: logger.warning(f"No Image found: {self.game.app_title}") pixmap = None + + if pixmap.isNull(): + logger.info(game.app_title + " has a corrupt image.") + download_image(game, force=True) + pixmap = QPixmap(f"{IMAGE_DIR}/{game.app_name}/UninstalledArt.png") + if pixmap: w = 200 pixmap = pixmap.scaled(w, int(w * 4 / 3)) self.image = ClickableLabel() self.image.setPixmap(pixmap) self.layout.addWidget(self.image) + self.title_label = QLabel(f"

{game.app_title}

") - self.title_label.setStyleSheet(""" - QLabel{ - text-align: center; - } - """) self.title_label.setWordWrap(True) self.layout.addWidget(self.title_label) diff --git a/Rare/Components/Tabs/Games/GamesTab.py b/Rare/Components/Tabs/Games/GamesTab.py index 4830a291..07470c77 100644 --- a/Rare/Components/Tabs/Games/GamesTab.py +++ b/Rare/Components/Tabs/Games/GamesTab.py @@ -44,7 +44,6 @@ class GameListHeadBar(QWidget): self.layout.addWidget(self.list_view) self.view = QCheckBox("Icon view") self.layout.addWidget(self.view) - self.refresh_list = QPushButton() self.refresh_list.setIcon(self.style().standardIcon(getattr(QStyle, "SP_BrowserReload"))) # Reload icon self.layout.addWidget(self.refresh_list) diff --git a/Rare/Main.py b/Rare/Main.py index c20ad0e0..4f2bd7b9 100644 --- a/Rare/Main.py +++ b/Rare/Main.py @@ -24,7 +24,6 @@ core = LegendaryCore() def main(): app = QApplication(sys.argv) - # Translator translator = QTranslator() lang = get_lang() diff --git a/Rare/Styles/RareStyle.qss b/Rare/Styles/RareStyle.qss index 7b5d2739..b51f213b 100644 --- a/Rare/Styles/RareStyle.qss +++ b/Rare/Styles/RareStyle.qss @@ -58,4 +58,7 @@ QCheckBox::indicator:checked { } #list_widget{ border-top: 2px solid white; +} +QPushButton:hover#installed_menu_button{ + background-color: green; } \ No newline at end of file diff --git a/Rare/Styles/__init__.py b/Rare/Styles/__init__.py deleted file mode 100644 index 8b137891..00000000 --- a/Rare/Styles/__init__.py +++ /dev/null @@ -1 +0,0 @@ -