Compare commits
6 Commits
05b00a40c0
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 7ff4f6e5c0 | |||
| 7517e16b15 | |||
| 9a0433225e | |||
| fa82d30087 | |||
| 3068e74e5c | |||
| febd617c56 |
@@ -10,6 +10,7 @@ Run: python mcp_manager.py
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import contextlib
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
@@ -18,6 +19,7 @@ from typing import ClassVar
|
|||||||
from PySide6.QtCore import QRect, QSettings, QSize, Qt, QThread, QTimer, QUrl, Signal
|
from PySide6.QtCore import QRect, QSettings, QSize, Qt, QThread, QTimer, QUrl, Signal
|
||||||
from PySide6.QtGui import (
|
from PySide6.QtGui import (
|
||||||
QAction,
|
QAction,
|
||||||
|
QActionGroup,
|
||||||
QColor,
|
QColor,
|
||||||
QCursor,
|
QCursor,
|
||||||
QDesktopServices,
|
QDesktopServices,
|
||||||
@@ -25,6 +27,7 @@ from PySide6.QtGui import (
|
|||||||
QIcon,
|
QIcon,
|
||||||
QKeySequence,
|
QKeySequence,
|
||||||
QPainter,
|
QPainter,
|
||||||
|
QPalette,
|
||||||
QPixmap,
|
QPixmap,
|
||||||
)
|
)
|
||||||
from PySide6.QtWidgets import (
|
from PySide6.QtWidgets import (
|
||||||
@@ -65,85 +68,122 @@ import bcc_core as core
|
|||||||
# thread during drag-and-drop import, so skip anything larger than this.
|
# thread during drag-and-drop import, so skip anything larger than this.
|
||||||
MAX_DROP_IMPORT_BYTES = 5 * 1024 * 1024 # 5 MB
|
MAX_DROP_IMPORT_BYTES = 5 * 1024 * 1024 # 5 MB
|
||||||
|
|
||||||
# --- One-line rebrand: change this to recolor the whole app --------------- #
|
# --- Theming (issue #75) -------------------------------------------------- #
|
||||||
ACCENT = "#f97316" # warm orange
|
# The palette lives in bcc_core (testable without a Qt app); these module-level
|
||||||
ACCENT_DIM = "#c2570b"
|
# names are rebound by `apply_palette()` whenever the theme changes.
|
||||||
BG = "#1b1d23"
|
#
|
||||||
PANEL = "#23262e"
|
# Why globals rather than passing a palette around: ~20 inline
|
||||||
PANEL_2 = "#2b2f39"
|
# `setStyleSheet(f"color: {MUTED}")` calls are scattered through this file, and
|
||||||
TEXT = "#e7e9ee"
|
# an f-string resolves its names when it runs, not when it's compiled. Rebinding
|
||||||
MUTED = "#9aa0ad"
|
# the globals means every one of those call sites picks up the new colour on its
|
||||||
BORDER = "#3a3f4b"
|
# next render, with no change to the call sites themselves.
|
||||||
GOOD = "#4ade80"
|
PALETTE = core.DARK_PALETTE
|
||||||
BAD = "#f87171"
|
ACCENT = ACCENT_DIM = BG = PANEL = PANEL_2 = TEXT = MUTED = BORDER = ""
|
||||||
WARN = "#fbbf24"
|
GOOD = BAD = WARN = REMOTE = ON_ACCENT = DISABLED_BG = MONO_BG = SEL_TEXT = ""
|
||||||
|
STATUS_COLORS: dict[str, str] = {}
|
||||||
|
HEALTH_COLORS: dict[str, str] = {}
|
||||||
|
|
||||||
STATUS_COLORS = {"ok": GOOD, "missing": BAD, "warn": WARN, "remote": "#60a5fa", "unknown": WARN}
|
STATUS_GLYPH = {
|
||||||
STATUS_GLYPH = {"ok": "●", "missing": "●", "warn": "▲", "remote": "◆", "unknown": "○"}
|
"ok": "\u25cf",
|
||||||
|
"missing": "\u25cf",
|
||||||
|
"warn": "\u25b2",
|
||||||
|
"remote": "\u25c6",
|
||||||
|
"unknown": "\u25cb",
|
||||||
|
}
|
||||||
|
|
||||||
# Health dot (spawn-test outcome, see core.HealthStatus) shown per row in the
|
# Health dot (spawn-test outcome, see core.HealthStatus) shown per row in the
|
||||||
# server tables' "Health" column -- distinct from the PATH-dependency Status
|
# server tables' "Health" column -- distinct from the PATH-dependency Status
|
||||||
# column above.
|
# column above.
|
||||||
HEALTH_COLORS = {"ok": GOOD, "failed": BAD, "untested": MUTED}
|
HEALTH_GLYPH = {"ok": "\u25cf", "failed": "\u25cf", "untested": "\u25cb"}
|
||||||
HEALTH_GLYPH = {"ok": "●", "failed": "●", "untested": "○"}
|
|
||||||
|
|
||||||
STYLESHEET = f"""
|
|
||||||
|
def build_stylesheet(p: core.Palette) -> str:
|
||||||
|
"""Render the global QSS for a palette."""
|
||||||
|
return f"""
|
||||||
/* No font-family here on purpose: Qt already uses the native system UI font
|
/* No font-family here on purpose: Qt already uses the native system UI font
|
||||||
on every platform (San Francisco / Segoe UI / desktop default). Naming
|
on every platform (San Francisco / Segoe UI / desktop default). Naming
|
||||||
web-CSS aliases like -apple-system forces a costly font-alias scan. */
|
web-CSS aliases like -apple-system forces a costly font-alias scan. */
|
||||||
* {{ font-size: 13px; color: {TEXT}; }}
|
* {{ font-size: 13px; color: {p.text}; }}
|
||||||
QMainWindow, QDialog {{ background: {BG}; }}
|
QMainWindow, QDialog {{ background: {p.bg}; }}
|
||||||
QLabel#h1 {{ font-size: 15px; font-weight: 600; }}
|
QLabel#h1 {{ font-size: 15px; font-weight: 600; }}
|
||||||
QLabel#muted {{ color: {MUTED}; }}
|
QLabel#muted {{ color: {p.muted}; }}
|
||||||
QFrame#card {{ background: {PANEL}; border: 1px solid {BORDER}; border-radius: 10px; }}
|
QFrame#card {{ background: {p.panel}; border: 1px solid {p.border}; border-radius: 10px; }}
|
||||||
QLineEdit, QPlainTextEdit, QComboBox {{
|
QLineEdit, QPlainTextEdit, QComboBox {{
|
||||||
background: {PANEL_2}; border: 1px solid {BORDER}; border-radius: 7px;
|
background: {p.panel_2}; border: 1px solid {p.border}; border-radius: 7px;
|
||||||
padding: 6px 8px; selection-background-color: {ACCENT}; selection-color: #1a1205;
|
padding: 6px 8px; selection-background-color: {p.accent}; selection-color: {p.on_accent};
|
||||||
}}
|
}}
|
||||||
QLineEdit:focus, QPlainTextEdit:focus, QComboBox:focus {{ border: 1px solid {ACCENT}; }}
|
QLineEdit:focus, QPlainTextEdit:focus, QComboBox:focus {{ border: 1px solid {p.accent}; }}
|
||||||
QComboBox::drop-down {{ border: none; width: 22px; }}
|
QComboBox::drop-down {{ border: none; width: 22px; }}
|
||||||
QComboBox QAbstractItemView {{ background: {PANEL_2}; border: 1px solid {BORDER};
|
QComboBox QAbstractItemView {{ background: {p.panel_2}; border: 1px solid {p.border};
|
||||||
selection-background-color: {ACCENT}; outline: none; }}
|
selection-background-color: {p.accent}; outline: none; }}
|
||||||
QPushButton {{ background: {PANEL_2}; border: 1px solid {BORDER}; border-radius: 7px;
|
QPushButton {{ background: {p.panel_2}; border: 1px solid {p.border}; border-radius: 7px;
|
||||||
padding: 7px 13px; }}
|
padding: 7px 13px; }}
|
||||||
QPushButton:hover {{ border: 1px solid {ACCENT}; }}
|
QPushButton:hover {{ border: 1px solid {p.accent}; }}
|
||||||
QPushButton:disabled {{ color: {MUTED}; background: {PANEL}; }}
|
QPushButton:disabled {{ color: {p.muted}; background: {p.panel}; }}
|
||||||
QPushButton#primary {{ background: {ACCENT}; border: 1px solid {ACCENT}; color: #1a1205; font-weight: 600; }}
|
QPushButton#primary {{ background: {p.accent}; border: 1px solid {p.accent}; color: {p.on_accent}; font-weight: 600; }}
|
||||||
QPushButton#primary:hover {{ background: {ACCENT_DIM}; }}
|
QPushButton#primary:hover {{ background: {p.accent_dim}; }}
|
||||||
QPushButton#primary:disabled {{ background: {PANEL}; color: {MUTED}; border: 1px solid {BORDER}; }}
|
QPushButton#primary:disabled {{ background: {p.panel}; color: {p.muted}; border: 1px solid {p.border}; }}
|
||||||
QPushButton#danger:hover {{ border: 1px solid {BAD}; color: {BAD}; }}
|
QPushButton#danger:hover {{ border: 1px solid {p.bad}; color: {p.bad}; }}
|
||||||
QTableWidget {{ background: {PANEL}; border: 1px solid {BORDER}; border-radius: 10px;
|
QTableWidget {{ background: {p.panel}; border: 1px solid {p.border}; border-radius: 10px;
|
||||||
gridline-color: transparent; outline: none; }}
|
gridline-color: transparent; outline: none; }}
|
||||||
QTableWidget::item {{ padding: 6px 8px; border: none; }}
|
QTableWidget::item {{ padding: 6px 8px; border: none; }}
|
||||||
QTableWidget::item:selected {{ background: {ACCENT}; color: #1a1205; }}
|
QTableWidget::item:selected {{ background: {p.accent}; color: {p.on_accent}; }}
|
||||||
/* Inline cell editors: the global QLineEdit padding/radius clips the text
|
/* Inline cell editors: the global QLineEdit padding/radius clips the text
|
||||||
inside a table row, so give editors a compact, flat style instead. */
|
inside a table row, so give editors a compact, flat style instead. */
|
||||||
QTableWidget QLineEdit {{
|
QTableWidget QLineEdit {{
|
||||||
background: {PANEL_2}; color: {TEXT}; border: 1px solid {ACCENT};
|
background: {p.panel_2}; color: {p.text}; border: 1px solid {p.accent};
|
||||||
border-radius: 3px; padding: 0px 4px; margin: 0px;
|
border-radius: 3px; padding: 0px 4px; margin: 0px;
|
||||||
selection-background-color: {ACCENT_DIM}; selection-color: #ffffff;
|
selection-background-color: {p.accent_dim}; selection-color: {p.selection_text};
|
||||||
}}
|
}}
|
||||||
QHeaderView::section {{ background: {PANEL}; color: {MUTED}; border: none;
|
QHeaderView::section {{ background: {p.panel}; color: {p.muted}; border: none;
|
||||||
border-bottom: 1px solid {BORDER}; padding: 8px; font-weight: 600; }}
|
border-bottom: 1px solid {p.border}; padding: 8px; font-weight: 600; }}
|
||||||
QScrollBar:vertical {{ background: transparent; width: 10px; margin: 2px; }}
|
QScrollBar:vertical {{ background: transparent; width: 10px; margin: 2px; }}
|
||||||
QScrollBar::handle:vertical {{ background: {BORDER}; border-radius: 5px; min-height: 24px; }}
|
QScrollBar::handle:vertical {{ background: {p.border}; border-radius: 5px; min-height: 24px; }}
|
||||||
QScrollBar::add-line, QScrollBar::sub-line {{ height: 0; }}
|
QScrollBar::add-line, QScrollBar::sub-line {{ height: 0; }}
|
||||||
QLabel#statusbar {{ color: {MUTED}; padding: 4px 2px; }}
|
QLabel#statusbar {{ color: {p.muted}; padding: 4px 2px; }}
|
||||||
QLabel#warnBanner {{ color: #1a1205; background: {WARN}; border-radius: 8px; padding: 8px 10px; font-weight: 600; }}
|
QLabel#warnBanner {{ color: {p.on_accent}; background: {p.warn}; border-radius: 8px; padding: 8px 10px; font-weight: 600; }}
|
||||||
QLabel#section {{ color: {MUTED}; font-weight: 600; font-size: 12px; padding: 2px 2px; }}
|
QFrame#noticeBanner {{ background: {p.panel_2}; border: 1px solid {p.accent}; border-radius: 8px; }}
|
||||||
QLabel#sectionDisabled {{ color: {MUTED}; font-weight: 600; font-size: 12px; padding: 2px 2px; }}
|
QLabel#noticeText {{ color: {p.text}; }}
|
||||||
QLabel#placeholder {{ color: {MUTED}; padding: 12px; background: {PANEL_2}; border: 1px dashed {BORDER}; border-radius: 8px; }}
|
QPushButton#noticeClose {{ background: transparent; border: none; color: {p.muted}; font-size: 14px; padding: 2px; }}
|
||||||
QTableWidget#disabledTable {{ background: #202229; }}
|
QPushButton#noticeClose:hover {{ color: {p.text}; }}
|
||||||
QTableWidget#disabledTable::item:selected {{ background: {ACCENT}; color: #1a1205; }}
|
QLabel#section {{ color: {p.muted}; font-weight: 600; font-size: 12px; padding: 2px 2px; }}
|
||||||
|
QLabel#sectionDisabled {{ color: {p.muted}; font-weight: 600; font-size: 12px; padding: 2px 2px; }}
|
||||||
|
QLabel#placeholder {{ color: {p.muted}; padding: 12px; background: {p.panel_2}; border: 1px dashed {p.border}; border-radius: 8px; }}
|
||||||
|
QTableWidget#disabledTable {{ background: {p.disabled_bg}; }}
|
||||||
|
QTableWidget#disabledTable::item:selected {{ background: {p.accent}; color: {p.on_accent}; }}
|
||||||
QPlainTextEdit#diag {{ font-family: "Menlo", "Cascadia Code", "Consolas", "DejaVu Sans Mono", monospace;
|
QPlainTextEdit#diag {{ font-family: "Menlo", "Cascadia Code", "Consolas", "DejaVu Sans Mono", monospace;
|
||||||
font-size: 12px; background: #16181d; border: 1px solid {BORDER}; border-radius: 8px; }}
|
font-size: 12px; background: {p.mono_bg}; border: 1px solid {p.border}; border-radius: 8px; }}
|
||||||
QFrame#diagCard {{ background: transparent; border: none; }}
|
QFrame#diagCard {{ background: transparent; border: none; }}
|
||||||
QSplitter::handle {{ background: transparent; }}
|
QSplitter::handle {{ background: transparent; }}
|
||||||
QSplitter::handle:hover {{ background: {BORDER}; border-radius: 4px; }}
|
QSplitter::handle:hover {{ background: {p.border}; border-radius: 4px; }}
|
||||||
QSplitter::handle:pressed {{ background: {ACCENT}; border-radius: 4px; }}
|
QSplitter::handle:pressed {{ background: {p.accent}; border-radius: 4px; }}
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
def apply_palette(p: core.Palette) -> str:
|
||||||
|
"""Rebind the module-level colour names to `p` and return its stylesheet."""
|
||||||
|
global PALETTE, ACCENT, ACCENT_DIM, BG, PANEL, PANEL_2, TEXT, MUTED, BORDER
|
||||||
|
global GOOD, BAD, WARN, REMOTE, ON_ACCENT, DISABLED_BG, MONO_BG, SEL_TEXT
|
||||||
|
global STATUS_COLORS, HEALTH_COLORS
|
||||||
|
PALETTE = p
|
||||||
|
ACCENT, ACCENT_DIM = p.accent, p.accent_dim
|
||||||
|
BG, PANEL, PANEL_2 = p.bg, p.panel, p.panel_2
|
||||||
|
TEXT, MUTED, BORDER = p.text, p.muted, p.border
|
||||||
|
GOOD, BAD, WARN, REMOTE = p.good, p.bad, p.warn, p.remote
|
||||||
|
ON_ACCENT, DISABLED_BG, MONO_BG, SEL_TEXT = (
|
||||||
|
p.on_accent,
|
||||||
|
p.disabled_bg,
|
||||||
|
p.mono_bg,
|
||||||
|
p.selection_text,
|
||||||
|
)
|
||||||
|
STATUS_COLORS = {"ok": GOOD, "missing": BAD, "warn": WARN, "remote": REMOTE, "unknown": WARN}
|
||||||
|
HEALTH_COLORS = {"ok": GOOD, "failed": BAD, "untested": MUTED}
|
||||||
|
return build_stylesheet(p)
|
||||||
|
|
||||||
|
|
||||||
|
STYLESHEET = apply_palette(core.DARK_PALETTE)
|
||||||
|
|
||||||
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Background reachability tester (keeps the UI responsive during the request)
|
# Background reachability tester (keeps the UI responsive during the request)
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
@@ -1493,6 +1533,54 @@ class AboutDialog(QDialog):
|
|||||||
QDesktopServices.openUrl(QUrl(self._release_url or core.RELEASES_URL))
|
QDesktopServices.openUrl(QUrl(self._release_url or core.RELEASES_URL))
|
||||||
|
|
||||||
|
|
||||||
|
class NoticeBanner(QFrame):
|
||||||
|
"""A persistent, dismissible notice with an optional action button.
|
||||||
|
|
||||||
|
The status bar is the wrong home for anything the user needs to act on --
|
||||||
|
21 call sites rewrite it, so a message posted there is gone by the next
|
||||||
|
click. That wiped the MSIX warning (#35) and then the update notice (#78).
|
||||||
|
This is the shared mechanism so it doesn't happen a third time.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, parent=None):
|
||||||
|
super().__init__(parent)
|
||||||
|
self.setObjectName("noticeBanner")
|
||||||
|
row = QHBoxLayout(self)
|
||||||
|
row.setContentsMargins(10, 8, 8, 8)
|
||||||
|
row.setSpacing(8)
|
||||||
|
self._label = QLabel("")
|
||||||
|
self._label.setObjectName("noticeText")
|
||||||
|
self._label.setWordWrap(True)
|
||||||
|
row.addWidget(self._label, 1)
|
||||||
|
self._action_btn = QPushButton("")
|
||||||
|
self._action_btn.setCursor(Qt.CursorShape.PointingHandCursor)
|
||||||
|
self._action_btn.hide()
|
||||||
|
row.addWidget(self._action_btn)
|
||||||
|
self._close_btn = QPushButton("\u2715")
|
||||||
|
self._close_btn.setObjectName("noticeClose")
|
||||||
|
self._close_btn.setCursor(Qt.CursorShape.PointingHandCursor)
|
||||||
|
self._close_btn.setFixedWidth(26)
|
||||||
|
self._close_btn.setToolTip("Dismiss")
|
||||||
|
self._close_btn.clicked.connect(self.hide)
|
||||||
|
row.addWidget(self._close_btn)
|
||||||
|
self.hide()
|
||||||
|
|
||||||
|
def show_notice(self, text: str, action_label: str = "", on_action=None):
|
||||||
|
self._label.setText(text)
|
||||||
|
self._label.setToolTip(text)
|
||||||
|
# Reconnect cleanly: a banner reused for a second notice would
|
||||||
|
# otherwise fire the previous notice's action too.
|
||||||
|
with contextlib.suppress(RuntimeError, TypeError):
|
||||||
|
self._action_btn.clicked.disconnect()
|
||||||
|
if action_label and on_action is not None:
|
||||||
|
self._action_btn.setText(action_label)
|
||||||
|
self._action_btn.clicked.connect(lambda _=False: on_action())
|
||||||
|
self._action_btn.show()
|
||||||
|
else:
|
||||||
|
self._action_btn.hide()
|
||||||
|
self.show()
|
||||||
|
|
||||||
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Restart worker: core.restart_claude_desktop() blocks up to ~5 s on macOS
|
# Restart worker: core.restart_claude_desktop() blocks up to ~5 s on macOS
|
||||||
# waiting for the old instance to exit, so it must run off the UI thread.
|
# waiting for the old instance to exit, so it must run off the UI thread.
|
||||||
@@ -1550,6 +1638,11 @@ class MainWindow(QMainWindow):
|
|||||||
self.warn_banner.hide()
|
self.warn_banner.hide()
|
||||||
root.addWidget(self.warn_banner)
|
root.addWidget(self.warn_banner)
|
||||||
|
|
||||||
|
# Update availability gets its own persistent banner rather than a
|
||||||
|
# status-line write, which the next UI action overwrites (#78).
|
||||||
|
self.update_banner = NoticeBanner(self)
|
||||||
|
root.addWidget(self.update_banner)
|
||||||
|
|
||||||
# User-draggable divider between the server list and the editor.
|
# User-draggable divider between the server list and the editor.
|
||||||
split = QSplitter(Qt.Orientation.Horizontal)
|
split = QSplitter(Qt.Orientation.Horizontal)
|
||||||
split.setChildrenCollapsible(False)
|
split.setChildrenCollapsible(False)
|
||||||
@@ -1585,11 +1678,96 @@ class MainWindow(QMainWindow):
|
|||||||
|
|
||||||
# --- menu bar ---------------------------------------------------------- #
|
# --- menu bar ---------------------------------------------------------- #
|
||||||
def _build_menu_bar(self):
|
def _build_menu_bar(self):
|
||||||
|
view_menu = self.menuBar().addMenu("&View")
|
||||||
|
theme_menu = view_menu.addMenu("Theme")
|
||||||
|
self._theme_group = QActionGroup(self)
|
||||||
|
self._theme_group.setExclusive(True)
|
||||||
|
current = stored_theme_setting()
|
||||||
|
for setting, label in (
|
||||||
|
(core.THEME_SYSTEM, "Match system"),
|
||||||
|
(core.THEME_LIGHT, "Light"),
|
||||||
|
(core.THEME_DARK, "Dark"),
|
||||||
|
):
|
||||||
|
act = QAction(label, self, checkable=True)
|
||||||
|
act.setChecked(setting == current)
|
||||||
|
act.triggered.connect(lambda _checked=False, s=setting: self._set_theme(s))
|
||||||
|
self._theme_group.addAction(act)
|
||||||
|
theme_menu.addAction(act)
|
||||||
|
|
||||||
help_menu = self.menuBar().addMenu("&Help")
|
help_menu = self.menuBar().addMenu("&Help")
|
||||||
|
|
||||||
|
# "Check for updates" used to exist only as a button inside the About
|
||||||
|
# dialog, which is not somewhere anyone looks for it (#79).
|
||||||
|
update_action = QAction("Check for updates…", self)
|
||||||
|
# Explicit role: macOS relocates actions it recognises by text, and
|
||||||
|
# some Qt versions treat "update" as application-menu material. Pin it
|
||||||
|
# so the item stays where the menu says it is on every platform.
|
||||||
|
update_action.setMenuRole(QAction.MenuRole.ApplicationSpecificRole)
|
||||||
|
update_action.triggered.connect(self.check_for_updates)
|
||||||
|
help_menu.addAction(update_action)
|
||||||
|
help_menu.addSeparator()
|
||||||
|
|
||||||
about_action = QAction("About Better Claude Config…", self)
|
about_action = QAction("About Better Claude Config…", self)
|
||||||
|
# Qt auto-assigns AboutRole to actions whose text starts with "About",
|
||||||
|
# which moves this into the application menu on macOS. That is the
|
||||||
|
# right home there -- state it explicitly rather than inheriting it by
|
||||||
|
# accident, since the behaviour is invisible from this call site.
|
||||||
|
about_action.setMenuRole(QAction.MenuRole.AboutRole)
|
||||||
about_action.triggered.connect(self._show_about)
|
about_action.triggered.connect(self._show_about)
|
||||||
help_menu.addAction(about_action)
|
help_menu.addAction(about_action)
|
||||||
|
|
||||||
|
def _show_update_notice(self, notice: dict):
|
||||||
|
"""Surface an available update where it survives the next click."""
|
||||||
|
url = notice["url"]
|
||||||
|
self.update_banner.show_notice(
|
||||||
|
notice["text"],
|
||||||
|
action_label="Open releases page",
|
||||||
|
on_action=lambda: QDesktopServices.openUrl(QUrl(url)),
|
||||||
|
)
|
||||||
|
|
||||||
|
def check_for_updates(self):
|
||||||
|
"""Menu-driven check. Unlike the startup check this is never throttled
|
||||||
|
and always reports back -- the user asked, so silence would read as a
|
||||||
|
broken button."""
|
||||||
|
self.status.setText("Checking for updates…")
|
||||||
|
self._menu_update_worker = UpdateCheckWorker()
|
||||||
|
self._menu_update_worker.done.connect(self._on_menu_update_checked)
|
||||||
|
self._menu_update_worker.start()
|
||||||
|
|
||||||
|
def _on_menu_update_checked(self, release: dict | None):
|
||||||
|
self._menu_update_worker = None
|
||||||
|
if release is None:
|
||||||
|
self.status.setText("Couldn't check for updates (offline?).")
|
||||||
|
return
|
||||||
|
QSettings("BCC", "BetterClaudeConfig").setValue("update/lastCheck", time.time())
|
||||||
|
notice = core.update_notice(core.__version__, release)
|
||||||
|
if notice:
|
||||||
|
self._show_update_notice(notice)
|
||||||
|
self.status.setText(f"Update available: {notice['version']}")
|
||||||
|
else:
|
||||||
|
self.update_banner.hide()
|
||||||
|
self.status.setText(f"You're up to date ({core.__version__}).")
|
||||||
|
|
||||||
|
def _set_theme(self, setting: str):
|
||||||
|
"""Persist the theme choice and repaint the running window."""
|
||||||
|
QSettings("BCC", "BetterClaudeConfig").setValue("ui/theme", setting)
|
||||||
|
app = QApplication.instance()
|
||||||
|
if app is None: # pragma: no cover - only in a headless test harness
|
||||||
|
return
|
||||||
|
app.setStyleSheet(theme_stylesheet_for(app, setting))
|
||||||
|
# The global stylesheet covers most of the UI, but the inline
|
||||||
|
# setStyleSheet calls (status dots, warning labels, update banner) only
|
||||||
|
# pick up the new palette when their widget next renders -- so re-render
|
||||||
|
# them now rather than leaving dark-on-light text behind.
|
||||||
|
self._repaint_themed_widgets()
|
||||||
|
|
||||||
|
def _repaint_themed_widgets(self):
|
||||||
|
"""Re-run the inline-styled bits after a palette change."""
|
||||||
|
self.status.setStyleSheet(f"color: {MUTED};")
|
||||||
|
idx = self._current_index()
|
||||||
|
self._refresh_tables(select_index=idx if idx >= 0 else -1)
|
||||||
|
self._update_status(saved=False)
|
||||||
|
|
||||||
def _show_about(self):
|
def _show_about(self):
|
||||||
AboutDialog(self).exec()
|
AboutDialog(self).exec()
|
||||||
|
|
||||||
@@ -1610,10 +1788,9 @@ class MainWindow(QMainWindow):
|
|||||||
if release is None:
|
if release is None:
|
||||||
return # offline/failed check: don't advance lastCheck, allow retry
|
return # offline/failed check: don't advance lastCheck, allow retry
|
||||||
QSettings("BCC", "BetterClaudeConfig").setValue("update/lastCheck", time.time())
|
QSettings("BCC", "BetterClaudeConfig").setValue("update/lastCheck", time.time())
|
||||||
if core.is_newer_version(core.__version__, release["version"]):
|
notice = core.update_notice(core.__version__, release)
|
||||||
self.status.setText(
|
if notice:
|
||||||
f"Update available: {release['version']} · Help ▸ About to view it."
|
self._show_update_notice(notice)
|
||||||
)
|
|
||||||
|
|
||||||
# --- layout persistence ---------------------------------------------- #
|
# --- layout persistence ---------------------------------------------- #
|
||||||
def _restore_layout(self):
|
def _restore_layout(self):
|
||||||
@@ -2671,6 +2848,33 @@ class MainWindow(QMainWindow):
|
|||||||
e.accept()
|
e.accept()
|
||||||
|
|
||||||
|
|
||||||
|
def system_is_dark(app: QApplication) -> bool:
|
||||||
|
"""Whether the desktop is currently using a dark appearance.
|
||||||
|
|
||||||
|
Read from the style's own window colour rather than per-platform APIs --
|
||||||
|
Qt has already resolved the OS appearance by the time it builds the
|
||||||
|
default palette, so this works the same on all three platforms.
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
return app.palette().color(QPalette.ColorRole.Window).lightness() < 128
|
||||||
|
except Exception: # pragma: no cover - defensive; never block startup on theming
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def stored_theme_setting() -> str:
|
||||||
|
"""The user's theme choice, defaulting to following the system."""
|
||||||
|
value = QSettings("BCC", "BetterClaudeConfig").value("ui/theme", core.THEME_SYSTEM)
|
||||||
|
return value if value in core.THEME_CHOICES else core.THEME_SYSTEM
|
||||||
|
|
||||||
|
|
||||||
|
def theme_stylesheet_for(app: QApplication, setting: str | None = None) -> str:
|
||||||
|
"""Resolve setting + OS appearance into a palette, apply it, return the QSS."""
|
||||||
|
if setting is None:
|
||||||
|
setting = stored_theme_setting()
|
||||||
|
theme = core.resolve_theme(setting, system_is_dark(app))
|
||||||
|
return apply_palette(core.palette_for(theme))
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
if sys.platform == "win32":
|
if sys.platform == "win32":
|
||||||
# Without an explicit AppUserModelID, Windows taskbar groups the app
|
# Without an explicit AppUserModelID, Windows taskbar groups the app
|
||||||
@@ -2689,7 +2893,7 @@ def main():
|
|||||||
icon = _app_icon()
|
icon = _app_icon()
|
||||||
if not icon.isNull():
|
if not icon.isNull():
|
||||||
app.setWindowIcon(icon)
|
app.setWindowIcon(icon)
|
||||||
app.setStyleSheet(STYLESHEET)
|
app.setStyleSheet(theme_stylesheet_for(app))
|
||||||
win = MainWindow()
|
win = MainWindow()
|
||||||
win.show()
|
win.show()
|
||||||
sys.exit(app.exec())
|
sys.exit(app.exec())
|
||||||
|
|||||||
+165
@@ -170,6 +170,39 @@ def fetch_latest_release(timeout: float = 4.0) -> dict | None:
|
|||||||
return {"version": tag, "url": payload.get("html_url") or RELEASES_URL}
|
return {"version": tag, "url": payload.get("html_url") or RELEASES_URL}
|
||||||
|
|
||||||
|
|
||||||
|
def update_notice(
|
||||||
|
current: str, release: dict | None, url_fallback: str = RELEASES_URL
|
||||||
|
) -> dict | None:
|
||||||
|
"""Decide whether to tell the user about a release, and what to say.
|
||||||
|
|
||||||
|
Returns {"version", "text", "url"} when `release` is newer than `current`,
|
||||||
|
or None when it isn't, when the check failed, or when the payload is
|
||||||
|
malformed. Kept here rather than in the GUI so the wording and the
|
||||||
|
should-we-notify decision are testable -- bcc.py can't be imported by the
|
||||||
|
test suite, which has no PySide6.
|
||||||
|
|
||||||
|
The text deliberately names no menu path. The old status-line notice read
|
||||||
|
"Help > About to view it", which is wrong on macOS: Qt relocates the About
|
||||||
|
action into the application menu (#79). A notice that carries its own
|
||||||
|
action can't drift out of sync with the platform.
|
||||||
|
"""
|
||||||
|
if not isinstance(release, dict):
|
||||||
|
return None
|
||||||
|
version = release.get("version")
|
||||||
|
if not version or not isinstance(version, str):
|
||||||
|
return None
|
||||||
|
if not is_newer_version(current, version):
|
||||||
|
return None
|
||||||
|
# Tags carry a "v" prefix and __version__ doesn't; render both the same way
|
||||||
|
# so the notice doesn't read "Version v1.3.0 ... you're running 1.2.0".
|
||||||
|
shown = version.lstrip("vV")
|
||||||
|
return {
|
||||||
|
"version": version,
|
||||||
|
"text": f"Version {shown} is available. You're running {current.lstrip('vV')}.",
|
||||||
|
"url": release.get("url") or url_fallback,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Data model
|
# Data model
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
@@ -243,6 +276,138 @@ class ServerEntry:
|
|||||||
return self.data if self.raw is NO_RAW else self.raw
|
return self.data if self.raw is NO_RAW else self.raw
|
||||||
|
|
||||||
|
|
||||||
|
# --------------------------------------------------------------------------- #
|
||||||
|
# Theming (issue #75)
|
||||||
|
# --------------------------------------------------------------------------- #
|
||||||
|
THEME_SYSTEM = "system"
|
||||||
|
THEME_LIGHT = "light"
|
||||||
|
THEME_DARK = "dark"
|
||||||
|
THEME_CHOICES = (THEME_SYSTEM, THEME_LIGHT, THEME_DARK)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class Palette:
|
||||||
|
"""Every colour the UI draws with.
|
||||||
|
|
||||||
|
Deliberately exhaustive: the stylesheet used to inline a handful of
|
||||||
|
near-black literals (`#1a1205` for text on the accent, `#202229` for the
|
||||||
|
disabled table, `#16181d` for the diagnostics pane), which is fine while
|
||||||
|
there's one theme and invisible breakage the moment there are two. Each
|
||||||
|
gets a slot here so a light palette can't silently inherit a dark value.
|
||||||
|
"""
|
||||||
|
|
||||||
|
name: str
|
||||||
|
accent: str
|
||||||
|
accent_dim: str
|
||||||
|
bg: str
|
||||||
|
panel: str
|
||||||
|
panel_2: str
|
||||||
|
text: str
|
||||||
|
muted: str
|
||||||
|
border: str
|
||||||
|
good: str
|
||||||
|
bad: str
|
||||||
|
warn: str
|
||||||
|
remote: str
|
||||||
|
on_accent: str # text drawn on top of an accent fill
|
||||||
|
disabled_bg: str # the parked-servers table
|
||||||
|
mono_bg: str # diagnostics / log panes
|
||||||
|
selection_text: str
|
||||||
|
|
||||||
|
|
||||||
|
# The shipping theme through v1.3.0. These values are carried over verbatim --
|
||||||
|
# adding a light theme must not restyle the dark one.
|
||||||
|
DARK_PALETTE = Palette(
|
||||||
|
name="dark",
|
||||||
|
accent="#f97316",
|
||||||
|
accent_dim="#c2570b",
|
||||||
|
bg="#1b1d23",
|
||||||
|
panel="#23262e",
|
||||||
|
panel_2="#2b2f39",
|
||||||
|
text="#e7e9ee",
|
||||||
|
muted="#9aa0ad",
|
||||||
|
border="#3a3f4b",
|
||||||
|
good="#4ade80",
|
||||||
|
bad="#f87171",
|
||||||
|
warn="#fbbf24",
|
||||||
|
remote="#60a5fa",
|
||||||
|
on_accent="#1a1205",
|
||||||
|
disabled_bg="#202229",
|
||||||
|
mono_bg="#16181d",
|
||||||
|
selection_text="#ffffff",
|
||||||
|
)
|
||||||
|
|
||||||
|
# The semantic colours are NOT the dark ones lightened. #4ade80 / #fbbf24 sit
|
||||||
|
# around 1.7:1 against white -- illegible. These are darkened to clear 4.5:1,
|
||||||
|
# which `test_light_palette_meets_contrast` enforces so nobody "tidies" them
|
||||||
|
# back toward the dark hues later.
|
||||||
|
LIGHT_PALETTE = Palette(
|
||||||
|
name="light",
|
||||||
|
accent="#c2410c",
|
||||||
|
accent_dim="#9a3412",
|
||||||
|
bg="#f6f7f9",
|
||||||
|
panel="#ffffff",
|
||||||
|
panel_2="#eef0f4",
|
||||||
|
text="#1b1d23",
|
||||||
|
muted="#5c6270",
|
||||||
|
border="#d3d7de",
|
||||||
|
good="#15803d",
|
||||||
|
bad="#b91c1c",
|
||||||
|
warn="#a16207",
|
||||||
|
remote="#1d4ed8",
|
||||||
|
on_accent="#ffffff",
|
||||||
|
disabled_bg="#e9ebef",
|
||||||
|
mono_bg="#f0f2f5",
|
||||||
|
selection_text="#ffffff",
|
||||||
|
)
|
||||||
|
|
||||||
|
PALETTES = {DARK_PALETTE.name: DARK_PALETTE, LIGHT_PALETTE.name: LIGHT_PALETTE}
|
||||||
|
|
||||||
|
|
||||||
|
def resolve_theme(setting: str, system_is_dark: bool) -> str:
|
||||||
|
"""Map a stored theme setting + the OS appearance onto a concrete palette name.
|
||||||
|
|
||||||
|
Anything unrecognised (a hand-edited QSettings value, a setting written by
|
||||||
|
a future version) falls back to following the system rather than to a
|
||||||
|
fixed theme -- the user's desktop is the better guess.
|
||||||
|
"""
|
||||||
|
if setting == THEME_DARK:
|
||||||
|
return THEME_DARK
|
||||||
|
if setting == THEME_LIGHT:
|
||||||
|
return THEME_LIGHT
|
||||||
|
return THEME_DARK if system_is_dark else THEME_LIGHT
|
||||||
|
|
||||||
|
|
||||||
|
def palette_for(theme: str) -> Palette:
|
||||||
|
"""Concrete palette by name; unknown names fall back to dark (the historical look)."""
|
||||||
|
return PALETTES.get(theme, DARK_PALETTE)
|
||||||
|
|
||||||
|
|
||||||
|
def _hex_to_rgb(value: str) -> tuple[int, int, int]:
|
||||||
|
v = value.lstrip("#")
|
||||||
|
if len(v) == 3:
|
||||||
|
v = "".join(ch * 2 for ch in v)
|
||||||
|
return int(v[0:2], 16), int(v[2:4], 16), int(v[4:6], 16)
|
||||||
|
|
||||||
|
|
||||||
|
def relative_luminance(color: str) -> float:
|
||||||
|
"""WCAG relative luminance for a #rrggbb colour."""
|
||||||
|
|
||||||
|
def chan(c: int) -> float:
|
||||||
|
srgb = c / 255.0
|
||||||
|
return srgb / 12.92 if srgb <= 0.04045 else ((srgb + 0.055) / 1.055) ** 2.4
|
||||||
|
|
||||||
|
r, g, b = (chan(c) for c in _hex_to_rgb(color))
|
||||||
|
return 0.2126 * r + 0.7152 * g + 0.0722 * b
|
||||||
|
|
||||||
|
|
||||||
|
def contrast_ratio(fg: str, bg: str) -> float:
|
||||||
|
"""WCAG contrast ratio between two #rrggbb colours (1.0 to 21.0)."""
|
||||||
|
a, b = relative_luminance(fg), relative_luminance(bg)
|
||||||
|
lighter, darker = max(a, b), min(a, b)
|
||||||
|
return (lighter + 0.05) / (darker + 0.05)
|
||||||
|
|
||||||
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Discovery
|
# Discovery
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
"""Pytest port of the original test_core.py script (same 23 behaviours, now
|
"""Pytest port of the original test_core.py script (same 23 behaviours, now
|
||||||
proper test functions with tmp_path/monkeypatch fixtures)."""
|
proper test functions with tmp_path/monkeypatch fixtures)."""
|
||||||
|
|
||||||
|
import dataclasses
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
@@ -2510,3 +2511,172 @@ def test_a_normal_entry_is_not_malformed():
|
|||||||
entry = c.extract_servers({"mcpServers": {"foo": {"command": "npx"}}})[0]
|
entry = c.extract_servers({"mcpServers": {"foo": {"command": "npx"}}})[0]
|
||||||
assert entry.malformed is False
|
assert entry.malformed is False
|
||||||
assert entry.raw is c.NO_RAW
|
assert entry.raw is c.NO_RAW
|
||||||
|
|
||||||
|
|
||||||
|
# --------------------------------------------------------------------------- #
|
||||||
|
# #75 -- theming
|
||||||
|
# --------------------------------------------------------------------------- #
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"setting,system_dark,expected",
|
||||||
|
[
|
||||||
|
(c.THEME_DARK, False, "dark"),
|
||||||
|
(c.THEME_DARK, True, "dark"),
|
||||||
|
(c.THEME_LIGHT, False, "light"),
|
||||||
|
(c.THEME_LIGHT, True, "light"),
|
||||||
|
(c.THEME_SYSTEM, True, "dark"),
|
||||||
|
(c.THEME_SYSTEM, False, "light"),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_resolve_theme_covers_every_setting_and_appearance(setting, system_dark, expected):
|
||||||
|
assert c.resolve_theme(setting, system_dark) == expected
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("junk", ["", "solarized", None, "DARK", 3])
|
||||||
|
def test_resolve_theme_falls_back_to_following_the_system(junk):
|
||||||
|
"""A hand-edited or future QSettings value should follow the desktop,
|
||||||
|
not pin a fixed theme."""
|
||||||
|
assert c.resolve_theme(junk, True) == "dark"
|
||||||
|
assert c.resolve_theme(junk, False) == "light"
|
||||||
|
|
||||||
|
|
||||||
|
def test_palette_for_known_names():
|
||||||
|
assert c.palette_for("dark") is c.DARK_PALETTE
|
||||||
|
assert c.palette_for("light") is c.LIGHT_PALETTE
|
||||||
|
|
||||||
|
|
||||||
|
def test_palette_for_unknown_name_falls_back_to_dark():
|
||||||
|
assert c.palette_for("chartreuse") is c.DARK_PALETTE
|
||||||
|
|
||||||
|
|
||||||
|
def test_dark_palette_is_unchanged_from_the_shipped_look():
|
||||||
|
"""v1.3.0 shipped these exact colours; adding a light theme must not
|
||||||
|
quietly restyle the dark one."""
|
||||||
|
p = c.DARK_PALETTE
|
||||||
|
assert (p.accent, p.bg, p.panel, p.panel_2) == ("#f97316", "#1b1d23", "#23262e", "#2b2f39")
|
||||||
|
assert (p.text, p.muted, p.border) == ("#e7e9ee", "#9aa0ad", "#3a3f4b")
|
||||||
|
assert (p.good, p.bad, p.warn, p.remote) == ("#4ade80", "#f87171", "#fbbf24", "#60a5fa")
|
||||||
|
assert (p.on_accent, p.disabled_bg, p.mono_bg) == ("#1a1205", "#202229", "#16181d")
|
||||||
|
|
||||||
|
|
||||||
|
def test_both_palettes_define_every_slot():
|
||||||
|
"""A missing slot should fail here rather than render a broken window."""
|
||||||
|
for pal in (c.DARK_PALETTE, c.LIGHT_PALETTE):
|
||||||
|
for f in dataclasses.fields(c.Palette):
|
||||||
|
value = getattr(pal, f.name)
|
||||||
|
assert value, f"{pal.name}.{f.name} is empty"
|
||||||
|
if f.name != "name":
|
||||||
|
assert re.fullmatch(r"#[0-9a-fA-F]{6}", value), f"{pal.name}.{f.name}={value!r}"
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("pal_name", ["dark", "light"])
|
||||||
|
@pytest.mark.parametrize("slot", ["text", "muted", "good", "bad", "warn", "remote", "accent"])
|
||||||
|
def test_palette_meets_contrast_on_panel(pal_name, slot):
|
||||||
|
"""Every colour drawn as text/glyph must clear WCAG AA (4.5:1) against the
|
||||||
|
surface it sits on. The light palette's semantic colours are NOT the dark
|
||||||
|
ones lightened -- #4ade80 sits near 1.7:1 on white -- so this guards
|
||||||
|
against someone 'harmonising' them back toward the dark hues."""
|
||||||
|
pal = c.palette_for(pal_name)
|
||||||
|
assert c.contrast_ratio(getattr(pal, slot), pal.panel) >= 4.5
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("pal_name", ["dark", "light"])
|
||||||
|
def test_on_accent_is_legible_against_the_accent_fill(pal_name):
|
||||||
|
"""Primary buttons and selected rows draw on_accent on top of accent."""
|
||||||
|
pal = c.palette_for(pal_name)
|
||||||
|
assert c.contrast_ratio(pal.on_accent, pal.accent) >= 4.5
|
||||||
|
|
||||||
|
|
||||||
|
def test_contrast_ratio_endpoints():
|
||||||
|
assert c.contrast_ratio("#000000", "#ffffff") == pytest.approx(21.0, abs=0.01)
|
||||||
|
assert c.contrast_ratio("#123456", "#123456") == pytest.approx(1.0, abs=0.001)
|
||||||
|
assert c.contrast_ratio("#ffffff", "#000000") == pytest.approx(21.0, abs=0.01)
|
||||||
|
|
||||||
|
|
||||||
|
def test_relative_luminance_extremes():
|
||||||
|
assert c.relative_luminance("#000000") == pytest.approx(0.0)
|
||||||
|
assert c.relative_luminance("#ffffff") == pytest.approx(1.0)
|
||||||
|
|
||||||
|
|
||||||
|
def test_stylesheet_builder_has_no_hardcoded_colours():
|
||||||
|
"""Every colour in the QSS must come from the palette.
|
||||||
|
|
||||||
|
Three near-black literals used to be inlined here (#1a1205, #202229,
|
||||||
|
#16181d). Harmless with one theme; with two, they silently render dark
|
||||||
|
chrome on a light window. Reads the source rather than importing bcc,
|
||||||
|
which needs PySide6.
|
||||||
|
"""
|
||||||
|
src = (Path(__file__).resolve().parent.parent / "bcc.py").read_text(encoding="utf-8")
|
||||||
|
start = src.index("def build_stylesheet")
|
||||||
|
body = src[start : src.index("def apply_palette")]
|
||||||
|
assert re.findall(r"#[0-9a-fA-F]{6}", body) == []
|
||||||
|
|
||||||
|
|
||||||
|
def test_every_palette_slot_is_consumed():
|
||||||
|
"""A slot added to Palette but never wired up is dead weight.
|
||||||
|
|
||||||
|
Checks for `p.<slot>` anywhere in bcc.py, which covers both the QSS and
|
||||||
|
apply_palette's global bindings -- not every slot belongs in the
|
||||||
|
stylesheet (`good` and `remote` feed the inline status dots via
|
||||||
|
STATUS_COLORS/HEALTH_COLORS, never the QSS). This won't catch a slot bound
|
||||||
|
to a global that nothing then uses; it does catch the common mistake of
|
||||||
|
extending the dataclass and forgetting to plumb it through.
|
||||||
|
"""
|
||||||
|
src = (Path(__file__).resolve().parent.parent / "bcc.py").read_text(encoding="utf-8")
|
||||||
|
for f in dataclasses.fields(c.Palette):
|
||||||
|
if f.name == "name":
|
||||||
|
continue
|
||||||
|
assert f"p.{f.name}" in src, f"palette slot {f.name!r} is never consumed"
|
||||||
|
|
||||||
|
|
||||||
|
# --------------------------------------------------------------------------- #
|
||||||
|
# #78/#79 -- update notice: when to show it, and what it says
|
||||||
|
# --------------------------------------------------------------------------- #
|
||||||
|
def test_update_notice_when_a_newer_release_exists():
|
||||||
|
n = c.update_notice("1.2.0", {"version": "v1.3.0", "url": "https://example.test/rel"})
|
||||||
|
assert n is not None
|
||||||
|
assert n["version"] == "v1.3.0"
|
||||||
|
assert n["url"] == "https://example.test/rel"
|
||||||
|
assert "1.3.0" in n["text"] and "1.2.0" in n["text"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_update_notice_is_silent_when_current():
|
||||||
|
assert c.update_notice("1.3.0", {"version": "v1.3.0"}) is None
|
||||||
|
assert c.update_notice("1.4.0", {"version": "v1.3.0"}) is None
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("bad", [None, {}, {"version": ""}, {"version": None}, {"version": 3}, []])
|
||||||
|
def test_update_notice_is_silent_on_a_failed_or_malformed_check(bad):
|
||||||
|
"""fetch_latest_release returns None on any failure; a half-formed payload
|
||||||
|
must not produce a notice pointing at nothing."""
|
||||||
|
assert c.update_notice("1.0.0", bad) is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_update_notice_falls_back_to_the_releases_page_without_a_url():
|
||||||
|
n = c.update_notice("1.0.0", {"version": "v2.0.0"})
|
||||||
|
assert n["url"] == c.RELEASES_URL
|
||||||
|
|
||||||
|
|
||||||
|
def test_update_notice_names_no_menu_path():
|
||||||
|
"""The old status-line text said 'Help > About to view it', which is wrong
|
||||||
|
on macOS -- Qt moves the About action into the application menu (#79). The
|
||||||
|
notice carries its own action, so it must not describe a menu path."""
|
||||||
|
n = c.update_notice("1.0.0", {"version": "v2.0.0"})
|
||||||
|
lowered = n["text"].lower()
|
||||||
|
for phrase in ("help", "about", "menu", "▸", ">"):
|
||||||
|
assert phrase not in lowered, f"notice text should not reference {phrase!r}"
|
||||||
|
|
||||||
|
|
||||||
|
def test_update_notice_handles_the_v_prefix_consistently():
|
||||||
|
assert c.update_notice("1.2.0", {"version": "1.3.0"}) is not None
|
||||||
|
assert c.update_notice("v1.2.0", {"version": "v1.3.0"}) is not None
|
||||||
|
assert c.update_notice("1.3.0", {"version": "v1.3.0"}) is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_update_notice_renders_both_versions_the_same_way():
|
||||||
|
"""Tags carry a 'v' prefix, __version__ doesn't -- don't show both forms
|
||||||
|
in one sentence."""
|
||||||
|
n = c.update_notice("1.2.0", {"version": "v1.3.0"})
|
||||||
|
assert "v1.3.0" not in n["text"]
|
||||||
|
assert "1.3.0" in n["text"] and "1.2.0" in n["text"]
|
||||||
|
# the machine-readable field keeps the real tag
|
||||||
|
assert n["version"] == "v1.3.0"
|
||||||
|
|||||||
Reference in New Issue
Block a user