diff --git a/docs/v2_requirements_checklist.md b/docs/v2_requirements_checklist.md index 5c9902a..782c7a8 100644 --- a/docs/v2_requirements_checklist.md +++ b/docs/v2_requirements_checklist.md @@ -27,7 +27,7 @@ - [ ] 自由画笔支持颜色、线宽、透明度。 - [ ] 注释创建后自动刷新右侧注释列表。 - [x] 注释删除后自动刷新右侧注释列表。 -- [ ] 阅读模式下禁止选中注释对象。 +- [x] 阅读模式下禁止选中注释对象。 ## 编辑:新增功能 @@ -62,8 +62,8 @@ ## 交互体验 - [x] 当前模式在状态栏显示。 -- [ ] 阅读、编辑PDF、页面、工具、注释模式互斥。 -- [ ] 鼠标光标随模式变化。 +- [x] 阅读、编辑PDF、页面、工具、注释模式互斥。 +- [x] 鼠标光标随模式变化。 - [x] Esc 取消放置文本。 - [x] Esc 取消放置图片。 - [x] Esc 取消放置签名。 diff --git a/pdfreaderlite/ui/main_window.py b/pdfreaderlite/ui/main_window.py index 4fc7529..b66e7ad 100644 --- a/pdfreaderlite/ui/main_window.py +++ b/pdfreaderlite/ui/main_window.py @@ -1668,6 +1668,8 @@ class MainWindow(QMainWindow): def highlight_current_page(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("高亮"): + return text, ok = QInputDialog.getText(self, "高亮", "输入要在当前页高亮的文本:") if not ok or not text.strip(): return @@ -1679,6 +1681,8 @@ class MainWindow(QMainWindow): def underline_current_page(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("下划线"): + return text, ok = QInputDialog.getText(self, "下划线", "输入要在当前页标记的文本:") if not ok or not text.strip(): return @@ -1690,6 +1694,8 @@ class MainWindow(QMainWindow): def strikeout_current_page(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("删除线"): + return text, ok = QInputDialog.getText(self, "删除线", "输入要在当前页标记的文本:") if not ok or not text.strip(): return @@ -1701,6 +1707,8 @@ class MainWindow(QMainWindow): def add_note(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("批注"): + return text, ok = QInputDialog.getMultiLineText(self, "批注", "批注内容:") if not ok or not text.strip(): return @@ -1713,6 +1721,11 @@ class MainWindow(QMainWindow): if enabled and not self._ensure_document(): self.select_object_action.setChecked(False) return + if enabled and not self._ensure_can_edit("选择对象"): + with QSignalBlocker(self.select_object_action): + self.select_object_action.setChecked(False) + self.viewer.reset_interaction_mode() + return if enabled: self.pending_placement = None self.freehand_action.setChecked(False) @@ -1727,6 +1740,9 @@ class MainWindow(QMainWindow): self.statusBar().showMessage("选择对象已关闭", 3000) def select_object_at_point(self, page_index: int, point: tuple[float, float]) -> None: + if self.toggle_read_action.isChecked(): + self.viewer.reset_interaction_mode() + return raster = self._session_raster_at_point(page_index, point) if raster: self.selected_raster_id = int(raster["id"]) @@ -1797,7 +1813,7 @@ class MainWindow(QMainWindow): QMessageBox.critical(self, "删除失败", f"无法删除对象:\n{exc}") def show_object_context_menu(self, page_index: int, point: tuple[float, float]) -> None: - if not self.select_object_action.isChecked(): + if self.toggle_read_action.isChecked() or not self.select_object_action.isChecked(): return raster = self._session_raster_at_point(page_index, point) if raster: @@ -1865,6 +1881,11 @@ class MainWindow(QMainWindow): if enabled and not self._ensure_document(): self.freehand_action.setChecked(False) return + if enabled and not self._ensure_can_edit("自由画笔"): + with QSignalBlocker(self.freehand_action): + self.freehand_action.setChecked(False) + self.viewer.reset_interaction_mode() + return if enabled: self.pending_placement = None self.viewer.set_placement_enabled(False) @@ -1889,6 +1910,8 @@ class MainWindow(QMainWindow): def add_text(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("添加文本"): + return text, ok = QInputDialog.getMultiLineText(self, "添加文本", "文本内容:") if not ok or not text.strip(): return @@ -1902,6 +1925,8 @@ class MainWindow(QMainWindow): def prepare_place_text(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("点击放置文本"): + return text, ok = QInputDialog.getMultiLineText(self, "点击放置文本", "文本内容:") if not ok or not text.strip(): return @@ -1910,6 +1935,8 @@ class MainWindow(QMainWindow): def prepare_place_image(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("点击放置图片"): + return selected, _ = QFileDialog.getOpenFileName( self, "点击放置图片", "", "图片文件 (*.png *.jpg *.jpeg *.bmp *.tif *.tiff)" ) @@ -1920,6 +1947,8 @@ class MainWindow(QMainWindow): def prepare_place_signature(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("点击放置签名"): + return selected, _ = QFileDialog.getOpenFileName( self, "点击放置签名", @@ -2000,6 +2029,8 @@ class MainWindow(QMainWindow): self._update_current_tab_title() def _start_placement(self, payload: dict[str, object], message: str) -> None: + if not self._ensure_can_edit("点击放置"): + return self.pending_placement = payload self.freehand_action.setChecked(False) self.select_object_action.setChecked(False) @@ -2031,6 +2062,8 @@ class MainWindow(QMainWindow): def insert_image(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("插入图片"): + return selected, _ = QFileDialog.getOpenFileName( self, "插入图片", "", "图片文件 (*.png *.jpg *.jpeg *.bmp *.tif *.tiff)" ) @@ -2046,6 +2079,8 @@ class MainWindow(QMainWindow): def add_signature(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("图片签名"): + return selected, _ = QFileDialog.getOpenFileName( self, "选择签名图片", @@ -2064,6 +2099,8 @@ class MainWindow(QMainWindow): def draw_signature(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("手写签名"): + return dialog = SignatureDialog(self) if dialog.exec() != QDialog.DialogCode.Accepted: return @@ -2079,6 +2116,8 @@ class MainWindow(QMainWindow): def add_rectangle(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("矩形"): + return self.document.add_rectangle(self.viewer.page_index) self.viewer.render() self._refresh_annotation_panel() @@ -2087,6 +2126,8 @@ class MainWindow(QMainWindow): def add_circle(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("圆形"): + return self.document.add_circle(self.viewer.page_index) self.viewer.render() self._refresh_annotation_panel() @@ -2095,6 +2136,8 @@ class MainWindow(QMainWindow): def add_line(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("线条"): + return self.document.add_line(self.viewer.page_index) self.viewer.render() self._refresh_annotation_panel() @@ -2103,6 +2146,8 @@ class MainWindow(QMainWindow): def add_arrow(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("箭头"): + return self.document.add_line(self.viewer.page_index, arrow=True) self.viewer.render() self._refresh_annotation_panel() @@ -2111,6 +2156,8 @@ class MainWindow(QMainWindow): def add_cover_area(self) -> None: if not self._ensure_document(): return + if not self._ensure_can_edit("遮盖"): + return self.document.add_cover_area(self.viewer.page_index) self.viewer.render() self._refresh_annotation_panel() @@ -2154,6 +2201,16 @@ class MainWindow(QMainWindow): return False return True + def _ensure_can_edit(self, tool_name: str) -> bool: + if not self.toggle_read_action.isChecked(): + return True + self.pending_placement = None + self.selected_annotation = None + self.selected_raster_id = None + self.viewer.reset_interaction_mode() + self.statusBar().showMessage(f"阅读模式下不能使用“{tool_name}”,请先切换到编辑或注释模式", 4000) + return False + def _refresh_document_view(self) -> None: self.viewer.render() self._refresh_session_raster_overlays() @@ -2298,10 +2355,7 @@ class MainWindow(QMainWindow): self.selected_raster_id = None self.select_object_action.setChecked(False) self.freehand_action.setChecked(False) - self.viewer.set_placement_enabled(False) - self.viewer.set_drawing_enabled(False) - self.viewer.set_object_edit_enabled(False) - self.viewer.clear_object_selection() + self.viewer.reset_interaction_mode() self.set_right_tools_visible(False) self._sync_mode_status() self.statusBar().showMessage("阅读模式已开启", 3000) diff --git a/pdfreaderlite/ui/pdf_viewer.py b/pdfreaderlite/ui/pdf_viewer.py index e444f10..624a108 100644 --- a/pdfreaderlite/ui/pdf_viewer.py +++ b/pdfreaderlite/ui/pdf_viewer.py @@ -271,6 +271,15 @@ class PdfViewer(QScrollArea): label.setCursor(Qt.CursorShape.SizeAllCursor if enabled else Qt.CursorShape.ArrowCursor) self.viewport().setCursor(Qt.CursorShape.SizeAllCursor if enabled else Qt.CursorShape.ArrowCursor) + def reset_interaction_mode(self) -> None: + for label in self._labels(): + label.drawing_enabled = False + label.placement_enabled = False + label.object_edit_enabled = False + label.setCursor(Qt.CursorShape.ArrowCursor) + self.viewport().setCursor(Qt.CursorShape.ArrowCursor) + self.clear_object_selection() + def set_selected_object_rect(self, rect: tuple[float, float, float, float] | None) -> None: if not rect: self.clear_object_selection()