From 1fab13fd920c52a85bf66f5d0cc8882e53b133c6 Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Wed, 21 Feb 2024 21:39:33 +0200 Subject: [PATCH] Store: Fix rebase errors --- rare/components/tabs/store/landing.py | 13 +++++++------ rare/components/tabs/store/widgets/details.py | 8 ++++---- rare/components/tabs/store/widgets/items.py | 2 +- rare/components/tabs/store/wishlist.py | 6 +++--- rare/resources/resources.py | Bin 3601126 -> 3601126 bytes rare/resources/static_css/__init__.py | Bin 4331 -> 4475 bytes rare/resources/static_css/stylesheet.qss | 5 +++++ .../stylesheets/ChildOfMetropolis/__init__.py | Bin 26680 -> 26680 bytes .../stylesheets/RareStyle/__init__.py | Bin 26642 -> 26642 bytes 9 files changed, 20 insertions(+), 14 deletions(-) diff --git a/rare/components/tabs/store/landing.py b/rare/components/tabs/store/landing.py index a8582697..75821b23 100644 --- a/rare/components/tabs/store/landing.py +++ b/rare/components/tabs/store/landing.py @@ -142,13 +142,14 @@ class LandingWidget(QWidget, SideTabContents): except KeyError as e: logger.warning(str(e)) - if not item.promotions.promotionalOffers: - start_date = item.promotions.upcomingPromotionalOffers[0].promotionalOffers[0].startDate - else: - start_date = item.promotions.promotionalOffers[0].promotionalOffers[0].startDate + if item.promotions is not None: + if not item.promotions.promotionalOffers: + start_date = item.promotions.upcomingPromotionalOffers[0].promotionalOffers[0].startDate + else: + start_date = item.promotions.promotionalOffers[0].promotionalOffers[0].startDate - if start_date > date: - free_next.append(item) + if start_date > date: + free_next.append(item) # free games now self.free_games_now.setVisible(bool(free_now)) diff --git a/rare/components/tabs/store/widgets/details.py b/rare/components/tabs/store/widgets/details.py index 3051845c..7b83bacf 100644 --- a/rare/components/tabs/store/widgets/details.py +++ b/rare/components/tabs/store/widgets/details.py @@ -17,7 +17,7 @@ from rare.components.tabs.store.api.models.response import CatalogOfferModel from rare.components.tabs.store.store_api import StoreAPI from rare.models.image import ImageSize from rare.ui.components.tabs.store.details import Ui_DetailsWidget -from rare.utils.misc import icon +from rare.utils.misc import qta_icon from rare.widgets.elide_label import ElideLabel from rare.widgets.side_tab import SideTabWidget, SideTabContents from .image import LoadingImageWidget @@ -56,7 +56,7 @@ class DetailsWidget(QWidget, SideTabContents): self.requirements_tabs.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) self.ui.requirements_layout.addWidget(self.requirements_tabs) - self.ui.back_button.setIcon(icon("fa.chevron-left")) + self.ui.back_button.setIcon(qta_icon("fa.chevron-left")) self.ui.back_button.clicked.connect(self.back_clicked) self.setDisabled(False) @@ -207,10 +207,10 @@ class DetailsWidget(QWidget, SideTabContents): continue name = name.replace("link", "").lower() if name == "homepage": - icn = icon("mdi.web", "fa.search", scale_factor=1.5) + icn = qta_icon("mdi.web", "fa.search", scale_factor=1.5) else: try: - icn = icon(f"mdi.{name}", f"fa.{name}", scale_factor=1.5) + icn = qta_icon(f"mdi.{name}", f"fa.{name}", scale_factor=1.5) except Exception as e: logger.error(str(e)) continue diff --git a/rare/components/tabs/store/widgets/items.py b/rare/components/tabs/store/widgets/items.py index 86e61f5e..d89b47f1 100644 --- a/rare/components/tabs/store/widgets/items.py +++ b/rare/components/tabs/store/widgets/items.py @@ -132,7 +132,7 @@ class WishlistItemWidget(ItemWidget): ) self.delete_button = QPushButton(self) - self.delete_button.setIcon(icon("mdi.delete", color="white")) + self.delete_button.setIcon(qta_icon("mdi.delete", color="white")) self.delete_button.clicked.connect( lambda: self.delete_from_wishlist.emit(self.catalog_game) ) diff --git a/rare/components/tabs/store/wishlist.py b/rare/components/tabs/store/wishlist.py index 2eb173a9..a469a978 100644 --- a/rare/components/tabs/store/wishlist.py +++ b/rare/components/tabs/store/wishlist.py @@ -2,10 +2,10 @@ from typing import List from PyQt5.QtCore import pyqtSignal, Qt, pyqtSlot from PyQt5.QtGui import QShowEvent -from PyQt5.QtWidgets import QMessageBox, QWidget, QScrollArea, QFrame, QSizePolicy +from PyQt5.QtWidgets import QMessageBox, QWidget, QSizePolicy from rare.ui.components.tabs.store.wishlist import Ui_Wishlist -from rare.utils.misc import icon +from rare.utils.misc import qta_icon from rare.widgets.flow_layout import FlowLayout from rare.widgets.side_tab import SideTabContents from rare.widgets.sliding_stack import SlidingStackedWidget @@ -64,7 +64,7 @@ class WishlistWidget(QWidget, SideTabContents): self.ui.sort_cb.currentIndexChanged.connect(self.sort_wishlist) self.ui.filter_cb.currentIndexChanged.connect(self.set_filter) self.ui.reload_button.clicked.connect(self.update_wishlist) - self.ui.reload_button.setIcon(icon("fa.refresh", color="white")) + self.ui.reload_button.setIcon(qta_icon("fa.refresh", color="white")) self.ui.reverse.stateChanged.connect( lambda: self.sort_wishlist(sort=self.ui.sort_cb.currentIndex()) diff --git a/rare/resources/resources.py b/rare/resources/resources.py index a45a4bb1698992e1f2cc07c09ae1c162c07deb7c..f3fc0f5ba66275ce94e32ef767f9075c99f8e53c 100644 GIT binary patch delta 139 zcmWN=$qj-)06@{8qPU(wD2!GI~D~Da;=?Y%s6@ delta 139 zcmWN=Q8EGn007WgT7<0#5mBL1h_$;p%>H$WKKpn_aRD>UbeO)|zwXe!nOAH#K~Y`` z95_@FI&$np)u}V*A~kgl7cMnjxpt%F)}6L{4>}$_>FViw_TtsR(8!yyiFY49O?~+m a`;kaj+21bu%@@h69OsL9y#C*1X}AY3M=&7( diff --git a/rare/resources/static_css/__init__.py b/rare/resources/static_css/__init__.py index 0e139851eb4be14a74e8bc96bce0efb5fa4a8a78..2e4d9ccf0ad9f3d200bd21caf4da863eec19bb3e 100644 GIT binary patch literal 4475 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 XUxadfeRY7pXaA4&_Qx^!+V#=DJ&&LH diff --git a/rare/resources/static_css/stylesheet.qss b/rare/resources/static_css/stylesheet.qss index 051a419d..df10c32d 100644 --- a/rare/resources/static_css/stylesheet.qss +++ b/rare/resources/static_css/stylesheet.qss @@ -1,6 +1,11 @@ /* This file is auto-generated from "stylesheet.py". DO NOT EDIT!!! */ +QPushButton[flat="true"] { + border: 0px; + border-radius: 5px; + background-color: rgba(255, 255, 255, 5%); +} QLabel#InfoLabel { color: #999; font-style: italic; diff --git a/rare/resources/stylesheets/ChildOfMetropolis/__init__.py b/rare/resources/stylesheets/ChildOfMetropolis/__init__.py index effb5639b1fca9c2f44d9dbc8f891bdf0b68ea96..73407d65408148e9bfc00ec2a454221ed0bf19c9 100644 GIT binary patch delta 40 wcmdmSfpNzL#trL|c@twQQcPniER$m@EDR^#i+7(Km!djZBf)%gT*@tG0Ai*PkpKVy delta 40 wcmdmSfpNzL#trL|c`afpEK*`BjFMt1k`gE1i+7(Km!djZBf)%gT*@tG0As-ry#N3J diff --git a/rare/resources/stylesheets/RareStyle/__init__.py b/rare/resources/stylesheets/RareStyle/__init__.py index b987bee262da6f386d765ec9cc7a49f4a6adb1dc..dfc98d1937b496919b939f7c1988da284f1ea1b0 100644 GIT binary patch delta 32 ocmbPqfpO9W#tj|GyooUtDW)+MmdP;{7KW2|#Jg|4lWfKU0Nuw82LJ#7 delta 32 ocmbPqfpO9W#tj|GycRJPW(F}87M3v;$>x)H#Jg|4lWfKU0M<7Qu>b%7