Add multi-tab document sessions
This commit is contained in:
@@ -64,6 +64,7 @@ PDFReaderLite 是一个面向 Windows 的轻量 PDF 阅读与编辑工具,目
|
|||||||
- 设置中注册 PDF 文件关联
|
- 设置中注册 PDF 文件关联
|
||||||
- Acrobat 风格右侧工具面板
|
- Acrobat 风格右侧工具面板
|
||||||
- 图片签名
|
- 图片签名
|
||||||
|
- 多标签页打开、切换、关闭 PDF
|
||||||
- 深色模式
|
- 深色模式
|
||||||
- 常用快捷键
|
- 常用快捷键
|
||||||
|
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重
|
|||||||
- 移除密码(已完成另存为无密码 PDF)
|
- 移除密码(已完成另存为无密码 PDF)
|
||||||
- 基础权限设置(已完成加密保存权限选项)
|
- 基础权限设置(已完成加密保存权限选项)
|
||||||
- 打印(已完成)
|
- 打印(已完成)
|
||||||
- 多标签页
|
- 多标签页(已完成多文档标签打开、切换、关闭)
|
||||||
- 深色模式(已完成)
|
- 深色模式(已完成)
|
||||||
- PDF 文件关联(已完成当前用户级注册与系统默认应用入口)
|
- PDF 文件关联(已完成当前用户级注册与系统默认应用入口)
|
||||||
|
|
||||||
|
|||||||
+118
-14
@@ -1,5 +1,6 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from dataclasses import dataclass
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from PySide6.QtCore import QSettings, QStandardPaths, Qt, QUrl
|
from PySide6.QtCore import QSettings, QStandardPaths, Qt, QUrl
|
||||||
@@ -22,8 +23,10 @@ from PySide6.QtWidgets import (
|
|||||||
QMessageBox,
|
QMessageBox,
|
||||||
QSplitter,
|
QSplitter,
|
||||||
QStatusBar,
|
QStatusBar,
|
||||||
|
QTabWidget,
|
||||||
QToolBar,
|
QToolBar,
|
||||||
QVBoxLayout,
|
QVBoxLayout,
|
||||||
|
QWidget,
|
||||||
)
|
)
|
||||||
|
|
||||||
from pdfreaderlite import __version__
|
from pdfreaderlite import __version__
|
||||||
@@ -40,14 +43,31 @@ from pdfreaderlite.ui.sidebar import Sidebar
|
|||||||
from pdfreaderlite.ui.signature_dialog import SignatureDialog
|
from pdfreaderlite.ui.signature_dialog import SignatureDialog
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class DocumentSession:
|
||||||
|
document: PdfDocument
|
||||||
|
viewer: PdfViewer
|
||||||
|
sidebar: Sidebar
|
||||||
|
widget: QWidget
|
||||||
|
session_raster_objects: list[dict[str, object]]
|
||||||
|
selected_annotation: AnnotationInfo | None = None
|
||||||
|
selected_raster_id: int | None = None
|
||||||
|
next_raster_id: int = 1
|
||||||
|
|
||||||
|
|
||||||
class MainWindow(QMainWindow):
|
class MainWindow(QMainWindow):
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.document = PdfDocument()
|
|
||||||
self.settings = QSettings()
|
self.settings = QSettings()
|
||||||
self.recent_files: list[str] = self.settings.value("recentFiles", [], list)
|
self.recent_files: list[str] = self.settings.value("recentFiles", [], list)
|
||||||
self.dark_mode = self.settings.value("darkMode", False, bool)
|
self.dark_mode = self.settings.value("darkMode", False, bool)
|
||||||
|
|
||||||
|
self.sessions: list[DocumentSession] = []
|
||||||
|
self.active_session_index = -1
|
||||||
|
self.tab_widget = QTabWidget()
|
||||||
|
self.tab_widget.setDocumentMode(True)
|
||||||
|
self.tab_widget.setTabsClosable(True)
|
||||||
|
self.document = PdfDocument()
|
||||||
self.viewer = PdfViewer()
|
self.viewer = PdfViewer()
|
||||||
self.sidebar = Sidebar()
|
self.sidebar = Sidebar()
|
||||||
self.search_box = QLineEdit()
|
self.search_box = QLineEdit()
|
||||||
@@ -58,6 +78,7 @@ class MainWindow(QMainWindow):
|
|||||||
self.session_raster_objects: list[dict[str, object]] = []
|
self.session_raster_objects: list[dict[str, object]] = []
|
||||||
self.selected_raster_id: int | None = None
|
self.selected_raster_id: int | None = None
|
||||||
self.next_raster_id = 1
|
self.next_raster_id = 1
|
||||||
|
self._create_document_session("未打开")
|
||||||
|
|
||||||
self._build_window()
|
self._build_window()
|
||||||
self._build_actions()
|
self._build_actions()
|
||||||
@@ -73,6 +94,92 @@ class MainWindow(QMainWindow):
|
|||||||
self.settings.setValue("windowState", self.saveState())
|
self.settings.setValue("windowState", self.saveState())
|
||||||
super().closeEvent(event)
|
super().closeEvent(event)
|
||||||
|
|
||||||
|
def _create_document_session(self, title: str = "未打开") -> DocumentSession:
|
||||||
|
document = PdfDocument()
|
||||||
|
viewer = PdfViewer()
|
||||||
|
sidebar = Sidebar()
|
||||||
|
splitter = QSplitter()
|
||||||
|
splitter.addWidget(sidebar)
|
||||||
|
splitter.addWidget(viewer)
|
||||||
|
splitter.setSizes([220, 820])
|
||||||
|
|
||||||
|
session = DocumentSession(
|
||||||
|
document=document,
|
||||||
|
viewer=viewer,
|
||||||
|
sidebar=sidebar,
|
||||||
|
widget=splitter,
|
||||||
|
session_raster_objects=[],
|
||||||
|
)
|
||||||
|
self.sessions.append(session)
|
||||||
|
self.tab_widget.addTab(splitter, title)
|
||||||
|
self._connect_session_signals(session)
|
||||||
|
self._activate_session(len(self.sessions) - 1)
|
||||||
|
return session
|
||||||
|
|
||||||
|
def _connect_session_signals(self, session: DocumentSession) -> None:
|
||||||
|
session.sidebar.page_selected.connect(session.viewer.go_to_page)
|
||||||
|
session.viewer.page_changed.connect(session.sidebar.select_page)
|
||||||
|
session.viewer.page_changed.connect(lambda _: self._update_status())
|
||||||
|
session.viewer.page_changed.connect(lambda _: self._refresh_session_raster_overlays())
|
||||||
|
session.viewer.zoom_changed.connect(lambda _: self._update_status())
|
||||||
|
session.viewer.ink_stroke_finished.connect(self.add_ink_stroke)
|
||||||
|
session.viewer.placement_requested.connect(self.place_pending_object)
|
||||||
|
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)
|
||||||
|
|
||||||
|
def _persist_current_session_state(self) -> None:
|
||||||
|
index = self.active_session_index
|
||||||
|
if 0 <= index < len(self.sessions):
|
||||||
|
session = self.sessions[index]
|
||||||
|
session.selected_annotation = self.selected_annotation
|
||||||
|
session.selected_raster_id = self.selected_raster_id
|
||||||
|
session.next_raster_id = self.next_raster_id
|
||||||
|
|
||||||
|
def _activate_session(self, index: int) -> None:
|
||||||
|
if not (0 <= index < len(self.sessions)):
|
||||||
|
return
|
||||||
|
session = self.sessions[index]
|
||||||
|
self.document = session.document
|
||||||
|
self.viewer = session.viewer
|
||||||
|
self.sidebar = session.sidebar
|
||||||
|
self.session_raster_objects = session.session_raster_objects
|
||||||
|
self.selected_annotation = session.selected_annotation
|
||||||
|
self.selected_raster_id = session.selected_raster_id
|
||||||
|
self.next_raster_id = session.next_raster_id
|
||||||
|
self.active_session_index = index
|
||||||
|
if self.tab_widget.currentIndex() != index:
|
||||||
|
self.tab_widget.setCurrentIndex(index)
|
||||||
|
self._refresh_session_raster_overlays()
|
||||||
|
self._update_title()
|
||||||
|
self._update_status()
|
||||||
|
|
||||||
|
def _current_session(self) -> DocumentSession:
|
||||||
|
index = self.tab_widget.currentIndex()
|
||||||
|
return self.sessions[index]
|
||||||
|
|
||||||
|
def _on_tab_changed(self, index: int) -> None:
|
||||||
|
self._persist_current_session_state()
|
||||||
|
self._activate_session(index)
|
||||||
|
|
||||||
|
def _close_tab(self, index: int) -> None:
|
||||||
|
if not (0 <= index < len(self.sessions)):
|
||||||
|
return
|
||||||
|
session = self.sessions[index]
|
||||||
|
session.document.close()
|
||||||
|
self.tab_widget.removeTab(index)
|
||||||
|
self.sessions.pop(index)
|
||||||
|
if not self.sessions:
|
||||||
|
self._create_document_session("未打开")
|
||||||
|
else:
|
||||||
|
self._activate_session(min(index, len(self.sessions) - 1))
|
||||||
|
|
||||||
|
def _update_current_tab_title(self) -> None:
|
||||||
|
index = self.tab_widget.currentIndex()
|
||||||
|
if 0 <= index < len(self.sessions):
|
||||||
|
title = self.document.title if self.document.is_open else "未打开"
|
||||||
|
self.tab_widget.setTabText(index, title)
|
||||||
|
|
||||||
def offer_restore_last_file(self) -> None:
|
def offer_restore_last_file(self) -> None:
|
||||||
last_file = self.settings.value("lastOpenFile", "", str)
|
last_file = self.settings.value("lastOpenFile", "", str)
|
||||||
if not last_file or self.document.is_open or not Path(last_file).exists():
|
if not last_file or self.document.is_open or not Path(last_file).exists():
|
||||||
@@ -95,12 +202,15 @@ class MainWindow(QMainWindow):
|
|||||||
return
|
return
|
||||||
path = selected
|
path = selected
|
||||||
|
|
||||||
|
if self.document.is_open:
|
||||||
|
self._create_document_session(Path(path).name)
|
||||||
try:
|
try:
|
||||||
self._clear_session_raster_objects()
|
self._clear_session_raster_objects()
|
||||||
self.document.open(path)
|
self.document.open(path)
|
||||||
self.viewer.set_document(self.document)
|
self.viewer.set_document(self.document)
|
||||||
self.sidebar.load_document(self.document)
|
self.sidebar.load_document(self.document)
|
||||||
self._remember_file(str(path))
|
self._remember_file(str(path))
|
||||||
|
self._update_current_tab_title()
|
||||||
self._update_title()
|
self._update_title()
|
||||||
self._update_status()
|
self._update_status()
|
||||||
except EncryptedPdfError:
|
except EncryptedPdfError:
|
||||||
@@ -117,6 +227,7 @@ class MainWindow(QMainWindow):
|
|||||||
self.viewer.set_document(self.document)
|
self.viewer.set_document(self.document)
|
||||||
self.sidebar.load_document(self.document)
|
self.sidebar.load_document(self.document)
|
||||||
self._remember_file(str(path))
|
self._remember_file(str(path))
|
||||||
|
self._update_current_tab_title()
|
||||||
self._update_title()
|
self._update_title()
|
||||||
self._update_status()
|
self._update_status()
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
@@ -130,6 +241,7 @@ class MainWindow(QMainWindow):
|
|||||||
try:
|
try:
|
||||||
self._flush_session_raster_objects()
|
self._flush_session_raster_objects()
|
||||||
self.document.save()
|
self.document.save()
|
||||||
|
self._update_current_tab_title()
|
||||||
self.statusBar().showMessage("已保存", 3000)
|
self.statusBar().showMessage("已保存", 3000)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
QMessageBox.critical(self, "保存失败", f"无法保存文件:\n{exc}")
|
QMessageBox.critical(self, "保存失败", f"无法保存文件:\n{exc}")
|
||||||
@@ -148,6 +260,7 @@ class MainWindow(QMainWindow):
|
|||||||
self._flush_session_raster_objects()
|
self._flush_session_raster_objects()
|
||||||
self.document.save_as(selected)
|
self.document.save_as(selected)
|
||||||
self._remember_file(selected)
|
self._remember_file(selected)
|
||||||
|
self._update_current_tab_title()
|
||||||
self._update_title()
|
self._update_title()
|
||||||
self.statusBar().showMessage("已另存为", 3000)
|
self.statusBar().showMessage("已另存为", 3000)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
@@ -656,10 +769,9 @@ class MainWindow(QMainWindow):
|
|||||||
self.setStatusBar(QStatusBar())
|
self.setStatusBar(QStatusBar())
|
||||||
|
|
||||||
splitter = QSplitter()
|
splitter = QSplitter()
|
||||||
splitter.addWidget(self.sidebar)
|
splitter.addWidget(self.tab_widget)
|
||||||
splitter.addWidget(self.viewer)
|
|
||||||
splitter.addWidget(self.right_tools)
|
splitter.addWidget(self.right_tools)
|
||||||
splitter.setSizes([220, 820, 320])
|
splitter.setSizes([1040, 320])
|
||||||
self.setCentralWidget(splitter)
|
self.setCentralWidget(splitter)
|
||||||
|
|
||||||
self.search_box.setPlaceholderText("搜索文本,按 Enter")
|
self.search_box.setPlaceholderText("搜索文本,按 Enter")
|
||||||
@@ -1000,19 +1112,11 @@ class MainWindow(QMainWindow):
|
|||||||
self.arrow_action.triggered.connect(self.add_arrow)
|
self.arrow_action.triggered.connect(self.add_arrow)
|
||||||
self.cover_action.triggered.connect(self.add_cover_area)
|
self.cover_action.triggered.connect(self.add_cover_area)
|
||||||
self.dark_mode_action.triggered.connect(self.toggle_dark_mode)
|
self.dark_mode_action.triggered.connect(self.toggle_dark_mode)
|
||||||
|
self.tab_widget.currentChanged.connect(self._on_tab_changed)
|
||||||
|
self.tab_widget.tabCloseRequested.connect(self._close_tab)
|
||||||
|
|
||||||
self.sidebar.page_selected.connect(self.viewer.go_to_page)
|
|
||||||
self.viewer.page_changed.connect(self.sidebar.select_page)
|
|
||||||
self.viewer.page_changed.connect(lambda _: self._update_status())
|
|
||||||
self.viewer.page_changed.connect(lambda _: self._refresh_session_raster_overlays())
|
|
||||||
self.viewer.zoom_changed.connect(lambda _: self._update_status())
|
|
||||||
self.search_box.returnPressed.connect(self.search)
|
self.search_box.returnPressed.connect(self.search)
|
||||||
self.search_results.itemClicked.connect(self._go_to_search_match)
|
self.search_results.itemClicked.connect(self._go_to_search_match)
|
||||||
self.viewer.ink_stroke_finished.connect(self.add_ink_stroke)
|
|
||||||
self.viewer.placement_requested.connect(self.place_pending_object)
|
|
||||||
self.viewer.object_select_requested.connect(self.select_object_at_point)
|
|
||||||
self.viewer.object_rect_changed.connect(self.update_selected_object_rect)
|
|
||||||
self.viewer.object_context_requested.connect(self.show_object_context_menu)
|
|
||||||
|
|
||||||
def _go_to_search_match(self, item: QListWidgetItem) -> None:
|
def _go_to_search_match(self, item: QListWidgetItem) -> None:
|
||||||
match: SearchMatch = item.data(Qt.ItemDataRole.UserRole)
|
match: SearchMatch = item.data(Qt.ItemDataRole.UserRole)
|
||||||
|
|||||||
Reference in New Issue
Block a user