diff --git a/README.md b/README.md index 410cdec..1e1213c 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,10 @@ PDFReaderLite 是一个面向 Windows 的轻量 PDF 阅读与编辑工具,目 - 打印 - 基础表单填写 - 注释列表与删除注释 +- 撤销、重做 +- 页面移动重排 +- 手写签名 +- 加密 PDF 权限选项 - 页面渲染缓存 - 分批加载缩略图 - 异常日志 diff --git a/docs/development_plan.md b/docs/development_plan.md index 5bae8af..54aaf88 100644 --- a/docs/development_plan.md +++ b/docs/development_plan.md @@ -26,7 +26,7 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重 ## V2:编辑增强版 -- 撤销/重做 +- 撤销/重做(已完成基础快照) - 下划线、删除线 - 画笔 - 矩形、圆形、线条、箭头 @@ -39,13 +39,13 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重 - 提取页面 - 拆分 PDF - 合并 PDF -- 页面拖拽重排 +- 页面拖拽重排(已完成页码移动,拖拽待后续优化) ## V3:实用工具版 - 填写已有 PDF 表单(已完成基础字段填写) - 基础文本框、复选框、单选按钮 -- 手写签名 +- 手写签名(已完成) - 图片签名(已完成基础放置) - 签名拖拽放置 - 导出页面为图片(已完成) @@ -54,7 +54,7 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重 - 查看、修改文档信息(已完成) - 设置打开密码(已完成密码另存为) - 移除密码(已完成另存为无密码 PDF) -- 基础权限设置 +- 基础权限设置(已完成加密保存权限选项) - 打印(已完成) - 多标签页 - 深色模式(已完成) diff --git a/pdfreaderlite/core/document.py b/pdfreaderlite/core/document.py index ec2906f..e8f0497 100644 --- a/pdfreaderlite/core/document.py +++ b/pdfreaderlite/core/document.py @@ -40,6 +40,8 @@ class PdfDocument: self.path: Path | None = None self._doc: fitz.Document | None = None self._revision = 0 + self._undo_stack: list[bytes] = [] + self._redo_stack: list[bytes] = [] self._render_cache: OrderedDict[tuple[int, int, float], QImage] = OrderedDict() self._thumbnail_cache: OrderedDict[tuple[int, int, int], QImage] = OrderedDict() @@ -65,12 +67,14 @@ class PdfDocument: if not password or not self._doc.authenticate(password): self.close() raise EncryptedPdfError("该 PDF 需要密码。") + self.clear_history() def close(self) -> None: if self._doc: self._doc.close() self._doc = None self.path = None + self.clear_history() self.clear_cache() def render_page(self, page_index: int, zoom: float) -> QImage: @@ -128,6 +132,7 @@ class PdfDocument: return matches def rotate_page(self, page_index: int, degrees: int = 90) -> None: + self.snapshot() page = self._page(page_index) page.set_rotation((page.rotation + degrees) % 360) self.mark_changed() @@ -135,6 +140,8 @@ class PdfDocument: def highlight_text(self, page_index: int, text: str) -> int: page = self._page(page_index) rects = page.search_for(text.strip()) + if rects: + self.snapshot() for rect in rects: annot = page.add_highlight_annot(rect) annot.update() @@ -145,6 +152,8 @@ class PdfDocument: def underline_text(self, page_index: int, text: str) -> int: page = self._page(page_index) rects = page.search_for(text.strip()) + if rects: + self.snapshot() for rect in rects: annot = page.add_underline_annot(rect) annot.update() @@ -155,6 +164,8 @@ class PdfDocument: def strikeout_text(self, page_index: int, text: str) -> int: page = self._page(page_index) rects = page.search_for(text.strip()) + if rects: + self.snapshot() for rect in rects: annot = page.add_strikeout_annot(rect) annot.update() @@ -163,6 +174,7 @@ class PdfDocument: return len(rects) def add_note(self, page_index: int, text: str) -> None: + self.snapshot() page = self._page(page_index) point = fitz.Point(72, 72) annot = page.add_text_annot(point, text) @@ -170,12 +182,14 @@ class PdfDocument: self.mark_changed() def add_text(self, page_index: int, text: str) -> None: + self.snapshot() page = self._page(page_index) point = fitz.Point(72, 96) page.insert_text(point, text, fontsize=14, fontname="china-s", color=(0, 0, 0)) self.mark_changed() def insert_image(self, page_index: int, image_path: str | Path) -> None: + self.snapshot() page = self._page(page_index) page_rect = page.rect width = page_rect.width * 0.35 @@ -185,6 +199,7 @@ class PdfDocument: self.mark_changed() def add_signature(self, page_index: int, image_path: str | Path) -> None: + self.snapshot() page = self._page(page_index) page_rect = page.rect width = page_rect.width * 0.28 @@ -200,6 +215,7 @@ class PdfDocument: self.mark_changed() def add_rectangle(self, page_index: int) -> None: + self.snapshot() page = self._page(page_index) rect = self._default_rect(page) annot = page.add_rect_annot(rect) @@ -209,6 +225,7 @@ class PdfDocument: self.mark_changed() def add_circle(self, page_index: int) -> None: + self.snapshot() page = self._page(page_index) rect = self._default_rect(page) annot = page.add_circle_annot(rect) @@ -218,6 +235,7 @@ class PdfDocument: self.mark_changed() def add_line(self, page_index: int, arrow: bool = False) -> None: + self.snapshot() page = self._page(page_index) rect = self._default_rect(page) start = fitz.Point(rect.x0, rect.y0) @@ -231,6 +249,7 @@ class PdfDocument: self.mark_changed() def add_cover_area(self, page_index: int) -> None: + self.snapshot() page = self._page(page_index) rect = self._default_rect(page) annot = page.add_rect_annot(rect) @@ -242,6 +261,7 @@ class PdfDocument: def insert_blank_page(self, after_page_index: int | None = None) -> int: if not self._doc: raise RuntimeError("没有打开 PDF") + self.snapshot() if self.page_count: source = self._page(after_page_index if after_page_index is not None else self.page_count - 1) width = source.rect.width @@ -257,6 +277,7 @@ class PdfDocument: def insert_pdf(self, source_path: str | Path, after_page_index: int | None = None) -> int: if not self._doc: raise RuntimeError("没有打开 PDF") + self.snapshot() insert_at = self.page_count if after_page_index is None else after_page_index + 1 with fitz.open(source_path) as source: count = source.page_count @@ -362,6 +383,7 @@ class PdfDocument: ) -> None: if not self._doc: raise RuntimeError("没有打开 PDF") + self.snapshot() metadata = self.metadata() metadata.update( { @@ -399,6 +421,7 @@ class PdfDocument: annot = page.first_annot while annot: if annot.xref == xref: + self.snapshot() page.delete_annot(annot) self.mark_changed() return True @@ -432,6 +455,7 @@ class PdfDocument: widgets = self._page(page_index).widgets() or [] for widget in widgets: if widget.field_name == field_name: + self.snapshot() widget.field_value = value widget.update() self.mark_changed() @@ -441,9 +465,23 @@ class PdfDocument: def delete_page(self, page_index: int) -> None: if not self._doc: raise RuntimeError("没有打开 PDF") + self.snapshot() self._doc.delete_page(page_index) self.mark_changed() + def move_page(self, from_page_index: int, to_page_index: int) -> None: + if not self._doc: + raise RuntimeError("没有打开 PDF") + if from_page_index < 0 or from_page_index >= self.page_count: + raise IndexError("源页码超出范围") + if to_page_index < 0 or to_page_index >= self.page_count: + raise IndexError("目标页码超出范围") + if from_page_index == to_page_index: + return + self.snapshot() + self._doc.move_page(from_page_index, to_page_index) + self.mark_changed() + def save(self) -> None: if not self.path: raise RuntimeError("没有原始文件路径") @@ -456,7 +494,13 @@ class PdfDocument: target = Path(path) target.parent.mkdir(parents=True, exist_ok=True) original_path = self.path - if original_path and target.resolve() == original_path.resolve(): + can_incremental = ( + original_path + and target.resolve() == original_path.resolve() + and self._doc.name + and Path(self._doc.name).resolve() == target.resolve() + ) + if can_incremental: self._doc.saveIncr() self._doc.close() self.path = target @@ -479,7 +523,14 @@ class PdfDocument: if temp_path.exists(): temp_path.unlink() - def save_encrypted(self, path: str | Path, password: str) -> None: + def save_encrypted( + self, + path: str | Path, + password: str, + allow_print: bool = True, + allow_copy: bool = True, + allow_modify: bool = False, + ) -> None: if not self._doc: raise RuntimeError("没有打开 PDF") if not password: @@ -487,6 +538,13 @@ class PdfDocument: target = Path(path) target.parent.mkdir(parents=True, exist_ok=True) + permissions = fitz.PDF_PERM_ACCESSIBILITY + if allow_print: + permissions |= fitz.PDF_PERM_PRINT + if allow_copy: + permissions |= fitz.PDF_PERM_COPY + if allow_modify: + permissions |= fitz.PDF_PERM_MODIFY self._doc.save( target, garbage=4, @@ -494,7 +552,7 @@ class PdfDocument: encryption=fitz.PDF_ENCRYPT_AES_256, owner_pw=password, user_pw=password, - permissions=fitz.PDF_PERM_ACCESSIBILITY | fitz.PDF_PERM_PRINT, + permissions=permissions, ) def _page(self, page_index: int) -> fitz.Page: @@ -508,6 +566,46 @@ class PdfDocument: self._revision += 1 self.clear_cache() + def snapshot(self) -> None: + if not self._doc: + return + self._undo_stack.append(self._doc.tobytes(garbage=4, deflate=True)) + if len(self._undo_stack) > 20: + self._undo_stack.pop(0) + self._redo_stack.clear() + + def can_undo(self) -> bool: + return bool(self._undo_stack) + + def can_redo(self) -> bool: + return bool(self._redo_stack) + + def undo(self) -> bool: + if not self._doc or not self._undo_stack: + return False + self._redo_stack.append(self._doc.tobytes(garbage=4, deflate=True)) + data = self._undo_stack.pop() + self._replace_with_bytes(data) + return True + + def redo(self) -> bool: + if not self._doc or not self._redo_stack: + return False + self._undo_stack.append(self._doc.tobytes(garbage=4, deflate=True)) + data = self._redo_stack.pop() + self._replace_with_bytes(data) + return True + + def clear_history(self) -> None: + self._undo_stack.clear() + self._redo_stack.clear() + + def _replace_with_bytes(self, data: bytes) -> None: + if self._doc: + self._doc.close() + self._doc = fitz.open("pdf", data) + self.mark_changed() + def clear_cache(self) -> None: self._render_cache.clear() self._thumbnail_cache.clear() diff --git a/pdfreaderlite/ui/main_window.py b/pdfreaderlite/ui/main_window.py index 73d6b81..31dcac9 100644 --- a/pdfreaderlite/ui/main_window.py +++ b/pdfreaderlite/ui/main_window.py @@ -6,6 +6,7 @@ from PySide6.QtCore import QSettings, Qt from PySide6.QtGui import QAction, QIcon, QKeySequence, QPainter from PySide6.QtPrintSupport import QPrintDialog, QPrinter from PySide6.QtWidgets import ( + QCheckBox, QComboBox, QDialog, QDialogButtonBox, @@ -29,6 +30,7 @@ from pdfreaderlite.core.document import EncryptedPdfError, FormField, PdfDocumen from pdfreaderlite.resources import software_icon_path from pdfreaderlite.ui.pdf_viewer import PdfViewer from pdfreaderlite.ui.sidebar import Sidebar +from pdfreaderlite.ui.signature_dialog import SignatureDialog class MainWindow(QMainWindow): @@ -126,6 +128,25 @@ class MainWindow(QMainWindow): ) if not ok or not password: return + permission_dialog = QDialog(self) + permission_dialog.setWindowTitle("权限设置") + permission_layout = QVBoxLayout(permission_dialog) + allow_print = QCheckBox("允许打印") + allow_copy = QCheckBox("允许复制") + allow_modify = QCheckBox("允许修改") + allow_print.setChecked(True) + allow_copy.setChecked(True) + permission_layout.addWidget(allow_print) + permission_layout.addWidget(allow_copy) + permission_layout.addWidget(allow_modify) + permission_buttons = QDialogButtonBox( + QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel + ) + permission_buttons.accepted.connect(permission_dialog.accept) + permission_buttons.rejected.connect(permission_dialog.reject) + permission_layout.addWidget(permission_buttons) + if permission_dialog.exec() != QDialog.DialogCode.Accepted: + return selected, _ = QFileDialog.getSaveFileName( self, "保存加密 PDF", self.document.title, "PDF 文件 (*.pdf)" ) @@ -134,7 +155,13 @@ class MainWindow(QMainWindow): if not selected.lower().endswith(".pdf"): selected += ".pdf" try: - self.document.save_encrypted(selected, password) + self.document.save_encrypted( + selected, + password, + allow_print=allow_print.isChecked(), + allow_copy=allow_copy.isChecked(), + allow_modify=allow_modify.isChecked(), + ) self.statusBar().showMessage("已保存加密 PDF", 3000) except Exception as exc: QMessageBox.critical(self, "保存失败", f"无法保存加密 PDF:\n{exc}") @@ -212,6 +239,57 @@ class MainWindow(QMainWindow): self._refresh_document_view() self.statusBar().showMessage("页面已删除,记得保存", 3000) + def move_page_dialog(self) -> None: + if not self._ensure_document(): + return + if self.document.page_count <= 1: + QMessageBox.information(self, "移动页面", "当前 PDF 只有一页。") + return + source_page, ok = QInputDialog.getInt( + self, + "移动页面", + "要移动的页码:", + self.viewer.page_index + 1, + 1, + self.document.page_count, + ) + if not ok: + return + target_page, ok = QInputDialog.getInt( + self, + "移动页面", + "移动到页码:", + source_page, + 1, + self.document.page_count, + ) + if not ok: + return + self.document.move_page(source_page - 1, target_page - 1) + self.viewer.go_to_page(target_page - 1) + self._refresh_document_view() + self.statusBar().showMessage("页面已移动,记得保存", 3000) + + def undo(self) -> None: + if not self._ensure_document(): + return + if self.document.undo(): + self.viewer.page_index = min(self.viewer.page_index, self.document.page_count - 1) + self._refresh_document_view() + self.statusBar().showMessage("已撤销", 3000) + else: + self.statusBar().showMessage("没有可撤销的操作", 3000) + + def redo(self) -> None: + if not self._ensure_document(): + return + if self.document.redo(): + self.viewer.page_index = min(self.viewer.page_index, self.document.page_count - 1) + self._refresh_document_view() + self.statusBar().showMessage("已重做", 3000) + else: + self.statusBar().showMessage("没有可重做的操作", 3000) + def insert_blank_page(self) -> None: if not self._ensure_document(): return @@ -555,6 +633,10 @@ class MainWindow(QMainWindow): self.remove_password_action = QAction("移除密码另存为", self) self.print_action = QAction("打印", self) self.print_action.setShortcut(QKeySequence.StandardKey.Print) + self.undo_action = QAction("撤销", self) + self.undo_action.setShortcut(QKeySequence.StandardKey.Undo) + self.redo_action = QAction("重做", self) + self.redo_action.setShortcut(QKeySequence.StandardKey.Redo) self.previous_action = QAction("上一页", self) self.previous_action.setShortcut(QKeySequence(Qt.Key.Key_PageUp)) @@ -570,6 +652,7 @@ class MainWindow(QMainWindow): self.go_to_page_action.setShortcut(QKeySequence("Ctrl+G")) self.rotate_action = QAction("旋转", self) self.delete_action = QAction("删除页", self) + self.move_page_action = QAction("移动页面", self) self.insert_blank_action = QAction("插入空白页", self) self.insert_pdf_action = QAction("插入 PDF", self) self.extract_pages_action = QAction("提取页面", self) @@ -590,6 +673,7 @@ class MainWindow(QMainWindow): self.add_text_action = QAction("添加文本", self) self.insert_image_action = QAction("插入图片", self) self.signature_action = QAction("图片签名", self) + self.draw_signature_action = QAction("手写签名", self) self.rectangle_action = QAction("矩形", self) self.circle_action = QAction("圆形", self) self.line_action = QAction("线条", self) @@ -622,6 +706,7 @@ class MainWindow(QMainWindow): page_menu.addAction(self.go_to_page_action) page_menu.addAction(self.rotate_action) page_menu.addAction(self.delete_action) + page_menu.addAction(self.move_page_action) page_menu.addAction(self.insert_blank_action) page_menu.addAction(self.insert_pdf_action) page_menu.addAction(self.extract_pages_action) @@ -637,6 +722,8 @@ class MainWindow(QMainWindow): tools_menu.addAction(self.annotation_list_action) edit_menu = self.menuBar().addMenu("编辑") + edit_menu.addAction(self.undo_action) + edit_menu.addAction(self.redo_action) edit_menu.addAction(self.highlight_action) edit_menu.addAction(self.underline_action) edit_menu.addAction(self.strikeout_action) @@ -644,6 +731,7 @@ class MainWindow(QMainWindow): edit_menu.addAction(self.add_text_action) edit_menu.addAction(self.insert_image_action) edit_menu.addAction(self.signature_action) + edit_menu.addAction(self.draw_signature_action) edit_menu.addAction(self.rectangle_action) edit_menu.addAction(self.circle_action) edit_menu.addAction(self.line_action) @@ -660,6 +748,8 @@ class MainWindow(QMainWindow): self.open_action, self.save_action, self.save_as_action, + self.undo_action, + self.redo_action, self.print_action, self.export_current_image_action, self.previous_action, @@ -676,11 +766,13 @@ class MainWindow(QMainWindow): self.add_text_action, self.insert_image_action, self.signature_action, + self.draw_signature_action, self.rectangle_action, self.circle_action, self.arrow_action, self.rotate_action, self.delete_action, + self.move_page_action, self.insert_blank_action, ]: toolbar.addAction(action) @@ -692,6 +784,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.undo_action.triggered.connect(self.undo) + self.redo_action.triggered.connect(self.redo) self.previous_action.triggered.connect(self.viewer.previous_page) self.next_action.triggered.connect(self.viewer.next_page) self.zoom_out_action.triggered.connect(self.viewer.zoom_out) @@ -701,6 +795,7 @@ class MainWindow(QMainWindow): self.go_to_page_action.triggered.connect(self.go_to_page_dialog) self.rotate_action.triggered.connect(self.rotate_page) self.delete_action.triggered.connect(self.delete_page) + self.move_page_action.triggered.connect(self.move_page_dialog) self.insert_blank_action.triggered.connect(self.insert_blank_page) self.insert_pdf_action.triggered.connect(self.insert_pdf) self.extract_pages_action.triggered.connect(self.extract_pages) @@ -719,6 +814,7 @@ class MainWindow(QMainWindow): self.add_text_action.triggered.connect(self.add_text) self.insert_image_action.triggered.connect(self.insert_image) self.signature_action.triggered.connect(self.add_signature) + self.draw_signature_action.triggered.connect(self.draw_signature) self.rectangle_action.triggered.connect(self.add_rectangle) self.circle_action.triggered.connect(self.add_circle) self.line_action.triggered.connect(self.add_line) @@ -823,6 +919,21 @@ class MainWindow(QMainWindow): except Exception as exc: QMessageBox.critical(self, "签名失败", f"无法添加签名:\n{exc}") + def draw_signature(self) -> None: + if not self._ensure_document(): + return + dialog = SignatureDialog(self) + if dialog.exec() != QDialog.DialogCode.Accepted: + return + signature_path = Path(self.settings.fileName()).parent / "last_signature.png" + dialog.save_signature(signature_path) + try: + self.document.add_signature(self.viewer.page_index, signature_path) + self.viewer.render() + self.statusBar().showMessage("手写签名已放置,记得保存", 3000) + except Exception as exc: + QMessageBox.critical(self, "签名失败", f"无法添加手写签名:\n{exc}") + def add_rectangle(self) -> None: if not self._ensure_document(): return diff --git a/pdfreaderlite/ui/signature_dialog.py b/pdfreaderlite/ui/signature_dialog.py new file mode 100644 index 0000000..9a52b6a --- /dev/null +++ b/pdfreaderlite/ui/signature_dialog.py @@ -0,0 +1,72 @@ +from __future__ import annotations + +from pathlib import Path + +from PySide6.QtCore import QPoint, Qt +from PySide6.QtGui import QColor, QImage, QPainter, QPen +from PySide6.QtWidgets import QDialog, QDialogButtonBox, QPushButton, QVBoxLayout, QWidget + + +class SignaturePad(QWidget): + def __init__(self) -> None: + super().__init__() + self.setMinimumSize(520, 220) + self.image = QImage(520, 220, QImage.Format.Format_ARGB32) + self.image.fill(Qt.GlobalColor.transparent) + self._last_point: QPoint | None = None + + def clear(self) -> None: + self.image.fill(Qt.GlobalColor.transparent) + self.update() + + def save(self, path: str | Path) -> None: + self.image.save(str(path), "PNG") + + def paintEvent(self, event) -> None: + painter = QPainter(self) + painter.fillRect(self.rect(), QColor("#ffffff")) + painter.drawImage(0, 0, self.image) + + def mousePressEvent(self, event) -> None: + if event.button() == Qt.MouseButton.LeftButton: + self._last_point = event.position().toPoint() + + def mouseMoveEvent(self, event) -> None: + if self._last_point is None: + return + current_point = event.position().toPoint() + painter = QPainter(self.image) + painter.setRenderHint(QPainter.RenderHint.Antialiasing) + painter.setPen(QPen(QColor("#111111"), 3, Qt.PenStyle.SolidLine, Qt.PenCapStyle.RoundCap)) + painter.drawLine(self._last_point, current_point) + painter.end() + self._last_point = current_point + self.update() + + def mouseReleaseEvent(self, event) -> None: + if event.button() == Qt.MouseButton.LeftButton: + self._last_point = None + + +class SignatureDialog(QDialog): + def __init__(self, parent=None) -> None: + super().__init__(parent) + self.setWindowTitle("手写签名") + self.pad = SignaturePad() + + clear_button = QPushButton("清除") + clear_button.clicked.connect(self.pad.clear) + + buttons = QDialogButtonBox( + QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel + ) + buttons.accepted.connect(self.accept) + buttons.rejected.connect(self.reject) + + layout = QVBoxLayout(self) + layout.addWidget(self.pad) + layout.addWidget(clear_button) + layout.addWidget(buttons) + + def save_signature(self, path: str | Path) -> None: + self.pad.save(path) diff --git a/scripts/smoke_test.py b/scripts/smoke_test.py index 585f3e7..95ce904 100644 --- a/scripts/smoke_test.py +++ b/scripts/smoke_test.py @@ -66,6 +66,10 @@ def main() -> int: assert document.render_page(0, 1.0).width() > 0 assert document.search("feature") assert document.highlight_text(0, "feature") == 1 + assert document.can_undo() + assert document.undo() + assert document.redo() + assert document.highlight_text(0, "feature") == 1 assert document.underline_text(0, "feature") == 1 assert document.strikeout_text(0, "feature") == 1 @@ -86,6 +90,7 @@ def main() -> int: assert blank_index == 1 assert document.insert_pdf(insert_pdf, blank_index) == 1 assert document.page_count == 3 + document.move_page(2, 1) document.extract_pages([1, 3], extracted_pdf) document.split_to_folder(split_folder) @@ -94,7 +99,13 @@ def main() -> int: document.update_metadata("PDFReaderLite", "smoke test", "test", "pdf") PdfDocument.merge_pdfs([source_pdf, insert_pdf], merged_pdf) PdfDocument.images_to_pdf([image_path], image_pdf) - document.save_encrypted(encrypted_pdf, "123456") + document.save_encrypted( + encrypted_pdf, + "123456", + allow_print=True, + allow_copy=False, + allow_modify=False, + ) document.save() document.close()