From 1496f55ed5b84dcd53b1901d6e3c23b53b9ef5b2 Mon Sep 17 00:00:00 2001 From: shen Date: Mon, 29 Jun 2026 15:47:18 +0800 Subject: [PATCH] Add session restore and window polish --- README.md | 4 +++ docs/development_plan.md | 4 +-- pdfreaderlite/app.py | 2 ++ pdfreaderlite/ui/main_window.py | 60 ++++++++++++++++++++++++++++++++- 4 files changed, 67 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1e1213c..d131b34 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,10 @@ PDFReaderLite 是一个面向 Windows 的轻量 PDF 阅读与编辑工具,目 - 页面渲染缓存 - 分批加载缩略图 - 异常日志 +- 窗口大小与布局记忆 +- 启动时恢复上次文件提示 +- 清空最近文件 +- 关于窗口 - 图片签名 - 深色模式 - 常用快捷键 diff --git a/docs/development_plan.md b/docs/development_plan.md index 54aaf88..f61a9f5 100644 --- a/docs/development_plan.md +++ b/docs/development_plan.md @@ -65,8 +65,8 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重 - 页面缓存(已完成基础缓存) - 后台渲染(已完成缩略图分批加载) - 快捷键(已完成常用快捷键) -- 配置保存 -- 异常恢复(已完成异常日志) +- 配置保存(已完成窗口状态、主题、最近文件) +- 异常恢复(已完成异常日志与上次文件恢复提示) - PyInstaller 打包(已完成) - 单文件 exe(已完成) - 程序图标(已完成) diff --git a/pdfreaderlite/app.py b/pdfreaderlite/app.py index 40fea71..6ce87c4 100644 --- a/pdfreaderlite/app.py +++ b/pdfreaderlite/app.py @@ -52,5 +52,7 @@ def main() -> int: if len(sys.argv) > 1: window.open_file(sys.argv[1]) + else: + window.offer_restore_last_file() return app.exec() diff --git a/pdfreaderlite/ui/main_window.py b/pdfreaderlite/ui/main_window.py index 31dcac9..70ce863 100644 --- a/pdfreaderlite/ui/main_window.py +++ b/pdfreaderlite/ui/main_window.py @@ -2,7 +2,7 @@ from __future__ import annotations from pathlib import Path -from PySide6.QtCore import QSettings, Qt +from PySide6.QtCore import QSettings, QStandardPaths, Qt from PySide6.QtGui import QAction, QIcon, QKeySequence, QPainter from PySide6.QtPrintSupport import QPrintDialog, QPrinter from PySide6.QtWidgets import ( @@ -26,6 +26,7 @@ from PySide6.QtWidgets import ( QVBoxLayout, ) +from pdfreaderlite import __version__ from pdfreaderlite.core.document import EncryptedPdfError, FormField, PdfDocument, SearchMatch from pdfreaderlite.resources import software_icon_path from pdfreaderlite.ui.pdf_viewer import PdfViewer @@ -51,9 +52,28 @@ class MainWindow(QMainWindow): self._build_toolbar() self._connect_signals() self._apply_theme() + self._restore_window_state() self._update_title() self._update_status() + def closeEvent(self, event) -> None: + self.settings.setValue("windowGeometry", self.saveGeometry()) + self.settings.setValue("windowState", self.saveState()) + super().closeEvent(event) + + def offer_restore_last_file(self) -> None: + last_file = self.settings.value("lastOpenFile", "", str) + if not last_file or self.document.is_open or not Path(last_file).exists(): + return + reply = QMessageBox.question( + self, + "恢复上次文件", + f"是否打开上次阅读的文件?\n\n{last_file}", + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + ) + if reply == QMessageBox.StandardButton.Yes: + self.open_file(last_file) + def open_file(self, path: str | Path | None = None) -> None: if path is None: selected, _ = QFileDialog.getOpenFileName( @@ -633,6 +653,7 @@ class MainWindow(QMainWindow): self.remove_password_action = QAction("移除密码另存为", self) self.print_action = QAction("打印", self) self.print_action.setShortcut(QKeySequence.StandardKey.Print) + self.clear_recent_action = QAction("清空最近文件", self) self.undo_action = QAction("撤销", self) self.undo_action.setShortcut(QKeySequence.StandardKey.Undo) self.redo_action = QAction("重做", self) @@ -738,6 +759,10 @@ class MainWindow(QMainWindow): edit_menu.addAction(self.arrow_action) edit_menu.addAction(self.cover_action) + help_menu = self.menuBar().addMenu("帮助") + self.about_action = QAction("关于", self) + help_menu.addAction(self.about_action) + def _build_toolbar(self) -> None: toolbar = QToolBar("主工具栏") toolbar.setMovable(False) @@ -784,6 +809,8 @@ class MainWindow(QMainWindow): self.save_encrypted_action.triggered.connect(self.save_encrypted_file) self.remove_password_action.triggered.connect(self.remove_password_file) self.print_action.triggered.connect(self.print_document) + self.clear_recent_action.triggered.connect(self.clear_recent_files) + self.about_action.triggered.connect(self.show_about) self.undo_action.triggered.connect(self.undo) self.redo_action.triggered.connect(self.redo) self.previous_action.triggered.connect(self.viewer.previous_page) @@ -973,9 +1000,17 @@ class MainWindow(QMainWindow): files = [item for item in self.recent_files if item != path] files.insert(0, path) self.recent_files = files[:10] + self.settings.setValue("lastOpenFile", path) self.settings.setValue("recentFiles", self.recent_files) self._refresh_recent_menu() + def clear_recent_files(self) -> None: + self.recent_files = [] + self.settings.remove("recentFiles") + self.settings.remove("lastOpenFile") + self._refresh_recent_menu() + self.statusBar().showMessage("最近文件已清空", 3000) + def _refresh_recent_menu(self) -> None: if not hasattr(self, "recent_menu"): return @@ -990,6 +1025,8 @@ class MainWindow(QMainWindow): action.setToolTip(path) action.triggered.connect(lambda checked=False, file_path=path: self.open_file(file_path)) self.recent_menu.addAction(action) + self.recent_menu.addSeparator() + self.recent_menu.addAction(self.clear_recent_action) def _ensure_document(self) -> bool: if not self.document.is_open: @@ -1060,6 +1097,27 @@ class MainWindow(QMainWindow): """ ) + def _restore_window_state(self) -> None: + geometry = self.settings.value("windowGeometry") + window_state = self.settings.value("windowState") + if geometry: + self.restoreGeometry(geometry) + if window_state: + self.restoreState(window_state) + + def show_about(self) -> None: + log_dir = Path( + QStandardPaths.writableLocation(QStandardPaths.StandardLocation.AppDataLocation) + ) + QMessageBox.information( + self, + "关于 PDFReaderLite", + "PDFReaderLite\n\n" + f"版本:{__version__}\n" + "定位:轻量 PDF 阅读与编辑工具\n\n" + f"日志目录:{log_dir}", + ) + def _update_title(self) -> None: self.setWindowTitle(f"{self.document.title} - PDFReaderLite")