update v1.1.7

conf/config.py

@@ -31,7 +31,7 @@
 
 UpdateUrl = "https://github.com/tonquer/picacg-windows/releases/latest"
 UpdateUrl2 = "https://github.com/tonquer/picacg-windows/releases"
-UpdateVersion = "v1.1.6"
+UpdateVersion = "v1.1.7"
 
 # waifu2x
 CanWaifu2x = True
@@ -41,7 +41,7 @@
 Waifu2xThread = 2
 Format = "jpg"
 Waifu2xPath = "waifu2x"
-IsOpenWaifu = True
+IsOpenWaifu = False
 
 LookModel = 0       # 默认值
 DownloadModel = 0   # 默认值

qss/build.py

@@ -0,0 +1,34 @@
+import base64
+import os
+import subprocess
+
+fw = open("qss.py", "w+")
+fw.write("import base64\n\n\n")
+fw.write("class QssDataMgr(object):\n")
+
+files = []
+for root, dirs, filenames in os.walk("./"):
+    for name in filenames:
+        if name[-3:] != "qss":
+            continue
+        if len(name.split(".")) >= 3:
+            continue
+        f = open(name, "r", encoding="utf-8")
+        # fw.write("def get():\r\n    return )
+        i = 0
+        data = base64.b64encode(f.read().encode("utf-8"))
+        # if i % 2 == 0:
+        #     fw.write("\\x")
+        fw.write("  {}".format(name[:-4]))
+        files.append(name[:-4])
+        fw.write(" = \"")
+        fw.write(data.decode("utf-8"))
+        fw.write("\"\n\n")
+        f.close()
+
+fw.write("  files = {}\n\n".format(files))
+fw.write("  @classmethod\n")
+fw.write("  def GetData(cls, name):\n")
+fw.write("      data = getattr(cls, name)\n")
+fw.write("      return base64.b64decode(data.encode('utf-8')).decode('utf-8')\n")
+fw.close()

qss/qss.py

