From 8ce0c733bcc8d5879487b378e81deaaeb869c604 Mon Sep 17 00:00:00 2001 From: shen Date: Tue, 30 Jun 2026 16:48:02 +0800 Subject: [PATCH] Add raster replacement and layer ordering --- docs/v2_requirements_checklist.md | 4 +- pdfreaderlite/ui/main_window.py | 88 +++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 2 deletions(-) diff --git a/docs/v2_requirements_checklist.md b/docs/v2_requirements_checklist.md index 5e91b06..dd1cd34 100644 --- a/docs/v2_requirements_checklist.md +++ b/docs/v2_requirements_checklist.md @@ -36,7 +36,7 @@ - [ ] 文本框颜色设置。 - [ ] 文本框加粗设置。 - [ ] 添加文本后自动选中新对象。 -- [ ] 图片替换。 +- [x] 图片替换。 - [ ] 图片旋转。 - [ ] 图片透明度。 - [ ] 图片裁剪。 @@ -49,7 +49,7 @@ - [ ] 对象粘贴。 - [x] 方向键微调对象。 - [x] Shift+方向键大步移动对象。 -- [ ] 对象图层顺序:置顶、置底、上移、下移。 +- [x] 对象图层顺序:置顶、置底、上移、下移。 - [x] 页面内对象列表。 ## 编辑:旧功能完善 diff --git a/pdfreaderlite/ui/main_window.py b/pdfreaderlite/ui/main_window.py index 3ccbe56..991b22b 100644 --- a/pdfreaderlite/ui/main_window.py +++ b/pdfreaderlite/ui/main_window.py @@ -1092,6 +1092,11 @@ class MainWindow(QMainWindow): self.copy_object_action.setShortcut(QKeySequence.StandardKey.Copy) self.paste_object_action = QAction("粘贴对象", self) self.paste_object_action.setShortcut(QKeySequence.StandardKey.Paste) + self.replace_image_action = QAction("替换图片", self) + self.bring_to_front_action = QAction("置顶", self) + self.send_to_back_action = QAction("置底", self) + self.bring_forward_action = QAction("上移一层", self) + self.send_backward_action = QAction("下移一层", self) self.freehand_action = QAction("自由画笔", self) self.freehand_action.setCheckable(True) self.add_text_action = QAction("添加文本", self) @@ -1181,6 +1186,11 @@ class MainWindow(QMainWindow): edit_menu.addAction(self.select_object_action) edit_menu.addAction(self.copy_object_action) edit_menu.addAction(self.paste_object_action) + edit_menu.addAction(self.replace_image_action) + edit_menu.addAction(self.bring_to_front_action) + edit_menu.addAction(self.send_to_back_action) + edit_menu.addAction(self.bring_forward_action) + edit_menu.addAction(self.send_backward_action) edit_menu.addAction(self.freehand_action) edit_menu.addAction(self.add_text_action) edit_menu.addAction(self.place_text_action) @@ -1291,6 +1301,11 @@ class MainWindow(QMainWindow): self.cover_action, self.copy_object_action, self.paste_object_action, + self.replace_image_action, + self.bring_to_front_action, + self.send_to_back_action, + self.bring_forward_action, + self.send_backward_action, self.undo_action, self.redo_action, ], @@ -1527,6 +1542,11 @@ class MainWindow(QMainWindow): self.select_object_action.toggled.connect(self.toggle_object_selection) self.copy_object_action.triggered.connect(self.copy_selected_object) self.paste_object_action.triggered.connect(self.paste_copied_object) + self.replace_image_action.triggered.connect(self.replace_selected_image) + self.bring_to_front_action.triggered.connect(lambda: self.reorder_selected_raster("front")) + self.send_to_back_action.triggered.connect(lambda: self.reorder_selected_raster("back")) + self.bring_forward_action.triggered.connect(lambda: self.reorder_selected_raster("forward")) + self.send_backward_action.triggered.connect(lambda: self.reorder_selected_raster("backward")) self.freehand_action.toggled.connect(self.toggle_freehand_drawing) self.add_text_action.triggered.connect(self.add_text) self.place_text_action.triggered.connect(self.prepare_place_text) @@ -2056,6 +2076,56 @@ class MainWindow(QMainWindow): self.viewer.set_selected_object_rect(item["rect"]) self.statusBar().showMessage("对象已粘贴,保存时会写入 PDF", 3000) + def replace_selected_image(self) -> None: + if self.selected_raster_id is None: + self.statusBar().showMessage("请选择未保存的图片/签名/图章对象", 3000) + return + raster = self._session_raster_by_id(self.selected_raster_id) + if not raster: + return + selected, _ = QFileDialog.getOpenFileName( + self, + "替换图片", + "", + "图片文件 (*.png *.jpg *.jpeg *.bmp *.tif *.tiff)", + ) + if not selected: + return + raster["path"] = selected + self._refresh_session_raster_overlays() + self.viewer.set_selected_object_rect(raster["rect"]) + self.statusBar().showMessage("图片已替换,保存时会写入 PDF", 3000) + + def reorder_selected_raster(self, direction: str) -> None: + if self.selected_raster_id is None: + self.statusBar().showMessage("请选择未保存的图片/签名/图章对象", 3000) + return + index = next( + ( + idx + for idx, item in enumerate(self.session_raster_objects) + if int(item["id"]) == self.selected_raster_id + ), + None, + ) + if index is None: + return + item = self.session_raster_objects.pop(index) + if direction == "front": + new_index = len(self.session_raster_objects) + elif direction == "back": + new_index = 0 + elif direction == "forward": + new_index = min(len(self.session_raster_objects), index + 1) + elif direction == "backward": + new_index = max(0, index - 1) + else: + new_index = index + self.session_raster_objects.insert(new_index, item) + self._refresh_session_raster_overlays() + self.viewer.set_selected_object_rect(item["rect"]) + self.statusBar().showMessage("对象层级已调整,保存时会写入 PDF", 3000) + def delete_selected_object(self) -> None: if self.selected_raster_id is not None: raster_id = self.selected_raster_id @@ -2098,11 +2168,19 @@ class MainWindow(QMainWindow): delete_action = menu.addAction("删除对象") copy_action = menu.addAction("复制对象") paste_action = menu.addAction("粘贴对象") + replace_action = menu.addAction("替换图片") + layer_menu = menu.addMenu("图层顺序") + front_action = layer_menu.addAction("置顶") + back_action = layer_menu.addAction("置底") + forward_action = layer_menu.addAction("上移一层") + backward_action = layer_menu.addAction("下移一层") edit_action = menu.addAction("编辑内容") properties_action = menu.addAction("属性") delete_action.setEnabled(self.selected_annotation is not None or self.selected_raster_id is not None) copy_action.setEnabled(self.selected_raster_id is not None) paste_action.setEnabled(self.copied_raster_object is not None) + replace_action.setEnabled(self.selected_raster_id is not None) + layer_menu.setEnabled(self.selected_raster_id is not None) edit_action.setEnabled(self._selected_annotation_content_editable()) properties_action.setEnabled(self.selected_annotation is not None or self.selected_raster_id is not None) chosen = menu.exec(self.cursor().pos()) @@ -2112,6 +2190,16 @@ class MainWindow(QMainWindow): self.copy_selected_object() elif chosen == paste_action: self.paste_copied_object() + elif chosen == replace_action: + self.replace_selected_image() + elif chosen == front_action: + self.reorder_selected_raster("front") + elif chosen == back_action: + self.reorder_selected_raster("back") + elif chosen == forward_action: + self.reorder_selected_raster("forward") + elif chosen == backward_action: + self.reorder_selected_raster("backward") elif chosen == edit_action and self.selected_annotation: self.edit_annotation_from_panel(self.selected_annotation) elif chosen == properties_action: