Add read mode and simplify toolbar
This commit is contained in:
@@ -1084,6 +1084,8 @@ class MainWindow(QMainWindow):
|
||||
self.toggle_tools_action.setChecked(True)
|
||||
self.toggle_annotations_action = QAction("注释", self)
|
||||
self.toggle_annotations_action.setCheckable(True)
|
||||
self.toggle_read_action = QAction("阅读", self)
|
||||
self.toggle_read_action.setCheckable(True)
|
||||
self._apply_action_icons()
|
||||
|
||||
file_menu = self.menuBar().addMenu("文件")
|
||||
@@ -1228,6 +1230,7 @@ class MainWindow(QMainWindow):
|
||||
self.toggle_pages_action: QStyle.StandardPixmap.SP_FileDialogInfoView,
|
||||
self.toggle_tools_action: QStyle.StandardPixmap.SP_FileDialogDetailedView,
|
||||
self.toggle_annotations_action: QStyle.StandardPixmap.SP_FileDialogListView,
|
||||
self.toggle_read_action: QStyle.StandardPixmap.SP_FileDialogContentsView,
|
||||
}
|
||||
for action, standard_icon in icon_map.items():
|
||||
action.setIcon(self.style().standardIcon(standard_icon))
|
||||
@@ -1340,36 +1343,11 @@ class MainWindow(QMainWindow):
|
||||
self.redo_action,
|
||||
]:
|
||||
toolbar.addAction(action)
|
||||
toolbar.addSeparator()
|
||||
for action in [
|
||||
self.zoom_out_action,
|
||||
self.zoom_in_action,
|
||||
]:
|
||||
toolbar.addAction(action)
|
||||
zoom_label = QLabel("缩放")
|
||||
zoom_label.setObjectName("toolbarLabel")
|
||||
self._toolbar_page_size_actions.append(toolbar.addWidget(zoom_label))
|
||||
self._toolbar_page_size_actions.append(toolbar.addWidget(self.zoom_slider))
|
||||
self._toolbar_page_size_actions.append(toolbar.addWidget(self.zoom_percent_input))
|
||||
toolbar.addSeparator()
|
||||
for action in [
|
||||
self.fit_width_action,
|
||||
self.fit_page_action,
|
||||
self.go_to_page_action,
|
||||
]:
|
||||
toolbar.addAction(action)
|
||||
toolbar.addSeparator()
|
||||
for action in [
|
||||
self.highlight_action,
|
||||
self.select_object_action,
|
||||
self.freehand_action,
|
||||
]:
|
||||
toolbar.addAction(action)
|
||||
toolbar.addSeparator()
|
||||
toolbar.addAction(self.toggle_edit_pdf_action)
|
||||
toolbar.addAction(self.toggle_pages_action)
|
||||
toolbar.addAction(self.toggle_tools_action)
|
||||
toolbar.addAction(self.toggle_annotations_action)
|
||||
toolbar.addAction(self.toggle_read_action)
|
||||
|
||||
def _status_action_button(self, action: QAction, width: int = 64) -> QToolButton:
|
||||
button = QToolButton()
|
||||
@@ -1502,6 +1480,7 @@ class MainWindow(QMainWindow):
|
||||
self.toggle_pages_action.toggled.connect(self.toggle_pages_panel)
|
||||
self.toggle_tools_action.toggled.connect(self.toggle_tools_panel)
|
||||
self.toggle_annotations_action.toggled.connect(self.toggle_annotations_panel)
|
||||
self.toggle_read_action.toggled.connect(self.toggle_read_mode)
|
||||
self.right_tools.collapse_requested.connect(self.close_right_tools_panel)
|
||||
self.tab_widget.currentChanged.connect(self._on_tab_changed)
|
||||
self.tab_widget.tabCloseRequested.connect(self._close_tab)
|
||||
@@ -2071,12 +2050,19 @@ class MainWindow(QMainWindow):
|
||||
elif not self._any_right_mode_checked():
|
||||
self.set_right_tools_visible(False)
|
||||
|
||||
def toggle_read_mode(self, checked: bool) -> None:
|
||||
if checked:
|
||||
self._enter_read_mode()
|
||||
elif not self._any_right_mode_checked():
|
||||
self.set_right_tools_visible(False)
|
||||
|
||||
def _right_mode_actions(self) -> list[QAction]:
|
||||
return [
|
||||
self.toggle_edit_pdf_action,
|
||||
self.toggle_pages_action,
|
||||
self.toggle_tools_action,
|
||||
self.toggle_annotations_action,
|
||||
self.toggle_read_action,
|
||||
]
|
||||
|
||||
def _any_right_mode_checked(self) -> bool:
|
||||
@@ -2088,11 +2074,13 @@ class MainWindow(QMainWindow):
|
||||
QSignalBlocker(self.toggle_pages_action),
|
||||
QSignalBlocker(self.toggle_tools_action),
|
||||
QSignalBlocker(self.toggle_annotations_action),
|
||||
QSignalBlocker(self.toggle_read_action),
|
||||
):
|
||||
self.toggle_edit_pdf_action.setChecked(mode == "edit")
|
||||
self.toggle_pages_action.setChecked(mode == "pages")
|
||||
self.toggle_tools_action.setChecked(mode == "tools")
|
||||
self.toggle_annotations_action.setChecked(mode == "annotations")
|
||||
self.toggle_read_action.setChecked(False)
|
||||
|
||||
if mode == "annotations":
|
||||
self.right_tools.set_title("注释")
|
||||
@@ -2109,12 +2097,39 @@ class MainWindow(QMainWindow):
|
||||
self.right_tools.show_sections(["sign", "export", "settings"])
|
||||
self.set_right_tools_visible(True)
|
||||
|
||||
def _enter_read_mode(self) -> None:
|
||||
with (
|
||||
QSignalBlocker(self.toggle_edit_pdf_action),
|
||||
QSignalBlocker(self.toggle_pages_action),
|
||||
QSignalBlocker(self.toggle_tools_action),
|
||||
QSignalBlocker(self.toggle_annotations_action),
|
||||
QSignalBlocker(self.toggle_read_action),
|
||||
):
|
||||
self.toggle_edit_pdf_action.setChecked(False)
|
||||
self.toggle_pages_action.setChecked(False)
|
||||
self.toggle_tools_action.setChecked(False)
|
||||
self.toggle_annotations_action.setChecked(False)
|
||||
self.toggle_read_action.setChecked(True)
|
||||
|
||||
self.pending_placement = None
|
||||
self.selected_annotation = None
|
||||
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.set_right_tools_visible(False)
|
||||
self.statusBar().showMessage("阅读模式已开启", 3000)
|
||||
|
||||
def close_right_tools_panel(self) -> None:
|
||||
with (
|
||||
QSignalBlocker(self.toggle_edit_pdf_action),
|
||||
QSignalBlocker(self.toggle_pages_action),
|
||||
QSignalBlocker(self.toggle_tools_action),
|
||||
QSignalBlocker(self.toggle_annotations_action),
|
||||
QSignalBlocker(self.toggle_read_action),
|
||||
):
|
||||
for action in self._right_mode_actions():
|
||||
action.setChecked(False)
|
||||
|
||||
Reference in New Issue
Block a user