@@ -0,0 +1,12 @@
+import base64
+
+
+class QssDataMgr(object):
+  qt_list_scrollbar = "UVNjcm9sbEJhcjp2ZXJ0aWNhbCB7CiAgICBiYWNrZ3JvdW5kOiB0cmFuc3BhcmVudDsgLyrog4zmma/pgI/mmI4qLwogICAgd2lkdGg6IDEwcHg7IC8q5a695bqmKi8KICAgIG1hcmdpbjogMHB4IDBweCAwcHggMHB4OyAvKiovCiAgICBwYWRkaW5nLXRvcDogMTJweDsgLyrot53nprvkuIrpnaIxMnB4Ki8KICAgIHBhZGRpbmctYm90dG9tOiAxMnB4OyAvKui3neemu+W6lemDqDEycHgqLwp9Ci8q5qiq5ZCR5rua5Yqo5p2hKi8KUVNjcm9sbEJhcjpob3Jpem9udGFsIHsKICAgIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50OwogICAgaGVpZ2h0OiAxMHB4OyAvKumrmOW6piovCiAgICBtYXJnaW46IDBweCAwcHggMHB4IDBweDsKICAgIHBhZGRpbmctbGVmdDogMTJweDsgLyrot53nprvlt6bovrkxMnB4Ki8KICAgIHBhZGRpbmctcmlnaHQ6IDEycHg7IC8q6Led56a75Y+z6L65MTJweCovCn0KCi8q5b2T6byg5qCH5pS+5Yiw57q15ZCR5oiW6ICF5qiq5ZCR5rua5Yqo5p2h5LiK6Z2i5pe2Ki8KUVNjcm9sbEJhcjp2ZXJ0aWNhbDpob3ZlcixRU2Nyb2xsQmFyOmhvcml6b250YWw6aG92ZXIgewogICAgYmFja2dyb3VuZDogcmdiYSgwLCAwLCAwLCAzMCk7IC8q5L+u5pS56IOM5pmv6YCP5piO5bqmIDMwKi8KICAgIGJvcmRlci1yYWRpdXM6IDVweDsgLyrlnIbop5IqLwp9CgovKue6teWQkea7muWKqOadoeS4iumdoueahOa7keWdlyovClFTY3JvbGxCYXI6OmhhbmRsZTp2ZXJ0aWNhbCB7CiAgICBiYWNrZ3JvdW5kOiByZ2JhKDAsIDAsIDAsIDUwKTsKICAgIHdpZHRoOiAxMHB4OwogICAgYm9yZGVyLXJhZGl1czogNXB4OwogICAgYm9yZGVyOiBub25lOwp9Ci8q5qiq5ZCR5rua5Yqo5p2h5LiK6Z2i55qE5ruR5Z2XKi8KUVNjcm9sbEJhcjo6aGFuZGxlOmhvcml6b250YWwgewogICAgYmFja2dyb3VuZDogcmdiYSgwLCAwLCAwLCA1MCk7CiAgICBoZWlnaHQ6IDEwcHg7CiAgICBib3JkZXItcmFkaXVzOiA1cHg7CiAgICBib3JkZXI6IG5vbmU7Cn0KCi8q5b2T6byg5qCH5pS+5Yiw5rua5Yqo5p2h5ruR5Z2X5LiK6Z2i5pe25pS55Y+Y6YCP5piO5bqm5a6e546w6aKc6Imy55qE5rex5rWF5Y+Y5YyWKi8KUVNjcm9sbEJhcjo6aGFuZGxlOnZlcnRpY2FsOmhvdmVyLFFTY3JvbGxCYXI6OmhhbmRsZTpob3Jpem9udGFsOmhvdmVyIHsKICAgIGJhY2tncm91bmQ6IHJnYmEoMCwgMCwgMCwgMTAwKTsKfQoKLyrnurXlkJHmu5rliqjmnaHkuIvpg6jliIblnZcqLwpRU2Nyb2xsQmFyOjphZGQtcGFnZTp2ZXJ0aWNhbCB7CiAgICB3aWR0aDogMTBweDsKICAgIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50Owp9Ci8q5qiq5ZCR5rua5Yqo5p2h5ZCO6Z2i6YOo5YiG5Z2XKi8KUVNjcm9sbEJhcjo6YWRkLXBhZ2U6aG9yaXpvbnRhbCB7CiAgICBoZWlnaHQ6IDEwcHg7CiAgICBiYWNrZ3JvdW5kOiB0cmFuc3BhcmVudDsKfQovKue6teWQkea7muWKqOadoeS4iumdoumDqOWIhuWdlyovClFTY3JvbGxCYXI6OnN1Yi1wYWdlOnZlcnRpY2FsIHsKICAgIHdpZHRoOiAxMHB4OwogICAgYmFja2dyb3VuZDogdHJhbnNwYXJlbnQ7Cn0KLyrmqKrlkJHmu5rliqjmnaHlt6bpg6jliIblnZcqLwpRU2Nyb2xsQmFyOjpzdWItcGFnZTpob3Jpem9udGFsIHsKICAgIGhlaWdodDogMTBweDsKICAgIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50Owp9Ci8q57q15ZCR5rua5Yqo5p2h6aG26YOo5LiJ6KeS5b2i5L2N572uKi8KUVNjcm9sbEJhcjo6c3ViLWxpbmU6dmVydGljYWwgewogICAgaGVpZ2h0OiAxMnB4OwogICAgd2lkdGg6IDEwcHg7CiAgICBiYWNrZ3JvdW5kOiB0cmFuc3BhcmVudDsKICAgIHN1YmNvbnRyb2wtcG9zaXRpb246IHRvcDsKfQovKuaoquWQkea7muWKqOadoeW3puS+p+S4ieinkuW9ouS9jee9riovClFTY3JvbGxCYXI6OnN1Yi1saW5lOmhvcml6b250YWwgewogICAgaGVpZ2h0OiAxMHB4OwogICAgd2lkdGg6IDEycHg7CiAgICBiYWNrZ3JvdW5kOiB0cmFuc3BhcmVudDsKICAgIHN1YmNvbnRyb2wtcG9zaXRpb246IGxlZnQ7Cn0KLyrnurXlkJHmu5rliqjmnaHlkJHkuIrnmoTkuInop5LlvaLlsI/lm77moIcqLwpRU2Nyb2xsQmFyOjp1cC1hcnJvdzp2ZXJ0aWNhbCB7CiAgICBpbWFnZTogdXJsKERhdGEvc2Nyb2xsYmFyL3Njcm9sbGJhcl9hcnJvd3VwX25vcm1hbC5wbmcpOwp9Ci8q5qiq5ZCR5rua5Yqo5p2h5bem6L6555qE5LiJ6KeS5b2i5bCP5Zu+5qCHKi8KUVNjcm9sbEJhcjo6bGVmdC1hcnJvdzpob3Jpem9udGFsIHsKICAgIGltYWdlOiB1cmwoRGF0YS9zY3JvbGxiYXIvc2Nyb2xsYmFyX2Fycm93bGVmdF9ub3JtYWwucG5nKTsKfQovKue6teWQkea7muWKqOadoeWQkeS4iueahOS4ieinkuW9ouWwj+WbvuaghyDpvKDmoIfmgqzlgZwqLwpRU2Nyb2xsQmFyOjp1cC1hcnJvdzp2ZXJ0aWNhbDpob3ZlciB7CiAgICBpbWFnZTogdXJsKERhdGEvc2Nyb2xsYmFyL3Njcm9sbGJhcl9hcnJvd3VwX2Rvd24ucG5nKTsKfQovKuaoquWQkea7muWKqOadoeW3pui+ueeahOS4ieinkuW9ouWwj+WbvuaghyDpvKDmoIfmgqzlgZwqLwpRU2Nyb2xsQmFyOjpsZWZ0LWFycm93Omhvcml6b250YWw6aG92ZXIgewogICAgaW1hZ2U6IHVybChEYXRhL3Njcm9sbGJhci9zY3JvbGxiYXJfYXJyb3dsZWZ0X2Rvd24ucG5nKTsKfQovKue6teWQkea7muWKqOadoeWQkeS4iueahOS4ieinkuW9ouWwj+WbvuaghyDpvKDmoIfmjInkuIsqLwpRU2Nyb2xsQmFyOjp1cC1hcnJvdzp2ZXJ0aWNhbDpwcmVzc2VkIHsKICAgIGltYWdlOiB1cmwoRGF0YS9zY3JvbGxiYXIvc2Nyb2xsYmFyX2Fycm93dXBfaGlnaGxpZ2h0LnBuZyk7Cn0KLyrmqKrlkJHmu5rliqjmnaHlt6bovrnnmoTkuInop5LlvaLlsI/lm77moIcg6byg5qCH5oyJ5LiLKi8KUVNjcm9sbEJhcjo6bGVmdC1hcnJvdzpob3Jpem9udGFsOnByZXNzZWQgewogICAgaW1hZ2U6IHVybChEYXRhL3Njcm9sbGJhci9zY3JvbGxiYXJfYXJyb3dsZWZ0X2hpZ2hsaWdodC5wbmcpOwp9CgovKue6teWQkea7muWKqOadoeS4i+mdouS4ieinkuW9oumDqOWIhiovClFTY3JvbGxCYXI6OmFkZC1saW5lOnZlcnRpY2FsIHsKICAgIGhlaWdodDogMTJweDsKICAgIHdpZHRoOiAxMHB4OwogICAgYmFja2dyb3VuZDogdHJhbnNwYXJlbnQ7CiAgICBzdWJjb250cm9sLXBvc2l0aW9uOiBib3R0b207Cn0KLyrmqKrlkJHmu5rliqjmnaHlj7PovrnnmoTkuInop5LlvaLpg6jliIYqLwpRU2Nyb2xsQmFyOjphZGQtbGluZTpob3Jpem9udGFsIHsKICAgIGhlaWdodDogMTBweDsKICAgIHdpZHRoOiAxMnB4OwogICAgYmFja2dyb3VuZDogdHJhbnNwYXJlbnQ7CiAgICBzdWJjb250cm9sLXBvc2l0aW9uOiByaWdodDsKfQovKue6teWQkea7muWKqOadoeS4i+mdouS4ieinkuW9ouWbvuaghyovClFTY3JvbGxCYXI6OmRvd24tYXJyb3c6dmVydGljYWwgewogICAgaW1hZ2U6IHVybChyZXNvdXJjZXMvc2Nyb2xsYmFyL3Njcm9sbGJhcl9hcnJvd2Rvd25fbm9ybWFsLnBuZyk7Cn0KLyrmqKrlkJHmu5rliqjmnaHlj7PkvqfkuInop5LlvaLlm77moIcqLwpRU2Nyb2xsQmFyOjpyaWdodC1hcnJvdzpob3Jpem9udGFsIHsKICAgIGltYWdlOiB1cmwocmVzb3VyY2VzL3Njcm9sbGJhci9zY3JvbGxiYXJfYXJyb3dyaWdodF9ub3JtYWwucG5nKTsKfQovKue6teWQkea7muWKqOadoeS4i+mdouS4ieinkuW9ouWbvuaghyDpvKDmoIfmgqzlgZwqLwpRU2Nyb2xsQmFyOjpkb3duLWFycm93OnZlcnRpY2FsOmhvdmVyIHsKICAgIGltYWdlOiB1cmwocmVzb3VyY2VzL3Njcm9sbGJhci9zY3JvbGxiYXJfYXJyb3dkb3duX2Rvd24ucG5nKTsKfQovKuaoquWQkea7muWKqOadoeWPs+S+p+S4ieinkuW9ouWbvuaghyDpvKDmoIfmgqzlgZwqLwpRU2Nyb2xsQmFyOjpyaWdodC1hcnJvdzpob3Jpem9udGFsOmhvdmVyIHsKICAgIGltYWdlOiB1cmwocmVzb3VyY2VzL3Njcm9sbGJhci9zY3JvbGxiYXJfYXJyb3dyaWdodF9kb3duLnBuZyk7Cn0KLyrnurXlkJHmu5rliqjmnaHkuIvpnaLkuInop5LlvaLlm77moIcg6byg5qCH5oyJ5LiLKi8KUVNjcm9sbEJhcjo6ZG93bi1hcnJvdzp2ZXJ0aWNhbDpwcmVzc2VkIHsKICAgIGltYWdlOiB1cmwocmVzb3VyY2VzL3Njcm9sbGJhci9zY3JvbGxiYXJfYXJyb3dkb3duX2hpZ2hsaWdodC5wbmcpOwp9Ci8q5qiq5ZCR5rua5Yqo5p2h5Y+z5L6n5LiJ6KeS5b2i5Zu+5qCHIOm8oOagh+aMieS4iyovClFTY3JvbGxCYXI6OnJpZ2h0LWFycm93Omhvcml6b250YWw6cHJlc3NlZCB7CiAgICBpbWFnZTogdXJsKHJlc291cmNlcy9zY3JvbGxiYXIvc2Nyb2xsYmFyX2Fycm93cmlnaHRfaGlnaGxpZ2h0LnBuZyk7Cn0="
+
+  files = ['qt_list_scrollbar']
+
+  @classmethod
+  def GetData(cls, name):
+      data = getattr(cls, name)
+      return base64.b64decode(data.encode('utf-8')).decode('utf-8')

qss/qt_list_scrollbar.qss

@@ -0,0 +1,139 @@
+QScrollBar:vertical {
+    background: transparent; /*背景透明*/
+    width: 10px; /*宽度*/
+    margin: 0px 0px 0px 0px; /**/
+    padding-top: 12px; /*距离上面12px*/
+    padding-bottom: 12px; /*距离底部12px*/
+}
+/*横向滚动条*/
+QScrollBar:horizontal {
+    background: transparent;
+    height: 10px; /*高度*/
+    margin: 0px 0px 0px 0px;
+    padding-left: 12px; /*距离左边12px*/
+    padding-right: 12px; /*距离右边12px*/
+}
+
+/*当鼠标放到纵向或者横向滚动条上面时*/
+QScrollBar:vertical:hover,QScrollBar:horizontal:hover {
+    background: rgba(0, 0, 0, 30); /*修改背景透明度 30*/
+    border-radius: 5px; /*圆角*/
+}
+
+/*纵向滚动条上面的滑块*/
+QScrollBar::handle:vertical {
+    background: rgba(0, 0, 0, 50);
+    width: 10px;
+    border-radius: 5px;
+    border: none;
+}
+/*横向滚动条上面的滑块*/
+QScrollBar::handle:horizontal {
+    background: rgba(0, 0, 0, 50);
+    height: 10px;
+    border-radius: 5px;
+    border: none;
+}
+
+/*当鼠标放到滚动条滑块上面时改变透明度实现颜色的深浅变化*/
+QScrollBar::handle:vertical:hover,QScrollBar::handle:horizontal:hover {
+    background: rgba(0, 0, 0, 100);
+}
+
+/*纵向滚动条下部分块*/
+QScrollBar::add-page:vertical {
+    width: 10px;
+    background: transparent;
+}
+/*横向滚动条后面部分块*/
+QScrollBar::add-page:horizontal {
+    height: 10px;
+    background: transparent;
+}
+/*纵向滚动条上面部分块*/
+QScrollBar::sub-page:vertical {
+    width: 10px;
+    background: transparent;
+}
+/*横向滚动条左部分块*/
+QScrollBar::sub-page:horizontal {
+    height: 10px;
+    background: transparent;
+}
+/*纵向滚动条顶部三角形位置*/
+QScrollBar::sub-line:vertical {
+    height: 12px;
+    width: 10px;
+    background: transparent;
+    subcontrol-position: top;
+}
+/*横向滚动条左侧三角形位置*/
+QScrollBar::sub-line:horizontal {
+    height: 10px;
+    width: 12px;
+    background: transparent;
+    subcontrol-position: left;
+}
+/*纵向滚动条向上的三角形小图标*/
+QScrollBar::up-arrow:vertical {
+    image: url(Data/scrollbar/scrollbar_arrowup_normal.png);
+}
+/*横向滚动条左边的三角形小图标*/
+QScrollBar::left-arrow:horizontal {
+    image: url(Data/scrollbar/scrollbar_arrowleft_normal.png);
+}
+/*纵向滚动条向上的三角形小图标 鼠标悬停*/
+QScrollBar::up-arrow:vertical:hover {
+    image: url(Data/scrollbar/scrollbar_arrowup_down.png);
+}
+/*横向滚动条左边的三角形小图标 鼠标悬停*/
+QScrollBar::left-arrow:horizontal:hover {
+    image: url(Data/scrollbar/scrollbar_arrowleft_down.png);
+}
+/*纵向滚动条向上的三角形小图标 鼠标按下*/
+QScrollBar::up-arrow:vertical:pressed {
+    image: url(Data/scrollbar/scrollbar_arrowup_highlight.png);
+}
+/*横向滚动条左边的三角形小图标 鼠标按下*/
+QScrollBar::left-arrow:horizontal:pressed {
+    image: url(Data/scrollbar/scrollbar_arrowleft_highlight.png);
+}
+
+/*纵向滚动条下面三角形部分*/
+QScrollBar::add-line:vertical {
+    height: 12px;
+    width: 10px;
+    background: transparent;
+    subcontrol-position: bottom;
+}
+/*横向滚动条右边的三角形部分*/
+QScrollBar::add-line:horizontal {
+    height: 10px;
+    width: 12px;
+    background: transparent;
+    subcontrol-position: right;
+}
+/*纵向滚动条下面三角形图标*/
+QScrollBar::down-arrow:vertical {
+    image: url(resources/scrollbar/scrollbar_arrowdown_normal.png);
+}
+/*横向滚动条右侧三角形图标*/
+QScrollBar::right-arrow:horizontal {
+    image: url(resources/scrollbar/scrollbar_arrowright_normal.png);
+}
+/*纵向滚动条下面三角形图标 鼠标悬停*/
+QScrollBar::down-arrow:vertical:hover {
+    image: url(resources/scrollbar/scrollbar_arrowdown_down.png);
+}
+/*横向滚动条右侧三角形图标 鼠标悬停*/
+QScrollBar::right-arrow:horizontal:hover {
+    image: url(resources/scrollbar/scrollbar_arrowright_down.png);
+}
+/*纵向滚动条下面三角形图标 鼠标按下*/
+QScrollBar::down-arrow:vertical:pressed {
+    image: url(resources/scrollbar/scrollbar_arrowdown_highlight.png);
+}
+/*横向滚动条右侧三角形图标 鼠标按下*/
+QScrollBar::right-arrow:horizontal:pressed {
+    image: url(resources/scrollbar/scrollbar_arrowright_highlight.png);
+}

resources/build.py

@@ -11,6 +11,8 @@
     for name in filenames:
         if name[-3:] != "png":
             continue
+        if len(name.split(".")) >= 3:
+            continue
         f = open(name, "rb")
         # fw.write("def get():\r\n    return )
         i = 0

src/qt/chat/qtchat.py

@@ -4,31 +4,36 @@
 from PySide2.QtWidgets import QGridLayout
 
 from src.qt.chat.qtchatroom import QtChatRoom
-from src.qt.com.qtlistwidget import QtBookList
-from src.server import Server, QtTask, req, Log, json
+from ui.qtlistwidget import QtBookList
+from src.server import Server, QtTask, req, Log, json, Status
 
 
 class QtChat(QtWidgets.QWidget):
     def __init__(self, owner):
         super(self.__class__, self).__init__(owner)
         self.owner = weakref.ref(owner)
         self.gridLayout = QGridLayout(self)
-        self.listWidget = QtBookList(None, self.__class__.__name__, owner)
-        self.listWidget.InitUser()
+        self.listWidget = QtBookList(None)
+        self.listWidget.InitUser(self.__class__.__name__, owner)
         self.gridLayout.addWidget(self.listWidget)
         self.closeFlag = self.__class__.__name__
         self.listWidget.doubleClicked.connect(self.OpenChatRoom)
         self.chatRoom = QtChatRoom()
