repdf 0.1.3__tar.gz → 0.1.4__tar.gz

{repdf-0.1.3 → repdf-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: repdf
-Version: 0.1.3
+Version: 0.1.4
 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
@@ -76,7 +76,7 @@ repdf
 | <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-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-text-markup-dark.png"><img src="docs/images/toolbar-text-markup.png" width="24" alt="文字畫線"></picture> | 文字畫線 | 拖曳選字畫線；下拉設定螢光筆、底線、刪除線、波浪線、顏色與粗細。 | — |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-callout-dark.png"><img src="docs/images/toolbar-callout.png" width="24" alt="箭頭文字註解"></picture> | 文字註解 | 下拉選擇箭頭文字框或便利貼，點選頁面新增；雙擊可編輯文字。 | — |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-drawing-dark.png"><img src="docs/images/toolbar-drawing.png" width="24" alt="繪圖註解"></picture> | 繪圖註解 | 下拉選擇直線、箭頭、矩形、橢圓或自由手繪；設定線條與填色後拖曳建立。 | — |
@@ -218,7 +218,7 @@ repdf
 1. 點「搜尋文字」或按 <kbd>Ctrl</kbd>+<kbd>F</kbd>（macOS：<kbd>⌘</kbd>+<kbd>F</kbd>），開啟右側窗格。
 2. 輸入搜尋內容，選擇「目前標籤頁」、「勾選的標籤頁」或「所有標籤頁」；同一列的 `.*`、`Aa` 與底線 `ab` 狀態按鈕分別切換「規則表達式」、「區分大小寫」與「僅限單字」，亮起表示啟用。
 3. 按 <kbd>Enter</kbd> 或「搜尋」執行；修改條件後再次執行才會更新結果。
-4. 上方選取有命中的檔案，下方以交錯底色單行列出命中段落、原始頁碼與命中次數；內容過長時以 `...` 結尾，滑鼠停留可查看完整段落。
+4. 上方「檔案」表格列出檔名與命中段落筆數；選取檔案後，下方「命中項目」表格以「頁碼／段落」分欄顯示，段落採交錯底色單行呈現，命中次數保留在提示文字中；內容過長時以 `...` 結尾，滑鼠停留可查看完整段落。
 5. 單擊段落，切換到對應標籤與頁面，捲至命中位置；尚未載入的頁面會自動載入。命中預設以黃色螢光筆標示，選取段落以較深的同色系突出。
 
 - 預設搜尋目前標籤頁、不區分大小寫、不使用規則表達式；三種範圍互斥。

{repdf-0.1.3 → repdf-0.1.4}/README.md

@@ -59,7 +59,7 @@ repdf
 | <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-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-text-markup-dark.png"><img src="docs/images/toolbar-text-markup.png" width="24" alt="文字畫線"></picture> | 文字畫線 | 拖曳選字畫線；下拉設定螢光筆、底線、刪除線、波浪線、顏色與粗細。 | — |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-callout-dark.png"><img src="docs/images/toolbar-callout.png" width="24" alt="箭頭文字註解"></picture> | 文字註解 | 下拉選擇箭頭文字框或便利貼，點選頁面新增；雙擊可編輯文字。 | — |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/toolbar-drawing-dark.png"><img src="docs/images/toolbar-drawing.png" width="24" alt="繪圖註解"></picture> | 繪圖註解 | 下拉選擇直線、箭頭、矩形、橢圓或自由手繪；設定線條與填色後拖曳建立。 | — |
@@ -201,7 +201,7 @@ repdf
 1. 點「搜尋文字」或按 <kbd>Ctrl</kbd>+<kbd>F</kbd>（macOS：<kbd>⌘</kbd>+<kbd>F</kbd>），開啟右側窗格。
 2. 輸入搜尋內容，選擇「目前標籤頁」、「勾選的標籤頁」或「所有標籤頁」；同一列的 `.*`、`Aa` 與底線 `ab` 狀態按鈕分別切換「規則表達式」、「區分大小寫」與「僅限單字」，亮起表示啟用。
 3. 按 <kbd>Enter</kbd> 或「搜尋」執行；修改條件後再次執行才會更新結果。
-4. 上方選取有命中的檔案，下方以交錯底色單行列出命中段落、原始頁碼與命中次數；內容過長時以 `...` 結尾，滑鼠停留可查看完整段落。
+4. 上方「檔案」表格列出檔名與命中段落筆數；選取檔案後，下方「命中項目」表格以「頁碼／段落」分欄顯示，段落採交錯底色單行呈現，命中次數保留在提示文字中；內容過長時以 `...` 結尾，滑鼠停留可查看完整段落。
 5. 單擊段落，切換到對應標籤與頁面，捲至命中位置；尚未載入的頁面會自動載入。命中預設以黃色螢光筆標示，選取段落以較深的同色系突出。
 
 - 預設搜尋目前標籤頁、不區分大小寫、不使用規則表達式；三種範圍互斥。

{repdf-0.1.3 → repdf-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "repdf"
-version = "0.1.3"
+version = "0.1.4"
 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.3 → repdf-0.1.4}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "repdf"
-version = "0.1.3"
+version = "0.1.4"
 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.3 → repdf-0.1.4}/src/repdf/icons.py

