Store: Fix rebase errors

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:
+            if item.promotions is not None:
-                start_date = item.promotions.upcomingPromotionalOffers[0].promotionalOffers[0].startDate
+                if not item.promotions.promotionalOffers:
-            else:
+                    start_date = item.promotions.upcomingPromotionalOffers[0].promotionalOffers[0].startDate
-                start_date = item.promotions.promotionalOffers[0].promotionalOffers[0].startDate
+                else:
+                    start_date = item.promotions.promotionalOffers[0].promotionalOffers[0].startDate
 
-            if start_date > date:
+                if start_date > date:
-                free_next.append(item)
+                    free_next.append(item)
 
         # free games now
         self.free_games_now.setVisible(bool(free_now))

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

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)
         )

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())

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;