+        self.listWidget.setStyleSheet("""
+        QListWidget {background-color:transparent;}
+        """)
 
     def SwitchCurrent(self):
         if self.listWidget.count() > 0:
             return
+        self.owner().loadingForm.show()
         QtTask().AddHttpTask(
             lambda x: Server().Send(req.GetChatReq(), bakParam=x),
             self.GetChatBack, cleanFlag=self.closeFlag)
         return
 
     def GetChatBack(self, data):
+        self.owner().loadingForm.close()
         try:
             data = json.loads(data)
             if data.get("code") == 200:
@@ -38,11 +43,10 @@ def GetChatBack(self, data):
                     content = info.get("description")
                     # avatar = info.get("_user", {}).get("avatar", {})
                     # createdTime = info.get("created_at")
-                    self.listWidget.AddUserItem(info.get("url"), "", "", content, name, "", index+1,
-                                                info.get("avatar"),
-                                                "", "")
+                    self.listWidget.AddUserItem(info, index+1)
         except Exception as es:
             Log.Error(es)
+            self.owner().msgForm.ShowMsg(Status.UnKnowError)
         return
 
     def OpenChatRoom(self, modelIndex):
@@ -53,4 +57,4 @@ def OpenChatRoom(self, modelIndex):
         widget = self.listWidget.itemWidget(item)
         if not widget:
             return
