update v.1.4.5

res/images.qrc

@@ -79,6 +79,10 @@
     <file>icon/cat_random.jpg</file>
     <file>icon/cat_leaderboard.jpg</file>
     <file>icon/new.svg</file>
+    <file>icon/vip.png</file>
+    <file>icon/svip.png</file>
+    <file>icon/nv.png</file>
+    <file>icon/icon_picacg.png</file>
   </qresource>
   <qresource prefix="icon">
     <file>theme/dark_pink/disabled/base.svg</file>

src/component/list/base_list_widget.py

@@ -26,7 +26,7 @@ def __init__(self, parent):
         if Setting.IsGrabGesture.value:
             QScroller.grabGesture(self, QScroller.LeftMouseButtonGesture)
             propertiesOne = QScroller.scroller(self).scrollerProperties()
-            print(propertiesOne.scrollMetric(propertiesOne.MousePressEventDelay))
+            # print(propertiesOne.scrollMetric(propertiesOne.MousePressEventDelay))
             propertiesOne.setScrollMetric(QScrollerProperties.MousePressEventDelay, 1)
             propertiesOne.setScrollMetric(QScrollerProperties.VerticalOvershootPolicy, QScrollerProperties.OvershootAlwaysOff)
             propertiesOne.setScrollMetric(QScrollerProperties.HorizontalOvershootPolicy, QScrollerProperties.OvershootAlwaysOff)
@@ -80,8 +80,8 @@ def wheelEvent(self, arg__1) -> None:
         if self.vScrollBar:
             self.vScrollBar.ScrollValue(-arg__1.angleDelta().y())
         else:
-            print(self.verticalScrollMode())
-            print(self.verticalScrollBar().singleStep())
+            # print(self.verticalScrollMode())
+            # print(self.verticalScrollBar().singleStep())
             return QListWidget.wheelEvent(self, arg__1)
 
     def OnActionTriggered(self):

src/component/list/user_list_widget.py

@@ -165,6 +165,7 @@ def AddNewChatItem(self, info, floor):
         iwidget.starButton.hide()
 
         # iwidget.commentLabel.setTextInteractionFlags(Qt.TextSelectableByKeyboard)
+        iwidget.commentLabel.setTextInteractionFlags(Qt.NoTextInteraction)
         iwidget.setToolTip(slogan)
         iwidget.id = id
         iwidget.commentLabel.setText(description)

src/component/scroll/smooth_scroll.py

@@ -52,7 +52,7 @@ def wheelEvent(self, e):
     def __smoothMove(self):
         """ 计时器溢出时进行平滑滚动 """
         totalDelta = 0
-        # 计算所有未处理完事件的滚动距离，定时器每溢出一次就将步数-1
+        # 计算所有未处理完事件的滚动距离，定时器每溢出 一次就将步数-1
         for i in self.stepsLeftQueue:
             totalDelta += self.__subDelta(i[0], i[1])
             i[1] -= 1
@@ -72,6 +72,7 @@ def __smoothMove(self):
                             Qt.ScrollBegin,
                             False
                             )
+            # print("old {}".format(self.verticalScrollBar().value()))
             QApplication.sendEvent(self.verticalScrollBar(), e)
         else:
             # 构造滚轮事件

src/config/config.py

@@ -52,9 +52,9 @@
 Issues2 = "https://hub.ggo.icu/tonquer/picacg-qt/issues"
 Issues3 = "https://hub.fastgit.xyz/tonquer/picacg-qt/issues"
 
-UpdateVersion = "v1.4.4"
-RealVersion = "v1.4.4"
-TimeVersion = "2023-3-19"
+UpdateVersion = "v1.4.5"
+RealVersion = "v1.4.5"
+TimeVersion = "2023-5-7"
 
 Waifu2xVersion = "1.1.6"
 

src/interface/ui_chat_new_room_msg.py

@@ -16,7 +16,8 @@
     QImage, QKeySequence, QLinearGradient, QPainter,
     QPalette, QPixmap, QRadialGradient, QTransform)
 from PySide6.QtWidgets import (QApplication, QGridLayout, QHBoxLayout, QLabel,
-    QSizePolicy, QSpacerItem, QVBoxLayout, QWidget)
+    QSizePolicy, QSpacerItem, QToolButton, QVBoxLayout,
+    QWidget)
 
 from component.label.head_label import HeadLabel
 import images_rc
