修改部分UI

.idea/workspace.xml

@@ -4,12 +4,18 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="84e65474-7da9-466d-baf3-cc88dde3ffdd" name="变更" comment="add web">
+    <list default="true" id="84e65474-7da9-466d-baf3-cc88dde3ffdd" name="变更" comment="修复再次解密数据库时显示msg.db占用问题">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/DataBase/hard_link.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/DataBase/hard_link.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/resources/resource.qrc" beforeDir="false" afterPath="$PROJECT_DIR$/app/resources/resource.qrc" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/DataBase/output_pc.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/DataBase/output_pc.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/resources/resource_rc.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/resources/resource_rc.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/util/dat2pic.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/util/dat2pic.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/ui_pc/Icon.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/Icon.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/util/path.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/util/path.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/ui_pc/mainview.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/mainview.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/ui_pc/tool/pc_decrypt/decryptUi.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/tool/pc_decrypt/decryptUi.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/ui_pc/tool/pc_decrypt/decryptUi.ui" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/tool/pc_decrypt/decryptUi.ui" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/ui_pc/tool/toolUI.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/tool/toolUI.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/ui_pc/tool/toolUI.ui" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/tool/toolUI.ui" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/ui_pc/tool/tool_window.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/ui_pc/tool/tool_window.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/readme.md" beforeDir="false" afterPath="$PROJECT_DIR$/readme.md" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -21,8 +27,8 @@
       <list>
         <option value="Freeze Requirements File" />
         <option value="Blank Requirements File" />
-        <option value="Python Script" />
         <option value="HTML File" />
+        <option value="Python Script" />
       </list>
     </option>
   </component>
@@ -68,7 +74,7 @@
                 <list>
                   <RecentBranch>
                     <option name="branchName" value="master" />
-                    <option name="lastUsedInstant" value="1700478623" />
+                    <option name="lastUsedInstant" value="1701179528" />
                   </RecentBranch>
                   <RecentBranch>
                     <option name="branchName" value="dev_zsk" />
@@ -122,27 +128,6 @@
     </key>
   </component>
   <component name="RunManager" selected="Python.main_pc">
-    <configuration name="emoji" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
-      <module name="WeChatMsg" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/app/util" />
-      <option name="IS_MODULE_SDK" value="true" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/app/util/emoji.py" />
-      <option name="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
     <configuration name="hard_link" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="WeChatMsg" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -185,6 +170,27 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <configuration name="merge" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="WeChatMsg" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/app/DataBase" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/app/DataBase/merge.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
     <configuration name="pc_decrypt" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
       <module name="WeChatMsg" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -252,9 +258,9 @@
       <list>
         <item itemvalue="Python.main_pc" />
         <item itemvalue="Python.test" />
+        <item itemvalue="Python.merge" />
         <item itemvalue="Python.web" />
         <item itemvalue="Python.hard_link" />
-        <item itemvalue="Python.emoji" />
       </list>
     </recent_temporary>
   </component>
@@ -270,55 +276,6 @@
       <option name="presentableId" value="Default" />
       <updated>1672848140146</updated>
     </task>
