Add object properties and double click text editing
This commit is contained in:
@@ -31,7 +31,7 @@
|
||||
|
||||
## 编辑:新增功能
|
||||
|
||||
- [ ] 文本框双击编辑内容。
|
||||
- [x] 文本框双击编辑内容。
|
||||
- [ ] 文本框字号设置。
|
||||
- [ ] 文本框颜色设置。
|
||||
- [ ] 文本框加粗设置。
|
||||
@@ -57,7 +57,7 @@
|
||||
- [ ] 文本、图片、签名、遮盖、图形注释使用统一选择框。
|
||||
- [x] Delete 删除选中对象。
|
||||
- [x] Esc 取消当前选择。
|
||||
- [ ] 右键菜单支持删除、复制、属性。
|
||||
- [x] 右键菜单支持删除、复制、属性。
|
||||
- [ ] 保存前正确固化当前会话对象。
|
||||
- [ ] 所有对象变更触发未保存状态。
|
||||
|
||||
|
||||
@@ -194,6 +194,7 @@ class MainWindow(QMainWindow):
|
||||
session.viewer.object_select_requested.connect(self.select_object_at_point)
|
||||
session.viewer.object_rect_changed.connect(self.update_selected_object_rect)
|
||||
session.viewer.object_context_requested.connect(self.show_object_context_menu)
|
||||
session.viewer.object_double_clicked.connect(self.edit_object_at_point)
|
||||
|
||||
def _persist_current_session_state(self) -> None:
|
||||
index = self.active_session_index
|
||||
@@ -1983,9 +1984,13 @@ class MainWindow(QMainWindow):
|
||||
delete_action = menu.addAction("删除对象")
|
||||
copy_action = menu.addAction("复制对象")
|
||||
paste_action = 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)
|
||||
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())
|
||||
if chosen == delete_action:
|
||||
self.delete_selected_object()
|
||||
@@ -1993,6 +1998,58 @@ class MainWindow(QMainWindow):
|
||||
self.copy_selected_object()
|
||||
elif chosen == paste_action:
|
||||
self.paste_copied_object()
|
||||
elif chosen == edit_action and self.selected_annotation:
|
||||
self.edit_annotation_from_panel(self.selected_annotation)
|
||||
elif chosen == properties_action:
|
||||
self.show_selected_object_properties()
|
||||
|
||||
def edit_object_at_point(self, page_index: int, point: tuple[float, float]) -> None:
|
||||
if self.toggle_read_action.isChecked() or not self.select_object_action.isChecked():
|
||||
return
|
||||
self.select_object_at_point(page_index, point)
|
||||
if self.selected_annotation and self._selected_annotation_content_editable():
|
||||
self.edit_annotation_from_panel(self.selected_annotation)
|
||||
return
|
||||
if self.selected_raster_id is not None:
|
||||
self.statusBar().showMessage("图片/签名对象可通过右键查看属性或复制粘贴", 3000)
|
||||
return
|
||||
self.statusBar().showMessage("该对象暂不支持双击编辑内容", 3000)
|
||||
|
||||
def _selected_annotation_content_editable(self) -> bool:
|
||||
if not self.selected_annotation:
|
||||
return False
|
||||
return self.selected_annotation.annotation_type.lower() in {"freetext", "text"}
|
||||
|
||||
def show_selected_object_properties(self) -> None:
|
||||
if self.selected_raster_id is not None:
|
||||
raster = self._session_raster_by_id(self.selected_raster_id)
|
||||
if not raster:
|
||||
return
|
||||
x0, y0, x1, y1 = raster["rect"]
|
||||
message = (
|
||||
f"类型:{raster['type']}\n"
|
||||
f"页码:第 {int(raster['page_index']) + 1} 页\n"
|
||||
f"位置:{x0:.1f}, {y0:.1f}, {x1:.1f}, {y1:.1f}\n"
|
||||
f"文件:{raster['path']}"
|
||||
)
|
||||
QMessageBox.information(self, "对象属性", message)
|
||||
return
|
||||
if self.selected_annotation:
|
||||
rect = self.selected_annotation.rect or self.document.annotation_rect(
|
||||
self.selected_annotation.page_index,
|
||||
self.selected_annotation.xref,
|
||||
)
|
||||
rect_text = ""
|
||||
if rect:
|
||||
rect_text = f"\n位置:{rect[0]:.1f}, {rect[1]:.1f}, {rect[2]:.1f}, {rect[3]:.1f}"
|
||||
message = (
|
||||
f"类型:{self.selected_annotation.annotation_type}\n"
|
||||
f"页码:第 {self.selected_annotation.page_index + 1} 页\n"
|
||||
f"编号:{self.selected_annotation.xref}"
|
||||
f"{rect_text}\n"
|
||||
f"内容:{self.selected_annotation.content or '无'}"
|
||||
)
|
||||
QMessageBox.information(self, "对象属性", message)
|
||||
|
||||
def cancel_current_operation(self) -> bool:
|
||||
had_pending = self.pending_placement is not None
|
||||
|
||||
@@ -13,6 +13,7 @@ class PageLabel(QLabel):
|
||||
object_select_requested = Signal(QPointF)
|
||||
object_rect_changed = Signal(QRectF)
|
||||
object_context_requested = Signal(QPointF)
|
||||
object_double_clicked = Signal(QPointF)
|
||||
|
||||
def __init__(self, text: str = "") -> None:
|
||||
super().__init__(text)
|
||||
@@ -52,6 +53,12 @@ class PageLabel(QLabel):
|
||||
return
|
||||
super().mousePressEvent(event)
|
||||
|
||||
def mouseDoubleClickEvent(self, event: QMouseEvent) -> None:
|
||||
if self.object_edit_enabled and event.button() == Qt.MouseButton.LeftButton:
|
||||
self.object_double_clicked.emit(event.position())
|
||||
return
|
||||
super().mouseDoubleClickEvent(event)
|
||||
|
||||
def mouseMoveEvent(self, event: QMouseEvent) -> None:
|
||||
if self._dragging_object and self.selected_rect:
|
||||
delta = event.position() - self._drag_start
|
||||
@@ -146,6 +153,7 @@ class PdfViewer(QScrollArea):
|
||||
object_select_requested = Signal(int, tuple)
|
||||
object_rect_changed = Signal(int, tuple)
|
||||
object_context_requested = Signal(int, tuple)
|
||||
object_double_clicked = Signal(int, tuple)
|
||||
|
||||
def __init__(self) -> None:
|
||||
super().__init__()
|
||||
@@ -345,6 +353,7 @@ class PdfViewer(QScrollArea):
|
||||
label.object_select_requested.connect(lambda point, index=page_index: self._emit_object_select_for_page(index, point))
|
||||
label.object_rect_changed.connect(lambda rect, index=page_index: self._emit_object_rect_changed_for_page(index, rect))
|
||||
label.object_context_requested.connect(lambda point, index=page_index: self._emit_object_context_for_page(index, point))
|
||||
label.object_double_clicked.connect(lambda point, index=page_index: self._emit_object_double_clicked_for_page(index, point))
|
||||
|
||||
def _labels(self) -> list[PageLabel]:
|
||||
return self._page_labels or [self.page_label]
|
||||
@@ -439,3 +448,7 @@ class PdfViewer(QScrollArea):
|
||||
def _emit_object_context_for_page(self, page_index: int, point: QPointF) -> None:
|
||||
self._set_current_page_from_interaction(page_index)
|
||||
self.object_context_requested.emit(page_index, (point.x() / self.zoom, point.y() / self.zoom))
|
||||
|
||||
def _emit_object_double_clicked_for_page(self, page_index: int, point: QPointF) -> None:
|
||||
self._set_current_page_from_interaction(page_index)
|
||||
self.object_double_clicked.emit(page_index, (point.x() / self.zoom, point.y() / self.zoom))
|
||||
|
||||
Reference in New Issue
Block a user