@@ -25,7 +26,7 @@ class Ui_ChatNewRoomMsg(object):
     def setupUi(self, ChatNewRoomMsg):
         if not ChatNewRoomMsg.objectName():
             ChatNewRoomMsg.setObjectName(u"ChatNewRoomMsg")
-        ChatNewRoomMsg.resize(636, 299)
+        ChatNewRoomMsg.resize(749, 299)
         ChatNewRoomMsg.setStyleSheet(u"QWidget#widget{\n"
 "            border-image:url(:png/icon/skin_aio_friend_bubble_pressed.9.png) 50;\n"
 "			border-width: 45;\n"
@@ -70,16 +71,6 @@ def setupUi(self, ChatNewRoomMsg):
         self.gridLayout = QGridLayout()
         self.gridLayout.setSpacing(1)
         self.gridLayout.setObjectName(u"gridLayout")
-        self.nameLabel = QLabel(ChatNewRoomMsg)
-        self.nameLabel.setObjectName(u"nameLabel")
-        self.nameLabel.setMinimumSize(QSize(0, 20))
-        self.nameLabel.setMaximumSize(QSize(16777215, 30))
-        font = QFont()
-        font.setPointSize(12)
-        self.nameLabel.setFont(font)
-
-        self.gridLayout.addWidget(self.nameLabel, 0, 0, 1, 1)
-
         self.horizontalLayout = QHBoxLayout()
         self.horizontalLayout.setSpacing(6)
         self.horizontalLayout.setObjectName(u"horizontalLayout")
@@ -110,7 +101,7 @@ def setupUi(self, ChatNewRoomMsg):
         self.horizontalLayout.addItem(self.horizontalSpacer_2)
 
 
-        self.gridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 1)
+        self.gridLayout.addLayout(self.horizontalLayout, 2, 0, 1, 1)
 
         self.widget = QWidget(ChatNewRoomMsg)
         self.widget.setObjectName(u"widget")
@@ -135,6 +126,8 @@ def setupUi(self, ChatNewRoomMsg):
         self.replayLabel = QLabel(self.replayWidget)
         self.replayLabel.setObjectName(u"replayLabel")
         self.replayLabel.setMinimumSize(QSize(40, 50))
+        font = QFont()
+        font.setPointSize(12)
         self.replayLabel.setFont(font)
         self.replayLabel.setStyleSheet(u"padding-left:20px;\n"
 "padding-right:10px;")
@@ -182,7 +175,60 @@ def setupUi(self, ChatNewRoomMsg):
         self.verticalLayout_3.addWidget(self.infoLabel)
 
 
-        self.gridLayout.addWidget(self.widget, 4, 0, 1, 1)
+        self.gridLayout.addWidget(self.widget, 5, 0, 1, 1)
+
+        self.horizontalLayout_4 = QHBoxLayout()
+        self.horizontalLayout_4.setObjectName(u"horizontalLayout_4")
+        self.nameLabel = QLabel(ChatNewRoomMsg)
+        self.nameLabel.setObjectName(u"nameLabel")
+        self.nameLabel.setMinimumSize(QSize(0, 20))
+        self.nameLabel.setMaximumSize(QSize(16777215, 30))
+        self.nameLabel.setFont(font)
+
+        self.horizontalLayout_4.addWidget(self.nameLabel)
+
+        self.vipIcon = QToolButton(ChatNewRoomMsg)
+        self.vipIcon.setObjectName(u"vipIcon")
+        icon = QIcon()
+        icon.addFile(u":/png/icon/vip.png", QSize(), QIcon.Normal, QIcon.Off)
+        self.vipIcon.setIcon(icon)
+        self.vipIcon.setIconSize(QSize(32, 32))
+
+        self.horizontalLayout_4.addWidget(self.vipIcon)
+
+        self.managerIcon = QToolButton(ChatNewRoomMsg)
+        self.managerIcon.setObjectName(u"managerIcon")
+        icon1 = QIcon()
+        icon1.addFile(u":/png/icon/svip.png", QSize(), QIcon.Normal, QIcon.Off)
+        self.managerIcon.setIcon(icon1)
+        self.managerIcon.setIconSize(QSize(32, 32))
+
+        self.horizontalLayout_4.addWidget(self.managerIcon)
+
+        self.nvIcon = QToolButton(ChatNewRoomMsg)
+        self.nvIcon.setObjectName(u"nvIcon")
+        icon2 = QIcon()
+        icon2.addFile(u":/png/icon/nv.png", QSize(), QIcon.Normal, QIcon.Off)
+        self.nvIcon.setIcon(icon2)
+        self.nvIcon.setIconSize(QSize(32, 32))
+
+        self.horizontalLayout_4.addWidget(self.nvIcon)
+
+        self.officialIcon = QToolButton(ChatNewRoomMsg)
+        self.officialIcon.setObjectName(u"officialIcon")
+        icon3 = QIcon()
+        icon3.addFile(u":/png/icon/icon_picacg.png", QSize(), QIcon.Normal, QIcon.Off)
+        self.officialIcon.setIcon(icon3)
+        self.officialIcon.setIconSize(QSize(32, 32))
+
+        self.horizontalLayout_4.addWidget(self.officialIcon)
+
+        self.horizontalSpacer_3 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+
+        self.horizontalLayout_4.addItem(self.horizontalSpacer_3)
+
+
+        self.gridLayout.addLayout(self.horizontalLayout_4, 1, 0, 1, 1)
 
 
         self.gridLayout_2.addLayout(self.gridLayout, 0, 1, 1, 1)
