Improve status controls and keyboard navigation
This commit is contained in:
@@ -8,7 +8,8 @@ PDFReaderLite 是一个面向 Windows 的轻量 PDF 阅读与编辑工具,目
|
|||||||
- 阅读、翻页、缩放
|
- 阅读、翻页、缩放
|
||||||
- 连续阅读模式,页面上下自动衔接并保留页间缝隙
|
- 连续阅读模式,页面上下自动衔接并保留页间缝隙
|
||||||
- 鼠标滚轮优先在文档内容窗口内上下滚动
|
- 鼠标滚轮优先在文档内容窗口内上下滚动
|
||||||
- 状态栏页面显示区:页码输入框、缩小、放大、10%-1000% 缩放输入、缩放滑条、适应宽度、适应页面
|
- 键盘左右键翻页,上下键滚动阅读区
|
||||||
|
- 状态栏页面显示区:无上下按钮页码输入框、缩小、放大、10%-1000% 缩放文本框、缩放滑条、适应宽度、适应页面
|
||||||
- 适应宽度、适应页面
|
- 适应宽度、适应页面
|
||||||
- 页码跳转(已支持状态栏页码输入框,失焦后自动跳转并校验非法输入)
|
- 页码跳转(已支持状态栏页码输入框,失焦后自动跳转并校验非法输入)
|
||||||
- 左侧缩略图
|
- 左侧缩略图
|
||||||
@@ -68,7 +69,7 @@ PDFReaderLite 是一个面向 Windows 的轻量 PDF 阅读与编辑工具,目
|
|||||||
- exe 版本资源
|
- exe 版本资源
|
||||||
- 设置中注册 PDF 文件关联
|
- 设置中注册 PDF 文件关联
|
||||||
- Acrobat 风格右侧工具面板(已完成可折叠分类、搜索结果默认收起、整栏收起/展开)
|
- Acrobat 风格右侧工具面板(已完成可折叠分类、搜索结果默认收起、整栏收起/展开)
|
||||||
- 缩略图单列卡片式显示与克制选中态,支持随左侧栏拖拽宽度自适应缩放并限制最大栏宽,缩略图间距已压缩
|
- 缩略图单列卡片式显示与克制选中态,支持随左侧栏拖拽宽度自适应缩放并限制最大栏宽,横向缩略图格子高度已压缩
|
||||||
- 顶部与右侧常用工具图标化,另存为/缩放/适应宽度图标已区分,状态栏页面按钮已加宽
|
- 顶部与右侧常用工具图标化,另存为/缩放/适应宽度图标已区分,状态栏页面按钮已加宽
|
||||||
- 图片签名
|
- 图片签名
|
||||||
- 多标签页打开、切换、关闭 PDF
|
- 多标签页打开、切换、关闭 PDF
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重
|
|||||||
## V1:基础可用版
|
## V1:基础可用版
|
||||||
|
|
||||||
- 打开 PDF
|
- 打开 PDF
|
||||||
- 阅读、翻页、缩放(已支持连续阅读、页间缝隙、鼠标滚轮页内/文档内滚动、状态栏页面缩放控件,缩放范围 10%-1000%)
|
- 阅读、翻页、缩放(已支持连续阅读、页间缝隙、鼠标滚轮页内/文档内滚动、键盘左右翻页、键盘上下滚动、状态栏页面缩放文本框和滑条,缩放范围 10%-1000%)
|
||||||
- 适应宽度、适应页面
|
- 适应宽度、适应页面
|
||||||
- 页码跳转(已支持状态栏页码输入框,失焦后自动跳转并校验非法输入)
|
- 页码跳转(已支持状态栏无上下按钮页码输入框,失焦后自动跳转并校验非法输入)
|
||||||
- 左侧缩略图
|
- 左侧缩略图
|
||||||
- 文本搜索
|
- 文本搜索
|
||||||
- 高亮
|
- 高亮
|
||||||
@@ -65,7 +65,7 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重
|
|||||||
|
|
||||||
- 大文件性能优化(已完成缩略图可见区域懒加载与缩略图独立缓存)
|
- 大文件性能优化(已完成缩略图可见区域懒加载与缩略图独立缓存)
|
||||||
- Acrobat 风格右侧工具面板(已完成可折叠分类、搜索结果默认收起、整栏收起/展开)
|
- Acrobat 风格右侧工具面板(已完成可折叠分类、搜索结果默认收起、整栏收起/展开)
|
||||||
- 缩略图单列卡片式显示与克制选中态(已完成随左侧栏拖拽宽度自适应缩放、限制最大栏宽、压缩缩略图间距)
|
- 缩略图单列卡片式显示与克制选中态(已完成随左侧栏拖拽宽度自适应缩放、限制最大栏宽、压缩横向缩略图格子高度)
|
||||||
- 顶部与右侧常用工具图标化(已完成另存为、缩小、放大、适应宽度图标区分,状态栏页面按钮已加宽)
|
- 顶部与右侧常用工具图标化(已完成另存为、缩小、放大、适应宽度图标区分,状态栏页面按钮已加宽)
|
||||||
- 页面缓存(已完成基础缓存)
|
- 页面缓存(已完成基础缓存)
|
||||||
- 后台渲染(已完成缩略图分批加载)
|
- 后台渲染(已完成缩略图分批加载)
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ from PySide6.QtGui import (
|
|||||||
QDropEvent,
|
QDropEvent,
|
||||||
QFont,
|
QFont,
|
||||||
QIcon,
|
QIcon,
|
||||||
|
QIntValidator,
|
||||||
QKeySequence,
|
QKeySequence,
|
||||||
QPainter,
|
QPainter,
|
||||||
QPen,
|
QPen,
|
||||||
@@ -25,6 +26,7 @@ from PySide6.QtWidgets import (
|
|||||||
QDialogButtonBox,
|
QDialogButtonBox,
|
||||||
QFormLayout,
|
QFormLayout,
|
||||||
QFileDialog,
|
QFileDialog,
|
||||||
|
QHBoxLayout,
|
||||||
QInputDialog,
|
QInputDialog,
|
||||||
QLabel,
|
QLabel,
|
||||||
QLineEdit,
|
QLineEdit,
|
||||||
@@ -35,7 +37,6 @@ from PySide6.QtWidgets import (
|
|||||||
QMessageBox,
|
QMessageBox,
|
||||||
QSplitter,
|
QSplitter,
|
||||||
QSlider,
|
QSlider,
|
||||||
QSpinBox,
|
|
||||||
QStatusBar,
|
QStatusBar,
|
||||||
QStyle,
|
QStyle,
|
||||||
QTabWidget,
|
QTabWidget,
|
||||||
@@ -287,6 +288,20 @@ class MainWindow(QMainWindow):
|
|||||||
return
|
return
|
||||||
self.viewer.set_zoom(value / 100)
|
self.viewer.set_zoom(value / 100)
|
||||||
|
|
||||||
|
def apply_zoom_percent_input(self) -> None:
|
||||||
|
if not self.document.is_open:
|
||||||
|
self._sync_zoom_controls(self.viewer.zoom)
|
||||||
|
return
|
||||||
|
text = self.zoom_percent_input.text().strip().removesuffix("%")
|
||||||
|
try:
|
||||||
|
percent = int(text)
|
||||||
|
except ValueError:
|
||||||
|
self._sync_zoom_controls(self.viewer.zoom)
|
||||||
|
return
|
||||||
|
if 10 <= percent <= 1000:
|
||||||
|
self.viewer.set_zoom(percent / 100)
|
||||||
|
self._sync_zoom_controls(self.viewer.zoom)
|
||||||
|
|
||||||
def _sync_zoom_controls(
|
def _sync_zoom_controls(
|
||||||
self,
|
self,
|
||||||
zoom: float,
|
zoom: float,
|
||||||
@@ -299,29 +314,33 @@ class MainWindow(QMainWindow):
|
|||||||
percent = max(10, min(1000, round(zoom * 100)))
|
percent = max(10, min(1000, round(zoom * 100)))
|
||||||
with QSignalBlocker(self.zoom_slider), QSignalBlocker(self.zoom_percent_input):
|
with QSignalBlocker(self.zoom_slider), QSignalBlocker(self.zoom_percent_input):
|
||||||
self.zoom_slider.setValue(percent)
|
self.zoom_slider.setValue(percent)
|
||||||
self.zoom_percent_input.setValue(percent)
|
self.zoom_percent_input.setText(str(percent))
|
||||||
|
|
||||||
def _sync_page_controls(self) -> None:
|
def _sync_page_controls(self) -> None:
|
||||||
if not hasattr(self, "page_number_input"):
|
if not hasattr(self, "page_number_input"):
|
||||||
return
|
return
|
||||||
if not self.document.is_open:
|
if not self.document.is_open:
|
||||||
with QSignalBlocker(self.page_number_input):
|
with QSignalBlocker(self.page_number_input):
|
||||||
self.page_number_input.setRange(1, 1)
|
self.page_number_input.setValidator(QIntValidator(1, 1, self.page_number_input))
|
||||||
self.page_number_input.setValue(1)
|
self.page_number_input.setText("1")
|
||||||
self.page_number_input.setEnabled(False)
|
self.page_number_input.setEnabled(False)
|
||||||
self.page_total_label.setText("/ 0 页")
|
self.page_total_label.setText("/ 0 页")
|
||||||
return
|
return
|
||||||
with QSignalBlocker(self.page_number_input):
|
with QSignalBlocker(self.page_number_input):
|
||||||
self.page_number_input.setEnabled(True)
|
self.page_number_input.setEnabled(True)
|
||||||
self.page_number_input.setRange(1, self.document.page_count)
|
self.page_number_input.setValidator(QIntValidator(1, self.document.page_count, self.page_number_input))
|
||||||
self.page_number_input.setValue(self.viewer.page_index + 1)
|
self.page_number_input.setText(str(self.viewer.page_index + 1))
|
||||||
self.page_total_label.setText(f"/ {self.document.page_count} 页")
|
self.page_total_label.setText(f"/ {self.document.page_count} 页")
|
||||||
|
|
||||||
def apply_page_number_input(self) -> None:
|
def apply_page_number_input(self) -> None:
|
||||||
if not self.document.is_open:
|
if not self.document.is_open:
|
||||||
self._sync_page_controls()
|
self._sync_page_controls()
|
||||||
return
|
return
|
||||||
page = self.page_number_input.value()
|
try:
|
||||||
|
page = int(self.page_number_input.text().strip())
|
||||||
|
except ValueError:
|
||||||
|
self._sync_page_controls()
|
||||||
|
return
|
||||||
if 1 <= page <= self.document.page_count:
|
if 1 <= page <= self.document.page_count:
|
||||||
self.viewer.go_to_page(page - 1)
|
self.viewer.go_to_page(page - 1)
|
||||||
self._sync_page_controls()
|
self._sync_page_controls()
|
||||||
@@ -982,16 +1001,13 @@ class MainWindow(QMainWindow):
|
|||||||
self.zoom_slider.setPageStep(25)
|
self.zoom_slider.setPageStep(25)
|
||||||
self.zoom_slider.setFixedWidth(150)
|
self.zoom_slider.setFixedWidth(150)
|
||||||
self.zoom_slider.setToolTip("缩放")
|
self.zoom_slider.setToolTip("缩放")
|
||||||
self.zoom_percent_input = QSpinBox()
|
self.zoom_percent_input = QLineEdit()
|
||||||
self.zoom_percent_input.setRange(10, 1000)
|
self.zoom_percent_input.setValidator(QIntValidator(10, 1000, self))
|
||||||
self.zoom_percent_input.setSingleStep(5)
|
self.zoom_percent_input.setFixedWidth(64)
|
||||||
self.zoom_percent_input.setSuffix("%")
|
|
||||||
self.zoom_percent_input.setFixedWidth(78)
|
|
||||||
self.zoom_percent_input.setToolTip("缩放百分比")
|
self.zoom_percent_input.setToolTip("缩放百分比")
|
||||||
self.page_number_input = QSpinBox()
|
self.page_number_input = QLineEdit()
|
||||||
self.page_number_input.setRange(1, 1)
|
self.page_number_input.setValidator(QIntValidator(1, 1, self))
|
||||||
self.page_number_input.setKeyboardTracking(False)
|
self.page_number_input.setFixedWidth(48)
|
||||||
self.page_number_input.setFixedWidth(64)
|
|
||||||
self.page_number_input.setToolTip("当前页码")
|
self.page_number_input.setToolTip("当前页码")
|
||||||
self.page_number_input.setEnabled(False)
|
self.page_number_input.setEnabled(False)
|
||||||
self.page_total_label = QLabel("/ 0 页")
|
self.page_total_label = QLabel("/ 0 页")
|
||||||
@@ -1358,6 +1374,11 @@ class MainWindow(QMainWindow):
|
|||||||
self.zoom_percent_input.setObjectName("statusZoomPercent")
|
self.zoom_percent_input.setObjectName("statusZoomPercent")
|
||||||
self.zoom_percent_input.setFixedWidth(72)
|
self.zoom_percent_input.setFixedWidth(72)
|
||||||
|
|
||||||
|
controls = QWidget()
|
||||||
|
controls.setObjectName("statusPageControls")
|
||||||
|
controls_layout = QHBoxLayout(controls)
|
||||||
|
controls_layout.setContentsMargins(0, 0, 0, 0)
|
||||||
|
controls_layout.setSpacing(6)
|
||||||
for widget in [
|
for widget in [
|
||||||
self._status_action_button(self.zoom_out_action, 66),
|
self._status_action_button(self.zoom_out_action, 66),
|
||||||
self._status_action_button(self.zoom_in_action, 66),
|
self._status_action_button(self.zoom_in_action, 66),
|
||||||
@@ -1370,7 +1391,9 @@ class MainWindow(QMainWindow):
|
|||||||
self.page_number_input,
|
self.page_number_input,
|
||||||
self.page_total_label,
|
self.page_total_label,
|
||||||
]:
|
]:
|
||||||
status.addPermanentWidget(widget)
|
controls_layout.addWidget(widget)
|
||||||
|
widget.show()
|
||||||
|
status.addPermanentWidget(controls, 1)
|
||||||
|
|
||||||
def _connect_signals(self) -> None:
|
def _connect_signals(self) -> None:
|
||||||
self.open_action.triggered.connect(lambda: self.open_file())
|
self.open_action.triggered.connect(lambda: self.open_file())
|
||||||
@@ -1390,7 +1413,7 @@ class MainWindow(QMainWindow):
|
|||||||
self.zoom_out_action.triggered.connect(self.zoom_out)
|
self.zoom_out_action.triggered.connect(self.zoom_out)
|
||||||
self.zoom_in_action.triggered.connect(self.zoom_in)
|
self.zoom_in_action.triggered.connect(self.zoom_in)
|
||||||
self.zoom_slider.valueChanged.connect(self.set_zoom_percent)
|
self.zoom_slider.valueChanged.connect(self.set_zoom_percent)
|
||||||
self.zoom_percent_input.valueChanged.connect(self.set_zoom_percent)
|
self.zoom_percent_input.editingFinished.connect(self.apply_zoom_percent_input)
|
||||||
self.page_number_input.editingFinished.connect(self.apply_page_number_input)
|
self.page_number_input.editingFinished.connect(self.apply_page_number_input)
|
||||||
self.fit_width_action.triggered.connect(self.fit_width)
|
self.fit_width_action.triggered.connect(self.fit_width)
|
||||||
self.fit_page_action.triggered.connect(self.fit_page)
|
self.fit_page_action.triggered.connect(self.fit_page)
|
||||||
@@ -1595,6 +1618,22 @@ class MainWindow(QMainWindow):
|
|||||||
if event.key() == Qt.Key.Key_Delete and (self.selected_annotation or self.selected_raster_id is not None):
|
if event.key() == Qt.Key.Key_Delete and (self.selected_annotation or self.selected_raster_id is not None):
|
||||||
self.delete_selected_object()
|
self.delete_selected_object()
|
||||||
return
|
return
|
||||||
|
if self.document.is_open and not isinstance(self.focusWidget(), QLineEdit):
|
||||||
|
if event.key() == Qt.Key.Key_Left:
|
||||||
|
self.previous_page()
|
||||||
|
event.accept()
|
||||||
|
return
|
||||||
|
if event.key() == Qt.Key.Key_Right:
|
||||||
|
self.next_page()
|
||||||
|
event.accept()
|
||||||
|
return
|
||||||
|
if event.key() in {Qt.Key.Key_Up, Qt.Key.Key_Down}:
|
||||||
|
bar = self.viewer.verticalScrollBar()
|
||||||
|
direction = -1 if event.key() == Qt.Key.Key_Up else 1
|
||||||
|
step = max(48, bar.pageStep() // 5)
|
||||||
|
bar.setValue(bar.value() + direction * step)
|
||||||
|
event.accept()
|
||||||
|
return
|
||||||
super().keyPressEvent(event)
|
super().keyPressEvent(event)
|
||||||
|
|
||||||
def toggle_freehand_drawing(self, enabled: bool) -> None:
|
def toggle_freehand_drawing(self, enabled: bool) -> None:
|
||||||
@@ -2152,6 +2191,7 @@ class MainWindow(QMainWindow):
|
|||||||
|
|
||||||
def _update_status(self) -> None:
|
def _update_status(self) -> None:
|
||||||
self._update_current_tab_title()
|
self._update_current_tab_title()
|
||||||
|
self._sync_zoom_controls(self.viewer.zoom)
|
||||||
self._sync_page_controls()
|
self._sync_page_controls()
|
||||||
if not self.document.is_open:
|
if not self.document.is_open:
|
||||||
self.statusBar().showMessage("就绪")
|
self.statusBar().showMessage("就绪")
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ class ThumbnailList(QListWidget):
|
|||||||
def _update_thumbnail_metrics(self) -> None:
|
def _update_thumbnail_metrics(self) -> None:
|
||||||
viewport_width = max(120, self.viewport().width())
|
viewport_width = max(120, self.viewport().width())
|
||||||
thumbnail_width = max(92, min(self.MAX_THUMBNAIL_WIDTH, viewport_width - 34))
|
thumbnail_width = max(92, min(self.MAX_THUMBNAIL_WIDTH, viewport_width - 34))
|
||||||
thumbnail_height = int(thumbnail_width * 1.34)
|
thumbnail_height = int(thumbnail_width * 0.76)
|
||||||
gap = max(1, round(self.fontMetrics().height() * 0.25))
|
gap = max(1, round(self.fontMetrics().height() * 0.25))
|
||||||
label_height = self.fontMetrics().height() + 8
|
label_height = self.fontMetrics().height() + 8
|
||||||
grid_size = QSize(thumbnail_width + 26, thumbnail_height + label_height + gap)
|
grid_size = QSize(thumbnail_width + 26, thumbnail_height + label_height + gap)
|
||||||
|
|||||||
Reference in New Issue
Block a user