From 90b8d6a5413cf6af65bafe19698e5821c0f1ea8b Mon Sep 17 00:00:00 2001
From: loathingKernel <142770+loathingKernel@users.noreply.github.com>
Date: Mon, 20 May 2024 16:47:48 +0300
Subject: [PATCH] Utils: Remove deprecated widgets

WaitingSpinner replaced by LoadingWidget
ImageLabel replaced by ImageWidget
---
 rare/resources/static_css/__init__.py    | Bin 4475 -> 4343 bytes
 rare/resources/static_css/stylesheet.py  |   8 ----
 rare/resources/static_css/stylesheet.qss |   4 --
 rare/utils/extra_widgets.py              |  57 -----------------------
 4 files changed, 69 deletions(-)

diff --git a/rare/resources/static_css/__init__.py b/rare/resources/static_css/__init__.py
index 2e4d9ccf0ad9f3d200bd21caf4da863eec19bb3e..8c39ffdce26cc65e83fcde6cf2f7f31b4ea69c3a 100644
GIT binary patch
literal 4343
zcmcJS%Wo4`6o>czD+XAQR1kT_9(#<+0;N*LrYfk91wm*$a|c`{cCd%k{P+F7V>=H5
zs#sv@>b}nXo%cE8N7>V#o@ULeT`b=}%Rcqp)5?><;8FHEZC0PwP0CjDe^S#+lm?Hu
zI9;c@Pi;2;{4D$9L%Jb6U0qx*&eJ;UR_pBd&#(G2J9^b;SLI1wo)pLN`0p35e|!1c
zuMe^p=jU1Tp<cdEo9v=)Q?^)U{fEUS>ww7qU2r{5+4*YIKNt+U_3C1exVX4nt^4d%
zf4W+y!Qf;6ZoL=uU0e5c_B@+EJR6*Chr|6S&bIYze{wjl&$jc~*>+l;ZD$SZ@@!j9
z81311+(AEL=6ybfhO;!~j!`w@jG!KK+HzZhFl0X$k^LN$hB1>Gno(j6O=8s2<Ra8_
zUcqMqWzIZgo<q^XvqG)}{~>batP2oI=;w@_(RCtpB5+f|djg+2XU|#7%fxxj7=fys
zamV?T(Rkj9piWZ};5h|l3O{u&cvV6<W1eBV3c04B7u<DdFlIj*i7-=N@N-UvtPAD}
ziX2K`O4*=64yV?=76(Zgim=0s*F$a+FG_AkuCYgsEHm~Ua)i#FtEn2X)+V4JLjiRG
z{s`R<BO!~3E&S)cgnGi5YXk1oVuUQ?Yb}zPoH*<A2GkK$H3%USv-T-K7|BtqLdzN%
z=3tlVkHqnU89#4lP`B#N+-Nyo7+tM*$TvZw6p?9!7>f;B=!;wl;n(nb%v!w*UMJ3s
zwy-X=T7O(BL&K@D)^ehs@o`vEJ~glO^qg5+bPO_L+wn$Z-hg22>jUGlLzajlDD;0=
z6#gO=YO1x7O`3`^o`_)9=*<xnO6YnDrE!^qJkbuEDbtiWhqrcXnJ3fGf}4Xc#5EVB
zPT0Um??h$R4%(#x*=!p_i#Et$CYA1>Fv~>f7&+RtXl7oRFXqpT{RBEQOON7V5X|=}
zFQPWUuY}4>GNP2JMsMXX+QQr1b!v=uWEu$Ssvoq+3@WplSc{A*c`4t-dGO}7`69v)
z8X^pYN(3n42A<ZQhBM_bA0o0u0L`2=qtvQJZu|v8U~_9W>nW{drpsFdbHVDOO{CR=
z=7=>5?jY!?sE1IQ+1k5926M0Cb<`);HU5}#7nWyTgV2NwIS58`c!;%?_TW|d>v!vh
zdElto8#ms~hst0UX=gK5FIG@krw@KmU*pBxG*8Vg{bZa{J3z1tSd++-s3unW$X8I6
zE6|}aldO|r8)PzHce!Z<YZ-CX*$S`DR(v&>A;Ux)A+=GRb`}h)Pr?q?r?~MoNP4!`
z4^SH?1xQipIk#p;4d>k2P31=my`#>`VI*1gB7#AvKyQ&}pG8rhq7y+Al{PGC^q58V
ztRXyVW+Qx}{kc;!_my&S7V!bS{v&^p!A_@?Ru3aa3mKpE#OPP<tw7cXtI-s>@M3g7
zvK$1x=ZRHLf7?Io3G!5{%9q@k8)|Fyw@VFoHWC3!^Dp`qbM$Peuyf=haTk5vs#al}
z94=IrsC48s2xhFF(g)T_tr-46dimS+tni-OiL4>o&VG)^MPO%z(V7u+@<PHn6k69h
zrA>?v&r38kMn-5(9R;CdWv@_oBV2ur+^{{bqi%p?7xcBgGu|LOSpdRNoy1cHD3wQ9
zT#xmQi0aO;`$nIDgLy&)1VNpQb+dJf23Az7x%D7CsNS4S*xQ}#7s_ha+hvwnWo5B8
z74n3au^*WYrJi<gRrC90!tfhMpJ8QWhzbWTc@_~&7l}+#a^*1d>^w#sUp>)3{f3H|
zjasdL<*ydjLgP_egrv&GD~ER@WU?As+pWrc#UX>a=Z$%3oS8{xb96S&BQ8PpYt0;q
z$O6R<K%RhLMK|A~!^2bQ9W#(iU$V9n`X!)T(X+6Lvgc8wrcl{4{8sVXQvLYCimdlb
z&{&L0&waz*j%Z&CYwmiMJ8sO2p-5T@er7gVHh6gVJ9$}Oq`TkA5!pjtb?Bz9#2~s^
zJ;{>83b{Oqdg0As5BE4n0%t9LdvBh(zd_>5RZPz9GTI!y4qR?ldwe|>c-TK?ExN<o
z?TM<}=SF?p@88?8VvjX$zf+zsEVJp?pPK&NReskzF!SN{K<MkW=X>DmvuL2#yYG2f
z9L#Wd?WbU@@AJ4T17-dj$`n6JnH$CSzB>qgJ^!Df?x}nI@|)P-V~|^J!hF_O>$_h}
z`)|>`$*$6Rvsf*$)0@SzKe{@Of3R2nCEfkcJo)(7j^yb0WOI4G=#L(sJU)IqSacbG
zKo8G<&fb(yvg%1TeEV#W@mn{|_2u&{kF(o<Sa;zD+xv&a;2@oE($|2B?*l3ZgEk@P
z%jKd!{Hfm@9q*72`n^u?7n?q<4+OvPU;5~l{7=3j<J~i>%H0$Hk00-upPr|B`RVci
Re~<s4%k__w;7ip9{{b-Yr|kd$

literal 4475
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
Q$NnFy&5vX7wd;d_0e{WZOaK4?

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