@@ -196,7 +242,6 @@ def setupUi(self, ChatNewRoomMsg):
     def retranslateUi(self, ChatNewRoomMsg):
         ChatNewRoomMsg.setWindowTitle(QCoreApplication.translate("ChatNewRoomMsg", u"Form", None))
         self.picLabel.setText("")
-        self.nameLabel.setText(QCoreApplication.translate("ChatNewRoomMsg", u"TextLabel", None))
         self.indexLabel.setText(QCoreApplication.translate("ChatNewRoomMsg", u"X\u697c", None))
         self.levelLabel.setText(QCoreApplication.translate("ChatNewRoomMsg", u"LV", None))
         self.titleLabel.setText(QCoreApplication.translate("ChatNewRoomMsg", u"TextLabel", None))
@@ -205,5 +250,22 @@ def retranslateUi(self, ChatNewRoomMsg):
         self.commentLabel.setText(QCoreApplication.translate("ChatNewRoomMsg", u"TextLabel", None))
         self.pic2Label.setText("")
         self.infoLabel.setText(QCoreApplication.translate("ChatNewRoomMsg", u"TextLabel", None))
+        self.nameLabel.setText(QCoreApplication.translate("ChatNewRoomMsg", u"TextLabel", None))
+#if QT_CONFIG(tooltip)
+        self.vipIcon.setToolTip(QCoreApplication.translate("ChatNewRoomMsg", u"vip\u7528\u6237", None))
+#endif // QT_CONFIG(tooltip)
+        self.vipIcon.setText(QCoreApplication.translate("ChatNewRoomMsg", u"...", None))
+#if QT_CONFIG(tooltip)
+        self.managerIcon.setToolTip(QCoreApplication.translate("ChatNewRoomMsg", u"\u623f\u7ba1", None))
+#endif // QT_CONFIG(tooltip)
+        self.managerIcon.setText("")
+#if QT_CONFIG(tooltip)
+        self.nvIcon.setToolTip(QCoreApplication.translate("ChatNewRoomMsg", u"\u5973\u83e9\u8428", None))
+#endif // QT_CONFIG(tooltip)
+        self.nvIcon.setText(QCoreApplication.translate("ChatNewRoomMsg", u"...", None))
+#if QT_CONFIG(tooltip)
+        self.officialIcon.setToolTip(QCoreApplication.translate("ChatNewRoomMsg", u"\u54d4\u5494\u5b98\u65b9", None))
+#endif // QT_CONFIG(tooltip)
+        self.officialIcon.setText(QCoreApplication.translate("ChatNewRoomMsg", u"...", None))
     # retranslateUi
 

src/interface/ui_chat_room.py

@@ -45,6 +45,16 @@ def setupUi(self, ChatRoom):
 
         self.horizontalLayout_3.addItem(self.horizontalSpacer_2)
 