-    <task id="LOCAL-00046" summary="修改导入路径，方便打包成exe">
-      <created>1699373594568</created>
-      <option name="number" value="00046" />
-      <option name="presentableId" value="LOCAL-00046" />
-      <option name="project" value="LOCAL" />
-      <updated>1699373594568</updated>
-    </task>
-    <task id="LOCAL-00047" summary="修改部分UI">
-      <created>1699531863395</created>
-      <option name="number" value="00047" />
-      <option name="presentableId" value="LOCAL-00047" />
-      <option name="project" value="LOCAL" />
-      <updated>1699531863395</updated>
-    </task>
-    <task id="LOCAL-00048" summary="上传html模板">
-      <created>1699700323644</created>
-      <option name="number" value="00048" />
-      <option name="presentableId" value="LOCAL-00048" />
-      <option name="project" value="LOCAL" />
-      <updated>1699700323644</updated>
-    </task>
-    <task id="LOCAL-00049" summary="增加几个图标">
-      <created>1699702527136</created>
-      <option name="number" value="00049" />
-      <option name="presentableId" value="LOCAL-00049" />
-      <option name="project" value="LOCAL" />
-      <updated>1699702527136</updated>
-    </task>
-    <task id="LOCAL-00050" summary="增加导航按钮效果">
-      <created>1699766149377</created>
-      <option name="number" value="00050" />
-      <option name="presentableId" value="LOCAL-00050" />
-      <option name="project" value="LOCAL" />
-      <updated>1699766149377</updated>
-    </task>
-    <task id="LOCAL-00051" summary="新增PC数据库解密">
-      <created>1699797095509</created>
-      <option name="number" value="00051" />
-      <option name="presentableId" value="LOCAL-00051" />
-      <option name="project" value="LOCAL" />
-      <updated>1699797095509</updated>
-    </task>
-    <task id="LOCAL-00052" summary="main首次加载解密界面">
-      <created>1699797493106</created>
-      <option name="number" value="00052" />
-      <option name="presentableId" value="LOCAL-00052" />
-      <option name="project" value="LOCAL" />
-      <updated>1699797493106</updated>
-    </task>
     <task id="LOCAL-00053" summary="update readme">
       <created>1699797862964</created>
       <option name="number" value="00053" />
@@ -613,7 +570,56 @@
       <option name="project" value="LOCAL" />
       <updated>1701178346464</updated>
     </task>
-    <option name="localTasksCounter" value="95" />
+    <task id="LOCAL-00095" summary="update readme">
+      <created>1701180610357</created>
+      <option name="number" value="00095" />
+      <option name="presentableId" value="LOCAL-00095" />
+      <option name="project" value="LOCAL" />
+      <updated>1701180610357</updated>
+    </task>
+    <task id="LOCAL-00096" summary="update version">
+      <created>1701180958841</created>
+      <option name="number" value="00096" />
+      <option name="presentableId" value="LOCAL-00096" />
+      <option name="project" value="LOCAL" />
+      <updated>1701180958841</updated>
+    </task>
+    <task id="LOCAL-00097" summary="update readme">
+      <created>1701253824370</created>
+      <option name="number" value="00097" />
+      <option name="presentableId" value="LOCAL-00097" />
+      <option name="project" value="LOCAL" />
+      <updated>1701253824370</updated>
+    </task>
+    <task id="LOCAL-00098" summary="合并msg数据库">
+      <created>1701264226625</created>
+      <option name="number" value="00098" />
+      <option name="presentableId" value="LOCAL-00098" />
+      <option name="project" value="LOCAL" />
+      <updated>1701264226625</updated>
+    </task>
+    <task id="LOCAL-00099" summary="修改初始加载显示页面">
+      <created>1701265181600</created>
+      <option name="number" value="00099" />
+      <option name="presentableId" value="LOCAL-00099" />
+      <option name="project" value="LOCAL" />
+      <updated>1701265181600</updated>
+    </task>
+    <task id="LOCAL-00100" summary="修改打开路径的初始位置，修复打开404图片闪退问题">
+      <created>1701269880600</created>
+      <option name="number" value="00100" />
+      <option name="presentableId" value="LOCAL-00100" />
+      <option name="project" value="LOCAL" />
+      <updated>1701269880600</updated>
+    </task>
+    <task id="LOCAL-00101" summary="修复再次解密数据库时显示msg.db占用问题">
+      <created>1701272464442</created>
+      <option name="number" value="00101" />
+      <option name="presentableId" value="LOCAL-00101" />
+      <option name="project" value="LOCAL" />
+      <updated>1701272464442</updated>
+    </task>
+    <option name="localTasksCounter" value="102" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -649,11 +655,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="导出所有数据库的聊天记录" />
-    <MESSAGE value="数据库加锁避免多线程访问报错" />
-    <MESSAGE value="修复聊天气泡不能更改大小的bug" />
-    <MESSAGE value="更改头像显示" />
-    <MESSAGE value="将自己的wxid设置为配置文件" />
     <MESSAGE value="修改聊天记录显示顺序" />
     <MESSAGE value="聊天记录从后往前显示" />
     <MESSAGE value="聊天消息自适应" />
