diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4405dbd7..ffeee828 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,26 +4,15 @@ - @@ -607,7 +602,8 @@ - diff --git a/app/Ui/Icon.py b/app/Ui/Icon.py index 896fb6dd..808fae3d 100644 --- a/app/Ui/Icon.py +++ b/app/Ui/Icon.py @@ -10,3 +10,9 @@ class Icon: ToDocx = QIcon('app/data/icons/word.svg') ToCSV = QIcon('app/data/icons/csv.svg') ToHTML = QIcon('app/data/icons/html.svg') + Chat_Icon = QIcon('./app/data/icons/chat.svg') + Contact_Icon = QIcon('./app/data/icons/contact.svg') + MyInfo_Icon = QIcon('./app/data/icons/myinfo.svg') + Annual_Report_Icon = QIcon('./app/data/icons/annual_report.svg') + Analysis_Icon = QIcon('./app/data/icons/analysis.svg') + Emotion_Icon = QIcon('./app/data/icons/emotion.svg') diff --git a/app/Ui/contact/contactInfo.py b/app/Ui/contact/contactInfo.py index 903ebaa0..eaf4db0a 100644 --- a/app/Ui/contact/contactInfo.py +++ b/app/Ui/contact/contactInfo.py @@ -32,6 +32,9 @@ def __init__(self, wxid, me: person.Me, parent=None): def init_ui(self): self.btn_back.setIcon(Icon.Back) + self.btn_report.setIcon(Icon.Annual_Report_Icon) + self.btn_analysis.setIcon(Icon.Analysis_Icon) + self.btn_emotion.setIcon(Icon.Emotion_Icon) self.label_remark.setText(self.contact.conRemark) self.stackedWidget.addWidget(self.view_userinfo) self.stackedWidget.addWidget(self.view_analysis) diff --git a/app/Ui/contact/contactInfoUi.py b/app/Ui/contact/contactInfoUi.py index 83d3962f..aa973a18 100644 --- a/app/Ui/contact/contactInfoUi.py +++ b/app/Ui/contact/contactInfoUi.py @@ -87,6 +87,6 @@ def retranslateUi(self, Form): Form.setWindowTitle(_translate("Form", "Form")) self.btn_analysis.setText(_translate("Form", "统计信息")) self.btn_emotion.setText(_translate("Form", "情感分析")) - self.btn_report.setText(_translate("Form", "生成年度报告")) + self.btn_report.setText(_translate("Form", "年度报告")) self.btn_back.setText(_translate("Form", "退出")) self.toolButton_output.setText(_translate("Form", "导出聊天记录")) diff --git a/app/Ui/contact/contactInfoUi.ui b/app/Ui/contact/contactInfoUi.ui index 86b3e261..18591fb7 100644 --- a/app/Ui/contact/contactInfoUi.ui +++ b/app/Ui/contact/contactInfoUi.ui @@ -102,7 +102,7 @@ - 生成年度报告 + 年度报告 true diff --git a/app/Ui/mainview.py b/app/Ui/mainview.py index 1480be47..10890c2a 100644 --- a/app/Ui/mainview.py +++ b/app/Ui/mainview.py @@ -46,6 +46,9 @@ def __init__(self, username, parent=None): # self.btn_myinfo.clicked.connect(self.myInfo) self.btn_about.clicked.connect(self.about) self.now_btn = self.btn_chat + self.btn_chat.setIcon(Icon.Chat_Icon) + self.btn_contact.setIcon(Icon.Contact_Icon) + self.btn_myinfo.setIcon(Icon.MyInfo_Icon) self.btn_about.setIcon(Icon.MainWindow_Icon) self.btn_about.setContextMenuPolicy(Qt.CustomContextMenu) self.btn_about.customContextMenuRequested.connect(self.create_rightmenu) # 连接到菜单显示函数 diff --git a/app/Ui/mainwindow.py b/app/Ui/mainwindow.py index 773e7328..f3b9f602 100644 --- a/app/Ui/mainwindow.py +++ b/app/Ui/mainwindow.py @@ -149,7 +149,7 @@ def retranslateUi(self, MainWindow): _translate = QtCore.QCoreApplication.translate MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow")) self.btn_chat.setText(_translate("MainWindow", "聊天")) - self.btn_contact.setText(_translate("MainWindow", "联系人")) + self.btn_contact.setText(_translate("MainWindow", "好友")) self.btn_myinfo.setText(_translate("MainWindow", "我的")) self.btn_about.setText(_translate("MainWindow", "关于")) self.myavatar.setText(_translate("MainWindow", "avatar")) diff --git a/app/Ui/mainwindow.ui b/app/Ui/mainwindow.ui index f28e78ca..3bd55a6b 100644 --- a/app/Ui/mainwindow.ui +++ b/app/Ui/mainwindow.ui @@ -111,7 +111,7 @@ - 联系人 + 好友 true diff --git a/app/data/html/1.html b/app/data/html/1.html index 646027f4..9e2e3a02 100644 --- a/app/data/html/1.html +++ b/app/data/html/1.html @@ -252,15 +252,16 @@ -
-
-
-
+
+
+
+
+
+
-
- +