diff --git a/app/person_pc.py b/app/person_pc.py index de9c682a..f72283cf 100644 --- a/app/person_pc.py +++ b/app/person_pc.py @@ -49,7 +49,7 @@ def __init__(self, contact_info: Dict): self.smallHeadImgUrl = contact_info.get('smallHeadImgUrl') self.smallHeadImgBLOG = b'' self.avatar = QPixmap() - self.avatar_path = ':/icons/icons/default_avatar.svg' + self.avatar_path = Icon.Default_avatar_path def set_avatar(self, img_bytes): if not img_bytes: @@ -59,7 +59,6 @@ def set_avatar(self, img_bytes): self.avatar.loadFromData(img_bytes, format='PNG') else: self.avatar.loadFromData(img_bytes, format='jfif') - self.avatar.scaled(60, 60, Qt.IgnoreAspectRatio, Qt.SmoothTransformation) diff --git a/app/ui_pc/contact/contactInfo.py b/app/ui_pc/contact/contactInfo.py index 6e00ca20..9cadf691 100644 --- a/app/ui_pc/contact/contactInfo.py +++ b/app/ui_pc/contact/contactInfo.py @@ -1,5 +1,5 @@ -from PyQt5.QtCore import * -from PyQt5.QtWidgets import * +from PyQt5.QtCore import pyqtSignal, QUrl +from PyQt5.QtWidgets import QWidget, QMenu, QAction, QToolButton, QMessageBox from app.DataBase.output_pc import Output from app.ui_pc.Icon import Icon @@ -25,6 +25,9 @@ def init_ui(self): self.btn_report.setIcon(Icon.Annual_Report_Icon) self.btn_analysis.setIcon(Icon.Analysis_Icon) self.btn_emotion.setIcon(Icon.Emotion_Icon) + self.btn_report.clicked.connect(self.annual_report) + self.btn_analysis.clicked.connect(self.analysis) + self.btn_emotion.clicked.connect(self.emotionale_Analysis) self.label_remark.setText(self.contact.remark) self.stackedWidget.addWidget(self.view_userinfo) self.stackedWidget.setCurrentWidget(self.view_userinfo) @@ -48,6 +51,11 @@ def toolButton_show(self): self.toolButton_output.showMenu() def analysis(self): + QMessageBox.warning(self, + "别急别急", + "马上就实现该功能" + ) + return self.stackedWidget.setCurrentWidget(self.view_analysis) if 'room' in self.contact.wxid: QMessageBox.warning( @@ -68,6 +76,11 @@ def annual_report(self): # self.report.show() def emotionale_Analysis(self): + QMessageBox.warning(self, + "别急别急", + "马上就实现该功能" + ) + return self.stackedWidget.setCurrentWidget(self.view_emotion) if 'room' in self.contact.wxid: QMessageBox.warning( @@ -121,6 +134,5 @@ def output_progress(self, value): self.view_userinfo.progressBar.setProperty('value', value) def set_progressBar_range(self, value): - print('进度条范围', value) self.view_userinfo.progressBar.setVisible(True) self.view_userinfo.progressBar.setRange(0, value) diff --git a/app/ui_pc/mainview.py b/app/ui_pc/mainview.py index 58143893..82db6d79 100644 --- a/app/ui_pc/mainview.py +++ b/app/ui_pc/mainview.py @@ -89,7 +89,6 @@ def load_data(self, flag=True): me.name = dic.get('name') me.mobile = dic.get('mobile') me.wx_dir = dic.get('wx_dir') - print('wx_dir', me.wx_dir) self.set_my_info(wxid) self.load_flag = True else: diff --git a/app/ui_pc/tool/pc_decrypt/decryptUi.py b/app/ui_pc/tool/pc_decrypt/decryptUi.py index 889744d4..25939560 100644 --- a/app/ui_pc/tool/pc_decrypt/decryptUi.py +++ b/app/ui_pc/tool/pc_decrypt/decryptUi.py @@ -187,6 +187,6 @@ def retranslateUi(self, Dialog): self.label_8.setText(_translate("Dialog", "微信路径")) self.btn_getinfo.setText(_translate("Dialog", "获取信息")) self.btn_db_dir.setText(_translate("Dialog", "设置微信路径")) - self.pushButton_3.setText(_translate("Dialog", "开始解密")) + self.pushButton_3.setText(_translate("Dialog", "开始启动")) self.label_tip.setText(_translate("Dialog", "TextLabel")) self.label_ready.setText(_translate("Dialog", "未就绪")) diff --git a/app/ui_pc/tool/pc_decrypt/decryptUi.ui b/app/ui_pc/tool/pc_decrypt/decryptUi.ui index 1f01ccb7..38905083 100644 --- a/app/ui_pc/tool/pc_decrypt/decryptUi.ui +++ b/app/ui_pc/tool/pc_decrypt/decryptUi.ui @@ -315,7 +315,7 @@ - 开始解密 + 开始启动 diff --git a/main.spec b/main.spec deleted file mode 100644 index af2513a8..00000000 --- a/main.spec +++ /dev/null @@ -1,80 +0,0 @@ -# -*- mode: python ; coding: utf-8 -*- - -add_files = [ - ("D:\\Project\\Python\\WeChatMsg\\app\\data\\icon.png",'.\\app\\data'), - ("D:\\Project\\Python\\WeChatMsg\\app\\data\\stopwords.txt",'.\\app\\data'), - ("D:\\Project\\Python\\WeChatMsg\\app\\data\\bg.gif",'.\\app\\data'), - ("D:\\Project\\Python\\WeChatMsg\\app\\data\\icons",'.\\app\\data\\icons'), - ("D:\\Project\\Python\\WeChatMsg\\app\\ImageBox",'.\\app\\ImageBox'), - ("D:\\Project\\Python\\WeChatMsg\\app\\DataBase",'.\\app\\DataBase'), - #("D:\\Project\\Python\\WeChatMsg\\app\\Ui",'.\\app\\Ui'), - ("D:\\Project\\Python\\WeChatMsg\\sqlcipher-3.0.1",'.\\sqlcipher-3.0.1'), - ('.\\resource\\datasets', 'pyecharts\\datasets\\.'), - ('.\\resource\\render\\templates', 'pyecharts\\render\\templates\\.'), - ('.\\data\\AnnualReport', 'data\\AnnualReport'), - ("D:\\Program Files\\Python310\\Lib\\site-packages\\snownlp",'snownlp') - -] -block_cipher = None - -#("D:\\Project\\Python\\WeChatMsg\\sqlcipher-3.0.1",'.\\sqlcipher-3.0.1') - -a = Analysis( - ['main.py', - './app/DataBase/data.py','./app/DataBase/output.py', - './app/Ui/mainview.py','./app/Ui/mainwindow.py', - './app/Ui/__init__.py', - './app/Ui/chat/chat.py','./app/Ui/chat/chatUi.py', - './app/Ui/contact/contact.py','./app/Ui/contact/contactUi.py','./app/Ui/contact/analysis/analysis.py','./app/Ui/contact/analysis/charts.py','./app/Ui/contact/report/report.py', - './app/Ui/contact/emotion/emotion.py','./app/Ui/contact/emotion/emotionUi.py', - './app/Ui/contact/contactInfo.py','./app/Ui/contact/contactInfoUi.py', - './app/Ui/contact/userinfo/userinfoUi.py','./app/Ui/contact/userinfo/userinfo.py', - './app/Ui/decrypt/decrypt.py','./app/Ui/decrypt/decryptUi.py', - './app/Ui/userinfo/userinfo.py','./app/Ui/userinfo/userinfoUi.py', - './app/person.py', - './app/Ui/ICON.py', - './app/Ui/MyComponents/Button_Contact.py' - ], - pathex=[], - binaries=[], - datas=add_files, - hiddenimports=[], - hookspath=[], - hooksconfig={}, - runtime_hooks=[], - excludes=[], - win_no_prefer_redirects=False, - win_private_assemblies=False, - cipher=block_cipher, - noarchive=False, -) -pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher) - -exe = EXE( - pyz, - a.scripts, - [], - exclude_binaries=True, - name='main', - debug=False, - bootloader_ignore_signals=False, - strip=False, - upx=True, - console=True, - disable_windowed_traceback=True, - argv_emulation=False, - target_arch=None, - codesign_identity=None, - entitlements_file=None, - icon='./app/data/icon.png' -) -coll = COLLECT( - exe, - a.binaries, - a.zipfiles, - a.datas, - strip=False, - upx=True, - upx_exclude=[], - name='main', -) diff --git a/main_pc.py b/main_pc.py index 0291e5c1..21aa303c 100644 --- a/main_pc.py +++ b/main_pc.py @@ -3,7 +3,6 @@ import time import traceback -from PyQt5.QtGui import QIcon from PyQt5.QtWidgets import * from app.log import logger @@ -16,8 +15,6 @@ class ViewController(QWidget): def __init__(self): super().__init__() - self.setWindowTitle('解密') - self.setWindowIcon(QIcon(':/icons/icons/logo.png')) self.viewMainWIndow = None self.viewDecrypt = None