-        self.chatRoom.OpenChat(widget.id, widget.nameLabel.text())
+        self.chatRoom.OpenChat(widget.id, widget.titleLabel.text())

src/qt/chat/qtchatroom.py

@@ -284,7 +284,7 @@ def SendMsg(self, imageData=None):
             info['avatar'] = "https://storage.wikawika.xyz" + "/static/" + User().avatar.get("path")
         info['audio'] = ""
         info['block_user_id'] = ""
-        info['platform'] = "windows"
+        info['platform'] = "android"
         if not imageData:
             info['reply_name'] = ""
             info['at'] = ""

src/qt/chat/qtchatroommsg.py

@@ -21,8 +21,6 @@ def __init__(self, chatRoom):
         p.loadFromData(DataMgr().GetData("placeholder_avatar"))
         self.commentLabel.installEventFilter(self)
         self.picLabel.installEventFilter(self)
-        self.label.installEventFilter(self)
-        self.label.setText("")
         self.data = None
         self.picData = None
         self.audioData = None
@@ -77,18 +75,11 @@ def setParent(self, parent):
         return super(self.__class__, self).setParent(parent)
 
     def SetPicture(self, data):
-        pic = QPixmap()
-        pic.loadFromData(data)
         self.picData = data
-        self.picLabel.setPixmap(pic)
+        self.picLabel.SetPicture(data)
 
     def SetHeadPicture(self, data):
-        pic = QPixmap()
-        pic.loadFromData(data)
-        self.label.setCursor(Qt.PointingHandCursor)
-        self.label.setScaledContents(True)
-        self.label.setAttribute(Qt.WA_TranslucentBackground)
-        self.label.setPixmap(pic)
+        self.picLabel.SetPicture(self.picData, data)
 
     def SetPictureComment(self, data):
         pic = QPixmap()
@@ -106,7 +97,7 @@ def SetPictureComment(self, data):
     def eventFilter(self, obj, event):
         if event.type() == QEvent.MouseButtonPress:
             if event.button() == Qt.LeftButton:
-                if self.picData and (obj == self.label or obj == self.picLabel):
+                if self.picData and (obj == self.picLabel):
                     QtImgMgr().ShowImg(self.picData)
                 elif self.data and obj == self.commentLabel:
                     QtImgMgr().ShowImg(self.data)