Homer
3aca43b372
There was no icon system at all. Transport buttons called QStyle.standardIcon(SP_MediaPlay), which returns the platform theme's dark monochrome glyph -- painted onto the app's saturated red buttons at a fixed 36px with no text, that is the black square. Everything else called an icon was an emoji baked into en.json, which is tofu wherever the emoji font is missing. Qt stylesheets cannot recolour a QIcon, so the colour is an argument to the new helper; that is the whole fix. The SVGs are drawn here rather than vendored, which keeps a third-party licence out of the tree, and they live in the module rather than as asset files, which keeps them out of package-data and safe in a frozen build. Tooltips were the other half: three widgets in the entire application had one and nothing set an accessible name. Filling that in at the call sites would have meant editing well over a hundred of them, most in upstream-owned files. Instead one application-level event filter handles QEvent.Polish, which Qt sends to every widget once before it is shown -- so it also reaches dialogs built by upstream code, and survives the next merge. It maps placeholder emoji to icons, fills empty tooltips from the button text, and logs icon-only buttons that still have none so the gaps are findable. StyleSheet.MAIN styles the window, inputs, buttons and tables and nothing else, so the main tab bar, combos, sliders, lists, menus, splitters, tooltips and the horizontal scrollbar fell through to the platform style. EXTRA_QSS covers them, in a fork-owned module appended at the one application site. SmoothTabWidget names its frame "tabContent" with the comment "We draw border on content instead" -- that rule existed only inside two dialogs, and now exists for the main window too. Two corrections to rules that were already there: the pressed style changed the padding, shifting every label two pixels and clipping fixed-width icon buttons, and checkboxes were fully rounded, which reads as a radio button rather than an on/off toggle. Verified by screenshot on the real display: tab bar, buttons, combo carets and checkboxes all render as intended, and all 35 icons rasterise non-empty. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
93 lines
3.4 KiB
Python
93 lines
3.4 KiB
Python
"""
|
|
Search tab - in-app YouTube search via yt-dlp (ytsearchN:)
|
|
"""
|
|
|
|
from typing import Any, Dict, List, Optional
|
|
|
|
from PySide6.QtWidgets import QHBoxLayout, QLabel, QLineEdit, QPushButton, QVBoxLayout, QWidget
|
|
|
|
from .ytsage_gui_cards import VideoCardGrid
|
|
from ..core.ytsage_client import YtdlpWorker
|
|
from ..utils.ytsage_localization import _
|
|
from ..utils.ytsage_logger import logger
|
|
|
|
PAGE_SIZE = 24
|
|
|
|
|
|
class SearchPage(QWidget):
|
|
def __init__(self, router, parent: Optional[QWidget] = None) -> None:
|
|
super().__init__(parent)
|
|
self._router = router
|
|
self._worker: Optional[YtdlpWorker] = None
|
|
self._query = ""
|
|
self._offset = 0
|
|
|
|
layout = QVBoxLayout(self)
|
|
layout.setContentsMargins(8, 8, 8, 8)
|
|
|
|
bar = QHBoxLayout()
|
|
self.query_input = QLineEdit()
|
|
self.query_input.setPlaceholderText(_("search.placeholder"))
|
|
self.query_input.returnPressed.connect(self.start_search)
|
|
self.query_input.setMinimumHeight(38)
|
|
bar.addWidget(self.query_input, stretch=1)
|
|
|
|
self.search_btn = QPushButton(_("search.button"))
|
|
self.search_btn.setToolTip(_("search.button_tooltip"))
|
|
self.search_btn.clicked.connect(self.start_search)
|
|
self.search_btn.setMinimumHeight(38)
|
|
bar.addWidget(self.search_btn)
|
|
layout.addLayout(bar)
|
|
|
|
self.status_label = QLabel("")
|
|
self.status_label.setStyleSheet("color: #9aa0a6; padding: 2px;")
|
|
layout.addWidget(self.status_label)
|
|
|
|
self.grid = VideoCardGrid(router, self)
|
|
self.grid.loadMoreRequested.connect(self.load_more)
|
|
layout.addWidget(self.grid, stretch=1)
|
|
|
|
# ---------------------------------------------------------------- search
|
|
|
|
def start_search(self) -> None:
|
|
query = self.query_input.text().strip()
|
|
if not query or self._worker is not None:
|
|
return
|
|
self._query = query
|
|
self._offset = 0
|
|
self.grid.clear()
|
|
self._fetch(append=False)
|
|
|
|
def load_more(self) -> None:
|
|
if self._worker is None and self._query:
|
|
self._offset += PAGE_SIZE
|
|
self._fetch(append=True)
|
|
|
|
def _fetch(self, append: bool) -> None:
|
|
self.status_label.setText(_("search.searching"))
|
|
self.search_btn.setEnabled(False)
|
|
query, offset = self._query, self._offset
|
|
self._worker = YtdlpWorker(lambda c: c.search(query, n=PAGE_SIZE, offset=offset), parent=self)
|
|
self._worker.result.connect(lambda entries: self._on_results(entries, append))
|
|
self._worker.error.connect(self._on_error)
|
|
self._worker.finished.connect(self._on_finished)
|
|
self._worker.start()
|
|
|
|
def _on_results(self, entries: List[Dict[str, Any]], append: bool) -> None:
|
|
show_more = len(entries) >= PAGE_SIZE
|
|
if append:
|
|
self.grid.append_entries(entries, show_load_more=show_more)
|
|
else:
|
|
self.grid.set_entries(entries, show_load_more=show_more)
|
|
self.status_label.setText(_("search.results_count", count=self.grid.card_count()))
|
|
|
|
def _on_error(self, message: str) -> None:
|
|
logger.error(f"Search failed: {message}")
|
|
self.status_label.setText(_("search.failed", error=message[:200]))
|
|
|
|
def _on_finished(self) -> None:
|
|
self.search_btn.setEnabled(True)
|
|
if self._worker is not None:
|
|
self._worker.deleteLater()
|
|
self._worker = None
|