Merge pull request #57 from ljzloser/master

更新界面优化

Author: eee555

media/unfold.png

@@ -2,8 +2,8 @@
     QSizePolicy, QPushButton, QFrame, QMessageBox, QFormLayout, QProgressDialog, QTextEdit, QComboBox
 from githubApi import GitHub, Release, SourceManager, PingThread
 from PyQt5.QtCore import QObject, pyqtSlot, Qt, pyqtSignal, QUrl, QPropertyAnimation, \
-    QRect, QSize, pyqtProperty, QVariantAnimation,QDateTime
-from PyQt5.QtGui import QDesktopServices, QFont, QIcon, QPainter, QPixmap, QPaintEvent
+    QRect, QSize, pyqtProperty, QVariantAnimation,QDateTime,QEvent,QEasingCurve
+from PyQt5.QtGui import QDesktopServices, QFont, QIcon, QMouseEvent, QPainter, QPixmap, QPaintEvent,QEnterEvent
 
 
 class AnimationButton(QPushButton):
@@ -14,6 +14,7 @@ def __init__(self, parent=None):
         self.animation = QVariantAnimation(self)
         self.animation.valueChanged.connect(self.setRotate)
         self.__rotate = 0
+        self.setFixedSize(20, 20)
 
     def rotate(self):
         return self.__rotate
@@ -27,11 +28,13 @@ def paintEvent(self, event):
         super().paintEvent(event)
         if self.pixmap is not None:
             painter = QPainter(self)
-            painter.setRenderHint(QPainter.RenderHint.Antialiasing)
-            painter.translate(self.width() / 2, self.height() / 2)
+            painter.setRenderHint(QPainter.Antialiasing)
+            painter.translate(self.width() // 2, self.height() // 2)
+            size = self.width() if self.width() < self.height() else self.height()
             painter.rotate(self.rotate())
-            painter.drawPixmap(-(self.width()-10) // 2, -(self.height()-10) //
-                               2, self.pixmap.scaled(self.width() - 10, self.height() - 10))
+            painter.drawPixmap(-size// 2, -size //
+                               2, self.pixmap.scaled(size,size))
+            self.setMask(self.pixmap.scaled(size,size).mask())
 
     def animationStart(self, check):
         if check:
@@ -51,6 +54,7 @@ def __init__(self, release: Release, mode=">", parent=None, r_path=""):
         super().__init__(parent)
         self.release: Release = release
         self.showButton = AnimationButton()
+        self.showButton.setToolTip(self.tr("unfold"))
         self.showButton.setCheckable(True)
         self.showButton.pixmap = QPixmap(str(r_path.with_name('media').joinpath('unfold.png')).replace("\\", "/"))
         self.dateTimeLabel = QLabel()
@@ -130,9 +134,9 @@ def initUi(self):
         else:
             # 样式表红色背景
             rgbStr = "rgb(249, 179, 163)"
-        # label字体微软雅黑Ui,大小13
+        # label字体微软雅黑Ui,大小13,圆角 8
         self.setStyleSheet(
-            f"QFrame{{background-color:{rgbStr}; font-family:Microsoft YaHei UI; font-size:14px;}}")
+            f"QFrame{{background-color:{rgbStr}; font-family:Microsoft YaHei UI; font-size:14px; border-radius: 5px;}}")
 
     def initConnect(self):
         self.showButton.clicked.connect(self.showButtonClicked)
@@ -141,19 +145,24 @@ def initConnect(self):
     def showButtonClicked(self, checked: bool):
         self.formWidget.setVisible(True)
         animation = QPropertyAnimation(self.formWidget, b"size", self)
+        easingCurveType = QEasingCurve.Type.OutBack if checked else QEasingCurve.Type.InBack
+        animation.setEasingCurve(easingCurveType)
         animation2 = QPropertyAnimation(self, b"size", self)
+        animation2.setEasingCurve(easingCurveType)
         animation.setDuration(300)
         animation2.setDuration(300)
         start: QSize = None
         end: QSize = None
         start1: QSize = None
         end1: QSize = None
         if checked:
+            self.showButton.setToolTip(QObject.tr(self, "fold"))
             start = QSize(self.width(), 0)
             start1 = QSize(self.width(), self.titleWidget.height())
             end = QSize(self.width(), self.formWidget.sizeHint().height())
             end1 = QSize(self.width(), self.sizeHint().height())
         else:
+            self.showButton.setToolTip(QObject.tr(self, "unfold"))
             start = QSize(self.width(), self.formWidget.sizeHint().height())
             start1 = QSize(self.width(), self.sizeHint().height())
             end = QSize(self.width(), 0)