@@ -669,12 +670,17 @@
     <MESSAGE value="支持显示表情包" />
     <MESSAGE value="修复第一次启动的问题" />
     <MESSAGE value="移除pandas" />
-    <MESSAGE value="update readme" />
     <MESSAGE value="更新帮助链接" />
     <MESSAGE value="新增导出所有聊天记录到CSV" />
     <MESSAGE value="修复str_content转义问题" />
     <MESSAGE value="add web" />
-    <option name="LAST_COMMIT_MESSAGE" value="add web" />
+    <MESSAGE value="update version" />
+    <MESSAGE value="update readme" />
+    <MESSAGE value="合并msg数据库" />
+    <MESSAGE value="修改初始加载显示页面" />
+    <MESSAGE value="修改打开路径的初始位置，修复打开404图片闪退问题" />
+    <MESSAGE value="修复再次解密数据库时显示msg.db占用问题" />
+    <option name="LAST_COMMIT_MESSAGE" value="修复再次解密数据库时显示msg.db占用问题" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
   </component>

app/config.py

@@ -1,8 +1,8 @@
 version = '0.2.4'
 contact = '474379264'
 description = [
-    '1. 支持获取个人信息\n',
+    '1. 支持获取个人信息<br>',
-    '2. 支持显示聊天界面\n',
+    '2. 支持显示聊天界面<br>',
-    '3. 支持导出聊天记录\n    * csv\n    * html\n',
+    '3. 支持导出聊天记录<br>&nbsp;&nbsp;&nbsp;&nbsp;* csv<br>&nbsp;&nbsp;&nbsp;&nbsp;* html<br>',
-    '4. 查找联系人\n',
+    '4. 查找联系人<br>',
 ]

app/resources/resource.qrc

@@ -19,6 +19,9 @@
         <file>version_list.json</file>
         <file>icons/logo.ico</file>
         <file>icons/logo.png</file>
+        <file>icons/tool.svg</file>
+        <file>icons/home.svg</file>
+        <file>icons/help.svg</file>
     </qresource>
     <qresource prefix="/data">
         <file>version_list.json</file>

app/ui_pc/Icon.py

@@ -22,3 +22,6 @@ class Icon:
     Analysis_Icon = QIcon(':/icons/icons/analysis.svg')
     Emotion_Icon = QIcon(':/icons/icons/emotion.svg')
     Search_Icon = QIcon(':/icons/icons/search.svg')
+    Tool_Icon = QIcon(':/icons/icons/tool.svg')
+    Home_Icon = QIcon(':/icons/icons/home.svg')
+    Help_Icon = QIcon(':/icons/icons/help.svg')

app/ui_pc/mainview.py

@@ -26,13 +26,7 @@ from ..person_pc import MePC
 
 # 美化样式表
 Stylesheet = """
-QPushButton {
+
-    background-color: rgb(240,240,240);
-    border:none;
-}
-QPushButton:hover{
-    background-color: rgb(209,209,209);
-}
 /*去掉item虚线边框*/
 QListWidget, QListView, QTreeWidget, QTreeView {
     outline: 0px;
@@ -109,6 +103,7 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
         self.menu_output.setIcon(Icon.Output)
         self.action_output_CSV.setIcon(Icon.ToCSV)
         self.action_output_CSV.triggered.connect(self.output)
+        self.action_desc.setIcon(Icon.Help_Icon)
         self.action_help_contact.triggered.connect(
             lambda: QDesktopServices.openUrl(QUrl("https://blog.lc044.love/post/5")))
         self.action_help_chat.triggered.connect(
@@ -118,10 +113,10 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
         self.listWidget.setVisible(False)
         self.stackedWidget.setVisible(False)
         self.listWidget.currentRowChanged.connect(self.setCurrentIndex)
-        tool_item = QListWidgetItem(Icon.MyInfo_Icon, '工具', self.listWidget)
+        tool_item = QListWidgetItem(Icon.Tool_Icon, '工具', self.listWidget)
         chat_item = QListWidgetItem(Icon.Chat_Icon, '聊天', self.listWidget)
         contact_item = QListWidgetItem(Icon.Contact_Icon, '好友', self.listWidget)
-        myinfo_item = QListWidgetItem(Icon.MyInfo_Icon, '我的', self.listWidget)
+        myinfo_item = QListWidgetItem(Icon.Home_Icon, '我的', self.listWidget)
         tool_window = ToolWindow()
         tool_window.get_info_signal.connect(self.set_my_info)
         tool_window.decrypt_success_signal.connect(self.load_data)
@@ -207,10 +202,8 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
         关于
         """
         QMessageBox.about(self, "关于",
-                          f"版本：{config.version}\n"
+                          f'''版本：{config.version}<br>QQ交流群:{config.contact}<br>地址：<a href='https://github.com/LC044/WeChatMsg'>https://github.com/LC044/WeChatMsg</a><br>新特性:<br>{''.join(['' + i for i in config.description])}
-                          f"QQ交流群:{config.contact}\n"
+                            '''
-                          "地址：https://github.com/LC044/WeChatMsg\n"
-                          f"新特性:\n{''.join(['*' + i for i in config.description])}"
                           )
 
     def close(self) -> bool:

