diff --git a/rare/components/tabs/store/wishlist.py b/rare/components/tabs/store/wishlist.py index b3f7f3b9..06a2d41d 100644 --- a/rare/components/tabs/store/wishlist.py +++ b/rare/components/tabs/store/wishlist.py @@ -8,27 +8,28 @@ from .shop_api_core import ShopApiCore from .game_widgets import WishlistWidget -class Wishlist(QWidget, Ui_Wishlist, SideTabContents): +class Wishlist(QWidget, SideTabContents): show_game_info = pyqtSignal(dict) update_wishlist_signal = pyqtSignal() def __init__(self, api_core: ShopApiCore, parent=None): super(Wishlist, self).__init__(parent=parent) self.api_core = api_core - self.setupUi(self) + self.ui = Ui_Wishlist() + self.ui.setupUi(self) self.setEnabled(False) self.wishlist = [] self.widgets = [] - self.sort_cb.currentIndexChanged.connect( + self.ui.sort_cb.currentIndexChanged.connect( lambda i: self.set_wishlist(self.wishlist, i) ) - self.filter_cb.currentIndexChanged.connect(self.set_filter) - self.reload_button.clicked.connect(self.update_wishlist) - self.reload_button.setIcon(icon("fa.refresh", color="white")) + 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.reverse.stateChanged.connect( - lambda: self.set_wishlist(sort=self.sort_cb.currentIndex()) + self.ui.reverse.stateChanged.connect( + lambda: self.set_wishlist(sort=self.ui.sort_cb.currentIndex()) ) def update_wishlist(self): @@ -61,9 +62,9 @@ class Wishlist(QWidget, Ui_Wishlist, SideTabContents): w.setVisible(True) if count == 0: - self.no_games_label.setVisible(True) + self.ui.no_games_label.setVisible(True) else: - self.no_games_label.setVisible(False) + self.ui.no_games_label.setVisible(False) def set_wishlist(self, wishlist=None, sort=0): if wishlist and wishlist[0] == "error": @@ -103,17 +104,17 @@ class Wishlist(QWidget, Ui_Wishlist, SideTabContents): self.widgets.clear() if len(sorted_list) == 0: - self.no_games_label.setVisible(True) + self.ui.no_games_label.setVisible(True) else: - self.no_games_label.setVisible(False) + self.ui.no_games_label.setVisible(False) - if self.reverse.isChecked(): + if self.ui.reverse.isChecked(): sorted_list.reverse() for game in sorted_list: w = WishlistWidget(game["offer"]) self.widgets.append(w) - self.list_layout.addWidget(w) + self.ui.list_layout.addWidget(w) w.open_game.connect(self.show_game_info.emit) w.delete_from_wishlist.connect(self.delete_from_wishlist) self.setEnabled(True) diff --git a/rare/ui/components/tabs/store/wishlist.py b/rare/ui/components/tabs/store/wishlist.py index 4e9fd461..4a0fb0a2 100644 --- a/rare/ui/components/tabs/store/wishlist.py +++ b/rare/ui/components/tabs/store/wishlist.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'rare/ui/components/tabs/store/wishlist.ui' # -# Created by: PyQt5 UI code generator 5.15.7 +# Created by: PyQt5 UI code generator 5.15.9 # # WARNING: Any manual changes made to this file will be lost when pyuic5 is # run again. Do not edit this file unless you know what you are doing. @@ -18,12 +18,6 @@ class Ui_Wishlist(object): Wishlist.setWindowTitle("Wishlist") self.verticalLayout = QtWidgets.QVBoxLayout(Wishlist) self.verticalLayout.setObjectName("verticalLayout") - self.title_label = QtWidgets.QLabel(Wishlist) - font = QtGui.QFont() - font.setPointSize(15) - self.title_label.setFont(font) - self.title_label.setObjectName("title_label") - self.verticalLayout.addWidget(self.title_label) self.horizontalLayout = QtWidgets.QHBoxLayout() self.horizontalLayout.setObjectName("horizontalLayout") self.sort_label = QtWidgets.QLabel(Wishlist) @@ -79,7 +73,6 @@ class Ui_Wishlist(object): def retranslateUi(self, Wishlist): _translate = QtCore.QCoreApplication.translate - self.title_label.setText(_translate("Wishlist", "Wishlist")) self.sort_label.setText(_translate("Wishlist", "Sort by")) self.sort_cb.setItemText(0, _translate("Wishlist", "Name")) self.sort_cb.setItemText(1, _translate("Wishlist", "Price")) diff --git a/rare/ui/components/tabs/store/wishlist.ui b/rare/ui/components/tabs/store/wishlist.ui index 1b341623..a9560ec0 100644 --- a/rare/ui/components/tabs/store/wishlist.ui +++ b/rare/ui/components/tabs/store/wishlist.ui @@ -14,18 +14,6 @@ Wishlist - - - - - 15 - - - - Wishlist - - -