@@ -174,9 +183,48 @@ def resWidth(self):
         area:QScrollArea = self.parentWidget().parentWidget().parentWidget()
         width = area.verticalScrollBar().width() if area.verticalScrollBar().isVisible() else 0
         self.resize(area.width() - width, self.height())
+        
+    def mousePressEvent(self, a0: QMouseEvent) -> None:
+        super().mousePressEvent(a0)
+        if self.titleWidget.geometry().contains(a0.pos()) and a0.button() == Qt.LeftButton:
+            self.showButton.click()
+    def __setStyleSheet(self,isEnter:bool):
+        rgbStr = ""
+        if self.mode == ">":
+            # 样式表绿色
+            rgbStr = "rgb(200,255,250)"
+        elif self.mode == "=":
+            # 样式表蓝色
+            rgbStr = "rgb(200,216,230)"
+        else:
+            # 样式表红色背景
+            rgbStr = "rgb(249, 179, 163)"
+
+        
+        if isEnter:
+            # label字体微软雅黑Ui,大小13,圆角 8,1px的蓝色边框,只针对ReleaseFrame
+            self.setStyleSheet(
+                f"""QFrame{{background-color:{rgbStr}; font-family:Microsoft YaHei UI; font-size:14px; border-radius: 5px;}}
+                ReleaseFrame{{border: 1px solid blue;}}
+                """)
+        else:
+            # label字体微软雅黑Ui,大小13,圆角 8
+            self.setStyleSheet(
+                f"QFrame{{background-color:{rgbStr}; font-family:Microsoft YaHei UI; font-size:14px; border-radius: 5px;}}")
+    def enterEvent(self, a0: QEnterEvent) -> None:
+        self.__setStyleSheet(True)
+        return super().enterEvent(a0)
+    
+    def leaveEvent(self, a0: QEvent) -> None:
+        self.__setStyleSheet(False)
+        return super().leaveEvent(a0)
+        
 class CheckUpdateGui(QDialog):
     def __init__(self, github: GitHub, parent=None):
         super().__init__(parent.mainWindow)
+        self.setWindowTitle(QObject.tr(self, "CheckUpdate"))
+        # 去掉问号
+        self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)
         self.r_path = parent.r_path
         self.github: GitHub = github
         self.github.setParent(self)
@@ -257,6 +305,8 @@ def checkUpdate(self, releases: list[Release]):
         widget = QWidget()
         layout = QVBoxLayout()
         layout.setContentsMargins(0, 0, 0, 0)
+        # 间隔设置为2px
+        layout.setSpacing(2)
         for release in releases:
             frame = ReleaseFrame(
                 release, self.github.compareVersion(release.tag_name), r_path=self.r_path)
@@ -273,6 +323,9 @@ def checkUpdate(self, releases: list[Release]):
         self.releaseArea.setWidget(widget)
 
     def showError(self, msg: str):
+        widget = self.releaseArea.widget()
+        if widget is not None:
+            widget.deleteLater()
         QMessageBox.critical(self, QObject.tr(self, "Error"), msg)
 
     def showDownloadDialog(self, release: Release):

src/CheckUpdateGui.py

@@ -226,6 +226,7 @@ def isNeedUpdate(self,isAsync:bool = True) -> bool | str | None:
 
         nam = QNetworkAccessManager(self)
         request = QNetworkRequest(QUrl(self.latestReleaseUrl))
+        request.setAttribute(QNetworkRequest.Attribute.FollowRedirectsAttribute,True)
         reply = nam.get(request)
         reply.setObjectName(str(uuid.uuid1()))
         self.__replyDict[reply.objectName()] = reply
@@ -269,6 +270,7 @@ def latestRelease(self,isAsync:bool = True) -> Release | str | None:
 
         nam = QNetworkAccessManager(self)
         request = QNetworkRequest(QUrl(self.latestReleaseUrl))
+        request.setAttribute(QNetworkRequest.Attribute.FollowRedirectsAttribute,True)
         reply = nam.get(request)
         reply.setObjectName(str(uuid.uuid1()))
         self.__replyDict[reply.objectName()] = reply
@@ -307,6 +309,7 @@ def releases(self,isAsync:bool = True) -> list | str | None:
         """
         nam = QNetworkAccessManager(self)
         request = QNetworkRequest(QUrl(self.releasesUrl))
+        request.setAttribute(QNetworkRequest.Attribute.FollowRedirectsAttribute,True)
         reply = nam.get(request)
         reply.setObjectName(str(uuid.uuid1()))
         self.__replyDict[reply.objectName()] = reply