From 7dbfc46e14bce5e6ba2ab64a36ca34080d308582 Mon Sep 17 00:00:00 2001 From: shuaikangzhou <863909694@qq.com> Date: Mon, 20 Nov 2023 00:20:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9wixd?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 35 ++++++++++--------------- app/components/bubble_message.py | 4 +-- app/ui_pc/chat/chat_info.py | 2 +- app/ui_pc/tool/pc_decrypt/decryptUi.py | 12 +++++++-- app/ui_pc/tool/pc_decrypt/decryptUi.ui | 12 +++++++-- app/ui_pc/tool/pc_decrypt/pc_decrypt.py | 9 +++++++ 6 files changed, 46 insertions(+), 28 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8af5f9b..bdf2d90 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,18 +4,11 @@ - @@ -685,7 +677,8 @@ - diff --git a/app/components/bubble_message.py b/app/components/bubble_message.py index 5396abd..708eaf3 100644 --- a/app/components/bubble_message.py +++ b/app/components/bubble_message.py @@ -11,7 +11,7 @@ class TextMessage(QLabel): def __init__(self, text, is_send=False, parent=None): super(TextMessage, self).__init__(text, parent) - self.setFont(QFont('微软雅黑', 12)) + self.setFont(QFont('Microsoft YaHei UI', 12)) self.setWordWrap(True) # self.adjustSize() self.setMaximumWidth(800) @@ -81,7 +81,7 @@ class Notice(QLabel): def __init__(self, text, type_=3, parent=None): super().__init__(text, parent) self.type_ = type_ - self.setFont(QFont('微软雅黑', 12)) + self.setFont(QFont('Microsoft YaHei UI', 12)) self.setWordWrap(True) self.setTextInteractionFlags(Qt.TextSelectableByMouse) self.setAlignment(Qt.AlignCenter) diff --git a/app/ui_pc/chat/chat_info.py b/app/ui_pc/chat/chat_info.py index 66e40b8..1df3bb3 100644 --- a/app/ui_pc/chat/chat_info.py +++ b/app/ui_pc/chat/chat_info.py @@ -84,7 +84,7 @@ class ChatInfo(QWidget): is_send = message[4] avatar = MePC().avatar if is_send else self.contact.avatar timestamp = message[5] - if type_ == 1: + if type_ == 1 or type_ == 3: if self.is_5_min(timestamp): time_message = Notice(self.last_str_time) self.last_str_time = str_time diff --git a/app/ui_pc/tool/pc_decrypt/decryptUi.py b/app/ui_pc/tool/pc_decrypt/decryptUi.py index 99579ae..3fed138 100644 --- a/app/ui_pc/tool/pc_decrypt/decryptUi.py +++ b/app/ui_pc/tool/pc_decrypt/decryptUi.py @@ -51,8 +51,16 @@ class Ui_Dialog(object): self.label_7.setObjectName("label_7") self.gridLayout.addWidget(self.label_7, 1, 0, 1, 1) self.lineEdit = QtWidgets.QLineEdit(Dialog) - self.lineEdit.setStyleSheet("\n" - " background:transparent;border-width:0;border-style:outset\n" + self.lineEdit.setStyleSheet("background:transparent;\n" + "\n" + "border-radius:5px;\n" + "border-top: 0px solid #b2e281;\n" + "border-bottom: 2px solid black;\n" + "border-right: 0px solid #b2e281;\n" + "border-left: 0px solid #b2e281;\n" + "\n" + " \n" + "border-style:outset\n" " ") self.lineEdit.setFrame(False) self.lineEdit.setObjectName("lineEdit") diff --git a/app/ui_pc/tool/pc_decrypt/decryptUi.ui b/app/ui_pc/tool/pc_decrypt/decryptUi.ui index 04d9673..dff82c5 100644 --- a/app/ui_pc/tool/pc_decrypt/decryptUi.ui +++ b/app/ui_pc/tool/pc_decrypt/decryptUi.ui @@ -92,8 +92,16 @@ - - background:transparent;border-width:0;border-style:outset + background:transparent; + + border-radius:5px; + border-top: 0px solid #b2e281; + border-bottom: 2px solid black; + border-right: 0px solid #b2e281; + border-left: 0px solid #b2e281; + + + border-style:outset diff --git a/app/ui_pc/tool/pc_decrypt/pc_decrypt.py b/app/ui_pc/tool/pc_decrypt/pc_decrypt.py index 41f19f7..c3e3499 100644 --- a/app/ui_pc/tool/pc_decrypt/pc_decrypt.py +++ b/app/ui_pc/tool/pc_decrypt/pc_decrypt.py @@ -22,6 +22,8 @@ class DecryptControl(QWidget, decryptUi.Ui_Dialog): self.pushButton_3.clicked.connect(self.decrypt) self.btn_getinfo.clicked.connect(self.get_info) self.btn_db_dir.clicked.connect(self.select_db_dir) + self.lineEdit.returnPressed.connect(self.set_wxid) + self.lineEdit.textChanged.connect(self.set_wxid_) self.info = {} self.lineEdit.setFocus() self.ready = False @@ -54,6 +56,13 @@ class DecryptControl(QWidget, decryptUi.Ui_Dialog): print(e) QMessageBox.critical(self, "错误", "请登录微信") + def set_wxid_(self): + self.info['wxid'] = self.lineEdit.text() + + def set_wxid(self): + self.info['wxid'] = self.lineEdit.text() + QMessageBox.information(self, "ok", f"wxid修改成功{self.info['wxid']}") + def select_db_dir(self): directory = QtWidgets.QFileDialog.getExistingDirectory( self, "选取微信安装目录——能看到All Users文件夹",