Release PDFReaderLite 0.2.4
This commit is contained in:
@@ -0,0 +1,23 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from functools import lru_cache
|
||||
|
||||
from PySide6.QtGui import QIcon
|
||||
|
||||
# Import QtSvg so packaged builds include the SVG icon support plugin.
|
||||
try: # pragma: no cover - packaging safeguard
|
||||
from PySide6 import QtSvg # noqa: F401
|
||||
except Exception: # pragma: no cover - icon loading can still degrade safely
|
||||
QtSvg = None
|
||||
|
||||
from pdfreaderlite.resources import resource_path
|
||||
|
||||
|
||||
@lru_cache(maxsize=128)
|
||||
def action_icon(name: str) -> QIcon:
|
||||
path = resource_path(f"resources/icons/actions/{name}.svg")
|
||||
if not path.exists():
|
||||
return QIcon()
|
||||
icon = QIcon(path.as_posix())
|
||||
icon.setIsMask(True)
|
||||
return icon
|
||||
+114
-87
@@ -18,7 +18,6 @@ from PySide6.QtGui import (
|
||||
QDesktopServices,
|
||||
QDragEnterEvent,
|
||||
QDropEvent,
|
||||
QFont,
|
||||
QIcon,
|
||||
QImage,
|
||||
QIntValidator,
|
||||
@@ -56,7 +55,6 @@ from PySide6.QtWidgets import (
|
||||
QSlider,
|
||||
QSpinBox,
|
||||
QStatusBar,
|
||||
QStyle,
|
||||
QTabWidget,
|
||||
QTextEdit,
|
||||
QToolBar,
|
||||
@@ -73,6 +71,7 @@ from pdfreaderlite.core.file_association import (
|
||||
)
|
||||
from pdfreaderlite.core.document import AnnotationInfo, EncryptedPdfError, FormField, PdfDocument, SearchMatch
|
||||
from pdfreaderlite.resources import pdf_icon_path, software_icon_path
|
||||
from pdfreaderlite.ui.icons import action_icon
|
||||
from pdfreaderlite.ui.page_manager import PageManagerDialog
|
||||
from pdfreaderlite.ui.pdf_viewer import PdfViewer
|
||||
from pdfreaderlite.ui.right_tools import RightToolsPanel
|
||||
@@ -1737,7 +1736,6 @@ class MainWindow(QMainWindow):
|
||||
self.toggle_read_action,
|
||||
]:
|
||||
self.right_mode_group.addAction(action)
|
||||
self._apply_action_icons()
|
||||
|
||||
file_menu = self.menuBar().addMenu("文件")
|
||||
file_menu.addAction(self.open_action)
|
||||
@@ -1825,95 +1823,99 @@ class MainWindow(QMainWindow):
|
||||
help_menu.addAction(self.shortcuts_action)
|
||||
help_menu.addAction(self.open_log_dir_action)
|
||||
help_menu.addAction(self.about_action)
|
||||
self._apply_action_icons()
|
||||
self._build_right_tools_panel()
|
||||
|
||||
def _text_icon(self, text: str, color: QColor | None = None) -> QIcon:
|
||||
pixmap = QPixmap(24, 24)
|
||||
pixmap.fill(Qt.GlobalColor.transparent)
|
||||
painter = QPainter(pixmap)
|
||||
painter.setRenderHint(QPainter.RenderHint.Antialiasing)
|
||||
pen_color = color or QColor("#2d73c5")
|
||||
font = QFont()
|
||||
font.setBold(True)
|
||||
font.setPixelSize(18 if len(text) <= 1 else 13)
|
||||
painter.setFont(font)
|
||||
painter.setPen(pen_color)
|
||||
painter.drawText(pixmap.rect(), Qt.AlignmentFlag.AlignCenter, text)
|
||||
painter.end()
|
||||
return QIcon(pixmap)
|
||||
|
||||
def _apply_action_icons(self) -> None:
|
||||
icon_map = {
|
||||
self.open_action: QStyle.StandardPixmap.SP_DialogOpenButton,
|
||||
self.save_action: QStyle.StandardPixmap.SP_DialogSaveButton,
|
||||
self.print_action: QStyle.StandardPixmap.SP_FileDialogDetailedView,
|
||||
self.undo_action: QStyle.StandardPixmap.SP_ArrowBack,
|
||||
self.redo_action: QStyle.StandardPixmap.SP_ArrowForward,
|
||||
self.pointer_action: QStyle.StandardPixmap.SP_ArrowRight,
|
||||
self.hand_action: QStyle.StandardPixmap.SP_DialogOpenButton,
|
||||
self.previous_action: QStyle.StandardPixmap.SP_ArrowUp,
|
||||
self.next_action: QStyle.StandardPixmap.SP_ArrowDown,
|
||||
self.fit_page_action: QStyle.StandardPixmap.SP_FileDialogContentsView,
|
||||
self.go_to_page_action: QStyle.StandardPixmap.SP_ArrowRight,
|
||||
self.rotate_action: QStyle.StandardPixmap.SP_BrowserReload,
|
||||
self.delete_action: QStyle.StandardPixmap.SP_TrashIcon,
|
||||
self.move_page_action: QStyle.StandardPixmap.SP_FileDialogListView,
|
||||
self.page_manager_action: QStyle.StandardPixmap.SP_FileDialogInfoView,
|
||||
self.insert_blank_action: QStyle.StandardPixmap.SP_FileIcon,
|
||||
self.insert_pdf_action: QStyle.StandardPixmap.SP_FileLinkIcon,
|
||||
self.extract_pages_action: QStyle.StandardPixmap.SP_DialogSaveButton,
|
||||
self.split_pdf_action: QStyle.StandardPixmap.SP_DialogResetButton,
|
||||
self.merge_pdfs_action: QStyle.StandardPixmap.SP_DirIcon,
|
||||
self.export_current_image_action: QStyle.StandardPixmap.SP_DialogSaveButton,
|
||||
self.export_pages_images_action: QStyle.StandardPixmap.SP_DirOpenIcon,
|
||||
self.images_to_pdf_action: QStyle.StandardPixmap.SP_FileIcon,
|
||||
self.metadata_action: QStyle.StandardPixmap.SP_MessageBoxInformation,
|
||||
self.form_fill_action: QStyle.StandardPixmap.SP_FileDialogDetailedView,
|
||||
self.annotation_list_action: QStyle.StandardPixmap.SP_FileDialogListView,
|
||||
self.text_selection_action: QStyle.StandardPixmap.SP_FileDialogContentsView,
|
||||
self.highlight_action: QStyle.StandardPixmap.SP_DialogApplyButton,
|
||||
self.underline_action: QStyle.StandardPixmap.SP_DialogApplyButton,
|
||||
self.strikeout_action: QStyle.StandardPixmap.SP_DialogCancelButton,
|
||||
self.note_action: QStyle.StandardPixmap.SP_MessageBoxInformation,
|
||||
self.annotation_style_action: QStyle.StandardPixmap.SP_DialogApplyButton,
|
||||
self.text_stamp_action: QStyle.StandardPixmap.SP_DialogApplyButton,
|
||||
self.image_stamp_action: QStyle.StandardPixmap.SP_FileIcon,
|
||||
self.select_object_action: QStyle.StandardPixmap.SP_ArrowRight,
|
||||
self.image_properties_action: QStyle.StandardPixmap.SP_FileDialogInfoView,
|
||||
self.align_left_action: QStyle.StandardPixmap.SP_ArrowLeft,
|
||||
self.align_center_action: QStyle.StandardPixmap.SP_FileDialogContentsView,
|
||||
self.align_right_action: QStyle.StandardPixmap.SP_ArrowRight,
|
||||
self.align_top_action: QStyle.StandardPixmap.SP_ArrowUp,
|
||||
self.align_middle_action: QStyle.StandardPixmap.SP_FileDialogContentsView,
|
||||
self.align_bottom_action: QStyle.StandardPixmap.SP_ArrowDown,
|
||||
self.distribute_horizontal_action: QStyle.StandardPixmap.SP_FileDialogDetailedView,
|
||||
self.distribute_vertical_action: QStyle.StandardPixmap.SP_FileDialogListView,
|
||||
self.freehand_action: QStyle.StandardPixmap.SP_DialogApplyButton,
|
||||
self.add_text_action: QStyle.StandardPixmap.SP_FileDialogDetailedView,
|
||||
self.place_text_action: QStyle.StandardPixmap.SP_FileDialogDetailedView,
|
||||
self.text_style_action: QStyle.StandardPixmap.SP_DialogApplyButton,
|
||||
self.place_image_action: QStyle.StandardPixmap.SP_FileIcon,
|
||||
self.signature_action: QStyle.StandardPixmap.SP_DialogApplyButton,
|
||||
self.place_signature_action: QStyle.StandardPixmap.SP_DialogApplyButton,
|
||||
self.draw_signature_action: QStyle.StandardPixmap.SP_DialogApplyButton,
|
||||
self.rectangle_action: QStyle.StandardPixmap.SP_FileDialogContentsView,
|
||||
self.circle_action: QStyle.StandardPixmap.SP_FileDialogContentsView,
|
||||
self.line_action: QStyle.StandardPixmap.SP_ArrowRight,
|
||||
self.arrow_action: QStyle.StandardPixmap.SP_ArrowRight,
|
||||
self.cover_action: QStyle.StandardPixmap.SP_DialogCloseButton,
|
||||
self.dark_mode_action: QStyle.StandardPixmap.SP_ComputerIcon,
|
||||
self.toggle_edit_pdf_action: QStyle.StandardPixmap.SP_FileDialogDetailedView,
|
||||
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,
|
||||
self.open_action: "file-open",
|
||||
self.save_action: "file-save",
|
||||
self.save_as_action: "file-save-as",
|
||||
self.save_encrypted_action: "lock",
|
||||
self.remove_password_action: "unlock",
|
||||
self.print_action: "print",
|
||||
self.clear_recent_action: "recent-files",
|
||||
self.undo_action: "previous-page",
|
||||
self.redo_action: "next-page",
|
||||
self.pointer_action: "pointer",
|
||||
self.hand_action: "hand",
|
||||
self.previous_action: "previous-page",
|
||||
self.next_action: "next-page",
|
||||
self.zoom_out_action: "zoom-out",
|
||||
self.zoom_in_action: "zoom-in",
|
||||
self.fit_width_action: "fit-width",
|
||||
self.fit_page_action: "fit-page",
|
||||
self.go_to_page_action: "page-number",
|
||||
self.rotate_action: "rotate",
|
||||
self.delete_action: "delete-page",
|
||||
self.move_page_action: "move-page",
|
||||
self.page_manager_action: "page-grid",
|
||||
self.insert_blank_action: "insert-page",
|
||||
self.insert_pdf_action: "insert-pdf",
|
||||
self.extract_pages_action: "extract-page",
|
||||
self.split_pdf_action: "split-pdf",
|
||||
self.merge_pdfs_action: "merge-pdf",
|
||||
self.export_current_image_action: "export-image",
|
||||
self.export_pages_images_action: "export-images",
|
||||
self.images_to_pdf_action: "image-to-pdf",
|
||||
self.metadata_action: "document-info",
|
||||
self.form_fill_action: "form-fill",
|
||||
self.annotation_list_action: "annotation-list",
|
||||
self.text_selection_action: "pointer",
|
||||
self.highlight_action: "highlight",
|
||||
self.underline_action: "underline",
|
||||
self.strikeout_action: "strikeout",
|
||||
self.note_action: "note",
|
||||
self.annotation_style_action: "sliders",
|
||||
self.text_stamp_action: "text",
|
||||
self.image_stamp_action: "image-signature",
|
||||
self.select_object_action: "pointer",
|
||||
self.copy_object_action: "copy",
|
||||
self.paste_object_action: "paste",
|
||||
self.replace_image_action: "image",
|
||||
self.image_properties_action: "sliders",
|
||||
self.bring_to_front_action: "bring-front",
|
||||
self.send_to_back_action: "send-back",
|
||||
self.bring_forward_action: "move-up-layer",
|
||||
self.send_backward_action: "move-down-layer",
|
||||
self.align_left_action: "align-left",
|
||||
self.align_center_action: "align-center",
|
||||
self.align_right_action: "align-right",
|
||||
self.align_top_action: "align-top",
|
||||
self.align_middle_action: "align-middle",
|
||||
self.align_bottom_action: "align-bottom",
|
||||
self.distribute_horizontal_action: "distribute-horizontal",
|
||||
self.distribute_vertical_action: "distribute-vertical",
|
||||
self.freehand_action: "pen",
|
||||
self.add_text_action: "text",
|
||||
self.place_text_action: "text",
|
||||
self.text_style_action: "sliders",
|
||||
self.place_image_action: "image",
|
||||
self.signature_action: "image-signature",
|
||||
self.place_signature_action: "signature-place",
|
||||
self.draw_signature_action: "signature-hand",
|
||||
self.rectangle_action: "rectangle",
|
||||
self.circle_action: "circle",
|
||||
self.line_action: "line",
|
||||
self.arrow_action: "arrow",
|
||||
self.cover_action: "cover",
|
||||
self.dark_mode_action: "moon",
|
||||
self.toggle_edit_pdf_action: "mode-edit",
|
||||
self.toggle_pages_action: "mode-page",
|
||||
self.toggle_tools_action: "mode-tools",
|
||||
self.toggle_annotations_action: "mode-annotation",
|
||||
self.toggle_read_action: "read",
|
||||
self.register_pdf_action: "file-link",
|
||||
self.unregister_pdf_action: "unlock",
|
||||
self.default_apps_action: "settings",
|
||||
self.shortcuts_action: "settings",
|
||||
self.open_log_dir_action: "log-folder",
|
||||
self.about_action: "document-info",
|
||||
}
|
||||
for action, standard_icon in icon_map.items():
|
||||
action.setIcon(self.style().standardIcon(standard_icon))
|
||||
self.save_as_action.setIcon(self._text_icon("另", QColor("#365f91")))
|
||||
self.zoom_out_action.setIcon(self._text_icon("-", QColor("#2f5f9f")))
|
||||
self.zoom_in_action.setIcon(self._text_icon("+", QColor("#2f5f9f")))
|
||||
self.fit_width_action.setIcon(self._text_icon("<>", QColor("#2f5f9f")))
|
||||
for action, icon_name in icon_map.items():
|
||||
action.setIcon(action_icon(icon_name))
|
||||
if not action.toolTip():
|
||||
action.setToolTip(action.text().replace("&", ""))
|
||||
|
||||
def _build_right_tools_panel(self) -> None:
|
||||
self.right_tools.add_section(
|
||||
@@ -2304,6 +2306,8 @@ class MainWindow(QMainWindow):
|
||||
menu = QMenu(self)
|
||||
edit_action = menu.addAction("编辑内容")
|
||||
delete_action = menu.addAction("删除注释")
|
||||
edit_action.setIcon(action_icon("note"))
|
||||
delete_action.setIcon(action_icon("delete"))
|
||||
chosen = menu.exec(self.right_annotation_list.mapToGlobal(position))
|
||||
if chosen == edit_action:
|
||||
self.edit_annotation_from_panel(annotation)
|
||||
@@ -2813,12 +2817,15 @@ class MainWindow(QMainWindow):
|
||||
)
|
||||
if not has_selection:
|
||||
hint_action = menu.addAction("请先拖拽选中文字")
|
||||
hint_action.setIcon(action_icon("pointer"))
|
||||
hint_action.setEnabled(False)
|
||||
menu.exec(QCursor.pos())
|
||||
return
|
||||
if self.toggle_read_action.isChecked():
|
||||
copy_action = menu.addAction("复制文字")
|
||||
hint_action = menu.addAction("阅读模式下仅支持复制文字")
|
||||
copy_action.setIcon(action_icon("copy"))
|
||||
hint_action.setIcon(action_icon("read"))
|
||||
hint_action.setEnabled(False)
|
||||
chosen = menu.exec(QCursor.pos())
|
||||
if chosen == copy_action:
|
||||
@@ -2826,16 +2833,21 @@ class MainWindow(QMainWindow):
|
||||
self.statusBar().showMessage("选区文字已复制", 3000)
|
||||
return
|
||||
highlight_menu = menu.addMenu("高亮显示")
|
||||
highlight_menu.setIcon(action_icon("highlight"))
|
||||
highlight_actions: dict[QAction, tuple[float, float, float]] = {}
|
||||
for label, color in self._highlight_color_options():
|
||||
action = highlight_menu.addAction(label)
|
||||
action.setIcon(self._color_swatch_icon(color))
|
||||
highlight_actions[action] = color
|
||||
note_action = menu.addAction("添加注释")
|
||||
note_action.setIcon(action_icon("note"))
|
||||
menu.addSeparator()
|
||||
underline_action = menu.addAction("下划线")
|
||||
strikeout_action = menu.addAction("删除线")
|
||||
copy_action = menu.addAction("复制文字")
|
||||
underline_action.setIcon(action_icon("underline"))
|
||||
strikeout_action.setIcon(action_icon("strikeout"))
|
||||
copy_action.setIcon(action_icon("copy"))
|
||||
chosen = menu.exec(QCursor.pos())
|
||||
if not chosen:
|
||||
return
|
||||
@@ -3874,13 +3886,17 @@ class MainWindow(QMainWindow):
|
||||
if has_object:
|
||||
delete_action = menu.addAction("删除对象")
|
||||
copy_action = menu.addAction("复制对象")
|
||||
delete_action.setIcon(action_icon("delete"))
|
||||
copy_action.setIcon(action_icon("copy"))
|
||||
else:
|
||||
delete_action = None
|
||||
copy_action = None
|
||||
paste_action = menu.addAction("粘贴对象")
|
||||
paste_action.setIcon(action_icon("paste"))
|
||||
paste_action.setEnabled(self._has_copied_object())
|
||||
if not has_object and not self._has_copied_object():
|
||||
hint_action = menu.addAction("没有可操作的对象")
|
||||
hint_action.setIcon(action_icon("pointer"))
|
||||
hint_action.setEnabled(False)
|
||||
|
||||
replace_action = None
|
||||
@@ -3896,15 +3912,25 @@ class MainWindow(QMainWindow):
|
||||
replace_action = menu.addAction("替换图片")
|
||||
image_properties_action = menu.addAction("图片属性")
|
||||
layer_menu = menu.addMenu("图层顺序")
|
||||
replace_action.setIcon(action_icon("image"))
|
||||
image_properties_action.setIcon(action_icon("sliders"))
|
||||
layer_menu.setIcon(action_icon("bring-front"))
|
||||
front_action = layer_menu.addAction("置顶")
|
||||
back_action = layer_menu.addAction("置底")
|
||||
forward_action = layer_menu.addAction("上移一层")
|
||||
backward_action = layer_menu.addAction("下移一层")
|
||||
properties_action = menu.addAction("属性")
|
||||
front_action.setIcon(action_icon("bring-front"))
|
||||
back_action.setIcon(action_icon("send-back"))
|
||||
forward_action.setIcon(action_icon("move-up-layer"))
|
||||
backward_action.setIcon(action_icon("move-down-layer"))
|
||||
properties_action.setIcon(action_icon("sliders"))
|
||||
elif self.selected_annotation is not None:
|
||||
if self._selected_annotation_content_editable():
|
||||
edit_action = menu.addAction("编辑内容")
|
||||
edit_action.setIcon(action_icon("note"))
|
||||
properties_action = menu.addAction("属性")
|
||||
properties_action.setIcon(action_icon("sliders"))
|
||||
|
||||
chosen = menu.exec(self.cursor().pos())
|
||||
if delete_action is not None and chosen == delete_action:
|
||||
@@ -4663,6 +4689,7 @@ class MainWindow(QMainWindow):
|
||||
return
|
||||
for path in self.recent_files:
|
||||
action = QAction(Path(path).name, self)
|
||||
action.setIcon(action_icon("file-open"))
|
||||
action.setToolTip(path)
|
||||
action.triggered.connect(lambda checked=False, file_path=path: self.open_file(file_path))
|
||||
self.recent_menu.addAction(action)
|
||||
|
||||
@@ -20,6 +20,7 @@ from PySide6.QtWidgets import (
|
||||
)
|
||||
|
||||
from pdfreaderlite.core.document import PdfDocument
|
||||
from pdfreaderlite.ui.icons import action_icon
|
||||
|
||||
|
||||
class PageGrid(QListWidget):
|
||||
@@ -106,6 +107,15 @@ class PageManagerDialog(QDialog):
|
||||
rotate_left_button = QPushButton("左旋所选")
|
||||
rotate_right_button = QPushButton("右旋所选")
|
||||
extract_button = QPushButton("提取所选")
|
||||
for button, icon_name in [
|
||||
(delete_button, "delete-page"),
|
||||
(rotate_left_button, "rotate"),
|
||||
(rotate_right_button, "rotate"),
|
||||
(extract_button, "extract-page"),
|
||||
]:
|
||||
button.setIcon(action_icon(icon_name))
|
||||
button.setIconSize(QSize(18, 18))
|
||||
button.setToolTip(button.text())
|
||||
delete_button.clicked.connect(self.delete_selected_pages)
|
||||
rotate_left_button.clicked.connect(lambda: self.rotate_selected_pages(-90))
|
||||
rotate_right_button.clicked.connect(lambda: self.rotate_selected_pages(90))
|
||||
|
||||
Reference in New Issue
Block a user