diff --git a/.gitignore b/.gitignore index 1dd9b9f..2df7527 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ app/data/image2 app/data/emoji app/DataBase/Msg/* *.db +*.ui *.pyc *.log *.spec diff --git a/app/DataBase/merge.py b/app/DataBase/merge.py index 27ea06b..2038a84 100644 --- a/app/DataBase/merge.py +++ b/app/DataBase/merge.py @@ -1,6 +1,42 @@ import os import sqlite3 +def merge_MediaMSG_databases(source_paths, target_path): + # 创建目标数据库连接 + target_conn = sqlite3.connect(target_path) + target_cursor = target_conn.cursor() + try: + # 开始事务 + target_conn.execute("BEGIN;") + for i, source_path in enumerate(source_paths): + if not os.path.exists(source_path): + break + db = sqlite3.connect(source_path) + db.text_factory = str + cursor = db.cursor() + sql = ''' + SELECT Key,Reserved0,Buf,Reserved1,Reserved2 FROM Media; + ''' + cursor.execute(sql) + result = cursor.fetchall() + # 附加源数据库 + target_cursor.executemany( + "INSERT INTO Media (Key,Reserved0,Buf,Reserved1,Reserved2)" + "VALUES(?,?,?,?,?)", + result) + cursor.close() + db.close() + # 提交事务 + target_conn.execute("COMMIT;") + + except Exception as e: + # 发生异常时回滚事务 + target_conn.execute("ROLLBACK;") + raise e + + finally: + # 关闭目标数据库连接 + target_conn.close() def merge_databases(source_paths, target_path): # 创建目标数据库连接 diff --git a/app/DataBase/output_pc.py b/app/DataBase/output_pc.py index 55bb67c..e4d5f72 100644 --- a/app/DataBase/output_pc.py +++ b/app/DataBase/output_pc.py @@ -518,234 +518,233 @@ html_head = ''' Chat Records -
+
昨天 12:35
你已添加了凡繁烦，现在可以开始聊天了。
@@ -779,65 +778,63 @@ input {
昨天 13:15
-
-
-
- - -
-
- - -
-
+
+ + +
+
+ + +
+
diff --git a/app/Ui/chat/chatUi.ui b/app/Ui/chat/chatUi.ui deleted file mode 100644 index 8ae5714..0000000 --- a/app/Ui/chat/chatUi.ui +++ /dev/null @@ -1,329 +0,0 @@ - - - Form - - - - 0 - 0 - 878 - 720 - - - - Form - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - true - - - - 325 - 150000 - - - - false - - - QFrame::NoFrame - - - QFrame::Raised - - - 0 - - - Qt::ScrollBarAlwaysOn - - - Qt::ScrollBarAlwaysOff - - - QAbstractScrollArea::AdjustToContentsOnFirstShow - - - false - - - - - 0 - 0 - 300 - 12000 - - - - - - 0 - 0 - 300 - 80 - - - - Qt::LeftToRight - - - false - - - - - - - 80 - 80 - - - - - - - 220 - 10 - 72 - 15 - - - - TextLabel - - - - - - - - - - 500 - 500 - - - - background-color: #F5F5F5; - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - 12 - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - ... - - - - - - - - - Qt::Horizontal - - - - - - - Qt::ActionsContextMenu - - - background-color: #F5F5F5; - - - - - - - Qt::Horizontal - - - - - - - - 15 - - - - false - - - background-color: #F5F5F5; - - - QFrame::NoFrame - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> - <html><head><meta name="qrichtext" content="1" - /><style type="text/css"> - p, li { white-space: pre-wrap; } - </style></head><body style=" font-family:'SimSun'; - font-size:15pt; font-weight:400; font-style:normal;"> - <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; - margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p> - <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; - margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p> - <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; - margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p> - <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; - margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p></body></html> - - - - false - - - 80 - - - true - - - 1 - - - Qt::TextEditorInteraction - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 黑体 - 15 - 50 - false - - - - ArrowCursor - - - false - - - false - - - QPushButton { - background-color:rgb(233,233,233); - padding: 10px; - color:rgb(5,180,104);} - QPushButton:hover{ - background-color:rgb(198,198,198)} - - - - 发送 - - - - 40 - 40 - - - - false - - - true - - - - - - - - - - - - - diff --git a/app/Ui/contact/contactInfoUi.ui b/app/Ui/contact/contactInfoUi.ui deleted file mode 100644 index 18591fb..0000000 --- a/app/Ui/contact/contactInfoUi.ui +++ /dev/null @@ -1,168 +0,0 @@ - - - Form - - - - 0 - 0 - 817 - 748 - - - - Form - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - 0 - - - - - - 16777215 - 100 - - - - - 12 - - - - - - - - - - - - - - 统计信息 - - - true - - - - - - - 情感分析 - - - true - - - - - - - 年度报告 - - - true - - - - - - - 退出 - - - true - - - - - - - 导出聊天记录 - - - - ../../data/icons/output.svg - ../../data/icons/output.svg - - - - false - - - QToolButton::MenuButtonPopup - - - Qt::ToolButtonTextBesideIcon - - - true - - - Qt::NoArrow - - - - - - - - - 1 - - - - - - - - - - - - - diff --git a/app/Ui/contact/contactUi.ui b/app/Ui/contact/contactUi.ui deleted file mode 100644 index 42973cd..0000000 --- a/app/Ui/contact/contactUi.ui +++ /dev/null @@ -1,166 +0,0 @@ - - - Dialog - - - - 0 - 0 - 1141 - 740 - - - - ArrowCursor - - - Dialog - - - false - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - true - - - - 325 - 0 - - - - - 325 - 150000 - - - - false - - - QFrame::NoFrame - - - QFrame::Raised - - - 0 - - - Qt::ScrollBarAlwaysOn - - - Qt::ScrollBarAlwaysOff - - - QAbstractScrollArea::AdjustToContentsOnFirstShow - - - false - - - - - 0 - 0 - 300 - 12000 - - - - - - 0 - 0 - 300 - 80 - - - - Qt::LeftToRight - - - false - - - - - - - 80 - 80 - - - - - - - 220 - 10 - 72 - 15 - - - - TextLabel - - - - - - - - - - - - - - - - - - - diff --git a/app/Ui/contact/emotion/emotionUi.ui b/app/Ui/contact/emotion/emotionUi.ui deleted file mode 100644 index 4d9e1ab..0000000 --- a/app/Ui/contact/emotion/emotionUi.ui +++ /dev/null @@ -1,19 +0,0 @@ - - Dialog - - - - 0 - 0 - 400 - 300 - - - - Dialog - - - - - - diff --git a/app/Ui/contact/test.ui b/app/Ui/contact/test.ui deleted file mode 100644 index b48643c..0000000 --- a/app/Ui/contact/test.ui +++ /dev/null @@ -1,25 +0,0 @@ - - - - - MainWindow - - - - 0 - 0 - 800 - 600 - - - - MainWindow - - - - - - - - - diff --git a/app/Ui/contact/userinfo/userinfoUi.ui b/app/Ui/contact/userinfo/userinfoUi.ui deleted file mode 100644 index 3bba2de..0000000 --- a/app/Ui/contact/userinfo/userinfoUi.ui +++ /dev/null @@ -1,280 +0,0 @@ - - - Frame - - - - 0 - 0 - 800 - 720 - - - - IBeamCursor - - - true - - - true - - - Frame - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - 6 - - - - - - 80 - 80 - - - - - 80 - 80 - - - - - - - ../../../a_img/be0fa6c0c4707fb5f7b37b660de826d3.jpg - - - true - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - - 15 - - - - 曹雨萱 - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - 昵称：997 - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - 账号：TextLabel - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - - 15 - - - - 备注名 - - - - - - - - 0 - 25 - - - - - 16777215 - 25 - - - - - 15 - - - - ArrowCursor - - - false - - - - background:transparent;border-width:0;border-style:outset - - - - 曹雨萱 - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - 24 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - diff --git a/app/Ui/decrypt/decryptUi.ui b/app/Ui/decrypt/decryptUi.ui deleted file mode 100644 index 92552dc..0000000 --- a/app/Ui/decrypt/decryptUi.ui +++ /dev/null @@ -1,119 +0,0 @@ - - - Dialog - - - - 0 - 0 - 400 - 300 - - - - Dialog - - - - - 110 - 20 - 221 - 51 - - - - - 一纸情书 - 20 - - - - 解密数据库 - - - - - - 90 - 260 - 271 - 23 - - - - 50 - - - - - - 80 - 230 - 241 - 20 - - - - - - - - - - 80 - 80 - 245 - 134 - - - - - - - - - 点击加载xml文件 - - - - - - - xml未就绪 - - - - - - - - - - - 点击加载数据库文件 - - - - - - - 数据库未就绪 - - - - - - - - - 开始解密数据库 - - - - - - - - - diff --git a/app/Ui/mainwindow.ui b/app/Ui/mainwindow.ui deleted file mode 100644 index 208e7db..0000000 --- a/app/Ui/mainwindow.ui +++ /dev/null @@ -1,291 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 1280 - 779 - - - - MainWindow - - - QPushButton { - background-color: rgb(240,240,240); - border:none; - } - QPushButton:hover{ - background-color: rgb(209,209,209); - } - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 80 - 500 - - - - - 80 - 16777215 - - - - background-color:rgb(240,240,240) - - - QFrame::NoFrame - - - QFrame::Plain - - - - - 0 - 190 - 77 - 271 - - - - - 0 - - - - - - 0 - 60 - - - - - 微软雅黑 - - - - QPushButton { - background-color: rgb(240,240,240); - border:none; - } - QPushButton:hover{background-color: rgb(209,209,209);} - - - - 聊天 - - - true - - - false - - - false - - - - - - - - 0 - 60 - - - - - 微软雅黑 - - - - QPushButton { - background-color: rgb(240,240,240); - border:none; - } - QPushButton:hover{ - background-color: rgb(209,209,209); - } - - - - 好友 - - - true - - - false - - - - - - - - 60 - 60 - - - - - 微软雅黑 - - - - 我的 - - - false - - - - - - - - 60 - 60 - - - - - 微软雅黑 - - - - QPushButton {background-color: rgb(240,240,240);} - QPushButton:hover{background-color: rgb(209,209,209);} - - - - 关于 - - - false - - - - - - - - - 10 - 40 - 60 - 60 - - - - avatar - - - - - - - - - 微软雅黑 - 50 - false - - - - - - - - - - - - - - 0 - 0 - 1280 - 23 - - - - - 文件(F) - - - - - - - - - - 微软雅黑 - - - - 编辑 - - - - - 帮助 - - - - - - - - - - - 保存 - - - - - 退出 - - - - - 关于 - - - - Microsoft YaHei UI - - - - - - - diff --git a/app/Ui/userinfo/userinfoUi.ui b/app/Ui/userinfo/userinfoUi.ui deleted file mode 100644 index 50d0fd8..0000000 --- a/app/Ui/userinfo/userinfoUi.ui +++ /dev/null @@ -1,91 +0,0 @@ - - - Dialog - - - - 0 - 0 - 1120 - 720 - - - - ArrowCursor - - - Dialog - - - false - - - - - 0 - 0 - 1120 - 720 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - 340 - 60 - 291 - 82 - - - - - - - - 80 - 80 - - - - TextLabel - - - - - - - - - TextLabel - - - - - - - TextLabel - - - - - - - TextLabel - - - - - - - - - - - - diff --git a/app/ui_pc/chat/chatInfoUi.ui b/app/ui_pc/chat/chatInfoUi.ui deleted file mode 100644 index bb8c9aa..0000000 --- a/app/ui_pc/chat/chatInfoUi.ui +++ /dev/null @@ -1,96 +0,0 @@ - - - Form - - - - 0 - 0 - 817 - 748 - - - - Form - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - - - - - TextLabel - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - ... - - - - - - - - - true - - - - - 0 - 0 - 797 - 700 - - - - - - - - - - - - - diff --git a/app/ui_pc/chat/chatUi.ui b/app/ui_pc/chat/chatUi.ui deleted file mode 100644 index 9a08d97..0000000 --- a/app/ui_pc/chat/chatUi.ui +++ /dev/null @@ -1,118 +0,0 @@ - - - Form - - - - 0 - 0 - 840 - 752 - - - - Form - - - background: rgb(240, 240, 240); - - - - 6 - - - - - 6 - - - - - - - - - - - - - - - - - 200 - 30 - - - - - 200 - 16777215 - - - - background:transparent; - border-radius:5px; - border-top: 0px solid #b2e281; - border-bottom: 0px solid #b2e281; - border-right: 0px solid #b2e281; - border-left: 0px solid #b2e281; - border-style:outset; - background-color:rgb(226,226,226); - - - - Qt::VisualMoveStyle - - - - - - - - 30 - 0 - - - - - - - - - - - - - - - - 250 - 0 - - - - - 250 - 16777215 - - - - Qt::ScrollBarAlwaysOff - - - - - - - - - -1 - - - - - - - - diff --git a/app/ui_pc/chat/chat_window.py b/app/ui_pc/chat/chat_window.py index a0cf7cd..b2fa2fb 100644 --- a/app/ui_pc/chat/chat_window.py +++ b/app/ui_pc/chat/chat_window.py @@ -71,6 +71,7 @@ class ChatWindow(QWidget, Ui_Form): self.stackedWidget.setCurrentIndex(0) def show_chats(self): + # return if self.ok_flag: return msg_db.init_database() diff --git a/app/ui_pc/contact/contactInfoUi.py b/app/ui_pc/contact/contactInfoUi.py index aa973a1..cba0b77 100644 --- a/app/ui_pc/contact/contactInfoUi.py +++ b/app/ui_pc/contact/contactInfoUi.py @@ -14,48 +14,63 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_Form(object): def setupUi(self, Form): Form.setObjectName("Form") - Form.resize(817, 748) - self.horizontalLayout = QtWidgets.QHBoxLayout(Form) - self.horizontalLayout.setContentsMargins(0, 0, 0, 0) - self.horizontalLayout.setSpacing(0) - self.horizontalLayout.setObjectName("horizontalLayout") - self.frame = QtWidgets.QFrame(Form) - self.frame.setFrameShape(QtWidgets.QFrame.NoFrame) - self.frame.setFrameShadow(QtWidgets.QFrame.Raised) - self.frame.setObjectName("frame") - self.verticalLayout = QtWidgets.QVBoxLayout(self.frame) - self.verticalLayout.setContentsMargins(0, 0, 0, 0) - self.verticalLayout.setSpacing(0) + Form.resize(494, 748) + self.verticalLayout = QtWidgets.QVBoxLayout(Form) self.verticalLayout.setObjectName("verticalLayout") self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3.setSpacing(0) self.horizontalLayout_3.setObjectName("horizontalLayout_3") - self.label_remark = QtWidgets.QLabel(self.frame) - self.label_remark.setMaximumSize(QtCore.QSize(16777215, 100)) + self.label_remark = QtWidgets.QLabel(Form) + self.label_remark.setMaximumSize(QtCore.QSize(120, 100)) font = QtGui.QFont() font.setPointSize(12) self.label_remark.setFont(font) self.label_remark.setText("") self.label_remark.setObjectName("label_remark") self.horizontalLayout_3.addWidget(self.label_remark) - self.btn_analysis = QtWidgets.QPushButton(self.frame) + self.btn_analysis = QtWidgets.QPushButton(Form) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.btn_analysis.sizePolicy().hasHeightForWidth()) + self.btn_analysis.setSizePolicy(sizePolicy) self.btn_analysis.setStyleSheet("") - self.btn_analysis.setFlat(True) + self.btn_analysis.setFlat(False) self.btn_analysis.setObjectName("btn_analysis") self.horizontalLayout_3.addWidget(self.btn_analysis) - self.btn_emotion = QtWidgets.QPushButton(self.frame) - self.btn_emotion.setFlat(True) + self.btn_emotion = QtWidgets.QPushButton(Form) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.btn_emotion.sizePolicy().hasHeightForWidth()) + self.btn_emotion.setSizePolicy(sizePolicy) + self.btn_emotion.setFlat(False) self.btn_emotion.setObjectName("btn_emotion") self.horizontalLayout_3.addWidget(self.btn_emotion) - self.btn_report = QtWidgets.QPushButton(self.frame) - self.btn_report.setFlat(True) + self.btn_report = QtWidgets.QPushButton(Form) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.btn_report.sizePolicy().hasHeightForWidth()) + self.btn_report.setSizePolicy(sizePolicy) + self.btn_report.setFlat(False) self.btn_report.setObjectName("btn_report") self.horizontalLayout_3.addWidget(self.btn_report) - self.btn_back = QtWidgets.QPushButton(self.frame) - self.btn_back.setFlat(True) + self.btn_back = QtWidgets.QPushButton(Form) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.btn_back.sizePolicy().hasHeightForWidth()) + self.btn_back.setSizePolicy(sizePolicy) + self.btn_back.setFlat(False) self.btn_back.setObjectName("btn_back") self.horizontalLayout_3.addWidget(self.btn_back) - self.toolButton_output = QtWidgets.QToolButton(self.frame) + self.toolButton_output = QtWidgets.QToolButton(Form) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.toolButton_output.sizePolicy().hasHeightForWidth()) + self.toolButton_output.setSizePolicy(sizePolicy) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap("../../data/icons/output.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.toolButton_output.setIcon(icon) @@ -66,8 +81,9 @@ class Ui_Form(object): self.toolButton_output.setArrowType(QtCore.Qt.NoArrow) self.toolButton_output.setObjectName("toolButton_output") self.horizontalLayout_3.addWidget(self.toolButton_output) + self.horizontalLayout_3.setStretch(0, 1) self.verticalLayout.addLayout(self.horizontalLayout_3) - self.stackedWidget = QtWidgets.QStackedWidget(self.frame) + self.stackedWidget = QtWidgets.QStackedWidget(Form) self.stackedWidget.setObjectName("stackedWidget") self.page_3 = QtWidgets.QWidget() self.page_3.setObjectName("page_3") @@ -76,7 +92,6 @@ class Ui_Form(object): self.page_4.setObjectName("page_4") self.stackedWidget.addWidget(self.page_4) self.verticalLayout.addWidget(self.stackedWidget) - self.horizontalLayout.addWidget(self.frame) self.retranslateUi(Form) self.stackedWidget.setCurrentIndex(1) diff --git a/app/ui_pc/contact/contactInfoUi.ui b/app/ui_pc/contact/contactInfoUi.ui deleted file mode 100644 index 18591fb..0000000 --- a/app/ui_pc/contact/contactInfoUi.ui +++ /dev/null @@ -1,168 +0,0 @@ - - - Form - - - - 0 - 0 - 817 - 748 - - - - Form - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - 0 - - - - - - 16777215 - 100 - - - - - 12 - - - - - - - - - - - - - - 统计信息 - - - true - - - - - - - 情感分析 - - - true - - - - - - - 年度报告 - - - true - - - - - - - 退出 - - - true - - - - - - - 导出聊天记录 - - - - ../../data/icons/output.svg - ../../data/icons/output.svg - - - - false - - - QToolButton::MenuButtonPopup - - - Qt::ToolButtonTextBesideIcon - - - true - - - Qt::NoArrow - - - - - - - - - 1 - - - - - - - - - - - - - diff --git a/app/ui_pc/contact/contactUi.ui b/app/ui_pc/contact/contactUi.ui deleted file mode 100644 index fbacbc5..0000000 --- a/app/ui_pc/contact/contactUi.ui +++ /dev/null @@ -1,121 +0,0 @@ - - - Form - - - - 0 - 0 - 840 - 752 - - - - Form - - - background: rgb(240, 240, 240); - - - - - - 6 - - - - - - - - - - - - - - - - - 200 - 30 - - - - - 200 - 16777215 - - - - background:transparent; - border-radius:5px; - border-top: 0px solid #b2e281; - border-bottom: 0px solid #b2e281; - border-right: 0px solid #b2e281; - border-left: 0px solid #b2e281; - border-style:outset; - background-color:rgb(226,226,226); - - - - Qt::VisualMoveStyle - - - - - - - - 30 - 0 - - - - - 30 - 16777215 - - - - - - - - - - - - - - - - 250 - 0 - - - - - 250 - 16777215 - - - - Qt::ScrollBarAlwaysOff - - - - - - - - - -1 - - - - - - - - diff --git a/app/ui_pc/contact/contact_window.py b/app/ui_pc/contact/contact_window.py index a37177f..864f3e9 100644 --- a/app/ui_pc/contact/contact_window.py +++ b/app/ui_pc/contact/contact_window.py @@ -70,6 +70,7 @@ class ContactWindow(QWidget, Ui_Form): self.stackedWidget.setCurrentIndex(0) def show_contacts(self): + # return if self.ok_flag: return micro_msg_db.init_database() diff --git a/app/ui_pc/contact/userinfo/userinfoUi.py b/app/ui_pc/contact/userinfo/userinfoUi.py index 8154cf6..8494e5d 100644 --- a/app/ui_pc/contact/userinfo/userinfoUi.py +++ b/app/ui_pc/contact/userinfo/userinfoUi.py @@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_Frame(object): def setupUi(self, Frame): Frame.setObjectName("Frame") - Frame.resize(800, 720) + Frame.resize(624, 720) Frame.setCursor(QtGui.QCursor(QtCore.Qt.IBeamCursor)) Frame.setMouseTracking(True) Frame.setTabletTracking(True) @@ -81,7 +81,9 @@ class Ui_Frame(object): self.lineEdit.setFont(font) self.lineEdit.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor)) self.lineEdit.setAutoFillBackground(False) - self.lineEdit.setStyleSheet("background:transparent;border-width:0;border-style:outset") + self.lineEdit.setStyleSheet("\n" +" background:transparent;border-width:0;border-style:outset\n" +" ") self.lineEdit.setObjectName("lineEdit") self.horizontalLayout.addWidget(self.lineEdit) self.verticalLayout.addLayout(self.horizontalLayout) diff --git a/app/ui_pc/contact/userinfo/userinfoUi.ui b/app/ui_pc/contact/userinfo/userinfoUi.ui deleted file mode 100644 index 3bba2de..0000000 --- a/app/ui_pc/contact/userinfo/userinfoUi.ui +++ /dev/null @@ -1,280 +0,0 @@ - - - Frame - - - - 0 - 0 - 800 - 720 - - - - IBeamCursor - - - true - - - true - - - Frame - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - 6 - - - - - - 80 - 80 - - - - - 80 - 80 - - - - - - - ../../../a_img/be0fa6c0c4707fb5f7b37b660de826d3.jpg - - - true - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - - 15 - - - - 曹雨萱 - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - 昵称：997 - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - 账号：TextLabel - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - - 15 - - - - 备注名 - - - - - - - - 0 - 25 - - - - - 16777215 - 25 - - - - - 15 - - - - ArrowCursor - - - false - - - - background:transparent;border-width:0;border-style:outset - - - - 曹雨萱 - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - 24 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - diff --git a/app/ui_pc/mainview.py b/app/ui_pc/mainview.py index f6d8e89..06124d9 100644 --- a/app/ui_pc/mainview.py +++ b/app/ui_pc/mainview.py @@ -26,7 +26,12 @@ from ..person_pc import MePC # 美化样式表 Stylesheet = """ - +QPushButton{ + background-color: transparent; +} +QPushButton:hover { + background-color: lightgray; +} /*去掉item虚线边框*/ QListWidget, QListView, QTreeWidget, QTreeView { outline: 0px; @@ -176,7 +181,7 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow): self.load_num += 1 # self.label.setVisible(False) print('加载一个了') - if self.load_num == 2: + if self.load_num == 1: print('ok了') self.label.clear() self.label.hide() diff --git a/app/ui_pc/mainwindow.ui b/app/ui_pc/mainwindow.ui deleted file mode 100644 index 45f1ad3..0000000 --- a/app/ui_pc/mainwindow.ui +++ /dev/null @@ -1,278 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 1280 - 779 - - - - MainWindow - - - - /*去掉item虚线边框*/ - QListWidget, QListView, QTreeWidget, QTreeView { - outline: 0px; - } - /*设置左侧选项的最小最大宽度,文字颜色和背景颜色*/ - QListWidget { - min-width: 120px; - max-width: 120px; - color: black; - background: white; - border:none; - } - QListWidget::item{ - height:80; - } - /*被选中时的背景颜色和左边框颜色*/ - QListWidget::item:selected { - background: rgb(204, 204, 204); - border-left: 4px solid rgb(9, 187, 7); - } - /*鼠标悬停颜色*/ - HistoryPanel::item:hover { - background: rgb(52, 52, 52); - } - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 80 - 500 - - - - - 80 - 16777215 - - - - background-color:rgb(240,240,240) - - - QFrame::NoFrame - - - QFrame::Plain - - - - - 10 - 40 - 60 - 60 - - - - avatar - - - - - - 0 - 230 - 120 - 331 - - - - - 120 - 0 - - - - - 120 - 16777215 - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - QAbstractScrollArea::AdjustIgnored - - - - 新建项目 - - - - - 新建项目 - - - - - 新建项目 - - - - - 新建项目 - - - - - 新建项目 - - - - - - - - - - 微软雅黑 - 50 - false - - - - - - - - - - 0 - 0 - 1280 - 23 - - - - - 文件(F) - - - - - - - - - - 微软雅黑 - - - - 数据 - - - - 导出聊天记录(全部) - - - - - - - - - 帮助 - - - - - - - - 关于 - - - - - - 不显示或者显示异常请重启应用、没反应那就多等一会儿 - - - - - - - - - - - - 保存 - - - - - 退出 - - - - - 解密教程 - - - - Microsoft YaHei UI - - - - - - 说明 - - - - - 聊天相关 - - - - - 好友相关 - - - - - CSV - - - - - 导出联系人 - - - - - - diff --git a/app/ui_pc/tool/pc_decrypt/decryptUi.ui b/app/ui_pc/tool/pc_decrypt/decryptUi.ui deleted file mode 100644 index 421bba9..0000000 --- a/app/ui_pc/tool/pc_decrypt/decryptUi.ui +++ /dev/null @@ -1,407 +0,0 @@ - - - Dialog - - - - 0 - 0 - 611 - 519 - - - - - 微软雅黑 - - - - Dialog - - - Qt::LeftToRight - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 200 - 16777215 - - - - 使用说明 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 一纸情书 - 20 - - - - 解密数据库 - - - Qt::AlignCenter - - - - - - - 以下内容为自动获取，如获取失败请手动填写 - - - Qt::AlignCenter - - - - - - - - - - - - - - - - - - 版本 - - - - - - - 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 - - - - false - - - - - - - 微信昵称 - - - - - - - 密钥 - - - - - - - - 400 - 16777215 - - - - - - - - - - - PID - - - - - - - 手机号 - - - - - - - - - - - - - - - - - - - - - wxid - - - - - - - - - - - - - - 微信路径 - - - - - - - - 400 - 300 - - - - - - - - - - - - - - 0 - 60 - - - - 获取信息 - - - - - - - - - - - - - - - 0 - 60 - - - - 设置微信路径 - - - - - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 60 - - - - - 100 - 16777215 - - - - 开始启动 - - - - - - - TextLabel - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - 未就绪 - - - - - - - 50 - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - diff --git a/app/ui_pc/tool/pc_decrypt/pc_decrypt.py b/app/ui_pc/tool/pc_decrypt/pc_decrypt.py index d7723b7..85637e3 100644 --- a/app/ui_pc/tool/pc_decrypt/pc_decrypt.py +++ b/app/ui_pc/tool/pc_decrypt/pc_decrypt.py @@ -8,7 +8,7 @@ from PyQt5.QtGui import QDesktopServices from PyQt5.QtWidgets import QWidget, QMessageBox, QFileDialog from app.DataBase import msg_db, misc_db -from app.DataBase.merge import merge_databases +from app.DataBase.merge import merge_databases, merge_MediaMSG_databases from app.decrypt import get_wx_info, decrypt from app.log import logger from app.util import path @@ -173,7 +173,7 @@ class DecryptControl(QWidget, decryptUi.Ui_Dialog): except: with open('./info.json', 'w', encoding='utf-8') as f: f.write(json.dumps(dic)) - # 目标数据库文件 + # 目标数据库文件 target_database = "app/DataBase/Msg/MSG.db" # 源数据库文件列表 source_databases = [f"app/DataBase/Msg/MSG{i}.db" for i in range(1, 20)] @@ -184,6 +184,19 @@ class DecryptControl(QWidget, decryptUi.Ui_Dialog): merge_databases(source_databases, target_database) except FileNotFoundError: QMessageBox.critical(self, "错误", "数据库不存在\n请检查微信版本是否为最新") + + # 音频数据库文件 + target_database = "app/DataBase/Msg/MediaMSG.db" + # 源数据库文件列表 + source_databases = [f"app/DataBase/Msg/MediaMSG{i}.db" for i in range(1, 20)] + import shutil + shutil.copy("app/DataBase/Msg/MediaMSG0.db", target_database) # 使用一个数据库文件作为模板 + # 合并数据库 + try: + merge_MediaMSG_databases(source_databases, target_database) + except FileNotFoundError: + QMessageBox.critical(self, "错误", "数据库不存在\n请检查微信版本是否为最新") + self.DecryptSignal.emit(True) self.close() diff --git a/app/ui_pc/tool/toolUI.py b/app/ui_pc/tool/toolUI.py index a13f276..3f71481 100644 --- a/app/ui_pc/tool/toolUI.py +++ b/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, 547) + Dialog.resize(590, 547) font = QtGui.QFont() font.setFamily("微软雅黑") Dialog.setFont(font) @@ -30,7 +30,7 @@ class Ui_Dialog(object): self.label.setObjectName("label") self.horizontalLayout.addWidget(self.label) self.listWidget = QtWidgets.QListWidget(Dialog) - self.listWidget.setMinimumSize(QtCore.QSize(500, 80)) + self.listWidget.setMinimumSize(QtCore.QSize(100, 80)) self.listWidget.setMaximumSize(QtCore.QSize(500, 80)) self.listWidget.setFrameShape(QtWidgets.QFrame.NoFrame) self.listWidget.setFrameShadow(QtWidgets.QFrame.Plain) diff --git a/app/ui_pc/tool/toolUI.ui b/app/ui_pc/tool/toolUI.ui deleted file mode 100644 index 17e797d..0000000 --- a/app/ui_pc/tool/toolUI.ui +++ /dev/null @@ -1,128 +0,0 @@ - - - Dialog - - - - 0 - 0 - 630 - 547 - - - - - 微软雅黑 - - - - Dialog - - - - - - 0 - - - QLayout::SetDefaultConstraint - - - - - - 80 - 80 - - - - - - - - - - - - 500 - 80 - - - - - 500 - 80 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 0 - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - QListView::LeftToRight - - - - 新建项目 - - - - - 新建项目 - - - - - 新建项目 - - - - - 新建项目 - - - - - 新建项目 - - - - - - - - - 80 - 80 - - - - - - - - - - - - - -1 - - - - - - - - diff --git a/hook-pyecharts.py b/hook-pyecharts.py deleted file mode 100644 index 5ce4d96..0000000 --- a/hook-pyecharts.py +++ /dev/null @@ -1,13 +0,0 @@ -#----------------------------------------------------------------------------- - # Copyright (c) 2017-2020, PyInstaller Development Team. - # - # Distributed under the terms of the GNU General Public License (version 2 - # or later) with exception for distributing the bootloader. - # - # The full license is in the file COPYING.txt, distributed with this software. - # - # SPDX-License-Identifier: (GPL-2.0-or-later WITH Bootloader-exception) - #----------------------------------------------------------------------------- -# Hook for nanite: https://pypi.python.org/pypi/nanite -from PyInstaller.utils.hooks import collect_data_files -datas = collect_data_files('pyecharts') \ No newline at end of file diff --git a/logo.ico b/logo.ico deleted file mode 100644 index 229c49f..0000000 Binary files a/logo.ico and /dev/null differ diff --git a/logo16x16.ico b/logo16x16.ico deleted file mode 100644 index f356615..0000000 Binary files a/logo16x16.ico and /dev/null differ diff --git a/readme.md b/readme.md index 45d4b36..4d03c10 100644 --- a/readme.md +++ b/readme.md @@ -297,6 +297,7 @@ python main.py > 声明：该项目有且仅有一个目的：“留痕”——我的数据我做主，前提是“我的数据”其次才是“我做主”，禁止任何人以任何形式将其用于任何非法用途，对于使用该程序所造成的任何后果，所有创作者不承担任何责任🙄
> 该软件不会对您使用的微信造成任何影响，更不会对他人的微信造成任何影响，不能找回删除的聊天记录，任何企图篡改微信聊天数据的想法都是无稽之谈。本项目所有功能均建立在”前言“的基础之上，基于该项目的所有开发者均不能接受任何有悖于”前言“的功能需求，违者后果自负。 +>
该软件不存在任何收费，谨防上当受骗 [![Star History Chart](https://api.star-history.com/svg?repos=LC044/WeChatMsg&type=Date)](https://star-history.com/?utm_source=bestxtools.com#LC044/WeChatMsg&Date) @@ -322,7 +323,7 @@ python main.py -# 支持 +# 支持该项目 感谢您对这个项目的兴趣和支持！如果您发现这个项目对您有帮助，并且您愿意提供赞助以维持项目的发展和改进，我将非常感激。 @@ -337,6 +338,8 @@ python main.py 感谢以下赞助者的慷慨支持： +- [STDquantum](https://github.com/STDquantum) + 如果您提供赞助并希望出现在赞助者名单中，请在提交赞助时提供您的 GitHub 用户名或其他相关信息。 ## 感谢