diff --git a/rare/resources/static_css/__init__.py b/rare/resources/static_css/__init__.py index 2e4d9ccf..8c39ffdc 100644 Binary files a/rare/resources/static_css/__init__.py and b/rare/resources/static_css/__init__.py differ diff --git a/rare/resources/static_css/stylesheet.py b/rare/resources/static_css/stylesheet.py index 43a7aece..e47d3f7b 100644 --- a/rare/resources/static_css/stylesheet.py +++ b/rare/resources/static_css/stylesheet.py @@ -196,14 +196,6 @@ css.QPushButton[css_name(ListWidget, "Button")].textAlign.setValue("left") css.QLabel[css_name(ListWidget, "InfoLabel")].color.setValue("#999") -# WaitingSpinner -from rare.utils.extra_widgets import WaitingSpinner -css.QLabel[css_name(WaitingSpinner)].setValues( - marginLeft="auto", - marginRight="auto", -) - - # SelectViewWidget from rare.utils.extra_widgets import SelectViewWidget css.QPushButton[css_name(SelectViewWidget, "Button")].setValues( diff --git a/rare/resources/static_css/stylesheet.qss b/rare/resources/static_css/stylesheet.qss index df10c32d..8abec794 100644 --- a/rare/resources/static_css/stylesheet.qss +++ b/rare/resources/static_css/stylesheet.qss @@ -108,10 +108,6 @@ QPushButton#ListWidgetButton { QLabel#ListWidgetInfoLabel { color: #999; } -QLabel#WaitingSpinner { - margin-left: auto; - margin-right: auto; -} QPushButton#SelectViewWidgetButton { border: none; background-color: transparent; diff --git a/rare/utils/extra_widgets.py b/rare/utils/extra_widgets.py index a1719765..81222f08 100644 --- a/rare/utils/extra_widgets.py +++ b/rare/utils/extra_widgets.py @@ -1,10 +1,8 @@ from logging import getLogger from PyQt5.QtCore import Qt, pyqtSignal -from PyQt5.QtGui import QPixmap, QImage, QMovie from PyQt5.QtWidgets import ( QStyle, - QLabel, QHBoxLayout, QWidget, QPushButton, @@ -12,21 +10,9 @@ from PyQt5.QtWidgets import ( ) from rare.utils.misc import qta_icon -from rare.utils.paths import cache_dir -from rare.utils.qt_requests import QtRequests logger = getLogger("ExtraWidgets") -# FIXME: move this? -class WaitingSpinner(QLabel): - def __init__(self, parent=None): - super(WaitingSpinner, self).__init__(parent=parent) - self.setObjectName(type(self).__name__) - self.setAlignment(Qt.AlignHCenter | Qt.AlignVCenter) - self.movie = QMovie(":/images/loader.gif") - self.setMovie(self.movie) - self.movie.start() - class SelectViewWidget(QWidget): toggled = pyqtSignal(bool) @@ -66,49 +52,6 @@ class SelectViewWidget(QWidget): self.toggled.emit(False) -class ImageLabel(QLabel): - image = None - img_size = None - name = "" - - def __init__(self, parent=None): - super(ImageLabel, self).__init__(parent=parent) - self.manager = QtRequests( - cache=str(cache_dir().joinpath("store")), - parent=self - ) - - def update_image(self, url, name="", size: tuple = (240, 320)): - self.setFixedSize(*size) - self.img_size = size - self.name = name - for c in r'<>?":|\/* ': - self.name = self.name.replace(c, "") - if self.img_size[0] > self.img_size[1]: - name_extension = "wide" - else: - name_extension = "tall" - self.name = f"{self.name}_{name_extension}.png" - self.manager.get(url, self.image_ready) - - def image_ready(self, data): - try: - self.setPixmap(QPixmap()) - except Exception: - logger.warning("C++ object already removed, when image ready") - return - image = QImage() - image.loadFromData(data) - image = image.scaled( - *self.img_size[:2], - Qt.KeepAspectRatio, - transformMode=Qt.SmoothTransformation, - ) - - pixmap = QPixmap().fromImage(image) - self.setPixmap(pixmap) - - class ButtonLineEdit(QLineEdit): buttonClicked = pyqtSignal()