@@ -229,13 +229,11 @@ def toolbar_icon(kind: str) -> QIcon:
                 painter.drawLine(13, 18, 22, 9)
                 painter.drawLine(20, 8, 23, 11)
         elif kind == "export":
-            painter.drawPolyline(QPolygonF([QPointF(8, 16), QPointF(4, 16), QPointF(4, 3),
-                                            QPointF(14, 3), QPointF(18, 7), QPointF(18, 10)]))
-            painter.drawPolyline(QPolygonF([QPointF(14, 3), QPointF(14, 7), QPointF(18, 7)]))
-            painter.drawLine(13, 11, 13, 20)
-            painter.drawPolyline(QPolygonF([QPointF(9, 16), QPointF(13, 20), QPointF(17, 16)]))
-            painter.drawPolyline(QPolygonF([QPointF(6, 20), QPointF(6, 22), QPointF(20, 22),
-                                            QPointF(20, 20)]))
+            painter.drawPolygon(QPolygonF([QPointF(4, 2), QPointF(14, 2), QPointF(20, 8),
+                                           QPointF(20, 22), QPointF(4, 22)]))
+            painter.drawPolyline(QPolygonF([QPointF(14, 2), QPointF(14, 8), QPointF(20, 8)]))
+            painter.drawLine(12, 11, 12, 18)
+            painter.drawPolyline(QPolygonF([QPointF(8, 14), QPointF(12, 18), QPointF(16, 14)]))
         elif kind == "split":
             painter.drawRoundedRect(QRectF(2, 2, 8, 13), 1, 1)
             painter.drawRoundedRect(QRectF(14, 9, 8, 13), 1, 1)

{repdf-0.1.3 → repdf-0.1.4}/src/repdf/search_panel.py

@@ -5,8 +5,8 @@ from html import escape
 from PySide6.QtCore import QEvent, QObject, QSize, Qt, QTimer, Signal
 from PySide6.QtGui import QAction, QActionGroup, QColor, QIcon, QPainter, QPixmap
 from PySide6.QtWidgets import (
-    QAbstractItemView, QColorDialog, QComboBox, QHBoxLayout, QLabel, QLayout, QLineEdit, QListView, QListWidget,
-    QListWidgetItem, QMenu, QSplitter, QStyle, QStyledItemDelegate, QStyleOptionViewItem,
+    QAbstractItemView, QColorDialog, QComboBox, QGroupBox, QHeaderView, QHBoxLayout, QLabel, QLayout, QLineEdit,
+    QTreeWidget, QTreeWidgetItem, QMenu, QSplitter, QStyle, QStyledItemDelegate, QStyleOptionViewItem,
     QToolButton, QVBoxLayout, QWidget,
 )
 
@@ -26,7 +26,13 @@ class SearchStatus(QLabel):
         self.setToolTip('<qt>' + escape(text).replace('\n', '<br>') + '</qt>')
 
 
-class ParagraphDelegate(QStyledItemDelegate):
+class ResultRowDelegate(QStyledItemDelegate):
+    def sizeHint(self, option, index):
+        hint = super().sizeHint(option, index)
+        return QSize(hint.width(), option.fontMetrics.height() + 4)
+
+
+class ParagraphDelegate(ResultRowDelegate):
     """Keep complete result text in the model, but paint one elided line."""
 
     @staticmethod
@@ -49,7 +55,7 @@ class ParagraphDelegate(QStyledItemDelegate):
         style.drawControl(QStyle.ControlElement.CE_ItemViewItem, opt, painter, opt.widget)
 
     def sizeHint(self, option, index):