+        self.label = QLabel(ChatRoom)
+        self.label.setObjectName(u"label")
+
+        self.horizontalLayout_3.addWidget(self.label)
+
+        self.onlineNum = QLabel(ChatRoom)
+        self.onlineNum.setObjectName(u"onlineNum")
+
+        self.horizontalLayout_3.addWidget(self.onlineNum)
+
         self.numLabel = QLabel(ChatRoom)
         self.numLabel.setObjectName(u"numLabel")
 
@@ -161,6 +171,8 @@ def retranslateUi(self, ChatRoom):
         ChatRoom.setWindowTitle(QCoreApplication.translate("ChatRoom", u"\u804a\u5929\u5ba4", None))
         self.atLabel.setText(QCoreApplication.translate("ChatRoom", u"PushButton", None))
         self.nameLabel.setText(QCoreApplication.translate("ChatRoom", u"TextLabel", None))
+        self.label.setText(QCoreApplication.translate("ChatRoom", u"\u5728\u7ebf\u4eba\u6570\uff1a", None))
+        self.onlineNum.setText(QCoreApplication.translate("ChatRoom", u"0", None))
         self.numLabel.setText("")
         self.replyLabel.setText(QCoreApplication.translate("ChatRoom", u"PushButton", None))
         self.pushButton.setText(QCoreApplication.translate("ChatRoom", u"\u8868\u60c5", None))

src/interface/ui_download.py

@@ -70,8 +70,8 @@ def setupUi(self, Download):
         self.gridLayout.addLayout(self.horizontalLayout, 2, 0, 1, 1)
 
         self.tableWidget = QTableWidget(Download)
-        if (self.tableWidget.columnCount() < 10):
-            self.tableWidget.setColumnCount(10)
+        if (self.tableWidget.columnCount() < 11):
+            self.tableWidget.setColumnCount(11)
         __qtablewidgetitem = QTableWidgetItem()
         self.tableWidget.setHorizontalHeaderItem(0, __qtablewidgetitem)
         __qtablewidgetitem1 = QTableWidgetItem()
@@ -92,6 +92,8 @@ def setupUi(self, Download):
         self.tableWidget.setHorizontalHeaderItem(8, __qtablewidgetitem8)
         __qtablewidgetitem9 = QTableWidgetItem()
         self.tableWidget.setHorizontalHeaderItem(9, __qtablewidgetitem9)
+        __qtablewidgetitem10 = QTableWidgetItem()
+        self.tableWidget.setHorizontalHeaderItem(10, __qtablewidgetitem10)
         self.tableWidget.setObjectName(u"tableWidget")
 
         self.gridLayout.addWidget(self.tableWidget, 5, 0, 1, 1)
@@ -121,22 +123,24 @@ def retranslateUi(self, Download):
         ___qtablewidgetitem = self.tableWidget.horizontalHeaderItem(0)
         ___qtablewidgetitem.setText(QCoreApplication.translate("Download", u"id", None));
         ___qtablewidgetitem1 = self.tableWidget.horizontalHeaderItem(1)
-        ___qtablewidgetitem1.setText(QCoreApplication.translate("Download", u"\u6807\u9898", None));
+        ___qtablewidgetitem1.setText(QCoreApplication.translate("Download", u"\u65f6\u95f4", None));
         ___qtablewidgetitem2 = self.tableWidget.horizontalHeaderItem(2)
-        ___qtablewidgetitem2.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u8fdb\u5ea6", None));
+        ___qtablewidgetitem2.setText(QCoreApplication.translate("Download", u"\u6807\u9898", None));
         ___qtablewidgetitem3 = self.tableWidget.horizontalHeaderItem(3)
-        ___qtablewidgetitem3.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u7ae0\u8282", None));
+        ___qtablewidgetitem3.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u8fdb\u5ea6", None));
         ___qtablewidgetitem4 = self.tableWidget.horizontalHeaderItem(4)
-        ___qtablewidgetitem4.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u901f\u5ea6", None));
+        ___qtablewidgetitem4.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u7ae0\u8282", None));
         ___qtablewidgetitem5 = self.tableWidget.horizontalHeaderItem(5)
-        ___qtablewidgetitem5.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u72b6\u6001", None));
+        ___qtablewidgetitem5.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u901f\u5ea6", None));
         ___qtablewidgetitem6 = self.tableWidget.horizontalHeaderItem(6)
