repdf 0.1.1__tar.gz → 0.1.2__tar.gz

{repdf-0.1.1 → repdf-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: repdf
-Version: 0.1.1
+Version: 0.1.2
 Summary: RePDF (Read the PDF): a desktop PDF reader with printing, search, bookmarks, OCR and page rearrangement.
 Requires-Dist: onnxruntime>=1.31.0,<2
 Requires-Dist: pillow>=11.0,<13
@@ -19,7 +19,7 @@ Description-Content-Type: text/markdown
 
 [繁體中文](README.md) | [English](README.en.md)
 
-RePDF 代表 **Read the PDF**，命令與 Python 套件名稱為 `repdf`。這是一套桌面 PDF 閱讀器，支援多標籤閱讀、列印、書籤與目錄跳頁、文字搜尋、選字複製、OCR 及圖片擷取，也可勾選頁面，依標籤與頁面排列順序重組或拆分輸出。重組與拆分保留原始頁面品質。
+RePDF 代表 **Read the PDF**，命令與 Python 套件名稱為 `repdf`。這是一套桌面 PDF 閱讀器，支援多標籤閱讀、列印、書籤與目錄跳頁、註解清單、文字搜尋、選字複製、OCR 及圖片擷取，也可勾選頁面，依標籤與頁面排列順序重組或拆分輸出。重組與拆分保留原始頁面品質。
 
 ## 重點特色
 
@@ -68,6 +68,7 @@ repdf
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-ocr-region-dark.png"><img src="docs/images/toolbar-ocr-region.png" width="24" alt="區域 OCR 圖示"></picture> | 區域 OCR | 拖曳矩形框選頁面或圖片，放開滑鼠後辨識並複製文字。 | — |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-extract-image-dark.png"><img src="docs/images/toolbar-extract-image.png" width="24" alt="擷取圖片圖示"></picture> | 擷取圖片 | 啟用後點選內嵌點陣圖片，再選擇位置另存為 PNG。 | — |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-bookmarks-dark.png"><img src="docs/images/toolbar-bookmarks.png" width="24" alt="書籤圖示"></picture> | 書籤 | 在左側章節樹展開或收合書籤，點選章節即可跳頁。 | — |
+| <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-annotations-dark.png"><img src="docs/images/toolbar-annotations.png" width="24" alt="註解圖示"></picture> | 註解 | 在左側列出註解，點選即可跳至對應頁面。 | — |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-search-dark.png"><img src="docs/images/toolbar-search.png" width="24" alt="搜尋文字圖示"></picture> | 搜尋文字 | 在右側窗格搜尋文字，上方選檔案、下方選命中段落，單擊即可跳頁並高亮。 | Windows／Linux：<kbd>Ctrl</kbd>+<kbd>F</kbd>；macOS：<kbd>⌘</kbd>+<kbd>F</kbd> |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-zoom-dark.png"><img src="docs/images/toolbar-zoom.png" width="160" alt="顯示比例與縮放滑桿"></picture> | 顯示比例 | 滑桿調整 25%–200%；點擊比例回到 100%。鍵盤縮放每次調整 25 個百分點。 | 放大：<kbd>Ctrl</kbd>+<kbd>+</kbd>／<kbd>Ctrl</kbd>+<kbd>=</kbd>；縮小：<kbd>Ctrl</kbd>+<kbd>-</kbd>；100%：<kbd>Ctrl</kbd>+<kbd>0</kbd> |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-fit-dark.png"><img src="docs/images/toolbar-fit.png" width="24" alt="Fit 圖示"></picture> | Fit | 將目前單頁等比例縮放至預覽區；調整視窗大小時自動適應。拖動滑桿或使用縮放快捷鍵會回到手動比例。 | — |
@@ -153,11 +154,25 @@ repdf
 - 書籤跟隨目前標籤頁切換；沒有內建書籤的文件會顯示提示。
 - 一般預覽與全螢幕都可直接點選 PDF 頁內的目錄連結；滑鼠移到可跳頁區域時會顯示手指游標與目的頁碼。
 - 跳頁保留目前縮放／Fit 模式。頁面已重新排序時，仍會找到目的章節所屬的原始頁面。
-- 視窗縮窄時，書籤與 PDF 以單一窗格切換；點選章節後返回 PDF，再點「書籤」可返回目錄。搜尋與書籤窗格可透過各自的工具按鈕切換。
+- 視窗縮窄時，書籤與 PDF 以單一窗格切換；點選章節後返回 PDF，再點「書籤」可返回目錄。書籤、註解與搜尋窗格可透過各自的工具按鈕切換。
 - 啟用複製文字、區域 OCR 或圖片擷取模式時，頁內連結暫停點選；停用後即可跳頁，拖曳頁面仍可排序。
 - 一般預覽與全螢幕可點選 PDF 內建的 HTTP／HTTPS 超連結，以系統預設瀏覽器開啟；滑鼠停留可查看網址。
 - 此功能使用 PDF 已有的書籤與連結；純文字或掃描圖片形式的目錄、網址不會自動變成連結。電子郵件、外部文件與其他動作不在支援範圍。
 
+### 註解清單
+
+- 點工具列的「註解」對話框圖示，開啟目前標籤頁的左側註解清單。
+- 清單依 PDF 原始頁序分組，每頁顯示註解數量，預設收合；展開後查看個別註解的類型與摘要。切換標籤、書籤或介面語言後會保留展開狀態。滑鼠停留可查看完整內容、作者、主旨及修改時間（若文件有提供）。
+- 點選頁碼群組即可跳到該頁清單中的第一個註解，並標示其範圍；點選個別註解會跳到對應位置，並以半透明底色與外框標示註解範圍。保留目前縮放／Fit 模式，頁面重新排列後仍會找到原始目標頁。
+- 選取含文字的註解時，會自動將註解文字複製到剪貼簿；頁碼群組會複製第一個註解的文字。無文字的註解不會覆蓋剪貼簿內容。
+- 關閉註解窗格或切換至其他側欄時，會取消框選；重新開啟清單不會自動複製文字或恢復框選。
+- 框選會跟隨縮放與全螢幕顯示；點選另一註解或頁碼群組會更新標示，點選書籤或搜尋結果則清除標示。文件未提供有效註解範圍時，仍可跳頁。
+- 支援備註、文字方塊、螢光標示、底線、刪除線、手繪及形狀等註解。文字標示若沒有附註內容，會嘗試顯示標示的原文。
+- 在一般閱讀模式可直接點選頁面上的註解，框選其範圍並同步選取左側清單、展開對應頁面群組；全螢幕也可使用。選字、區域 OCR 與圖片擷取模式保留各自操作。窄視窗點選後維持 PDF 顯示，再按「註解」即可查看清單中的選取項目。
+- 註解跟隨標籤頁切換；沒有註解時顯示提示。書籤、註解與搜尋窗格透過各自的按鈕切換。
+- 視窗較窄時，點選後返回 PDF；再點「註解」可返回清單。
+- 完整註解清單只在開啟窗格時於背景讀取；頁面點選範圍則隨目前需要顯示的頁面讀取，不會在開檔時掃描整份文件；此功能提供檢視與跳頁，不編輯註解或執行附件內容。
+
 ### 搜尋文字
 
 1. 點「搜尋文字」或按 <kbd>Ctrl</kbd>+<kbd>F</kbd>（macOS：<kbd>⌘</kbd>+<kbd>F</kbd>），開啟右側窗格。

{repdf-0.1.1 → repdf-0.1.2}/README.md

@@ -2,7 +2,7 @@
 
 [繁體中文](README.md) | [English](README.en.md)
 
-RePDF 代表 **Read the PDF**，命令與 Python 套件名稱為 `repdf`。這是一套桌面 PDF 閱讀器，支援多標籤閱讀、列印、書籤與目錄跳頁、文字搜尋、選字複製、OCR 及圖片擷取，也可勾選頁面，依標籤與頁面排列順序重組或拆分輸出。重組與拆分保留原始頁面品質。
+RePDF 代表 **Read the PDF**，命令與 Python 套件名稱為 `repdf`。這是一套桌面 PDF 閱讀器，支援多標籤閱讀、列印、書籤與目錄跳頁、註解清單、文字搜尋、選字複製、OCR 及圖片擷取，也可勾選頁面，依標籤與頁面排列順序重組或拆分輸出。重組與拆分保留原始頁面品質。
 
 ## 重點特色
 
@@ -51,6 +51,7 @@ repdf
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-ocr-region-dark.png"><img src="docs/images/toolbar-ocr-region.png" width="24" alt="區域 OCR 圖示"></picture> | 區域 OCR | 拖曳矩形框選頁面或圖片，放開滑鼠後辨識並複製文字。 | — |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-extract-image-dark.png"><img src="docs/images/toolbar-extract-image.png" width="24" alt="擷取圖片圖示"></picture> | 擷取圖片 | 啟用後點選內嵌點陣圖片，再選擇位置另存為 PNG。 | — |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-bookmarks-dark.png"><img src="docs/images/toolbar-bookmarks.png" width="24" alt="書籤圖示"></picture> | 書籤 | 在左側章節樹展開或收合書籤，點選章節即可跳頁。 | — |
+| <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-annotations-dark.png"><img src="docs/images/toolbar-annotations.png" width="24" alt="註解圖示"></picture> | 註解 | 在左側列出註解，點選即可跳至對應頁面。 | — |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-search-dark.png"><img src="docs/images/toolbar-search.png" width="24" alt="搜尋文字圖示"></picture> | 搜尋文字 | 在右側窗格搜尋文字，上方選檔案、下方選命中段落，單擊即可跳頁並高亮。 | Windows／Linux：<kbd>Ctrl</kbd>+<kbd>F</kbd>；macOS：<kbd>⌘</kbd>+<kbd>F</kbd> |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-zoom-dark.png"><img src="docs/images/toolbar-zoom.png" width="160" alt="顯示比例與縮放滑桿"></picture> | 顯示比例 | 滑桿調整 25%–200%；點擊比例回到 100%。鍵盤縮放每次調整 25 個百分點。 | 放大：<kbd>Ctrl</kbd>+<kbd>+</kbd>／<kbd>Ctrl</kbd>+<kbd>=</kbd>；縮小：<kbd>Ctrl</kbd>+<kbd>-</kbd>；100%：<kbd>Ctrl</kbd>+<kbd>0</kbd> |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-fit-dark.png"><img src="docs/images/toolbar-fit.png" width="24" alt="Fit 圖示"></picture> | Fit | 將目前單頁等比例縮放至預覽區；調整視窗大小時自動適應。拖動滑桿或使用縮放快捷鍵會回到手動比例。 | — |
@@ -136,11 +137,25 @@ repdf
 - 書籤跟隨目前標籤頁切換；沒有內建書籤的文件會顯示提示。
 - 一般預覽與全螢幕都可直接點選 PDF 頁內的目錄連結；滑鼠移到可跳頁區域時會顯示手指游標與目的頁碼。
 - 跳頁保留目前縮放／Fit 模式。頁面已重新排序時，仍會找到目的章節所屬的原始頁面。
-- 視窗縮窄時，書籤與 PDF 以單一窗格切換；點選章節後返回 PDF，再點「書籤」可返回目錄。搜尋與書籤窗格可透過各自的工具按鈕切換。
+- 視窗縮窄時，書籤與 PDF 以單一窗格切換；點選章節後返回 PDF，再點「書籤」可返回目錄。書籤、註解與搜尋窗格可透過各自的工具按鈕切換。
 - 啟用複製文字、區域 OCR 或圖片擷取模式時，頁內連結暫停點選；停用後即可跳頁，拖曳頁面仍可排序。
 - 一般預覽與全螢幕可點選 PDF 內建的 HTTP／HTTPS 超連結，以系統預設瀏覽器開啟；滑鼠停留可查看網址。
 - 此功能使用 PDF 已有的書籤與連結；純文字或掃描圖片形式的目錄、網址不會自動變成連結。電子郵件、外部文件與其他動作不在支援範圍。
 
+### 註解清單
+
+- 點工具列的「註解」對話框圖示，開啟目前標籤頁的左側註解清單。
+- 清單依 PDF 原始頁序分組，每頁顯示註解數量，預設收合；展開後查看個別註解的類型與摘要。切換標籤、書籤或介面語言後會保留展開狀態。滑鼠停留可查看完整內容、作者、主旨及修改時間（若文件有提供）。
+- 點選頁碼群組即可跳到該頁清單中的第一個註解，並標示其範圍；點選個別註解會跳到對應位置，並以半透明底色與外框標示註解範圍。保留目前縮放／Fit 模式，頁面重新排列後仍會找到原始目標頁。
+- 選取含文字的註解時，會自動將註解文字複製到剪貼簿；頁碼群組會複製第一個註解的文字。無文字的註解不會覆蓋剪貼簿內容。
+- 關閉註解窗格或切換至其他側欄時，會取消框選；重新開啟清單不會自動複製文字或恢復框選。
+- 框選會跟隨縮放與全螢幕顯示；點選另一註解或頁碼群組會更新標示，點選書籤或搜尋結果則清除標示。文件未提供有效註解範圍時，仍可跳頁。
+- 支援備註、文字方塊、螢光標示、底線、刪除線、手繪及形狀等註解。文字標示若沒有附註內容，會嘗試顯示標示的原文。
+- 在一般閱讀模式可直接點選頁面上的註解，框選其範圍並同步選取左側清單、展開對應頁面群組；全螢幕也可使用。選字、區域 OCR 與圖片擷取模式保留各自操作。窄視窗點選後維持 PDF 顯示，再按「註解」即可查看清單中的選取項目。
+- 註解跟隨標籤頁切換；沒有註解時顯示提示。書籤、註解與搜尋窗格透過各自的按鈕切換。
+- 視窗較窄時，點選後返回 PDF；再點「註解」可返回清單。
+- 完整註解清單只在開啟窗格時於背景讀取；頁面點選範圍則隨目前需要顯示的頁面讀取，不會在開檔時掃描整份文件；此功能提供檢視與跳頁，不編輯註解或執行附件內容。
+
 ### 搜尋文字
 
 1. 點「搜尋文字」或按 <kbd>Ctrl</kbd>+<kbd>F</kbd>（macOS：<kbd>⌘</kbd>+<kbd>F</kbd>），開啟右側窗格。

{repdf-0.1.1 → repdf-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "repdf"
-version = "0.1.1"
+version = "0.1.2"
 description = "RePDF (Read the PDF): a desktop PDF reader with printing, search, bookmarks, OCR and page rearrangement."
 readme = "README.md"
 requires-python = ">=3.11"

{repdf-0.1.1 → repdf-0.1.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "repdf"
-version = "0.1.1"
+version = "0.1.2"
 description = "RePDF (Read the PDF): a desktop PDF reader with printing, search, bookmarks, OCR and page rearrangement."
 readme = "README.md"
 requires-python = ">=3.11"

{repdf-0.1.1 → repdf-0.1.2}/src/repdf/app.py

@@ -90,8 +90,10 @@ class DocumentView(QWidget):
         self.focused_page = None
         self.page_sizes = {}
         self.page_links = {}
+        self.page_annotations = {}
         self.page_labels = {}
         self.bookmarks = None
+        self.annotations = None
         self.ready = False
         self._search_navigation = None
         self.password: str | None = None
@@ -178,6 +180,7 @@ class DocumentView(QWidget):
                                       self.owner._copy_text_selection(self, index, preview, start, end, copy=False))
         self.pages.prepare_card(card)
         card.preview.set_links(self.page_links.get(page_index, []))
+        card.preview.set_annotations(self.page_annotations.get(page_index, []))
         card.preview.link_activated.connect(lambda destination: self.owner.navigation.activate(self, destination))
         self.pages.chrome = max(1, card.sizeHint().height() - card.preview.height())
         return card
@@ -734,6 +737,12 @@ class MainWindow(QMainWindow):
         self.bookmark_action.triggered.connect(lambda: self.navigation.toggle())
         self.toolbar.addAction(self.bookmark_action)
         self.toolbar.widgetForAction(self.bookmark_action).setObjectName('bookmarksTool')
+        self.annotation_action = QAction(tr('註解'), self)
+        self.annotation_action.setCheckable(True)
+        self.annotation_action.setToolTip(tr('註解：開啟註解清單，點選即可跳至對應頁面'))
+        self.annotation_action.triggered.connect(lambda: self.navigation.toggle('annotations'))
+        self.toolbar.addAction(self.annotation_action)
+        self.toolbar.widgetForAction(self.annotation_action).setObjectName('annotationsTool')
         self.search_action = QAction(tr('搜尋文字'), self)
         self.search_action.setShortcuts(QKeySequence.keyBindings(QKeySequence.StandardKey.Find))
         self.search_action.setToolTip(tr('搜尋文字（{p0}）：在右側窗格搜尋目前、勾選或所有標籤頁',
@@ -822,6 +831,7 @@ class MainWindow(QMainWindow):
                              (self.search_action, "search"),
                              (self.print_action, "print"),
                              (self.bookmark_action, "bookmarks"),
+                             (self.annotation_action, "annotations"),
                              (self.fit_action, "fit"),
                              (self.fullscreen_action, "fullscreen"),
                              (self.spread_action, "fullscreen_spread"),
@@ -1503,6 +1513,7 @@ class MainWindow(QMainWindow):
 
     def closeEvent(self, event: QCloseEvent) -> None:
         self._closing = True
+        self.navigation.shutdown()
         self.ocr_languages.close()
         self.print_controller.close()
         self.search_controller.stop()

{repdf-0.1.1 → repdf-0.1.2}/src/repdf/icons.py

@@ -20,7 +20,13 @@ def toolbar_icon(kind: str) -> QIcon:
         painter.setPen(QPen(QApplication.palette().color(group, role),
                             1.0, Qt.PenStyle.SolidLine, Qt.PenCapStyle.RoundCap,
                             Qt.PenJoinStyle.RoundJoin))
-        if kind == 'chevron_down':
+        if kind == 'annotations':
+            painter.drawPolyline(QPolygonF([QPointF(4, 3), QPointF(21, 3), QPointF(21, 17),
+                                            QPointF(11, 17), QPointF(6, 21), QPointF(6, 17),
+                                            QPointF(4, 17), QPointF(4, 3)]))
+            painter.drawLine(8, 8, 17, 8)
+            painter.drawLine(8, 12, 15, 12)
+        elif kind == 'chevron_down':
             pen = painter.pen()
             pen.setWidthF(2)
             painter.setPen(pen)

repdf-0.1.2/src/repdf/navigation.py

@@ -0,0 +1,397 @@
+"""Bookmark/annotation sidebar, internal navigation and web links."""
+
+from html import escape
+
+from PySide6.QtCore import QEvent, QObject, QSize, Qt, QUrl
+from PySide6.QtGui import QDesktopServices
+from PySide6.QtWidgets import (QApplication, QHBoxLayout, QLabel, QLayout, QSplitter, QToolButton,
+                               QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget)
+
+from repdf.icons import toolbar_icon
+from repdf.strings import tr
+from repdf.renderer import RenderService, start_render_backend
+
+
+class BookmarkPanel(QWidget):
+    def __init__(self):
+        super().__init__()
+        self.setMinimumSize(0, 0)
+        layout = QVBoxLayout(self)
+        layout.setContentsMargins(8, 8, 8, 8)
+        layout.setSpacing(6)
+        layout.setSizeConstraint(QLayout.SizeConstraint.SetNoConstraint)
+        row = QHBoxLayout()
+        self.title = QLabel(tr('書籤'))
+        row.addWidget(self.title, 1)
+        self.close_button = QToolButton()
+        self.close_button.setText(tr('關閉書籤窗格'))
+        self.close_button.setAccessibleName(tr('關閉書籤窗格'))
+        self.close_button.setToolTip(tr('關閉書籤窗格'))
+        self.close_button.setFixedSize(34, 34)
+        self.close_button.setIconSize(QSize(20, 20))
+        self.close_button.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
+        self.close_button.setIcon(toolbar_icon('close'))
+        row.addWidget(self.close_button)
+        layout.addLayout(row)
+        self.status = QLabel()
+        self.status.setWordWrap(True)
+        self.status.setTextFormat(Qt.TextFormat.PlainText)
+        layout.addWidget(self.status)
+        self.tree = QTreeWidget()
+        self.tree.setHeaderHidden(True)
+        self.tree.setAccessibleName(tr('PDF 書籤'))
+        self.tree.setMinimumSize(0, 0)
+        self.tree.setIndentation(16)
+        self.tree.setTextElideMode(Qt.TextElideMode.ElideRight)
+        self.tree.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
+        layout.addWidget(self.tree, 1)
+
+    def changeEvent(self, event):
+        super().changeEvent(event)
+        if event.type() == QEvent.Type.PaletteChange and hasattr(self, 'close_button'):
+            self.close_button.setIcon(toolbar_icon('close'))
+
+
+class NavigationController(QObject):
+    def __init__(self, owner, content):
+        super().__init__(owner)
+        self.owner, self.content = owner, content
+        self.panel = BookmarkPanel()
+        self.workspace = QSplitter(Qt.Orientation.Horizontal)
+        self.workspace.setChildrenCollapsible(False)
+        self.workspace.addWidget(self.panel)
+        self.workspace.addWidget(content)
+        self.workspace.setStretchFactor(0, 0)
+        self.workspace.setStretchFactor(1, 1)
+        self.panel.hide()
+        self.opened = False
+        self.narrow_results = True
+        self.displayed_id = None
+        self.kind = 'bookmarks'
+        self.displayed_kind = None
+        self.annotation_service = None
+        self.items = []
+        self.annotation_groups = {}
+        self.states = {}
+        self.requests = {}
+        self.latest_jump = None
+        self.annotation_selection = None
+        self.pending_annotation_copy = None
+        self._layout_state = None
+        self.panel.close_button.clicked.connect(self.close)
+        self.panel.tree.itemClicked.connect(self._clicked)
+        self.panel.tree.itemActivated.connect(self._clicked)
+
+    def toggle(self, kind='bookmarks'):
+        if self.panel.isVisible() and self.kind == kind:
+            self.close()
+        else:
+            self.open(kind)
+
+    def open(self, kind='bookmarks', *, keep_fullscreen=False):
+        if kind != self.kind:
+            if self.kind == 'annotations':
+                self._clear_annotation_selection()
+            self._cancel_annotations()
+        self.kind = kind
+        if self.owner._fullscreen_preview is not None and not keep_fullscreen:
+            self.owner._fullscreen_preview.close()
+        self.owner.search_controller.close()
+        self.opened = True
+        self.narrow_results = True
+        self.layout()
+        self.show_document()
+        self.panel.tree.setFocus()
+
+    def close(self):
+        if self.kind == 'annotations':
+            self._clear_annotation_selection()
+        self._cancel_annotations()
+        self.opened = False
+        self.layout()
+
+    def _clear_annotation_selection(self):
+        self.annotation_selection = None
+        self.pending_annotation_copy = None
+        self.latest_jump = None
+        for doc in self.owner.documents.values():
+            doc.pages.set_annotation_highlight(None, None)
+
+    def layout(self):
+        narrow = self.owner.width() < 640
+        state = narrow, self.opened, self.narrow_results, self.kind
+        if state == self._layout_state:
+            return
+        self._layout_state = state
+        visible = self.opened and (not narrow or self.narrow_results)
+        self.content.setVisible(not (narrow and visible))
+        self.panel.setVisible(visible)
+        self.owner.bookmark_action.setChecked(visible and self.kind == 'bookmarks')
+        self.owner.annotation_action.setChecked(visible and self.kind == 'annotations')
+        if visible and not narrow:
+            self.workspace.setSizes([260, max(1, self.owner.width() - 260)])
+
+    def show_document(self):
+        doc = self.owner.current_document()
+        document_id = doc.document_id if doc is not None else None
+        if self.pending_annotation_copy is not None and self.pending_annotation_copy[0] != document_id:
+            self.pending_annotation_copy = None
+        if (self.displayed_id, self.displayed_kind) != (document_id, self.kind):
+            self._cancel_annotations()
+            self._remember_state()
+            self.latest_jump = None
+            self.displayed_id = document_id
+            self.displayed_kind = self.kind
+            self.panel.tree.clear()
+            self.items = []
+            self.annotation_groups = {}
+        annotations = self.kind == 'annotations'
+        self.panel.title.setText(tr('註解' if annotations else '書籤'))
+        close_label = tr('關閉註解窗格' if annotations else '關閉書籤窗格')
+        self.panel.close_button.setText(close_label)
+        self.panel.close_button.setToolTip(close_label)
+        self.panel.close_button.setAccessibleName(close_label)
+        self.panel.tree.setAccessibleName(tr('PDF 註解' if annotations else 'PDF 書籤'))
+        self.panel.tree.setRootIsDecorated(True)
+        self.panel.tree.setIndentation(16)
+        if not self.opened:
+            return
+        if doc is None or not doc.ready:
+            self.panel.status.setText(tr('請先開啟 PDF 檔案'))
+            self.panel.status.show()
+            return
+        if getattr(doc, self.kind) is not None:
+            self.populate(doc)
+            return
+        self.panel.status.setText(tr('正在載入註解…' if annotations else '正在載入書籤…'))
+        self.panel.status.show()
+        if not any(value == (doc.document_id, self.kind, False) for value in self.requests.values()):
+            self._request(doc, self.kind)
+
+    def _request(self, doc, kind, destination=None, fullscreen=False):
+        self.owner._next_generation += 1
+        generation = self.owner._next_generation
+        self.requests = {key: value for key, value in self.requests.items()
+                         if value[:2] != (doc.document_id, kind)}
+        self.requests[generation] = doc.document_id, kind, fullscreen
+        if kind == 'navigate':
+            self.latest_jump = generation
+        service = self.owner.render_service
+        if kind == 'annotations':
+            try:
+                if self.annotation_service is None:
+                    self.annotation_service = RenderService(start_render_backend(), self)
+                    self.annotation_service.message.connect(self.receive, Qt.ConnectionType.QueuedConnection)
+                service = self.annotation_service
+            except (OSError, RuntimeError) as exc:
+                self.receive({'type': 'error', 'generation': generation, 'message': str(exc)})
+                return generation
+        service.request_navigation(doc.source_path, doc.document_id, generation, kind,
+                                                     destination=destination, password=doc.password)
+        return generation
+
+    def populate(self, doc):
+        if self.items:
+            return
+        self.panel.tree.clear()
+        if self.kind == 'annotations':
+            self.populate_annotations(doc)
+            return
+        parents = []
+        remembered = self.states.get((doc.document_id, self.kind))
+        for index, bookmark in enumerate(doc.bookmarks):
+            level = min(bookmark['level'], len(parents))
+            parents = parents[:level]
+            parent = parents[-1] if parents else self.panel.tree
+            title = bookmark['title'] or tr('未命名書籤')
+            item = QTreeWidgetItem(parent, [title])
+            item.setData(0, Qt.ItemDataRole.UserRole, bookmark['destination'])
+            item.setToolTip(0, title)
+            self.items.append(item)
+            parents.append(item)
+        if remembered and 0 <= remembered[1] < len(self.items):
+            self.panel.tree.setCurrentItem(self.items[remembered[1]])
+        for index, (item, bookmark) in enumerate(zip(self.items, doc.bookmarks)):
+            item.setExpanded(index in remembered[0] if remembered else bookmark['expanded'])
+        self.panel.status.setText(tr('此 PDF 沒有內建書籤'))
+        self.panel.status.setVisible(not bool(doc.bookmarks))
+
+    def populate_annotations(self, doc):
+        counts = {}
+        first_destinations = {}
+        for annotation in doc.annotations:
+            page = annotation['page']
+            counts[page] = counts.get(page, 0) + 1
+            first_destinations.setdefault(page, annotation['destination'])
+        for page, count in counts.items():
+            title = tr('第 {page} 頁（{count} 則註解）', page=page + 1, count=count)
+            group = QTreeWidgetItem(self.panel.tree, [title])
+            group.setToolTip(0, title)
+            group.setData(0, Qt.ItemDataRole.UserRole, first_destinations[page])
+            self.annotation_groups[page] = group
+        for annotation in doc.annotations:
+            summary = ' '.join((annotation['contents'] or annotation['subject'] or tr('沒有文字內容')).split())
+            title = tr(annotation['kind']) + ' · ' + summary
+            item = QTreeWidgetItem(self.annotation_groups[annotation['page']], [title])
+            item.setData(0, Qt.ItemDataRole.UserRole, annotation['destination'])
+            details = [tr(annotation['kind']), annotation['contents'] or tr('沒有文字內容')]
+            for key, label in [('author', '作者：{value}'), ('subject', '主旨：{value}'), ('modified', '修改時間：{value}')]:
+                if annotation.get(key):
+                    details.append(tr(label, value=annotation[key]))
+            item.setToolTip(0, '<qt>' + '<br>'.join(escape(line).replace('\n', '<br>') for line in details) + '</qt>')
+            self.items.append(item)
+        remembered = self.states.get((doc.document_id, self.kind))
+        if remembered and 0 <= remembered[1] < len(self.items):
+            self.panel.tree.setCurrentItem(self.items[remembered[1]])
+        for page, group in self.annotation_groups.items():
+            group.setExpanded(remembered is not None and page in remembered[0])
+        self._select_annotation_item(doc)
+        self.panel.status.setText(tr('共 {count} 則註解', count=len(doc.annotations)) if doc.annotations else tr('此 PDF 沒有註解'))
+        self.panel.status.show()
+
+    def _remember_state(self):
+        selected = self.panel.tree.currentItem()
+        expanded = ([page for page, group in self.annotation_groups.items() if group.isExpanded()]
+                    if self.displayed_kind == 'annotations'
+                    else [i for i, item in enumerate(self.items) if item.isExpanded()])
+        self.states[self.displayed_id, self.displayed_kind] = (
+            expanded, self.items.index(selected) if selected in self.items else -1)
+
+    def _clicked(self, item, _column=0):
+        self.annotation_selection = None
+        destination = item.data(0, Qt.ItemDataRole.UserRole)
+        doc = self.owner.current_document()
+        if destination is not None and doc is not None:
+            self.activate(doc, destination)
+            if self.kind == 'annotations':
+                target = item if item in self.items else item.child(0)
+                if target in self.items:
+                    annotation = doc.annotations[self.items.index(target)]
+                    self.pending_annotation_copy = doc.document_id, annotation['page'], annotation['index']
+
+    def activate(self, doc, destination, fullscreen=False):
+        if doc.ready and doc is self.owner.current_document():
+            self.pending_annotation_copy = None
+            if 'annotation_index' in destination:
+                self.latest_jump = None
+                doc._search_navigation = None
+                self.annotation_selection = doc.document_id, destination['page'], destination['annotation_index']
+                self.pending_annotation_copy = self.annotation_selection
+                self.open('annotations', keep_fullscreen=fullscreen)
+                self.narrow_results = False
+                self.layout()
+                self._select_annotation_item(doc)
+                self.owner.search_controller.clear_highlights()
+                doc.pages.set_annotation_highlight(destination['page'], destination.get('annotation_rect'))
+                doc._focus_page(destination['page'])
+                return
+            if 'url' in destination:
+                url = QUrl(destination['url'], QUrl.ParsingMode.StrictMode)
+                if (url.isValid() and url.scheme().lower() in ('http', 'https') and url.host()
+                        and not any(ord(c) < 32 or ord(c) == 127 for c in destination['url'])):
+                    if not QDesktopServices.openUrl(url):
+                        self.owner.statusBar().showMessage(tr('無法開啟連結：{p0}', p0=destination['url']))
+                return
+            self._request(doc, 'navigate', destination, fullscreen)
+
+    def _select_annotation_item(self, doc):
+        if (self.annotation_selection is None or self.kind != 'annotations'
+                or self.displayed_id != doc.document_id or doc.annotations is None):
+            return
+        for annotation, item in zip(doc.annotations, self.items):
+            if self.annotation_selection == (doc.document_id, annotation['page'], annotation['index']):
+                item.parent().setExpanded(True)
+                self.panel.tree.setCurrentItem(item)
+                self.panel.tree.scrollToItem(item)
+                self._copy_pending_annotation(doc)
+                break
+
+    def _copy_pending_annotation(self, doc):
+        if doc.annotations is None or doc is not self.owner.current_document():
+            return
+        for annotation in doc.annotations:
+            if self.pending_annotation_copy == (doc.document_id, annotation['page'], annotation['index']):
+                self.pending_annotation_copy = None
+                text = annotation['contents']
+                if text.strip():
+                    QApplication.clipboard().setText(text)
+                    self.owner.statusBar().showMessage(tr('已複製 {p0} 個字元到剪貼簿', p0=len(text)))
+                break
+
+    def receive(self, payload):
+        generation = payload.get('generation')
+        request = self.requests.get(generation)
+        if request is None:
+            return False
+        document_id, kind, fullscreen = request
+        doc = self.owner.documents.get(document_id)
+        message_type = payload.get('type')
+        if message_type in ('done', 'error'):
+            self.requests.pop(generation, None)
+        if doc is None or self.owner._closing:
+            return True
+        if message_type in ('bookmarks', 'annotations'):
+            setattr(doc, message_type, payload[message_type])
+            if doc.document_id == self.displayed_id and self.kind == message_type:
+                self.populate(doc)
+        elif message_type == 'navigate' and generation == self.latest_jump and doc is self.owner.current_document():
+            page = payload['page']
+            doc.page_labels[page] = payload.get('page_label')
+            doc.page_sizes[page] = payload['width_points'], payload['height_points']
+            doc._reflow_grid()
+            self.owner.search_controller.clear_highlights()
+            doc.pages.set_annotation_highlight(page, payload.get('annotation_rect'))
+            self._copy_pending_annotation(doc)
+            viewer = self.owner._fullscreen_preview
+            if fullscreen and viewer is not None and viewer.document is doc:
+                viewer.show_page(page)
+            else:
+                self.narrow_results = False
+                self.layout()
+                doc.jump_to_page(page, payload['point'])
+        elif message_type == 'error':
+            message = tr('無法載入註解：{p0}' if kind == 'annotations' else '無法載入 PDF 導航：{p0}',
+                         p0=payload.get('message', ''))
+            if doc.document_id == self.displayed_id and kind == self.kind:
+                self.panel.status.setText(message)
+                self.panel.status.show()
+            self.owner.statusBar().showMessage(message)
+        return True
+
+    def remove_document(self, doc):
+        if self.annotation_selection is not None and self.annotation_selection[0] == doc.document_id:
+            self.annotation_selection = None
+        if self.pending_annotation_copy is not None and self.pending_annotation_copy[0] == doc.document_id:
+            self.pending_annotation_copy = None
+        if self.displayed_id == doc.document_id or any(
+                value[:2] == (doc.document_id, 'annotations') for value in self.requests.values()):
+            self._cancel_annotations()
+        for kind in ('bookmarks', 'annotations'):
+            self.states.pop((doc.document_id, kind), None)
+        self.requests = {key: value for key, value in self.requests.items() if value[0] != doc.document_id}
+        if self.displayed_id == doc.document_id:
+            self.displayed_id = None
+            self.items = []
+            self.annotation_groups = {}
+            self.panel.tree.clear()
+        for prefix in (-3_000_000, -4_000_000):
+            self.owner.render_service.cancel_pending(prefix - doc.document_id)
+
+    def retranslate(self):
+        if self.kind == 'annotations':
+            self._remember_state()
+            self.panel.tree.clear()
+            self.items = []
+            self.annotation_groups = {}
+        if self.opened:
+            self.show_document()
+
+    def _cancel_annotations(self):
+        self.requests = {key: value for key, value in self.requests.items() if value[1] != 'annotations'}
+        service, self.annotation_service = self.annotation_service, None
+        if service is not None:
+            service.close(terminate_tree=True)
+            service.deleteLater()
+
+    def shutdown(self):
+        self._cancel_annotations()

{repdf-0.1.1 → repdf-0.1.2}/src/repdf/packaging_smoke.py

@@ -90,6 +90,8 @@ def main(report_path: str) -> int:
             writer = PdfWriter()
             for width in (200, 300):
                 writer.add_blank_page(width=width, height=400)
+            from pypdf.annotations import Text
+            writer.add_annotation(1, Text(rect=(30, 200, 100, 250), text='Smoke annotation 註解'))
             with source.open("wb") as stream:
                 writer.write(stream)
             process = start_render_backend()
@@ -107,11 +109,29 @@ def main(report_path: str) -> int:
                 if message["type"] == "page":
                     if QImage(message["path"]).isNull():
                         raise RuntimeError("Invalid rendered page")
+                    hits = message.get('annotation_hits', [])
+                    if message['page'] == 1 and (len(hits) != 1 or
+                            hits[0]['destination'].get('annotation_index') != 0):
+                        raise RuntimeError(f'Invalid annotation hit targets: {hits}')
                     pages.append(message["page"])
                 if message["type"] == "done":
                     break
             if pages != [0, 1]:
                 raise RuntimeError(f"Unexpected rendered pages: {pages}")
+            process.stdin.write(json.dumps({'type': 'annotations', 'source': str(source), 'generation': 2}) + '\n')
+            process.stdin.flush()
+            annotations = None
+            for line in process.stdout:
+                message = json.loads(line)
+                if message['type'] == 'error':
+                    raise RuntimeError(message['message'])
+                if message['type'] == 'annotations':
+                    annotations = message['annotations']
+                if message['type'] == 'done':
+                    break
+            if (not annotations or len(annotations) != 1 or annotations[0]['page'] != 1
+                    or annotations[0]['contents'] != 'Smoke annotation 註解'):
+                raise RuntimeError(f'Packaged annotation extraction failed: {annotations}')
             from PySide6.QtCore import QEventLoop, QTimer
             from PySide6.QtPrintSupport import QPrinter
             from repdf.printing import PrintJob, PrintPage