增加几个图标

Austinguis · Nov 11, 2023 · 531fda2 · 531fda2
1 parent 17d598d
commit 531fda2
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 45 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git 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
@@ -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
@@ -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
@@ -102,7 +102,7 @@
                                 <item>
                                     <widget class="QPushButton" name="btn_report">
                                         <property name="text">
-                                            <string>生成年度报告</string>
+                                            <string>年度报告</string>
                                         </property>
                                         <property name="flat">
                                             <bool>true</bool>

diff --git 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
@@ -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
@@ -111,7 +111,7 @@
                                             </string>
                                         </property>
                                         <property name="text">
-                                            <string>联系人</string>
+                                            <string>好友</string>
                                         </property>
                                         <property name="flat">
                                             <bool>true</bool>

diff --git a/app/data/html/1.html b/app/data/html/1.html
@@ -252,15 +252,16 @@
         </div>
     </div>
 </div>
-<div id="j-preloader" class="m-preloader f-page z-hide">
-    <div class="content">
-        <div class="icon">
-            <div class="shadow"></div>
+    <div id="j-preloader" class="m-preloader f-page z-hide">
+        <div class="content">
+            <div class="icon">
+                <div class="shadow"></div>
+            </div>
+            <div id="j-progress" class="progress"></div>
         </div>
-        <div id="j-progress" class="progress"></div>
     </div>
 </div>
-    <script type="text/javascript" src="https://assets.pyecharts.org/assets/v5/echarts.min.js"></script>
+<script type="text/javascript" src="https://assets.pyecharts.org/assets/v5/echarts.min.js"></script>
 <script>
         var chart_3d9bc167542041d9a6c6e46a6d8e5dba = echarts.init(
             document.getElementById('3d9bc167542041d9a6c6e46a6d8e5dba'), 'white', {renderer: 'canvas'});

diff --git a/app/data/html/2.html b/app/data/html/2.html
@@ -174,21 +174,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="paras">
-                        <p class="para f-animLineUp" style="transition-delay: 0.2s;">这一年里</p>
-                        <p class="para f-animLineUp" style="transition-delay: 0.3s;">TA一共在云村听了
-                            <em class="s-fcRed f-fw1">1357</em>首歌</p>
-                        <p class="para f-animLineUp" style="transition-delay: 0.4s;">&nbsp;</p>
-                        <p class="para f-animLineUp" style="transition-delay: 0.5s;">TA热衷的风格成谜</p>
-                        <p class="para f-animLineUp" style="transition-delay: 0.6s;">喜欢在
-                            <em class="s-fcRed">午后</em>听歌</p>
-                        <p class="para f-animLineUp" style="transition-delay: 0.7s;">&nbsp;</p>
-                        <div>
-                            <p class="para f-animLineUp" style="transition-delay: 0.8s;">TA
-                                <em class="s-fcRed">热爱分享</em></p>
-                            <p class="para f-animLineUp" style="transition-delay: 0.9s;">评论区里藏着TA的许多回忆</p>
-                        </div>
-                    </div>
                 </div>
                 <div class="m-page m-page-01 f-page z-enter">
                     <div class="bg f-page"></div>

diff --git a/app/data/icons/analysis.svg b/app/data/icons/analysis.svg
diff --git a/app/data/icons/annual_report.svg b/app/data/icons/annual_report.svg
diff --git a/app/data/icons/chat.svg b/app/data/icons/chat.svg
diff --git a/app/data/icons/contact.svg b/app/data/icons/contact.svg