app/ui_pc/tool/pc_decrypt/decryptUi.py

@@ -19,19 +19,27 @@ class Ui_Dialog(object):
         font.setFamily("微软雅黑")
         Dialog.setFont(font)
         Dialog.setLayoutDirection(QtCore.Qt.LeftToRight)
-        self.horizontalLayout_4 = QtWidgets.QHBoxLayout(Dialog)
+        self.verticalLayout_3 = QtWidgets.QVBoxLayout(Dialog)
-        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
+        self.verticalLayout_3.setObjectName("verticalLayout_3")
         self.verticalLayout_2 = QtWidgets.QVBoxLayout()
         self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_4.addItem(spacerItem)
         self.btn_help = QtWidgets.QPushButton(Dialog)
+        self.btn_help.setMaximumSize(QtCore.QSize(200, 16777215))
         self.btn_help.setObjectName("btn_help")
-        self.verticalLayout_2.addWidget(self.btn_help)
+        self.horizontalLayout_4.addWidget(self.btn_help)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_2.addItem(spacerItem)
+        self.horizontalLayout_4.addItem(spacerItem1)
+        self.verticalLayout_2.addLayout(self.horizontalLayout_4)
+        spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_2.addItem(spacerItem2)
         self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_3.addItem(spacerItem1)
+        self.horizontalLayout_3.addItem(spacerItem3)
         self.verticalLayout = QtWidgets.QVBoxLayout()
         self.verticalLayout.setObjectName("verticalLayout")
         self.label_3 = QtWidgets.QLabel(Dialog)
@@ -131,15 +139,15 @@ class Ui_Dialog(object):
         self.verticalLayout.addLayout(self.gridLayout_2)
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem2)
+        self.horizontalLayout_2.addItem(spacerItem4)
         self.pushButton_3 = QtWidgets.QPushButton(Dialog)
         self.pushButton_3.setMinimumSize(QtCore.QSize(0, 60))
         self.pushButton_3.setMaximumSize(QtCore.QSize(100, 16777215))
         self.pushButton_3.setObjectName("pushButton_3")
         self.horizontalLayout_2.addWidget(self.pushButton_3)
-        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem3)
+        self.horizontalLayout_2.addItem(spacerItem5)
         self.verticalLayout.addLayout(self.horizontalLayout_2)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
@@ -152,12 +160,12 @@ class Ui_Dialog(object):
         self.horizontalLayout.addWidget(self.progressBar)
         self.verticalLayout.addLayout(self.horizontalLayout)
         self.horizontalLayout_3.addLayout(self.verticalLayout)
-        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_3.addItem(spacerItem4)
+        self.horizontalLayout_3.addItem(spacerItem6)
         self.verticalLayout_2.addLayout(self.horizontalLayout_3)
-        spacerItem5 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem7 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_2.addItem(spacerItem5)
+        self.verticalLayout_2.addItem(spacerItem7)
-        self.horizontalLayout_4.addLayout(self.verticalLayout_2)
+        self.verticalLayout_3.addLayout(self.verticalLayout_2)
 
         self.retranslateUi(Dialog)
         QtCore.QMetaObject.connectSlotsByName(Dialog)