-        return QSize(0, option.fontMetrics.height() + 10)
+        return QSize(0, option.fontMetrics.height() + 4)
 
 
 class SearchPanel(QWidget):
@@ -150,22 +156,48 @@ class SearchPanel(QWidget):
         status_row.addWidget(self.status, 1)
         layout.addLayout(status_row)
         self.results_splitter = QSplitter(Qt.Orientation.Vertical)
-        self.files = QListWidget()
+        self.files = QTreeWidget()
         self.files.setAccessibleName(tr('有命中的檔案'))
-        self.files.setMinimumSize(0, 0)
+        self.files.setHeaderLabels([tr('檔名'), tr('筆數')])
+        self.files.headerItem().setTextAlignment(1, Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter)
+        self.files.header().setStretchLastSection(False)
+        self.files.header().setSectionResizeMode(0, QHeaderView.ResizeMode.Stretch)
+        self.files.header().setSectionResizeMode(1, QHeaderView.ResizeMode.ResizeToContents)
         self.files.setTextElideMode(Qt.TextElideMode.ElideMiddle)
-        self.files.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
-        self.paragraphs = QListWidget()
+        self.files.setItemDelegate(ResultRowDelegate(self.files))
+        self.paragraphs = QTreeWidget()
         self.paragraphs.setAccessibleName(tr('命中段落'))
-        self.paragraphs.setWordWrap(False)
+        self.paragraphs.setHeaderLabels([tr('頁碼'), tr('段落')])
+        self.paragraphs.headerItem().setTextAlignment(0, Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter)
+        self.paragraphs.header().setSectionResizeMode(0, QHeaderView.ResizeMode.ResizeToContents)
+        self.paragraphs.header().setSectionResizeMode(1, QHeaderView.ResizeMode.Stretch)
+        self.paragraphs.setItemDelegate(ResultRowDelegate(self.paragraphs))
+        self.paragraphs.setItemDelegateForColumn(1, ParagraphDelegate(self.paragraphs))
         self.paragraphs.setAlternatingRowColors(True)
-        self.paragraphs.setItemDelegate(ParagraphDelegate(self.paragraphs))
-        self.paragraphs.setResizeMode(QListView.ResizeMode.Adjust)
-        self.paragraphs.setVerticalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel)
-        self.paragraphs.setMinimumSize(0, 0)
-        self.paragraphs.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
-        self.results_splitter.addWidget(self.files)
-        self.results_splitter.addWidget(self.paragraphs)
+        self.result_groups = []
+        for table, title in ((self.files, '檔案'), (self.paragraphs, '命中項目')):
+            table.setRootIsDecorated(False)
+            table.setItemsExpandable(False)
+            table.setUniformRowHeights(True)
+            table.setWordWrap(False)
+            table.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
+            table.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
+            table.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers)
+            table.setMinimumSize(0, 0)
+            table.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
+            table.setVerticalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel)
+            table.header().setMinimumSectionSize(40)
+            table.header().setSectionsMovable(False)
+            header_font = table.header().font()
+            header_font.setBold(True)
+            table.header().setFont(header_font)
+            group = QGroupBox(tr(title))
+            group.setMinimumSize(0, 0)
+            group_layout = QVBoxLayout(group)
+            group_layout.setContentsMargins(6, 8, 6, 6)
+            group_layout.addWidget(table)
+            self.result_groups.append(group)
+            self.results_splitter.addWidget(group)
         self.results_splitter.setSizes([140, 260])
         layout.addWidget(self.results_splitter, 1)
         self.refresh_icons()
@@ -219,6 +251,10 @@ class SearchPanel(QWidget):
         self.highlight_color_action.setText(tr('命中標示顏色'))
         self.scope.setCurrentIndex(index)
         self.query.setPlaceholderText(tr('輸入文字或規則表達式'))
+        self.files.setHeaderLabels([tr('檔名'), tr('筆數')])
+        self.paragraphs.setHeaderLabels([tr('頁碼'), tr('段落')])
+        for group, title in zip(self.result_groups, ('檔案', '命中項目')):
+            group.setTitle(tr(title))
 
     def set_compact(self, compact):
         self.options_box.setVisible(not compact)
@@ -454,7 +490,7 @@ class SearchController(QObject):
     def _refresh_files(self):
         p = self.panel
         current = p.files.currentItem()
