trcc-linux 3.0.9__tar.gz → 3.0.10__tar.gz

{trcc_linux-3.0.9 → trcc_linux-3.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trcc-linux
-Version: 3.0.9
+Version: 3.0.10
 Summary: Linux implementation of Thermalright LCD Control Center
 Project-URL: Homepage, https://github.com/Lexonight1/thermalright-trcc-linux
 Project-URL: Documentation, https://github.com/Lexonight1/thermalright-trcc-linux#readme

{trcc_linux-3.0.9 → trcc_linux-3.0.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "trcc-linux"
-version = "3.0.9"
+version = "3.0.10"
 description = "Linux implementation of Thermalright LCD Control Center"
 readme = "README.md"
 license = "GPL-3.0-or-later"

{trcc_linux-3.0.9 → trcc_linux-3.0.10}/src/trcc/__version__.py

@@ -1,6 +1,6 @@
 """TRCC Linux version information."""
 
-__version__ = "3.0.9"
+__version__ = "3.0.10"
 __version_info__ = tuple(int(x) for x in __version__.split("."))
 
 # Version history:
@@ -108,3 +108,8 @@ __version_info__ = tuple(int(x) for x in __version__.split("."))
 #          zones 4+ by 4 wire positions). Fix HID Type 2 frame send: chunk at
 #          512 bytes matching C# UCDevice.cs, skip redundant SetConfiguration
 #          to prevent USB bus reset on Linux. 2290 tests.
+# 3.0.10 - Rewrite UCScreenLED: exact CS paint order (dark fill → decorations
+#          → LED rectangles → overlay mask), 12 ledPosition arrays with exact
+#          Rectangle(x,y,w,h) coordinates, 460×460 widget. Unified device
+#          sidebar buttons: remove DeviceButton class, all buttons use
+#          create_image_button with setChecked() toggle. 2288 tests.

{trcc_linux-3.0.9 → trcc_linux-3.0.10}/src/trcc/device_led.py

@@ -122,6 +122,7 @@ class PmEntry(NamedTuple):
     style_id: int
     model_name: str
     button_image: str
+    preview_image: str = ""  # PM-specific preview; empty = use style default
 
 
 class PmRegistry:
@@ -139,8 +140,8 @@ class PmRegistry:
 
     # PM → PmEntry base registry (built once at class load time).
     _REGISTRY: dict[int, PmEntry] = {
-        1:   PmEntry(1, "FROZEN_HORIZON_PRO", "A1FROZEN HORIZON PRO"),
-        2:   PmEntry(1, "FROZEN_MAGIC_PRO", "A1FROZEN MAGIC PRO"),
+        1:   PmEntry(1, "FROZEN_HORIZON_PRO", "A1FROZEN HORIZON PRO", "DFROZEN_HORIZON_PRO"),
+        2:   PmEntry(1, "FROZEN_MAGIC_PRO", "A1FROZEN MAGIC PRO", "DFROZEN_MAGIC_PRO"),
         3:   PmEntry(1, "AX120_DIGITAL", "A1AX120 DIGITAL"),
         16:  PmEntry(2, "PA120_DIGITAL", "A1PA120 DIGITAL"),
         23:  PmEntry(2, "RK120_DIGITAL", "A1RK120 DIGITAL"),
@@ -196,6 +197,15 @@ class PmRegistry:
         entry = cls.resolve(pm, sub_type)
         return LED_STYLES[entry.style_id if entry else 1]
 
+    @classmethod
+    def get_preview_image(cls, pm: int, sub_type: int = 0) -> str:
+        """Get device preview image name, PM-specific or style default."""
+        entry = cls.resolve(pm, sub_type)
+        if entry and entry.preview_image:
+            return entry.preview_image
+        style = cls.get_style(pm, sub_type)
+        return style.preview_image
+
 
 # Preset colors from FormLED.cs ucColor1_ChangeColor handlers
 # Note: Windows ucColor1Delegate has swapped B,G params (R,B,G order)

{trcc_linux-3.0.9 → trcc_linux-3.0.10}/src/trcc/qt_components/assets.py

@@ -75,6 +75,9 @@ def asset_exists(name: str) -> bool:
 class Assets:
     """Windows resource names mapped to asset filenames."""
 
+    # Form1 background (full window with sidebar + gold bar + sensor grid)
+    FORM1_BG = 'A0无设备.png'
+
     # Main form backgrounds
     FORM_CZTV_BG = 'P0CZTV.png'
     FORM_CZTV_BG_EN = 'P0CZTVen.png'
@@ -151,6 +154,8 @@ class Assets:
     ABOUT_LOGOUT_HOVER = 'Alogout选中.png'
     CHECKBOX_OFF = 'P点选框.png'
     CHECKBOX_ON = 'P点选框A.png'
+    UPDATE_BTN = 'A2立即更新.png'
+    SYSINFO_BG = 'A0数据列表.png'
 
     @classmethod
     def get(cls, name: str) -> str | None:

{trcc_linux-3.0.9 → trcc_linux-3.0.10}/src/trcc/qt_components/base.py

@@ -16,8 +16,8 @@ import logging
 from pathlib import Path
 
 from PIL import Image
-from PySide6.QtCore import QSize, Qt, Signal
-from PySide6.QtGui import QBrush, QIcon, QImage, QPalette, QPixmap
+from PySide6.QtCore import QEvent, QObject, QSize, Qt, Signal
+from PySide6.QtGui import QIcon, QImage, QPainter, QPixmap
 from PySide6.QtWidgets import (
     QFrame,
     QGridLayout,
@@ -183,12 +183,34 @@ def pixmap_to_pil(pixmap):
                            qimage.bytesPerLine())
 
 
+class _BgPaintFilter(QObject):
+    """Event filter that paints a background pixmap once at (0,0).
+
+    Matches Windows WinForms BackgroundImageLayout.None — draw once at
+    top-left, no tiling, no stretching.  Avoids QBrush texture tiling.
+    """
+
+    def __init__(self, pixmap: QPixmap, parent: QObject | None = None):
+        super().__init__(parent)
+        self._pixmap = pixmap
+
+    def eventFilter(self, obj: QObject, event: QEvent) -> bool:  # noqa: N802
+        if event.type() == QEvent.Type.Paint:
+            painter = QPainter(obj)  # type: ignore[arg-type]
+            painter.drawPixmap(0, 0, self._pixmap)
+            painter.end()
+            return True
+        return False
+
+
 def set_background_pixmap(widget, asset_name, width=None, height=None,
                           fallback_style=None):
-    """Apply a background image to a widget via QPalette.
+    """Apply a background image to a widget (no tiling).
 
-    Uses QPalette+QBrush (not stylesheet) to avoid blocking palette
-    propagation to child widgets.
+    Uses a paint event filter to draw the pixmap once at (0,0), matching
+    Windows BackgroundImageLayout.None.  Does NOT use QPalette+QBrush
+    (which tiles), and does NOT use setStyleSheet (which blocks QPalette
+    on descendants).
 
     Args:
         widget: QWidget to set background on.
@@ -210,10 +232,9 @@ def set_background_pixmap(widget, asset_name, width=None, height=None,
         pixmap = _load(asset_name, w, h)
 
     if pixmap and not pixmap.isNull():
-        palette = widget.palette()
-        palette.setBrush(QPalette.ColorRole.Window, QBrush(pixmap))
-        widget.setPalette(palette)
-        widget.setAutoFillBackground(True)
+        filt = _BgPaintFilter(pixmap, widget)
+        widget.installEventFilter(filt)
+        widget.setAutoFillBackground(False)
         return pixmap
 
     if fallback_style:

{trcc_linux-3.0.9 → trcc_linux-3.0.10}/src/trcc/qt_components/constants.py

@@ -179,6 +179,11 @@ class Layout:
     SIDEBAR = (0, 0, 180, 800)
     FORM_CONTAINER = (180, 0, 1274, 800)
 
+    # Form1-level buttons (on central, visible in sensor/home view only)
+    # Windows: buttonPower at (1392, 24), buttonHelp at (1342, 24)
+    FORM1_CLOSE_BTN = (1392, 24, 40, 40)
+    FORM1_HELP_BTN = (1342, 24, 40, 40)
+
     # Preview (within form_container)
     PREVIEW = (16, 88, 500, 560)
 
@@ -274,6 +279,10 @@ class Layout:
     ADD_BTN_Y0 = 55
     ADD_BTN_DY = 42
 
+    # UCSystemInfoOptions (sensor grid) — Windows: (190, 98) on Form1, size 1254x692
+    # Sibling of FormCZTV on Form1, not a child
+    SYSINFO_PANEL = (190, 98, 1254, 692)
+
     # UCAbout / Control Center panel
     ABOUT_CLOSE_BTN = (1212, 24, 40, 40)
     ABOUT_STARTUP = (297, 174, 14, 14)
@@ -282,7 +291,8 @@ class Layout:
     ABOUT_HDD = (297, 254, 14, 14)
     ABOUT_REFRESH_INPUT = (299, 291, 36, 16)
     ABOUT_WEBSITE = (94, 726, 353, 43)
-    ABOUT_VERSION = (1175, 735, 87, 27)
+    ABOUT_VERSION = (1150, 735, 87, 27)
+    ABOUT_UPDATE_BTN = (297, 328, 48, 26)
 
     # Language selection checkboxes (within UCAbout)
     ABOUT_LANG_BUTTONS = [

{trcc_linux-3.0.9 → trcc_linux-3.0.10}/src/trcc/qt_components/qt_app_mvc.py

@@ -310,6 +310,14 @@ class TRCCMainWindowMVC(QMainWindow):
         self.setCentralWidget(central)
         # No stylesheet on central - would override QPalette on children
 
+        # Form1 background: A0无设备.png (sidebar + gold bar + sensor grid)
+        # ImageLayout.None in Windows — placed at origin, no scaling
+        pix_form1 = set_background_pixmap(central, Assets.FORM1_BG,
+            width=Sizes.WINDOW_W, height=Sizes.WINDOW_H,
+            fallback_style=f"background-color: {Colors.WINDOW_BG};")
+        if pix_form1:
+            self._pixmap_refs.append(pix_form1)
+
         # === Left: Device sidebar (180px) ===
         self.uc_device = UCDevice(central)
         self.uc_device.setGeometry(*Layout.SIDEBAR)
@@ -383,7 +391,7 @@ class TRCCMainWindowMVC(QMainWindow):
         # Apply localized display mode backgrounds to settings panel
         self._apply_settings_backgrounds()
 
-        # === About / Control Center panel (hidden, replaces form_container) ===
+        # === About / Control Center panel (sibling of form_container) ===
         self.uc_about = UCAbout(self._lang, central)
         self.uc_about.setGeometry(*Layout.FORM_CONTAINER)
         self.uc_about.setVisible(False)
@@ -392,9 +400,10 @@ class TRCCMainWindowMVC(QMainWindow):
         self._system_sensors = SensorEnumerator()
         self._system_sensors.discover()
 
-        # === System Info dashboard (hidden, shown by sensor/home button) ===
-        self.uc_system_info = UCSystemInfo(self._system_sensors, self._lang, central)
-        self.uc_system_info.setGeometry(*Layout.FORM_CONTAINER)
+        # === System Info dashboard (sibling of form_container) ===
+        self.uc_system_info = UCSystemInfo(self._system_sensors, self._lang,
+                                           central)
+        self.uc_system_info.setGeometry(*Layout.SYSINFO_PANEL)
         self.uc_system_info.setVisible(False)
 
         # === LED Control panel (hidden, shown when LED device is selected) ===
@@ -402,6 +411,22 @@ class TRCCMainWindowMVC(QMainWindow):
         self.uc_led_control.setGeometry(*Layout.FORM_CONTAINER)
         self.uc_led_control.setVisible(False)
 
+        # === Form1-level buttons (on central, visible in sensor/home view) ===
+        # Windows: buttonPower at (1392, 24), buttonHelp at (1342, 24)
+        self.form1_close_btn = create_image_button(
+            central, *Layout.FORM1_CLOSE_BTN,
+            Assets.BTN_POWER, Assets.BTN_POWER_HOVER, fallback_text="X"
+        )
+        self.form1_close_btn.setToolTip("Close")
+        self.form1_close_btn.clicked.connect(self.close)
+
+        self.form1_help_btn = create_image_button(
+            central, *Layout.FORM1_HELP_BTN,
+            Assets.BTN_HELP, None, fallback_text="?"
+        )
+        self.form1_help_btn.setToolTip("Help")
+        self.form1_help_btn.clicked.connect(self._on_help_clicked)
+
         # Initialize theme directories
         self._init_theme_directories()
 
@@ -441,17 +466,27 @@ class TRCCMainWindowMVC(QMainWindow):
             btn.setChecked(i == active_btn)
 
     def _show_view(self, view: str):
-        """Switch between the five content views.
+        """Switch between the four content views.
 
         Args:
             view: 'form' (device/themes), 'about' (control center),
                   'sysinfo' (dashboard), or 'led' (LED control)
+
+        All panels are siblings on central — only one visible at a time.
+        Matches Windows: Form1 hides/shows FormCZTV, UCAbout,
+        UCSystemInfoOptions, FormLED as siblings.
         """
         self.form_container.setVisible(view == 'form')
         self.uc_about.setVisible(view == 'about')
         self.uc_system_info.setVisible(view == 'sysinfo')
         self.uc_led_control.setVisible(view == 'led')
 
+        # Form1-level buttons: visible in sensor/home view only
+        # Windows: cmd 512 shows buttonPower/Help, cmd 256/240 hides them
+        show_form1_btns = (view == 'sysinfo')
+        self.form1_close_btn.setVisible(show_form1_btns)
+        self.form1_help_btn.setVisible(show_form1_btns)
+
         if view == 'sysinfo':
             self.uc_system_info.start_updates()
         else:
@@ -1743,7 +1778,8 @@ class TRCCMainWindowMVC(QMainWindow):
         style_info = LEDService.get_style_info(led_style)
         if style_info:
             self.uc_led_control.initialize(
-                led_style, style_info.segment_count, style_info.zone_count, self._lang
+                led_style, style_info.segment_count, style_info.zone_count,
+                self._lang, model=model,
             )
         # Sync saved sensor source to UI
         source = self._led_controller.led.state.temp_source

{trcc_linux-3.0.9 → trcc_linux-3.0.10}/src/trcc/qt_components/uc_about.py

@@ -14,17 +14,24 @@ Windows controls (from UCAbout.cs):
 - Language checkboxes at y=373/403
 """
 
+from __future__ import annotations
+
+import json
 import logging
 import shutil
+import subprocess
+import sys
 import webbrowser
 from pathlib import Path
+from threading import Thread
+from urllib.request import urlopen
 
-from PySide6.QtCore import Qt, Signal
-from PySide6.QtGui import QBrush, QIcon, QIntValidator, QPalette
-from PySide6.QtWidgets import QLabel, QLineEdit, QPushButton
+from PySide6.QtCore import QEvent, QPoint, Qt, Signal
+from PySide6.QtGui import QIcon, QIntValidator
+from PySide6.QtWidgets import QLabel, QLineEdit, QPushButton, QToolTip
 
 from .assets import Assets, load_pixmap
-from .base import BasePanel, create_image_button
+from .base import BasePanel, create_image_button, set_background_pixmap
 from .constants import Layout, Sizes, Styles
 
 log = logging.getLogger(__name__)
@@ -120,6 +127,21 @@ def ensure_autostart():
     return _is_autostart_enabled()
 
 
+def _check_pypi_version() -> str | None:
+    """Fetch the latest trcc-linux version from PyPI. Returns version string or None."""
+    try:
+        with urlopen('https://pypi.org/pypi/trcc-linux/json', timeout=5) as resp:
+            data = json.loads(resp.read())
+            return data['info']['version']
+    except Exception:
+        return None
+
+
+def _parse_version(v: str) -> tuple[int, ...]:
+    """Parse '3.0.9' into (3, 0, 9) for comparison."""
+    return tuple(int(x) for x in v.split('.'))
+
+
 class UCAbout(BasePanel):
     """
     Control Center panel matching Windows UCAbout.
@@ -140,6 +162,7 @@ class UCAbout(BasePanel):
     startup_changed = Signal(bool)       # auto-start enabled
     hdd_toggle_changed = Signal(bool)    # HDD info enabled
     refresh_changed = Signal(int)        # refresh interval (seconds)
+    _update_available = Signal(str)      # latest version string
 
     def __init__(self, lang: str = 'en', parent=None):
         super().__init__(parent, width=Sizes.FORM_W, height=Sizes.FORM_H)
@@ -160,14 +183,9 @@ class UCAbout(BasePanel):
         self._apply_background()
 
     def _apply_background(self):
-        """Set localized background image via QPalette."""
+        """Set localized background image (no tiling)."""
         bg_name = Assets.get_localized(Assets.ABOUT_BG, self._lang)
-        pixmap = load_pixmap(bg_name)
-        if not pixmap.isNull():
-            palette = self.palette()
-            palette.setBrush(QPalette.ColorRole.Window, QBrush(pixmap))
-            self.setPalette(palette)
-            self.setAutoFillBackground(True)
+        set_background_pixmap(self, bg_name)
 
     def _setup_ui(self):
         """Build UI with invisible click targets over background image text."""
@@ -231,12 +249,56 @@ class UCAbout(BasePanel):
         self.version_label = QLabel(__version__, self)
         self.version_label.setGeometry(*Layout.ABOUT_VERSION)
         self.version_label.setStyleSheet(
-            "color: white; font-size: 12px; background: transparent;"
+            "color: white; font-size: 16px; font-weight: bold; background: transparent;"
         )
         self.version_label.setAlignment(
             Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter
         )
 
+        # === Software update area (buttonBCZT — baked into background) ===
+        # Tooltip shown to the right of the button via event override
+        self._update_tooltip = "Running latest"
+        self._update_rect = self.rect().__class__(  # QRect
+            *Layout.ABOUT_UPDATE_BTN)
+
+        self.update_btn = QPushButton(self)
+        self.update_btn.setGeometry(*Layout.ABOUT_UPDATE_BTN)
+        self.update_btn.setFlat(True)
+        self.update_btn.setStyleSheet(Styles.FLAT_BUTTON)
+        self.update_btn.setCursor(Qt.CursorShape.PointingHandCursor)
+        self.update_btn.hide()
+        self.update_btn.installEventFilter(self)
+        self.update_btn.clicked.connect(self._on_update_clicked)
+        self._update_available.connect(self._on_update_result)
+        self._latest_version: str | None = None
+
+        # Check PyPI for updates in background
+        Thread(target=self._check_for_update, daemon=True).start()
+
+    def _show_update_tooltip(self):
+        """Show tooltip to the right of the update button, vertically centered."""
+        tip_pos = self.mapToGlobal(
+            QPoint(self._update_rect.right() + 4,
+                   self._update_rect.center().y() - 36))
+        QToolTip.showText(tip_pos, self._update_tooltip, self,
+                          self._update_rect)
+
+    def event(self, e: QEvent) -> bool:
+        """Show update tooltip to the right of the button area."""
+        if e.type() == QEvent.Type.ToolTip:
+            pos = e.pos()  # pyright: ignore[reportAttributeAccessIssue]
+            if self._update_rect.contains(pos):
+                self._show_update_tooltip()
+                return True
+        return super().event(e)
+
+    def eventFilter(self, obj, e: QEvent) -> bool:  # pyright: ignore[reportIncompatibleMethodOverride]
+        """Intercept tooltip on update button to use same custom position."""
+        if obj is self.update_btn and e.type() == QEvent.Type.ToolTip:
+            self._show_update_tooltip()
+            return True
+        return super().eventFilter(obj, e)
+
     def _make_checkbox(self, x, y, w, h, checked=False):
         """Create a checkbox-style toggle button using Windows checkbox images."""
         btn = QPushButton(self)
@@ -316,6 +378,41 @@ class UCAbout(BasePanel):
         self._apply_background()
         self.language_changed.emit(lang_suffix)
 
+    # --- Software update ---
+
+    def _check_for_update(self):
+        """Background thread: query PyPI and emit result via signal."""
+        latest = _check_pypi_version()
+        if latest:
+            self._update_available.emit(latest)
+
+    def _on_update_result(self, latest: str):
+        """Handle PyPI version check result (runs on main thread via signal)."""
+        from trcc.__version__ import __version__
+        if _parse_version(latest) > _parse_version(__version__):
+            self._latest_version = latest
+            self._update_tooltip = f"Version {latest} available"
+            self.update_btn.show()
+            log.info("Update available: %s → %s", __version__, latest)
+
+    def _on_update_clicked(self):
+        """Run pip install --upgrade trcc-linux."""
+        self.update_btn.hide()
+        self._update_tooltip = "Updating..."
+        log.info("Starting upgrade to %s", self._latest_version)
+        Thread(target=self._run_upgrade, daemon=True).start()
+
+    def _run_upgrade(self):
+        """Background thread: run pip upgrade."""
+        try:
+            subprocess.run(
+                [sys.executable, '-m', 'pip', 'install', '--upgrade', 'trcc-linux'],
+                check=True, capture_output=True, text=True,
+            )
+            log.info("Upgrade to %s successful", self._latest_version)
+        except subprocess.CalledProcessError as e:
+            log.error("Upgrade failed: %s", e.stderr)
+
     # --- Close ---
 
     def _on_close(self):