diff --git a/README.md b/README.md index f80152f..9843610 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ PDFReaderLite 是一个面向 Windows 的轻量 PDF 阅读与编辑工具,目 - 连续阅读模式,页面上下自动衔接并保留页间缝隙 - 鼠标滚轮优先在文档内容窗口内上下滚动 - 键盘左右键翻页,上下键滚动阅读区 -- 状态栏页面显示区:无上下按钮页码输入框、缩小、放大、10%-1000% 缩放文本框、缩放滑条、适应宽度、适应页面 +- 状态栏三段式页面显示区:页码输入、对数型缩放滑条与 10%-1000% 缩放文本框、适应宽度/适应页面 - 适应宽度、适应页面 - 页码跳转(已支持状态栏页码输入框,失焦后自动跳转并校验非法输入) - 左侧缩略图 diff --git a/docs/development_plan.md b/docs/development_plan.md index d2549f6..518673b 100644 --- a/docs/development_plan.md +++ b/docs/development_plan.md @@ -7,7 +7,7 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重 ## V1:基础可用版 - 打开 PDF -- 阅读、翻页、缩放(已支持连续阅读、页间缝隙、鼠标滚轮页内/文档内滚动、键盘左右翻页、键盘上下滚动、状态栏页面缩放文本框和滑条,缩放范围 10%-1000%) +- 阅读、翻页、缩放(已支持连续阅读、页间缝隙、鼠标滚轮页内/文档内滚动、键盘左右翻页、键盘上下滚动、状态栏三段式页面控件、对数型缩放滑条,缩放范围 10%-1000%) - 适应宽度、适应页面 - 页码跳转(已支持状态栏无上下按钮页码输入框,失焦后自动跳转并校验非法输入) - 左侧缩略图 diff --git a/pdfreaderlite/ui/main_window.py b/pdfreaderlite/ui/main_window.py index 345cbc4..b68c2ca 100644 --- a/pdfreaderlite/ui/main_window.py +++ b/pdfreaderlite/ui/main_window.py @@ -1,5 +1,6 @@ from __future__ import annotations +import math from dataclasses import dataclass from pathlib import Path @@ -26,6 +27,7 @@ from PySide6.QtWidgets import ( QDialogButtonBox, QFormLayout, QFileDialog, + QFrame, QHBoxLayout, QInputDialog, QLabel, @@ -286,7 +288,15 @@ class MainWindow(QMainWindow): if not self.document.is_open: self._sync_zoom_controls(self.viewer.zoom) return - self.viewer.set_zoom(value / 100) + self.viewer.set_zoom(self._zoom_from_slider_value(value)) + + def _slider_value_from_zoom(self, zoom: float) -> int: + clamped_zoom = max(0.1, min(10.0, zoom)) + return round((math.log10(clamped_zoom) + 1.0) * 1000) + + def _zoom_from_slider_value(self, value: int) -> float: + exponent = (value / 1000) - 1.0 + return 10**exponent def apply_zoom_percent_input(self) -> None: if not self.document.is_open: @@ -313,7 +323,7 @@ class MainWindow(QMainWindow): return percent = max(10, min(1000, round(zoom * 100))) with QSignalBlocker(self.zoom_slider), QSignalBlocker(self.zoom_percent_input): - self.zoom_slider.setValue(percent) + self.zoom_slider.setValue(self._slider_value_from_zoom(zoom)) self.zoom_percent_input.setText(str(percent)) def _sync_page_controls(self) -> None: @@ -996,9 +1006,9 @@ class MainWindow(QMainWindow): self.zoom_in_action = QAction("放大", self) self.zoom_in_action.setShortcut(QKeySequence.StandardKey.ZoomIn) self.zoom_slider = QSlider(Qt.Orientation.Horizontal) - self.zoom_slider.setRange(10, 1000) - self.zoom_slider.setSingleStep(5) - self.zoom_slider.setPageStep(25) + self.zoom_slider.setRange(0, 2000) + self.zoom_slider.setSingleStep(25) + self.zoom_slider.setPageStep(100) self.zoom_slider.setFixedWidth(150) self.zoom_slider.setToolTip("缩放") self.zoom_percent_input = QLineEdit() @@ -1350,6 +1360,14 @@ class MainWindow(QMainWindow): button.setAutoRaise(True) return button + def _status_separator(self) -> QFrame: + separator = QFrame() + separator.setObjectName("statusSeparator") + separator.setFrameShape(QFrame.Shape.VLine) + separator.setFrameShadow(QFrame.Shadow.Plain) + separator.setFixedHeight(18) + return separator + def _build_status_controls(self) -> None: status = self.statusBar() toolbar = getattr(self, "main_toolbar", None) @@ -1370,30 +1388,33 @@ class MainWindow(QMainWindow): zoom_label = QLabel("缩放") zoom_label.setObjectName("statusZoomLabel") self.zoom_slider.setObjectName("statusZoomSlider") - self.zoom_slider.setFixedWidth(132) + self.zoom_slider.setFixedWidth(170) self.zoom_percent_input.setObjectName("statusZoomPercent") - self.zoom_percent_input.setFixedWidth(72) + self.zoom_percent_input.setFixedWidth(58) controls = QWidget() controls.setObjectName("statusPageControls") controls_layout = QHBoxLayout(controls) controls_layout.setContentsMargins(0, 0, 0, 0) - controls_layout.setSpacing(6) + controls_layout.setSpacing(8) for widget in [ - self._status_action_button(self.zoom_out_action, 66), - self._status_action_button(self.zoom_in_action, 66), - zoom_label, - self.zoom_percent_input, - self.zoom_slider, - self._status_action_button(self.fit_width_action, 92), - self._status_action_button(self.fit_page_action, 92), page_label, self.page_number_input, self.page_total_label, + self._status_separator(), + self._status_action_button(self.zoom_out_action, 64), + self._status_action_button(self.zoom_in_action, 64), + zoom_label, + self.zoom_percent_input, + self.zoom_slider, + self._status_separator(), + self._status_action_button(self.fit_width_action, 92), + self._status_action_button(self.fit_page_action, 92), ]: controls_layout.addWidget(widget) widget.show() - status.addPermanentWidget(controls, 1) + controls.setFixedWidth(760) + status.addPermanentWidget(controls, 0) def _connect_signals(self) -> None: self.open_action.triggered.connect(lambda: self.open_file()) @@ -1987,6 +2008,7 @@ class MainWindow(QMainWindow): QLabel#toolbarLabel { color: #cfd3d8; padding-left: 4px; } QLabel#statusZoomLabel { color: #cfd3d8; padding: 0 4px 0 10px; } QLabel#statusPageLabel, QLabel#statusPageTotal { color: #cfd3d8; padding: 0 4px; } + QFrame#statusSeparator { color: #555a60; background: #555a60; } QToolButton#statusToolButton { color: #f1f1f1; background: transparent; border: 1px solid transparent; border-radius: 4px; padding: 3px 7px; @@ -2061,6 +2083,7 @@ class MainWindow(QMainWindow): QLabel#toolbarLabel { color: #5b6067; padding-left: 4px; } QLabel#statusZoomLabel { color: #5b6067; padding: 0 4px 0 10px; } QLabel#statusPageLabel, QLabel#statusPageTotal { color: #5b6067; padding: 0 4px; } + QFrame#statusSeparator { color: #c9cdd3; background: #c9cdd3; } QToolButton#statusToolButton { color: #25272a; background: transparent; border: 1px solid transparent; border-radius: 4px; padding: 3px 7px;