修复修改wixd的bug

This commit is contained in:
shuaikangzhou 2023-11-20 00:20:00 +08:00
parent d6bac1628f
commit 7dbfc46e14
6 changed files with 46 additions and 28 deletions

View File

@ -4,18 +4,11 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="84e65474-7da9-466d-baf3-cc88dde3ffdd" name="变更" comment="修复第一次启动的显示问题">
<change afterPath="$PROJECT_DIR$/app/util/search.py" afterDir="false" />
<list default="true" id="84e65474-7da9-466d-baf3-cc88dde3ffdd" name="变更" comment="支持查找功能">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TEST/mainwindow.ui" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/ui_pc/chat/chatUi.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/chat/chatUi.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/ui_pc/chat/chatUi.ui" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/chat/chatUi.ui" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/ui_pc/chat/chat_window.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/chat/chat_window.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/ui_pc/contact/contactUi.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/contact/contactUi.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/ui_pc/contact/contactUi.ui" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/contact/contactUi.ui" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/ui_pc/contact/contact_window.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/contact/contact_window.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doc/images/chat_.png" beforeDir="false" afterPath="$PROJECT_DIR$/doc/images/chat_.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/requirements.txt" beforeDir="false" afterPath="$PROJECT_DIR$/requirements.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/components/bubble_message.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/components/bubble_message.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/ui_pc/chat/chat_info.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/chat/chat_info.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/ui_pc/tool/pc_decrypt/pc_decrypt.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/tool/pc_decrypt/pc_decrypt.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -281,13 +274,6 @@
<option name="presentableId" value="Default" />
<updated>1672848140146</updated>
</task>
<task id="LOCAL-00032" summary="支持导出csv格式聊天记录">
<created>1698331547560</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1698331547560</updated>
</task>
<task id="LOCAL-00033" summary="增加几个图标">
<created>1698331665669</created>
<option name="number" value="00033" />
@ -624,7 +610,14 @@
<option name="project" value="LOCAL" />
<updated>1700373695942</updated>
</task>
<option name="localTasksCounter" value="81" />
<task id="LOCAL-00081" summary="支持查找功能">
<created>1700407657926</created>
<option name="number" value="00081" />
<option name="presentableId" value="LOCAL-00081" />
<option name="project" value="LOCAL" />
<updated>1700407657926</updated>
</task>
<option name="localTasksCounter" value="82" />
<servers />
</component>
<component name="UnknownFeatures">
@ -660,7 +653,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="新增PC数据库解密" />
<MESSAGE value="main首次加载解密界面" />
<MESSAGE value="增加日志模块" />
<MESSAGE value="增加PC端微信解密条件的判断" />
@ -685,7 +677,8 @@
<MESSAGE value="update readme" />
<MESSAGE value="修复时间插入位置" />
<MESSAGE value="修复第一次启动的显示问题" />
<option name="LAST_COMMIT_MESSAGE" value="修复第一次启动的显示问题" />
<MESSAGE value="支持查找功能" />
<option name="LAST_COMMIT_MESSAGE" value="支持查找功能" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
</component>

View File

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

View File

@ -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

View File

@ -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")

View File

@ -92,8 +92,16 @@
<item row="4" column="1">
<widget class="QLineEdit" name="lineEdit">
<property name="styleSheet">
<string notr="true">
background:transparent;border-width:0;border-style:outset
<string notr="true">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
</string>
</property>
<property name="frame">

View File

@ -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文件夹",