-        ___qtablewidgetitem6.setText(QCoreApplication.translate("Download", u"\u8f6c\u6362\u8fdb\u5ea6", None));
+        ___qtablewidgetitem6.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u72b6\u6001", None));
         ___qtablewidgetitem7 = self.tableWidget.horizontalHeaderItem(7)
-        ___qtablewidgetitem7.setText(QCoreApplication.translate("Download", u"\u8f6c\u6362\u7ae0\u8282", None));
+        ___qtablewidgetitem7.setText(QCoreApplication.translate("Download", u"\u8f6c\u6362\u8fdb\u5ea6", None));
         ___qtablewidgetitem8 = self.tableWidget.horizontalHeaderItem(8)
-        ___qtablewidgetitem8.setText(QCoreApplication.translate("Download", u"\u8f6c\u6362\u8017\u65f6", None));
+        ___qtablewidgetitem8.setText(QCoreApplication.translate("Download", u"\u8f6c\u6362\u7ae0\u8282", None));
         ___qtablewidgetitem9 = self.tableWidget.horizontalHeaderItem(9)
-        ___qtablewidgetitem9.setText(QCoreApplication.translate("Download", u"\u8f6c\u6362\u72b6\u6001", None));
+        ___qtablewidgetitem9.setText(QCoreApplication.translate("Download", u"\u8f6c\u6362\u8017\u65f6", None));
+        ___qtablewidgetitem10 = self.tableWidget.horizontalHeaderItem(10)
+        ___qtablewidgetitem10.setText(QCoreApplication.translate("Download", u"\u8f6c\u6362\u72b6\u6001", None));
     # retranslateUi
 

src/interface/ui_favorite.py

@@ -16,8 +16,9 @@
     QImage, QKeySequence, QLinearGradient, QPainter,
     QPalette, QPixmap, QRadialGradient, QTransform)
 from PySide6.QtWidgets import (QApplication, QComboBox, QFrame, QGridLayout,
-    QHBoxLayout, QLabel, QListWidgetItem, QPushButton,
-    QSizePolicy, QSpacerItem, QSpinBox, QWidget)
+    QHBoxLayout, QLabel, QLineEdit, QListWidgetItem,
+    QPushButton, QSizePolicy, QSpacerItem, QSpinBox,
+    QWidget)
 
 from component.list.comic_list_widget import ComicListWidget
 
@@ -37,7 +38,7 @@ def setupUi(self, Favorite):
         self.gridLayout_3.addWidget(self.bookList, 0, 0, 1, 1)
 
 
-        self.gridLayout_2.addLayout(self.gridLayout_3, 0, 0, 1, 1)
+        self.gridLayout_2.addLayout(self.gridLayout_3, 1, 0, 1, 1)
 
         self.gridLayout_4 = QGridLayout()
         self.gridLayout_4.setObjectName(u"gridLayout_4")
@@ -144,7 +145,24 @@ def setupUi(self, Favorite):
         self.gridLayout_4.addLayout(self.horizontalLayout, 0, 0, 1, 1)
 
 
-        self.gridLayout_2.addLayout(self.gridLayout_4, 1, 0, 1, 1)
+        self.gridLayout_2.addLayout(self.gridLayout_4, 2, 0, 1, 1)
+
+        self.widget = QWidget(Favorite)
+        self.widget.setObjectName(u"widget")
+        self.horizontalLayout_2 = QHBoxLayout(self.widget)
+        self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
+        self.label = QLabel(self.widget)
+        self.label.setObjectName(u"label")
+
+        self.horizontalLayout_2.addWidget(self.label)
+
+        self.lineEdit = QLineEdit(self.widget)
+        self.lineEdit.setObjectName(u"lineEdit")
+
+        self.horizontalLayout_2.addWidget(self.lineEdit)
+
+
+        self.gridLayout_2.addWidget(self.widget, 0, 0, 1, 1)
 
 
         self.retranslateUi(Favorite)
@@ -178,5 +196,6 @@ def retranslateUi(self, Favorite):
 #if QT_CONFIG(shortcut)
         self.jumpButton.setShortcut(QCoreApplication.translate("Favorite", u"Return", None))
 #endif // QT_CONFIG(shortcut)
+        self.label.setText(QCoreApplication.translate("Favorite", u"\u641c\u7d22\uff1a", None))
     # retranslateUi