app/ui_pc/tool/pc_decrypt/decryptUi.ui

@@ -21,16 +21,52 @@
         <property name="layoutDirection">
             <enum>Qt::LeftToRight</enum>
         </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <layout class="QVBoxLayout" name="verticalLayout_3">
             <item>
                 <layout class="QVBoxLayout" name="verticalLayout_2">
+                    <item>
+                        <layout class="QHBoxLayout" name="horizontalLayout_4">
+                            <item>
+                                <spacer name="horizontalSpacer_6">
+                                    <property name="orientation">
+                                        <enum>Qt::Horizontal</enum>
+                                    </property>
+                                    <property name="sizeHint" stdset="0">
+                                        <size>
+                                            <width>40</width>
+                                            <height>20</height>
+                                        </size>
+                                    </property>
+                                </spacer>
+                            </item>
                             <item>
                                 <widget class="QPushButton" name="btn_help">
+                                    <property name="maximumSize">
+                                        <size>
+                                            <width>200</width>
+                                            <height>16777215</height>
+                                        </size>
+                                    </property>
                                     <property name="text">
                                         <string>使用说明</string>
                                     </property>
                                 </widget>
                             </item>
+                            <item>
+                                <spacer name="horizontalSpacer_5">
+                                    <property name="orientation">
+                                        <enum>Qt::Horizontal</enum>
+                                    </property>
+                                    <property name="sizeHint" stdset="0">
+                                        <size>
+                                            <width>40</width>
+                                            <height>20</height>
+                                        </size>
+                                    </property>
+                                </spacer>
+                            </item>
+                        </layout>
+                    </item>
                     <item>
                         <spacer name="verticalSpacer">
                             <property name="orientation">

app/ui_pc/tool/toolUI.py

@@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(630, 633)
+        Dialog.resize(630, 547)
         font = QtGui.QFont()
         font.setFamily("微软雅黑")
         Dialog.setFont(font)
@@ -26,6 +26,7 @@ class Ui_Dialog(object):
         self.horizontalLayout.setObjectName("horizontalLayout")
         self.label = QtWidgets.QLabel(Dialog)
         self.label.setMaximumSize(QtCore.QSize(80, 80))
+        self.label.setText("")
         self.label.setObjectName("label")
         self.horizontalLayout.addWidget(self.label)
         self.listWidget = QtWidgets.QListWidget(Dialog)
@@ -51,6 +52,7 @@ class Ui_Dialog(object):
         self.horizontalLayout.addWidget(self.listWidget)
         self.label_2 = QtWidgets.QLabel(Dialog)
         self.label_2.setMaximumSize(QtCore.QSize(80, 80))
+        self.label_2.setText("")
         self.label_2.setObjectName("label_2")
         self.horizontalLayout.addWidget(self.label_2)
         self.verticalLayout.addLayout(self.horizontalLayout)
@@ -66,7 +68,6 @@ class Ui_Dialog(object):
     def retranslateUi(self, Dialog):
         _translate = QtCore.QCoreApplication.translate
         Dialog.setWindowTitle(_translate("Dialog", "Dialog"))
-        self.label.setText(_translate("Dialog", "TextLabel"))
         __sortingEnabled = self.listWidget.isSortingEnabled()
         self.listWidget.setSortingEnabled(False)
         item = self.listWidget.item(0)
@@ -80,4 +81,3 @@ class Ui_Dialog(object):
         item = self.listWidget.item(4)
         item.setText(_translate("Dialog", "新建项目"))
         self.listWidget.setSortingEnabled(__sortingEnabled)
-        self.label_2.setText(_translate("Dialog", "TextLabel"))

app/ui_pc/tool/toolUI.ui

@@ -36,7 +36,7 @@
                                 </size>
                             </property>
                             <property name="text">
-                                <string>TextLabel</string>
+                                <string/>
                             </property>
                         </widget>
                     </item>
