From de362536f54c64ddf8fa19c528a316ab0c674e9e Mon Sep 17 00:00:00 2001 From: shen Date: Thu, 29 Oct 2026 19:09:32 +0800 Subject: [PATCH] refactor: separate reader widgets and shared UI themes --- docs/architecture.md | 14 + mdhelper/main_window.py | 738 +------------------------ mdhelper/reader_widgets.py | 145 +++++ mdhelper/resources/ui_navigation.qss | 285 ++++++++++ mdhelper/resources/ui_style_dialog.qss | 179 ++++++ mdhelper/style_dialog.py | 259 +-------- mdhelper/ui_theme.py | 153 +++++ mdhelper/video_player.py | 159 ++++++ 8 files changed, 947 insertions(+), 985 deletions(-) create mode 100644 docs/architecture.md create mode 100644 mdhelper/reader_widgets.py create mode 100644 mdhelper/resources/ui_navigation.qss create mode 100644 mdhelper/resources/ui_style_dialog.qss create mode 100644 mdhelper/ui_theme.py create mode 100644 mdhelper/video_player.py diff --git a/docs/architecture.md b/docs/architecture.md new file mode 100644 index 0000000..6abe14a --- /dev/null +++ b/docs/architecture.md @@ -0,0 +1,14 @@ +# MDHelper 架构 + +## 界面与启动 + +- `reader_widgets.py`:阅读页面、浏览器视图、固定的阅读标签容器与桥接信号。 +- `video_player.py`:视频播放控件。 +- `ui_theme.py` 与 `resources/ui_*.qss`:配色、样式模板及 Windows 标题栏设置。 +- `main_window.py`:应用窗口、菜单事件以及功能之间的协调。 + +控件模块导入时不创建窗口或浏览器。欢迎页不启动 WebEngine;首次显示阅读器时使用固定的 `ReaderTabHost`,页面准备好后才切换内容。拆分模块时必须保留控件的父子关系、创建时机和显示顺序,不通过重新创建主窗口或重新挂载已显示浏览器来刷新内容。 + +## 验证约定 + +每个重构阶段独立提交。运行单元测试,并按改动范围运行 `gui_smoke.py`、`improvements_smoke.py` 和 `reliability_smoke.py`。涉及浏览器生命周期的调整必须检查欢迎页、首次打开文件、标签切换以及预览滚动;涉及保存的调整必须检查保存失败、取消、另存为和后台标签。 diff --git a/mdhelper/main_window.py b/mdhelper/main_window.py index 847002b..d770ae8 100644 --- a/mdhelper/main_window.py +++ b/mdhelper/main_window.py @@ -7,15 +7,10 @@ import logging import os import re import shutil -import ctypes -import zipfile -from email.mime.multipart import MIMEMultipart -from email.mime.text import MIMEText -from email.policy import default as email_default_policy from pathlib import Path from urllib.parse import unquote, urlsplit -from PySide6.QtCore import QEventLoop, QFile, QFileSystemWatcher, QObject, QPoint, QProcess, QSettings, QSignalBlocker, QSize, QThreadPool, QTimer, QUrl, Qt, Signal, Slot +from PySide6.QtCore import QEventLoop, QFile, QFileSystemWatcher, QPoint, QProcess, QSettings, QSignalBlocker, QSize, QThreadPool, QTimer, QUrl, Qt, Slot from PySide6.QtGui import ( QAction, QActionGroup, @@ -33,37 +28,7 @@ from PySide6.QtGui import ( from PySide6.QtWebChannel import QWebChannel from PySide6.QtWebEngineCore import QWebEnginePage, QWebEngineSettings from PySide6.QtWebEngineWidgets import QWebEngineView -from PySide6.QtMultimedia import QAudioOutput, QMediaPlayer -from PySide6.QtMultimediaWidgets import QVideoWidget -from PySide6.QtWidgets import ( - QAbstractItemView, - QApplication, - QComboBox, - QFileDialog, - QFontDialog, - QInputDialog, - QLabel, - QLineEdit, - QDialog, - QMainWindow, - QMenu, - QMessageBox, - QPushButton, - QSlider, - QSplitter, - QStackedLayout, - QStatusBar, - QStyledItemDelegate, - QStyle, - QTabBar, - QTabWidget, - QTextBrowser, - QTreeWidget, - QTreeWidgetItem, - QHBoxLayout, - QVBoxLayout, - QWidget, -) +from PySide6.QtWidgets import QAbstractItemView, QApplication, QFileDialog, QFontDialog, QInputDialog, QLabel, QLineEdit, QDialog, QMainWindow, QMenu, QMessageBox, QPushButton, QSplitter, QStatusBar, QStyle, QTabBar, QTabWidget, QTextBrowser, QTreeWidget, QTreeWidgetItem, QHBoxLayout, QVBoxLayout, QWidget from .bookmark_dialog import BookmarkManagerDialog from . import __version__ @@ -79,19 +44,11 @@ from .document_tree import ( is_code_document, normalized_document_file_groups, ) -from .docx_exporter import DOCX_EXPORT_ENGINES, DocxExportError, export_markdown_to_docx from .history import HistoryItem, NavigationHistory from .markdown_utils import Heading, extract_headings, extract_headings_from_text from .markdown_editor import MarkdownEditorDialog as RichMarkdownEditorDialog from .markdown_renderer import MarkdownRenderer from .media import is_markdown_url, is_qt_video_player_url, is_webpage_url, media_kind, media_mime_type -from .pdf_export import ( - PdfExportSettingsDialog, - PdfMargins, - build_pdf_export_html, - build_pdf_page_layout, - extract_heading_page_numbers, -) from .search import SearchIndex from .settings_dialog import AppPreferences, SettingsDialog from .style_dialog import DocumentStyleEditorDialog, build_document_style_css @@ -99,6 +56,9 @@ from .style_sync import normalize_payload, render_css from .text_io import DEFAULT_TEXT_PREVIEW_BYTES, read_text_with_fallback from .startup_scan import StartupScan from .export_workflow import ExportWorkflow +from .reader_widgets import ReaderPage, ReaderBridge, ReaderView, ReaderTabHost, CompactTreeDelegate +from .video_player import VideoPlayerWidget +from .ui_theme import navigation_theme, apply_title_bar_style BOOKMARKS_SETTING_KEY = "bookmarks/items" @@ -249,292 +209,16 @@ def re_find_markdown_links(source: str) -> list[str]: return markdown_targets + html_targets -class ReaderPage(QWebEnginePage): - anchor_requested = Signal(str) - local_link_requested = Signal(QUrl, bool) - external_url_requested = Signal(QUrl) - - def acceptNavigationRequest( - self, - url: QUrl, - navigation_type: QWebEnginePage.NavigationType, - is_main_frame: bool, - ) -> bool: - if navigation_type != QWebEnginePage.NavigationType.NavigationTypeLinkClicked: - return super().acceptNavigationRequest(url, navigation_type, is_main_frame) - - if url.scheme() in {"http", "https"}: - self.external_url_requested.emit(url) - return False - - if url.fragment() and not url.scheme(): - self.anchor_requested.emit(url.fragment()) - return False - - if url.scheme() and url.scheme() not in {"file", "qrc"}: - self.external_url_requested.emit(url) - return False - - if url.isLocalFile(): - self.local_link_requested.emit(url, True) - return False - - return super().acceptNavigationRequest(url, navigation_type, is_main_frame) -class ReaderBridge(QObject): - image_save_requested = Signal(str) - image_reveal_requested = Signal(str) - - @Slot(str) - def saveImage(self, url: str) -> None: - self.image_save_requested.emit(url) - - @Slot(str) - def revealImage(self, url: str) -> None: - self.image_reveal_requested.emit(url) -class ReaderView(QWebEngineView): - open_link_requested = Signal(QUrl, bool) - - def set_wheel_scroll_speed(self, speed: float) -> None: - try: - normalized = max(WHEEL_SCROLL_SPEED_MIN, min(WHEEL_SCROLL_SPEED_MAX, float(speed))) - except (TypeError, ValueError): - normalized = 1.0 - self.setProperty("wheel_scroll_speed", normalized) - self.page().runJavaScript( - f"document.documentElement.dataset.wheelScrollSpeed = '{normalized:.1f}';" - "window.mdhelperSyncCustomWheelHandler?.();" - ) - - def contextMenuEvent(self, event: object) -> None: - request = self.lastContextMenuRequest() - link_url = request.linkUrl() - if link_url.isValid() and not link_url.isEmpty(): - if self._show_link_context_menu(link_url, event.globalPos()): - request.setAccepted(True) - return - super().contextMenuEvent(event) - - def _show_link_context_menu(self, link_url: QUrl, global_pos: object) -> bool: - menu = self._create_link_context_menu() - chosen = menu.exec(global_pos) - if chosen is None: - return False - return self._handle_link_context_action(link_url, bool(chosen.data())) - - def _create_link_context_menu(self) -> QMenu: - menu = QMenu(self) - open_current = menu.addAction("在本标签页打开") - open_current.setData(False) - open_new = menu.addAction("新建标签页打开") - open_new.setData(True) - return menu - - def _handle_link_context_action(self, link_url: QUrl, new_tab: bool) -> bool: - if not link_url.isValid() or link_url.isEmpty(): - return False - self.open_link_requested.emit(link_url, new_tab) - return True -class ReaderTabHost(QWidget): - def __init__(self, parent: QWidget | None = None) -> None: - super().__init__(parent) - self.reader_view: ReaderView | None = None - self.welcome_view = QTextBrowser(self) - self.welcome_view.setOpenExternalLinks(False) - - self.stack = QStackedLayout(self) - self.stack.setContentsMargins(0, 0, 0, 0) - self.stack.addWidget(self.welcome_view) - self.show_welcome() - - def set_reader_view(self, web_view: ReaderView) -> None: - if self.reader_view is web_view: - return - if self.reader_view is not None: - self.stack.removeWidget(self.reader_view) - self.reader_view = web_view - self.stack.addWidget(web_view) - - def begin_reader_load(self) -> None: - self.setProperty("is_welcome", False) - self.setProperty("reader_pending_show", True) - - def show_reader(self) -> None: - if self.reader_view is None: - return - self.setProperty("is_welcome", False) - self.setProperty("reader_pending_show", False) - self.stack.setCurrentWidget(self.reader_view) - - def show_welcome(self) -> None: - self.setProperty("is_welcome", True) - self.setProperty("reader_pending_show", False) - self.stack.setCurrentWidget(self.welcome_view) -class VideoPlayerWidget(QWidget): - external_open_requested = Signal(str) - - def __init__(self, path: Path, parent: QWidget | None = None) -> None: - super().__init__(parent) - self.setObjectName("videoPlayer") - self.path = path.resolve() - self._seeking = False - - self.video_widget = QVideoWidget(self) - self.video_widget.setObjectName("videoSurface") - - self.player = QMediaPlayer(self) - self.audio_output = QAudioOutput(self) - self.audio_output.setVolume(0.8) - self.player.setAudioOutput(self.audio_output) - self.player.setVideoOutput(self.video_widget) - self.player.playbackStateChanged.connect(self._sync_play_button) - self.player.errorOccurred.connect(self._on_error) - self.player.positionChanged.connect(self._on_position_changed) - self.player.durationChanged.connect(self._on_duration_changed) - - self.title_label = QLabel(self.path.name) - self.title_label.setObjectName("videoTitle") - self.title_label.setToolTip(str(self.path)) - - self.status_label = QLabel("准备播放") - self.status_label.setObjectName("videoStatus") - - self.play_button = QPushButton() - self.play_button.setObjectName("videoControlButton") - self.play_button.setToolTip("播放/暂停") - self.play_button.clicked.connect(self.toggle_playback) - - self.position_label = QLabel("00:00 / 00:00") - self.position_label.setObjectName("videoStatus") - self.position_label.setMinimumWidth(104) - - self.position_slider = QSlider(Qt.Orientation.Horizontal) - self.position_slider.setObjectName("videoPositionSlider") - self.position_slider.setRange(0, 0) - self.position_slider.sliderPressed.connect(self._begin_seek) - self.position_slider.sliderMoved.connect(self._preview_seek_position) - self.position_slider.sliderReleased.connect(self._finish_seek) - - self.speed_box = QComboBox() - self.speed_box.setObjectName("videoSpeedBox") - self.speed_box.setToolTip("播放速度") - for label, value in (("x0.5", 0.5), ("x1", 1.0), ("x2", 2.0), ("x3", 3.0)): - self.speed_box.addItem(label, value) - self.speed_box.setCurrentIndex(1) - self.speed_box.currentIndexChanged.connect(self._change_playback_rate) - - self.external_button = QPushButton("用外部程序打开") - self.external_button.setObjectName("videoExternalButton") - self.external_button.clicked.connect(lambda: self.external_open_requested.emit(str(self.path))) - - controls = QHBoxLayout() - controls.setContentsMargins(0, 0, 0, 0) - controls.setSpacing(8) - controls.addWidget(self.play_button) - controls.addWidget(self.position_label) - controls.addWidget(self.position_slider, 1) - controls.addWidget(self.speed_box) - controls.addWidget(self.status_label) - controls.addWidget(self.external_button) - - layout = QVBoxLayout(self) - layout.setContentsMargins(14, 14, 14, 14) - layout.setSpacing(10) - layout.addWidget(self.title_label) - layout.addWidget(self.video_widget, 1) - layout.addLayout(controls) - - self.load_file(self.path) - - def load_file(self, path: Path) -> None: - self.path = path.resolve() - self.setProperty("current_file", str(self.path)) - self.setProperty("current_fragment", "") - self.title_label.setText(self.path.name) - self.title_label.setToolTip(str(self.path)) - self.status_label.setText("正在加载视频...") - self.position_slider.setValue(0) - self.position_label.setText("00:00 / 00:00") - self.player.setSource(QUrl.fromLocalFile(str(self.path))) - self._change_playback_rate(self.speed_box.currentIndex()) - self.player.play() - self._sync_play_button(self.player.playbackState()) - - def toggle_playback(self) -> None: - if self.player.playbackState() == QMediaPlayer.PlaybackState.PlayingState: - self.player.pause() - else: - self.player.play() - - def stop(self) -> None: - self.player.stop() - - def _sync_play_button(self, state: QMediaPlayer.PlaybackState) -> None: - if state == QMediaPlayer.PlaybackState.PlayingState: - self.play_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaPause)) - self.status_label.setText("正在播放") - else: - self.play_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaPlay)) - if state == QMediaPlayer.PlaybackState.PausedState: - self.status_label.setText("已暂停") - - def _on_error(self, error: QMediaPlayer.Error, message: str) -> None: - if error == QMediaPlayer.Error.NoError: - return - detail = message or "当前视频无法由内置播放器播放,可尝试使用外部程序打开。" - self.status_label.setText(detail) - - def _on_duration_changed(self, duration: int) -> None: - self.position_slider.setRange(0, max(0, duration)) - self._update_position_label(self.player.position(), duration) - - def _on_position_changed(self, position: int) -> None: - if not self._seeking: - self.position_slider.setValue(max(0, position)) - self._update_position_label(position, self.player.duration()) - - def _begin_seek(self) -> None: - self._seeking = True - - def _preview_seek_position(self, position: int) -> None: - self._update_position_label(position, self.player.duration()) - - def _finish_seek(self) -> None: - self.player.setPosition(self.position_slider.value()) - self._seeking = False - - def _change_playback_rate(self, index: int) -> None: - rate = self.speed_box.itemData(index) - try: - self.player.setPlaybackRate(float(rate)) - except (TypeError, ValueError): - self.player.setPlaybackRate(1.0) - - def _update_position_label(self, position: int, duration: int) -> None: - self.position_label.setText(f"{self._format_time(position)} / {self._format_time(duration)}") - - def _format_time(self, milliseconds: int) -> str: - seconds = max(0, int(milliseconds // 1000)) - minutes, second = divmod(seconds, 60) - hours, minute = divmod(minutes, 60) - if hours: - return f"{hours:d}:{minute:02d}:{second:02d}" - return f"{minute:02d}:{second:02d}" -class CompactTreeDelegate(QStyledItemDelegate): - def sizeHint(self, option: object, index: object) -> object: - size = super().sizeHint(option, index) - line_height = option.fontMetrics.height() - size.setHeight(max(18, round(line_height * 1.16) + 2)) - return size class MainWindow(ExportWorkflow, QMainWindow): @@ -1629,395 +1313,9 @@ class MainWindow(ExportWorkflow, QMainWindow): return path.resolve().as_posix() def _apply_navigation_style(self) -> None: - palettes = { - "white": { - "chrome": "#f7f8fb", - "surface": "#ffffff", - "text": "#111827", - "muted": "#6b7280", - "border": "#dde2eb", - "hover": "#eef4ff", - "selected": "#dbeafe", - "selected_text": "#0f172a", - "splitter": "#e5e7eb", - "focus": "#3b82f6", - "tab_bg": "#edf1f7", - }, - "black": { - "chrome": "#0c0d10", - "surface": "#17191f", - "text": "#f3f4f6", - "muted": "#a7adb7", - "border": "#2a2e38", - "hover": "#252b36", - "selected": "#243b5a", - "selected_text": "#f8fafc", - "splitter": "#252a33", - "focus": "#60a5fa", - "tab_bg": "#111318", - }, - "dark_gray": { - "chrome": "#282c33", - "surface": "#343943", - "text": "#f1f5f9", - "muted": "#c1c7d0", - "border": "#48505d", - "hover": "#3f4a59", - "selected": "#365b82", - "selected_text": "#ffffff", - "splitter": "#48505d", - "focus": "#7dd3fc", - "tab_bg": "#303640", - }, - "colorful": { - "chrome": "#eef5ff", - "surface": "#ffffff", - "text": "#132238", - "muted": "#667085", - "border": "#cbd9ef", - "hover": "#e7f0ff", - "selected": "#cfe2ff", - "selected_text": "#10213d", - "splitter": "#cbd9ef", - "focus": "#2563eb", - "tab_bg": "#dceaff", - }, - } - palette = palettes.get(self.theme_color, palettes["white"]) - background_accents = { - "none": ("", palette["chrome"], ""), - "chinese_knot": ("#d92f2f", "#fff1ef", "theme_chinese_knot.svg"), - "cloud": ("#8bd5ff", "#effaff", "theme_cloud.svg"), - "ruyi": ("#bfe9ca", "#f1fbf3", "theme_ruyi.svg"), - "brush": ("#d6d7dc", "#f5f6f8", "theme_brush.svg"), - "peony": ("#ffd0df", "#fff3f7", "theme_peony.svg"), - "bamboo": ("#a9d878", "#f1faeb", "theme_bamboo.svg"), - "meander": ("#ffd94d", "#fff8d8", "theme_meander.svg"), - } - dark_background_accents = { - "none": ("", palette["chrome"], ""), - "chinese_knot": ("#6e171a", "#26191c", "theme_chinese_knot.svg"), - "cloud": ("#16384d", "#122330", "theme_cloud.svg"), - "ruyi": ("#1c4229", "#17251b", "theme_ruyi.svg"), - "brush": ("#3a3d45", "#1e2026", "theme_brush.svg"), - "peony": ("#552333", "#2a1a22", "theme_peony.svg"), - "bamboo": ("#254018", "#1a2616", "theme_bamboo.svg"), - "meander": ("#574913", "#282416", "theme_meander.svg"), - } - accent_source = dark_background_accents if self.theme == "dark" else background_accents self._enforce_theme_background_rule() - header_background, themed_panel, pattern_file = accent_source.get(self.theme_background, accent_source["none"]) - panel_bg = themed_panel if self.theme_background != "none" else palette["chrome"] - chrome_bg = header_background or panel_bg - text = palette["text"] - muted = palette["muted"] - surface = palette["surface"] - border = palette["border"] - hover = palette["hover"] - selected = palette["selected"] - selected_text = palette["selected_text"] - splitter = palette["splitter"] - input_bg = palette["surface"] - focus = palette["focus"] - tab_bg = palette["tab_bg"] - tab_active = palette["surface"] - branch_closed_icon = self._stylesheet_url(self.resources_dir / "tree_closed.svg") - branch_open_icon = self._stylesheet_url(self.resources_dir / "tree_open.svg") - search_box_height = max(22, round(self.fontMetrics().height() * 1.5)) - pattern_style = "" - chrome_pattern_style = "" - if pattern_file: - pattern_url = self._stylesheet_url(self.resources_dir / pattern_file) - pattern_style = f'background-image: url("{pattern_url}"); background-repeat: repeat;' - chrome_pattern_style = f'background-image: url("{pattern_url}"); background-repeat: repeat;' - - self.setStyleSheet( - f""" - QMainWindow {{ - background-color: {panel_bg}; - {pattern_style} - }} - - QMenuBar, - QStatusBar {{ - color: {text}; - background-color: {chrome_bg}; - {chrome_pattern_style} - border: 0; - }} - - QStatusBar {{ - border-top: 1px solid {splitter}; - }} - - QLabel#statusPathLabel {{ - color: {text}; - background: transparent; - }} - - QMenuBar::item {{ - padding: 5px 9px; - background: transparent; - }} - - QMenuBar::item:selected {{ - background: {hover}; - color: {selected_text}; - border-radius: 4px; - }} - - QMenu {{ - color: {text}; - background: {surface}; - border: 1px solid {border}; - padding: 4px; - }} - - QMenu::item {{ - padding: 5px 24px 5px 10px; - }} - - QMenu::item:selected {{ - background: {hover}; - color: {selected_text}; - }} - - QTabWidget {{ - background: {tab_bg}; - }} - - QTabWidget::tab-bar {{ - background: {tab_bg}; - }} - - QTabWidget::pane {{ - border: 0; - border-left: 1px solid {splitter}; - border-right: 1px solid {splitter}; - background: {tab_active}; - }} - - QTabBar {{ - background: {tab_bg}; - qproperty-drawBase: 0; - }} - - QTabBar::tab {{ - color: {muted}; - background: {tab_bg}; - border: 1px solid {splitter}; - border-bottom: 0; - padding: 6px 12px; - margin-right: 2px; - }} - - QTabBar::tab:selected {{ - color: {text}; - background: {tab_active}; - }} - - QTabBar::tab:hover {{ - color: {text}; - background: {hover}; - }} - - QWidget#navigationPanel, - QWidget#tocPanel {{ - background-color: {panel_bg}; - {pattern_style} - border: 0; - }} - - QWidget#videoPlayer {{ - color: {text}; - background-color: {panel_bg}; - {pattern_style} - }} - - QVideoWidget#videoSurface {{ - background: #05070a; - border: 1px solid {splitter}; - }} - - QLabel#videoTitle {{ - color: {text}; - font-weight: 650; - background: transparent; - }} - - QLabel#videoStatus {{ - color: {muted}; - background: transparent; - }} - - QPushButton#videoControlButton, - QPushButton#videoExternalButton {{ - min-height: 26px; - padding: 3px 10px; - color: {text}; - background: {surface}; - border: 1px solid {border}; - border-radius: 5px; - }} - - QPushButton#videoControlButton:hover, - QPushButton#videoExternalButton:hover {{ - background: {hover}; - color: {selected_text}; - }} - - QSlider#videoPositionSlider::groove:horizontal {{ - height: 5px; - border-radius: 2px; - background: {border}; - }} - - QSlider#videoPositionSlider::handle:horizontal {{ - width: 14px; - height: 14px; - margin: -5px 0; - border-radius: 7px; - background: {focus}; - }} - - QSlider#videoPositionSlider::sub-page:horizontal {{ - border-radius: 2px; - background: {focus}; - }} - - QComboBox#videoSpeedBox {{ - min-height: 26px; - padding: 2px 8px; - color: {text}; - background: {surface}; - border: 1px solid {border}; - border-radius: 5px; - }} - - QWidget#panelTitleBlock {{ - background: transparent; - }} - - QLabel#panelTitle {{ - color: {text}; - font-size: 15px; - font-weight: 700; - }} - - QLabel#panelCaption, - QLabel#panelSubTitle {{ - color: {muted}; - font-size: 12px; - }} - - QLineEdit#panelSearchBox {{ - min-height: {search_box_height}px; - max-height: {search_box_height}px; - padding: 0 8px; - color: {text}; - background: {input_bg}; - border: 1px solid {border}; - border-radius: 6px; - selection-background-color: {focus}; - }} - - QLineEdit#panelSearchBox:focus {{ - border-color: {focus}; - }} - - QPushButton#panelSearchButton {{ - min-width: 0; - min-height: 24px; - padding: 2px; - color: {text}; - background: {surface}; - border: 1px solid {border}; - border-radius: 5px; - }} - - QPushButton#panelSearchButton:hover {{ - background: {hover}; - color: {selected_text}; - }} - - QPushButton#panelSearchButton:pressed {{ - background: {selected}; - color: {selected_text}; - }} - - QPushButton#panelIconButton {{ - min-width: 28px; - max-width: 28px; - min-height: 24px; - padding: 2px; - color: {text}; - background: {surface}; - border: 1px solid {border}; - border-radius: 5px; - }} - - QPushButton#panelIconButton:hover {{ - background: {hover}; - }} - - QPushButton#panelIconButton:pressed {{ - background: {selected}; - }} - - QTreeWidget#navigationTree, - QTreeWidget#tocTree {{ - color: {text}; - background: {surface}; - border: 1px solid {border}; - border-radius: 7px; - padding: 3px; - outline: 0; - show-decoration-selected: 1; - }} - - QTreeWidget#navigationTree::item, - QTreeWidget#tocTree::item {{ - min-height: 20px; - padding: 1px 6px; - border-radius: 5px; - }} - - QTreeWidget#navigationTree::item:hover, - QTreeWidget#tocTree::item:hover {{ - background: {hover}; - color: {selected_text}; - }} - - QTreeWidget#navigationTree::item:selected, - QTreeWidget#tocTree::item:selected {{ - background: {selected}; - color: {selected_text}; - }} - - QTreeWidget#navigationTree::branch, - QTreeWidget#tocTree::branch {{ - background: transparent; - }} - - QTreeWidget#navigationTree::branch:closed:has-children, - QTreeWidget#tocTree::branch:closed:has-children {{ - image: url("{branch_closed_icon}"); - }} - - QTreeWidget#navigationTree::branch:open:has-children, - QTreeWidget#tocTree::branch:open:has-children {{ - image: url("{branch_open_icon}"); - }} - - QSplitter#mainSplitter::handle {{ - background: {splitter}; - }} - - QSplitter#mainSplitter::handle:horizontal {{ - width: 1px; - }} - """ - ) + stylesheet, chrome_bg, text = navigation_theme(self.theme_color, self.theme, self.theme_background, self.resources_dir, self.fontMetrics().height()) + self.setStyleSheet(stylesheet) self._apply_window_title_bar_style(chrome_bg, text) self._apply_window_icon_style(chrome_bg, text) if hasattr(self, "find_current_button"): @@ -2030,27 +1328,7 @@ class MainWindow(ExportWorkflow, QMainWindow): self._refresh_welcome_tab() def _apply_window_title_bar_style(self, background: str, foreground: str) -> None: - if os.name != "nt": - return - - def colorref(value: str) -> int: - value = value.lstrip("#") - red = int(value[0:2], 16) - green = int(value[2:4], 16) - blue = int(value[4:6], 16) - return red | (green << 8) | (blue << 16) - - try: - hwnd = int(self.winId()) - dwmapi = ctypes.windll.dwmapi - dark_mode = ctypes.c_int(1 if self.theme == "dark" else 0) - for attribute in (20, 19): - dwmapi.DwmSetWindowAttribute(hwnd, attribute, ctypes.byref(dark_mode), ctypes.sizeof(dark_mode)) - for attribute, value in ((35, background), (36, foreground), (34, background)): - color = ctypes.c_int(colorref(value)) - dwmapi.DwmSetWindowAttribute(hwnd, attribute, ctypes.byref(color), ctypes.sizeof(color)) - except (AttributeError, OSError, ValueError): - return + apply_title_bar_style(self, background, foreground, self.theme == "dark") def _apply_window_icon_style(self, background: str, foreground: str) -> None: if not self.base_window_icon_path.exists(): diff --git a/mdhelper/reader_widgets.py b/mdhelper/reader_widgets.py new file mode 100644 index 0000000..183cd32 --- /dev/null +++ b/mdhelper/reader_widgets.py @@ -0,0 +1,145 @@ +"""Standalone widgets; construction and visibility are controlled by the window.""" +from __future__ import annotations +from PySide6.QtCore import QObject, QUrl, Signal, Slot +from PySide6.QtWebEngineCore import QWebEnginePage +from PySide6.QtWebEngineWidgets import QWebEngineView +from PySide6.QtWidgets import QMenu, QStackedLayout, QStyledItemDelegate, QTextBrowser, QWidget + +WHEEL_SCROLL_SPEED_MIN = 0.5 +WHEEL_SCROLL_SPEED_MAX = 3.0 + + +class ReaderPage(QWebEnginePage): + anchor_requested = Signal(str) + local_link_requested = Signal(QUrl, bool) + external_url_requested = Signal(QUrl) + + def acceptNavigationRequest( + self, + url: QUrl, + navigation_type: QWebEnginePage.NavigationType, + is_main_frame: bool, + ) -> bool: + if navigation_type != QWebEnginePage.NavigationType.NavigationTypeLinkClicked: + return super().acceptNavigationRequest(url, navigation_type, is_main_frame) + + if url.scheme() in {"http", "https"}: + self.external_url_requested.emit(url) + return False + + if url.fragment() and not url.scheme(): + self.anchor_requested.emit(url.fragment()) + return False + + if url.scheme() and url.scheme() not in {"file", "qrc"}: + self.external_url_requested.emit(url) + return False + + if url.isLocalFile(): + self.local_link_requested.emit(url, True) + return False + + return super().acceptNavigationRequest(url, navigation_type, is_main_frame) + + +class ReaderBridge(QObject): + image_save_requested = Signal(str) + image_reveal_requested = Signal(str) + + @Slot(str) + def saveImage(self, url: str) -> None: + self.image_save_requested.emit(url) + + @Slot(str) + def revealImage(self, url: str) -> None: + self.image_reveal_requested.emit(url) + + +class ReaderView(QWebEngineView): + open_link_requested = Signal(QUrl, bool) + + def set_wheel_scroll_speed(self, speed: float) -> None: + try: + normalized = max(WHEEL_SCROLL_SPEED_MIN, min(WHEEL_SCROLL_SPEED_MAX, float(speed))) + except (TypeError, ValueError): + normalized = 1.0 + self.setProperty("wheel_scroll_speed", normalized) + self.page().runJavaScript( + f"document.documentElement.dataset.wheelScrollSpeed = '{normalized:.1f}';" + "window.mdhelperSyncCustomWheelHandler?.();" + ) + + def contextMenuEvent(self, event: object) -> None: + request = self.lastContextMenuRequest() + link_url = request.linkUrl() + if link_url.isValid() and not link_url.isEmpty(): + if self._show_link_context_menu(link_url, event.globalPos()): + request.setAccepted(True) + return + super().contextMenuEvent(event) + + def _show_link_context_menu(self, link_url: QUrl, global_pos: object) -> bool: + menu = self._create_link_context_menu() + chosen = menu.exec(global_pos) + if chosen is None: + return False + return self._handle_link_context_action(link_url, bool(chosen.data())) + + def _create_link_context_menu(self) -> QMenu: + menu = QMenu(self) + open_current = menu.addAction("在本标签页打开") + open_current.setData(False) + open_new = menu.addAction("新建标签页打开") + open_new.setData(True) + return menu + + def _handle_link_context_action(self, link_url: QUrl, new_tab: bool) -> bool: + if not link_url.isValid() or link_url.isEmpty(): + return False + self.open_link_requested.emit(link_url, new_tab) + return True + + +class ReaderTabHost(QWidget): + def __init__(self, parent: QWidget | None = None) -> None: + super().__init__(parent) + self.reader_view: ReaderView | None = None + self.welcome_view = QTextBrowser(self) + self.welcome_view.setOpenExternalLinks(False) + + self.stack = QStackedLayout(self) + self.stack.setContentsMargins(0, 0, 0, 0) + self.stack.addWidget(self.welcome_view) + self.show_welcome() + + def set_reader_view(self, web_view: ReaderView) -> None: + if self.reader_view is web_view: + return + if self.reader_view is not None: + self.stack.removeWidget(self.reader_view) + self.reader_view = web_view + self.stack.addWidget(web_view) + + def begin_reader_load(self) -> None: + self.setProperty("is_welcome", False) + self.setProperty("reader_pending_show", True) + + def show_reader(self) -> None: + if self.reader_view is None: + return + self.setProperty("is_welcome", False) + self.setProperty("reader_pending_show", False) + self.stack.setCurrentWidget(self.reader_view) + + def show_welcome(self) -> None: + self.setProperty("is_welcome", True) + self.setProperty("reader_pending_show", False) + self.stack.setCurrentWidget(self.welcome_view) + + +class CompactTreeDelegate(QStyledItemDelegate): + def sizeHint(self, option: object, index: object) -> object: + size = super().sizeHint(option, index) + line_height = option.fontMetrics.height() + size.setHeight(max(18, round(line_height * 1.16) + 2)) + return size diff --git a/mdhelper/resources/ui_navigation.qss b/mdhelper/resources/ui_navigation.qss new file mode 100644 index 0000000..c3c7364 --- /dev/null +++ b/mdhelper/resources/ui_navigation.qss @@ -0,0 +1,285 @@ + + QMainWindow { + background-color: ${panel_bg}; + ${pattern_style} + } + + QMenuBar, + QStatusBar { + color: ${text}; + background-color: ${chrome_bg}; + ${chrome_pattern_style} + border: 0; + } + + QStatusBar { + border-top: 1px solid ${splitter}; + } + + QLabel#statusPathLabel { + color: ${text}; + background: transparent; + } + + QMenuBar::item { + padding: 5px 9px; + background: transparent; + } + + QMenuBar::item:selected { + background: ${hover}; + color: ${selected_text}; + border-radius: 4px; + } + + QMenu { + color: ${text}; + background: ${surface}; + border: 1px solid ${border}; + padding: 4px; + } + + QMenu::item { + padding: 5px 24px 5px 10px; + } + + QMenu::item:selected { + background: ${hover}; + color: ${selected_text}; + } + + QTabWidget { + background: ${tab_bg}; + } + + QTabWidget::tab-bar { + background: ${tab_bg}; + } + + QTabWidget::pane { + border: 0; + border-left: 1px solid ${splitter}; + border-right: 1px solid ${splitter}; + background: ${tab_active}; + } + + QTabBar { + background: ${tab_bg}; + qproperty-drawBase: 0; + } + + QTabBar::tab { + color: ${muted}; + background: ${tab_bg}; + border: 1px solid ${splitter}; + border-bottom: 0; + padding: 6px 12px; + margin-right: 2px; + } + + QTabBar::tab:selected { + color: ${text}; + background: ${tab_active}; + } + + QTabBar::tab:hover { + color: ${text}; + background: ${hover}; + } + + QWidget#navigationPanel, + QWidget#tocPanel { + background-color: ${panel_bg}; + ${pattern_style} + border: 0; + } + + QWidget#videoPlayer { + color: ${text}; + background-color: ${panel_bg}; + ${pattern_style} + } + + QVideoWidget#videoSurface { + background: #05070a; + border: 1px solid ${splitter}; + } + + QLabel#videoTitle { + color: ${text}; + font-weight: 650; + background: transparent; + } + + QLabel#videoStatus { + color: ${muted}; + background: transparent; + } + + QPushButton#videoControlButton, + QPushButton#videoExternalButton { + min-height: 26px; + padding: 3px 10px; + color: ${text}; + background: ${surface}; + border: 1px solid ${border}; + border-radius: 5px; + } + + QPushButton#videoControlButton:hover, + QPushButton#videoExternalButton:hover { + background: ${hover}; + color: ${selected_text}; + } + + QSlider#videoPositionSlider::groove:horizontal { + height: 5px; + border-radius: 2px; + background: ${border}; + } + + QSlider#videoPositionSlider::handle:horizontal { + width: 14px; + height: 14px; + margin: -5px 0; + border-radius: 7px; + background: ${focus}; + } + + QSlider#videoPositionSlider::sub-page:horizontal { + border-radius: 2px; + background: ${focus}; + } + + QComboBox#videoSpeedBox { + min-height: 26px; + padding: 2px 8px; + color: ${text}; + background: ${surface}; + border: 1px solid ${border}; + border-radius: 5px; + } + + QWidget#panelTitleBlock { + background: transparent; + } + + QLabel#panelTitle { + color: ${text}; + font-size: 15px; + font-weight: 700; + } + + QLabel#panelCaption, + QLabel#panelSubTitle { + color: ${muted}; + font-size: 12px; + } + + QLineEdit#panelSearchBox { + min-height: ${search_box_height}px; + max-height: ${search_box_height}px; + padding: 0 8px; + color: ${text}; + background: ${input_bg}; + border: 1px solid ${border}; + border-radius: 6px; + selection-background-color: ${focus}; + } + + QLineEdit#panelSearchBox:focus { + border-color: ${focus}; + } + + QPushButton#panelSearchButton { + min-width: 0; + min-height: 24px; + padding: 2px; + color: ${text}; + background: ${surface}; + border: 1px solid ${border}; + border-radius: 5px; + } + + QPushButton#panelSearchButton:hover { + background: ${hover}; + color: ${selected_text}; + } + + QPushButton#panelSearchButton:pressed { + background: ${selected}; + color: ${selected_text}; + } + + QPushButton#panelIconButton { + min-width: 28px; + max-width: 28px; + min-height: 24px; + padding: 2px; + color: ${text}; + background: ${surface}; + border: 1px solid ${border}; + border-radius: 5px; + } + + QPushButton#panelIconButton:hover { + background: ${hover}; + } + + QPushButton#panelIconButton:pressed { + background: ${selected}; + } + + QTreeWidget#navigationTree, + QTreeWidget#tocTree { + color: ${text}; + background: ${surface}; + border: 1px solid ${border}; + border-radius: 7px; + padding: 3px; + outline: 0; + show-decoration-selected: 1; + } + + QTreeWidget#navigationTree::item, + QTreeWidget#tocTree::item { + min-height: 20px; + padding: 1px 6px; + border-radius: 5px; + } + + QTreeWidget#navigationTree::item:hover, + QTreeWidget#tocTree::item:hover { + background: ${hover}; + color: ${selected_text}; + } + + QTreeWidget#navigationTree::item:selected, + QTreeWidget#tocTree::item:selected { + background: ${selected}; + color: ${selected_text}; + } + + QTreeWidget#navigationTree::branch, + QTreeWidget#tocTree::branch { + background: transparent; + } + + QTreeWidget#navigationTree::branch:closed:has-children, + QTreeWidget#tocTree::branch:closed:has-children { + image: url("${branch_closed_icon}"); + } + + QTreeWidget#navigationTree::branch:open:has-children, + QTreeWidget#tocTree::branch:open:has-children { + image: url("${branch_open_icon}"); + } + + QSplitter#mainSplitter::handle { + background: ${splitter}; + } + + QSplitter#mainSplitter::handle:horizontal { + width: 1px; + } + \ No newline at end of file diff --git a/mdhelper/resources/ui_style_dialog.qss b/mdhelper/resources/ui_style_dialog.qss new file mode 100644 index 0000000..c51e254 --- /dev/null +++ b/mdhelper/resources/ui_style_dialog.qss @@ -0,0 +1,179 @@ + + QDialog { + background: ${chrome}; + color: ${text}; + } + + QLabel { + color: ${text}; + } + + QLineEdit, + QTextEdit, + QComboBox, + QFontComboBox, + QSpinBox, + QDoubleSpinBox { + background: ${surface}; + color: ${text}; + border: 1px solid ${border}; + border-radius: 4px; + padding: 4px 6px; + selection-background-color: ${selected}; + } + + QLineEdit#styleNameEdit { + min-height: 24px; + font-weight: 600; + } + + QLineEdit:focus, + QTextEdit:focus, + QComboBox:focus, + QFontComboBox:focus, + QSpinBox:focus, + QDoubleSpinBox:focus { + border-color: ${focus}; + } + + QSpinBox, + QDoubleSpinBox { + padding-right: 18px; + } + + QSpinBox::up-button, + QDoubleSpinBox::up-button, + QSpinBox::down-button, + QDoubleSpinBox::down-button { + width: 15px; + background: transparent; + border-left: 1px solid ${border}; + } + + QSpinBox::up-button, + QDoubleSpinBox::up-button { + subcontrol-origin: border; + subcontrol-position: top right; + border-bottom: 1px solid ${border}; + border-top-right-radius: 3px; + } + + QSpinBox::down-button, + QDoubleSpinBox::down-button { + subcontrol-origin: border; + subcontrol-position: bottom right; + border-bottom-right-radius: 3px; + } + + QSpinBox::up-button:hover, + QDoubleSpinBox::up-button:hover, + QSpinBox::down-button:hover, + QDoubleSpinBox::down-button:hover { + background: ${hover}; + } + + QSpinBox::up-arrow, + QDoubleSpinBox::up-arrow, + QSpinBox::down-arrow, + QDoubleSpinBox::down-arrow { + width: 7px; + height: 7px; + } + + QCheckBox { + color: ${text}; + } + + QListWidget#styleTargetList { + background: ${surface}; + color: ${text}; + border: 1px solid ${border}; + border-radius: 6px; + padding: 4px; + outline: 0; + } + + QListWidget#styleTargetList::item { + min-height: 28px; + padding: 4px 8px; + border-radius: 4px; + } + + QListWidget#styleTargetList::item:hover { + background: ${hover}; + } + + QListWidget#styleTargetList::item:selected { + background: ${selected}; + color: ${text}; + } + + QGroupBox#styleSection { + background: ${surface}; + color: ${text}; + border: 1px solid ${border}; + border-radius: 6px; + margin-top: 10px; + font-weight: 600; + } + + QGroupBox#styleSection::title { + subcontrol-origin: margin; + left: 10px; + padding: 0 5px; + background: ${chrome}; + } + + QFrame#stylePreview { + background: ${surface}; + border: 1px solid ${border}; + border-radius: 6px; + } + + QLabel#stylePreviewTitle { + color: ${muted}; + font-weight: 600; + } + + QLabel#stylePreviewText { + color: ${text}; + line-height: 1.5; + } + + QPushButton { + background: ${surface}; + color: ${text}; + border: 1px solid ${border}; + border-radius: 4px; + padding: 6px 12px; + } + + QPushButton:hover { + background: ${hover}; + } + + QPushButton#styleResetButton { + color: ${muted}; + } + + QTabWidget::pane { + border: 1px solid ${border}; + background: ${surface}; + border-radius: 6px; + top: -1px; + } + + QTabBar::tab { + background: ${chrome}; + color: ${muted}; + border: 1px solid ${border}; + border-bottom: 0; + padding: 7px 14px; + } + + QTabBar::tab:selected { + background: ${surface}; + color: ${text}; + border-color: ${border}; + } + \ No newline at end of file diff --git a/mdhelper/style_dialog.py b/mdhelper/style_dialog.py index c4fbc38..8789dc0 100644 --- a/mdhelper/style_dialog.py +++ b/mdhelper/style_dialog.py @@ -1,7 +1,6 @@ from __future__ import annotations +from .ui_theme import style_dialog_theme, apply_title_bar_style -import ctypes -import os import re from copy import deepcopy from typing import Any @@ -100,262 +99,12 @@ class DocumentStyleEditorDialog(QDialog): self._sync_from_css() def apply_theme(self, theme_color: str) -> None: - palettes = { - "white": { - "chrome": "#f7f8fb", - "surface": "#ffffff", - "text": "#111827", - "muted": "#6b7280", - "border": "#dde2eb", - "hover": "#eef4ff", - "selected": "#dbeafe", - "focus": "#3b82f6", - }, - "black": { - "chrome": "#0c0d10", - "surface": "#17191f", - "text": "#f3f4f6", - "muted": "#a7adb7", - "border": "#2a2e38", - "hover": "#252b36", - "selected": "#243b5a", - "focus": "#60a5fa", - }, - "dark_gray": { - "chrome": "#282c33", - "surface": "#343943", - "text": "#f1f5f9", - "muted": "#c1c7d0", - "border": "#48505d", - "hover": "#3f4a59", - "selected": "#365b82", - "focus": "#7dd3fc", - }, - "colorful": { - "chrome": "#eef5ff", - "surface": "#ffffff", - "text": "#132238", - "muted": "#667085", - "border": "#cbd9ef", - "hover": "#e7f0ff", - "selected": "#cfe2ff", - "focus": "#2563eb", - }, - } - palette = palettes.get(theme_color, palettes["white"]) - chrome = palette["chrome"] - surface = palette["surface"] - text = palette["text"] - muted = palette["muted"] - border = palette["border"] - hover = palette["hover"] - selected = palette["selected"] - focus = palette["focus"] - self.setStyleSheet( - f""" - QDialog {{ - background: {chrome}; - color: {text}; - }} - - QLabel {{ - color: {text}; - }} - - QLineEdit, - QTextEdit, - QComboBox, - QFontComboBox, - QSpinBox, - QDoubleSpinBox {{ - background: {surface}; - color: {text}; - border: 1px solid {border}; - border-radius: 4px; - padding: 4px 6px; - selection-background-color: {selected}; - }} - - QLineEdit#styleNameEdit {{ - min-height: 24px; - font-weight: 600; - }} - - QLineEdit:focus, - QTextEdit:focus, - QComboBox:focus, - QFontComboBox:focus, - QSpinBox:focus, - QDoubleSpinBox:focus {{ - border-color: {focus}; - }} - - QSpinBox, - QDoubleSpinBox {{ - padding-right: 18px; - }} - - QSpinBox::up-button, - QDoubleSpinBox::up-button, - QSpinBox::down-button, - QDoubleSpinBox::down-button {{ - width: 15px; - background: transparent; - border-left: 1px solid {border}; - }} - - QSpinBox::up-button, - QDoubleSpinBox::up-button {{ - subcontrol-origin: border; - subcontrol-position: top right; - border-bottom: 1px solid {border}; - border-top-right-radius: 3px; - }} - - QSpinBox::down-button, - QDoubleSpinBox::down-button {{ - subcontrol-origin: border; - subcontrol-position: bottom right; - border-bottom-right-radius: 3px; - }} - - QSpinBox::up-button:hover, - QDoubleSpinBox::up-button:hover, - QSpinBox::down-button:hover, - QDoubleSpinBox::down-button:hover {{ - background: {hover}; - }} - - QSpinBox::up-arrow, - QDoubleSpinBox::up-arrow, - QSpinBox::down-arrow, - QDoubleSpinBox::down-arrow {{ - width: 7px; - height: 7px; - }} - - QCheckBox {{ - color: {text}; - }} - - QListWidget#styleTargetList {{ - background: {surface}; - color: {text}; - border: 1px solid {border}; - border-radius: 6px; - padding: 4px; - outline: 0; - }} - - QListWidget#styleTargetList::item {{ - min-height: 28px; - padding: 4px 8px; - border-radius: 4px; - }} - - QListWidget#styleTargetList::item:hover {{ - background: {hover}; - }} - - QListWidget#styleTargetList::item:selected {{ - background: {selected}; - color: {text}; - }} - - QGroupBox#styleSection {{ - background: {surface}; - color: {text}; - border: 1px solid {border}; - border-radius: 6px; - margin-top: 10px; - font-weight: 600; - }} - - QGroupBox#styleSection::title {{ - subcontrol-origin: margin; - left: 10px; - padding: 0 5px; - background: {chrome}; - }} - - QFrame#stylePreview {{ - background: {surface}; - border: 1px solid {border}; - border-radius: 6px; - }} - - QLabel#stylePreviewTitle {{ - color: {muted}; - font-weight: 600; - }} - - QLabel#stylePreviewText {{ - color: {text}; - line-height: 1.5; - }} - - QPushButton {{ - background: {surface}; - color: {text}; - border: 1px solid {border}; - border-radius: 4px; - padding: 6px 12px; - }} - - QPushButton:hover {{ - background: {hover}; - }} - - QPushButton#styleResetButton {{ - color: {muted}; - }} - - QTabWidget::pane {{ - border: 1px solid {border}; - background: {surface}; - border-radius: 6px; - top: -1px; - }} - - QTabBar::tab {{ - background: {chrome}; - color: {muted}; - border: 1px solid {border}; - border-bottom: 0; - padding: 7px 14px; - }} - - QTabBar::tab:selected {{ - background: {surface}; - color: {text}; - border-color: {border}; - }} - """ - ) + stylesheet, chrome, text = style_dialog_theme(theme_color) + self.setStyleSheet(stylesheet) self._apply_window_title_bar_style(chrome, text, theme_color in {"black", "dark_gray"}) def _apply_window_title_bar_style(self, background: str, foreground: str, dark: bool) -> None: - if os.name != "nt": - return - - def colorref(value: str) -> int: - value = value.lstrip("#") - red = int(value[0:2], 16) - green = int(value[2:4], 16) - blue = int(value[4:6], 16) - return red | (green << 8) | (blue << 16) - - try: - hwnd = int(self.winId()) - dwmapi = ctypes.windll.dwmapi - dark_mode = ctypes.c_int(1 if dark else 0) - for attribute in (20, 19): - dwmapi.DwmSetWindowAttribute(hwnd, attribute, ctypes.byref(dark_mode), ctypes.sizeof(dark_mode)) - for attribute, value in ((35, background), (36, foreground), (34, background)): - color = ctypes.c_int(colorref(value)) - dwmapi.DwmSetWindowAttribute(hwnd, attribute, ctypes.byref(color), ctypes.sizeof(color)) - except (AttributeError, OSError, ValueError): - return + apply_title_bar_style(self, background, foreground, dark) def style_payload(self) -> dict[str, object]: if not self._sync_from_css(): diff --git a/mdhelper/ui_theme.py b/mdhelper/ui_theme.py new file mode 100644 index 0000000..06639f0 --- /dev/null +++ b/mdhelper/ui_theme.py @@ -0,0 +1,153 @@ +"""Pure theme builders and shared Windows title-bar styling.""" +from __future__ import annotations +import ctypes +import os +from pathlib import Path +from functools import lru_cache +from string import Template + +PALETTES = {'white': {'chrome': '#f7f8fb', + 'surface': '#ffffff', + 'text': '#111827', + 'muted': '#6b7280', + 'border': '#dde2eb', + 'hover': '#eef4ff', + 'selected': '#dbeafe', + 'selected_text': '#0f172a', + 'splitter': '#e5e7eb', + 'focus': '#3b82f6', + 'tab_bg': '#edf1f7'}, + 'black': {'chrome': '#0c0d10', + 'surface': '#17191f', + 'text': '#f3f4f6', + 'muted': '#a7adb7', + 'border': '#2a2e38', + 'hover': '#252b36', + 'selected': '#243b5a', + 'selected_text': '#f8fafc', + 'splitter': '#252a33', + 'focus': '#60a5fa', + 'tab_bg': '#111318'}, + 'dark_gray': {'chrome': '#282c33', + 'surface': '#343943', + 'text': '#f1f5f9', + 'muted': '#c1c7d0', + 'border': '#48505d', + 'hover': '#3f4a59', + 'selected': '#365b82', + 'selected_text': '#ffffff', + 'splitter': '#48505d', + 'focus': '#7dd3fc', + 'tab_bg': '#303640'}, + 'colorful': {'chrome': '#eef5ff', + 'surface': '#ffffff', + 'text': '#132238', + 'muted': '#667085', + 'border': '#cbd9ef', + 'hover': '#e7f0ff', + 'selected': '#cfe2ff', + 'selected_text': '#10213d', + 'splitter': '#cbd9ef', + 'focus': '#2563eb', + 'tab_bg': '#dceaff'}} + +def stylesheet_url(path: Path) -> str: + return path.resolve().as_posix() + + +def navigation_theme(theme_color: str, theme: str, theme_background: str, resources_dir: Path, font_height: int) -> tuple[str, str, str]: + palette = PALETTES.get(theme_color, PALETTES["white"]) + background_accents = { + "none": ("", palette["chrome"], ""), + "chinese_knot": ("#d92f2f", "#fff1ef", "theme_chinese_knot.svg"), + "cloud": ("#8bd5ff", "#effaff", "theme_cloud.svg"), + "ruyi": ("#bfe9ca", "#f1fbf3", "theme_ruyi.svg"), + "brush": ("#d6d7dc", "#f5f6f8", "theme_brush.svg"), + "peony": ("#ffd0df", "#fff3f7", "theme_peony.svg"), + "bamboo": ("#a9d878", "#f1faeb", "theme_bamboo.svg"), + "meander": ("#ffd94d", "#fff8d8", "theme_meander.svg"), + } + dark_background_accents = { + "none": ("", palette["chrome"], ""), + "chinese_knot": ("#6e171a", "#26191c", "theme_chinese_knot.svg"), + "cloud": ("#16384d", "#122330", "theme_cloud.svg"), + "ruyi": ("#1c4229", "#17251b", "theme_ruyi.svg"), + "brush": ("#3a3d45", "#1e2026", "theme_brush.svg"), + "peony": ("#552333", "#2a1a22", "theme_peony.svg"), + "bamboo": ("#254018", "#1a2616", "theme_bamboo.svg"), + "meander": ("#574913", "#282416", "theme_meander.svg"), + } + accent_source = dark_background_accents if theme == "dark" else background_accents + header_background, themed_panel, pattern_file = accent_source.get(theme_background, accent_source["none"]) + panel_bg = themed_panel if theme_background != "none" else palette["chrome"] + chrome_bg = header_background or panel_bg + text = palette["text"] + muted = palette["muted"] + surface = palette["surface"] + border = palette["border"] + hover = palette["hover"] + selected = palette["selected"] + selected_text = palette["selected_text"] + splitter = palette["splitter"] + input_bg = palette["surface"] + focus = palette["focus"] + tab_bg = palette["tab_bg"] + tab_active = palette["surface"] + branch_closed_icon = stylesheet_url(resources_dir / "tree_closed.svg") + branch_open_icon = stylesheet_url(resources_dir / "tree_open.svg") + search_box_height = max(22, round(font_height * 1.5)) + pattern_style = "" + chrome_pattern_style = "" + if pattern_file: + pattern_url = stylesheet_url(resources_dir / pattern_file) + pattern_style = f'background-image: url("{pattern_url}"); background-repeat: repeat;' + chrome_pattern_style = f'background-image: url("{pattern_url}"); background-repeat: repeat;' + + stylesheet = theme_stylesheet("ui_navigation.qss", locals()) + return stylesheet, chrome_bg, text + + +def style_dialog_theme(theme_color: str) -> tuple[str, str, str]: + palette = PALETTES.get(theme_color, PALETTES["white"]) + chrome = palette["chrome"] + surface = palette["surface"] + text = palette["text"] + muted = palette["muted"] + border = palette["border"] + hover = palette["hover"] + selected = palette["selected"] + focus = palette["focus"] + stylesheet = theme_stylesheet("ui_style_dialog.qss", locals()) + return stylesheet, chrome, text + + +def apply_title_bar_style(widget, background: str, foreground: str, dark: bool) -> None: + if os.name != "nt": + return + + def colorref(value: str) -> int: + value = value.lstrip("#") + red = int(value[0:2], 16) + green = int(value[2:4], 16) + blue = int(value[4:6], 16) + return red | (green << 8) | (blue << 16) + + try: + hwnd = int(widget.winId()) + dwmapi = ctypes.windll.dwmapi + dark_mode = ctypes.c_int(1 if dark else 0) + for attribute in (20, 19): + dwmapi.DwmSetWindowAttribute(hwnd, attribute, ctypes.byref(dark_mode), ctypes.sizeof(dark_mode)) + for attribute, value in ((35, background), (36, foreground), (34, background)): + color = ctypes.c_int(colorref(value)) + dwmapi.DwmSetWindowAttribute(hwnd, attribute, ctypes.byref(color), ctypes.sizeof(color)) + except (AttributeError, OSError, ValueError): + return + + +@lru_cache(maxsize=4) +def _template(name: str) -> Template: + return Template((Path(__file__).parent / "resources" / name).read_text(encoding="utf-8")) + +def theme_stylesheet(name: str, values: dict) -> str: + return _template(name).substitute(values) diff --git a/mdhelper/video_player.py b/mdhelper/video_player.py new file mode 100644 index 0000000..f80e474 --- /dev/null +++ b/mdhelper/video_player.py @@ -0,0 +1,159 @@ +"""Standalone widgets; construction and visibility are controlled by the window.""" +from __future__ import annotations +from pathlib import Path +from PySide6.QtCore import QUrl, Qt, Signal +from PySide6.QtMultimedia import QAudioOutput, QMediaPlayer +from PySide6.QtMultimediaWidgets import QVideoWidget +from PySide6.QtWidgets import QComboBox, QLabel, QPushButton, QSlider, QStyle, QHBoxLayout, QVBoxLayout, QWidget + + +class VideoPlayerWidget(QWidget): + external_open_requested = Signal(str) + + def __init__(self, path: Path, parent: QWidget | None = None) -> None: + super().__init__(parent) + self.setObjectName("videoPlayer") + self.path = path.resolve() + self._seeking = False + + self.video_widget = QVideoWidget(self) + self.video_widget.setObjectName("videoSurface") + + self.player = QMediaPlayer(self) + self.audio_output = QAudioOutput(self) + self.audio_output.setVolume(0.8) + self.player.setAudioOutput(self.audio_output) + self.player.setVideoOutput(self.video_widget) + self.player.playbackStateChanged.connect(self._sync_play_button) + self.player.errorOccurred.connect(self._on_error) + self.player.positionChanged.connect(self._on_position_changed) + self.player.durationChanged.connect(self._on_duration_changed) + + self.title_label = QLabel(self.path.name) + self.title_label.setObjectName("videoTitle") + self.title_label.setToolTip(str(self.path)) + + self.status_label = QLabel("准备播放") + self.status_label.setObjectName("videoStatus") + + self.play_button = QPushButton() + self.play_button.setObjectName("videoControlButton") + self.play_button.setToolTip("播放/暂停") + self.play_button.clicked.connect(self.toggle_playback) + + self.position_label = QLabel("00:00 / 00:00") + self.position_label.setObjectName("videoStatus") + self.position_label.setMinimumWidth(104) + + self.position_slider = QSlider(Qt.Orientation.Horizontal) + self.position_slider.setObjectName("videoPositionSlider") + self.position_slider.setRange(0, 0) + self.position_slider.sliderPressed.connect(self._begin_seek) + self.position_slider.sliderMoved.connect(self._preview_seek_position) + self.position_slider.sliderReleased.connect(self._finish_seek) + + self.speed_box = QComboBox() + self.speed_box.setObjectName("videoSpeedBox") + self.speed_box.setToolTip("播放速度") + for label, value in (("x0.5", 0.5), ("x1", 1.0), ("x2", 2.0), ("x3", 3.0)): + self.speed_box.addItem(label, value) + self.speed_box.setCurrentIndex(1) + self.speed_box.currentIndexChanged.connect(self._change_playback_rate) + + self.external_button = QPushButton("用外部程序打开") + self.external_button.setObjectName("videoExternalButton") + self.external_button.clicked.connect(lambda: self.external_open_requested.emit(str(self.path))) + + controls = QHBoxLayout() + controls.setContentsMargins(0, 0, 0, 0) + controls.setSpacing(8) + controls.addWidget(self.play_button) + controls.addWidget(self.position_label) + controls.addWidget(self.position_slider, 1) + controls.addWidget(self.speed_box) + controls.addWidget(self.status_label) + controls.addWidget(self.external_button) + + layout = QVBoxLayout(self) + layout.setContentsMargins(14, 14, 14, 14) + layout.setSpacing(10) + layout.addWidget(self.title_label) + layout.addWidget(self.video_widget, 1) + layout.addLayout(controls) + + self.load_file(self.path) + + def load_file(self, path: Path) -> None: + self.path = path.resolve() + self.setProperty("current_file", str(self.path)) + self.setProperty("current_fragment", "") + self.title_label.setText(self.path.name) + self.title_label.setToolTip(str(self.path)) + self.status_label.setText("正在加载视频...") + self.position_slider.setValue(0) + self.position_label.setText("00:00 / 00:00") + self.player.setSource(QUrl.fromLocalFile(str(self.path))) + self._change_playback_rate(self.speed_box.currentIndex()) + self.player.play() + self._sync_play_button(self.player.playbackState()) + + def toggle_playback(self) -> None: + if self.player.playbackState() == QMediaPlayer.PlaybackState.PlayingState: + self.player.pause() + else: + self.player.play() + + def stop(self) -> None: + self.player.stop() + + def _sync_play_button(self, state: QMediaPlayer.PlaybackState) -> None: + if state == QMediaPlayer.PlaybackState.PlayingState: + self.play_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaPause)) + self.status_label.setText("正在播放") + else: + self.play_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaPlay)) + if state == QMediaPlayer.PlaybackState.PausedState: + self.status_label.setText("已暂停") + + def _on_error(self, error: QMediaPlayer.Error, message: str) -> None: + if error == QMediaPlayer.Error.NoError: + return + detail = message or "当前视频无法由内置播放器播放,可尝试使用外部程序打开。" + self.status_label.setText(detail) + + def _on_duration_changed(self, duration: int) -> None: + self.position_slider.setRange(0, max(0, duration)) + self._update_position_label(self.player.position(), duration) + + def _on_position_changed(self, position: int) -> None: + if not self._seeking: + self.position_slider.setValue(max(0, position)) + self._update_position_label(position, self.player.duration()) + + def _begin_seek(self) -> None: + self._seeking = True + + def _preview_seek_position(self, position: int) -> None: + self._update_position_label(position, self.player.duration()) + + def _finish_seek(self) -> None: + self.player.setPosition(self.position_slider.value()) + self._seeking = False + + def _change_playback_rate(self, index: int) -> None: + rate = self.speed_box.itemData(index) + try: + self.player.setPlaybackRate(float(rate)) + except (TypeError, ValueError): + self.player.setPlaybackRate(1.0) + + def _update_position_label(self, position: int, duration: int) -> None: + self.position_label.setText(f"{self._format_time(position)} / {self._format_time(duration)}") + + def _format_time(self, milliseconds: int) -> str: + seconds = max(0, int(milliseconds // 1000)) + minutes, second = divmod(seconds, 60) + hours, minute = divmod(minutes, 60) + if hours: + return f"{hours:d}:{minute:02d}:{second:02d}" + return f"{minute:02d}:{second:02d}"