-        selected_id = current.data(Qt.ItemDataRole.UserRole) if current else None
+        selected_id = current.data(0, Qt.ItemDataRole.UserRole) if current else None
         p.files.blockSignals(True)
         p.files.clear()
         for document_id in self.order:
@@ -464,43 +500,46 @@ class SearchController(QObject):
             if not paragraphs:
                 continue
             doc = self.owner.documents[document_id]
-            item = QListWidgetItem(tr('{p0} — {p1} 處／{p2} 段', p0=doc.source_path.name,
-                                      p1=sum(p['count'] for p in paragraphs), p2=len(paragraphs)))
-            item.setData(Qt.ItemDataRole.UserRole, document_id)
-            item.setToolTip(str(doc.source_path))
-            p.files.addItem(item)
+            item = QTreeWidgetItem([doc.source_path.name, str(len(paragraphs))])
+            item.setData(0, Qt.ItemDataRole.UserRole, document_id)
+            item.setTextAlignment(1, Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter)
+            item.setToolTip(0, str(doc.source_path))
+            item.setToolTip(1, tr('找到 {p0} 個段落、{p1} 處命中', p0=len(paragraphs), p1=sum(p['count'] for p in paragraphs)))
+            p.files.addTopLevelItem(item)
             if document_id == selected_id:
                 p.files.setCurrentItem(item)
-        if p.files.currentRow() < 0 and p.files.count():
-            p.files.setCurrentRow(0)
+        if p.files.currentItem() is None and p.files.topLevelItemCount():
+            p.files.setCurrentItem(p.files.topLevelItem(0))
         p.files.blockSignals(False)
         self._show_paragraphs()
 
     def _show_paragraphs(self, *_args):
         p = self.panel
         selected = p.paragraphs.currentItem()
-        previous = selected.data(Qt.ItemDataRole.UserRole) if selected else None
+        previous = selected.data(0, Qt.ItemDataRole.UserRole) if selected else None
         p.paragraphs.clear()
         file_item = p.files.currentItem()
         if file_item is None:
             return
-        document_id = file_item.data(Qt.ItemDataRole.UserRole)
+        document_id = file_item.data(0, Qt.ItemDataRole.UserRole)
         doc = self.owner.documents.get(document_id)
         if doc is None:
             return
         for page in doc.page_order:
             for result in self.results.get(document_id, {}).get(page, []):
                 key = (document_id, page, result['paragraph_id'])
-                item = QListWidgetItem(tr('第 {p0} 頁 · {p1} 處命中 · {p2}',
-                                         p0=page + 1, p1=result['count'], p2=result['text']))
-                item.setData(Qt.ItemDataRole.UserRole, key)
-                item.setToolTip('<qt>' + escape(result['text']).replace('\n', '<br>') + '</qt>')
-                p.paragraphs.addItem(item)
+                item = QTreeWidgetItem([str(page + 1), result['text']])
+                item.setTextAlignment(0, Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter)
+                item.setData(0, Qt.ItemDataRole.UserRole, key)
+                tooltip = '<qt>' + escape(tr('第 {p0} 頁 · {p1} 處命中 · {p2}', p0=page + 1, p1=result['count'], p2=result['text'])).replace('\n', '<br>') + '</qt>'
+                item.setToolTip(0, tooltip)
+                item.setToolTip(1, tooltip)
+                p.paragraphs.addTopLevelItem(item)
                 if key == previous:
                     p.paragraphs.setCurrentItem(item)
 
-    def _activate_item(self, item):
-        document_id, page, paragraph_id = item.data(Qt.ItemDataRole.UserRole)
+    def _activate_item(self, item, _column=0):
+        document_id, page, paragraph_id = item.data(0, Qt.ItemDataRole.UserRole)
         doc = self.owner.documents.get(document_id)
         if doc is None or not doc.ready:
             return

{repdf-0.1.3 → repdf-0.1.4}/src/repdf/strings.py

@@ -5,6 +5,11 @@ from string import Formatter
 
 LANGUAGE = "zh"
 ENGLISH = {
+    '檔案': 'Files',
+    '檔名': 'Filename',
+    '筆數': 'Count',
+    '命中項目': 'Matches',
+    '段落': 'Paragraph',
     '儲存': 'Save',
     '取消': 'Cancel',
     '有尚未儲存的變更': 'You have unsaved changes',