diff --git a/app/analysis/analysis.py b/app/analysis/analysis.py index c5268ed..71b4f6d 100644 --- a/app/analysis/analysis.py +++ b/app/analysis/analysis.py @@ -144,6 +144,7 @@ def calendar_chart(wxid, time_range=None): ) return { 'chart_data': c.dump_options_with_quotes(), + 'calendar_chart_data': c.dump_options_with_quotes(), 'chat_days': len(calendar_data), # 'chart':c, } diff --git a/app/ui/mainwindow.py b/app/ui/mainwindow.py index c701914..3bac55f 100644 --- a/app/ui/mainwindow.py +++ b/app/ui/mainwindow.py @@ -140,10 +140,11 @@ class Ui_MainWindow(object): self.menu_data.addAction(self.menu_output.menuAction()) self.menu_data.addAction(self.action_output_contacts) self.menu_data.addAction(self.action_batch_export) + self.menu_2.addAction(self.action_help_faq) + self.menu_2.addSeparator() self.menu_2.addAction(self.action_help_decrypt) self.menu_2.addAction(self.action_help_chat) self.menu_2.addAction(self.action_help_contact) - self.menu_2.addAction(self.action_help_faq) self.menu_about.addAction(self.action_desc) self.menu_about.addAction(self.action_update) self.menubar.addAction(self.menu_F.menuAction()) @@ -186,4 +187,4 @@ class Ui_MainWindow(object): self.action_output_contacts.setText(_translate("MainWindow", "导出联系人")) self.action_batch_export.setText(_translate("MainWindow", "批量导出")) self.action_update.setText(_translate("MainWindow", "检查更新")) - self.action_help_faq.setText(_translate("MainWindow", "问题解答")) + self.action_help_faq.setText(_translate("MainWindow", "常见问题解答")) diff --git a/app/ui/menu/about_dialog.cp310-win_amd64.pyd b/app/ui/menu/about_dialog.cp310-win_amd64.pyd index 9b4f2aa..61272c7 100644 Binary files a/app/ui/menu/about_dialog.cp310-win_amd64.pyd and b/app/ui/menu/about_dialog.cp310-win_amd64.pyd differ diff --git a/app/ui/menu/about_dialog.cp311-win_amd64.pyd b/app/ui/menu/about_dialog.cp311-win_amd64.pyd index 32f2315..e6d8522 100644 Binary files a/app/ui/menu/about_dialog.cp311-win_amd64.pyd and b/app/ui/menu/about_dialog.cp311-win_amd64.pyd differ diff --git a/app/ui/menu/about_dialog.cp312-win_amd64.pyd b/app/ui/menu/about_dialog.cp312-win_amd64.pyd index 0dd0bbe..9646d2c 100644 Binary files a/app/ui/menu/about_dialog.cp312-win_amd64.pyd and b/app/ui/menu/about_dialog.cp312-win_amd64.pyd differ