@@ -108,7 +108,7 @@
                                 </size>
                             </property>
                             <property name="text">
-                                <string>TextLabel</string>
+                                <string/>
                             </property>
                         </widget>
                     </item>

app/ui_pc/tool/tool_window.py

@@ -1,6 +1,5 @@
-from random import randint
-
 from PyQt5.QtCore import Qt, pyqtSignal
+from PyQt5.QtGui import QFont
 from PyQt5.QtWidgets import QWidget, QListWidgetItem, QLabel
 
 from app.ui_pc.Icon import Icon
@@ -60,19 +59,20 @@ class ToolWindow(QWidget, Ui_Dialog):
         self.listWidget.clear()
         self.listWidget.currentRowChanged.connect(self.setCurrentIndex)
         chat_item = QListWidgetItem(Icon.Chat_Icon, '解密', self.listWidget)
-        contact_item = QListWidgetItem(Icon.Contact_Icon, 'None', self.listWidget)
+        contact_item = QListWidgetItem(Icon.Contact_Icon, '别点', self.listWidget)
-        myinfo_item = QListWidgetItem(Icon.MyInfo_Icon, 'None', self.listWidget)
+        myinfo_item = QListWidgetItem(Icon.MyInfo_Icon, '别点', self.listWidget)
-        tool_item = QListWidgetItem(Icon.MyInfo_Icon, 'None', self.listWidget)
+        tool_item = QListWidgetItem(Icon.MyInfo_Icon, '别点', self.listWidget)
         decrypt_window = DecryptControl()
         decrypt_window.get_wxidSignal.connect(self.get_info_signal)
         decrypt_window.DecryptSignal.connect(self.decrypt_success_signal)
         self.stackedWidget.addWidget(decrypt_window)
-        label = QLabel('我是页面', self)
+        label = QLabel('都说了不让你点', self)
+        label.setFont(QFont("微软雅黑", 50))
         label.setAlignment(Qt.AlignCenter)
         # 设置label的背景颜色(这里随机)
         # 这里加了一个margin边距(方便区分QStackedWidget和QLabel的颜色)
-        label.setStyleSheet('background: rgb(%d, %d, %d);margin: 50px;' % (
+        # label.setStyleSheet('background: rgb(%d, %d, %d);margin: 50px;' % (
-            randint(0, 255), randint(0, 255), randint(0, 255)))
+        #     randint(0, 255), randint(0, 255), randint(0, 255)))
         self.stackedWidget.addWidget(label)
         self.stackedWidget.addWidget(label)
         self.stackedWidget.addWidget(label)

readme.md

@@ -28,13 +28,21 @@
     - 🗨文本✅
     - 🏝图片✅
     - 🐻‍❄️表情包✅
+    - 语音❎
+    - 视频❎
+    - 文件❎
+    - 回复❎
+    - 拍一拍❎
 - 导出聊天记录
     - HTML(文本、图片)✅
     - Word文档✅
     - CSV文档✅
 - 分析聊天数据，做成可视化年报
 - 🔥**项目持续更新中**
-- 小伙伴们想要其他功能可以留言哦🏆
+    - 导出全部表情包❎
+    - 合并多个备份数据❎
+
+- 小伙伴们想要其他功能可以留言哦📬
 - 有任何问题可以随时联系我(863909694@qq.com)
 
 为了方便大家交流，我新建了一个QQ群💬：**474379264**
@@ -196,7 +204,8 @@ python main.py
 * 觉得UI不够美观
 * 等其他给您造成困扰的地方
 
-请提起[issue](https://github.com/LC044/WeChatMsg/issues)或者添加QQ群:[**474379264**](doc/images/qq.jpg)，我将尽快为您解决问题
+请提起[issue](https://github.com/LC044/WeChatMsg/issues)或者添加QQ群(进群前先点个⭐哦):[**474379264**](doc/images/qq.jpg)
+，我将尽快为您解决问题
 
 如果您是一名开发者，有新的想法或建议，欢迎[fork](https://github.com/LC044/WeChatMsg/forks)
 该项目并发起[PR](https://github.com/LC044/WeChatMsg/pulls)，我将把您的名字写入贡献者名单中